From f3656c27924839b1f37ee979b4c82c3ebec3c935 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 4 Nov 2019 16:51:04 +0000 Subject: [PATCH 1/7] Add dependency to eslint-plugin-react-hooks as react-sdk did --- package.json | 1 + yarn.lock | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/package.json b/package.json index 84f18a8085..2746d3a260 100644 --- a/package.json +++ b/package.json @@ -117,6 +117,7 @@ "eslint-plugin-babel": "^4.1.2", "eslint-plugin-flowtype": "^2.50.3", "eslint-plugin-react": "^7.11.1", + "eslint-plugin-react-hooks": "^2.2.0", "expect": "^1.16.0", "file-loader": "^3.0.1", "fs-extra": "^0.30.0", diff --git a/yarn.lock b/yarn.lock index 9b520a5b7c..4aaf8db701 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3364,6 +3364,11 @@ eslint-plugin-flowtype@^2.50.3: dependencies: lodash "^4.17.10" +eslint-plugin-react-hooks@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.2.0.tgz#078264e9e388da6929ace09d6abe92c85963aff4" + integrity sha512-jSlnBjV2cmyIeL555H/FbvuSbQ1AtpHjLMHuPrQnt1eVA6lX8yufdygh7AArI2m8ct7ChHGx2uOaCuxq2MUn6g== + eslint-plugin-react@^7.11.1: version "7.14.3" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz#911030dd7e98ba49e1b2208599571846a66bdf13" From 03887f9d1bce2c952fb1866e7ef436387f391515 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 4 Nov 2019 18:02:33 +0000 Subject: [PATCH 2/7] Fix close window behaviour on Macos --- electron_app/src/electron-main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 48a425c917..7e65c53470 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -393,7 +393,7 @@ app.on('ready', () => { }); mainWindow.on('close', (e) => { // If we are not quitting and have a tray icon then minimize to tray - if (!global.appQuitting && tray.hasTray()) { + if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) { // On Mac, closing the window just hides it // (this is generally how single-window Mac apps // behave, eg. Mail.app) From fbd5ffc1987a31e7913174eb90577574d404ed1c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 4 Nov 2019 18:02:33 +0000 Subject: [PATCH 3/7] Fix close window behaviour on Macos --- electron_app/src/electron-main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 48a425c917..7e65c53470 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -393,7 +393,7 @@ app.on('ready', () => { }); mainWindow.on('close', (e) => { // If we are not quitting and have a tray icon then minimize to tray - if (!global.appQuitting && tray.hasTray()) { + if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) { // On Mac, closing the window just hides it // (this is generally how single-window Mac apps // behave, eg. Mail.app) From 6f85fc9e8cf4368eaf6985223d0ecbd1a96e60a6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 18:27:35 +0000 Subject: [PATCH 4/7] v1.5.2 --- 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 adf119e065..f141aa6bb2 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.1", + "version": "1.5.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 3cd7e1c18cf9725635a614c0e18e70d1dbaee1a6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 18:30:36 +0000 Subject: [PATCH 5/7] Prepare changelog for v1.5.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 300f9799c0..7ee93d5ba7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.5.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.2) (2019-11-04) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1...v1.5.2) + + * Fix close window behaviour on Macos + [\#11311](https://github.com/vector-im/riot-web/pull/11311) + Changes in [1.5.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.1) (2019-11-04) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1-rc.2...v1.5.1) From 17027cb5155deb0496fc8b68709988dca5c3510a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 4 Nov 2019 18:30:37 +0000 Subject: [PATCH 6/7] v1.5.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf23ac5607..c696840fce 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.1", + "version": "1.5.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From e006e92255215d679cf38108bb5d9d91c535e06c Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 4 Nov 2019 18:56:41 +0000 Subject: [PATCH 7/7] Upgrade electron-notarize To include https://github.com/electron/electron-notarize/pull/14 --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 455e44250f..03239eecc9 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "electron-builder": "^21.2.0", "electron-builder-squirrel-windows": "^21.2.0", "electron-devtools-installer": "^2.2.4", - "electron-notarize": "^0.1.1", + "electron-notarize": "^0.2.0", "eslint": "^5.8.0", "eslint-config-google": "^0.7.1", "eslint-plugin-babel": "^4.1.2", diff --git a/yarn.lock b/yarn.lock index 4e5ec98f14..82c8137abd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3134,13 +3134,13 @@ electron-devtools-installer@^2.2.4: rimraf "^2.5.2" semver "^5.3.0" -electron-notarize@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.1.1.tgz#c3563d70c5e7b3315f44e8495b30050a8c408b91" - integrity sha512-TpKfJcz4LXl5jiGvZTs5fbEx+wUFXV5u8voeG5WCHWfY/cdgdD8lDZIZRqLVOtR3VO+drgJ9aiSHIO9TYn/fKg== +electron-notarize@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.2.0.tgz#676c71688ee84149bab27b22426d0a9452e7e262" + integrity sha512-u3KdEMOEcGMF9yCML8ej4ZF+O29VmGYIjrs/DoOi23neTWOMiIc5YCeFs4vxq3JG496omcw7Y5pimPm0sH9A7g== dependencies: debug "^4.1.1" - fs-extra "^8.0.1" + fs-extra "^8.1.0" electron-publish@21.2.0: version "21.2.0" @@ -4096,7 +4096,7 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^8.0.1, fs-extra@^8.1.0: +fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==