Migrate to @ember/destroyable and avoid the Ember global

NullVoxPopuli · NullVoxPopuli · commit 5b0c54f10086 · 2022-02-16T14:33:24.000-05:00
diff --git a/packages/@glimmer/component/addon/-private/ember-component-manager.ts b/packages/@glimmer/component/addon/-private/ember-component-manager.ts
@@ -1,6 +1,6 @@
 import { DEBUG } from '@glimmer/env';
-import Ember from 'ember';
 import { set } from '@ember/object';
+import { destroy } from '@ember/destroyable';
 import { capabilities } from '@ember/component';
 import { schedule } from '@ember/runloop';
 import { gte } from 'ember-compatibility-helpers';
@@ -21,14 +21,12 @@ const CAPABILITIES = gte('3.13.0-beta.1')
       asyncLifeCycleCallbacks: false,
     });
 
-function scheduledDestroyComponent(component: GlimmerComponent, meta: EmberMeta): void {
+function scheduledDestroyComponent(component: GlimmerComponent): void {
   if (component.isDestroyed) {
     return;
   }
 
-  Ember.destroy(component);
-
-  meta.setSourceDestroyed();
+  destroy(component);
   setDestroyed(component);
 }
 
@@ -46,13 +44,10 @@ class EmberGlimmerComponentManager extends BaseComponentManager<GlimmerComponent
       return;
     }
 
-    const meta = Ember.meta(component);
-
-    meta.setSourceDestroying();
     setDestroying(component);
 
     schedule('actions', component, component.willDestroy);
-    schedule('destroy', this, scheduledDestroyComponent, component, meta);
+    schedule('destroy', this, scheduledDestroyComponent, component);
   }
 }
 
diff --git a/packages/@glimmer/component/package.json b/packages/@glimmer/component/package.json
@@ -53,6 +53,7 @@
     "@types/ember": "~4.0.0",
     "@types/ember-qunit": "~5.0.0",
     "@types/ember-testing-helpers": "^0.0.4",
+    "@types/ember__destroyable": "^4.0.0",
     "@types/ember__test-helpers": "~2.6.1",
     "@types/qunit": "^2.5.3",
     "@types/rsvp": "^4.0.2",
diff --git a/yarn.lock b/yarn.lock
@@ -1813,6 +1813,11 @@
     "@types/ember__debug" "*"
     "@types/ember__object" "*"
 
+"@types/ember__destroyable@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/@types/ember__destroyable/-/ember__destroyable-4.0.0.tgz#997af44863323979796fbd153e9ad76498defb33"
+  integrity sha512-QxyRhCOlQmc056tbWvHOQZ7vIjlFOFYMOU82P3pcCFfxyi55+NRhj4ySruymcBCfrzKQmVQLCbbOGhyFMLqq0Q==
+
 "@types/ember__engine@*":
   version "4.0.0"
   resolved "https://registry.npmjs.org/@types/ember__engine/-/ember__engine-4.0.0.tgz#e39c06d98c7a085912508e8257c48a70196c1a87"
@@ -2543,14 +2548,7 @@ ajv@^8.0.0, ajv@^8.8.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-amd-name-resolver@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz#fc41b3848824b557313897d71f8d5a0184fbe679"
-  integrity sha512-hlSTWGS1t6/xq5YCed7YALg7tKZL3rkl7UwEZ/eCIkn8JxmM6fU6Qs/1hwtjQqfuYxlffuUcgYEm0f5xP4YKaA==
-  dependencies:
-    ensure-posix-path "^1.0.1"
-
-amd-name-resolver@^1.3.1:
+amd-name-resolver@1.2.0, amd-name-resolver@^1.3.1, "amd-name-resolver@https://github.com/ember-cli/amd-name-resolver.git":
   version "1.3.1"
   resolved "https://github.com/ember-cli/amd-name-resolver.git#f471c372fb21ec5b795e414cc95f04b80ae53351"
   dependencies:
