Merge pull request #10596 from vector-im/jryans/electron-6

Upgrade to Electron 6
This commit is contained in:
J. Ryan Stinnett 2019-08-20 17:41:16 +01:00 committed by GitHub
commit dad62137c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -36,10 +36,10 @@
"build:compile": "yarn reskindex && babel --source-maps -d lib src", "build:compile": "yarn reskindex && babel --source-maps -d lib src",
"build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production", "build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production",
"build:bundle:dev": "webpack --progress --bail --mode development", "build:bundle:dev": "webpack --progress --bail --mode development",
"build:electron": "yarn clean && yarn build && yarn install:electron && build -wml --ia32 --x64", "build:electron": "yarn clean && yarn build && yarn install:electron && electron-builder -wml --ia32 --x64",
"build:electron:linux": "yarn build && build -l --x64", "build:electron:linux": "yarn build && electron-builder -l --x64",
"build:electron:macos": "yarn build && build -m --x64", "build:electron:macos": "yarn build && electron-builder -m --x64",
"build:electron:windows": "yarn build && build -w --ia32 --x64", "build:electron:windows": "yarn build && electron-builder -w --ia32 --x64",
"build:react-sdk": "node scripts/yarn-sub.js matrix-react-sdk build", "build:react-sdk": "node scripts/yarn-sub.js matrix-react-sdk build",
"build:js-sdk": "node scripts/yarn-sub.js matrix-js-sdk start:init", "build:js-sdk": "node scripts/yarn-sub.js matrix-js-sdk start:init",
"build": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle", "build": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle",
@ -154,7 +154,7 @@
}, },
"build": { "build": {
"appId": "im.riot.app", "appId": "im.riot.app",
"electronVersion": "5.0.7", "electronVersion": "6.0.2",
"files": [ "files": [
"node_modules/**", "node_modules/**",
"src/**" "src/**"