Adapt merge conflicts

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

packages/core/src/main/start-main-application/runnable-tokens/phases.ts

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { Runnable, RunnableSync } from "@k8slens/run-many";
+
+export const beforeQuitOfFrontEndInjectionToken = getInjectionToken<RunnableSync>({
+  id: "before-quit-of-front-end",
+});
+
+export const beforeQuitOfBackEndInjectionToken = getInjectionToken<RunnableSync>({
+  id: "before-quit-of-back-end",
+});
+
+export const afterWindowIsOpenedInjectionToken = getInjectionToken<Runnable>({
+  id: "after-window-is-opened",
+});
+
+export const afterRootFrameIsReadyInjectionToken = getInjectionToken<Runnable>({
+  id: "after-root-frame-is-ready",
+});

packages/core/src/main/tray/menu-icon/start-reactivity.injectable.ts

@@ -14,7 +14,6 @@ const startReactiveTrayMenuIconInjectable = getInjectable({
     const reactiveTrayMenuIcon = di.inject(reactiveTrayMenuIconInjectable);
 
     return {
-      id: "start-reactive-tray-menu-icon",
       run: () => {
         reactiveTrayMenuIcon.start();
       },

packages/core/src/renderer/bootstrap.global-override-for-injectable.ts

@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getGlobalOverride } from "../common/test-utils/get-global-override";
+import { getGlobalOverride } from "@k8slens/test-utils";
 import bootstrapInjectable from "./bootstrap.injectable";
 
 export default getGlobalOverride(bootstrapInjectable, () => ({

packages/core/src/renderer/bootstrap.injectable.ts

@@ -17,7 +17,7 @@ const bootstrapInjectable = getInjectable({
       await bootstrap(di);
     },
 
-    runAfter: di.inject(startFrameInjectable),
+    runAfter: startFrameInjectable,
   }),
 
   causesSideEffects: true,