Skip to content

Commit 4ec3e56

Browse files
in ember-object-names, ember/-internal/{runtime,views} are now imported from utils/ember
1 parent ec94aec commit 4ec3e56

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

ember_debug/utils/ember-object-names.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { compareVersion } from 'ember-debug/utils/version';
2-
import { emberSafeRequire } from 'ember-debug/utils/ember';
32
import {
43
VERSION,
54
ActionHandler,
@@ -10,6 +9,8 @@ import {
109
MutableArray,
1110
Component,
1211
Evented,
12+
InternalsRuntime,
13+
InternalsViews,
1314
PromiseProxyMixin,
1415
EmberObject,
1516
Observable,
@@ -33,14 +34,12 @@ const emberNames = new Map([
3334
]);
3435

3536
if (compareVersion(VERSION, '3.27.0') === -1) {
36-
const TargetActionSupport = emberSafeRequire(
37-
'@ember/-internals/runtime',
38-
)?.TargetActionSupport;
37+
const TargetActionSupport = InternalsRuntime?.TargetActionSupport;
3938
emberNames.set(TargetActionSupport, 'TargetActionSupport Mixin');
4039
}
4140

4241
try {
43-
const Views = emberSafeRequire('@ember/-internals/views') || {};
42+
const Views = InternalsViews || {};
4443
emberNames.set(Views.ViewStateSupport, 'ViewStateSupport Mixin');
4544
emberNames.set(Views.ViewMixin, 'View Mixin');
4645
emberNames.set(Views.ActionSupport, 'ActionSupport Mixin');

ember_debug/utils/ember.js

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

5858
let Debug = emberSafeRequire('@ember/debug');
5959
let InternalsMetal = emberSafeRequire('@ember/-internals/metal');
60+
let InternalsRuntime = emberSafeRequire('@ember/-internals/runtime');
6061
let InternalsUtils = emberSafeRequire('@ember/-internals/utils');
62+
let InternalsViews = emberSafeRequire('@ember/-internals/views');
6163
let EmberDestroyable = emberSafeRequire('@ember/destroyable');
6264
let ObjectInternals = emberSafeRequire('@ember/object/internals');
6365
let Instrumentation = emberSafeRequire('@ember/instrumentation');
@@ -103,7 +105,9 @@ export {
103105
Runloop,
104106
Debug,
105107
InternalsMetal,
108+
InternalsRuntime,
106109
InternalsUtils,
110+
InternalsViews,
107111
ObjectInternals,
108112
Instrumentation,
109113
RSVP,

0 commit comments

Comments
 (0)