Skip to content

Commit a920f2c

Browse files
jakolehmNokel81
andauthored
Electron 22.3.3 (lensapp#7389)
* electron 22.3.3. Signed-off-by: Jari Kolehmainen <[email protected]> * fix typo Signed-off-by: Jari Kolehmainen <[email protected]> * fix crash on quit Signed-off-by: Jari Kolehmainen <[email protected]> * fix sessionData app path Signed-off-by: Jari Kolehmainen <[email protected]> * Fix errors after merging new feature Signed-off-by: Sebastian Malton <[email protected]> --------- Signed-off-by: Jari Kolehmainen <[email protected]> Signed-off-by: Sebastian Malton <[email protected]> Co-authored-by: Sebastian Malton <[email protected]>
1 parent 0f1f030 commit a920f2c

File tree

11 files changed

+85
-304
lines changed

11 files changed

+85
-304
lines changed

package-lock.json

Lines changed: 68 additions & 292 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
"css-loader": "^6.7.3",
258258
"deepdash": "^5.3.9",
259259
"dompurify": "^2.4.4",
260-
"electron": "^19.1.9",
260+
"electron": "^22.3.3",
261261
"electron-builder": "^23.6.0",
262262
"esbuild": "^0.17.8",
263263
"esbuild-loader": "^2.21.0",

packages/core/src/common/app-paths/app-path-names.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const pathNames: PathName[] = [
1111
"home",
1212
"appData",
1313
"userData",
14-
"cache",
14+
"sessionData",
1515
"temp",
1616
"exe",
1717
"module",

packages/core/src/common/app-paths/app-paths.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ describe("app-paths", () => {
2121
const defaultAppPathsStub: AppPaths = {
2222
currentApp: "/some-current-app",
2323
appData: "/some-app-data",
24-
cache: "/some-cache",
2524
crashDumps: "/some-crash-dumps",
2625
desktop: "/some-desktop",
2726
documents: "/some-documents",
@@ -36,6 +35,7 @@ describe("app-paths", () => {
3635
temp: "/some-temp",
3736
videos: "/some-videos",
3837
userData: "/some-irrelevant-user-data",
38+
sessionData: "/some-irrelevant-user-data", // By default this points to userData
3939
};
4040

4141
builder.beforeApplicationStart(({ mainDi }) => {
@@ -73,7 +73,6 @@ describe("app-paths", () => {
7373
expect(actual).toEqual({
7474
currentApp: "/some-current-app",
7575
appData: "/some-app-data",
76-
cache: "/some-cache",
7776
crashDumps: "/some-crash-dumps",
7877
desktop: "/some-desktop",
7978
documents: "/some-documents",
@@ -88,6 +87,7 @@ describe("app-paths", () => {
8887
temp: "/some-temp",
8988
videos: "/some-videos",
9089
userData: "/some-app-data/some-product-name",
90+
sessionData: "/some-app-data/some-product-name",
9191
});
9292
});
9393

@@ -97,7 +97,6 @@ describe("app-paths", () => {
9797
expect(actual).toEqual({
9898
currentApp: "/some-current-app",
9999
appData: "/some-app-data",
100-
cache: "/some-cache",
101100
crashDumps: "/some-crash-dumps",
102101
desktop: "/some-desktop",
103102
documents: "/some-documents",
@@ -112,6 +111,7 @@ describe("app-paths", () => {
112111
temp: "/some-temp",
113112
videos: "/some-videos",
114113
userData: "/some-app-data/some-product-name",
114+
sessionData: "/some-app-data/some-product-name",
115115
});
116116
});
117117
});

packages/core/src/common/error-reporting/initialize-sentry-reporting.injectable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import userStoreInjectable from "../user-store/user-store.injectable";
1313

1414
export type InitializeSentryReportingWith = (initSentry: (opts: BrowserOptions | ElectronMainOptions) => void) => void;
1515

16-
const mapProcessName = (type: "browser" | "renderer" | "worker") => type === "browser" ? "main" : type;
16+
const mapProcessName = (type: "browser" | "renderer" | "worker" | "utility") => type === "browser" ? "main" : type;
1717

1818
const initializeSentryReportingWithInjectable = getInjectable({
1919
id: "initialize-sentry-reporting-with",

packages/core/src/main/app-paths/setup-app-paths.injectable.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ const setupAppPathsInjectable = getInjectable({
3434
const appDataPath = getElectronAppPath("appData");
3535

3636
setElectronAppPath("userData", joinPaths(appDataPath, appName));
37+
setElectronAppPath("sessionData", getElectronAppPath("userData"));
3738

3839
const appPaths = pipeline(
3940
pathNames,

packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-window.injectable.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ import { BrowserWindow } from "electron";
88
const resolveSystemProxyWindowInjectable = getInjectable({
99
id: "resolve-system-proxy-window",
1010
instantiate: () => {
11-
return new BrowserWindow({ show: false, paintWhenInitiallyHidden: false });
11+
const window = new BrowserWindow({ show: false });
12+
13+
window.hide();
14+
15+
return window;
1216
},
1317
causesSideEffects: true,
1418
});

packages/open-lens/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
},
9797
"build": {
9898
"npmRebuild": false,
99-
"electronVersion": "19.1.9",
99+
"electronVersion": "22.3.3",
100100
"generateUpdatesFilesForAllChannels": true,
101101
"files": [
102102
"static/**/*",
@@ -251,7 +251,7 @@
251251
"copy-webpack-plugin": "^11.0.0",
252252
"cross-env": "^7.0.3",
253253
"css-loader": "^6.7.2",
254-
"electron": "^19.1.9",
254+
"electron": "^22.3.3",
255255
"electron-builder": "^23.6.0",
256256
"electron-notarize": "^0.3.0",
257257
"esbuild-loader": "^2.20.0",

packages/technical-features/application/electron-main/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@k8slens/feature-core": "^6.5.0-alpha.0",
3636
"@ogre-tools/injectable": "^15.1.2",
3737
"@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
38-
"electron": "^19.1.9"
38+
"electron": "^22.3.3"
3939
},
4040
"devDependencies": {
4141
"@async-fn/jest": "^1.6.4",

packages/technical-features/messaging/electron/main/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@k8slens/messaging": "^1.0.0-alpha.1",
3939
"@ogre-tools/injectable": "^15.1.2",
4040
"@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
41-
"electron": "^19.1.8",
41+
"electron": "^22.3.3",
4242
"lodash": "^4.17.21"
4343
},
4444
"devDependencies": {

0 commit comments

Comments
 (0)