Upgrade electron to '16.2.2'

Remove deprecated 'webPreference' flag

6 files changed, 32 insertions, 22 deletions

diff --git a/babel.config.json b/babel.config.json
index 7ef38a9a8..97250ae80 100644
--- a/babel.config.json
+++ b/babel.config.json
@@ -4,7 +4,7 @@
       "@babel/preset-env",
       {
         "targets": {
-          "electron": 15
+          "electron": 16
         }
       }
     ],
diff --git a/package-lock.json b/package-lock.json
index 1442956e3..eadb96df9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@adonisjs/session": "^1.0.29",
         "@adonisjs/shield": "^1.0.8",
         "@adonisjs/validator": "^5.0.6",
-        "@electron/remote": "1.2.1",
+        "@electron/remote": "2.0.1",
         "@mdi/js": "^6.3.95",
         "@mdi/react": "^1.5.0",
         "@sentry/electron": "^2.5.4",
@@ -114,7 +114,7 @@
         "concurrently": "^7.0.0",
         "cross-env": "^7.0.3",
         "dotenv": "^10.0.0",
-        "electron": "15.5.1",
+        "electron": "16.2.2",
         "electron-builder": "^22.14.12",
         "electron-notarize": "^1.1.1",
         "eslint": "^8.6.0",
@@ -2830,9 +2830,9 @@
       }
     },
     "node_modules/@electron/remote": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-1.2.1.tgz",
-      "integrity": "sha512-yKh60I8KjezQkZqeuN5Nu2O/Z72+tgNgzvAa8QQPLtQbsrCOaeIWdXZQqierz4jQ5jzTNUk6KIcK3V2kFeaxaQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.1.tgz",
+      "integrity": "sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA==",
       "peerDependencies": {
         "electron": ">= 10.0.0-beta.1"
       }
@@ -10780,9 +10780,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "15.5.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-15.5.1.tgz",
-      "integrity": "sha512-V3tOikVM7tGK4n5+MkLN+v73h0tndDeaQXy8kjkHj5NFIgQPwKD9S8XjQOBa+Cm5l3xbQrUsN5X6OmYS2WfPlg==",
+      "version": "16.2.2",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-16.2.2.tgz",
+      "integrity": "sha512-MOZCewpDvhiuYCw8UnJnQxU/9cni4tlHHWBdi0JWbcdBOrGsDMSt17nuPwR5wSf1e7mSfofGIUPg9iHS5KA8Eg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -32876,9 +32876,9 @@
       }
     },
     "@electron/remote": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-1.2.1.tgz",
-      "integrity": "sha512-yKh60I8KjezQkZqeuN5Nu2O/Z72+tgNgzvAa8QQPLtQbsrCOaeIWdXZQqierz4jQ5jzTNUk6KIcK3V2kFeaxaQ=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.1.tgz",
+      "integrity": "sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA=="
     },
     "@electron/universal": {
       "version": "1.0.5",
@@ -39311,9 +39311,9 @@
       }
     },
     "electron": {
-      "version": "15.5.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-15.5.1.tgz",
-      "integrity": "sha512-V3tOikVM7tGK4n5+MkLN+v73h0tndDeaQXy8kjkHj5NFIgQPwKD9S8XjQOBa+Cm5l3xbQrUsN5X6OmYS2WfPlg==",
+      "version": "16.2.2",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-16.2.2.tgz",
+      "integrity": "sha512-MOZCewpDvhiuYCw8UnJnQxU/9cni4tlHHWBdi0JWbcdBOrGsDMSt17nuPwR5wSf1e7mSfofGIUPg9iHS5KA8Eg==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.13.0",
diff --git a/package.json b/package.json
index 7dbe47e9b..a5f465599 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "@adonisjs/session": "^1.0.29",
     "@adonisjs/shield": "^1.0.8",
     "@adonisjs/validator": "^5.0.6",
-    "@electron/remote": "1.2.1",
+    "@electron/remote": "2.0.1",
     "@mdi/js": "^6.3.95",
     "@mdi/react": "^1.5.0",
     "@sentry/electron": "^2.5.4",
@@ -149,7 +149,7 @@
     "concurrently": "^7.0.0",
     "cross-env": "^7.0.3",
     "dotenv": "^10.0.0",
-    "electron": "15.5.1",
+    "electron": "16.2.2",
     "electron-builder": "^22.14.12",
     "electron-notarize": "^1.1.1",
     "eslint": "^8.6.0",
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index f90710c31..38450b98f 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, enableRemoteModule=1`}
+        }, contextIsolation=1, nativeWindowOpen=1`}
       />
     );
   }
diff --git a/src/electron-util.ts b/src/electron-util.ts
index 3c395ab10..eede55786 100644
--- a/src/electron-util.ts
+++ b/src/electron-util.ts
@@ -1,7 +1,7 @@
 // Enhanced from: https://github.com/dertieran/electron-util/blob/replace-remote/source/api.js
 
 import * as electron from 'electron';
-import { initialize } from '@electron/remote/main';
+import { initialize, enable } from '@electron/remote/main';
 
 export const initializeRemote = () => {
   if (process.type !== 'browser') {
@@ -13,6 +13,10 @@ export const initializeRemote = () => {
   initialize();
 };
 
+export const enableWebContents = (webContents: electron.WebContents) => {
+  enable(webContents);
+}
+
 export const remote = new Proxy(
   {},
   {
diff --git a/src/index.ts b/src/index.ts
index c61523584..013cf93ce 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -13,7 +13,7 @@ import { emptyDirSync, ensureFileSync } from 'fs-extra';
 import { join } from 'path';
 import windowStateKeeper from 'electron-window-state';
 import ms from 'ms';
-import { initializeRemote } from './electron-util';
+import { enableWebContents, initializeRemote } from './electron-util';
 import { enforceMacOSAppLocation } from './enforce-macos-app-location';
 
 initializeRemote();
@@ -214,13 +214,18 @@ const createWindow = () => {
       webviewTag: true,
       preload: join(__dirname, 'sentry.js'),
       nativeWindowOpen: true,
-      // @ts-expect-error Object literal may only specify known properties, and 'enableRemoteModule' does not exist in type 'WebPreferences'.
-      enableRemoteModule: true,
     },
   });
 
+  enableWebContents(mainWindow.webContents);
+
+  app.on('browser-window-created', (_, window) => {
+    enableWebContents(window.webContents);
+  });
+
   app.on('web-contents-created', (_e, contents) => {
     if (contents.getType() === 'webview') {
+      enableWebContents(contents);
       contents.on('new-window', event => {
         event.preventDefault();
       });
@@ -523,6 +528,7 @@ ipcMain.on('open-browser-window', (_e, { url, serviceId }) => {
       nativeWindowOpen: true,
     },
   });
+  enableWebContents(child.webContents);
   child.show();
   child.loadURL(url);
   debug('Received open-browser-window', url);