File tree Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Original file line number Diff line number Diff line change 11import { compareVersion } from 'ember-debug/utils/version' ;
2- import { emberSafeRequire } from 'ember-debug/utils/ember' ;
32import {
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
3536if ( 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
4241try {
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' ) ;
Original file line number Diff line number Diff line change @@ -57,7 +57,9 @@ let getEnv = () => Ember.ENV;
5757
5858let Debug = emberSafeRequire ( '@ember/debug' ) ;
5959let InternalsMetal = emberSafeRequire ( '@ember/-internals/metal' ) ;
60+ let InternalsRuntime = emberSafeRequire ( '@ember/-internals/runtime' ) ;
6061let InternalsUtils = emberSafeRequire ( '@ember/-internals/utils' ) ;
62+ let InternalsViews = emberSafeRequire ( '@ember/-internals/views' ) ;
6163let EmberDestroyable = emberSafeRequire ( '@ember/destroyable' ) ;
6264let ObjectInternals = emberSafeRequire ( '@ember/object/internals' ) ;
6365let 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 ,
You can’t perform that action at this time.
0 commit comments