From 9115e0b8ecf666cb15821901813181fa2b425570 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Mon, 18 Apr 2022 04:48:30 -0500 Subject: Upgrade electron to '18.0.4' Remove deprecated 'nativeWindowOpen' flag --- babel.config.json | 2 +- package-lock.json | 44 ++++++++--------------- package.json | 2 +- recipes | 2 +- src/components/services/content/ServiceWebview.js | 2 +- src/index.ts | 2 -- 6 files changed, 19 insertions(+), 35 deletions(-) diff --git a/babel.config.json b/babel.config.json index 4a3352900..fd89ad94e 100644 --- a/babel.config.json +++ b/babel.config.json @@ -4,7 +4,7 @@ "@babel/preset-env", { "targets": { - "electron": 17 + "electron": 18 } } ], diff --git a/package-lock.json b/package-lock.json index e751e4171..878a97c10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -114,7 +114,7 @@ "concurrently": "^7.0.0", "cross-env": "^7.0.3", "dotenv": "^10.0.0", - "electron": "17.4.0", + "electron": "18.0.4", "electron-builder": "^22.14.12", "electron-notarize": "^1.1.1", "eslint": "^8.6.0", @@ -4751,9 +4751,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "16.11.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.14.tgz", - "integrity": "sha512-mK6BKLpL0bG6v2CxHbm0ed6RcZrAtTHBTd/ZpnlVPVa3HkumsqLE4BC4u6TQ8D7pnrRbOU0am6epuALs+Ncnzw==", + "version": "16.11.27", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.27.tgz", + "integrity": "sha512-C1pD3kgLoZ56Uuy5lhfOxie4aZlA3UMGLX9rXteq4WitEZH6Rl80mwactt9QG0w0gLFlN/kLBTFnGXtDVWvWQw==", "dev": true }, "node_modules/@types/normalize-package-data": { @@ -10780,14 +10780,14 @@ } }, "node_modules/electron": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-17.4.0.tgz", - "integrity": "sha512-eMuCOZMB9qsY63qzxEkyyqM09qs6mrbPBBDJJZgd8pnPWftE4zKmFp3B1vdHzjQ+1c1r/siigxbWTrpDNNri0A==", + "version": "18.0.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-18.0.4.tgz", + "integrity": "sha512-xfsozNpFr3WzeM1EFlw2qqiqXbCrgQNBJJMlcC4/DUYVpkF8364SZenX7FFFA42NmwXiOEahkvvho/u7UrAcGg==", "dev": true, "hasInstallScript": true, "dependencies": { "@electron/get": "^1.13.0", - "@types/node": "^14.6.2", + "@types/node": "^16.11.26", "extract-zip": "^1.0.3" }, "bin": { @@ -11128,12 +11128,6 @@ "node": ">=8.0.0" } }, - "node_modules/electron/node_modules/@types/node": { - "version": "14.18.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.1.tgz", - "integrity": "sha512-fTFWOFrgAkj737w1o0HLTIgisgYHnsZfeiqhG1Ltrf/iJjudEbUwetQAsfrtVE49JGwvpEzQR+EbMkIqG4227g==", - "dev": true - }, "node_modules/elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -34450,9 +34444,9 @@ "dev": true }, "@types/node": { - "version": "16.11.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.14.tgz", - "integrity": "sha512-mK6BKLpL0bG6v2CxHbm0ed6RcZrAtTHBTd/ZpnlVPVa3HkumsqLE4BC4u6TQ8D7pnrRbOU0am6epuALs+Ncnzw==", + "version": "16.11.27", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.27.tgz", + "integrity": "sha512-C1pD3kgLoZ56Uuy5lhfOxie4aZlA3UMGLX9rXteq4WitEZH6Rl80mwactt9QG0w0gLFlN/kLBTFnGXtDVWvWQw==", "dev": true }, "@types/normalize-package-data": { @@ -39311,22 +39305,14 @@ } }, "electron": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-17.4.0.tgz", - "integrity": "sha512-eMuCOZMB9qsY63qzxEkyyqM09qs6mrbPBBDJJZgd8pnPWftE4zKmFp3B1vdHzjQ+1c1r/siigxbWTrpDNNri0A==", + "version": "18.0.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-18.0.4.tgz", + "integrity": "sha512-xfsozNpFr3WzeM1EFlw2qqiqXbCrgQNBJJMlcC4/DUYVpkF8364SZenX7FFFA42NmwXiOEahkvvho/u7UrAcGg==", "dev": true, "requires": { "@electron/get": "^1.13.0", - "@types/node": "^14.6.2", + "@types/node": "^16.11.26", "extract-zip": "^1.0.3" - }, - "dependencies": { - "@types/node": { - "version": "14.18.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.1.tgz", - "integrity": "sha512-fTFWOFrgAkj737w1o0HLTIgisgYHnsZfeiqhG1Ltrf/iJjudEbUwetQAsfrtVE49JGwvpEzQR+EbMkIqG4227g==", - "dev": true - } } }, "electron-builder": { diff --git a/package.json b/package.json index 6a4bf3bff..7f948cc9d 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "concurrently": "^7.0.0", "cross-env": "^7.0.3", "dotenv": "^10.0.0", - "electron": "17.4.0", + "electron": "18.0.4", "electron-builder": "^22.14.12", "electron-notarize": "^1.1.1", "eslint": "^8.6.0", diff --git a/recipes b/recipes index 18801ed0c..c819fe925 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 18801ed0c02627e87639dc0848cab44dacc18be2 +Subproject commit c819fe925dac556dee8336d3c19147073179c71a diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index 38450b98f..b30a8d9b0 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js @@ -109,7 +109,7 @@ class ServiceWebview extends Component { nodeintegration webpreferences={`spellcheck=${ isSpellcheckerEnabled ? 1 : 0 - }, contextIsolation=1, nativeWindowOpen=1`} + }, contextIsolation=1`} /> ); } diff --git a/src/index.ts b/src/index.ts index 013cf93ce..1721651e4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -213,7 +213,6 @@ const createWindow = () => { contextIsolation: false, webviewTag: true, preload: join(__dirname, 'sentry.js'), - nativeWindowOpen: true, }, }); @@ -525,7 +524,6 @@ ipcMain.on('open-browser-window', (_e, { url, serviceId }) => { fullscreenable: false, webPreferences: { session: serviceSession, - nativeWindowOpen: true, }, }); enableWebContents(child.webContents); -- cgit v1.2.3-54-g00ecf