fix loading race condition (#2689)

Author: ef4

ember_debug/entrypoints/basic-debug.js

@@ -1,6 +1,10 @@
 import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
-import { onEmberReady, startInspector } from '../lib/start-inspector';
 
-import adapter from '../adapters/basic';
+loadEmberDebugInWebpage(async () => {
+  const { onEmberReady, startInspector } = await import(
+    '../lib/start-inspector'
+  );
 
-loadEmberDebugInWebpage(() => onEmberReady(startInspector(adapter)));
+  const adapter = (await import('../adapters/basic')).default;
+  onEmberReady(startInspector(adapter));
+});

ember_debug/entrypoints/bookmarklet-debug.js

@@ -1,6 +1,10 @@
 import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
-import { onEmberReady, startInspector } from '../lib/start-inspector';
 
-import adapter from '../adapters/bookmarklet';
+loadEmberDebugInWebpage(async () => {
+  const { onEmberReady, startInspector } = await import(
+    '../lib/start-inspector'
+  );
 
-loadEmberDebugInWebpage(() => onEmberReady(startInspector(adapter)));
+  const adapter = (await import('../adapters/bookmarklet.js')).default;
+  onEmberReady(startInspector(adapter));
+});

ember_debug/entrypoints/chrome-debug.js

@@ -1,6 +1,10 @@
 import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
-import { onEmberReady, startInspector } from '../lib/start-inspector';
 
-import adapter from '../adapters/chrome';
+loadEmberDebugInWebpage(async () => {
+  const { onEmberReady, startInspector } = await import(
+    '../lib/start-inspector'
+  );
 
-loadEmberDebugInWebpage(() => onEmberReady(startInspector(adapter)));
+  const adapter = (await import('../adapters/chrome.js')).default;
+  onEmberReady(startInspector(adapter));
+});

ember_debug/entrypoints/firefox-debug.js

@@ -1,6 +1,10 @@
 import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
-import { onEmberReady, startInspector } from '../lib/start-inspector';
 
-import adapter from '../adapters/firefox';
+loadEmberDebugInWebpage(async () => {
+  const { onEmberReady, startInspector } = await import(
+    '../lib/start-inspector'
+  );
 
-loadEmberDebugInWebpage(() => onEmberReady(startInspector(adapter)));
+  const adapter = (await import('../adapters/firefox.js')).default;
+  onEmberReady(startInspector(adapter));
+});

ember_debug/entrypoints/websocket-debug.js

@@ -1,6 +1,10 @@
 import loadEmberDebugInWebpage from '../lib/load-ember-debug-in-webpage';
-import { onEmberReady, startInspector } from '../lib/start-inspector';
 
-import adapter from '../adapters/websocket';
+loadEmberDebugInWebpage(async () => {
+  const { onEmberReady, startInspector } = await import(
+    '../lib/start-inspector'
+  );
 
-loadEmberDebugInWebpage(() => onEmberReady(startInspector(adapter)));
+  const adapter = (await import('../adapters/websocket.js')).default;
+  onEmberReady(startInspector(adapter));
+});

tests/integration/injection-test.js

@@ -171,11 +171,14 @@ module('Integration | Injection', function (hooks) {
   let contentChromeApi, inspectorChromeApi, backgroundChromeApi;
   const olddefine = window.define;
   const olddrequireModule = window.requireModule;
+  const oldEmber = window.Ember;
 
   let injected;
+  let EmberService = Service;
 
   async function inject(owner, assert) {
     if (injected) return;
+
     const backgroundScript = await (await fetch('/background.js')).text();
     {
       const chrome = backgroundChromeApi;
@@ -208,6 +211,14 @@ module('Integration | Injection', function (hooks) {
 
     window.chrome = inspectorChromeApi;
 
+    owner.register('service:port', class extends EmberService {});
+    owner.lookup('service:adapters/web-extension');
+    window.requireModule = null;
+    Object.defineProperty(window, 'Ember', {
+      value: null,
+      writable: true,
+    });
+
     const emberDebugStarted = new Promise((resolve) => {
       inspectorChromeApi.runtime.onMessage.addListener((msg) => {
         if (msg.type === 'general:applicationBooted') {
@@ -223,8 +234,21 @@ module('Integration | Injection', function (hooks) {
         }
       });
     });
-    owner.register('service:port', class extends Service {});
-    owner.lookup('service:adapters/web-extension');
+
+    // check that we do not have any errors
+    await new Promise((resolve, reject) => {
+      window.addEventListener('error', reject);
+      contentChromeApi.runtime.onMessage.addListener((message) => {
+        if (message?.type === 'inject-ember-debug') {
+          setTimeout(resolve, 200);
+        }
+      });
+    });
+
+    window.requireModule = olddrequireModule;
+    window.Ember = oldEmber;
+    window.dispatchEvent(new Event('Ember'));
+
     await p;
     await emberDebugStarted;
     injected = true;