Skip to content

Commit 578d3d8

Browse files
Iku-tursojakolehm
andauthored
Release 6.4.12 (#7446)
* wait app to be ready before creating a BrowserWindow for system proxy resolver (#7443) Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * Release 6.4.12 Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> --------- Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> Co-authored-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
1 parent cef524a commit 578d3d8

8 files changed

Lines changed: 26 additions & 13 deletions

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"packages": [
55
"packages/*"
66
],
7-
"version": "6.4.11",
7+
"version": "6.4.12",
88
"npmClient": "yarn",
99
"npmClientArgs": [
1010
"--network-timeout=100000"

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"productName": "",
44
"description": "Lens Desktop Core",
55
"homepage": "https://github.com/lensapp/lens",
6-
"version": "6.4.11",
6+
"version": "6.4.12",
77
"repository": {
88
"type": "git",
99
"url": "git+https://github.com/lensapp/lens.git"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ const resolveSystemProxyFromElectronInjectable = getInjectable({
1010
id: "resolve-system-proxy-from-electron",
1111

1212
instantiate: (di) => {
13-
const helperWindow = di.inject(resolveSystemProxyWindowInjectable);
1413
const withErrorLoggingFor = di.inject(withErrorLoggingInjectable);
1514
const withErrorLogging = withErrorLoggingFor(() => "Error resolving proxy");
1615

1716
return withErrorLogging(async (url: string) => {
17+
const helperWindow = await di.inject(resolveSystemProxyWindowInjectable);
18+
1819
return await helperWindow.webContents.session.resolveProxy(url);
1920
});
2021
},

packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe("technical: resolve-system-proxy-from-electron", () => {
3232

3333
di.override(
3434
resolveSystemProxyWindowInjectable,
35-
() => ({
35+
async () => ({
3636
webContents: {
3737
session: {
3838
resolveProxy: resolveSystemProxyMock,
@@ -73,7 +73,7 @@ describe("technical: resolve-system-proxy-from-electron", () => {
7373

7474
di.override(
7575
resolveSystemProxyWindowInjectable,
76-
() => ({
76+
async () => ({
7777
webContents: {
7878
session: {
7979
resolveProxy: () => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import resolveSystemProxyWindowInjectable from "./resolve-system-proxy-window.in
99

1010
export default getGlobalOverride(
1111
resolveSystemProxyWindowInjectable,
12-
() => ({
12+
async () => ({
1313
webContents: {
1414
session: {
1515
resolveProxy: () => "DIRECT",

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,24 @@
44
*/
55
import { getInjectable } from "@ogre-tools/injectable";
66
import { BrowserWindow } from "electron";
7+
import electronAppInjectable from "../../electron-app/electron-app.injectable";
78

89
const resolveSystemProxyWindowInjectable = getInjectable({
910
id: "resolve-system-proxy-window",
10-
instantiate: () => new BrowserWindow({
11-
show: false,
12-
}),
11+
instantiate: async (di) => {
12+
const app = di.inject(electronAppInjectable);
13+
14+
await app.whenReady();
15+
16+
const window = new BrowserWindow({
17+
show: false,
18+
paintWhenInitiallyHidden: false,
19+
});
20+
21+
window.hide();
22+
23+
return window;
24+
},
1325
causesSideEffects: true,
1426
});
1527

packages/extension-api/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@k8slens/extensions",
33
"productName": "OpenLens extensions",
44
"description": "OpenLens - Open Source Kubernetes IDE: extensions",
5-
"version": "6.4.11",
5+
"version": "6.4.12",
66
"copyright": "© 2022 OpenLens Authors",
77
"license": "MIT",
88
"main": "dist/extension-api.js",
@@ -26,7 +26,7 @@
2626
"prepare:dev": "yarn run build"
2727
},
2828
"dependencies": {
29-
"@k8slens/core": "^6.4.11"
29+
"@k8slens/core": "^6.4.12"
3030
},
3131
"devDependencies": {
3232
"@types/node": "^16.18.6",

packages/open-lens/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"productName": "OpenLens",
55
"description": "OpenLens - Open Source IDE for Kubernetes",
66
"homepage": "https://github.com/lensapp/lens",
7-
"version": "6.4.11",
7+
"version": "6.4.12",
88
"repository": {
99
"type": "git",
1010
"url": "git+https://github.com/lensapp/lens.git"
@@ -192,7 +192,7 @@
192192
}
193193
},
194194
"dependencies": {
195-
"@k8slens/core": "^6.4.11",
195+
"@k8slens/core": "^6.4.12",
196196
"@k8slens/ensure-binaries": "^6.4.0-beta.16",
197197
"@k8slens/generate-tray-icons": "^6.4.0-beta.16",
198198
"@ogre-tools/fp": "^12.0.1",

0 commit comments

Comments
 (0)