Make bundled loaded IPC injectable

Signed-off-by: Sebastian Malton <sebastian@malton.name>

packages/core/src/main/getDiForUnitTesting.ts

@@ -23,7 +23,6 @@ import broadcastMessageInjectable from "../common/ipc/broadcast-message.injectab
 import electronQuitAndInstallUpdateInjectable from "./electron-app/features/electron-quit-and-install-update.injectable";
 import electronUpdaterIsActiveInjectable from "./electron-app/features/electron-updater-is-active.injectable";
 import setUpdateOnQuitInjectable from "./electron-app/features/set-update-on-quit.injectable";
-import waitUntilBundledExtensionsAreLoadedInjectable from "./start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable";
 import electronInjectable from "./utils/resolve-system-proxy/electron.injectable";
 import initializeClusterManagerInjectable from "./cluster/initialize-manager.injectable";
 import type { GlobalOverride } from "../common/test-utils/get-global-override";
@@ -58,7 +57,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
     }
 
     di.override(electronInjectable, () => ({}));
-    di.override(waitUntilBundledExtensionsAreLoadedInjectable, () => async () => {});
 
     overrideRunnablesHavingSideEffects(di);
     overrideElectronFeatures(di);

packages/core/src/main/start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable.ts

@@ -3,27 +3,20 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import ipcMainInjectionToken from "../../../../common/ipc/ipc-main-injection-token";
-import { bundledExtensionsLoaded } from "../../../../common/ipc/extension-handling";
 import { delay } from "../../../../common/utils";
+import waitForBundledExtensionsToBeLoadedInjectable from "../../../../features/extensions/loader/main/wait-for-bundled-loaded.injectable";
 
 const waitUntilBundledExtensionsAreLoadedInjectable = getInjectable({
   id: "wait-until-bundled-extensions-are-loaded",
 
   instantiate: (di) => {
-    const ipcMain = di.inject(ipcMainInjectionToken);
+    const waitForBundledExtensionsToBeLoaded = di.inject(waitForBundledExtensionsToBeLoadedInjectable);
 
     return async () => {
-      const viewHasLoaded = new Promise<void>((resolve) => {
-        ipcMain.once(bundledExtensionsLoaded, () => resolve());
-      });
-
-      await viewHasLoaded;
+      await waitForBundledExtensionsToBeLoaded();
       await delay(50); // wait just a bit longer to let the first round of rendering happen
     };
   },
-
-  causesSideEffects: true,
 });
 
 export default waitUntilBundledExtensionsAreLoadedInjectable;