fix: fix electron version

graasp · Oct 28, 2019 · e4b3725 · e4b3725
1 parent cae98e0
commit e4b3725
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 69 deletions.
diff --git a/package.json b/package.json
@@ -39,7 +39,6 @@
     "predist:mac": "yarn build",
     "predist:linux": "yarn build",
     "predist:posix": "yarn build",
-    "predist:all": "yarn build",
     "prerelease": "yarn test:once && yarn build",
     "setup": "node scripts/setup.js",
     "lint": "eslint .",
@@ -129,9 +128,9 @@
     "codacy-coverage": "3.4.0",
     "concurrently": "4.1.0",
     "cross-env": "5.2.0",
-    "electron": "7.0.0",
+    "electron": "6.1.2",
     "electron-builder": "21.2.0",
-    "env-cmd": "10.0.1",
+    "env-cmd": "9.0.3",
     "eslint-config-airbnb": "17.1.0",
     "eslint-config-prettier": "4.2.0",
     "husky": "2.1.0",

diff --git a/public/electron.js b/public/electron.js
@@ -89,10 +89,6 @@ Sentry.init({ dsn: SENTRY_DSN });
 // get unique identifier for this machine
 const machineId = machineIdSync();
 
-// disable web security
-// see: https://github.com/electron/electron/issues/20710
-app.commandLine.appendSwitch('disable-web-security');
-
 const createWindow = () => {
   mainWindow = new BrowserWindow({
     backgroundColor: '#F7F7F7',
@@ -102,7 +98,7 @@ const createWindow = () => {
     webPreferences: {
       nodeIntegration: false,
       preload: `${__dirname}/app/preload.js`,
-      // webSecurity: false,
+      webSecurity: false,
     },
     height: 860,
     width: 1280,