Remove all usages of legacy global logger

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

src/renderer/frames/root-frame/init-root-frame.injectable.ts

@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import ipcRendererInjectable from "../../utils/channel/ipc-renderer.injectable";
+import bindProtocolAddRouteHandlersInjectable from "../../protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable";
+import lensProtocolRouterRendererInjectable from "../../protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable";
+import catalogEntityRegistryInjectable from "../../api/catalog/entity/registry.injectable";
+import registerIpcListenersInjectable from "../../ipc/register-ipc-listeners.injectable";
+import loadExtensionsInjectable from "../load-extensions.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
+import { delay } from "../../../common/utils";
+import { broadcastMessage } from "../../../common/ipc";
+import { bundledExtensionsLoaded } from "../../../common/ipc/extension-handling";
+
+const initRootFrameInjectable = getInjectable({
+  id: "init-root-frame",
+  instantiate: (di) => {
+    const loadExtensions = di.inject(loadExtensionsInjectable);
+    const registerIpcListeners = di.inject(registerIpcListenersInjectable);
+    const ipcRenderer = di.inject(ipcRendererInjectable);
+    const bindProtocolAddRouteHandlers = di.inject(bindProtocolAddRouteHandlersInjectable);
+    const lensProtocolRouterRenderer = di.inject(lensProtocolRouterRendererInjectable);
+    const catalogEntityRegistry = di.inject(catalogEntityRegistryInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return async (unmountRoot: () => void) => {
+      catalogEntityRegistry.init();
+
+      try {
+        // maximum time to let bundled extensions finish loading
+        const timeout = delay(10000);
+
+        const loadingExtensions = await loadExtensions();
+
+        const loadingBundledExtensions = loadingExtensions
+          .filter((e) => e.isBundled)
+          .map((e) => e.loaded);
+
+        const bundledExtensionsFinished = Promise.all(loadingBundledExtensions);
+
+        await Promise.race([bundledExtensionsFinished, timeout]);
+      } finally {
+        ipcRenderer.send(bundledExtensionsLoaded);
+      }
+
+      lensProtocolRouterRenderer.init();
+
+      bindProtocolAddRouteHandlers();
+
+      window.addEventListener("offline", () =>
+        broadcastMessage("network:offline"),
+      );
+
+      window.addEventListener("online", () => broadcastMessage("network:online"));
+
+      registerIpcListeners();
+
+      window.addEventListener("beforeunload", () => {
+        logger.info("[ROOT-FRAME]: Unload app");
+
+        unmountRoot();
+      });
+    };
+  },
+});
+
+export default initRootFrameInjectable;

src/renderer/frames/root-frame/init-root-frame/init-root-frame.injectable.ts

@@ -1,26 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { initRootFrame } from "./init-root-frame";
-import ipcRendererInjectable from "../../../utils/channel/ipc-renderer.injectable";
-import bindProtocolAddRouteHandlersInjectable from "../../../protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable";
-import lensProtocolRouterRendererInjectable from "../../../protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable";
-import catalogEntityRegistryInjectable from "../../../api/catalog/entity/registry.injectable";
-import registerIpcListenersInjectable from "../../../ipc/register-ipc-listeners.injectable";
-import loadExtensionsInjectable from "../../load-extensions.injectable";
-
-const initRootFrameInjectable = getInjectable({
-  id: "init-root-frame",
-  instantiate: (di) => initRootFrame({
-    loadExtensions: di.inject(loadExtensionsInjectable),
-    registerIpcListeners: di.inject(registerIpcListenersInjectable),
-    ipcRenderer: di.inject(ipcRendererInjectable),
-    bindProtocolAddRouteHandlers: di.inject(bindProtocolAddRouteHandlersInjectable),
-    lensProtocolRouterRenderer: di.inject(lensProtocolRouterRendererInjectable),
-    catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable),
-  }),
-});
-
-export default initRootFrameInjectable;

src/renderer/frames/root-frame/init-root-frame/init-root-frame.ts

@@ -1,75 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { delay } from "../../../../common/utils";
-import { broadcastMessage } from "../../../../common/ipc";
-import logger from "../../../../common/logger";
-import type { ExtensionLoading } from "../../../../extensions/extension-loader";
-import type { CatalogEntityRegistry } from "../../../api/catalog/entity/registry";
-import { bundledExtensionsLoaded } from "../../../../common/ipc/extension-handling";
-
-
-interface Dependencies {
-  loadExtensions: () => Promise<ExtensionLoading[]>;
-
-  registerIpcListeners: () => void;
-
-  // TODO: Move usages of third party library behind abstraction
-  ipcRenderer: { send: (name: string) => void };
-
-  // TODO: Remove dependencies being here only for correct timing of initialization
-  bindProtocolAddRouteHandlers: () => void;
-  lensProtocolRouterRenderer: { init: () => void };
-  catalogEntityRegistry: CatalogEntityRegistry;
-}
-
-const logPrefix = "[ROOT-FRAME]:";
-
-export const initRootFrame =
-  ({
-    loadExtensions,
-    bindProtocolAddRouteHandlers,
-    lensProtocolRouterRenderer,
-    ipcRenderer,
-    registerIpcListeners,
-    catalogEntityRegistry,
-  }: Dependencies) =>
-    async (unmountRoot: () => void) => {
-      catalogEntityRegistry.init();
-
-      try {
-      // maximum time to let bundled extensions finish loading
-        const timeout = delay(10000);
-
-        const loadingExtensions = await loadExtensions();
-
-        const loadingBundledExtensions = loadingExtensions
-          .filter((e) => e.isBundled)
-          .map((e) => e.loaded);
-
-        const bundledExtensionsFinished = Promise.all(loadingBundledExtensions);
-
-        await Promise.race([bundledExtensionsFinished, timeout]);
-      } finally {
-        ipcRenderer.send(bundledExtensionsLoaded);
-      }
-
-      lensProtocolRouterRenderer.init();
-
-      bindProtocolAddRouteHandlers();
-
-      window.addEventListener("offline", () =>
-        broadcastMessage("network:offline"),
-      );
-
-      window.addEventListener("online", () => broadcastMessage("network:online"));
-
-      registerIpcListeners();
-
-      window.addEventListener("beforeunload", () => {
-        logger.info(`${logPrefix} Unload app`);
-
-        unmountRoot();
-      });
-    };