fix accessing Ember version during boot

Author: mansona

ember_debug/lib/send-version-miss.js

@@ -1,4 +1,3 @@
-/* eslint-disable ember/new-module-imports */
 let channel = new MessageChannel();
 let port = channel.port1;
 window.postMessage('debugger-client', '*', [channel.port2]);
@@ -12,7 +11,7 @@ let registeredMiss = false;
  * It sends a message to the inspector app to redirect
  * to an inspector version that supports this Ember version.
  */
-export default function sendVersionMiss(Ember) {
+export default function sendVersionMiss(VERSION) {
   if (registeredMiss) {
     return;
   }
@@ -32,7 +31,7 @@ export default function sendVersionMiss(Ember) {
   function sendVersionMismatch() {
     port.postMessage({
       name: 'version-mismatch',
-      version: Ember.VERSION,
+      version: VERSION,
       from: 'inspectedWindow',
     });
   }

ember_debug/lib/start-inspector.js

@@ -6,7 +6,7 @@ import getApplications from './get-applications';
 import bootEmberInspector from './boot-ember-inspector';
 import setupInstanceInitializer from './setup-instance-initializer';
 import sendVersionMiss from './send-version-miss';
-import { guidFor, Application } from '../utils/ember';
+import { guidFor, Application, VERSION } from '../utils/ember';
 
 function onReady(callback) {
   if (
@@ -136,7 +136,7 @@ export function startInspector(adapter) {
      * we can't continue (we need the version to know what version of
      * the Inspector to load).
      */
-    if (!globalThis.Ember && !globalThis.emberInspectorApps) {
+    if (!VERSION) {
       return;
     }
 
@@ -146,13 +146,9 @@ export function startInspector(adapter) {
      * The code fits the Inspector supporting Ember back to 3.16: any version
      * before 3.16 is necessarily a classic Ember app with Ember defined.
      */
-    if (
-      globalThis.Ember &&
-      globalThis.Ember.VERSION &&
-      !versionTest(globalThis.Ember.VERSION, EMBER_VERSIONS_SUPPORTED)
-    ) {
+    if ((VERSION, !versionTest(VERSION, EMBER_VERSIONS_SUPPORTED))) {
       // Wrong inspector version. Redirect to the correct version.
-      sendVersionMiss(globalThis.Ember);
+      sendVersionMiss(VERSION);
       return;
     }
 

tests/integration/injection-test.js

@@ -162,65 +162,6 @@ class ChromeApi {
   }
 }
 
-let loaderInstance = {};
-function getLoader(def, req) {
-  let { define, requireModule } = loaderInstance;
-  if (typeof define !== 'function' || typeof requireModule !== 'function') {
-    (function () {
-      let registry = {},
-        seen = {};
-
-      define = function (name, deps, callback) {
-        if (arguments.length < 3) {
-          callback = deps;
-          deps = [];
-        }
-        registry[name] = { deps, callback };
-      };
-
-      requireModule = function (name) {
-        if (!name.startsWith('ember-debug')) {
-          return req(name);
-        }
-        if (seen[name]) {
-          return seen[name];
-        }
-
-        let mod = registry[name];
-        if (!mod) {
-          throw new Error(`Module: '${name}' not found.`);
-        }
-
-        seen[name] = {};
-
-        let deps = mod.deps;
-        let callback = mod.callback;
-        let reified = [];
-        let exports;
-
-        for (let i = 0, l = deps.length; i < l; i++) {
-          if (deps[i] === 'exports') {
-            reified.push((exports = {}));
-          } else {
-            reified.push(requireModule(deps[i]));
-          }
-        }
-
-        let value = callback.apply(this, reified);
-        seen[name] = exports || value;
-        return seen[name];
-      };
-
-      requireModule.has = req.has;
-
-      define.registry = registry;
-      define.seen = seen;
-    })();
-  }
-  loaderInstance = { define, requireModule };
-  return loaderInstance;
-}
-
 module('Integration | Injection', function (hooks) {
   setupApplicationTest(hooks);
 
@@ -250,14 +191,6 @@ module('Integration | Injection', function (hooks) {
 
     let windowMessages = 0;
 
-    // setup global loader for ember-debug, will be reset after test
-
-    const { define, requireModule } = getLoader(
-      window.define,
-      window.requireModule,
-    );
-    window.define = define;
-    window.requireModule = requireModule;
     {
       // eslint-disable-next-line no-unused-vars
       const chrome = contentChromeApi;