fix loading race condition

Author: patricklx

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

@@ -238,8 +238,7 @@ module('Integration | Injection', function (hooks) {
     // check that we do not have any errors
     await new Promise((resolve, reject) => {
       window.addEventListener('error', reject);
-      // eslint-disable-next-line no-undef
-      chrome.runtime.onMessage.addListener((message) => {
+      contentChromeApi.runtime.onMessage.addListener((message) => {
         if (message?.type === 'inject-ember-debug') {
           setTimeout(resolve, 200);
         }