Update injectable library (#4842)

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

src/renderer/components/+extensions/attempt-install-by-info/attempt-install-by-info.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 { attemptInstallByInfo } from "./attempt-install-by-info";
 import attemptInstallInjectable from "../attempt-install/attempt-install.injectable";
 import getBaseRegistryUrlInjectable from "../get-base-registry-url/get-base-registry-url.injectable";
@@ -10,14 +10,14 @@ import extensionInstallationStateStoreInjectable
   from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 
 const attemptInstallByInfoInjectable = getInjectable({
+  id: "attempt-install-by-info",
+
   instantiate: (di) =>
     attemptInstallByInfo({
       attemptInstall: di.inject(attemptInstallInjectable),
       getBaseRegistryUrl: di.inject(getBaseRegistryUrlInjectable),
       extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default attemptInstallByInfoInjectable;

src/renderer/components/+extensions/attempt-install/attempt-install.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 extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
 import uninstallExtensionInjectable from "../uninstall-extension/uninstall-extension.injectable";
 import { attemptInstall } from "./attempt-install";
@@ -14,6 +14,8 @@ import extensionInstallationStateStoreInjectable
   from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 
 const attemptInstallInjectable = getInjectable({
+  id: "attempt-install",
+
   instantiate: (di) =>
     attemptInstall({
       extensionLoader: di.inject(extensionLoaderInjectable),
@@ -23,8 +25,6 @@ const attemptInstallInjectable = getInjectable({
       getExtensionDestFolder: di.inject(getExtensionDestFolderInjectable),
       extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default attemptInstallInjectable;

src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.injectable.tsx

@@ -2,17 +2,17 @@
  * 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 { createTempFilesAndValidate } from "./create-temp-files-and-validate";
 import extensionDiscoveryInjectable from "../../../../../extensions/extension-discovery/extension-discovery.injectable";
 
 const createTempFilesAndValidateInjectable = getInjectable({
+  id: "create-temp-files-and-validate",
+
   instantiate: (di) =>
     createTempFilesAndValidate({
       extensionDiscovery: di.inject(extensionDiscoveryInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default createTempFilesAndValidateInjectable;

src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.injectable.ts

@@ -2,19 +2,19 @@
  * 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 extensionDiscoveryInjectable from "../../../../../extensions/extension-discovery/extension-discovery.injectable";
 
 import { getExtensionDestFolder } from "./get-extension-dest-folder";
 
 const getExtensionDestFolderInjectable = getInjectable({
+  id: "get-extension-dest-folder",
+
   instantiate: (di) =>
     getExtensionDestFolder({
       extensionDiscovery: di.inject(extensionDiscoveryInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default getExtensionDestFolderInjectable;

src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.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 { unpackExtension } from "./unpack-extension";
 import extensionLoaderInjectable from "../../../../../extensions/extension-loader/extension-loader.injectable";
 import getExtensionDestFolderInjectable
@@ -11,14 +11,14 @@ import extensionInstallationStateStoreInjectable
   from "../../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 
 const unpackExtensionInjectable = getInjectable({
+  id: "unpack-extension",
+
   instantiate: (di) =>
     unpackExtension({
       extensionLoader: di.inject(extensionLoaderInjectable),
       getExtensionDestFolder: di.inject(getExtensionDestFolderInjectable),
       extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default unpackExtensionInjectable;

src/renderer/components/+extensions/attempt-installs/attempt-installs.injectable.ts

@@ -2,17 +2,17 @@
  * 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 { attemptInstalls } from "./attempt-installs";
 import attemptInstallInjectable from "../attempt-install/attempt-install.injectable";
 
 const attemptInstallsInjectable = getInjectable({
+  id: "attempt-installs",
+
   instantiate: (di) =>
     attemptInstalls({
       attemptInstall: di.inject(attemptInstallInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default attemptInstallsInjectable;

src/renderer/components/+extensions/confirm-uninstall-extension/confirm-uninstall-extension.injectable.ts

@@ -2,17 +2,17 @@
  * 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 { confirmUninstallExtension } from "./confirm-uninstall-extension";
 import uninstallExtensionInjectable from "../uninstall-extension/uninstall-extension.injectable";
 
 const confirmUninstallExtensionInjectable = getInjectable({
+  id: "confirm-uninstall-extension",
+
   instantiate: (di) =>
     confirmUninstallExtension({
       uninstallExtension: di.inject(uninstallExtensionInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default confirmUninstallExtensionInjectable;

src/renderer/components/+extensions/disable-extension/disable-extension.injectable.ts

@@ -2,17 +2,17 @@
  * 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 extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
 import { disableExtension } from "./disable-extension";
 
 const disableExtensionInjectable = getInjectable({
+  id: "disable-extension",
+
   instantiate: (di) =>
     disableExtension({
       extensionLoader: di.inject(extensionLoaderInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default disableExtensionInjectable;

src/renderer/components/+extensions/enable-extension/enable-extension.injectable.ts

@@ -2,17 +2,17 @@
  * 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 extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
 import { enableExtension } from "./enable-extension";
 
 const enableExtensionInjectable = getInjectable({
+  id: "enable-extension",
+
   instantiate: (di) =>
     enableExtension({
       extensionLoader: di.inject(extensionLoaderInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default enableExtensionInjectable;

src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.injectable.ts

@@ -5,18 +5,17 @@
 
 import {
   getInjectable,
-  lifecycleEnum,
 } from "@ogre-tools/injectable";
 import { UserStore } from "../../../../common/user-store";
 import { getBaseRegistryUrl } from "./get-base-registry-url";
 
 const getBaseRegistryUrlInjectable = getInjectable({
+  id: "get-base-registry-url",
+
   instantiate: () => getBaseRegistryUrl({
     // TODO: use injection
     getRegistryUrlPreference: () => UserStore.getInstance().extensionRegistryUrl,
   }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default getBaseRegistryUrlInjectable;

src/renderer/components/+extensions/install-from-input/install-from-input.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 attemptInstallInjectable from "../attempt-install/attempt-install.injectable";
 import { installFromInput } from "./install-from-input";
 import attemptInstallByInfoInjectable from "../attempt-install-by-info/attempt-install-by-info.injectable";
@@ -10,14 +10,14 @@ import extensionInstallationStateStoreInjectable
   from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 
 const installFromInputInjectable = getInjectable({
+  id: "install-from-input",
+
   instantiate: (di) =>
     installFromInput({
       attemptInstall: di.inject(attemptInstallInjectable),
       attemptInstallByInfo: di.inject(attemptInstallByInfoInjectable),
       extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default installFromInputInjectable;

src/renderer/components/+extensions/install-from-select-file-dialog.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 { requestOpenFilePickingDialog } from "../../ipc";
 import { supportedExtensionFormats } from "./supported-extension-formats";
 import attemptInstallsInjectable from "./attempt-installs/attempt-installs.injectable";
@@ -28,12 +28,12 @@ const installFromSelectFileDialog = ({ attemptInstalls, directoryForDownloads }:
 };
 
 const installFromSelectFileDialogInjectable = getInjectable({
+  id: "install-from-select-file-dialog",
+
   instantiate: (di) => installFromSelectFileDialog({
     attemptInstalls: di.inject(attemptInstallsInjectable),
     directoryForDownloads: di.inject(directoryForDownloadsInjectable),
   }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default installFromSelectFileDialogInjectable;

src/renderer/components/+extensions/install-on-drop/install-on-drop.injectable.ts

@@ -2,17 +2,17 @@
  * 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 { installOnDrop } from "./install-on-drop";
 import attemptInstallsInjectable from "../attempt-installs/attempt-installs.injectable";
 
 const installOnDropInjectable = getInjectable({
+  id: "install-on-drop",
+
   instantiate: (di) =>
     installOnDrop({
       attemptInstalls: di.inject(attemptInstallsInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default installOnDropInjectable;

src/renderer/components/+extensions/uninstall-extension/uninstall-extension.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 extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
 import { uninstallExtension } from "./uninstall-extension";
 import extensionInstallationStateStoreInjectable
@@ -11,14 +11,14 @@ import extensionDiscoveryInjectable
   from "../../../../extensions/extension-discovery/extension-discovery.injectable";
 
 const uninstallExtensionInjectable = getInjectable({
+  id: "uninstall-extension",
+
   instantiate: (di) =>
     uninstallExtension({
       extensionLoader: di.inject(extensionLoaderInjectable),
       extensionDiscovery: di.inject(extensionDiscoveryInjectable),
       extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default uninstallExtensionInjectable;

src/renderer/components/+extensions/user-extensions/user-extensions.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 { computed } from "mobx";
 import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
 
 const userExtensionsInjectable = getInjectable({
-  lifecycle: lifecycleEnum.singleton,
+  id: "user-extensions",
 
   instantiate: (di) => {
     const extensionLoader = di.inject(extensionLoaderInjectable);