Skip to content

Commit f39da01

Browse files
in render-tree, ember/destroyable is now imported from utils/ember
1 parent 1d17983 commit f39da01

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

ember_debug/libs/render-tree.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import captureRenderTree from './capture-render-tree';
22
import { guidFor } from 'ember-debug/utils/ember/object/internals';
3-
import { emberSafeRequire } from 'ember-debug/utils/ember';
43
import { inspect } from 'ember-debug/utils/type-check';
54
import { isInVersionSpecifier } from 'ember-debug/utils/version';
65
import {
76
VERSION,
7+
EmberDestroyable,
88
GlimmerManager,
99
GlimmerReference,
1010
GlimmerRuntime,
@@ -30,10 +30,7 @@ class InElementSupportProvider {
3030
}
3131

3232
this.DESTROY = GlimmerUtil?.DESTROY;
33-
this.registerDestructor =
34-
emberSafeRequire('@glimmer/destroyable')?.registerDestructor ||
35-
emberSafeRequire('@ember/destroyable')?.registerDestructor ||
36-
emberSafeRequire('@ember/runtime')?.registerDestructor;
33+
this.registerDestructor = EmberDestroyable?.registerDestructor;
3734

3835
this.debugRenderTree =
3936
owner.lookup('renderer:-dom')?.debugRenderTree ||

ember_debug/utils/ember.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ let getEnv = () => Ember.ENV;
5757

5858
let Debug = emberSafeRequire('@ember/debug');
5959
let InternalsUtils = emberSafeRequire('@ember/-internals/utils');
60+
let EmberDestroyable = emberSafeRequire('@ember/destroyable');
6061
let ObjectInternals = emberSafeRequire('@ember/object/internals');
6162
let Instrumentation = emberSafeRequire('@ember/instrumentation');
6263
let Runloop = emberSafeRequire('@ember/runloop');
@@ -117,6 +118,7 @@ export {
117118
Evented,
118119
Service,
119120
PromiseProxyMixin,
121+
EmberDestroyable,
120122
EmberObject,
121123
VERSION,
122124
ComputedProperty,

0 commit comments

Comments
 (0)