Update injectable library (#4842)

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

src/renderer/components/+catalog/__tests__/custom-columns.test.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { ConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable";
+import type { DiContainer } from "@ogre-tools/injectable";
 import { computed } from "mobx";
 import type { CatalogCategorySpec } from "../../../../common/catalog";
 import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
@@ -35,7 +35,7 @@ class TestCategory extends CatalogCategory {
 }
 
 describe("Custom Category Columns", () => {
-  let di: ConfigurableDependencyInjectionContainer;
+  let di: DiContainer;
 
   beforeEach(() => {
     di = getDiForUnitTesting();

src/renderer/components/+catalog/__tests__/custom-views.test.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { ConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable";
+import type { DiContainer } from "@ogre-tools/injectable";
 import { computed } from "mobx";
 import type React from "react";
 import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
@@ -13,7 +13,7 @@ import type { CustomCategoryViewRegistration } from "../custom-views";
 import customCategoryViewsInjectable from "../custom-views.injectable";
 
 describe("Custom Category Views", () => {
-  let di: ConfigurableDependencyInjectionContainer;
+  let di: DiContainer;
 
   beforeEach(() => {
     di = getDiForUnitTesting();

src/renderer/components/+catalog/catalog-entity-store/catalog-entity-store.injectable.ts

@@ -2,16 +2,16 @@
  * 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 { CatalogEntityStore } from "./catalog-entity.store";
 import catalogEntityRegistryInjectable from "../../../api/catalog-entity-registry/catalog-entity-registry.injectable";
 
 const catalogEntityStoreInjectable = getInjectable({
+  id: "catalog-entity-store",
+
   instantiate: (di) => new CatalogEntityStore({
     registry: di.inject(catalogEntityRegistryInjectable),
   }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default catalogEntityStoreInjectable;

src/renderer/components/+catalog/catalog-previous-active-tab-storage/catalog-previous-active-tab-storage.injectable.ts

@@ -2,11 +2,13 @@
  * 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 { browseCatalogTab } from "../../../../common/routes";
 import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable";
 
 const catalogPreviousActiveTabStorageInjectable = getInjectable({
+  id: "catalog-previous-active-tab-storage",
+
   instantiate: (di) => {
     const createStorage = di.inject(createStorageInjectable);
 
@@ -15,8 +17,6 @@ const catalogPreviousActiveTabStorageInjectable = getInjectable({
       browseCatalogTab,
     );
   },
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default catalogPreviousActiveTabStorageInjectable;

src/renderer/components/+catalog/catalog.test.tsx

@@ -14,7 +14,7 @@ import { CatalogEntityRegistry } from "../../api/catalog-entity-registry";
 import { CatalogEntityDetailRegistry } from "../../../extensions/registries";
 import type { CatalogEntityStore } from "./catalog-entity-store/catalog-entity.store";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";
-import type { DependencyInjectionContainer } from "@ogre-tools/injectable";
+import type { DiContainer } from "@ogre-tools/injectable";
 import catalogEntityStoreInjectable from "./catalog-entity-store/catalog-entity-store.injectable";
 import catalogEntityRegistryInjectable
   from "../../api/catalog-entity-registry/catalog-entity-registry.injectable";
@@ -95,7 +95,7 @@ describe("<Catalog />", () => {
     }, onRun);
   }
 
-  let di: DependencyInjectionContainer;
+  let di: DiContainer;
   let catalogEntityStore: CatalogEntityStore;
   let catalogEntityRegistry: CatalogEntityRegistry;
   let render: DiRender;

src/renderer/components/+catalog/custom-category-columns.injectable.tsx

@@ -2,7 +2,7 @@
  * 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 { computed, IComputedValue } from "mobx";
 import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
 import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable";
@@ -45,10 +45,11 @@ function getAdditionCategoryColumns({ extensions }: Dependencies): IComputedValu
 }
 
 const categoryColumnsInjectable = getInjectable({
+  id: "category-columns",
+
   instantiate: (di) => getAdditionCategoryColumns({
     extensions: di.inject(rendererExtensionsInjectable),
   }),
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default categoryColumnsInjectable;

src/renderer/components/+catalog/custom-views.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 { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { orderBy } from "lodash";
 import { computed, IComputedValue } from "mobx";
 import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
@@ -49,10 +49,11 @@ function getCustomCategoryViews({ extensions }: Dependencies): IComputedValue<Ma
 }
 
 const customCategoryViewsInjectable = getInjectable({
+  id: "custom-category-views",
+
   instantiate: (di) => getCustomCategoryViews({
     extensions: di.inject(rendererExtensionsInjectable),
   }),
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default customCategoryViewsInjectable;

src/renderer/components/+catalog/get-category-columns.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 { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { orderBy } from "lodash";
 import type { IComputedValue } from "mobx";
 import type { CatalogCategory, CatalogEntity } from "../../../common/catalog";
@@ -85,11 +85,11 @@ const getCategoryColumns = ({ extensionColumns }: Dependencies) => ({ activeCate
 };
 
 const getCategoryColumnsInjectable = getInjectable({
+  id: "get-category-columns",
+
   instantiate: (di) => getCategoryColumns({
     extensionColumns: di.inject(categoryColumnsInjectable),
   }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default getCategoryColumnsInjectable;