Bump electron to v10 (+ remove devtron, bump spectron)

This commit is contained in:
TC
2020-10-04 17:39:18 +02:00
parent 97dce5ad41
commit 5f0dcbb3fc
4 changed files with 559 additions and 658 deletions

View File

@ -55,6 +55,7 @@ function createMainWindow() {
nodeIntegration: isTesting(), // Only necessary when testing with Spectron nodeIntegration: isTesting(), // Only necessary when testing with Spectron
preload: path.join(__dirname, "preload.js"), preload: path.join(__dirname, "preload.js"),
nativeWindowOpen: true, // window.open return Window object(like in regular browsers), not BrowserWindowProxy nativeWindowOpen: true, // window.open return Window object(like in regular browsers), not BrowserWindowProxy
enableRemoteModule: true,
affinity: "main-window", // main window, and addition windows should work in one process affinity: "main-window", // main window, and addition windows should work in one process
}, },
frame: !is.macOS(), frame: !is.macOS(),

View File

@ -56,15 +56,14 @@
"node-fetch": "^2.6.1" "node-fetch": "^2.6.1"
}, },
"devDependencies": { "devDependencies": {
"devtron": "^1.4.0", "electron": "^10.1.3",
"electron": "^8.2.4",
"electron-builder": "^22.8.1", "electron-builder": "^22.8.1",
"electron-devtools-installer": "^3.1.1", "electron-devtools-installer": "^3.1.1",
"electron-icon-maker": "0.0.5", "electron-icon-maker": "0.0.5",
"get-port": "^5.1.1", "get-port": "^5.1.1",
"jest": "^26.4.2", "jest": "^26.4.2",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"spectron": "^10.0.1", "spectron": "^12.0.0",
"xo": "^0.33.1" "xo": "^0.33.1"
}, },
"xo": { "xo": {

View File

@ -1,6 +1,6 @@
const path = require("path"); const path = require("path");
const { getCurrentWindow } = require("electron").remote; const { remote } = require("electron");
const { getEnabledPlugins, store } = require("./store"); const { getEnabledPlugins, store } = require("./store");
const { fileExists } = require("./plugins/utils"); const { fileExists } = require("./plugins/utils");
@ -28,5 +28,5 @@ document.addEventListener("DOMContentLoaded", () => {
// Add action for reloading // Add action for reloading
global.reload = () => global.reload = () =>
getCurrentWindow().webContents.loadURL(store.get("url")); remote.getCurrentWindow().webContents.loadURL(store.get("url"));
}); });

1207
yarn.lock

File diff suppressed because it is too large Load Diff