Clean up versioning and packageJson uses (#6196)

src/main/start-main-application/lens-window/application-window/create-application-window.injectable.ts

@@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable";
 import createLensWindowInjectable from "./create-lens-window.injectable";
 import lensProxyPortInjectable from "../../../lens-proxy/lens-proxy-port.injectable";
 import isMacInjectable from "../../../../common/vars/is-mac.injectable";
-import appNameInjectable from "../../../app-paths/app-name/app-name.injectable";
 import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
 import waitUntilBundledExtensionsAreLoadedInjectable from "./wait-until-bundled-extensions-are-loaded.injectable";
 import { applicationWindowInjectionToken } from "./application-window-injection-token";
 import { runInAction } from "mobx";
+import appNameInjectable from "../../../../common/vars/app-name.injectable";
 
 const createApplicationWindowInjectable = getInjectable({
   id: "create-application-window",

src/main/start-main-application/runnables/sentry/initialize-on-main.global-override-for-injectable.ts

@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../../common/test-utils/get-global-override";
+import initializeSentryOnMainInjectable from "./initialize-on-main.injectable";
+
+export default getGlobalOverride(initializeSentryOnMainInjectable, () => () => {});

src/main/start-main-application/runnables/sentry/initialize-on-main.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 { init } from "@sentry/electron/main";
+
+const initializeSentryOnMainInjectable = getInjectable({
+  id: "initialize-sentry-on-main",
+  instantiate: () => init,
+  causesSideEffects: true,
+});
+
+export default initializeSentryOnMainInjectable;

src/main/start-main-application/runnables/sentry/setup.injectable.ts

@@ -0,0 +1,23 @@
+/**
+ * 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 { beforeElectronIsReadyInjectionToken } from "../../runnable-tokens/before-electron-is-ready-injection-token";
+import initializeSentryReportingWithInjectable from "../../../../common/error-reporting/initialize-sentry-reporting.injectable";
+import initializeSentryOnMainInjectable from "./initialize-on-main.injectable";
+
+const setupSentryInjectable = getInjectable({
+  id: "setup-sentry",
+  instantiate: (di) => {
+    const initializeSentryReportingWith = di.inject(initializeSentryReportingWithInjectable);
+    const initializeSentryOnMain = di.inject(initializeSentryOnMainInjectable);
+
+    return {
+      run: () => initializeSentryReportingWith(initializeSentryOnMain),
+    };
+  },
+  injectionToken: beforeElectronIsReadyInjectionToken,
+});
+
+export default setupSentryInjectable;

src/main/start-main-application/runnables/setup-lens-proxy.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 { getAppVersion, getAppVersionFromProxyServer } from "../../../common/utils";
+import { getAppVersionFromProxyServer } from "../../../common/utils";
 import exitAppInjectable from "../../electron-app/features/exit-app.injectable";
 import lensProxyInjectable from "../../lens-proxy/lens-proxy.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
@@ -11,6 +11,7 @@ import lensProxyPortInjectable from "../../lens-proxy/lens-proxy-port.injectable
 import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
 import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable";
 import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token";
+import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
 
 const setupLensProxyInjectable = getInjectable({
   id: "setup-lens-proxy",
@@ -22,6 +23,7 @@ const setupLensProxyInjectable = getInjectable({
     const lensProxyPort = di.inject(lensProxyPortInjectable);
     const isWindows = di.inject(isWindowsInjectable);
     const showErrorPopup = di.inject(showErrorPopupInjectable);
+    const buildVersion = di.inject(buildVersionInjectable);
 
     return {
       run: async () => {
@@ -41,7 +43,7 @@ const setupLensProxyInjectable = getInjectable({
             lensProxyPort.get(),
           );
 
-          if (getAppVersion() !== versionFromProxy) {
+          if (buildVersion.get() !== versionFromProxy) {
             logger.error("Proxy server responded with invalid response");
 
             return exitApp();

src/main/start-main-application/runnables/setup-sentry.injectable.ts

@@ -1,24 +0,0 @@
-/**
- * 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 { initializeSentryReporting } from "../../../common/sentry";
-import { init } from "@sentry/electron/main";
-import { beforeElectronIsReadyInjectionToken } from "../runnable-tokens/before-electron-is-ready-injection-token";
-
-const setupSentryInjectable = getInjectable({
-  id: "setup-sentry",
-
-  instantiate: () => ({
-    run: () => {
-      initializeSentryReporting(init);
-    },
-  }),
-
-  causesSideEffects: true,
-
-  injectionToken: beforeElectronIsReadyInjectionToken,
-});
-
-export default setupSentryInjectable;

src/main/start-main-application/runnables/setup-shell.injectable.ts

@@ -3,21 +3,47 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { shellSync } from "../../shell-sync";
 import loggerInjectable from "../../../common/logger.injectable";
 import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token";
+import { shellEnv } from "../../utils/shell-env";
+import os from "os";
+import { unionPATHs } from "../../../common/utils/union-env-path";
+import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable";
+import electronAppInjectable from "../../electron-app/electron-app.injectable";
 
 const setupShellInjectable = getInjectable({
   id: "setup-shell",
 
   instantiate: (di) => {
     const logger = di.inject(loggerInjectable);
+    const isSnapPackage = di.inject(isSnapPackageInjectable);
+    const electronApp = di.inject(electronAppInjectable);
 
     return {
       run: async () => {
         logger.info("🐚 Syncing shell environment");
 
-        await shellSync();
+        const env = await shellEnv(os.userInfo().shell);
+
+        if (!env.LANG) {
+          // the LANG env var expects an underscore instead of electron's dash
+          env.LANG = `${electronApp.getLocale().replace("-", "_")}.UTF-8`;
+        } else if (!env.LANG.endsWith(".UTF-8")) {
+          env.LANG += ".UTF-8";
+        }
+
+        if (!isSnapPackage) {
+          // Prefer the synced PATH over the initial one
+          process.env.PATH = unionPATHs(env.PATH ?? "",  process.env.PATH ?? "");
+        }
+
+        // The spread operator allows joining of objects. The precedence is last to first.
+        process.env = {
+          ...env,
+          ...process.env,
+        };
+
+        logger.debug(`[SHELL-SYNC]: Synced shell env, and updating`, env, process.env);
       },
     };
   },