From 5e6ae6a8550b48345afbe4aa4201c8e49343d03d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 25 Mar 2021 12:23:18 +0000 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 9.10.0-rc.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b22dc70124..d6ab5dc688 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "9.10.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index e669443d18..910a4a3331 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7506,6 +7506,21 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@9.10.0-rc.1: + version "9.10.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.10.0-rc.1.tgz#614f9429edc76348deb86ca436897c27d6849eb1" + integrity sha512-aJLXIKDcO4aGPU3dSfonYL2MXo2pz3USMqvFTmw5mfdVQKcgo8blHq6l/C8WEBk0r3oJfbG5E4O0HES5rdUSqA== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.9.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/cd38fb9b4c349eb31feac14e806e710bf6431b72" From a13863714c0e6a9792fb68b57121515d7eb56c97 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 25 Mar 2021 12:23:53 +0000 Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 3.17.0-rc.1 --- package.json | 2 +- yarn.lock | 23 +++++------------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index d6ab5dc688..79daedaf9e 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.10.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.17.0-rc.1", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 910a4a3331..ca4eb0a831 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7521,20 +7521,6 @@ matrix-js-sdk@9.10.0-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "9.9.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/cd38fb9b4c349eb31feac14e806e710bf6431b72" - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7543,9 +7529,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.16.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/3154dd6cd441b7710a525e75512e1665adf60746" +matrix-react-sdk@3.17.0-rc.1: + version "3.17.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.17.0-rc.1.tgz#4b0cf800f66513b25607bcb024ab89155fb1b044" + integrity sha512-0YRy/s6JktIVONfN9d2nF6ioPlBx3rD9VuYi1+l/3BA0DKEfkT2TQRG6HZLKWcA3fj3Hric11VajiqfU1Sjpqg== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7573,7 +7560,7 @@ matrix-mock-request@^1.2.3: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "9.10.0-rc.1" matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" pako "^2.0.3" From 9063f07b05c04ac8a597f727b3eb82b55f4f4c23 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 25 Mar 2021 12:30:33 +0000 Subject: [PATCH 3/8] Prepare changelog for v1.7.24-rc.1 --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5662b67e7..408e3b9468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +Changes in [1.7.24-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.24-rc.1) (2021-03-25) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.23...v1.7.24-rc.1) + + * Upgrade to React SDK 3.17.0-rc.2 and JS SDK 9.10.0-rc.1 + * Translations update from Weblate + [\#16766](https://github.com/vector-im/element-web/pull/16766) + * Docker image: serve pre-compressed assets using gzip_static + [\#16698](https://github.com/vector-im/element-web/pull/16698) + * Fix style lint issues + [\#16732](https://github.com/vector-im/element-web/pull/16732) + * Updated expected webpack output in setup guide + [\#16740](https://github.com/vector-im/element-web/pull/16740) + * Docs for `loginForWelcome` + [\#16468](https://github.com/vector-im/element-web/pull/16468) + * Disable rageshake persistence if no logs would be submitted + [\#16697](https://github.com/vector-im/element-web/pull/16697) + Changes in [1.7.23](https://github.com/vector-im/element-web/releases/tag/v1.7.23) (2021-03-15) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.23-rc.1...v1.7.23) From a05c68e8d9698ec9f05723aee79cfcd1a03c84b9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 25 Mar 2021 12:30:33 +0000 Subject: [PATCH 4/8] v1.7.24-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 79daedaf9e..68a837ed30 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.23", + "version": "1.7.24-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 20b1321818a12ef81479db56ccb72c9910101455 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 29 Mar 2021 13:38:31 +0100 Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 9.10.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 68a837ed30..1bf78c2e1a 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "9.10.0-rc.1", + "matrix-js-sdk": "9.10.0", "matrix-react-sdk": "3.17.0-rc.1", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index ca4eb0a831..74e3e46385 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7506,6 +7506,21 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@9.10.0: + version "9.10.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.10.0.tgz#ba32981391168778b301c01362a503a8469d3844" + integrity sha512-xvpgvTmCbS8dRTVvVULKbSwyES0y2F17TPukLIIXZMTqqeEBhfycVIjCV6LuACc0WBoRsZbi1/BIlgeWY7J03A== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@9.10.0-rc.1: version "9.10.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.10.0-rc.1.tgz#614f9429edc76348deb86ca436897c27d6849eb1" From 929fa5d59dae8baeaad72d9e24fc69997b4b3ba4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 29 Mar 2021 13:38:52 +0100 Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 3.17.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 1bf78c2e1a..cd83845de6 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.10.0", - "matrix-react-sdk": "3.17.0-rc.1", + "matrix-react-sdk": "3.17.0", "matrix-widget-api": "^0.1.0-beta.13", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 74e3e46385..99b7b807ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7521,21 +7521,6 @@ matrix-js-sdk@9.10.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@9.10.0-rc.1: - version "9.10.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.10.0-rc.1.tgz#614f9429edc76348deb86ca436897c27d6849eb1" - integrity sha512-aJLXIKDcO4aGPU3dSfonYL2MXo2pz3USMqvFTmw5mfdVQKcgo8blHq6l/C8WEBk0r3oJfbG5E4O0HES5rdUSqA== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7544,10 +7529,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.17.0-rc.1: - version "3.17.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.17.0-rc.1.tgz#4b0cf800f66513b25607bcb024ab89155fb1b044" - integrity sha512-0YRy/s6JktIVONfN9d2nF6ioPlBx3rD9VuYi1+l/3BA0DKEfkT2TQRG6HZLKWcA3fj3Hric11VajiqfU1Sjpqg== +matrix-react-sdk@3.17.0: + version "3.17.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.17.0.tgz#8793c0106f9058af755309c90ee5e3da8ff2a163" + integrity sha512-e8AMlReejmSjt+THys9U4i575MqQ+D4TWi2JfTJ8liS7nqT+Rj2oL4cwA1nRs71kYgPYqknRZIl1mcn7yi0vGQ== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7575,7 +7560,7 @@ matrix-react-sdk@3.17.0-rc.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "9.10.0-rc.1" + matrix-js-sdk "9.10.0" matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" pako "^2.0.3" From d178286e2b5f6c16053e4176902da9a551ebe7e7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 29 Mar 2021 13:42:28 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.7.24 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 408e3b9468..c9225a9e59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.24](https://github.com/vector-im/element-web/releases/tag/v1.7.24) (2021-03-29) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.24-rc.1...v1.7.24) + + * Upgrade to React SDK 3.17.0 and JS SDK 9.10.0 + Changes in [1.7.24-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.24-rc.1) (2021-03-25) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.23...v1.7.24-rc.1) From ac15f2755c2ce58dfb7dc64dc6e2708d25d5d57c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 29 Mar 2021 13:42:29 +0100 Subject: [PATCH 8/8] v1.7.24 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cd83845de6..5b08749328 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.24-rc.1", + "version": "1.7.24", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {