diff --git a/src/common/app-event-bus/app-event-bus.injectable.ts b/src/common/app-event-bus/app-event-bus.injectable.ts index e10d85c522..8ba0412ba4 100644 --- a/src/common/app-event-bus/app-event-bus.injectable.ts +++ b/src/common/app-event-bus/app-event-bus.injectable.ts @@ -2,13 +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 { appEventBus } from "./event-bus"; const appEventBusInjectable = getInjectable({ id: "app-event-bus", instantiate: () => appEventBus, - lifecycle: lifecycleEnum.singleton, }); export default appEventBusInjectable; diff --git a/src/common/app-paths/directory-for-binaries/directory-for-binaries.injectable.ts b/src/common/app-paths/directory-for-binaries/directory-for-binaries.injectable.ts index 1202436f22..7a7aa8658d 100644 --- a/src/common/app-paths/directory-for-binaries/directory-for-binaries.injectable.ts +++ b/src/common/app-paths/directory-for-binaries/directory-for-binaries.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 path from "path"; import directoryForUserDataInjectable from "../directory-for-user-data/directory-for-user-data.injectable"; @@ -11,8 +11,6 @@ const directoryForBinariesInjectable = getInjectable({ instantiate: (di) => path.join(di.inject(directoryForUserDataInjectable), "binaries"), - - lifecycle: lifecycleEnum.singleton, }); export default directoryForBinariesInjectable; diff --git a/src/common/app-paths/directory-for-downloads/directory-for-downloads.injectable.ts b/src/common/app-paths/directory-for-downloads/directory-for-downloads.injectable.ts index 708c47b4bb..944c8a656a 100644 --- a/src/common/app-paths/directory-for-downloads/directory-for-downloads.injectable.ts +++ b/src/common/app-paths/directory-for-downloads/directory-for-downloads.injectable.ts @@ -2,13 +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; diff --git a/src/common/app-paths/directory-for-exes/directory-for-exes.injectable.ts b/src/common/app-paths/directory-for-exes/directory-for-exes.injectable.ts index b79a910dc3..1bd245daa4 100644 --- a/src/common/app-paths/directory-for-exes/directory-for-exes.injectable.ts +++ b/src/common/app-paths/directory-for-exes/directory-for-exes.injectable.ts @@ -2,13 +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; diff --git a/src/common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable.ts b/src/common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable.ts index de8ba254f8..c0869c4b11 100644 --- a/src/common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable.ts +++ b/src/common/app-paths/directory-for-kube-configs/directory-for-kube-configs.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 directoryForUserDataInjectable from "../directory-for-user-data/directory-for-user-data.injectable"; import path from "path"; @@ -11,8 +11,6 @@ const directoryForKubeConfigsInjectable = getInjectable({ instantiate: (di) => path.resolve(di.inject(directoryForUserDataInjectable), "kubeconfigs"), - - lifecycle: lifecycleEnum.singleton, }); export default directoryForKubeConfigsInjectable; diff --git a/src/common/app-paths/directory-for-temp/directory-for-temp.injectable.ts b/src/common/app-paths/directory-for-temp/directory-for-temp.injectable.ts index a48cef4989..b51e8e0489 100644 --- a/src/common/app-paths/directory-for-temp/directory-for-temp.injectable.ts +++ b/src/common/app-paths/directory-for-temp/directory-for-temp.injectable.ts @@ -2,13 +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; diff --git a/src/common/app-paths/directory-for-user-data/directory-for-user-data.injectable.ts b/src/common/app-paths/directory-for-user-data/directory-for-user-data.injectable.ts index e71609a856..bff067b7e5 100644 --- a/src/common/app-paths/directory-for-user-data/directory-for-user-data.injectable.ts +++ b/src/common/app-paths/directory-for-user-data/directory-for-user-data.injectable.ts @@ -2,13 +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; diff --git a/src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable.ts b/src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable.ts index fedc357aa1..1157ec96da 100644 --- a/src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable.ts +++ b/src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.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 path from "path"; import directoryForKubeConfigsInjectable from "../directory-for-kube-configs/directory-for-kube-configs.injectable"; @@ -17,8 +17,6 @@ const getCustomKubeConfigDirectoryInjectable = getInjectable({ directoryName, ); }, - - lifecycle: lifecycleEnum.singleton, }); export default getCustomKubeConfigDirectoryInjectable; diff --git a/src/common/cluster-store/allowed-resources.injectable.ts b/src/common/cluster-store/allowed-resources.injectable.ts index 539ac548c2..2277befbd6 100644 --- a/src/common/cluster-store/allowed-resources.injectable.ts +++ b/src/common/cluster-store/allowed-resources.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 { comparer, computed } from "mobx"; import hostedClusterInjectable from "./hosted-cluster.injectable"; @@ -17,7 +17,6 @@ const allowedResourcesInjectable = getInjectable({ equals: (cur, prev) => comparer.structural(cur, prev), }); }, - lifecycle: lifecycleEnum.singleton, }); export default allowedResourcesInjectable; diff --git a/src/common/cluster-store/cluster-store.injectable.ts b/src/common/cluster-store/cluster-store.injectable.ts index e1dc8fcf3f..f6295e4bd7 100644 --- a/src/common/cluster-store/cluster-store.injectable.ts +++ b/src/common/cluster-store/cluster-store.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 { ClusterStore } from "./cluster-store"; import { createClusterInjectionToken } from "../cluster/create-cluster-injection-token"; @@ -13,8 +13,6 @@ const clusterStoreInjectable = getInjectable({ ClusterStore.createInstance({ createCluster: di.inject(createClusterInjectionToken), }), - - lifecycle: lifecycleEnum.singleton, }); export default clusterStoreInjectable; diff --git a/src/common/cluster-store/hosted-cluster.injectable.ts b/src/common/cluster-store/hosted-cluster.injectable.ts index 3e6fe75120..1bcafc9238 100644 --- a/src/common/cluster-store/hosted-cluster.injectable.ts +++ b/src/common/cluster-store/hosted-cluster.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 { getHostedClusterId } from "../utils"; import clusterStoreInjectable from "./cluster-store.injectable"; @@ -14,8 +14,6 @@ const hostedClusterInjectable = getInjectable({ return di.inject(clusterStoreInjectable).getById(hostedClusterId); }, - - lifecycle: lifecycleEnum.singleton, }); export default hostedClusterInjectable; diff --git a/src/common/cluster/authorization-review.injectable.ts b/src/common/cluster/authorization-review.injectable.ts index ed59e32d96..6330a1971f 100644 --- a/src/common/cluster/authorization-review.injectable.ts +++ b/src/common/cluster/authorization-review.injectable.ts @@ -5,7 +5,7 @@ import { AuthorizationV1Api, KubeConfig, V1ResourceAttributes } from "@kubernetes/client-node"; import logger from "../logger"; -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; export type CanI = (resourceAttributes: V1ResourceAttributes) => Promise; @@ -40,7 +40,6 @@ export function authorizationReview(proxyConfig: KubeConfig): CanI { const authorizationReviewInjectable = getInjectable({ id: "authorization-review", instantiate: () => authorizationReview, - lifecycle: lifecycleEnum.singleton, }); export default authorizationReviewInjectable; diff --git a/src/common/cluster/list-namespaces.injectable.ts b/src/common/cluster/list-namespaces.injectable.ts index 39ec2fc0d5..97ae171442 100644 --- a/src/common/cluster/list-namespaces.injectable.ts +++ b/src/common/cluster/list-namespaces.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { CoreV1Api, KubeConfig } from "@kubernetes/client-node"; -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; export type ListNamespaces = () => Promise; @@ -20,7 +20,6 @@ export function listNamespaces(config: KubeConfig): ListNamespaces { const listNamespacesInjectable = getInjectable({ id: "list-namespaces", instantiate: () => listNamespaces, - lifecycle: lifecycleEnum.singleton, }); export default listNamespacesInjectable; diff --git a/src/common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable.ts b/src/common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable.ts index 14f64d712d..fc1e3ef0f0 100644 --- a/src/common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable.ts +++ b/src/common/directory-for-lens-local-storage/directory-for-lens-local-storage.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 path from "path"; import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable"; @@ -14,8 +14,6 @@ const directoryForLensLocalStorageInjectable = getInjectable({ di.inject(directoryForUserDataInjectable), "lens-local-storage", ), - - lifecycle: lifecycleEnum.singleton, }); export default directoryForLensLocalStorageInjectable; diff --git a/src/common/fs/fs.injectable.ts b/src/common/fs/fs.injectable.ts index fccb2490b9..ab385e5871 100644 --- a/src/common/fs/fs.injectable.ts +++ b/src/common/fs/fs.injectable.ts @@ -2,14 +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 fse from "fs-extra"; const fsInjectable = getInjectable({ id: "fs", instantiate: () => fse, causesSideEffects: true, - lifecycle: lifecycleEnum.singleton, }); export default fsInjectable; diff --git a/src/common/fs/read-dir.injectable.ts b/src/common/fs/read-dir.injectable.ts index 81b9c83843..2c7b59d9b2 100644 --- a/src/common/fs/read-dir.injectable.ts +++ b/src/common/fs/read-dir.injectable.ts @@ -2,13 +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 fsInjectable from "./fs.injectable"; const readDirInjectable = getInjectable({ id: "read-dir", instantiate: (di) => di.inject(fsInjectable).readdir, - lifecycle: lifecycleEnum.singleton, }); export default readDirInjectable; diff --git a/src/common/fs/read-file.injectable.ts b/src/common/fs/read-file.injectable.ts index 2c413b22a1..5c0bad27ca 100644 --- a/src/common/fs/read-file.injectable.ts +++ b/src/common/fs/read-file.injectable.ts @@ -2,13 +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 fsInjectable from "./fs.injectable"; const readFileInjectable = getInjectable({ id: "read-file", instantiate: (di) => di.inject(fsInjectable).readFile, - lifecycle: lifecycleEnum.singleton, }); export default readFileInjectable; diff --git a/src/common/fs/read-json-file.injectable.ts b/src/common/fs/read-json-file.injectable.ts index d0cfcbe3b1..308d3b8a91 100644 --- a/src/common/fs/read-json-file.injectable.ts +++ b/src/common/fs/read-json-file.injectable.ts @@ -2,13 +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 fsInjectable from "./fs.injectable"; const readJsonFileInjectable = getInjectable({ id: "read-json-file", instantiate: (di) => di.inject(fsInjectable).readJson, - lifecycle: lifecycleEnum.singleton, }); export default readJsonFileInjectable; diff --git a/src/common/fs/write-json-file.injectable.ts b/src/common/fs/write-json-file.injectable.ts index 7cb2e9f425..89aae40736 100644 --- a/src/common/fs/write-json-file.injectable.ts +++ b/src/common/fs/write-json-file.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 type { EnsureOptions, WriteOptions } from "fs-extra"; import path from "path"; import type { JsonValue } from "type-fest"; @@ -33,8 +33,6 @@ const writeJsonFileInjectable = getInjectable({ ensureDir, }); }, - - lifecycle: lifecycleEnum.singleton, }); export default writeJsonFileInjectable; diff --git a/src/common/hotbar-store.injectable.ts b/src/common/hotbar-store.injectable.ts index d6ac508c40..47510d9555 100644 --- a/src/common/hotbar-store.injectable.ts +++ b/src/common/hotbar-store.injectable.ts @@ -2,13 +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 { HotbarStore } from "./hotbar-store"; const hotbarManagerInjectable = getInjectable({ id: "hotbar-manager", instantiate: () => HotbarStore.getInstance(), - lifecycle: lifecycleEnum.singleton, }); export default hotbarManagerInjectable; diff --git a/src/common/user-store/user-store.injectable.ts b/src/common/user-store/user-store.injectable.ts index 0d03ebf8d0..36db7c0820 100644 --- a/src/common/user-store/user-store.injectable.ts +++ b/src/common/user-store/user-store.injectable.ts @@ -2,13 +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 { UserStore } from "./user-store"; const userStoreInjectable = getInjectable({ id: "user-store", instantiate: () => UserStore.createInstance(), - lifecycle: lifecycleEnum.singleton, }); export default userStoreInjectable; diff --git a/src/common/utils/is-allowed-resource.injectable.ts b/src/common/utils/is-allowed-resource.injectable.ts index 135ca456d3..9977f6e5f8 100644 --- a/src/common/utils/is-allowed-resource.injectable.ts +++ b/src/common/utils/is-allowed-resource.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 allowedResourcesInjectable from "../cluster-store/allowed-resources.injectable"; import type { KubeResource } from "../rbac"; @@ -17,8 +17,6 @@ const isAllowedResourceInjectable = getInjectable({ return (resource: KubeResource) => allowedResources.get().has(resource); }, - - lifecycle: lifecycleEnum.singleton, }); export default isAllowedResourceInjectable; diff --git a/src/common/vars/is-linux.injectable.ts b/src/common/vars/is-linux.injectable.ts index 8986aefd69..b7a24e9a2b 100644 --- a/src/common/vars/is-linux.injectable.ts +++ b/src/common/vars/is-linux.injectable.ts @@ -2,13 +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 { isLinux } from "../vars"; const isLinuxInjectable = getInjectable({ id: "is-linux", instantiate: () => isLinux, - lifecycle: lifecycleEnum.singleton, }); export default isLinuxInjectable; diff --git a/src/common/vars/is-windows.injectable.ts b/src/common/vars/is-windows.injectable.ts index 2cf622472c..bdce3e827f 100644 --- a/src/common/vars/is-windows.injectable.ts +++ b/src/common/vars/is-windows.injectable.ts @@ -2,13 +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 { isWindows } from "../vars"; const isWindowsInjectable = getInjectable({ id: "is-windows", instantiate: () => isWindows, - lifecycle: lifecycleEnum.singleton, }); export default isWindowsInjectable; diff --git a/src/extensions/common-api/get-enabled-extensions/get-enabled-extensions.injectable.ts b/src/extensions/common-api/get-enabled-extensions/get-enabled-extensions.injectable.ts index e8a2da6031..747dfa4f42 100644 --- a/src/extensions/common-api/get-enabled-extensions/get-enabled-extensions.injectable.ts +++ b/src/extensions/common-api/get-enabled-extensions/get-enabled-extensions.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 extensionsStoreInjectable from "../../extensions-store/extensions-store.injectable"; const getEnabledExtensionsInjectable = getInjectable({ @@ -10,8 +10,6 @@ const getEnabledExtensionsInjectable = getInjectable({ instantiate: (di) => () => di.inject(extensionsStoreInjectable).enabledExtensions, - - lifecycle: lifecycleEnum.singleton, }); export default getEnabledExtensionsInjectable; diff --git a/src/extensions/extension-discovery/extension-discovery.injectable.ts b/src/extensions/extension-discovery/extension-discovery.injectable.ts index 756a47d254..6833dda3a8 100644 --- a/src/extensions/extension-discovery/extension-discovery.injectable.ts +++ b/src/extensions/extension-discovery/extension-discovery.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 { ExtensionDiscovery } from "./extension-discovery"; import extensionLoaderInjectable from "../extension-loader/extension-loader.injectable"; import isCompatibleExtensionInjectable from "./is-compatible-extension/is-compatible-extension.injectable"; @@ -38,8 +38,6 @@ const extensionDiscoveryInjectable = getInjectable({ extensionPackageRootDirectoryInjectable, ), }), - - lifecycle: lifecycleEnum.singleton, }); export default extensionDiscoveryInjectable; diff --git a/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts b/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts index ce13f84f5e..046b106da5 100644 --- a/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts +++ b/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts @@ -2,14 +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 { appSemVer } from "../../../common/vars"; import { isCompatibleBundledExtension } from "./is-compatible-bundled-extension"; const isCompatibleBundledExtensionInjectable = getInjectable({ id: "is-compatible-bundled-extension", instantiate: () => isCompatibleBundledExtension({ appSemVer }), - lifecycle: lifecycleEnum.singleton, }); export default isCompatibleBundledExtensionInjectable; diff --git a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts index 1e0d2836e5..7ca49a41cd 100644 --- a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts +++ b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts @@ -2,14 +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 { appSemVer } from "../../../common/vars"; import { isCompatibleExtension } from "./is-compatible-extension"; const isCompatibleExtensionInjectable = getInjectable({ id: "is-compatible-extension", instantiate: () => isCompatibleExtension({ appSemVer }), - lifecycle: lifecycleEnum.singleton, }); export default isCompatibleExtensionInjectable; diff --git a/src/extensions/extension-installation-state-store/extension-installation-state-store.injectable.ts b/src/extensions/extension-installation-state-store/extension-installation-state-store.injectable.ts index 19b3b7f087..9d5891a01a 100644 --- a/src/extensions/extension-installation-state-store/extension-installation-state-store.injectable.ts +++ b/src/extensions/extension-installation-state-store/extension-installation-state-store.injectable.ts @@ -2,13 +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 { ExtensionInstallationStateStore } from "./extension-installation-state-store"; const extensionInstallationStateStoreInjectable = getInjectable({ id: "extension-installation-state-store", instantiate: () => new ExtensionInstallationStateStore(), - lifecycle: lifecycleEnum.singleton, }); export default extensionInstallationStateStoreInjectable; diff --git a/src/extensions/extension-installer/extension-installer.injectable.ts b/src/extensions/extension-installer/extension-installer.injectable.ts index 446fd996da..169b758049 100644 --- a/src/extensions/extension-installer/extension-installer.injectable.ts +++ b/src/extensions/extension-installer/extension-installer.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 { ExtensionInstaller } from "./extension-installer"; import extensionPackageRootDirectoryInjectable from "./extension-package-root-directory/extension-package-root-directory.injectable"; @@ -15,8 +15,6 @@ const extensionInstallerInjectable = getInjectable({ extensionPackageRootDirectoryInjectable, ), }), - - lifecycle: lifecycleEnum.singleton, }); export default extensionInstallerInjectable; diff --git a/src/extensions/extension-installer/extension-package-root-directory/extension-package-root-directory.injectable.ts b/src/extensions/extension-installer/extension-package-root-directory/extension-package-root-directory.injectable.ts index 7561bfeb75..6ab004ef6d 100644 --- a/src/extensions/extension-installer/extension-package-root-directory/extension-package-root-directory.injectable.ts +++ b/src/extensions/extension-installer/extension-package-root-directory/extension-package-root-directory.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 directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; @@ -10,8 +10,6 @@ const extensionPackageRootDirectoryInjectable = getInjectable({ id: "extension-package-root-directory", instantiate: (di) => di.inject(directoryForUserDataInjectable), - - lifecycle: lifecycleEnum.singleton, }); export default extensionPackageRootDirectoryInjectable; diff --git a/src/extensions/extension-installer/install-extension/install-extension.injectable.ts b/src/extensions/extension-installer/install-extension/install-extension.injectable.ts index 6f56a9ee90..940c5987a5 100644 --- a/src/extensions/extension-installer/install-extension/install-extension.injectable.ts +++ b/src/extensions/extension-installer/install-extension/install-extension.injectable.ts @@ -2,13 +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 extensionInstallerInjectable from "../extension-installer.injectable"; const installExtensionInjectable = getInjectable({ id: "install-extension", instantiate: (di) => di.inject(extensionInstallerInjectable).installPackage, - lifecycle: lifecycleEnum.singleton, }); export default installExtensionInjectable; diff --git a/src/extensions/extension-installer/install-extensions/install-extensions.injectable.ts b/src/extensions/extension-installer/install-extensions/install-extensions.injectable.ts index 3e9bc3f567..7387326e15 100644 --- a/src/extensions/extension-installer/install-extensions/install-extensions.injectable.ts +++ b/src/extensions/extension-installer/install-extensions/install-extensions.injectable.ts @@ -2,13 +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 extensionInstallerInjectable from "../extension-installer.injectable"; const installExtensionsInjectable = getInjectable({ id: "install-extensions", instantiate: (di) => di.inject(extensionInstallerInjectable).installPackages, - lifecycle: lifecycleEnum.singleton, }); export default installExtensionsInjectable; diff --git a/src/extensions/extension-loader/create-extension-instance/create-extension-instance.injectable.ts b/src/extensions/extension-loader/create-extension-instance/create-extension-instance.injectable.ts index 6df5dc7fe7..d5bba359bc 100644 --- a/src/extensions/extension-loader/create-extension-instance/create-extension-instance.injectable.ts +++ b/src/extensions/extension-loader/create-extension-instance/create-extension-instance.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 { createExtensionInstance } from "./create-extension-instance"; import fileSystemProvisionerStoreInjectable from "./file-system-provisioner-store/file-system-provisioner-store.injectable"; @@ -12,8 +12,6 @@ const createExtensionInstanceInjectable = getInjectable({ instantiate: (di) => createExtensionInstance({ fileSystemProvisionerStore: di.inject(fileSystemProvisionerStoreInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default createExtensionInstanceInjectable; diff --git a/src/extensions/extension-loader/create-extension-instance/file-system-provisioner-store/directory-for-extension-data/directory-for-extension-data.injectable.ts b/src/extensions/extension-loader/create-extension-instance/file-system-provisioner-store/directory-for-extension-data/directory-for-extension-data.injectable.ts index 1d4ced9281..7856fd84de 100644 --- a/src/extensions/extension-loader/create-extension-instance/file-system-provisioner-store/directory-for-extension-data/directory-for-extension-data.injectable.ts +++ b/src/extensions/extension-loader/create-extension-instance/file-system-provisioner-store/directory-for-extension-data/directory-for-extension-data.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 path from "path"; import directoryForUserDataInjectable from "../../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; @@ -11,8 +11,6 @@ const directoryForExtensionDataInjectable = getInjectable({ instantiate: (di) => path.join(di.inject(directoryForUserDataInjectable), "extension_data"), - - lifecycle: lifecycleEnum.singleton, }); export default directoryForExtensionDataInjectable; diff --git a/src/extensions/extension-loader/create-extension-instance/file-system-provisioner-store/file-system-provisioner-store.injectable.ts b/src/extensions/extension-loader/create-extension-instance/file-system-provisioner-store/file-system-provisioner-store.injectable.ts index 8b00b4ea87..4851771285 100644 --- a/src/extensions/extension-loader/create-extension-instance/file-system-provisioner-store/file-system-provisioner-store.injectable.ts +++ b/src/extensions/extension-loader/create-extension-instance/file-system-provisioner-store/file-system-provisioner-store.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 { FileSystemProvisionerStore } from "./file-system-provisioner-store"; import directoryForExtensionDataInjectable from "./directory-for-extension-data/directory-for-extension-data.injectable"; @@ -15,8 +15,6 @@ const fileSystemProvisionerStoreInjectable = getInjectable({ directoryForExtensionDataInjectable, ), }), - - lifecycle: lifecycleEnum.singleton, }); export default fileSystemProvisionerStoreInjectable; diff --git a/src/extensions/extension-loader/extension-loader.injectable.ts b/src/extensions/extension-loader/extension-loader.injectable.ts index 1ed7578264..e6dd489ecc 100644 --- a/src/extensions/extension-loader/extension-loader.injectable.ts +++ b/src/extensions/extension-loader/extension-loader.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 { ExtensionLoader } from "./extension-loader"; import updateExtensionsStateInjectable from "./update-extensions-state/update-extensions-state.injectable"; import createExtensionInstanceInjectable @@ -16,8 +16,6 @@ const extensionLoaderInjectable = getInjectable({ updateExtensionsState: di.inject(updateExtensionsStateInjectable), createExtensionInstance: di.inject(createExtensionInstanceInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default extensionLoaderInjectable; diff --git a/src/extensions/extension-loader/update-extensions-state/update-extensions-state.injectable.ts b/src/extensions/extension-loader/update-extensions-state/update-extensions-state.injectable.ts index be7049f76c..e808246033 100644 --- a/src/extensions/extension-loader/update-extensions-state/update-extensions-state.injectable.ts +++ b/src/extensions/extension-loader/update-extensions-state/update-extensions-state.injectable.ts @@ -2,13 +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 extensionsStoreInjectable from "../../extensions-store/extensions-store.injectable"; const updateExtensionsStateInjectable = getInjectable({ id: "upadte-extensions-state", instantiate: (di) => di.inject(extensionsStoreInjectable).mergeState, - lifecycle: lifecycleEnum.singleton, }); export default updateExtensionsStateInjectable; diff --git a/src/extensions/extension-packages-root/extension-packages-root.injectable.ts b/src/extensions/extension-packages-root/extension-packages-root.injectable.ts index 4a88f20a30..81e91c5e27 100644 --- a/src/extensions/extension-packages-root/extension-packages-root.injectable.ts +++ b/src/extensions/extension-packages-root/extension-packages-root.injectable.ts @@ -2,14 +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 directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; const extensionPackagesRootInjectable = getInjectable({ id: "extension-packages-root", instantiate: (di) => di.inject(directoryForUserDataInjectable), - lifecycle: lifecycleEnum.singleton, }); export default extensionPackagesRootInjectable; diff --git a/src/extensions/extensions-store/extensions-store.injectable.ts b/src/extensions/extensions-store/extensions-store.injectable.ts index 691d37bbf4..352922143a 100644 --- a/src/extensions/extensions-store/extensions-store.injectable.ts +++ b/src/extensions/extensions-store/extensions-store.injectable.ts @@ -2,13 +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 { ExtensionsStore } from "./extensions-store"; const extensionsStoreInjectable = getInjectable({ id: "extensions-store", instantiate: () => ExtensionsStore.createInstance(), - lifecycle: lifecycleEnum.singleton, }); export default extensionsStoreInjectable; diff --git a/src/extensions/extensions.injectable.ts b/src/extensions/extensions.injectable.ts index 69763bc305..36d6af1a92 100644 --- a/src/extensions/extensions.injectable.ts +++ b/src/extensions/extensions.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 { computed } from "mobx"; import extensionLoaderInjectable from "./extension-loader/extension-loader.injectable"; @@ -14,8 +14,6 @@ const extensionsInjectable = getInjectable({ return computed(() => extensionLoader.enabledExtensionInstances); }, - - lifecycle: lifecycleEnum.singleton, }); export default extensionsInjectable; diff --git a/src/extensions/main-extensions.injectable.ts b/src/extensions/main-extensions.injectable.ts index 0f8dd9b864..07010af010 100644 --- a/src/extensions/main-extensions.injectable.ts +++ b/src/extensions/main-extensions.injectable.ts @@ -2,14 +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 type { IComputedValue } from "mobx"; import extensionsInjectable from "./extensions.injectable"; import type { LensMainExtension } from "./lens-main-extension"; const mainExtensionsInjectable = getInjectable({ id: "main-extensions", - lifecycle: lifecycleEnum.singleton, instantiate: (di) => di.inject(extensionsInjectable) as IComputedValue, diff --git a/src/extensions/renderer-extensions.injectable.ts b/src/extensions/renderer-extensions.injectable.ts index 02b9b2465e..92c3037e01 100644 --- a/src/extensions/renderer-extensions.injectable.ts +++ b/src/extensions/renderer-extensions.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 type { IComputedValue } from "mobx"; import extensionsInjectable from "./extensions.injectable"; import type { LensRendererExtension } from "./lens-renderer-extension"; @@ -10,7 +10,6 @@ import type { LensRendererExtension } from "./lens-renderer-extension"; const rendererExtensionsInjectable = getInjectable({ id: "renderer-extensions", instantiate: (di) => di.inject(extensionsInjectable) as IComputedValue, - lifecycle: lifecycleEnum.singleton, }); export default rendererExtensionsInjectable; diff --git a/src/main/app-paths/app-name/app-name.injectable.ts b/src/main/app-paths/app-name/app-name.injectable.ts index fa39cec302..4ba900d410 100644 --- a/src/main/app-paths/app-name/app-name.injectable.ts +++ b/src/main/app-paths/app-name/app-name.injectable.ts @@ -2,13 +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 electronAppInjectable from "../get-electron-app-path/electron-app/electron-app.injectable"; const appNameInjectable = getInjectable({ id: "app-name", instantiate: (di) => di.inject(electronAppInjectable).name, - lifecycle: lifecycleEnum.singleton, }); export default appNameInjectable; diff --git a/src/main/app-paths/app-paths.injectable.ts b/src/main/app-paths/app-paths.injectable.ts index e32302ce21..654f34d29b 100644 --- a/src/main/app-paths/app-paths.injectable.ts +++ b/src/main/app-paths/app-paths.injectable.ts @@ -5,7 +5,6 @@ import { DiContainerForSetup, getInjectable, - lifecycleEnum, } from "@ogre-tools/injectable"; import { @@ -41,7 +40,6 @@ const appPathsInjectable = getInjectable({ getAppPaths({ getAppPath: di.inject(getElectronAppPathInjectable) }), injectionToken: appPathsInjectionToken, - lifecycle: lifecycleEnum.singleton, }); export default appPathsInjectable; diff --git a/src/main/app-paths/directory-for-integration-testing/directory-for-integration-testing.injectable.ts b/src/main/app-paths/directory-for-integration-testing/directory-for-integration-testing.injectable.ts index 196631db8c..76779ce5a0 100644 --- a/src/main/app-paths/directory-for-integration-testing/directory-for-integration-testing.injectable.ts +++ b/src/main/app-paths/directory-for-integration-testing/directory-for-integration-testing.injectable.ts @@ -2,12 +2,11 @@ * 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"; const directoryForIntegrationTestingInjectable = getInjectable({ id: "directory-for-integration-testing", instantiate: () => process.env.CICD, - lifecycle: lifecycleEnum.singleton, }); export default directoryForIntegrationTestingInjectable; diff --git a/src/main/app-paths/get-electron-app-path/electron-app/electron-app.injectable.ts b/src/main/app-paths/get-electron-app-path/electron-app/electron-app.injectable.ts index db28275f52..52b037c4e1 100644 --- a/src/main/app-paths/get-electron-app-path/electron-app/electron-app.injectable.ts +++ b/src/main/app-paths/get-electron-app-path/electron-app/electron-app.injectable.ts @@ -2,13 +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 { app } from "electron"; const electronAppInjectable = getInjectable({ id: "electron-app", instantiate: () => app, - lifecycle: lifecycleEnum.singleton, causesSideEffects: true, }); diff --git a/src/main/app-paths/get-electron-app-path/get-electron-app-path.injectable.ts b/src/main/app-paths/get-electron-app-path/get-electron-app-path.injectable.ts index 19941afff6..4a548a1f8e 100644 --- a/src/main/app-paths/get-electron-app-path/get-electron-app-path.injectable.ts +++ b/src/main/app-paths/get-electron-app-path/get-electron-app-path.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 electronAppInjectable from "./electron-app/electron-app.injectable"; import { getElectronAppPath } from "./get-electron-app-path"; @@ -11,8 +11,6 @@ const getElectronAppPathInjectable = getInjectable({ instantiate: (di) => getElectronAppPath({ app: di.inject(electronAppInjectable) }), - - lifecycle: lifecycleEnum.singleton, }); export default getElectronAppPathInjectable; diff --git a/src/main/app-paths/register-channel/ipc-main/ipc-main.injectable.ts b/src/main/app-paths/register-channel/ipc-main/ipc-main.injectable.ts index cc8b42f4d9..13684bf8ec 100644 --- a/src/main/app-paths/register-channel/ipc-main/ipc-main.injectable.ts +++ b/src/main/app-paths/register-channel/ipc-main/ipc-main.injectable.ts @@ -2,13 +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 { ipcMain } from "electron"; const ipcMainInjectable = getInjectable({ id: "ipc-main", instantiate: () => ipcMain, - lifecycle: lifecycleEnum.singleton, causesSideEffects: true, }); diff --git a/src/main/app-paths/register-channel/register-channel.injectable.ts b/src/main/app-paths/register-channel/register-channel.injectable.ts index 725214285b..d0b517cf25 100644 --- a/src/main/app-paths/register-channel/register-channel.injectable.ts +++ b/src/main/app-paths/register-channel/register-channel.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 ipcMainInjectable from "./ipc-main/ipc-main.injectable"; import { registerChannel } from "./register-channel"; @@ -12,8 +12,6 @@ const registerChannelInjectable = getInjectable({ instantiate: (di) => registerChannel({ ipcMain: di.inject(ipcMainInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default registerChannelInjectable; diff --git a/src/main/app-paths/set-electron-app-path/set-electron-app-path.injectable.ts b/src/main/app-paths/set-electron-app-path/set-electron-app-path.injectable.ts index 51272a6d69..636063d939 100644 --- a/src/main/app-paths/set-electron-app-path/set-electron-app-path.injectable.ts +++ b/src/main/app-paths/set-electron-app-path/set-electron-app-path.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 type { PathName } from "../../../common/app-paths/app-path-names"; import electronAppInjectable from "../get-electron-app-path/electron-app/electron-app.injectable"; @@ -11,8 +11,6 @@ const setElectronAppPathInjectable = getInjectable({ instantiate: (di) => (name: PathName, path: string) : void => di.inject(electronAppInjectable).setPath(name, path), - - lifecycle: lifecycleEnum.singleton, }); export default setElectronAppPathInjectable; diff --git a/src/main/catalog-sources/kubeconfig-sync-manager/kubeconfig-sync-manager.injectable.ts b/src/main/catalog-sources/kubeconfig-sync-manager/kubeconfig-sync-manager.injectable.ts index 7d2658bd18..7c258cabd7 100644 --- a/src/main/catalog-sources/kubeconfig-sync-manager/kubeconfig-sync-manager.injectable.ts +++ b/src/main/catalog-sources/kubeconfig-sync-manager/kubeconfig-sync-manager.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 directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import { KubeconfigSyncManager } from "./kubeconfig-sync-manager"; import { createClusterInjectionToken } from "../../../common/cluster/create-cluster-injection-token"; @@ -14,8 +14,6 @@ const kubeconfigSyncManagerInjectable = getInjectable({ directoryForKubeConfigs: di.inject(directoryForKubeConfigsInjectable), createCluster: di.inject(createClusterInjectionToken), }), - - lifecycle: lifecycleEnum.singleton, }); export default kubeconfigSyncManagerInjectable; diff --git a/src/main/context-handler/create-context-handler.injectable.ts b/src/main/context-handler/create-context-handler.injectable.ts index 80a43db6ae..47b935ceaa 100644 --- a/src/main/context-handler/create-context-handler.injectable.ts +++ b/src/main/context-handler/create-context-handler.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 type { Cluster } from "../../common/cluster/cluster"; import { ContextHandler } from "./context-handler"; import createKubeAuthProxyInjectable from "../kube-auth-proxy/create-kube-auth-proxy.injectable"; @@ -17,8 +17,6 @@ const createContextHandlerInjectable = getInjectable({ return (cluster: Cluster) => new ContextHandler(dependencies, cluster); }, - - lifecycle: lifecycleEnum.singleton, }); export default createContextHandlerInjectable; diff --git a/src/main/create-cluster/create-cluster.injectable.ts b/src/main/create-cluster/create-cluster.injectable.ts index 64db47bddc..c1c26217ae 100644 --- a/src/main/create-cluster/create-cluster.injectable.ts +++ b/src/main/create-cluster/create-cluster.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 { Cluster, ClusterDependencies } from "../../common/cluster/cluster"; import directoryForKubeConfigsInjectable from "../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import createKubeconfigManagerInjectable from "../kubeconfig-manager/create-kubeconfig-manager.injectable"; @@ -29,8 +29,6 @@ const createClusterInjectable = getInjectable({ }, injectionToken: createClusterInjectionToken, - - lifecycle: lifecycleEnum.singleton, }); export default createClusterInjectable; diff --git a/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.injectable.ts b/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.injectable.ts index b45b9b47a4..794cfc522a 100644 --- a/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.injectable.ts +++ b/src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.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 electronMenuItemsInjectable from "../../menu/electron-menu-items.injectable"; import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable"; @@ -15,8 +15,6 @@ const initIpcMainHandlersInjectable = getInjectable({ electronMenuItems: di.inject(electronMenuItemsInjectable), directoryForLensLocalStorage: di.inject(directoryForLensLocalStorageInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default initIpcMainHandlersInjectable; diff --git a/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts b/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts index afb3f1485e..6a8699cf9e 100644 --- a/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts +++ b/src/main/kube-auth-proxy/create-kube-auth-proxy.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 { KubeAuthProxy } from "./kube-auth-proxy"; import type { Cluster } from "../../common/cluster/cluster"; import bundledKubectlInjectable from "../kubectl/bundled-kubectl.injectable"; @@ -20,8 +20,6 @@ const createKubeAuthProxyInjectable = getInjectable({ return (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => new KubeAuthProxy(dependencies, cluster, environmentVariables); }, - - lifecycle: lifecycleEnum.singleton, }); export default createKubeAuthProxyInjectable; diff --git a/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts b/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts index e49f8f204e..fd75737555 100644 --- a/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts +++ b/src/main/kubeconfig-manager/create-kubeconfig-manager.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 type { Cluster } from "../../common/cluster/cluster"; import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; import { KubeconfigManager } from "./kubeconfig-manager"; @@ -21,8 +21,6 @@ const createKubeconfigManagerInjectable = getInjectable({ return (cluster: Cluster) => new KubeconfigManager(dependencies, cluster); }, - - lifecycle: lifecycleEnum.singleton, }); export default createKubeconfigManagerInjectable; diff --git a/src/main/kubectl/bundled-kubectl.injectable.ts b/src/main/kubectl/bundled-kubectl.injectable.ts index 8b4e3d60c7..a06cbedff9 100644 --- a/src/main/kubectl/bundled-kubectl.injectable.ts +++ b/src/main/kubectl/bundled-kubectl.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 { getBundledKubectlVersion } from "../../common/utils"; import createKubectlInjectable from "./create-kubectl.injectable"; @@ -16,8 +16,6 @@ const bundledKubectlInjectable = getInjectable({ return createKubectl(bundledKubectlVersion); }, - - lifecycle: lifecycleEnum.singleton, }); export default bundledKubectlInjectable; diff --git a/src/main/kubectl/create-kubectl.injectable.ts b/src/main/kubectl/create-kubectl.injectable.ts index 3bb850b77e..dac0cf684c 100644 --- a/src/main/kubectl/create-kubectl.injectable.ts +++ b/src/main/kubectl/create-kubectl.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 { Kubectl } from "./kubectl"; import directoryForKubectlBinariesInjectable from "./directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable"; import userStoreInjectable from "../../common/user-store/user-store.injectable"; @@ -22,8 +22,6 @@ const createKubectlInjectable = getInjectable({ return (clusterVersion: string) => new Kubectl(dependencies, clusterVersion); }, - - lifecycle: lifecycleEnum.singleton, }); export default createKubectlInjectable; diff --git a/src/main/kubectl/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable.ts b/src/main/kubectl/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable.ts index 5d9534e64a..75a3cc421d 100644 --- a/src/main/kubectl/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable.ts +++ b/src/main/kubectl/directory-for-kubectl-binaries/directory-for-kubectl-binaries.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 directoryForBinariesInjectable from "../../../common/app-paths/directory-for-binaries/directory-for-binaries.injectable"; import path from "path"; @@ -11,8 +11,6 @@ const directoryForKubectlBinariesInjectable = getInjectable({ instantiate: (di) => path.join(di.inject(directoryForBinariesInjectable), "kubectl"), - - lifecycle: lifecycleEnum.singleton, }); export default directoryForKubectlBinariesInjectable; diff --git a/src/main/menu/electron-menu-items.injectable.ts b/src/main/menu/electron-menu-items.injectable.ts index 04cc8bc724..ff0206b734 100644 --- a/src/main/menu/electron-menu-items.injectable.ts +++ b/src/main/menu/electron-menu-items.injectable.ts @@ -2,13 +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 mainExtensionsInjectable from "../../extensions/main-extensions.injectable"; const electronMenuItemsInjectable = getInjectable({ id: "electron-menu-items", - lifecycle: lifecycleEnum.singleton, instantiate: (di) => { const extensions = di.inject(mainExtensionsInjectable); diff --git a/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable.ts b/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable.ts index 59a09ffdd0..f09a7c2b8a 100644 --- a/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable.ts +++ b/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.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 { LensProtocolRouterMain } from "./lens-protocol-router-main"; import extensionsStoreInjectable from "../../../extensions/extensions-store/extensions-store.injectable"; @@ -15,8 +15,6 @@ const lensProtocolRouterMainInjectable = getInjectable({ extensionLoader: di.inject(extensionLoaderInjectable), extensionsStore: di.inject(extensionsStoreInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default lensProtocolRouterMainInjectable; diff --git a/src/main/proxy-functions/shell-api-request/shell-api-request.injectable.ts b/src/main/proxy-functions/shell-api-request/shell-api-request.injectable.ts index 0ead82c238..73477d1889 100644 --- a/src/main/proxy-functions/shell-api-request/shell-api-request.injectable.ts +++ b/src/main/proxy-functions/shell-api-request/shell-api-request.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 { shellApiRequest } from "./shell-api-request"; import createShellSessionInjectable from "../../shell-session/create-shell-session.injectable"; import shellRequestAuthenticatorInjectable @@ -15,8 +15,6 @@ const shellApiRequestInjectable = getInjectable({ createShellSession: di.inject(createShellSessionInjectable), authenticateRequest: di.inject(shellRequestAuthenticatorInjectable).authenticate, }), - - lifecycle: lifecycleEnum.singleton, }); export default shellApiRequestInjectable; diff --git a/src/main/proxy-functions/shell-api-request/shell-request-authenticator/shell-request-authenticator.injectable.ts b/src/main/proxy-functions/shell-api-request/shell-request-authenticator/shell-request-authenticator.injectable.ts index bdf24406a6..c273f105d0 100644 --- a/src/main/proxy-functions/shell-api-request/shell-request-authenticator/shell-request-authenticator.injectable.ts +++ b/src/main/proxy-functions/shell-api-request/shell-request-authenticator/shell-request-authenticator.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 { ShellRequestAuthenticator } from "./shell-request-authenticator"; const shellRequestAuthenticatorInjectable = getInjectable({ @@ -15,8 +15,6 @@ const shellRequestAuthenticatorInjectable = getInjectable({ return authenticator; }, - - lifecycle: lifecycleEnum.singleton, }); export default shellRequestAuthenticatorInjectable; diff --git a/src/main/router/router.injectable.ts b/src/main/router/router.injectable.ts index 291f8c7c88..d7372824b4 100644 --- a/src/main/router/router.injectable.ts +++ b/src/main/router/router.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 { Router } from "../router"; import routePortForwardInjectable from "../routes/port-forward/route-port-forward/route-port-forward.injectable"; @@ -13,8 +13,6 @@ const routerInjectable = getInjectable({ instantiate: (di) => new Router({ routePortForward: di.inject(routePortForwardInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default routerInjectable; diff --git a/src/main/routes/port-forward/create-port-forward.injectable.ts b/src/main/routes/port-forward/create-port-forward.injectable.ts index c3e487e415..bc00f7d791 100644 --- a/src/main/routes/port-forward/create-port-forward.injectable.ts +++ b/src/main/routes/port-forward/create-port-forward.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 { PortForward, PortForwardArgs } from "./port-forward"; import bundledKubectlInjectable from "../../kubectl/bundled-kubectl.injectable"; @@ -19,8 +19,6 @@ const createPortForwardInjectable = getInjectable({ return (pathToKubeConfig: string, args: PortForwardArgs) => new PortForward(dependencies, pathToKubeConfig, args); }, - - lifecycle: lifecycleEnum.singleton, }); export default createPortForwardInjectable; diff --git a/src/main/routes/port-forward/route-port-forward/route-port-forward.injectable.ts b/src/main/routes/port-forward/route-port-forward/route-port-forward.injectable.ts index 5063bce8b7..af7758d0eb 100644 --- a/src/main/routes/port-forward/route-port-forward/route-port-forward.injectable.ts +++ b/src/main/routes/port-forward/route-port-forward/route-port-forward.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { routePortForward } from "./route-port-forward"; -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import createPortForwardInjectable from "../create-port-forward.injectable"; const routePortForwardInjectable = getInjectable({ @@ -12,8 +12,6 @@ const routePortForwardInjectable = getInjectable({ instantiate: (di) => routePortForward({ createPortForward: di.inject(createPortForwardInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default routePortForwardInjectable; diff --git a/src/main/shell-session/create-shell-session.injectable.ts b/src/main/shell-session/create-shell-session.injectable.ts index 34947a1e82..5bd5569053 100644 --- a/src/main/shell-session/create-shell-session.injectable.ts +++ b/src/main/shell-session/create-shell-session.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 type { Cluster } from "../../common/cluster/cluster"; import type WebSocket from "ws"; import localShellSessionInjectable from "./local-shell-session/local-shell-session.injectable"; @@ -24,8 +24,6 @@ const createShellSessionInjectable = getInjectable({ !nodeName ? di.inject(localShellSessionInjectable, rest) : di.inject(nodeShellSessionInjectable, { nodeName, ...rest }), - - lifecycle: lifecycleEnum.singleton, }); export default createShellSessionInjectable; diff --git a/src/main/tray/tray-menu-items.injectable.ts b/src/main/tray/tray-menu-items.injectable.ts index 7512591fc2..8ee9d25e5e 100644 --- a/src/main/tray/tray-menu-items.injectable.ts +++ b/src/main/tray/tray-menu-items.injectable.ts @@ -2,15 +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 { computed } from "mobx"; import mainExtensionsInjectable from "../../extensions/main-extensions.injectable"; const trayItemsInjectable = getInjectable({ id: "tray-items", - lifecycle: lifecycleEnum.singleton, - instantiate: (di) => { const extensions = di.inject(mainExtensionsInjectable); diff --git a/src/renderer/api/catalog-entity-registry/catalog-entity-registry.injectable.ts b/src/renderer/api/catalog-entity-registry/catalog-entity-registry.injectable.ts index 3544b3413d..98af561838 100644 --- a/src/renderer/api/catalog-entity-registry/catalog-entity-registry.injectable.ts +++ b/src/renderer/api/catalog-entity-registry/catalog-entity-registry.injectable.ts @@ -2,13 +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 { catalogEntityRegistry } from "../catalog-entity-registry"; const catalogEntityRegistryInjectable = getInjectable({ id: "catalog-entity-registry", instantiate: () => catalogEntityRegistry, - lifecycle: lifecycleEnum.singleton, }); export default catalogEntityRegistryInjectable; diff --git a/src/renderer/app-paths/app-paths.injectable.ts b/src/renderer/app-paths/app-paths.injectable.ts index 6ce43d5b59..1e80d7cd82 100644 --- a/src/renderer/app-paths/app-paths.injectable.ts +++ b/src/renderer/app-paths/app-paths.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 { AppPaths, appPathsInjectionToken, appPathsIpcChannel } from "../../common/app-paths/app-path-injection-token"; import getValueFromRegisteredChannelInjectable from "./get-value-from-registered-channel/get-value-from-registered-channel.injectable"; @@ -22,8 +22,6 @@ const appPathsInjectable = getInjectable({ instantiate: () => syncAppPaths, injectionToken: appPathsInjectionToken, - - lifecycle: lifecycleEnum.singleton, }); export default appPathsInjectable; diff --git a/src/renderer/app-paths/get-value-from-registered-channel/get-value-from-registered-channel.injectable.ts b/src/renderer/app-paths/get-value-from-registered-channel/get-value-from-registered-channel.injectable.ts index 73c0b89247..697783fbf5 100644 --- a/src/renderer/app-paths/get-value-from-registered-channel/get-value-from-registered-channel.injectable.ts +++ b/src/renderer/app-paths/get-value-from-registered-channel/get-value-from-registered-channel.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 ipcRendererInjectable from "./ipc-renderer/ipc-renderer.injectable"; import { getValueFromRegisteredChannel } from "./get-value-from-registered-channel"; @@ -11,8 +11,6 @@ const getValueFromRegisteredChannelInjectable = getInjectable({ instantiate: (di) => getValueFromRegisteredChannel({ ipcRenderer: di.inject(ipcRendererInjectable) }), - - lifecycle: lifecycleEnum.singleton, }); export default getValueFromRegisteredChannelInjectable; diff --git a/src/renderer/app-paths/get-value-from-registered-channel/ipc-renderer/ipc-renderer.injectable.ts b/src/renderer/app-paths/get-value-from-registered-channel/ipc-renderer/ipc-renderer.injectable.ts index 0ecd08b8cb..c0d7ff3afd 100644 --- a/src/renderer/app-paths/get-value-from-registered-channel/ipc-renderer/ipc-renderer.injectable.ts +++ b/src/renderer/app-paths/get-value-from-registered-channel/ipc-renderer/ipc-renderer.injectable.ts @@ -2,13 +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 { ipcRenderer } from "electron"; const ipcRendererInjectable = getInjectable({ id: "ipc-renderer", instantiate: () => ipcRenderer, - lifecycle: lifecycleEnum.singleton, causesSideEffects: true, }); diff --git a/src/renderer/cluster-frame-context/cluster-frame-context.injectable.ts b/src/renderer/cluster-frame-context/cluster-frame-context.injectable.ts index 3ada2efe8d..ad71a3dd17 100644 --- a/src/renderer/cluster-frame-context/cluster-frame-context.injectable.ts +++ b/src/renderer/cluster-frame-context/cluster-frame-context.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 { ClusterFrameContext } from "./cluster-frame-context"; import namespaceStoreInjectable from "../components/+namespaces/namespace-store/namespace-store.injectable"; import hostedClusterInjectable from "../../common/cluster-store/hosted-cluster.injectable"; @@ -21,8 +21,6 @@ const clusterFrameContextInjectable = getInjectable({ }, ); }, - - lifecycle: lifecycleEnum.singleton, }); export default clusterFrameContextInjectable; diff --git a/src/renderer/components/+catalog/catalog-entity-store/catalog-entity-store.injectable.ts b/src/renderer/components/+catalog/catalog-entity-store/catalog-entity-store.injectable.ts index 822cd51869..8509366307 100644 --- a/src/renderer/components/+catalog/catalog-entity-store/catalog-entity-store.injectable.ts +++ b/src/renderer/components/+catalog/catalog-entity-store/catalog-entity-store.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 { CatalogEntityStore } from "./catalog-entity.store"; import catalogEntityRegistryInjectable from "../../../api/catalog-entity-registry/catalog-entity-registry.injectable"; @@ -12,8 +12,6 @@ const catalogEntityStoreInjectable = getInjectable({ instantiate: (di) => new CatalogEntityStore({ registry: di.inject(catalogEntityRegistryInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default catalogEntityStoreInjectable; diff --git a/src/renderer/components/+catalog/catalog-previous-active-tab-storage/catalog-previous-active-tab-storage.injectable.ts b/src/renderer/components/+catalog/catalog-previous-active-tab-storage/catalog-previous-active-tab-storage.injectable.ts index 2d471cc80c..c978f8667e 100644 --- a/src/renderer/components/+catalog/catalog-previous-active-tab-storage/catalog-previous-active-tab-storage.injectable.ts +++ b/src/renderer/components/+catalog/catalog-previous-active-tab-storage/catalog-previous-active-tab-storage.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 { browseCatalogTab } from "../../../../common/routes"; import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; @@ -17,8 +17,6 @@ const catalogPreviousActiveTabStorageInjectable = getInjectable({ browseCatalogTab, ); }, - - lifecycle: lifecycleEnum.singleton, }); export default catalogPreviousActiveTabStorageInjectable; diff --git a/src/renderer/components/+catalog/custom-category-columns.injectable.tsx b/src/renderer/components/+catalog/custom-category-columns.injectable.tsx index eaf0e3db07..52eabc23eb 100644 --- a/src/renderer/components/+catalog/custom-category-columns.injectable.tsx +++ b/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"; @@ -50,8 +50,6 @@ const categoryColumnsInjectable = getInjectable({ instantiate: (di) => getAdditionCategoryColumns({ extensions: di.inject(rendererExtensionsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default categoryColumnsInjectable; diff --git a/src/renderer/components/+catalog/custom-views.injectable.ts b/src/renderer/components/+catalog/custom-views.injectable.ts index abd0821cd1..f131923a5c 100644 --- a/src/renderer/components/+catalog/custom-views.injectable.ts +++ b/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"; @@ -54,8 +54,6 @@ const customCategoryViewsInjectable = getInjectable({ instantiate: (di) => getCustomCategoryViews({ extensions: di.inject(rendererExtensionsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default customCategoryViewsInjectable; diff --git a/src/renderer/components/+catalog/get-category-columns.injectable.ts b/src/renderer/components/+catalog/get-category-columns.injectable.ts index 5903c0cd84..ad6984d7c9 100644 --- a/src/renderer/components/+catalog/get-category-columns.injectable.ts +++ b/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"; @@ -90,8 +90,6 @@ const getCategoryColumnsInjectable = getInjectable({ instantiate: (di) => getCategoryColumns({ extensionColumns: di.inject(categoryColumnsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default getCategoryColumnsInjectable; diff --git a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts index 27d2611a69..69fdc7a3bc 100644 --- a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts +++ b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.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 { ClusterOverviewStorageState, ClusterOverviewStore, @@ -36,8 +36,6 @@ const clusterOverviewStoreInjectable = getInjectable({ return store; }, - - lifecycle: lifecycleEnum.singleton, }); export default clusterOverviewStoreInjectable; diff --git a/src/renderer/components/+config/route-tabs.injectable.ts b/src/renderer/components/+config/route-tabs.injectable.ts index 87f644fae3..91bf531eff 100644 --- a/src/renderer/components/+config/route-tabs.injectable.ts +++ b/src/renderer/components/+config/route-tabs.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 { computed } from "mobx"; import { HorizontalPodAutoscalers } from "../+config-autoscalers"; import { LimitRanges } from "../+config-limit-ranges"; @@ -86,8 +86,6 @@ const configRoutesInjectable = getInjectable({ instantiate: (di) => getRouteTabs({ isAllowedResource: di.inject(isAllowedResourceInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default configRoutesInjectable; diff --git a/src/renderer/components/+custom-resources/custom-resources.injectable.ts b/src/renderer/components/+custom-resources/custom-resources.injectable.ts index 4277167b88..c35a278afa 100644 --- a/src/renderer/components/+custom-resources/custom-resources.injectable.ts +++ b/src/renderer/components/+custom-resources/custom-resources.injectable.ts @@ -3,7 +3,7 @@ * 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 { crdStore } from "./crd.store"; @@ -11,8 +11,6 @@ const customResourceDefinitionsInjectable = getInjectable({ id: "custom-resource-definitions", instantiate: () => computed(() => [...crdStore.items]), - - lifecycle: lifecycleEnum.singleton, }); export default customResourceDefinitionsInjectable; diff --git a/src/renderer/components/+custom-resources/grouped-custom-resources.injectable.ts b/src/renderer/components/+custom-resources/grouped-custom-resources.injectable.ts index 14ddb5cc99..0c06b6061b 100644 --- a/src/renderer/components/+custom-resources/grouped-custom-resources.injectable.ts +++ b/src/renderer/components/+custom-resources/grouped-custom-resources.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 { computed, IComputedValue } from "mobx"; import type { CustomResourceDefinition } from "../../../common/k8s-api/endpoints"; import { getOrInsert } from "../../utils"; @@ -30,8 +30,6 @@ const groupedCustomResourceDefinitionsInjectable = getInjectable({ instantiate: (di) => getGroupedCustomResourceDefinitions({ definitions: di.inject(customResourceDefinitionsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default groupedCustomResourceDefinitionsInjectable; diff --git a/src/renderer/components/+custom-resources/route-tabs.injectable.ts b/src/renderer/components/+custom-resources/route-tabs.injectable.ts index bbcca72ce4..87fd4b25d3 100644 --- a/src/renderer/components/+custom-resources/route-tabs.injectable.ts +++ b/src/renderer/components/+custom-resources/route-tabs.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 { computed, IComputedValue } from "mobx"; import type { CustomResourceDefinition } from "../../../common/k8s-api/endpoints"; import { crdURL, crdDefinitionsRoute } from "../../../common/routes"; @@ -56,8 +56,6 @@ const customResourcesRouteTabsInjectable = getInjectable({ instantiate: (di) => getRouteTabs({ customResourcesDefinitions: di.inject(groupedCustomResourceDefinitionsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default customResourcesRouteTabsInjectable; diff --git a/src/renderer/components/+extensions/attempt-install-by-info/attempt-install-by-info.injectable.ts b/src/renderer/components/+extensions/attempt-install-by-info/attempt-install-by-info.injectable.ts index 0b3b8eb64d..3703c8e56e 100644 --- a/src/renderer/components/+extensions/attempt-install-by-info/attempt-install-by-info.injectable.ts +++ b/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"; @@ -18,8 +18,6 @@ const attemptInstallByInfoInjectable = getInjectable({ getBaseRegistryUrl: di.inject(getBaseRegistryUrlInjectable), extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default attemptInstallByInfoInjectable; diff --git a/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.ts b/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.ts index 639e60114c..21ceb73ecf 100644 --- a/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.ts +++ b/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"; @@ -25,8 +25,6 @@ const attemptInstallInjectable = getInjectable({ getExtensionDestFolder: di.inject(getExtensionDestFolderInjectable), extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default attemptInstallInjectable; diff --git a/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.injectable.tsx b/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.injectable.tsx index 6f3e036b43..d0d71e6fbe 100644 --- a/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.injectable.tsx +++ b/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.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 { createTempFilesAndValidate } from "./create-temp-files-and-validate"; import extensionDiscoveryInjectable from "../../../../../extensions/extension-discovery/extension-discovery.injectable"; @@ -13,8 +13,6 @@ const createTempFilesAndValidateInjectable = getInjectable({ createTempFilesAndValidate({ extensionDiscovery: di.inject(extensionDiscoveryInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default createTempFilesAndValidateInjectable; diff --git a/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.injectable.ts b/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.injectable.ts index 4d75312afe..3062439e1b 100644 --- a/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.injectable.ts +++ b/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.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 extensionDiscoveryInjectable from "../../../../../extensions/extension-discovery/extension-discovery.injectable"; @@ -15,8 +15,6 @@ const getExtensionDestFolderInjectable = getInjectable({ getExtensionDestFolder({ extensionDiscovery: di.inject(extensionDiscoveryInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default getExtensionDestFolderInjectable; diff --git a/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.injectable.tsx b/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.injectable.tsx index 5095143df0..ebbc3639c5 100644 --- a/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.injectable.tsx +++ b/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 @@ -19,8 +19,6 @@ const unpackExtensionInjectable = getInjectable({ getExtensionDestFolder: di.inject(getExtensionDestFolderInjectable), extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default unpackExtensionInjectable; diff --git a/src/renderer/components/+extensions/attempt-installs/attempt-installs.injectable.ts b/src/renderer/components/+extensions/attempt-installs/attempt-installs.injectable.ts index f2ed5b6db8..407668989f 100644 --- a/src/renderer/components/+extensions/attempt-installs/attempt-installs.injectable.ts +++ b/src/renderer/components/+extensions/attempt-installs/attempt-installs.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 { attemptInstalls } from "./attempt-installs"; import attemptInstallInjectable from "../attempt-install/attempt-install.injectable"; @@ -13,8 +13,6 @@ const attemptInstallsInjectable = getInjectable({ attemptInstalls({ attemptInstall: di.inject(attemptInstallInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default attemptInstallsInjectable; diff --git a/src/renderer/components/+extensions/confirm-uninstall-extension/confirm-uninstall-extension.injectable.ts b/src/renderer/components/+extensions/confirm-uninstall-extension/confirm-uninstall-extension.injectable.ts index 6366977276..560b5adc74 100644 --- a/src/renderer/components/+extensions/confirm-uninstall-extension/confirm-uninstall-extension.injectable.ts +++ b/src/renderer/components/+extensions/confirm-uninstall-extension/confirm-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 { confirmUninstallExtension } from "./confirm-uninstall-extension"; import uninstallExtensionInjectable from "../uninstall-extension/uninstall-extension.injectable"; @@ -13,8 +13,6 @@ const confirmUninstallExtensionInjectable = getInjectable({ confirmUninstallExtension({ uninstallExtension: di.inject(uninstallExtensionInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default confirmUninstallExtensionInjectable; diff --git a/src/renderer/components/+extensions/disable-extension/disable-extension.injectable.ts b/src/renderer/components/+extensions/disable-extension/disable-extension.injectable.ts index 0ce03e35b9..274679c331 100644 --- a/src/renderer/components/+extensions/disable-extension/disable-extension.injectable.ts +++ b/src/renderer/components/+extensions/disable-extension/disable-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 { disableExtension } from "./disable-extension"; @@ -13,8 +13,6 @@ const disableExtensionInjectable = getInjectable({ disableExtension({ extensionLoader: di.inject(extensionLoaderInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default disableExtensionInjectable; diff --git a/src/renderer/components/+extensions/enable-extension/enable-extension.injectable.ts b/src/renderer/components/+extensions/enable-extension/enable-extension.injectable.ts index 6321d252b9..19e5e83233 100644 --- a/src/renderer/components/+extensions/enable-extension/enable-extension.injectable.ts +++ b/src/renderer/components/+extensions/enable-extension/enable-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 { enableExtension } from "./enable-extension"; @@ -13,8 +13,6 @@ const enableExtensionInjectable = getInjectable({ enableExtension({ extensionLoader: di.inject(extensionLoaderInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default enableExtensionInjectable; diff --git a/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.injectable.ts b/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.injectable.ts index 38138ceb92..abfb13e071 100644 --- a/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.injectable.ts +++ b/src/renderer/components/+extensions/get-base-registry-url/get-base-registry-url.injectable.ts @@ -5,7 +5,6 @@ import { getInjectable, - lifecycleEnum, } from "@ogre-tools/injectable"; import { UserStore } from "../../../../common/user-store"; import { getBaseRegistryUrl } from "./get-base-registry-url"; @@ -17,8 +16,6 @@ const getBaseRegistryUrlInjectable = getInjectable({ // TODO: use injection getRegistryUrlPreference: () => UserStore.getInstance().extensionRegistryUrl, }), - - lifecycle: lifecycleEnum.singleton, }); export default getBaseRegistryUrlInjectable; diff --git a/src/renderer/components/+extensions/install-from-input/install-from-input.injectable.ts b/src/renderer/components/+extensions/install-from-input/install-from-input.injectable.ts index 4813ef4f97..36596cd1ff 100644 --- a/src/renderer/components/+extensions/install-from-input/install-from-input.injectable.ts +++ b/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"; @@ -18,8 +18,6 @@ const installFromInputInjectable = getInjectable({ attemptInstallByInfo: di.inject(attemptInstallByInfoInjectable), extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default installFromInputInjectable; diff --git a/src/renderer/components/+extensions/install-from-select-file-dialog.injectable.ts b/src/renderer/components/+extensions/install-from-select-file-dialog.injectable.ts index a13500622d..d0960e306b 100644 --- a/src/renderer/components/+extensions/install-from-select-file-dialog.injectable.ts +++ b/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"; @@ -34,8 +34,6 @@ const installFromSelectFileDialogInjectable = getInjectable({ attemptInstalls: di.inject(attemptInstallsInjectable), directoryForDownloads: di.inject(directoryForDownloadsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default installFromSelectFileDialogInjectable; diff --git a/src/renderer/components/+extensions/install-on-drop/install-on-drop.injectable.ts b/src/renderer/components/+extensions/install-on-drop/install-on-drop.injectable.ts index 02f974ca6e..1a693fa7a6 100644 --- a/src/renderer/components/+extensions/install-on-drop/install-on-drop.injectable.ts +++ b/src/renderer/components/+extensions/install-on-drop/install-on-drop.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 { installOnDrop } from "./install-on-drop"; import attemptInstallsInjectable from "../attempt-installs/attempt-installs.injectable"; @@ -13,8 +13,6 @@ const installOnDropInjectable = getInjectable({ installOnDrop({ attemptInstalls: di.inject(attemptInstallsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default installOnDropInjectable; diff --git a/src/renderer/components/+extensions/uninstall-extension/uninstall-extension.injectable.ts b/src/renderer/components/+extensions/uninstall-extension/uninstall-extension.injectable.ts index cc7c415b79..a060ed7e88 100644 --- a/src/renderer/components/+extensions/uninstall-extension/uninstall-extension.injectable.ts +++ b/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 @@ -19,8 +19,6 @@ const uninstallExtensionInjectable = getInjectable({ extensionDiscovery: di.inject(extensionDiscoveryInjectable), extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default uninstallExtensionInjectable; diff --git a/src/renderer/components/+extensions/user-extensions/user-extensions.injectable.ts b/src/renderer/components/+extensions/user-extensions/user-extensions.injectable.ts index 6e0de8973b..63d5c7a5fc 100644 --- a/src/renderer/components/+extensions/user-extensions/user-extensions.injectable.ts +++ b/src/renderer/components/+extensions/user-extensions/user-extensions.injectable.ts @@ -2,13 +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({ id: "user-extensions", - lifecycle: lifecycleEnum.singleton, instantiate: (di) => { const extensionLoader = di.inject(extensionLoaderInjectable); diff --git a/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts b/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts index e11f95d443..a91a621625 100644 --- a/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts +++ b/src/renderer/components/+helm-releases/create-release/create-release.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 { createRelease, IReleaseCreatePayload, @@ -23,8 +23,6 @@ const createReleaseInjectable = getInjectable({ return release; }; }, - - lifecycle: lifecycleEnum.singleton, }); export default createReleaseInjectable; diff --git a/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts b/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts index e55274ba81..d9755e1e6d 100644 --- a/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts +++ b/src/renderer/components/+helm-releases/delete-release/delete-release.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 { deleteRelease, HelmRelease, @@ -21,8 +21,6 @@ const deleteReleaseInjectable = getInjectable({ releases.invalidate(); }; }, - - lifecycle: lifecycleEnum.singleton, }); export default deleteReleaseInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/release-details.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details.injectable.ts index 6ec05bb802..096259a969 100644 --- a/src/renderer/components/+helm-releases/release-details/release-details.injectable.ts +++ b/src/renderer/components/+helm-releases/release-details/release-details.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 { getRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import { asyncComputed } from "@ogre-tools/injectable-react"; import releaseInjectable from "./release.injectable"; @@ -16,8 +16,6 @@ const releaseDetailsInjectable = getInjectable({ return await getRelease(release.name, release.namespace); }), - - lifecycle: lifecycleEnum.singleton, }); export default releaseDetailsInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/release-route-parameters.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-route-parameters.injectable.ts index 171e3d247a..8ed009932c 100644 --- a/src/renderer/components/+helm-releases/release-details/release-route-parameters.injectable.ts +++ b/src/renderer/components/+helm-releases/release-details/release-route-parameters.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 { computed } from "mobx"; import { matchPath } from "react-router"; import observableHistoryInjectable from "../../../navigation/observable-history.injectable"; @@ -26,8 +26,6 @@ const releaseRouteParametersInjectable = getInjectable({ return releasePathParameters.params; }); }, - - lifecycle: lifecycleEnum.singleton, }); export default releaseRouteParametersInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/release-values.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-values.injectable.ts index 6e5ecc67f0..96cfd6c2dd 100644 --- a/src/renderer/components/+helm-releases/release-details/release-values.injectable.ts +++ b/src/renderer/components/+helm-releases/release-details/release-values.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 { getReleaseValues } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import { asyncComputed } from "@ogre-tools/injectable-react"; import releaseInjectable from "./release.injectable"; @@ -31,8 +31,6 @@ const releaseValuesInjectable = getInjectable({ return ""; } }), - - lifecycle: lifecycleEnum.singleton, }); export default releaseValuesInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/release.injectable.ts b/src/renderer/components/+helm-releases/release-details/release.injectable.ts index 1913a63b12..5506388af2 100644 --- a/src/renderer/components/+helm-releases/release-details/release.injectable.ts +++ b/src/renderer/components/+helm-releases/release-details/release.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 { matches } from "lodash/fp"; import releasesInjectable from "../releases.injectable"; import releaseRouteParametersInjectable from "./release-route-parameters.injectable"; @@ -25,8 +25,6 @@ const releaseInjectable = getInjectable({ return releases.value.get().find(matches({ name, namespace })); }); }, - - lifecycle: lifecycleEnum.singleton, }); export default releaseInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/user-supplied-values-are-shown.injectable.ts b/src/renderer/components/+helm-releases/release-details/user-supplied-values-are-shown.injectable.ts index 573f93ff86..f0201ebee0 100644 --- a/src/renderer/components/+helm-releases/release-details/user-supplied-values-are-shown.injectable.ts +++ b/src/renderer/components/+helm-releases/release-details/user-supplied-values-are-shown.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 { observable } from "mobx"; const userSuppliedValuesAreShownInjectable = getInjectable({ @@ -21,8 +21,6 @@ const userSuppliedValuesAreShownInjectable = getInjectable({ }, }; }, - - lifecycle: lifecycleEnum.singleton, }); export default userSuppliedValuesAreShownInjectable; diff --git a/src/renderer/components/+helm-releases/release-rollback-dialog-model/release-rollback-dialog-model.injectable.ts b/src/renderer/components/+helm-releases/release-rollback-dialog-model/release-rollback-dialog-model.injectable.ts index a5e58413d1..b81bdf438b 100644 --- a/src/renderer/components/+helm-releases/release-rollback-dialog-model/release-rollback-dialog-model.injectable.ts +++ b/src/renderer/components/+helm-releases/release-rollback-dialog-model/release-rollback-dialog-model.injectable.ts @@ -2,13 +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 { ReleaseRollbackDialogModel } from "./release-rollback-dialog-model"; const releaseRollbackDialogModelInjectable = getInjectable({ id: "release-rollback-dialog-model", instantiate: () => new ReleaseRollbackDialogModel(), - lifecycle: lifecycleEnum.singleton, }); export default releaseRollbackDialogModelInjectable; diff --git a/src/renderer/components/+helm-releases/releases.injectable.ts b/src/renderer/components/+helm-releases/releases.injectable.ts index 94799f62b9..597400d661 100644 --- a/src/renderer/components/+helm-releases/releases.injectable.ts +++ b/src/renderer/components/+helm-releases/releases.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 { asyncComputed } from "@ogre-tools/injectable-react"; import namespaceStoreInjectable from "../+namespaces/namespace-store/namespace-store.injectable"; import { listReleases } from "../../../common/k8s-api/endpoints/helm-releases.api"; @@ -35,8 +35,6 @@ const releasesInjectable = getInjectable({ return releaseArrays.flat(); }, []); }, - - lifecycle: lifecycleEnum.singleton, }); export default releasesInjectable; diff --git a/src/renderer/components/+helm-releases/removable-releases.injectable.ts b/src/renderer/components/+helm-releases/removable-releases.injectable.ts index da8ed7b090..5170bd3da3 100644 --- a/src/renderer/components/+helm-releases/removable-releases.injectable.ts +++ b/src/renderer/components/+helm-releases/removable-releases.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 { observable } from "mobx"; import releasesInjectable from "./releases.injectable"; import deleteReleaseInjectable from "./delete-release/delete-release.injectable"; @@ -17,8 +17,6 @@ const removableReleasesInjectable = getInjectable({ deleteRelease: di.inject(deleteReleaseInjectable), releaseSelectionStatus: observable.map(), }), - - lifecycle: lifecycleEnum.singleton, }); export default removableReleasesInjectable; diff --git a/src/renderer/components/+helm-releases/rollback-release/rollback-release.injectable.ts b/src/renderer/components/+helm-releases/rollback-release/rollback-release.injectable.ts index 55b1c4cada..c7ace21e06 100644 --- a/src/renderer/components/+helm-releases/rollback-release/rollback-release.injectable.ts +++ b/src/renderer/components/+helm-releases/rollback-release/rollback-release.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 { rollbackRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import releasesInjectable from "../releases.injectable"; @@ -18,8 +18,6 @@ const rollbackReleaseInjectable = getInjectable({ releases.invalidate(); }; }, - - lifecycle: lifecycleEnum.singleton, }); export default rollbackReleaseInjectable; diff --git a/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts b/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts index 3d40a80733..3400728e77 100644 --- a/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts +++ b/src/renderer/components/+helm-releases/update-release/update-release.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 { IReleaseUpdatePayload, updateRelease, @@ -27,8 +27,6 @@ const updateReleaseInjectable = getInjectable({ return result; }; }, - - lifecycle: lifecycleEnum.singleton, }); export default updateReleaseInjectable; diff --git a/src/renderer/components/+helm/route-tabs.injectable.ts b/src/renderer/components/+helm/route-tabs.injectable.ts index b4df138f20..6b599a368a 100644 --- a/src/renderer/components/+helm/route-tabs.injectable.ts +++ b/src/renderer/components/+helm/route-tabs.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 { computed } from "mobx"; import type { TabLayoutRoute } from "../layout/tab-layout"; import { HelmCharts } from "../+helm-charts"; @@ -29,7 +29,6 @@ function getRouteTabs() { const helmRoutesInjectable = getInjectable({ id: "helm-routes", instantiate: () => getRouteTabs(), - lifecycle: lifecycleEnum.singleton, }); export default helmRoutesInjectable; diff --git a/src/renderer/components/+namespaces/add-namespace-dialog-model/add-namespace-dialog-model.injectable.ts b/src/renderer/components/+namespaces/add-namespace-dialog-model/add-namespace-dialog-model.injectable.ts index 5b90ab2b69..844c3912c0 100644 --- a/src/renderer/components/+namespaces/add-namespace-dialog-model/add-namespace-dialog-model.injectable.ts +++ b/src/renderer/components/+namespaces/add-namespace-dialog-model/add-namespace-dialog-model.injectable.ts @@ -2,13 +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 { AddNamespaceDialogModel } from "./add-namespace-dialog-model"; const addNamespaceDialogModelInjectable = getInjectable({ id: "add-namespace-dialog-model", instantiate: () => new AddNamespaceDialogModel(), - lifecycle: lifecycleEnum.singleton, }); export default addNamespaceDialogModelInjectable; diff --git a/src/renderer/components/+namespaces/namespace-select-filter-model/namespace-select-filter-model.injectable.ts b/src/renderer/components/+namespaces/namespace-select-filter-model/namespace-select-filter-model.injectable.ts index 4a9b4c66d6..571029c853 100644 --- a/src/renderer/components/+namespaces/namespace-select-filter-model/namespace-select-filter-model.injectable.ts +++ b/src/renderer/components/+namespaces/namespace-select-filter-model/namespace-select-filter-model.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { NamespaceSelectFilterModel } from "./namespace-select-filter-model"; -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import namespaceStoreInjectable from "../namespace-store/namespace-store.injectable"; const namespaceSelectFilterModelInjectable = getInjectable({ @@ -12,8 +12,6 @@ const namespaceSelectFilterModelInjectable = getInjectable({ instantiate: (di) => new NamespaceSelectFilterModel({ namespaceStore: di.inject(namespaceStoreInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default namespaceSelectFilterModelInjectable; diff --git a/src/renderer/components/+namespaces/namespace-store/namespace-store.injectable.ts b/src/renderer/components/+namespaces/namespace-store/namespace-store.injectable.ts index 0b145d5bc5..219094be1e 100644 --- a/src/renderer/components/+namespaces/namespace-store/namespace-store.injectable.ts +++ b/src/renderer/components/+namespaces/namespace-store/namespace-store.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 { NamespaceStore } from "./namespace.store"; import apiManagerInjectable from "../../kube-object-menu/dependencies/api-manager.injectable"; import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; @@ -28,8 +28,6 @@ const namespaceStoreInjectable = getInjectable({ return namespaceStore; }, - - lifecycle: lifecycleEnum.singleton, }); export default namespaceStoreInjectable; diff --git a/src/renderer/components/+network/route-tabs.injectable.ts b/src/renderer/components/+network/route-tabs.injectable.ts index 9561c74b60..bef8a69d67 100644 --- a/src/renderer/components/+network/route-tabs.injectable.ts +++ b/src/renderer/components/+network/route-tabs.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 { computed } from "mobx"; import type { TabLayoutRoute } from "../layout/tab-layout"; import { Services } from "../+network-services"; @@ -75,8 +75,6 @@ const networkRouteTabsInjectable = getInjectable({ instantiate: (di) => getRouteTabs({ isAllowedResource: di.inject(isAllowedResourceInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default networkRouteTabsInjectable; diff --git a/src/renderer/components/+preferences/app-preferences/app-preferences.injectable.ts b/src/renderer/components/+preferences/app-preferences/app-preferences.injectable.ts index 911589ed02..83492ad22c 100644 --- a/src/renderer/components/+preferences/app-preferences/app-preferences.injectable.ts +++ b/src/renderer/components/+preferences/app-preferences/app-preferences.injectable.ts @@ -3,7 +3,7 @@ * 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 rendererExtensionsInjectable from "../../../../extensions/renderer-extensions.injectable"; import { getAppPreferences } from "./get-app-preferences"; @@ -14,8 +14,6 @@ const appPreferencesInjectable = getInjectable({ getAppPreferences({ extensions: di.inject(rendererExtensionsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default appPreferencesInjectable; diff --git a/src/renderer/components/+storage/route-tabs.injectable.ts b/src/renderer/components/+storage/route-tabs.injectable.ts index 6aee72c59a..9c7acf50a9 100644 --- a/src/renderer/components/+storage/route-tabs.injectable.ts +++ b/src/renderer/components/+storage/route-tabs.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 { computed } from "mobx"; import type { TabLayoutRoute } from "../layout/tab-layout"; import { PersistentVolumes } from "../+storage-volumes"; @@ -57,8 +57,6 @@ const storageRouteTabsInjectable = getInjectable({ instantiate: (di) => getRouteTabs({ isAllowedResource: di.inject(isAllowedResourceInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default storageRouteTabsInjectable; diff --git a/src/renderer/components/+user-management/route-tabs.injectable.ts b/src/renderer/components/+user-management/route-tabs.injectable.ts index d0b0d28a7e..c4c9f5c134 100644 --- a/src/renderer/components/+user-management/route-tabs.injectable.ts +++ b/src/renderer/components/+user-management/route-tabs.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 { computed } from "mobx"; import type { TabLayoutRoute } from "../layout/tab-layout"; import type { IsAllowedResource } from "../../../common/utils/is-allowed-resource.injectable"; @@ -87,8 +87,6 @@ const userManagementRouteTabsInjectable = getInjectable({ instantiate: (di) => getRouteTabs({ isAllowedResource: di.inject(isAllowedResourceInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default userManagementRouteTabsInjectable; diff --git a/src/renderer/components/+welcome/welcome-banner-items/welcome-banner-items.injectable.ts b/src/renderer/components/+welcome/welcome-banner-items/welcome-banner-items.injectable.ts index e2337cb02a..21f3f6690f 100644 --- a/src/renderer/components/+welcome/welcome-banner-items/welcome-banner-items.injectable.ts +++ b/src/renderer/components/+welcome/welcome-banner-items/welcome-banner-items.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 rendererExtensionsInjectable from "../../../../extensions/renderer-extensions.injectable"; import { computed } from "mobx"; @@ -16,8 +16,6 @@ const welcomeBannerItemsInjectable = getInjectable({ ...extensions.get().flatMap((extension) => extension.welcomeBanners), ]); }, - - lifecycle: lifecycleEnum.singleton, }); export default welcomeBannerItemsInjectable; diff --git a/src/renderer/components/+welcome/welcome-menu-items/welcome-menu-items.injectable.ts b/src/renderer/components/+welcome/welcome-menu-items/welcome-menu-items.injectable.ts index 2543357bf4..1fbfcffed6 100644 --- a/src/renderer/components/+welcome/welcome-menu-items/welcome-menu-items.injectable.ts +++ b/src/renderer/components/+welcome/welcome-menu-items/welcome-menu-items.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 rendererExtensionsInjectable from "../../../../extensions/renderer-extensions.injectable"; import { getWelcomeMenuItems } from "./get-welcome-menu-items"; @@ -13,8 +13,6 @@ const welcomeMenuItemsInjectable = getInjectable({ getWelcomeMenuItems({ extensions: di.inject(rendererExtensionsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default welcomeMenuItemsInjectable; diff --git a/src/renderer/components/+workloads-overview/workloads.injectable.ts b/src/renderer/components/+workloads-overview/workloads.injectable.ts index c9aef6d9bf..646dcb6325 100644 --- a/src/renderer/components/+workloads-overview/workloads.injectable.ts +++ b/src/renderer/components/+workloads-overview/workloads.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 type { KubeResource } from "../../../common/rbac"; import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; @@ -35,8 +35,6 @@ const workloadsInjectable = getInjectable({ ["cronjobs", cronJobStore], ]), }), - - lifecycle: lifecycleEnum.singleton, }); export default workloadsInjectable; diff --git a/src/renderer/components/+workloads/route-tabs.injectable.ts b/src/renderer/components/+workloads/route-tabs.injectable.ts index b3f66f1864..c263734af1 100644 --- a/src/renderer/components/+workloads/route-tabs.injectable.ts +++ b/src/renderer/components/+workloads/route-tabs.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 { computed } from "mobx"; import type { TabLayoutRoute } from "../layout/tab-layout"; import { WorkloadsOverview } from "../+workloads-overview/overview"; @@ -105,8 +105,6 @@ const workloadsRouteTabsInjectable = getInjectable({ instantiate: (di) => getRouteTabs({ isAllowedResource: di.inject(isAllowedResourceInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default workloadsRouteTabsInjectable; diff --git a/src/renderer/components/command-palette/command-overlay.injectable.ts b/src/renderer/components/command-palette/command-overlay.injectable.ts index d1284287fa..542bab957d 100644 --- a/src/renderer/components/command-palette/command-overlay.injectable.ts +++ b/src/renderer/components/command-palette/command-overlay.injectable.ts @@ -3,7 +3,7 @@ * 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 { observable } from "mobx"; import React from "react"; @@ -34,7 +34,6 @@ export class CommandOverlay { const commandOverlayInjectable = getInjectable({ id: "command-overlay", instantiate: () => new CommandOverlay(), - lifecycle: lifecycleEnum.singleton, }); export default commandOverlayInjectable; diff --git a/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx b/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx index 42a5a164df..bc37d3bfc4 100644 --- a/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx +++ b/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx @@ -12,7 +12,7 @@ import { HotbarSwitchCommand } from "../../hotbar/hotbar-switch-command"; import { HotbarRenameCommand } from "../../hotbar/hotbar-rename-command"; import { ActivateEntityCommand } from "../../activate-entity-command"; import type { CommandContext, CommandRegistration } from "./commands"; -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import commandOverlayInjectable from "../command-overlay.injectable"; import createTerminalTabInjectable from "../../dock/terminal/create-terminal-tab.injectable"; import type { DockTabCreate } from "../../dock/dock/store"; @@ -214,8 +214,6 @@ const internalCommandsInjectable = getInjectable({ .getItemsForKind, createTerminalTab: di.inject(createTerminalTabInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default internalCommandsInjectable; diff --git a/src/renderer/components/command-palette/registered-commands/registered-commands.injectable.ts b/src/renderer/components/command-palette/registered-commands/registered-commands.injectable.ts index 7ed3ad5eb7..997934b11b 100644 --- a/src/renderer/components/command-palette/registered-commands/registered-commands.injectable.ts +++ b/src/renderer/components/command-palette/registered-commands/registered-commands.injectable.ts @@ -3,7 +3,7 @@ * 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 { CustomResourceDefinition } from "../../../../common/k8s-api/endpoints"; import customResourceDefinitionsInjectable from "../../+custom-resources/custom-resources.injectable"; @@ -48,8 +48,6 @@ const registeredCommandsInjectable = getInjectable({ customResourceDefinitions: di.inject(customResourceDefinitionsInjectable), internalCommands: di.inject(internalCommandsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default registeredCommandsInjectable; diff --git a/src/renderer/components/dock/create-resource/clear-create-resource-tab-data.injectable.ts b/src/renderer/components/dock/create-resource/clear-create-resource-tab-data.injectable.ts index f088651c23..599696109c 100644 --- a/src/renderer/components/dock/create-resource/clear-create-resource-tab-data.injectable.ts +++ b/src/renderer/components/dock/create-resource/clear-create-resource-tab-data.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 type { TabId } from "../dock/store"; import createResourceTabStoreInjectable from "./store.injectable"; @@ -16,8 +16,6 @@ const clearCreateResourceTabDataInjectable = getInjectable({ createResourceTabStore.clearData(tabId); }; }, - - lifecycle: lifecycleEnum.singleton, }); export default clearCreateResourceTabDataInjectable; diff --git a/src/renderer/components/dock/create-resource/create-resource-tab.injectable.ts b/src/renderer/components/dock/create-resource/create-resource-tab.injectable.ts index 05bea85956..ab7d9b1de5 100644 --- a/src/renderer/components/dock/create-resource/create-resource-tab.injectable.ts +++ b/src/renderer/components/dock/create-resource/create-resource-tab.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 dockStoreInjectable from "../dock/store.injectable"; import { DockTabCreateSpecific, TabKind } from "../dock/store"; @@ -19,8 +19,6 @@ const createResourceTabInjectable = getInjectable({ kind: TabKind.CREATE_RESOURCE, }); }, - - lifecycle: lifecycleEnum.singleton, }); export default createResourceTabInjectable; diff --git a/src/renderer/components/dock/create-resource/create-resource-templates.injectable.ts b/src/renderer/components/dock/create-resource/create-resource-templates.injectable.ts index 2b5d3981d7..a86c5feb57 100644 --- a/src/renderer/components/dock/create-resource/create-resource-templates.injectable.ts +++ b/src/renderer/components/dock/create-resource/create-resource-templates.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 { computed } from "mobx"; import type { GroupSelectOption, SelectOption } from "../../select"; import userCreateResourceTemplatesInjectable from "./user-templates.injectable"; @@ -29,8 +29,6 @@ const createResourceTemplatesInjectable = getInjectable({ }) as GroupSelectOption>); }); }, - - lifecycle: lifecycleEnum.singleton, }); export default createResourceTemplatesInjectable; diff --git a/src/renderer/components/dock/create-resource/lens-templates.injectable.ts b/src/renderer/components/dock/create-resource/lens-templates.injectable.ts index 5fa3a0e968..a83b33011d 100644 --- a/src/renderer/components/dock/create-resource/lens-templates.injectable.ts +++ b/src/renderer/components/dock/create-resource/lens-templates.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 path from "path"; import { hasCorrectExtension } from "./has-correct-extension"; import "../../../../common/vars"; @@ -43,8 +43,6 @@ const lensCreateResourceTemplatesInjectable = getInjectable({ return ["lens", templates]; }, - - lifecycle: lifecycleEnum.singleton, }); export default lensCreateResourceTemplatesInjectable; diff --git a/src/renderer/components/dock/create-resource/store.injectable.ts b/src/renderer/components/dock/create-resource/store.injectable.ts index 9b3c5f339a..4cad7384d8 100644 --- a/src/renderer/components/dock/create-resource/store.injectable.ts +++ b/src/renderer/components/dock/create-resource/store.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 { CreateResourceTabStore } from "./store"; import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; @@ -12,8 +12,6 @@ const createResourceTabStoreInjectable = getInjectable({ instantiate: (di) => new CreateResourceTabStore({ createStorage: di.inject(createStorageInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default createResourceTabStoreInjectable; diff --git a/src/renderer/components/dock/create-resource/user-templates.injectable.ts b/src/renderer/components/dock/create-resource/user-templates.injectable.ts index 4676862e19..2fad8b074c 100644 --- a/src/renderer/components/dock/create-resource/user-templates.injectable.ts +++ b/src/renderer/components/dock/create-resource/user-templates.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 { computed, IComputedValue, observable } from "mobx"; import path from "path"; import os from "os"; @@ -97,7 +97,6 @@ function watchUserCreateResourceTemplates(): IComputedValue { const userCreateResourceTemplatesInjectable = getInjectable({ id: "user-create-resource-templates", instantiate: () => watchUserCreateResourceTemplates(), - lifecycle: lifecycleEnum.singleton, }); export default userCreateResourceTemplatesInjectable; diff --git a/src/renderer/components/dock/dock-tab-store/create-dock-tab-store.injectable.ts b/src/renderer/components/dock/dock-tab-store/create-dock-tab-store.injectable.ts index d3054efcda..399f091c76 100644 --- a/src/renderer/components/dock/dock-tab-store/create-dock-tab-store.injectable.ts +++ b/src/renderer/components/dock/dock-tab-store/create-dock-tab-store.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 { DockTabStore, DockTabStoreOptions } from "./dock-tab.store"; import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; @@ -16,8 +16,6 @@ const createDockTabStoreInjectable = getInjectable({ return (options: DockTabStoreOptions = {}) => new DockTabStore(dependencies, options); }, - - lifecycle: lifecycleEnum.singleton, }); export default createDockTabStoreInjectable; diff --git a/src/renderer/components/dock/dock/close-dock-tab.injectable.ts b/src/renderer/components/dock/dock/close-dock-tab.injectable.ts index b62e019bbd..ab7fdca2cd 100644 --- a/src/renderer/components/dock/dock/close-dock-tab.injectable.ts +++ b/src/renderer/components/dock/dock/close-dock-tab.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 type { TabId } from "./store"; import dockStoreInjectable from "./store.injectable"; @@ -16,8 +16,6 @@ const closeDockTabInjectable = getInjectable({ dockStore.closeTab(tabId); }; }, - - lifecycle: lifecycleEnum.singleton, }); export default closeDockTabInjectable; diff --git a/src/renderer/components/dock/dock/create-dock-tab.injectable.ts b/src/renderer/components/dock/dock/create-dock-tab.injectable.ts index 46bb0fbeb5..84ee7c868e 100644 --- a/src/renderer/components/dock/dock/create-dock-tab.injectable.ts +++ b/src/renderer/components/dock/dock/create-dock-tab.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 dockStoreInjectable from "./store.injectable"; import type { DockTab, DockTabCreate } from "./store"; @@ -15,8 +15,6 @@ const createDockTabInjectable = getInjectable({ return (rawTabDesc: DockTabCreate, addNumber?: boolean): DockTab => dockStore.createTab(rawTabDesc, addNumber); }, - - lifecycle: lifecycleEnum.singleton, }); export default createDockTabInjectable; diff --git a/src/renderer/components/dock/dock/dock-storage.injectable.ts b/src/renderer/components/dock/dock/dock-storage.injectable.ts index 790eccaf9e..df276290c9 100644 --- a/src/renderer/components/dock/dock/dock-storage.injectable.ts +++ b/src/renderer/components/dock/dock/dock-storage.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 createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; import { DockStorageState, TabKind } from "./store"; @@ -24,8 +24,6 @@ const dockStorageInjectable = getInjectable({ ], }); }, - - lifecycle: lifecycleEnum.singleton, }); export default dockStorageInjectable; diff --git a/src/renderer/components/dock/dock/rename-tab.injectable.ts b/src/renderer/components/dock/dock/rename-tab.injectable.ts index 20e8ee8030..b9f24f9cfc 100644 --- a/src/renderer/components/dock/dock/rename-tab.injectable.ts +++ b/src/renderer/components/dock/dock/rename-tab.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 dockStoreInjectable from "./store.injectable"; import type { TabId } from "./store"; @@ -16,8 +16,6 @@ const renameTabInjectable = getInjectable({ dockStore.renameTab(tabId, title); }; }, - - lifecycle: lifecycleEnum.singleton, }); export default renameTabInjectable; diff --git a/src/renderer/components/dock/dock/select-dock-tab.injectable.ts b/src/renderer/components/dock/dock/select-dock-tab.injectable.ts index 2a2a6b014e..7951604deb 100644 --- a/src/renderer/components/dock/dock/select-dock-tab.injectable.ts +++ b/src/renderer/components/dock/dock/select-dock-tab.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 type { TabId } from "./store"; import dockStoreInjectable from "./store.injectable"; @@ -16,8 +16,6 @@ const selectDockTabInjectable = getInjectable({ dockStore.selectTab(tabId); }; }, - - lifecycle: lifecycleEnum.singleton, }); export default selectDockTabInjectable; diff --git a/src/renderer/components/dock/dock/store.injectable.ts b/src/renderer/components/dock/dock/store.injectable.ts index 4e46c1f04f..dac05009ac 100644 --- a/src/renderer/components/dock/dock/store.injectable.ts +++ b/src/renderer/components/dock/dock/store.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 { DockStore, TabKind } from "./store"; import dockStorageInjectable from "./dock-storage.injectable"; import clearLogTabDataInjectable from "../logs/clear-log-tab-data.injectable"; @@ -30,8 +30,6 @@ const dockStoreInjectable = getInjectable({ [TabKind.POD_LOGS]: di.inject(isLogsTabDataValidInjectable), }, }), - - lifecycle: lifecycleEnum.singleton, }); export default dockStoreInjectable; diff --git a/src/renderer/components/dock/edit-resource/clear-edit-resource-tab-data.injectable.ts b/src/renderer/components/dock/edit-resource/clear-edit-resource-tab-data.injectable.ts index 92c006de1c..9f48fc2ee9 100644 --- a/src/renderer/components/dock/edit-resource/clear-edit-resource-tab-data.injectable.ts +++ b/src/renderer/components/dock/edit-resource/clear-edit-resource-tab-data.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 type { TabId } from "../dock/store"; import editResourceTabStoreInjectable from "./store.injectable"; @@ -16,8 +16,6 @@ const clearEditResourceTabDataInjectable = getInjectable({ editResourceTabStore.clearData(tabId); }; }, - - lifecycle: lifecycleEnum.singleton, }); export default clearEditResourceTabDataInjectable; diff --git a/src/renderer/components/dock/edit-resource/edit-resource-tab.injectable.ts b/src/renderer/components/dock/edit-resource/edit-resource-tab.injectable.ts index af7e64e0f6..eeba197acc 100644 --- a/src/renderer/components/dock/edit-resource/edit-resource-tab.injectable.ts +++ b/src/renderer/components/dock/edit-resource/edit-resource-tab.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 editResourceTabStoreInjectable from "./store.injectable"; import dockStoreInjectable from "../dock/store.injectable"; import type { KubeObject } from "../../../../common/k8s-api/kube-object"; @@ -51,8 +51,6 @@ const createEditResourceTabInjectable = getInjectable({ dockStore: di.inject(dockStoreInjectable), editResourceStore: di.inject(editResourceTabStoreInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default createEditResourceTabInjectable; diff --git a/src/renderer/components/dock/edit-resource/store.injectable.ts b/src/renderer/components/dock/edit-resource/store.injectable.ts index a741f7e810..dbf4f44a6d 100644 --- a/src/renderer/components/dock/edit-resource/store.injectable.ts +++ b/src/renderer/components/dock/edit-resource/store.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 { EditResourceTabStore } from "./store"; import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; @@ -12,8 +12,6 @@ const editResourceTabStoreInjectable = getInjectable({ instantiate: (di) => new EditResourceTabStore({ createStorage: di.inject(createStorageInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default editResourceTabStoreInjectable; diff --git a/src/renderer/components/dock/install-chart/clear-install-chart-tab-data.injectable.ts b/src/renderer/components/dock/install-chart/clear-install-chart-tab-data.injectable.ts index 389d85a57a..68fbf3841c 100644 --- a/src/renderer/components/dock/install-chart/clear-install-chart-tab-data.injectable.ts +++ b/src/renderer/components/dock/install-chart/clear-install-chart-tab-data.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 type { TabId } from "../dock/store"; import installChartTabStoreInjectable from "./store.injectable"; @@ -16,8 +16,6 @@ const clearInstallChartTabDataInjectable = getInjectable({ installChartTabStore.clearData(tabId); }; }, - - lifecycle: lifecycleEnum.singleton, }); export default clearInstallChartTabDataInjectable; diff --git a/src/renderer/components/dock/install-chart/create-install-chart-tab.injectable.ts b/src/renderer/components/dock/install-chart/create-install-chart-tab.injectable.ts index 0db83f3fba..4be192504e 100644 --- a/src/renderer/components/dock/install-chart/create-install-chart-tab.injectable.ts +++ b/src/renderer/components/dock/install-chart/create-install-chart-tab.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 installChartTabStoreInjectable from "./store.injectable"; import type { HelmChart } from "../../../../common/k8s-api/endpoints/helm-charts.api"; import { @@ -50,8 +50,6 @@ const createInstallChartTabInjectable = getInjectable({ installChartStore: di.inject(installChartTabStoreInjectable), createDockTab: di.inject(createDockTabInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default createInstallChartTabInjectable; diff --git a/src/renderer/components/dock/install-chart/store.injectable.ts b/src/renderer/components/dock/install-chart/store.injectable.ts index 18eb1039dc..01391a98c0 100644 --- a/src/renderer/components/dock/install-chart/store.injectable.ts +++ b/src/renderer/components/dock/install-chart/store.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 { InstallChartTabStore } from "./store"; import createDockTabStoreInjectable from "../dock-tab-store/create-dock-tab-store.injectable"; import type { IReleaseUpdateDetails } from "../../../../common/k8s-api/endpoints/helm-releases.api"; @@ -20,7 +20,6 @@ const installChartTabStoreInjectable = getInjectable({ detailsStore: createDockTabStore(), }); }, - lifecycle: lifecycleEnum.singleton, }); export default installChartTabStoreInjectable; diff --git a/src/renderer/components/dock/logs/are-logs-present.injectable.ts b/src/renderer/components/dock/logs/are-logs-present.injectable.ts index 372b9aa276..df9b1ca400 100644 --- a/src/renderer/components/dock/logs/are-logs-present.injectable.ts +++ b/src/renderer/components/dock/logs/are-logs-present.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 type { TabId } from "../dock/store"; import logStoreInjectable from "./store.injectable"; @@ -14,8 +14,6 @@ const areLogsPresentInjectable = getInjectable({ return (tabId: TabId) => logStore.areLogsPresent(tabId); }, - - lifecycle: lifecycleEnum.singleton, }); export default areLogsPresentInjectable; diff --git a/src/renderer/components/dock/logs/call-for-logs.injectable.ts b/src/renderer/components/dock/logs/call-for-logs.injectable.ts index 0670197b4b..523503b0b9 100644 --- a/src/renderer/components/dock/logs/call-for-logs.injectable.ts +++ b/src/renderer/components/dock/logs/call-for-logs.injectable.ts @@ -2,13 +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 { podsApi } from "../../../../common/k8s-api/endpoints"; const callForLogsInjectable = getInjectable({ id: "call-for-logs", instantiate: () => podsApi.getLogs, - lifecycle: lifecycleEnum.singleton, }); export default callForLogsInjectable; diff --git a/src/renderer/components/dock/logs/clear-log-tab-data.injectable.ts b/src/renderer/components/dock/logs/clear-log-tab-data.injectable.ts index a169448fe3..4b24ce4478 100644 --- a/src/renderer/components/dock/logs/clear-log-tab-data.injectable.ts +++ b/src/renderer/components/dock/logs/clear-log-tab-data.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 type { TabId } from "../dock/store"; import logTabStoreInjectable from "./tab-store.injectable"; @@ -16,8 +16,6 @@ const clearLogTabDataInjectable = getInjectable({ logTabStore.clearData(tabId); }; }, - - lifecycle: lifecycleEnum.singleton, }); export default clearLogTabDataInjectable; diff --git a/src/renderer/components/dock/logs/create-logs-tab.injectable.ts b/src/renderer/components/dock/logs/create-logs-tab.injectable.ts index e10b3725bb..e7c03bc271 100644 --- a/src/renderer/components/dock/logs/create-logs-tab.injectable.ts +++ b/src/renderer/components/dock/logs/create-logs-tab.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 { DockTabCreate, DockTab, TabKind, TabId } from "../dock/store"; import type { LogTabData } from "./tab-store"; import * as uuid from "uuid"; @@ -43,8 +43,6 @@ const createLogsTabInjectable = getInjectable({ createDockTab: di.inject(createDockTabInjectable), setLogTabData: di.inject(setLogTabDataInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default createLogsTabInjectable; diff --git a/src/renderer/components/dock/logs/create-pod-logs-tab.injectable.ts b/src/renderer/components/dock/logs/create-pod-logs-tab.injectable.ts index 69cc6fe9b8..b16e883535 100644 --- a/src/renderer/components/dock/logs/create-pod-logs-tab.injectable.ts +++ b/src/renderer/components/dock/logs/create-pod-logs-tab.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 type { IPodContainer, Pod } from "../../../../common/k8s-api/endpoints"; import type { TabId } from "../dock/store"; import createLogsTabInjectable from "./create-logs-tab.injectable"; @@ -26,8 +26,6 @@ const createPodLogsTabInjectable = getInjectable({ selectedPodId: selectedPod.getId(), }); }, - - lifecycle: lifecycleEnum.singleton, }); export default createPodLogsTabInjectable; diff --git a/src/renderer/components/dock/logs/create-workload-logs-tab.injectable.ts b/src/renderer/components/dock/logs/create-workload-logs-tab.injectable.ts index 71239584a4..e2fc22fdb3 100644 --- a/src/renderer/components/dock/logs/create-workload-logs-tab.injectable.ts +++ b/src/renderer/components/dock/logs/create-workload-logs-tab.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 { podsStore } from "../../+workloads-pods/pods.store"; import type { WorkloadKubeObject } from "../../../../common/k8s-api/workload-kube-object"; import type { TabId } from "../dock/store"; @@ -43,8 +43,6 @@ const createWorkloadLogsTabInjectable = getInjectable({ instantiate: (di) => createWorkloadLogsTab({ createLogsTab: di.inject(createLogsTabInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default createWorkloadLogsTabInjectable; diff --git a/src/renderer/components/dock/logs/get-log-tab-data.injectable.ts b/src/renderer/components/dock/logs/get-log-tab-data.injectable.ts index 3d80471a59..980c96cf09 100644 --- a/src/renderer/components/dock/logs/get-log-tab-data.injectable.ts +++ b/src/renderer/components/dock/logs/get-log-tab-data.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 type { LogTabData } from "./tab-store"; import logTabStoreInjectable from "./tab-store.injectable"; @@ -14,8 +14,6 @@ const getLogTabDataInjectable = getInjectable({ return (tabId: string): LogTabData => logTabStore.getData(tabId); }, - - lifecycle: lifecycleEnum.singleton, }); export default getLogTabDataInjectable; diff --git a/src/renderer/components/dock/logs/get-logs-without-timestamps.injectable.ts b/src/renderer/components/dock/logs/get-logs-without-timestamps.injectable.ts index bc6724c46d..029e23a4c2 100644 --- a/src/renderer/components/dock/logs/get-logs-without-timestamps.injectable.ts +++ b/src/renderer/components/dock/logs/get-logs-without-timestamps.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 logStoreInjectable from "./store.injectable"; const getLogsWithoutTimestampsInjectable = getInjectable({ @@ -14,8 +14,6 @@ const getLogsWithoutTimestampsInjectable = getInjectable({ return (tabId: string): string[] => logStore.getLogsWithoutTimestamps(tabId); }, - - lifecycle: lifecycleEnum.singleton, }); export default getLogsWithoutTimestampsInjectable; diff --git a/src/renderer/components/dock/logs/get-logs.injectable.ts b/src/renderer/components/dock/logs/get-logs.injectable.ts index 11dd996494..54b02a3761 100644 --- a/src/renderer/components/dock/logs/get-logs.injectable.ts +++ b/src/renderer/components/dock/logs/get-logs.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 logStoreInjectable from "./store.injectable"; const getLogsInjectable = getInjectable({ @@ -13,8 +13,6 @@ const getLogsInjectable = getInjectable({ return (tabId: string): string[] => logStore.getLogs(tabId); }, - - lifecycle: lifecycleEnum.singleton, }); export default getLogsInjectable; diff --git a/src/renderer/components/dock/logs/get-timestamp-split-logs.injectable.ts b/src/renderer/components/dock/logs/get-timestamp-split-logs.injectable.ts index d9b349fc9e..20db0c054f 100644 --- a/src/renderer/components/dock/logs/get-timestamp-split-logs.injectable.ts +++ b/src/renderer/components/dock/logs/get-timestamp-split-logs.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 logStoreInjectable from "./store.injectable"; const getTimestampSplitLogsInjectable = getInjectable({ @@ -14,8 +14,6 @@ const getTimestampSplitLogsInjectable = getInjectable({ return (tabId: string): [string, string][] => logStore.getTimestampSplitLogs(tabId); }, - - lifecycle: lifecycleEnum.singleton, }); export default getTimestampSplitLogsInjectable; diff --git a/src/renderer/components/dock/logs/is-logs-tab-data-valid.injectable.ts b/src/renderer/components/dock/logs/is-logs-tab-data-valid.injectable.ts index 728f5902c5..51e7d3b0ca 100644 --- a/src/renderer/components/dock/logs/is-logs-tab-data-valid.injectable.ts +++ b/src/renderer/components/dock/logs/is-logs-tab-data-valid.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 type { TabId } from "../dock/store"; import logTabStoreInjectable from "./tab-store.injectable"; @@ -14,8 +14,6 @@ const isLogsTabDataValidInjectable = getInjectable({ return (tabId: TabId) => logTabStore.isDataValid(tabId); }, - - lifecycle: lifecycleEnum.singleton, }); export default isLogsTabDataValidInjectable; diff --git a/src/renderer/components/dock/logs/load-logs.injectable.ts b/src/renderer/components/dock/logs/load-logs.injectable.ts index ea5e05afa2..ec95bcbad2 100644 --- a/src/renderer/components/dock/logs/load-logs.injectable.ts +++ b/src/renderer/components/dock/logs/load-logs.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 type { IComputedValue } from "mobx"; import type { Pod } from "../../../../common/k8s-api/endpoints"; import logStoreInjectable from "./store.injectable"; @@ -20,8 +20,6 @@ const loadLogsInjectable = getInjectable({ logTabData: IComputedValue, ): Promise => logStore.load(tabId, pod, logTabData); }, - - lifecycle: lifecycleEnum.singleton, }); export default loadLogsInjectable; diff --git a/src/renderer/components/dock/logs/reload-logs.injectable.ts b/src/renderer/components/dock/logs/reload-logs.injectable.ts index 96b7dab301..a286c063bc 100644 --- a/src/renderer/components/dock/logs/reload-logs.injectable.ts +++ b/src/renderer/components/dock/logs/reload-logs.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 type { IComputedValue } from "mobx"; import type { Pod } from "../../../../common/k8s-api/endpoints"; import logStoreInjectable from "./store.injectable"; @@ -20,8 +20,6 @@ const reloadLogsInjectable = getInjectable({ logTabData: IComputedValue, ): Promise => logStore.reload(tabId, pod, logTabData); }, - - lifecycle: lifecycleEnum.singleton, }); export default reloadLogsInjectable; diff --git a/src/renderer/components/dock/logs/set-log-tab-data.injectable.ts b/src/renderer/components/dock/logs/set-log-tab-data.injectable.ts index f0380c0b36..642d5062ac 100644 --- a/src/renderer/components/dock/logs/set-log-tab-data.injectable.ts +++ b/src/renderer/components/dock/logs/set-log-tab-data.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 type { LogTabData } from "./tab-store"; import logTabStoreInjectable from "./tab-store.injectable"; @@ -14,8 +14,6 @@ const setLogTabDataInjectable = getInjectable({ return (tabId: string, data: LogTabData): void => logTabStore.setData(tabId, data); }, - - lifecycle: lifecycleEnum.singleton, }); export default setLogTabDataInjectable; diff --git a/src/renderer/components/dock/logs/stop-loading-logs.injectable.ts b/src/renderer/components/dock/logs/stop-loading-logs.injectable.ts index 781e728c05..a5a609b200 100644 --- a/src/renderer/components/dock/logs/stop-loading-logs.injectable.ts +++ b/src/renderer/components/dock/logs/stop-loading-logs.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 logStoreInjectable from "./store.injectable"; const stopLoadingLogsInjectable = getInjectable({ @@ -13,8 +13,6 @@ const stopLoadingLogsInjectable = getInjectable({ return (tabId: string): void => logStore.stopLoadingLogs(tabId); }, - - lifecycle: lifecycleEnum.singleton, }); export default stopLoadingLogsInjectable; diff --git a/src/renderer/components/dock/logs/store.injectable.ts b/src/renderer/components/dock/logs/store.injectable.ts index 15d6964947..30c6111a9d 100644 --- a/src/renderer/components/dock/logs/store.injectable.ts +++ b/src/renderer/components/dock/logs/store.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 { LogStore } from "./store"; import callForLogsInjectable from "./call-for-logs.injectable"; @@ -12,8 +12,6 @@ const logStoreInjectable = getInjectable({ instantiate: (di) => new LogStore({ callForLogs: di.inject(callForLogsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default logStoreInjectable; diff --git a/src/renderer/components/dock/logs/tab-store.injectable.ts b/src/renderer/components/dock/logs/tab-store.injectable.ts index ca52d7907a..b711cd8a46 100644 --- a/src/renderer/components/dock/logs/tab-store.injectable.ts +++ b/src/renderer/components/dock/logs/tab-store.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 { LogTabStore } from "./tab-store"; import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; @@ -12,8 +12,6 @@ const logTabStoreInjectable = getInjectable({ instantiate: (di) => new LogTabStore({ createStorage: di.inject(createStorageInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default logTabStoreInjectable; diff --git a/src/renderer/components/dock/terminal/clear-terminal-tab-data.injectable.ts b/src/renderer/components/dock/terminal/clear-terminal-tab-data.injectable.ts index e62dfad0b5..cb017da0e0 100644 --- a/src/renderer/components/dock/terminal/clear-terminal-tab-data.injectable.ts +++ b/src/renderer/components/dock/terminal/clear-terminal-tab-data.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 type { TabId } from "../dock/store"; import terminalStoreInjectable from "./store.injectable"; @@ -16,8 +16,6 @@ const clearTerminalTabDataInjectable = getInjectable({ terminalStore.destroy(tabId); }; }, - - lifecycle: lifecycleEnum.singleton, }); export default clearTerminalTabDataInjectable; diff --git a/src/renderer/components/dock/terminal/create-terminal-tab.injectable.ts b/src/renderer/components/dock/terminal/create-terminal-tab.injectable.ts index d064fcea8a..8ee4ab45b0 100644 --- a/src/renderer/components/dock/terminal/create-terminal-tab.injectable.ts +++ b/src/renderer/components/dock/terminal/create-terminal-tab.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 dockStoreInjectable from "../dock/store.injectable"; import { DockTabCreateSpecific, TabKind } from "../dock/store"; @@ -19,8 +19,6 @@ const createTerminalTabInjectable = getInjectable({ kind: TabKind.TERMINAL, }); }, - - lifecycle: lifecycleEnum.singleton, }); export default createTerminalTabInjectable; diff --git a/src/renderer/components/dock/terminal/create-terminal.injectable.ts b/src/renderer/components/dock/terminal/create-terminal.injectable.ts index 0ba920cf0f..40bba50224 100644 --- a/src/renderer/components/dock/terminal/create-terminal.injectable.ts +++ b/src/renderer/components/dock/terminal/create-terminal.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 { Terminal } from "./terminal"; import type { TabId } from "../dock/store"; import type { TerminalApi } from "../../../api/terminal-api"; @@ -10,7 +10,6 @@ import type { TerminalApi } from "../../../api/terminal-api"; const createTerminalInjectable = getInjectable({ id: "create-terminal", instantiate: () => (tabId: TabId, api: TerminalApi) => new Terminal(tabId, api), - lifecycle: lifecycleEnum.singleton, }); export default createTerminalInjectable; diff --git a/src/renderer/components/dock/terminal/get-terminal-api.injectable.ts b/src/renderer/components/dock/terminal/get-terminal-api.injectable.ts index 3cf9dbb2fb..2dcf0fa62b 100644 --- a/src/renderer/components/dock/terminal/get-terminal-api.injectable.ts +++ b/src/renderer/components/dock/terminal/get-terminal-api.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 type { TerminalApi } from "../../../api/terminal-api"; import type { TabId } from "../dock/store"; import terminalStoreInjectable from "./store.injectable"; @@ -15,8 +15,6 @@ const getTerminalApiInjectable = getInjectable({ return (tabId: TabId): TerminalApi => terminalStore.getTerminalApi(tabId); }, - - lifecycle: lifecycleEnum.singleton, }); export default getTerminalApiInjectable; diff --git a/src/renderer/components/dock/terminal/send-command.injectable.ts b/src/renderer/components/dock/terminal/send-command.injectable.ts index f0b9ed6f82..c193d4804c 100644 --- a/src/renderer/components/dock/terminal/send-command.injectable.ts +++ b/src/renderer/components/dock/terminal/send-command.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 { when } from "mobx"; import { TerminalApi, TerminalChannels } from "../../../api/terminal-api"; import { noop } from "../../../utils"; @@ -86,8 +86,6 @@ const sendCommandInjectable = getInjectable({ selectTab: di.inject(selectDockTabInjectable), getTerminalApi: di.inject(getTerminalApiInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default sendCommandInjectable; diff --git a/src/renderer/components/dock/terminal/store.injectable.ts b/src/renderer/components/dock/terminal/store.injectable.ts index 60acb9d700..b04e8e932e 100644 --- a/src/renderer/components/dock/terminal/store.injectable.ts +++ b/src/renderer/components/dock/terminal/store.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 { TerminalStore } from "./store"; import createTerminalInjectable from "./create-terminal.injectable"; @@ -12,8 +12,6 @@ const terminalStoreInjectable = getInjectable({ instantiate: (di) => new TerminalStore({ createTerminal: di.inject(createTerminalInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default terminalStoreInjectable; diff --git a/src/renderer/components/dock/upgrade-chart/clear-upgrade-chart-tab-data.injectable.ts b/src/renderer/components/dock/upgrade-chart/clear-upgrade-chart-tab-data.injectable.ts index 120f36c2c9..08187d992c 100644 --- a/src/renderer/components/dock/upgrade-chart/clear-upgrade-chart-tab-data.injectable.ts +++ b/src/renderer/components/dock/upgrade-chart/clear-upgrade-chart-tab-data.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 type { TabId } from "../dock/store"; import upgradeChartTabStoreInjectable from "./store.injectable"; @@ -16,8 +16,6 @@ const clearUpgradeChartTabDataInjectable = getInjectable({ upgradeChartTabStore.clearData(tabId); }; }, - - lifecycle: lifecycleEnum.singleton, }); export default clearUpgradeChartTabDataInjectable; diff --git a/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts b/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts index d9d340c62c..655f09410e 100644 --- a/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts +++ b/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.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 upgradeChartTabStoreInjectable from "./store.injectable"; import dockStoreInjectable from "../dock/store.injectable"; import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api"; @@ -51,8 +51,6 @@ const createUpgradeChartTabInjectable = getInjectable({ upgradeChartStore: di.inject(upgradeChartTabStoreInjectable), dockStore: di.inject(dockStoreInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default createUpgradeChartTabInjectable; diff --git a/src/renderer/components/dock/upgrade-chart/store.injectable.ts b/src/renderer/components/dock/upgrade-chart/store.injectable.ts index 11bb5f9541..29a53c41d3 100644 --- a/src/renderer/components/dock/upgrade-chart/store.injectable.ts +++ b/src/renderer/components/dock/upgrade-chart/store.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 { UpgradeChartTabStore } from "./store"; import createDockTabStoreInjectable from "../dock-tab-store/create-dock-tab-store.injectable"; import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; @@ -18,8 +18,6 @@ const upgradeChartTabStoreInjectable = getInjectable({ valuesStore: createDockTabStore(), }); }, - - lifecycle: lifecycleEnum.singleton, }); export default upgradeChartTabStoreInjectable; diff --git a/src/renderer/components/drawer/drawer-storage/drawer-storage.injectable.ts b/src/renderer/components/drawer/drawer-storage/drawer-storage.injectable.ts index 43e9b75670..88ce20801d 100644 --- a/src/renderer/components/drawer/drawer-storage/drawer-storage.injectable.ts +++ b/src/renderer/components/drawer/drawer-storage/drawer-storage.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 createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; export const defaultDrawerWidth = 725; @@ -17,8 +17,6 @@ const drawerStorageInjectable = getInjectable({ width: defaultDrawerWidth, }); }, - - lifecycle: lifecycleEnum.singleton, }); export default drawerStorageInjectable; diff --git a/src/renderer/components/input/validators/unique-hotbar-name.injectable.ts b/src/renderer/components/input/validators/unique-hotbar-name.injectable.ts index b291f89c06..815d73493b 100644 --- a/src/renderer/components/input/validators/unique-hotbar-name.injectable.ts +++ b/src/renderer/components/input/validators/unique-hotbar-name.injectable.ts @@ -3,7 +3,7 @@ * 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 hotbarManagerInjectable from "../../../../common/hotbar-store.injectable"; import type { InputValidator } from "../input_validators"; @@ -15,8 +15,6 @@ const uniqueHotbarNameInjectable = getInjectable({ message: () => "Hotbar with this name already exists", validate: value => !di.inject(hotbarManagerInjectable).getByName(value), } as InputValidator), - - lifecycle: lifecycleEnum.singleton, }); export default uniqueHotbarNameInjectable; diff --git a/src/renderer/components/item-object-list/storage.injectable.ts b/src/renderer/components/item-object-list/storage.injectable.ts index 84c3ab3377..bd33b3b8d0 100644 --- a/src/renderer/components/item-object-list/storage.injectable.ts +++ b/src/renderer/components/item-object-list/storage.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 createStorageInjectable from "../../utils/create-storage/create-storage.injectable"; const itemListLayoutStorageInjectable = getInjectable({ @@ -15,8 +15,6 @@ const itemListLayoutStorageInjectable = getInjectable({ showFilters: false, // setup defaults }); }, - - lifecycle: lifecycleEnum.singleton, }); export default itemListLayoutStorageInjectable; diff --git a/src/renderer/components/kube-object-menu/dependencies/api-manager.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/api-manager.injectable.ts index 4228787004..0fc1dd740b 100644 --- a/src/renderer/components/kube-object-menu/dependencies/api-manager.injectable.ts +++ b/src/renderer/components/kube-object-menu/dependencies/api-manager.injectable.ts @@ -3,12 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { apiManager } from "../../../../common/k8s-api/api-manager"; -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; const apiManagerInjectable = getInjectable({ id: "api-manager", instantiate: () => apiManager, - lifecycle: lifecycleEnum.singleton, }); export default apiManagerInjectable; diff --git a/src/renderer/components/kube-object-menu/dependencies/hide-details.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/hide-details.injectable.ts index f2662830cd..ce399fb406 100644 --- a/src/renderer/components/kube-object-menu/dependencies/hide-details.injectable.ts +++ b/src/renderer/components/kube-object-menu/dependencies/hide-details.injectable.ts @@ -3,12 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { hideDetails } from "../../kube-detail-params"; -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; const hideDetailsInjectable = getInjectable({ id: "hide-details", instantiate: () => hideDetails, - lifecycle: lifecycleEnum.singleton, }); export default hideDetailsInjectable; diff --git a/src/renderer/components/layout/sidebar-storage/sidebar-storage.injectable.ts b/src/renderer/components/layout/sidebar-storage/sidebar-storage.injectable.ts index 6195881814..737639eb94 100644 --- a/src/renderer/components/layout/sidebar-storage/sidebar-storage.injectable.ts +++ b/src/renderer/components/layout/sidebar-storage/sidebar-storage.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 createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; export interface SidebarStorageState { @@ -25,8 +25,6 @@ const sidebarStorageInjectable = getInjectable({ expanded: {}, }); }, - - lifecycle: lifecycleEnum.singleton, }); export default sidebarStorageInjectable; diff --git a/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items.injectable.ts index 47e41a5fcd..851834190f 100644 --- a/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items.injectable.ts +++ b/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items.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 { computed } from "mobx"; import rendererExtensionsInjectable from "../../../../../extensions/renderer-extensions.injectable"; @@ -16,8 +16,6 @@ const topBarItemsInjectable = getInjectable({ extensions.get().flatMap((extension) => extension.topBarItems), ); }, - - lifecycle: lifecycleEnum.singleton, }); export default topBarItemsInjectable; diff --git a/src/renderer/components/table/table-model/table-model.injectable.ts b/src/renderer/components/table/table-model/table-model.injectable.ts index 4b6cf2c1f7..b0fc376ae1 100644 --- a/src/renderer/components/table/table-model/table-model.injectable.ts +++ b/src/renderer/components/table/table-model/table-model.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 createStorageInjectable from "../../../utils/create-storage/create-storage.injectable"; import { TableModel, TableStorageModel } from "./table-model"; @@ -20,8 +20,6 @@ const tableModelInjectable = getInjectable({ storage, }); }, - - lifecycle: lifecycleEnum.singleton, }); export default tableModelInjectable; diff --git a/src/renderer/create-cluster/create-cluster.injectable.ts b/src/renderer/create-cluster/create-cluster.injectable.ts index bd2330e7ff..a0cfba7701 100644 --- a/src/renderer/create-cluster/create-cluster.injectable.ts +++ b/src/renderer/create-cluster/create-cluster.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 { Cluster, ClusterDependencies } from "../../common/cluster/cluster"; import directoryForKubeConfigsInjectable from "../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import { createClusterInjectionToken } from "../../common/cluster/create-cluster-injection-token"; @@ -24,8 +24,6 @@ const createClusterInjectable = getInjectable({ }, injectionToken: createClusterInjectionToken, - - lifecycle: lifecycleEnum.singleton, }); export default createClusterInjectable; diff --git a/src/renderer/frames/cluster-frame/init-cluster-frame/frame-routing-id/frame-routing-id.injectable.ts b/src/renderer/frames/cluster-frame/init-cluster-frame/frame-routing-id/frame-routing-id.injectable.ts index 960d8b9dc4..87f3937fe0 100644 --- a/src/renderer/frames/cluster-frame/init-cluster-frame/frame-routing-id/frame-routing-id.injectable.ts +++ b/src/renderer/frames/cluster-frame/init-cluster-frame/frame-routing-id/frame-routing-id.injectable.ts @@ -2,14 +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 webFrameInjectable from "./web-frame/web-frame.injectable"; const frameRoutingIdInjectable = getInjectable({ id: "frame-routing-id", instantiate: (di) => di.inject(webFrameInjectable).routingId, - - lifecycle: lifecycleEnum.singleton, }); export default frameRoutingIdInjectable; diff --git a/src/renderer/frames/cluster-frame/init-cluster-frame/frame-routing-id/web-frame/web-frame.injectable.ts b/src/renderer/frames/cluster-frame/init-cluster-frame/frame-routing-id/web-frame/web-frame.injectable.ts index c39108f614..f746d33d1a 100644 --- a/src/renderer/frames/cluster-frame/init-cluster-frame/frame-routing-id/web-frame/web-frame.injectable.ts +++ b/src/renderer/frames/cluster-frame/init-cluster-frame/frame-routing-id/web-frame/web-frame.injectable.ts @@ -2,13 +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 { webFrame } from "electron"; const webFrameInjectable = getInjectable({ id: "web-frame", instantiate: () => webFrame, - lifecycle: lifecycleEnum.singleton, causesSideEffects: true, }); diff --git a/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts b/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts index 59bd0e896b..cc1140ca89 100644 --- a/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts +++ b/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.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 { initClusterFrame } from "./init-cluster-frame"; import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable"; import catalogEntityRegistryInjectable from "../../../api/catalog-entity-registry/catalog-entity-registry.injectable"; @@ -24,8 +24,6 @@ const initClusterFrameInjectable = getInjectable({ clusterFrameContext: di.inject(clusterFrameContextInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default initClusterFrameInjectable; diff --git a/src/renderer/frames/root-frame/init-root-frame/init-root-frame.injectable.ts b/src/renderer/frames/root-frame/init-root-frame/init-root-frame.injectable.ts index 9b653aac59..4d78260c19 100644 --- a/src/renderer/frames/root-frame/init-root-frame/init-root-frame.injectable.ts +++ b/src/renderer/frames/root-frame/init-root-frame/init-root-frame.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 { initRootFrame } from "./init-root-frame"; import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable"; import ipcRendererInjectable from "../../../app-paths/get-value-from-registered-channel/ipc-renderer/ipc-renderer.injectable"; @@ -32,8 +32,6 @@ const initRootFrameInjectable = getInjectable({ catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable), }); }, - - lifecycle: lifecycleEnum.singleton, }); export default initRootFrameInjectable; diff --git a/src/renderer/kube-watch-api/kube-watch-api.injectable.ts b/src/renderer/kube-watch-api/kube-watch-api.injectable.ts index d71b9b0e2c..3fc8aa60d3 100644 --- a/src/renderer/kube-watch-api/kube-watch-api.injectable.ts +++ b/src/renderer/kube-watch-api/kube-watch-api.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 clusterFrameContextInjectable from "../cluster-frame-context/cluster-frame-context.injectable"; import { KubeWatchApi } from "./kube-watch-api"; @@ -12,8 +12,6 @@ const kubeWatchApiInjectable = getInjectable({ instantiate: (di) => new KubeWatchApi({ clusterFrameContext: di.inject(clusterFrameContextInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default kubeWatchApiInjectable; diff --git a/src/renderer/kube-watch-api/subscribe-stores.injectable.ts b/src/renderer/kube-watch-api/subscribe-stores.injectable.ts index 99a18a59c8..81c38c387e 100644 --- a/src/renderer/kube-watch-api/subscribe-stores.injectable.ts +++ b/src/renderer/kube-watch-api/subscribe-stores.injectable.ts @@ -2,13 +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 kubeWatchApiInjectable from "./kube-watch-api.injectable"; const subscribeStoresInjectable = getInjectable({ id: "subscribe-stores", instantiate: (di) => di.inject(kubeWatchApiInjectable).subscribeStores, - lifecycle: lifecycleEnum.singleton, }); export default subscribeStoresInjectable; diff --git a/src/renderer/navigation/history.injectable.ts b/src/renderer/navigation/history.injectable.ts index 874493edb3..4361dc9391 100644 --- a/src/renderer/navigation/history.injectable.ts +++ b/src/renderer/navigation/history.injectable.ts @@ -2,13 +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 { history } from "./history"; const historyInjectable = getInjectable({ id: "history", instantiate: () => history, - lifecycle: lifecycleEnum.singleton, }); export default historyInjectable; diff --git a/src/renderer/navigation/observable-history.injectable.ts b/src/renderer/navigation/observable-history.injectable.ts index f59b5529dc..b4995c67c2 100644 --- a/src/renderer/navigation/observable-history.injectable.ts +++ b/src/renderer/navigation/observable-history.injectable.ts @@ -2,14 +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 { navigation as observableHistory } from "./history"; const observableHistoryInjectable = getInjectable({ id: "observable-history", instantiate: () => observableHistory, - lifecycle: lifecycleEnum.singleton, }); export default observableHistoryInjectable; diff --git a/src/renderer/port-forward/port-forward-dialog-model/port-forward-dialog-model.injectable.ts b/src/renderer/port-forward/port-forward-dialog-model/port-forward-dialog-model.injectable.ts index e3e6b7893e..4a4528214f 100644 --- a/src/renderer/port-forward/port-forward-dialog-model/port-forward-dialog-model.injectable.ts +++ b/src/renderer/port-forward/port-forward-dialog-model/port-forward-dialog-model.injectable.ts @@ -2,13 +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 { PortForwardDialogModel } from "./port-forward-dialog-model"; const portForwardDialogModelInjectable = getInjectable({ id: "port-forward-dialog-model", instantiate: () => new PortForwardDialogModel(), - lifecycle: lifecycleEnum.singleton, }); export default portForwardDialogModelInjectable; diff --git a/src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts b/src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts index 9067e88c56..0f90c2d705 100644 --- a/src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts +++ b/src/renderer/port-forward/port-forward-store/port-forward-store.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 { PortForwardStore } from "./port-forward-store"; import type { ForwardedPort } from "../port-forward-item"; import createStorageInjectable from "../../utils/create-storage/create-storage.injectable"; @@ -20,8 +20,6 @@ const portForwardStoreInjectable = getInjectable({ return new PortForwardStore({ storage }); }, - - lifecycle: lifecycleEnum.singleton, }); export default portForwardStoreInjectable; diff --git a/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable.ts b/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable.ts index 9c0a1311b8..26d7968044 100644 --- a/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable.ts +++ b/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.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 attemptInstallByInfoInjectable from "../../components/+extensions/attempt-install-by-info/attempt-install-by-info.injectable"; import { bindProtocolAddRouteHandlers } from "./bind-protocol-add-route-handlers"; import lensProtocolRouterRendererInjectable from "../lens-protocol-router-renderer/lens-protocol-router-renderer.injectable"; @@ -17,8 +17,6 @@ const bindProtocolAddRouteHandlersInjectable = getInjectable({ lensProtocolRouterRendererInjectable, ), }), - - lifecycle: lifecycleEnum.singleton, }); export default bindProtocolAddRouteHandlersInjectable; diff --git a/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable.ts b/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable.ts index 08893ab8df..9aa3df8a0a 100644 --- a/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable.ts +++ b/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.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 { LensProtocolRouterRenderer } from "./lens-protocol-router-renderer"; import extensionsStoreInjectable @@ -16,8 +16,6 @@ const lensProtocolRouterRendererInjectable = getInjectable({ extensionLoader: di.inject(extensionLoaderInjectable), extensionsStore: di.inject(extensionsStoreInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default lensProtocolRouterRendererInjectable; diff --git a/src/renderer/utils/create-storage/create-storage.injectable.ts b/src/renderer/utils/create-storage/create-storage.injectable.ts index c33da80e09..69a999c809 100644 --- a/src/renderer/utils/create-storage/create-storage.injectable.ts +++ b/src/renderer/utils/create-storage/create-storage.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 directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable"; import { createStorage } from "./create-storage"; import readJsonFileInjectable from "../../../common/fs/read-json-file.injectable"; @@ -20,8 +20,6 @@ const createStorageInjectable = getInjectable({ directoryForLensLocalStorageInjectable, ), }), - - lifecycle: lifecycleEnum.singleton, }); export default createStorageInjectable; diff --git a/src/renderer/utils/save-file.injectable.ts b/src/renderer/utils/save-file.injectable.ts index 38e9fcc16e..f38a031e0e 100644 --- a/src/renderer/utils/save-file.injectable.ts +++ b/src/renderer/utils/save-file.injectable.ts @@ -2,13 +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 { saveFileDialog } from "./saveFile"; const openSaveFileDialogInjectable = getInjectable({ id: "open-save-file-dialog", instantiate: () => saveFileDialog, - lifecycle: lifecycleEnum.singleton, }); export default openSaveFileDialogInjectable; diff --git a/src/renderer/window/event-listener.injectable.ts b/src/renderer/window/event-listener.injectable.ts index 5df5fa60a1..5f682d956d 100644 --- a/src/renderer/window/event-listener.injectable.ts +++ b/src/renderer/window/event-listener.injectable.ts @@ -3,7 +3,7 @@ * 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 type { Disposer } from "../utils"; function addWindowEventListener(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, options?: boolean | AddEventListenerOptions): Disposer { @@ -15,7 +15,6 @@ function addWindowEventListener(type: K, listene const windowAddEventListenerInjectable = getInjectable({ id: "window-add-event-listener", instantiate: () => addWindowEventListener, - lifecycle: lifecycleEnum.singleton, }); export default windowAddEventListenerInjectable;