From a438efa4becb3aaa2e9c394441b7eca9fe67e947 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 31 Jul 2019 15:50:54 +0100 Subject: [PATCH 1/3] Upgrade to Electron 6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 09a5c7837d..b9a684406f 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "5.0.7", + "electronVersion": "6.0.0", "files": [ "node_modules/**", "src/**" From d12f94888a67489a801249cb3d4677157ae34a2f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 31 Jul 2019 15:51:30 +0100 Subject: [PATCH 2/3] Use modern command name for electron-builder `electron-builder` now recommends you invoke it via that name instead of `build` as was previously supported. --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index b9a684406f..a102644402 100644 --- a/package.json +++ b/package.json @@ -36,10 +36,10 @@ "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:dev": "webpack --progress --bail --mode development", - "build:electron": "yarn clean && yarn build && yarn install:electron && build -wml --ia32 --x64", - "build:electron:linux": "yarn build && build -l --x64", - "build:electron:macos": "yarn build && build -m --x64", - "build:electron:windows": "yarn build && build -w --ia32 --x64", + "build:electron": "yarn clean && yarn build && yarn install:electron && electron-builder -wml --ia32 --x64", + "build:electron:linux": "yarn build && electron-builder -l --x64", + "build:electron:macos": "yarn build && electron-builder -m --x64", + "build:electron:windows": "yarn build && electron-builder -w --ia32 --x64", "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": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle", From 0800faf057c14df21a874995c8e1f69f8141bbfc Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 20 Aug 2019 10:36:06 +0100 Subject: [PATCH 3/3] Upgrade to Electron 6.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a102644402..79c8f6d087 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "6.0.0", + "electronVersion": "6.0.2", "files": [ "node_modules/**", "src/**"