Merge pull request #160 from mtgto/update-electron-11

Update electron 11

Author: mtgto

package.json

@@ -13,10 +13,10 @@
     "start": "electron app/development",
     "watch": "webpack --mode=development --watch",
     "test": "yarn run test:unit && yarn run test:integration",
-    "test:unit": "electron-mocha --renderer --color --grep @remote --invert \"./test/unit/**/*.test.{ts,tsx}\"",
-    "test:unit:remote": "electron-mocha --renderer --color --grep @remote \"./test/unit/**/*.test.{ts,tsx}\"",
+    "test:unit": "electron-mocha --renderer --require ts-node/register --ui tdd --color --grep @remote --invert \"./test/unit/**/*.test.{ts,tsx}\"",
+    "test:unit:remote": "electron-mocha --renderer --require ts-node/register --ui tdd --color --grep @remote \"./test/unit/**/*.test.{ts,tsx}\"",
     "test:build": "webpack --env BUILD_ENV=test --mode=development && electron-builder build --config electron-builder.test.yml --publish never --dir",
-    "test:integration": "yarn run test:build && mocha --exit test/integration/test.ts",
+    "test:integration": "yarn run test:build && mocha --exit --require ts-node/register --ui tdd test/integration/test.ts",
     "lint": "yarn run lint:eslint && yarn run lint:tsc && yarn run lint:prettier",
     "lint:eslint": "eslint --ext \".js,.jsx,.ts,.tsx\" --max-warnings 0 .",
     "lint:tsc": "tsc --noEmit",
@@ -32,9 +32,9 @@
     "classnames": "2.2.5",
     "codemirror": "~5.49.2",
     "csv-stringify": "2.0.1",
-    "electron-is-dev": "1.1.0",
-    "electron-log": "3.0.9",
-    "electron-updater": "4.2.0",
+    "electron-is-dev": "2.0.0",
+    "electron-log": "4.3.0",
+    "electron-updater": "4.3.8",
     "fs-extra": "5.0.0",
     "immup": "3.0.0",
     "js-yaml": "3.10.0",
@@ -67,14 +67,13 @@
     "@types/react-select": "~3.0.13",
     "@types/react-splitter-layout": "3.0.0",
     "@types/sqlite3": "3.1.6",
-    "@types/webdriverio": "4.13.3",
     "@typescript-eslint/eslint-plugin": "3.4.0",
     "@typescript-eslint/parser": "3.4.0",
     "copy-webpack-plugin": "^8.1.1",
     "css-loader": "^5.2.1",
-    "electron": "7.1.12",
+    "electron": "11.4.3",
     "electron-builder": "22.10.5",
-    "electron-mocha": "~8.2.1",
+    "electron-mocha": "~10.0.0",
     "electron-notarize": "0.3.0",
     "electron-publisher-s3": "20.14.4",
     "eslint": "~7.3.1",
@@ -84,7 +83,7 @@
     "execa": "0.9.0",
     "mini-css-extract-plugin": "~1.4.1",
     "prettier": "~1.19.1",
-    "spectron": "9.0.0",
+    "spectron": "13.0.0",
     "ts-loader": "~8.1.0",
     "ts-node": "5.0.1",
     "typescript": "^3.9.5",

src/main/index.ts

@@ -22,26 +22,14 @@ app.on("window-all-closed", () => {
   }
 });
 
-app.on("ready", async () => {
-  // https://github.com/electron/electron/issues/13008#issuecomment-569363295
-  electron.session.defaultSession.webRequest.onBeforeRequest((details, callback) => {
-    const redirectURL = details.url.replace(
-      /^devtools:\/\/devtools\/remote\/serve_file\/@[0-9a-f]{40}\//,
-      "https://chrome-devtools-frontend.appspot.com/serve_file/@675968a8c657a3bd9c1c2c20c5d2935577bbc5e6/"
-    );
-    if (redirectURL !== details.url) {
-      callback({ redirectURL });
-    } else {
-      callback({});
-    }
-  });
-  createWindow();
+app.whenReady().then(async () => {
+  await createWindow();
   initMenu();
   await updater.watch();
 });
 
-app.on("activate", () => {
+app.on("activate", async () => {
   if (windows.length === 0) {
-    createWindow();
+    await createWindow();
   }
 });

src/main/window.ts

@@ -12,11 +12,12 @@ export async function createWindow(): Promise<void> {
     titleBarStyle: process.platform === "darwin" ? "hidden" : undefined,
     icon: path.join(__dirname, "..", "icon.png"),
     webPreferences: {
-      nodeIntegration: true
+      nodeIntegration: true,
+      enableRemoteModule: true
     }
   });
 
-  win.loadURL(`file://${__dirname}/../index.html`);
+  await win.loadURL(`file://${__dirname}/../index.html`);
   win.once("closed", () => {
     const idx = windows.findIndex(w => w === win);
     windows.splice(idx, 1);
@@ -27,9 +28,9 @@ export async function createWindow(): Promise<void> {
     dialog.showErrorBox("Bdash is crashed", "Unrecoverable error");
   });
 
-  win.webContents.on("will-navigate", (e, url) => {
+  win.webContents.on("will-navigate", async (e, url) => {
     e.preventDefault();
-    shell.openExternal(url);
+    await shell.openExternal(url);
   });
 
   windows.push(win);