Update injectable library (#4842)

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

src/common/app-paths/app-path-injection-token.ts

@@ -8,7 +8,7 @@ import { createChannel } from "../ipc-channel/create-channel/create-channel";
 
 export type AppPaths = Record<PathName, string>;
 
-export const appPathsInjectionToken = getInjectionToken<AppPaths>();
+export const appPathsInjectionToken = getInjectionToken<AppPaths>({ id: "app-paths-token" });
 
 export const appPathsIpcChannel = createChannel<AppPaths>("app-paths");
 

src/common/app-paths/app-paths.test.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 type { DependencyInjectionContainer } from "@ogre-tools/injectable";
+import type { DiContainer } from "@ogre-tools/injectable";
 import { AppPaths, appPathsInjectionToken } from "./app-path-injection-token";
 import getElectronAppPathInjectable from "../../main/app-paths/get-electron-app-path/get-electron-app-path.injectable";
 import { getDisForUnitTesting } from "../../test-utils/get-dis-for-unit-testing";
@@ -13,8 +13,8 @@ import directoryForIntegrationTestingInjectable from "../../main/app-paths/direc
 import path from "path";
 
 describe("app-paths", () => {
-  let mainDi: DependencyInjectionContainer;
-  let rendererDi: DependencyInjectionContainer;
+  let mainDi: DiContainer;
+  let rendererDi: DiContainer;
   let runSetups: () => Promise<void[]>;
 
   beforeEach(() => {

src/common/app-paths/directory-for-binaries/directory-for-binaries.injectable.ts

@@ -2,15 +2,15 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import path from "path";
 import directoryForUserDataInjectable from "../directory-for-user-data/directory-for-user-data.injectable";
 
 const directoryForBinariesInjectable = getInjectable({
+  id: "directory-for-binaries",
+
   instantiate: (di) =>
     path.join(di.inject(directoryForUserDataInjectable), "binaries"),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default directoryForBinariesInjectable;

src/common/app-paths/directory-for-downloads/directory-for-downloads.injectable.ts

@@ -2,12 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { appPathsInjectionToken } from "../app-path-injection-token";
 
 const directoryForDownloadsInjectable = getInjectable({
+  id: "directory-for-downloads",
   instantiate: (di) => di.inject(appPathsInjectionToken).downloads,
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default directoryForDownloadsInjectable;

src/common/app-paths/directory-for-exes/directory-for-exes.injectable.ts

@@ -2,12 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { appPathsInjectionToken } from "../app-path-injection-token";
 
 const directoryForExesInjectable = getInjectable({
+  id: "directory-for-exes",
   instantiate: (di) => di.inject(appPathsInjectionToken).exe,
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default directoryForExesInjectable;

src/common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable.ts

@@ -2,15 +2,15 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import directoryForUserDataInjectable from "../directory-for-user-data/directory-for-user-data.injectable";
 import path from "path";
 
 const directoryForKubeConfigsInjectable = getInjectable({
+  id: "directory-for-kube-configs",
+
   instantiate: (di) =>
     path.resolve(di.inject(directoryForUserDataInjectable), "kubeconfigs"),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default directoryForKubeConfigsInjectable;

src/common/app-paths/directory-for-temp/directory-for-temp.injectable.ts

@@ -2,12 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { appPathsInjectionToken } from "../app-path-injection-token";
 
 const directoryForTempInjectable = getInjectable({
+  id: "directory-for-temp",
   instantiate: (di) => di.inject(appPathsInjectionToken).temp,
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default directoryForTempInjectable;

src/common/app-paths/directory-for-user-data/directory-for-user-data.injectable.ts

@@ -2,12 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { appPathsInjectionToken } from "../app-path-injection-token";
 
 const directoryForUserDataInjectable = getInjectable({
+  id: "directory-for-user-data",
   instantiate: (di) => di.inject(appPathsInjectionToken).userData,
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default directoryForUserDataInjectable;

src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable.ts

@@ -2,21 +2,21 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import path from "path";
 import directoryForKubeConfigsInjectable from "../directory-for-kube-configs/directory-for-kube-configs.injectable";
 
 const getCustomKubeConfigDirectoryInjectable = getInjectable({
+  id: "get-custom-kube-config-directory",
+
   instantiate: (di) => (directoryName: string) => {
     const directoryForKubeConfigs = di.inject(directoryForKubeConfigsInjectable);
-    
+
     return path.resolve(
       directoryForKubeConfigs,
       directoryName,
     );
   },
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default getCustomKubeConfigDirectoryInjectable;