diff --git a/package.json b/package.json index d017e39344..24c41e4261 100644 --- a/package.json +++ b/package.json @@ -202,9 +202,9 @@ "@hapi/call": "^8.0.1", "@hapi/subtext": "^7.0.3", "@kubernetes/client-node": "^0.16.3", - "@ogre-tools/injectable": "5.1.3", - "@ogre-tools/injectable-react": "5.1.3", - "@ogre-tools/fp": "5.1.3", + "@ogre-tools/injectable": "5.2.0", + "@ogre-tools/injectable-react": "5.2.0", + "@ogre-tools/fp": "5.2.0", "@sentry/electron": "^2.5.4", "@sentry/integrations": "^6.19.2", "@types/circular-dependency-plugin": "5.0.5", diff --git a/src/common/__tests__/base-store.test.ts b/src/common/__tests__/base-store.test.ts index a9892d1555..07cea7039e 100644 --- a/src/common/__tests__/base-store.test.ts +++ b/src/common/__tests__/base-store.test.ts @@ -85,11 +85,7 @@ describe("BaseStore", () => { const mainDi = getDiForUnitTesting({ doGeneralOverrides: true }); mainDi.override(directoryForUserDataInjectable, () => "some-user-data-directory"); - - // @ts-ignore mainDi.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore mainDi.permitSideEffects(appVersionInjectable); await mainDi.runSetups(); diff --git a/src/common/__tests__/cluster-store.test.ts b/src/common/__tests__/cluster-store.test.ts index 40822b6729..65377e605c 100644 --- a/src/common/__tests__/cluster-store.test.ts +++ b/src/common/__tests__/cluster-store.test.ts @@ -92,10 +92,7 @@ describe("cluster-store", () => { mainDi.override(clusterStoreInjectable, (di) => ClusterStore.createInstance({ createCluster: di.inject(createClusterInjectionToken) })); mainDi.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); - // @ts-ignore mainDi.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore mainDi.permitSideEffects(appVersionInjectable); await mainDi.runSetups(); diff --git a/src/common/__tests__/hotbar-store.test.ts b/src/common/__tests__/hotbar-store.test.ts index a12ab0ee58..96c2c675d5 100644 --- a/src/common/__tests__/hotbar-store.test.ts +++ b/src/common/__tests__/hotbar-store.test.ts @@ -134,13 +134,8 @@ describe("HotbarStore", () => { beforeEach(async () => { di = getDiForUnitTesting({ doGeneralOverrides: true }); - // @ts-ignore di.permitSideEffects(hotbarStoreInjectable); - - // @ts-ignore di.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore di.permitSideEffects(appVersionInjectable); }); diff --git a/src/common/__tests__/user-store.test.ts b/src/common/__tests__/user-store.test.ts index a606b10e26..9fb3713be1 100644 --- a/src/common/__tests__/user-store.test.ts +++ b/src/common/__tests__/user-store.test.ts @@ -53,10 +53,7 @@ describe("user store tests", () => { di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); di.override(userStoreInjectable, () => UserStore.createInstance()); - // @ts-ignore di.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore di.permitSideEffects(appVersionInjectable); await di.runSetups(); diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts index 1e35976c2c..92681218dd 100644 --- a/src/main/__test__/kube-auth-proxy.test.ts +++ b/src/main/__test__/kube-auth-proxy.test.ts @@ -98,10 +98,7 @@ describe("kube auth proxy tests", () => { di.override(spawnInjectable, () => mockSpawn); - // @ts-ignore di.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore di.permitSideEffects(appVersionInjectable); mockFs(mockMinikubeConfig); diff --git a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts index a4e93c4ce4..782c6e5950 100644 --- a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts +++ b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts @@ -56,10 +56,7 @@ describe("kubeconfig-sync.source tests", () => { ClusterStore.createInstance({ createCluster: () => null }), ); - // @ts-ignore di.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore di.permitSideEffects(appVersionInjectable); di.inject(clusterStoreInjectable); diff --git a/src/main/protocol-handler/__test__/router.test.ts b/src/main/protocol-handler/__test__/router.test.ts index bc3f5b6e51..974582e828 100644 --- a/src/main/protocol-handler/__test__/router.test.ts +++ b/src/main/protocol-handler/__test__/router.test.ts @@ -48,10 +48,7 @@ describe("protocol router tests", () => { di.override(extensionsStoreInjectable, () => ExtensionsStore.createInstance()); - // @ts-ignore di.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore di.permitSideEffects(appVersionInjectable); await di.runSetups(); diff --git a/src/renderer/components/+catalog/catalog.test.tsx b/src/renderer/components/+catalog/catalog.test.tsx index 7242b007f3..b8212ebf66 100644 --- a/src/renderer/components/+catalog/catalog.test.tsx +++ b/src/renderer/components/+catalog/catalog.test.tsx @@ -99,10 +99,7 @@ describe("", () => { di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); - // @ts-ignore di.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore di.permitSideEffects(appVersionInjectable); await di.runSetups(); diff --git a/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/src/renderer/components/+extensions/__tests__/extensions.test.tsx index 42ea06fc60..8335e2c24c 100644 --- a/src/renderer/components/+extensions/__tests__/extensions.test.tsx +++ b/src/renderer/components/+extensions/__tests__/extensions.test.tsx @@ -57,10 +57,7 @@ describe("Extensions", () => { di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); di.override(directoryForDownloadsInjectable, () => "some-directory-for-downloads"); - // @ts-ignore di.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore di.permitSideEffects(appVersionInjectable); mockFs({ diff --git a/src/renderer/components/dock/__test__/dock-tabs.test.tsx b/src/renderer/components/dock/__test__/dock-tabs.test.tsx index f31149bdfe..3bc1f048d7 100644 --- a/src/renderer/components/dock/__test__/dock-tabs.test.tsx +++ b/src/renderer/components/dock/__test__/dock-tabs.test.tsx @@ -84,10 +84,7 @@ describe("", () => { () => "some-test-suite-specific-directory-for-user-data", ); - // @ts-ignore di.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore di.permitSideEffects(appVersionInjectable); await di.runSetups(); diff --git a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx index edb5b6ed05..f9d92aab06 100644 --- a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx +++ b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx @@ -135,10 +135,7 @@ describe("", () => { di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); di.override(callForLogsInjectable, () => () => Promise.resolve("some-logs")); - // @ts-ignore di.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore di.permitSideEffects(appVersionInjectable); render = renderFor(di); diff --git a/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx b/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx index c9ce0942d4..8c37acd4d3 100644 --- a/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx +++ b/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx @@ -45,13 +45,8 @@ describe("", () => { di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); - // @ts-ignore di.permitSideEffects(hotbarStoreInjectable); - - // @ts-ignore di.permitSideEffects(getConfigurationFileModelInjectable); - - // @ts-ignore di.permitSideEffects(appVersionInjectable); render = renderFor(di); diff --git a/src/renderer/components/select/select.test.tsx b/src/renderer/components/select/select.test.tsx index 5e7ce327e2..46530443cb 100644 --- a/src/renderer/components/select/select.test.tsx +++ b/src/renderer/components/select/select.test.tsx @@ -42,10 +42,7 @@ describe("