From ea8989816fec5b7fc2e308b5b883c34902d153e8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 21 Apr 2021 16:55:51 +0100 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 10.0.0-rc.1 --- package.json | 2 +- yarn.lock | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f6a78b78d..614b927262 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": "10.0.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 3d48c75e31..15df6eb06e 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@10.0.0-rc.1: + version "10.0.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.0.0-rc.1.tgz#e99ff19fa02ad6526cd62a20767104591b4e0720" + integrity sha512-3dwM9BFFAW1RC55+XHUpSfV4lQmyrx8peLW+3p+uIbZNgtPV/+h2X0ja281SVipdePJ50gYF9Iif+UkLkXXuug== + 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.11.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1dddcd49251f750cd2ff44e084c666290ffb17ad" @@ -7580,6 +7595,7 @@ matrix-mock-request@^1.2.3: tar-js "^0.3.0" text-encoding-utf-8 "^1.0.2" url "^0.11.0" + velocity-animate "^2.0.6" what-input "^5.2.10" zxcvbn "^4.4.2" From 42067f9fd5e4410dbf9a044179b834d94e3e6e37 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 21 Apr 2021 16:56:32 +0100 Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 3.19.0-rc.1 --- package.json | 2 +- yarn.lock | 24 +++++------------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 614b927262..eb866f8ac0 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "10.0.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.19.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 15df6eb06e..6a4ec406e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7521,20 +7521,6 @@ matrix-js-sdk@10.0.0-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "9.11.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1dddcd49251f750cd2ff44e084c666290ffb17ad" - 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.18.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f74300733455e4d0c4eb9359dcce880092286b74" +matrix-react-sdk@3.19.0-rc.1: + version "3.19.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.19.0-rc.1.tgz#2b31aa8788f286989777445b8c4fd47fc1eeeef9" + integrity sha512-3lggmukp/o/gbHt6UIWG5t/rEt26TuksL3TyewH0ykr9vZ8j+es+573ixRujyaKIaALE0XcFm/XyHFyWZDzeZg== 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 "10.0.0-rc.1" matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" opus-recorder "^8.0.3" @@ -7595,7 +7582,6 @@ matrix-mock-request@^1.2.3: tar-js "^0.3.0" text-encoding-utf-8 "^1.0.2" url "^0.11.0" - velocity-animate "^2.0.6" what-input "^5.2.10" zxcvbn "^4.4.2" From 29528eaed4703119c665b5842283ba7fd98bd926 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 21 Apr 2021 17:19:47 +0100 Subject: [PATCH 3/8] Prepare changelog for v1.7.26-rc.1 --- CHANGELOG.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9a381ce43..ac0ef7113d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,29 @@ +Changes in [1.7.26-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.26-rc.1) (2021-04-21) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.25...v1.7.26-rc.1) + + * Upgrade to React SDK 3.19.0-rc.1 and JS SDK 10.0.0-rc.1 + * Translations update from Weblate + [\#17031](https://github.com/vector-im/element-web/pull/17031) + * Bump ssri from 6.0.1 to 6.0.2 + [\#17010](https://github.com/vector-im/element-web/pull/17010) + * Fix `NODE_ENV` value for CI environments + [\#17003](https://github.com/vector-im/element-web/pull/17003) + * Use React production mode in CI builds + [\#16969](https://github.com/vector-im/element-web/pull/16969) + * Labs documentation for DND mode + [\#16962](https://github.com/vector-im/element-web/pull/16962) + * Rename blackboxing to new option ignore list + [\#16965](https://github.com/vector-im/element-web/pull/16965) + * Remove velocity-animate from lockfile + [\#16963](https://github.com/vector-im/element-web/pull/16963) + * Add mobile download link configuration + [\#16890](https://github.com/vector-im/element-web/pull/16890) + * Switch develop to not-staging Scalar by default + [\#16883](https://github.com/vector-im/element-web/pull/16883) + * Support a config option to skip login/welcome and go to SSO + [\#16880](https://github.com/vector-im/element-web/pull/16880) + Changes in [1.7.25](https://github.com/vector-im/element-web/releases/tag/v1.7.25) (2021-04-12) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.25-rc.1...v1.7.25) From 1a7cfc67d9aa667891ed624b61066594af8f05d4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 21 Apr 2021 17:19:47 +0100 Subject: [PATCH 4/8] v1.7.26-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb866f8ac0..3b40d9525d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.25", + "version": "1.7.26-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 535ca49479f9ea7e192a6c215fc1289501a0fe7c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 26 Apr 2021 17:51:43 +0100 Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 10.0.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b40d9525d..005a18ba1f 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": "10.0.0-rc.1", + "matrix-js-sdk": "10.0.0", "matrix-react-sdk": "3.19.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 6a4ec406e5..734a235843 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@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.0.0.tgz#571e97c8d8351715ac609ccedd38cad79d0b752e" + integrity sha512-40QN9HITqWBSYi/e8QQidDL6UOhWBpst437i+lHIqQ8a7SQtbcquDSRXWR22BjM2qbssR+02zfrLI/Kez7IoBQ== + 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@10.0.0-rc.1: version "10.0.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.0.0-rc.1.tgz#e99ff19fa02ad6526cd62a20767104591b4e0720" From 0c8fee3528561ac037f24655fc94715fe23e8b66 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 26 Apr 2021 17:52:34 +0100 Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 3.19.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 005a18ba1f..8553af68b4 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "10.0.0", - "matrix-react-sdk": "3.19.0-rc.1", + "matrix-react-sdk": "3.19.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 734a235843..9c0cfefb7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7521,21 +7521,6 @@ matrix-js-sdk@10.0.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@10.0.0-rc.1: - version "10.0.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.0.0-rc.1.tgz#e99ff19fa02ad6526cd62a20767104591b4e0720" - integrity sha512-3dwM9BFFAW1RC55+XHUpSfV4lQmyrx8peLW+3p+uIbZNgtPV/+h2X0ja281SVipdePJ50gYF9Iif+UkLkXXuug== - 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.19.0-rc.1: - version "3.19.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.19.0-rc.1.tgz#2b31aa8788f286989777445b8c4fd47fc1eeeef9" - integrity sha512-3lggmukp/o/gbHt6UIWG5t/rEt26TuksL3TyewH0ykr9vZ8j+es+573ixRujyaKIaALE0XcFm/XyHFyWZDzeZg== +matrix-react-sdk@3.19.0: + version "3.19.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.19.0.tgz#45e5794f9dae9b8fd6bdc2862ffd6e3a6650e282" + integrity sha512-xCRtq0u+qyYIAU/rUt7oQU0+sQboT1q1RRBzEvKca2usQRFH+EV4ahh97GCgg+u2IDiYb83bcVPcB4lGcCVLjg== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7575,7 +7560,7 @@ matrix-react-sdk@3.19.0-rc.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "10.0.0-rc.1" + matrix-js-sdk "10.0.0" matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" opus-recorder "^8.0.3" From d22e1fff1655b06ff388333c07f6cc30d80a71e7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 26 Apr 2021 17:55:53 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.7.26 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac0ef7113d..9e5516a325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.26](https://github.com/vector-im/element-web/releases/tag/v1.7.26) (2021-04-26) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.26-rc.1...v1.7.26) + + * Upgrade to React SDK 3.19.0 and JS SDK 10.0.0 + Changes in [1.7.26-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.26-rc.1) (2021-04-21) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.25...v1.7.26-rc.1) From 6d056d7a084dd4f2e3cc2621c974e5e4af76af8f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 26 Apr 2021 17:55:54 +0100 Subject: [PATCH 8/8] v1.7.26 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8553af68b4..b528fbadfd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.26-rc.1", + "version": "1.7.26", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {