From 706834939f51a901e50d26eb16b59a3ff021ee87 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 2 Mar 2020 11:09:06 +0000 Subject: [PATCH 1/8] Revert "Remove will-navigate as we expect it to be broken like pre-8.0.2" This reverts commit fb656ce8bdcb0cfe377ad80d30b7d6a3177b52e8. --- electron_app/src/webcontents-handler.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/electron_app/src/webcontents-handler.js b/electron_app/src/webcontents-handler.js index f0aaf4a4f..bbfb2e7da 100644 --- a/electron_app/src/webcontents-handler.js +++ b/electron_app/src/webcontents-handler.js @@ -174,8 +174,7 @@ function onEditableContextMenu(ev, params) { module.exports = (webContents) => { webContents.on('new-window', onWindowOrNavigate); - // XXX: https://github.com/vector-im/riot-web/issues/8247 - // webContents.on('will-navigate', onWindowOrNavigate); + webContents.on('will-navigate', onWindowOrNavigate); webContents.on('context-menu', function(ev, params) { if (params.linkURL || params.srcURL) { From 2a5438d6368a0bb2bdfb9e5e41a7ecf042876b4d Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 28 Feb 2020 11:42:08 +0000 Subject: [PATCH 2/8] Revert "Remove will-navigate comment after Electron fix" This reverts commit 749d7e8e4c33b2c92832f25a45650a38781937cd. --- electron_app/src/webcontents-handler.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/electron_app/src/webcontents-handler.js b/electron_app/src/webcontents-handler.js index bbfb2e7da..c95869007 100644 --- a/electron_app/src/webcontents-handler.js +++ b/electron_app/src/webcontents-handler.js @@ -174,6 +174,18 @@ function onEditableContextMenu(ev, params) { module.exports = (webContents) => { webContents.on('new-window', onWindowOrNavigate); + // XXX: The below now does absolutely nothing because of + // https://github.com/electron/electron/issues/8841 + // Whilst this isn't a security issue since without + // node integration and with the sandbox, it should be + // no worse than opening the site in Chrome, it obviously + // means the user has to restart Riot to make it usable + // again (often unintuitive because it minimises to the + // system tray). We therefore need to be vigilant about + // putting target="_blank" on links in Riot (although + // we should generally be doing this anyway since links + // navigating you away from Riot in the browser is + // also annoying). webContents.on('will-navigate', onWindowOrNavigate); webContents.on('context-menu', function(ev, params) { From adc329c67f423c64d142dc5ed798fcc34c6b0af0 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 26 Feb 2020 13:44:07 +0000 Subject: [PATCH 3/8] Revert "Upgrade to Electron 8.0.2" This reverts commit 9b9d585af08a2a916c072fe0fe7cceb981680523. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d819671f..cf55fb1d9 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "8.0.2", + "electronVersion": "7.1.12", "files": [ "node_modules/**", "src/**" From b52b0f525ff4c820fcfb4acce6ca03358de7ea37 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Mar 2020 12:00:37 +0000 Subject: [PATCH 4/8] Log packages when checking version --- release.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/release.sh b/release.sh index 57c8f02c6..fada07f72 100755 --- a/release.sh +++ b/release.sh @@ -20,6 +20,7 @@ cd `dirname $0` for i in matrix-js-sdk matrix-react-sdk do + echo "Checking version of $i..." depver=`cat package.json | jq -r .dependencies[\"$i\"]` latestver=`yarn info -s $i dist-tags.next` if [ "$depver" != "$latestver" ] From c26396d693dd632b946f150ab9c645467066e65e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Mar 2020 12:01:31 +0000 Subject: [PATCH 5/8] Upgrade matrix-react-sdk to 2.2.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index cf55fb1d9..0e7daee17 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "5.1.0", - "matrix-react-sdk": "2.2.0", + "matrix-react-sdk": "2.2.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index da829520e..b0bcbeab7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7641,10 +7641,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.2.0.tgz#72f719b4d046a28d44188c03817f5b3b139bb8d4" - integrity sha512-hw7ok+yrRTdD3mt8rQc+kCrctzsGDaS1dEYI+HdBhNQxMing1gavZ61UU6kWB5gB1S6swvZ96q07sO14NosgnA== +matrix-react-sdk@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.2.1.tgz#1f443d35bdcc46c7ef3dc3066adda59f7f43b348" + integrity sha512-zIgf/i9z2x+KHf0caQtFVc3JEFiIFd9MH36XnqXaPYyRSuS0zWRLY/tFTR51pMblMIb3DskTYlf9q7JLDAP/+A== dependencies: "@babel/runtime" "^7.8.3" blueimp-canvas-to-blob "^3.5.0" From 096831c9df3ea8a5c017208ade8eddd6e661d9da Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Mar 2020 12:01:38 +0000 Subject: [PATCH 6/8] v1.5.12 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index ed75a56ce..418375e80 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.11", + "version": "1.5.12", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 2507073c20149d6a47282fd9a2ff15f266a2ec6a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Mar 2020 12:58:03 +0000 Subject: [PATCH 7/8] Prepare changelog for v1.5.12 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 684c82f48..49d43a93d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [1.5.12](https://github.com/vector-im/riot-web/releases/tag/v1.5.12) (2020-03-04) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.11...v1.5.12) + + * Upgrade to React SDK 2.2.1 + * Revert to Electron 7.1.12 to fix Arch Linux tray icon + * Fix image download links so they open in a new tab + Changes in [1.5.11](https://github.com/vector-im/riot-web/releases/tag/v1.5.11) (2020-03-02) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.11-rc.1...v1.5.11) From 6e68c106f724e536b783685411ded2590a2e63f1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 4 Mar 2020 12:58:03 +0000 Subject: [PATCH 8/8] v1.5.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0e7daee17..5fa5dd75f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.5.11", + "version": "1.5.12", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {