ember_debug: remove import Ember from js code

Author: BlueCutOfficial

ember_debug/adapters/web-extension.js

@@ -1,7 +1,7 @@
 import BasicAdapter from './basic';
 import { typeOf } from 'ember-debug/utils/type-check';
 
-import Ember from 'ember-debug/utils/ember';
+import { getEnv } from 'ember-debug/utils/ember';
 import { run } from 'ember-debug/utils/ember/runloop';
 
 const { isArray } = Array;
@@ -106,7 +106,7 @@ export default class extends BasicAdapter {
 // adapter later. See GH #1114.
 const HAS_ARRAY_PROTOTYPE_EXTENSIONS = (() => {
   try {
-    return Ember.ENV.EXTEND_PROTOTYPES.Array === true;
+    return getEnv().EXTEND_PROTOTYPES.Array === true;
   } catch {
     return false;
   }

ember_debug/general-debug.js

@@ -1,7 +1,7 @@
 /* eslint no-empty:0 */
 import DebugPort from './debug-port';
 
-import Ember from 'ember-debug/utils/ember';
+import { libraries } from 'ember-debug/utils/ember';
 
 /**
  * Class that handles gathering general information of the inspected app.
@@ -88,7 +88,7 @@ export default class extends DebugPort {
        */
       getLibraries() {
         this.sendMessage('libraries', {
-          libraries: Ember.libraries?._registry,
+          libraries: libraries?._registry,
         });
       },
 

ember_debug/models/profile-manager.js

@@ -1,5 +1,5 @@
 import ProfileNode from './profile-node';
-import Ember from 'ember-debug/utils/ember';
+import { VERSION } from 'ember-debug/utils/ember';
 import { compareVersion } from 'ember-debug/utils/version';
 
 import { later, scheduleOnce, cancel } from 'ember-debug/utils/ember/runloop';
@@ -75,8 +75,7 @@ export default class ProfileManager {
     this.stylesheet = insertStylesheet();
     // keep track of all the active highlights
     this.highlights = [];
-    // eslint-disable-next-line ember/new-module-imports
-    this.isHighlightEnabled = compareVersion(Ember?.VERSION, '3.20.0') !== -1;
+    this.isHighlightEnabled = compareVersion(VERSION, '3.20.0') !== -1;
   }
 
   began(timestamp, payload, now) {

ember_debug/utils/ember.js

@@ -63,14 +63,22 @@ let EmberDestroyable = emberSafeRequire('@ember/destroyable');
 let ObjectInternals = emberSafeRequire('@ember/object/internals');
 let Instrumentation = emberSafeRequire('@ember/instrumentation');
 let Runloop = emberSafeRequire('@ember/runloop');
+
 let RSVP = emberSafeRequire('rsvp');
+
 let GlimmerComponent = emberSafeRequire('@glimmer/component');
 let GlimmerManager = emberSafeRequire('@glimmer/manager');
 let GlimmerReference = emberSafeRequire('@glimmer/reference');
 let GlimmerRuntime = emberSafeRequire('@glimmer/runtime');
 let GlimmerUtil = emberSafeRequire('@glimmer/util');
 let GlimmerValidator = emberSafeRequire('@glimmer/validator');
 
+let inspect = Debug?.inspect || InternalsUtils?.inspect;
+let subscribe = Instrumentation?.subscribe;
+let cacheFor = ObjectInternals?.cacheFor;
+let guidFor = ObjectInternals?.guidFor;
+let libraries = InternalsMetal?.libraries;
+
 if (Ember) {
   captureRenderTree = Ember._captureRenderTree;
   getEnv = () => Ember.ENV;
@@ -96,6 +104,15 @@ if (Ember) {
   set = Ember.set;
   computed = Ember.computed;
   ActionHandler = Ember.ActionHandler;
+  Debug = Debug ?? Ember.Debug;
+  inspect = inspect ?? Ember.inspect;
+  Instrumentation = Instrumentation ?? Ember.Instrumentation;
+  subscribe = subscribe ?? Ember.subscribe;
+  RSVP = RSVP ?? Ember.RSVP;
+  Runloop = Runloop ?? Ember.run;
+  cacheFor = cacheFor ?? Ember.cacheFor;
+  guidFor = guidFor ?? Ember.guidFor;
+  libraries = libraries ?? Ember.libraries;
 } else {
   captureRenderTree = emberSafeRequire('@ember/debug')?.captureRenderTree;
   getEnv = emberSafeRequire('@ember/-internals/environment')?.getENV;
@@ -160,6 +177,11 @@ export {
   set,
   captureRenderTree,
   getEnv,
+  inspect,
+  subscribe,
+  cacheFor,
+  guidFor,
+  libraries,
   GlimmerComponent,
   GlimmerManager,
   GlimmerReference,

ember_debug/utils/ember/debug.js

@@ -1,21 +1,5 @@
-import Ember, { Debug, InternalsUtils } from '../ember';
+import { Debug, inspect as emberInspect } from '../ember';
 
-let module;
-export let inspect;
-
-if (Debug) {
-  module = Debug;
-  inspect = Debug.inspect || InternalsUtils.inspect;
-} else {
-  module = Ember.Debug;
-  // eslint-disable-next-line ember/new-module-imports
-  inspect = Ember.inspect;
-}
-
-if (!inspect) {
-  // eslint-disable-next-line ember/new-module-imports
-  inspect = Ember.inspect;
-}
-
-export let { registerDeprecationHandler } = module;
-export default module;
+export let inspect = emberInspect;
+export let { registerDeprecationHandler } = Debug;
+export default Debug;

ember_debug/utils/ember/instrumentation.js

@@ -1,11 +1,3 @@
-import Ember, { Instrumentation } from '../ember';
+import { subscribe as emberSubscribe } from '../ember';
 
-let module;
-
-if (Instrumentation) {
-  module = Instrumentation;
-} else {
-  module = Ember;
-}
-
-export let { subscribe } = module;
+export let subscribe = emberSubscribe;

ember_debug/utils/ember/object/internals.js

@@ -1,9 +1,4 @@
-import Ember, { ObjectInternals } from '../../ember';
-
-// eslint-disable-next-line ember/new-module-imports
-let cacheFor = ObjectInternals?.cacheFor ?? Ember.cacheFor;
-// eslint-disable-next-line ember/new-module-imports
-let emberGuidFor = ObjectInternals?.guidFor ?? Ember.guidFor;
+import { cacheFor, guidFor as emberGuidFor } from '../../ember';
 
 // it can happen that different ember apps/iframes have the same id for different objects
 // since the implementation is just a counter, so we add a prefix per iframe & app

ember_debug/utils/ember/runloop.js

@@ -1,4 +1,4 @@
-import Ember, { Runloop as EmberRunloop } from '../ember';
+import { Runloop as EmberRunloop } from '../ember';
 import * as runloop from './own-runloop';
 
 // it could happen that runloop is available but _backburner is not exported (dead code)
@@ -8,15 +8,9 @@ let _backburner = runloop._backburner;
 
 const keys = ['cancel', 'debounce', 'join', 'later', 'scheduleOnce'];
 
-if (EmberRunloop) {
-  module = EmberRunloop;
-  _backburner = EmberRunloop._backburner || EmberRunloop.backburner;
-} else {
-  // eslint-disable-next-line ember/new-module-imports
-  module = Ember?.run || module;
-  // eslint-disable-next-line ember/new-module-imports
-  _backburner = Ember?.run?.backburner || _backburner;
-}
+module = EmberRunloop;
+_backburner =
+  EmberRunloop._backburner || EmberRunloop.backburner || _backburner;
 
 if (!keys.every((k) => k in module)) {
   module = runloop;

ember_debug/utils/rsvp.js

@@ -1,14 +1,5 @@
-import Ember, { RSVP as emberRSVP } from './ember';
+import { RSVP as emberRSVP } from './ember';
 
-let module;
+export let { Promise, all, resolve } = emberRSVP;
 
-if (emberRSVP) {
-  module = emberRSVP;
-} else {
-  // eslint-disable-next-line ember/new-module-imports
-  module = Ember.RSVP;
-}
-
-export let { Promise, all, resolve } = module;
-
-export default module;
+export default emberRSVP;