Electron 22.3.3 (#7389)

* electron 22.3.3. Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * fix typo Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * fix crash on quit Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * fix sessionData app path Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * Fix errors after merging new feature Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> Signed-off-by: Sebastian Malton <sebastian@malton.name> Co-authored-by: Sebastian Malton <sebastian@malton.name>
lensapp · Mar 21, 2023 · a920f2c · a920f2c
1 parent 0f1f030
commit a920f2c
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 304 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -257,7 +257,7 @@
     "css-loader": "^6.7.3",
     "deepdash": "^5.3.9",
     "dompurify": "^2.4.4",
-    "electron": "^19.1.9",
+    "electron": "^22.3.3",
     "electron-builder": "^23.6.0",
     "esbuild": "^0.17.8",
     "esbuild-loader": "^2.21.0",

diff --git a/packages/core/src/common/app-paths/app-path-names.ts b/packages/core/src/common/app-paths/app-path-names.ts
@@ -11,7 +11,7 @@ export const pathNames: PathName[] = [
   "home",
   "appData",
   "userData",
-  "cache",
+  "sessionData",
   "temp",
   "exe",
   "module",

diff --git a/packages/core/src/common/app-paths/app-paths.test.ts b/packages/core/src/common/app-paths/app-paths.test.ts
@@ -21,7 +21,6 @@ describe("app-paths", () => {
     const defaultAppPathsStub: AppPaths = {
       currentApp: "/some-current-app",
       appData: "/some-app-data",
-      cache: "/some-cache",
       crashDumps: "/some-crash-dumps",
       desktop: "/some-desktop",
       documents: "/some-documents",
@@ -36,6 +35,7 @@ describe("app-paths", () => {
       temp: "/some-temp",
       videos: "/some-videos",
       userData: "/some-irrelevant-user-data",
+      sessionData: "/some-irrelevant-user-data", //  By default this points to userData
     };
 
     builder.beforeApplicationStart(({ mainDi }) => {
@@ -73,7 +73,6 @@ describe("app-paths", () => {
       expect(actual).toEqual({
         currentApp: "/some-current-app",
         appData: "/some-app-data",
-        cache: "/some-cache",
         crashDumps: "/some-crash-dumps",
         desktop: "/some-desktop",
         documents: "/some-documents",
@@ -88,6 +87,7 @@ describe("app-paths", () => {
         temp: "/some-temp",
         videos: "/some-videos",
         userData: "/some-app-data/some-product-name",
+        sessionData: "/some-app-data/some-product-name",
       });
     });
 
@@ -97,7 +97,6 @@ describe("app-paths", () => {
       expect(actual).toEqual({
         currentApp: "/some-current-app",
         appData: "/some-app-data",
-        cache: "/some-cache",
         crashDumps: "/some-crash-dumps",
         desktop: "/some-desktop",
         documents: "/some-documents",
@@ -112,6 +111,7 @@ describe("app-paths", () => {
         temp: "/some-temp",
         videos: "/some-videos",
         userData: "/some-app-data/some-product-name",
+        sessionData: "/some-app-data/some-product-name",
       });
     });
   });

diff --git a/packages/core/src/common/error-reporting/initialize-sentry-reporting.injectable.ts b/packages/core/src/common/error-reporting/initialize-sentry-reporting.injectable.ts
@@ -13,7 +13,7 @@ import userStoreInjectable from "../user-store/user-store.injectable";
 
 export type InitializeSentryReportingWith = (initSentry: (opts: BrowserOptions | ElectronMainOptions) => void) => void;
 
-const mapProcessName = (type: "browser" | "renderer" | "worker") => type === "browser" ? "main" : type;
+const mapProcessName = (type: "browser" | "renderer" | "worker" | "utility") => type === "browser" ? "main" : type;
 
 const initializeSentryReportingWithInjectable = getInjectable({
   id: "initialize-sentry-reporting-with",

diff --git a/packages/core/src/main/app-paths/setup-app-paths.injectable.ts b/packages/core/src/main/app-paths/setup-app-paths.injectable.ts
@@ -34,6 +34,7 @@ const setupAppPathsInjectable = getInjectable({
       const appDataPath = getElectronAppPath("appData");
 
       setElectronAppPath("userData", joinPaths(appDataPath, appName));
+      setElectronAppPath("sessionData", getElectronAppPath("userData"));
 
       const appPaths = pipeline(
         pathNames,

diff --git a/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-window.injectable.ts b/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-window.injectable.ts
@@ -8,7 +8,11 @@ import { BrowserWindow } from "electron";
 const resolveSystemProxyWindowInjectable = getInjectable({
   id: "resolve-system-proxy-window",
   instantiate: () => {
-    return new BrowserWindow({ show: false, paintWhenInitiallyHidden: false });
+    const window = new BrowserWindow({ show: false });
+
+    window.hide();
+
+    return window;
   },
   causesSideEffects: true,
 });

diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json
@@ -96,7 +96,7 @@
   },
   "build": {
     "npmRebuild": false,
-    "electronVersion": "19.1.9",
+    "electronVersion": "22.3.3",
     "generateUpdatesFilesForAllChannels": true,
     "files": [
       "static/**/*",
@@ -251,7 +251,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "cross-env": "^7.0.3",
     "css-loader": "^6.7.2",
-    "electron": "^19.1.9",
+    "electron": "^22.3.3",
     "electron-builder": "^23.6.0",
     "electron-notarize": "^0.3.0",
     "esbuild-loader": "^2.20.0",

diff --git a/packages/technical-features/application/electron-main/package.json b/packages/technical-features/application/electron-main/package.json
@@ -35,7 +35,7 @@
     "@k8slens/feature-core": "^6.5.0-alpha.0",
     "@ogre-tools/injectable": "^15.1.2",
     "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
-    "electron": "^19.1.9"
+    "electron": "^22.3.3"
   },
   "devDependencies": {
     "@async-fn/jest": "^1.6.4",

diff --git a/packages/technical-features/messaging/electron/main/package.json b/packages/technical-features/messaging/electron/main/package.json
@@ -38,7 +38,7 @@
     "@k8slens/messaging": "^1.0.0-alpha.1",
     "@ogre-tools/injectable": "^15.1.2",
     "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
-    "electron": "^19.1.8",
+    "electron": "^22.3.3",
     "lodash": "^4.17.21"
   },
   "devDependencies": {

diff --git a/packages/technical-features/messaging/electron/renderer/package.json b/packages/technical-features/messaging/electron/renderer/package.json
@@ -39,7 +39,7 @@
     "@k8slens/startable-stoppable": "^1.0.0-alpha.1",
     "@ogre-tools/injectable": "^15.1.2",
     "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
-    "electron": "^19.1.8",
+    "electron": "^22.3.3",
     "lodash": "^4.17.21"
   },
   "devDependencies": {