From 1fe8f27cf7adc07b993c1fe78c3c6cc01aab76c7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 13 Jan 2021 13:10:04 +0000 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 9.5.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 ff0d4caf4c..67688f3409 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "highlight.js": "^10.4.1", "jsrsasign": "^9.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "9.5.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.10", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 592c01bcfa..e937eaa9c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7899,6 +7899,21 @@ mathml-tag-names@^2.1.1: 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.5.0-rc.1: + version "9.5.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.5.0-rc.1.tgz#91c2f0ff969baea1416611a39354ca016cc1b7c6" + integrity sha512-TOWU6QKfc3BBTdLyzKMnc0trsaw9sQw3/LaNU/ZqP1LuVDK+qRQxcUfsev0EFfRKURIcI7KvtzRiV+DakN/X+Q== + 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.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.4.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1717fcf499b943517213f2a81c41ffec0b50748e" From 21cadb8a3b9f20d6c0eab5d970a0b5156ba11969 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 13 Jan 2021 13:10:30 +0000 Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 3.12.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 67688f3409..c8c163f505 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^9.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.5.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.12.0-rc.1", "matrix-widget-api": "^0.1.0-beta.10", "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 e937eaa9c8..e01aad70f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7914,20 +7914,6 @@ matrix-js-sdk@9.5.0-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "9.4.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1717fcf499b943517213f2a81c41ffec0b50748e" - 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.4" - 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" @@ -7936,9 +7922,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.11.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e551e7ac40a66954e1170528d80b97c34f08342e" +matrix-react-sdk@3.12.0-rc.1: + version "3.12.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.12.0-rc.1.tgz#e550c228c2b1aac0625c44a3afe95bf04a0023bc" + integrity sha512-U1q5Zk5aIo+wWN452zinzHnM/9DDjlhwGTRkaErA1Za0M1DHcTcCEEdLuU68SBBpgVf8APMgoQ8GzmfhQKi0Fg== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7967,7 +7954,7 @@ matrix-mock-request@^1.2.3: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "9.5.0-rc.1" matrix-widget-api "^0.1.0-beta.10" minimist "^1.2.5" pako "^1.0.11" From 50fe0d26e51f5405f60b4bd226958efce79d95af Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 13 Jan 2021 13:14:41 +0000 Subject: [PATCH 3/8] Prepare changelog for v1.7.17-rc.1 --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77f2fec801..5743fa2713 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +Changes in [1.7.17-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.17-rc.1) (2021-01-13) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.16...v1.7.17-rc.1) + + * Upgrade to React SDK 3.12.0-rc.1 and JS SDK 9.5.0-rc.1 + * Translations update from Weblate + [\#16131](https://github.com/vector-im/element-web/pull/16131) + * webplatform: Fix notification closing + [\#16028](https://github.com/vector-im/element-web/pull/16028) + * Stop building code and types for Element layer + [\#15999](https://github.com/vector-im/element-web/pull/15999) + Changes in [1.7.16](https://github.com/vector-im/element-web/releases/tag/v1.7.16) (2020-12-21) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.16-rc.1...v1.7.16) From f31b3c1c186ca46fddb9accca32cb2b2211a1e27 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 13 Jan 2021 13:14:41 +0000 Subject: [PATCH 4/8] v1.7.17-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c8c163f505..4f768cd2ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.16", + "version": "1.7.17-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 3275a0d819596900f0de9c1653a0516f4e9b9961 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 18 Jan 2021 15:18:38 +0000 Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 9.5.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f768cd2ad..53767b426a 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "highlight.js": "^10.4.1", "jsrsasign": "^9.1.5", "katex": "^0.12.0", - "matrix-js-sdk": "9.5.0-rc.1", + "matrix-js-sdk": "9.5.0", "matrix-react-sdk": "3.12.0-rc.1", "matrix-widget-api": "^0.1.0-beta.10", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index e01aad70f1..656316762e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7899,6 +7899,21 @@ mathml-tag-names@^2.1.1: 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.5.0: + version "9.5.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.5.0.tgz#2f54e73b0fbb03e85b3f81f41da9d33b028c4b30" + integrity sha512-Fg1SGrZ4N2WAtgbK5mEoOfDwTGV83noJ3VUJ9z3rparbQCBr8Rd8ppHBD8RgshVWGdJMPJ4EQBwhQUgHeyhz9g== + 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.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@9.5.0-rc.1: version "9.5.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.5.0-rc.1.tgz#91c2f0ff969baea1416611a39354ca016cc1b7c6" From 238ed786fdc4765cc4495a62b2d5aac60839729c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 18 Jan 2021 15:19:10 +0000 Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 3.12.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 53767b426a..b3f00275ad 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^9.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.5.0", - "matrix-react-sdk": "3.12.0-rc.1", + "matrix-react-sdk": "3.12.0", "matrix-widget-api": "^0.1.0-beta.10", "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 656316762e..27ab233f77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7914,21 +7914,6 @@ matrix-js-sdk@9.5.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@9.5.0-rc.1: - version "9.5.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.5.0-rc.1.tgz#91c2f0ff969baea1416611a39354ca016cc1b7c6" - integrity sha512-TOWU6QKfc3BBTdLyzKMnc0trsaw9sQw3/LaNU/ZqP1LuVDK+qRQxcUfsev0EFfRKURIcI7KvtzRiV+DakN/X+Q== - 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.4" - 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" @@ -7937,10 +7922,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.12.0-rc.1: - version "3.12.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.12.0-rc.1.tgz#e550c228c2b1aac0625c44a3afe95bf04a0023bc" - integrity sha512-U1q5Zk5aIo+wWN452zinzHnM/9DDjlhwGTRkaErA1Za0M1DHcTcCEEdLuU68SBBpgVf8APMgoQ8GzmfhQKi0Fg== +matrix-react-sdk@3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.12.0.tgz#fd81e11c8486f132f7e412bd96be45aae7f32566" + integrity sha512-4sDtch/ciG7ekAbmI5BlZPfvHS0u/2l9fS9vUHGxcq6AGld1HHIVWUn4jg4LH14TAKY2OHIK6WK/OPPaYgyO0Q== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7969,7 +7954,7 @@ matrix-react-sdk@3.12.0-rc.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.5.0-rc.1" + matrix-js-sdk "9.5.0" matrix-widget-api "^0.1.0-beta.10" minimist "^1.2.5" pako "^1.0.11" From 532caff9896401ea3fcadfff43396a37ab3f4efc Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 18 Jan 2021 15:21:56 +0000 Subject: [PATCH 7/8] Prepare changelog for v1.7.17 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5743fa2713..dda6f367fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.17](https://github.com/vector-im/element-web/releases/tag/v1.7.17) (2021-01-18) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.17-rc.1...v1.7.17) + + * Upgrade to React SDK 3.12.0 and JS SDK 9.5.0 + Changes in [1.7.17-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.17-rc.1) (2021-01-13) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.16...v1.7.17-rc.1) From 1da652ede3c88a1d3be955bf29a7bc050b9b31b1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 18 Jan 2021 15:21:57 +0000 Subject: [PATCH 8/8] v1.7.17 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b3f00275ad..6fe1e7e476 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.17-rc.1", + "version": "1.7.17", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {