diff --git a/package-lock.json b/package-lock.json index f8793184..c42b92df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6503,20 +6503,20 @@ "dev": true }, "electron": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.8.tgz", - "integrity": "sha512-FOBJIHkuv8wc15N+ZyqwDzPavYVu5CHMBEf14jHDWv7QW2vkEIpJjVK+PIT31kfZfvjsIP0j2wvA/FBsiqB7pw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.1.tgz", + "integrity": "sha512-8KksyhAPcpXVeO8ViVGxfZAuf8yEVBCtV0h/lMBD8VFbCQ9icej1K5csCFAGirbZbqOz5IdsBZX9Gpb9n4RCag==", "dev": true, "requires": { - "@types/node": "10.12.30", + "@types/node": "10.14.6", "electron-download": "4.1.1", "extract-zip": "1.6.7" }, "dependencies": { "@types/node": { - "version": "10.12.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", - "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==", + "version": "10.14.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.6.tgz", + "integrity": "sha512-Fvm24+u85lGmV4hT5G++aht2C5I4Z4dYlWZIh62FAfFO/TfzXtPpoLI6I7AuBWkIFqZCnhFOoTT7RjjaIL5Fjg==", "dev": true } } diff --git a/package.json b/package.json index f7cd1c37..75b538c3 100644 --- a/package.json +++ b/package.json @@ -228,7 +228,7 @@ "css-loader": "^0.28.11", "del": "^3.0.0", "devtron": "^1.4.0", - "electron": "4.0.8", + "electron": "5.0.1", "electron-builder": "^20.39.0", "electron-debug": "^2.2.0", "electron-devtools-installer": "^2.2.4", diff --git a/src/main/index.ts b/src/main/index.ts index d1adb860..852bf44d 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -203,7 +203,6 @@ async function createWindow() { defaultWidth: 1000, defaultHeight: 563 }) - // mainWindow = new BrowserWindow({ const mainOpts: BrowserWindowConstructorOptions = { titleBarStyle: 'hidden', x: mainWindowState.x, @@ -211,7 +210,12 @@ async function createWindow() { width: mainWindowState.width, height: mainWindowState.height, useContentSize: true, - icon: path.resolve(__dirname, '../../build/icons/256x256.png') + icon: path.resolve(__dirname, '../../build/icons/256x256.png'), + webPreferences: { + // It is required to use ipcRenderer in renderer process. + // But it is not secure, so if you want to disable this option, please use preload script. + nodeIntegration: true + } } const config: Config = { windowOpts: mainOpts,