Remove ember-global deprecations

adopted-ember-addons · Sep 21, 2022 · 89d8307 · 89d8307
1 parent d0e0e15
commit 89d8307
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/addon/-private/ember-internals.js b/addon/-private/ember-internals.js
@@ -1,17 +1,4 @@
-import Ember from 'ember';
-import { A } from '@ember/array';
-
-let __EMBER_METAL__;
-let emberMetalPaths = [
-  '@ember/-internals/metal', // ember-source from 3.10
-  '@ember/-internals/metal/index', // ember-source from 3.13
-];
-let metalPath = A(emberMetalPaths).find(
-  (path) => Ember.__loader.registry[path]
-);
-if (metalPath) {
-  __EMBER_METAL__ = Ember.__loader.require(metalPath);
-}
+import __EMBER_METAL__ from '@ember/-internals/metal/index';
 
 export function getDependentKeys(descriptorOrDecorator) {
   if (__EMBER_METAL__ && __EMBER_METAL__.descriptorForDecorator) {

diff --git a/addon/utils/meta-data.js b/addon/utils/meta-data.js
@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { meta } from '@ember/-internals/meta';
 
 let id = 0;
 const dataKey = symbol('data');
@@ -8,7 +8,7 @@ function symbol(key) {
 }
 
 function getData(obj, s) {
-  let m = Ember.meta(obj);
+  let m = meta(obj);
   let data = m[dataKey];
 
   if (data) {
@@ -17,7 +17,7 @@ function getData(obj, s) {
 }
 
 function setData(obj, s, value) {
-  let m = Ember.meta(obj);
+  let m = meta(obj);
   let data = (m[dataKey] = m[dataKey] || {});
 
   data[s] = value;

diff --git a/addon/utils/utils.js b/addon/utils/utils.js
@@ -5,13 +5,10 @@ import EmberObject from '@ember/object';
 import { typeOf } from '@ember/utils';
 import { A as emberArray, isArray } from '@ember/array';
 
-import Ember from 'ember';
 import requireModule from 'ember-require-module';
 
 const DS = requireModule('ember-data');
 
-const { canInvoke } = Ember;
-
 export { getDependentKeys, isDescriptor } from '../-private/ember-internals';
 
 export function unwrapString(s) {
@@ -30,6 +27,12 @@ export function isProxy(o) {
   return !!(o && (o instanceof ObjectProxy || o instanceof ArrayProxy));
 }
 
+function canInvoke(obj, methodName) {
+  return (
+    obj !== null && obj !== undefined && typeof obj[methodName] === 'function'
+  );
+}
+
 export function isPromise(p) {
   return !!(p && canInvoke(p, 'then'));
 }