mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
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>
This commit is contained in:
parent
cef524a3bb
commit
578d3d8290
@ -4,7 +4,7 @@
|
|||||||
"packages": [
|
"packages": [
|
||||||
"packages/*"
|
"packages/*"
|
||||||
],
|
],
|
||||||
"version": "6.4.11",
|
"version": "6.4.12",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"npmClientArgs": [
|
"npmClientArgs": [
|
||||||
"--network-timeout=100000"
|
"--network-timeout=100000"
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
"productName": "",
|
"productName": "",
|
||||||
"description": "Lens Desktop Core",
|
"description": "Lens Desktop Core",
|
||||||
"homepage": "https://github.com/lensapp/lens",
|
"homepage": "https://github.com/lensapp/lens",
|
||||||
"version": "6.4.11",
|
"version": "6.4.12",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "git+https://github.com/lensapp/lens.git"
|
"url": "git+https://github.com/lensapp/lens.git"
|
||||||
|
|||||||
@ -10,11 +10,12 @@ const resolveSystemProxyFromElectronInjectable = getInjectable({
|
|||||||
id: "resolve-system-proxy-from-electron",
|
id: "resolve-system-proxy-from-electron",
|
||||||
|
|
||||||
instantiate: (di) => {
|
instantiate: (di) => {
|
||||||
const helperWindow = di.inject(resolveSystemProxyWindowInjectable);
|
|
||||||
const withErrorLoggingFor = di.inject(withErrorLoggingInjectable);
|
const withErrorLoggingFor = di.inject(withErrorLoggingInjectable);
|
||||||
const withErrorLogging = withErrorLoggingFor(() => "Error resolving proxy");
|
const withErrorLogging = withErrorLoggingFor(() => "Error resolving proxy");
|
||||||
|
|
||||||
return withErrorLogging(async (url: string) => {
|
return withErrorLogging(async (url: string) => {
|
||||||
|
const helperWindow = await di.inject(resolveSystemProxyWindowInjectable);
|
||||||
|
|
||||||
return await helperWindow.webContents.session.resolveProxy(url);
|
return await helperWindow.webContents.session.resolveProxy(url);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
@ -32,7 +32,7 @@ describe("technical: resolve-system-proxy-from-electron", () => {
|
|||||||
|
|
||||||
di.override(
|
di.override(
|
||||||
resolveSystemProxyWindowInjectable,
|
resolveSystemProxyWindowInjectable,
|
||||||
() => ({
|
async () => ({
|
||||||
webContents: {
|
webContents: {
|
||||||
session: {
|
session: {
|
||||||
resolveProxy: resolveSystemProxyMock,
|
resolveProxy: resolveSystemProxyMock,
|
||||||
@ -73,7 +73,7 @@ describe("technical: resolve-system-proxy-from-electron", () => {
|
|||||||
|
|
||||||
di.override(
|
di.override(
|
||||||
resolveSystemProxyWindowInjectable,
|
resolveSystemProxyWindowInjectable,
|
||||||
() => ({
|
async () => ({
|
||||||
webContents: {
|
webContents: {
|
||||||
session: {
|
session: {
|
||||||
resolveProxy: () => {
|
resolveProxy: () => {
|
||||||
|
|||||||
@ -9,7 +9,7 @@ import resolveSystemProxyWindowInjectable from "./resolve-system-proxy-window.in
|
|||||||
|
|
||||||
export default getGlobalOverride(
|
export default getGlobalOverride(
|
||||||
resolveSystemProxyWindowInjectable,
|
resolveSystemProxyWindowInjectable,
|
||||||
() => ({
|
async () => ({
|
||||||
webContents: {
|
webContents: {
|
||||||
session: {
|
session: {
|
||||||
resolveProxy: () => "DIRECT",
|
resolveProxy: () => "DIRECT",
|
||||||
|
|||||||
@ -4,12 +4,24 @@
|
|||||||
*/
|
*/
|
||||||
import { getInjectable } from "@ogre-tools/injectable";
|
import { getInjectable } from "@ogre-tools/injectable";
|
||||||
import { BrowserWindow } from "electron";
|
import { BrowserWindow } from "electron";
|
||||||
|
import electronAppInjectable from "../../electron-app/electron-app.injectable";
|
||||||
|
|
||||||
const resolveSystemProxyWindowInjectable = getInjectable({
|
const resolveSystemProxyWindowInjectable = getInjectable({
|
||||||
id: "resolve-system-proxy-window",
|
id: "resolve-system-proxy-window",
|
||||||
instantiate: () => new BrowserWindow({
|
instantiate: async (di) => {
|
||||||
show: false,
|
const app = di.inject(electronAppInjectable);
|
||||||
}),
|
|
||||||
|
await app.whenReady();
|
||||||
|
|
||||||
|
const window = new BrowserWindow({
|
||||||
|
show: false,
|
||||||
|
paintWhenInitiallyHidden: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
window.hide();
|
||||||
|
|
||||||
|
return window;
|
||||||
|
},
|
||||||
causesSideEffects: true,
|
causesSideEffects: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
"name": "@k8slens/extensions",
|
"name": "@k8slens/extensions",
|
||||||
"productName": "OpenLens extensions",
|
"productName": "OpenLens extensions",
|
||||||
"description": "OpenLens - Open Source Kubernetes IDE: extensions",
|
"description": "OpenLens - Open Source Kubernetes IDE: extensions",
|
||||||
"version": "6.4.11",
|
"version": "6.4.12",
|
||||||
"copyright": "© 2022 OpenLens Authors",
|
"copyright": "© 2022 OpenLens Authors",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"main": "dist/extension-api.js",
|
"main": "dist/extension-api.js",
|
||||||
@ -26,7 +26,7 @@
|
|||||||
"prepare:dev": "yarn run build"
|
"prepare:dev": "yarn run build"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@k8slens/core": "^6.4.11"
|
"@k8slens/core": "^6.4.12"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^16.18.6",
|
"@types/node": "^16.18.6",
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
"productName": "OpenLens",
|
"productName": "OpenLens",
|
||||||
"description": "OpenLens - Open Source IDE for Kubernetes",
|
"description": "OpenLens - Open Source IDE for Kubernetes",
|
||||||
"homepage": "https://github.com/lensapp/lens",
|
"homepage": "https://github.com/lensapp/lens",
|
||||||
"version": "6.4.11",
|
"version": "6.4.12",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "git+https://github.com/lensapp/lens.git"
|
"url": "git+https://github.com/lensapp/lens.git"
|
||||||
@ -192,7 +192,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@k8slens/core": "^6.4.11",
|
"@k8slens/core": "^6.4.12",
|
||||||
"@k8slens/ensure-binaries": "^6.4.0-beta.16",
|
"@k8slens/ensure-binaries": "^6.4.0-beta.16",
|
||||||
"@k8slens/generate-tray-icons": "^6.4.0-beta.16",
|
"@k8slens/generate-tray-icons": "^6.4.0-beta.16",
|
||||||
"@ogre-tools/fp": "^12.0.1",
|
"@ogre-tools/fp": "^12.0.1",
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user