diff options
author | Vijay A <vraravam@users.noreply.github.com> | 2022-04-18 04:48:30 -0500 |
---|---|---|
committer | Vijay A <vraravam@users.noreply.github.com> | 2022-04-19 01:16:39 -0500 |
commit | 9115e0b8ecf666cb15821901813181fa2b425570 (patch) | |
tree | 6dcc5b8545671155b1c23db5416ae43f51b7509e | |
parent | Upgrade electron to '17.4.0' (diff) | |
download | ferdium-app-9115e0b8ecf666cb15821901813181fa2b425570.tar.gz ferdium-app-9115e0b8ecf666cb15821901813181fa2b425570.tar.zst ferdium-app-9115e0b8ecf666cb15821901813181fa2b425570.zip |
Upgrade electron to '18.0.4'
Remove deprecated 'nativeWindowOpen' flag
-rw-r--r-- | babel.config.json | 2 | ||||
-rw-r--r-- | package-lock.json | 44 | ||||
-rw-r--r-- | package.json | 2 | ||||
m--------- | recipes | 0 | ||||
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 2 | ||||
-rw-r--r-- | src/index.ts | 2 |
6 files changed, 18 insertions, 34 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 @@ | |||
4 | "@babel/preset-env", | 4 | "@babel/preset-env", |
5 | { | 5 | { |
6 | "targets": { | 6 | "targets": { |
7 | "electron": 17 | 7 | "electron": 18 |
8 | } | 8 | } |
9 | } | 9 | } |
10 | ], | 10 | ], |
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 @@ | |||
114 | "concurrently": "^7.0.0", | 114 | "concurrently": "^7.0.0", |
115 | "cross-env": "^7.0.3", | 115 | "cross-env": "^7.0.3", |
116 | "dotenv": "^10.0.0", | 116 | "dotenv": "^10.0.0", |
117 | "electron": "17.4.0", | 117 | "electron": "18.0.4", |
118 | "electron-builder": "^22.14.12", | 118 | "electron-builder": "^22.14.12", |
119 | "electron-notarize": "^1.1.1", | 119 | "electron-notarize": "^1.1.1", |
120 | "eslint": "^8.6.0", | 120 | "eslint": "^8.6.0", |
@@ -4751,9 +4751,9 @@ | |||
4751 | "dev": true | 4751 | "dev": true |
4752 | }, | 4752 | }, |
4753 | "node_modules/@types/node": { | 4753 | "node_modules/@types/node": { |
4754 | "version": "16.11.14", | 4754 | "version": "16.11.27", |
4755 | "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.14.tgz", | 4755 | "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.27.tgz", |
4756 | "integrity": "sha512-mK6BKLpL0bG6v2CxHbm0ed6RcZrAtTHBTd/ZpnlVPVa3HkumsqLE4BC4u6TQ8D7pnrRbOU0am6epuALs+Ncnzw==", | 4756 | "integrity": "sha512-C1pD3kgLoZ56Uuy5lhfOxie4aZlA3UMGLX9rXteq4WitEZH6Rl80mwactt9QG0w0gLFlN/kLBTFnGXtDVWvWQw==", |
4757 | "dev": true | 4757 | "dev": true |
4758 | }, | 4758 | }, |
4759 | "node_modules/@types/normalize-package-data": { | 4759 | "node_modules/@types/normalize-package-data": { |
@@ -10780,14 +10780,14 @@ | |||
10780 | } | 10780 | } |
10781 | }, | 10781 | }, |
10782 | "node_modules/electron": { | 10782 | "node_modules/electron": { |
10783 | "version": "17.4.0", | 10783 | "version": "18.0.4", |
10784 | "resolved": "https://registry.npmjs.org/electron/-/electron-17.4.0.tgz", | 10784 | "resolved": "https://registry.npmjs.org/electron/-/electron-18.0.4.tgz", |
10785 | "integrity": "sha512-eMuCOZMB9qsY63qzxEkyyqM09qs6mrbPBBDJJZgd8pnPWftE4zKmFp3B1vdHzjQ+1c1r/siigxbWTrpDNNri0A==", | 10785 | "integrity": "sha512-xfsozNpFr3WzeM1EFlw2qqiqXbCrgQNBJJMlcC4/DUYVpkF8364SZenX7FFFA42NmwXiOEahkvvho/u7UrAcGg==", |
10786 | "dev": true, | 10786 | "dev": true, |
10787 | "hasInstallScript": true, | 10787 | "hasInstallScript": true, |
10788 | "dependencies": { | 10788 | "dependencies": { |
10789 | "@electron/get": "^1.13.0", | 10789 | "@electron/get": "^1.13.0", |
10790 | "@types/node": "^14.6.2", | 10790 | "@types/node": "^16.11.26", |
10791 | "extract-zip": "^1.0.3" | 10791 | "extract-zip": "^1.0.3" |
10792 | }, | 10792 | }, |
10793 | "bin": { | 10793 | "bin": { |
@@ -11128,12 +11128,6 @@ | |||
11128 | "node": ">=8.0.0" | 11128 | "node": ">=8.0.0" |
11129 | } | 11129 | } |
11130 | }, | 11130 | }, |
11131 | "node_modules/electron/node_modules/@types/node": { | ||
11132 | "version": "14.18.1", | ||
11133 | "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.1.tgz", | ||
11134 | "integrity": "sha512-fTFWOFrgAkj737w1o0HLTIgisgYHnsZfeiqhG1Ltrf/iJjudEbUwetQAsfrtVE49JGwvpEzQR+EbMkIqG4227g==", | ||
11135 | "dev": true | ||
11136 | }, | ||
11137 | "node_modules/elliptic": { | 11131 | "node_modules/elliptic": { |
11138 | "version": "6.5.4", | 11132 | "version": "6.5.4", |
11139 | "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", | 11133 | "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", |
@@ -34450,9 +34444,9 @@ | |||
34450 | "dev": true | 34444 | "dev": true |
34451 | }, | 34445 | }, |
34452 | "@types/node": { | 34446 | "@types/node": { |
34453 | "version": "16.11.14", | 34447 | "version": "16.11.27", |
34454 | "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.14.tgz", | 34448 | "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.27.tgz", |
34455 | "integrity": "sha512-mK6BKLpL0bG6v2CxHbm0ed6RcZrAtTHBTd/ZpnlVPVa3HkumsqLE4BC4u6TQ8D7pnrRbOU0am6epuALs+Ncnzw==", | 34449 | "integrity": "sha512-C1pD3kgLoZ56Uuy5lhfOxie4aZlA3UMGLX9rXteq4WitEZH6Rl80mwactt9QG0w0gLFlN/kLBTFnGXtDVWvWQw==", |
34456 | "dev": true | 34450 | "dev": true |
34457 | }, | 34451 | }, |
34458 | "@types/normalize-package-data": { | 34452 | "@types/normalize-package-data": { |
@@ -39311,22 +39305,14 @@ | |||
39311 | } | 39305 | } |
39312 | }, | 39306 | }, |
39313 | "electron": { | 39307 | "electron": { |
39314 | "version": "17.4.0", | 39308 | "version": "18.0.4", |
39315 | "resolved": "https://registry.npmjs.org/electron/-/electron-17.4.0.tgz", | 39309 | "resolved": "https://registry.npmjs.org/electron/-/electron-18.0.4.tgz", |
39316 | "integrity": "sha512-eMuCOZMB9qsY63qzxEkyyqM09qs6mrbPBBDJJZgd8pnPWftE4zKmFp3B1vdHzjQ+1c1r/siigxbWTrpDNNri0A==", | 39310 | "integrity": "sha512-xfsozNpFr3WzeM1EFlw2qqiqXbCrgQNBJJMlcC4/DUYVpkF8364SZenX7FFFA42NmwXiOEahkvvho/u7UrAcGg==", |
39317 | "dev": true, | 39311 | "dev": true, |
39318 | "requires": { | 39312 | "requires": { |
39319 | "@electron/get": "^1.13.0", | 39313 | "@electron/get": "^1.13.0", |
39320 | "@types/node": "^14.6.2", | 39314 | "@types/node": "^16.11.26", |
39321 | "extract-zip": "^1.0.3" | 39315 | "extract-zip": "^1.0.3" |
39322 | }, | ||
39323 | "dependencies": { | ||
39324 | "@types/node": { | ||
39325 | "version": "14.18.1", | ||
39326 | "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.1.tgz", | ||
39327 | "integrity": "sha512-fTFWOFrgAkj737w1o0HLTIgisgYHnsZfeiqhG1Ltrf/iJjudEbUwetQAsfrtVE49JGwvpEzQR+EbMkIqG4227g==", | ||
39328 | "dev": true | ||
39329 | } | ||
39330 | } | 39316 | } |
39331 | }, | 39317 | }, |
39332 | "electron-builder": { | 39318 | "electron-builder": { |
diff --git a/package.json b/package.json index 6a4bf3bff..7f948cc9d 100644 --- a/package.json +++ b/package.json | |||
@@ -149,7 +149,7 @@ | |||
149 | "concurrently": "^7.0.0", | 149 | "concurrently": "^7.0.0", |
150 | "cross-env": "^7.0.3", | 150 | "cross-env": "^7.0.3", |
151 | "dotenv": "^10.0.0", | 151 | "dotenv": "^10.0.0", |
152 | "electron": "17.4.0", | 152 | "electron": "18.0.4", |
153 | "electron-builder": "^22.14.12", | 153 | "electron-builder": "^22.14.12", |
154 | "electron-notarize": "^1.1.1", | 154 | "electron-notarize": "^1.1.1", |
155 | "eslint": "^8.6.0", | 155 | "eslint": "^8.6.0", |
diff --git a/recipes b/recipes | |||
Subproject 18801ed0c02627e87639dc0848cab44dacc18be | Subproject c819fe925dac556dee8336d3c19147073179c71 | ||
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 { | |||
109 | nodeintegration | 109 | nodeintegration |
110 | webpreferences={`spellcheck=${ | 110 | webpreferences={`spellcheck=${ |
111 | isSpellcheckerEnabled ? 1 : 0 | 111 | isSpellcheckerEnabled ? 1 : 0 |
112 | }, contextIsolation=1, nativeWindowOpen=1`} | 112 | }, contextIsolation=1`} |
113 | /> | 113 | /> |
114 | ); | 114 | ); |
115 | } | 115 | } |
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 = () => { | |||
213 | contextIsolation: false, | 213 | contextIsolation: false, |
214 | webviewTag: true, | 214 | webviewTag: true, |
215 | preload: join(__dirname, 'sentry.js'), | 215 | preload: join(__dirname, 'sentry.js'), |
216 | nativeWindowOpen: true, | ||
217 | }, | 216 | }, |
218 | }); | 217 | }); |
219 | 218 | ||
@@ -525,7 +524,6 @@ ipcMain.on('open-browser-window', (_e, { url, serviceId }) => { | |||
525 | fullscreenable: false, | 524 | fullscreenable: false, |
526 | webPreferences: { | 525 | webPreferences: { |
527 | session: serviceSession, | 526 | session: serviceSession, |
528 | nativeWindowOpen: true, | ||
529 | }, | 527 | }, |
530 | }); | 528 | }); |
531 | enableWebContents(child.webContents); | 529 | enableWebContents(child.webContents); |