From d8dfbc25d330461e1004476518f624c7f2a79260 Mon Sep 17 00:00:00 2001 From: Kilian Valkhof Date: Thu, 30 Aug 2018 21:09:21 +0200 Subject: [PATCH] upgrade to electron 2.0 with fix for #72 --- app/main.dev.js | 5 +++-- package.json | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/main.dev.js b/app/main.dev.js index d508265..0d4666b 100644 --- a/app/main.dev.js +++ b/app/main.dev.js @@ -119,6 +119,7 @@ Optional arguments: darkTheme: true, titleBarStyle: 'hidden', autoHideMenuBar: true, + transparent: true, webPreferences: { blinkFeatures: 'OverlayScrollbars', }, @@ -486,8 +487,8 @@ Optional arguments: mainWindow = null; }); - if (isDev) { + //if (isDev) { mainWindow.openDevTools(); - } + //} }); } diff --git a/package.json b/package.json index b816363..3d48149 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "start-main-dev": "cross-env HOT=1 NODE_ENV=development electron -r babel-register ./app/main.dev.js", "start-renderer-dev": "cross-env NODE_ENV=development node --trace-warnings -r babel-register ./node_modules/webpack-dev-server/bin/webpack-dev-server --config webpack.config.renderer.dev.js" }, - "browserslist": "electron 1.8", + "browserslist": "electron 2.0", "build": { "productName": "FromScratch", "appId": "com.kilianvalkhof.FromScratch", @@ -114,7 +114,7 @@ "cross-spawn": "^6.0.5", "css-loader": "^0.28.11", "detect-port": "^1.2.3", - "electron": "^1.8.7", + "electron": "^2.0.8", "electron-builder": "20.14.7", "electron-devtools-installer": "^2.2.4", "electron-rebuild": "^1.7.3",