hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Release 6.4.12 (#7446)

Browse Source 
* 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>
This commit is contained in:
Iku-turso 2023-03-31 15:38:37 +03:00 committed by GitHub
parent cef524a3bb
commit 578d3d8290
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -4,7 +4,7 @@
"packages": [
"packages/*"
],
"version": "6.4.11",
"version": "6.4.12",
"npmClient": "yarn",
"npmClientArgs": [
"--network-timeout=100000"

2
packages/core/package.json
View File

@ -3,7 +3,7 @@
"productName": "",
"description": "Lens Desktop Core",
"homepage": "https://github.com/lensapp/lens",
"version": "6.4.11",
"version": "6.4.12",
"repository": {
"type": "git",
"url": "git+https://github.com/lensapp/lens.git"

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

@ -10,11 +10,12 @@ const resolveSystemProxyFromElectronInjectable = getInjectable({
id: "resolve-system-proxy-from-electron",
instantiate: (di) => {
const helperWindow = di.inject(resolveSystemProxyWindowInjectable);
const withErrorLoggingFor = di.inject(withErrorLoggingInjectable);
const withErrorLogging = withErrorLoggingFor(() => "Error resolving proxy");
return withErrorLogging(async (url: string) => {
const helperWindow = await di.inject(resolveSystemProxyWindowInjectable);
return await helperWindow.webContents.session.resolveProxy(url);
});
},

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

@ -32,7 +32,7 @@ describe("technical: resolve-system-proxy-from-electron", () => {
di.override(
resolveSystemProxyWindowInjectable,
() => ({
async () => ({
webContents: {
session: {
resolveProxy: resolveSystemProxyMock,
@ -73,7 +73,7 @@ describe("technical: resolve-system-proxy-from-electron", () => {
di.override(
resolveSystemProxyWindowInjectable,
() => ({
async () => ({
webContents: {
session: {
resolveProxy: () => {

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

@ -9,7 +9,7 @@ import resolveSystemProxyWindowInjectable from "./resolve-system-proxy-window.in
export default getGlobalOverride(
resolveSystemProxyWindowInjectable,
() => ({
async () => ({
webContents: {
session: {
resolveProxy: () => "DIRECT",

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

@ -4,12 +4,24 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import { BrowserWindow } from "electron";
import electronAppInjectable from "../../electron-app/electron-app.injectable";
const resolveSystemProxyWindowInjectable = getInjectable({
id: "resolve-system-proxy-window",
instantiate: () => new BrowserWindow({
show: false,
}),
instantiate: async (di) => {
const app = di.inject(electronAppInjectable);
await app.whenReady();
const window = new BrowserWindow({
show: false,
paintWhenInitiallyHidden: false,
});
window.hide();
return window;
},
causesSideEffects: true,
});

4
packages/extension-api/package.json
View File

@ -2,7 +2,7 @@
"name": "@k8slens/extensions",
"productName": "OpenLens extensions",
"description": "OpenLens - Open Source Kubernetes IDE: extensions",
"version": "6.4.11",
"version": "6.4.12",
"copyright": "© 2022 OpenLens Authors",
"license": "MIT",
"main": "dist/extension-api.js",
@ -26,7 +26,7 @@
"prepare:dev": "yarn run build"
},
"dependencies": {
"@k8slens/core": "^6.4.11"
"@k8slens/core": "^6.4.12"
},
"devDependencies": {
"@types/node": "^16.18.6",

4
packages/open-lens/package.json
View File

@ -4,7 +4,7 @@
"productName": "OpenLens",
"description": "OpenLens - Open Source IDE for Kubernetes",
"homepage": "https://github.com/lensapp/lens",
"version": "6.4.11",
"version": "6.4.12",
"repository": {
"type": "git",
"url": "git+https://github.com/lensapp/lens.git"
@ -192,7 +192,7 @@
}
},
"dependencies": {
"@k8slens/core": "^6.4.11",
"@k8slens/core": "^6.4.12",
"@k8slens/ensure-binaries": "^6.4.0-beta.16",
"@k8slens/generate-tray-icons": "^6.4.0-beta.16",
"@ogre-tools/fp": "^12.0.1",