feat: support electron 16.x (#86)

Aleksey28 · web-flow · commit 8301fe7d7266 · 2021-12-09T22:22:13.000+03:00
* build: updated electron to 12.2.3

* build: updated electron to 13.6.3

* build: updated electron to 14.2.2

* build: updated electron to 15.3.3

* build: updated electron to 16.0.4

* refactor: replaced promise to await
diff --git a/package.json b/package.json
@@ -46,14 +46,15 @@
     "testcafe": "*"
   },
   "devDependencies": {
+    "@electron/remote": "^2.0.1",
     "asar": "^2.0.1",
     "babel-core": "^6.26.3",
     "babel-eslint": "^7.2.3",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.0",
     "del": "^2.0.0",
-    "electron": "^11.0.3",
+    "electron": "^16.0.4",
     "gulp": "^4.0.0",
     "gulp-babel": "^7.0.0",
     "gulp-eslint": "^3.0.1",
diff --git a/src/node-inspect.js b/src/node-inspect.js
@@ -31,9 +31,12 @@ export default class NodeInspect {
     }
 
     async _setupRemoteInterface () {
-        this.client.Debugger.enable().then(async () => {
-            return this.client.Debugger.setBreakpointByUrl({ lineNumber: 16, url: 'internal/main/run_main_module\.js' });
-        });
+        await this.client.Debugger.enable();
+
+        // NOTE: <= Electron v14.2.2
+        await this.client.Debugger.setBreakpointByUrl({ lineNumber: 16, url: 'internal/main/run_main_module\.js' });
+        // NOTE: >= Electron v15.0.0
+        await this.client.Debugger.setBreakpointByUrl({ lineNumber: 16, url: 'node:internal/main/run_main_module' });
 
         var pausedEvent = promisifyEvent(this.client, 'Debugger.paused');
 
diff --git a/test/data/test-app-regular/index.html b/test/data/test-app-regular/index.html
@@ -5,7 +5,7 @@
     <body>
         <h1>TEST ME</h1>
         <script>
-            var { Menu } = require('electron').remote;
+            var { Menu } = require('@electron/remote');
             var foo      = require('./client.js').foo;
 
             var contextMenu = Menu.buildFromTemplate([
diff --git a/test/data/test-app-regular/index.js b/test/data/test-app-regular/index.js
@@ -1,6 +1,7 @@
-var electron = require('electron');
-var path     = require('path');
-var dialog   = electron.dialog;
+var electron   = require('electron');
+var path       = require('path');
+var dialog     = electron.dialog;
+var remoteMain = require('@electron/remote/main');
 
 var BrowserWindow = electron.BrowserWindow;
 var app           = electron.app;
@@ -11,19 +12,25 @@ var win = null;
 
 
 function createWindow () {
+    // Initialize main remote.
+    remoteMain.initialize();
+
     // Create the browser window.
     win = new BrowserWindow({
         width:          1024,
         height:         768,
         webPreferences: {
-            nodeIntegration:    true,
-            // NOTE: Electron 10 breaking changes:
-            // "Changed the default value of `enableRemoteModule` to `false`"
-            // (https://www.electronjs.org/blog/electron-10-0#breaking-changes) (GH-73)
-            enableRemoteModule: true
-        }
+            nodeIntegration:  true,
+            // NOTE: Electron 12 breaking changes:
+            // "Changed the default value of `contextIsolation` to `true`"
+            // (https://www.electronjs.org/blog/electron-12-0#breaking-changes)
+            contextIsolation: false,
+        },
     });
 
+    // and enable remote module for this windows
+    remoteMain.enable(win.webContents);
+
     // and load the index.html of the app.
     win.webContents.loadURL('file://' + path.join(__dirname, 'index.html'));
 
