Remove global shared state to fix unit tests (#5889)

src/common/__tests__/base-store.test.ts

@@ -7,14 +7,9 @@ import mockFs from "mock-fs";
 import { BaseStore } from "../base-store";
 import { action, comparer, makeObservable, observable, toJS } from "mobx";
 import { readFileSync } from "fs";
-
-import directoryForUserDataInjectable
-  from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
-import getConfigurationFileModelInjectable
-  from "../get-configuration-file-model/get-configuration-file-model.injectable";
-import appVersionInjectable
-  from "../get-configuration-file-model/app-version/app-version.injectable";
+import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
 
 jest.mock("electron", () => ({
   ipcMain: {
@@ -86,7 +81,6 @@ describe("BaseStore", () => {
 
     mainDi.override(directoryForUserDataInjectable, () => "some-user-data-directory");
     mainDi.permitSideEffects(getConfigurationFileModelInjectable);
-    mainDi.permitSideEffects(appVersionInjectable);
 
     TestStore.resetInstance();
 

src/common/__tests__/cluster-store.test.ts

@@ -18,7 +18,7 @@ import { createClusterInjectionToken } from "../cluster/create-cluster-injection
 import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
-import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.injectable";
+import appVersionInjectable from "../vars/app-version.injectable";
 import assert from "assert";
 import directoryForTempInjectable from "../app-paths/directory-for-temp/directory-for-temp.injectable";
 import kubectlBinaryNameInjectable from "../../main/kubectl/binary-name.injectable";
@@ -93,7 +93,6 @@ describe("cluster-store", () => {
     mainDi.override(normalizedPlatformInjectable, () => "darwin");
 
     mainDi.permitSideEffects(getConfigurationFileModelInjectable);
-    mainDi.permitSideEffects(appVersionInjectable);
     mainDi.permitSideEffects(clusterStoreInjectable);
     mainDi.permitSideEffects(fsInjectable);
 

src/common/__tests__/hotbar-store.test.ts

@@ -8,7 +8,7 @@ import mockFs from "mock-fs";
 import type { CatalogEntity, CatalogEntityData, CatalogEntityKindData } from "../catalog";
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
-import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.injectable";
+import appVersionInjectable from "../vars/app-version.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
 import hotbarStoreInjectable from "../hotbars/store.injectable";
 import type { HotbarStore } from "../hotbars/store";
@@ -113,7 +113,6 @@ describe("HotbarStore", () => {
     ]));
 
     di.permitSideEffects(getConfigurationFileModelInjectable);
-    di.permitSideEffects(appVersionInjectable);
     di.permitSideEffects(hotbarStoreInjectable);
   });
 

src/common/__tests__/user-store.test.ts

@@ -34,7 +34,7 @@ import { defaultThemeId } from "../vars";
 import writeFileInjectable from "../fs/write-file.injectable";
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
-import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.injectable";
+import appVersionInjectable from "../vars/app-version.injectable";
 
 console = new Console(stdout, stderr);
 
@@ -50,8 +50,6 @@ describe("user store tests", () => {
     di.override(writeFileInjectable, () => () => Promise.resolve());
     di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
     di.permitSideEffects(getConfigurationFileModelInjectable);
-
-    di.permitSideEffects(appVersionInjectable);
     di.permitSideEffects(userStoreInjectable);
 
     di.unoverride(userStoreInjectable);

src/common/application-update/selected-update-channel/default-update-channel.injectable.ts

@@ -3,8 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { SemVer } from "semver";
-import appVersionInjectable from "../../get-configuration-file-model/app-version/app-version.injectable";
+import appSemanticVersionInjectable from "../../vars/app-semantic-version.injectable";
 import type { UpdateChannelId } from "../update-channels";
 import { updateChannels } from "../update-channels";
 
@@ -12,12 +11,11 @@ const defaultUpdateChannelInjectable = getInjectable({
   id: "default-update-channel",
 
   instantiate: (di) => {
-    const appVersion = di.inject(appVersionInjectable);
+    const appSemanticVersion = di.inject(appSemanticVersionInjectable);
+    const currentReleaseChannel = appSemanticVersion.prerelease[0]?.toString();
 
-    const currentReleaseChannel = new SemVer(appVersion).prerelease[0]?.toString() as UpdateChannelId;
-
-    if (currentReleaseChannel && updateChannels[currentReleaseChannel]) {
-      return updateChannels[currentReleaseChannel];
+    if (currentReleaseChannel in updateChannels) {
+      return updateChannels[currentReleaseChannel as UpdateChannelId];
     }
 
     return updateChannels.latest;

src/common/base-store.ts

@@ -19,7 +19,7 @@ import { kebabCase } from "lodash";
 import { getLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import directoryForUserDataInjectable from "./app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import getConfigurationFileModelInjectable from "./get-configuration-file-model/get-configuration-file-model.injectable";
-import appVersionInjectable from "./get-configuration-file-model/app-version/app-version.injectable";
+import appVersionInjectable from "./vars/app-version.injectable";
 
 export interface BaseStoreParams<T> extends ConfOptions<T> {
   syncOptions?: {

src/common/vars.ts

@@ -5,7 +5,6 @@
 
 // App's common configuration for any process (main, renderer, build pipeline, etc.)
 import path from "path";
-import { SemVer } from "semver";
 import packageInfo from "../../package.json";
 import type { ThemeId } from "../renderer/themes/store";
 import { lazyInitialized } from "./utils/lazy-initialized";
@@ -139,7 +138,6 @@ export const lensTwitterWeblinkId = "lens-twitter-link";
 export const lensBlogWeblinkId = "lens-blog-link";
 export const kubernetesDocumentationWeblinkId = "kubernetes-documentation-link";
 
-export const appSemVer = new SemVer(packageInfo.version);
 export const docsUrl = "https://docs.k8slens.dev/main" as string;
 
 export const sentryDsn = packageInfo.config?.sentryDsn ?? "";

src/common/vars/app-semantic-version.injectable.ts

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { SemVer } from "semver";
+import appVersionInjectable from "./app-version.injectable";
+
+const appSemanticVersionInjectable = getInjectable({
+  id: "app-semantic-version",
+  instantiate: (di) => new SemVer(di.inject(appVersionInjectable)),
+});
+
+export default appSemanticVersionInjectable;

src/common/vars/app-version.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import packageJsonInjectable from "../../vars/package-json.injectable";
+import packageJsonInjectable from "./package-json.injectable";
 
 const appVersionInjectable = getInjectable({
   id: "app-version",