From e010e27f9df185d55ef419ce1f896e122dcce600 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 29 Jan 2021 17:30:19 +0000 Subject: [PATCH 1/9] Upgrade matrix-js-sdk to 9.6.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 392a8a8984..9660b5fbe1 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.6.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.12", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index e159799227..f88223582c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7511,6 +7511,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.6.0-rc.1: + version "9.6.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.6.0-rc.1.tgz#f5dd325b9b5c5b3fdf5199351ab51ecab1b2113c" + integrity sha512-Da5C4uTm7LRfjyb9pM7dbmkwFVVYH8HdjRa7rpaRP9elHwptJmAeoKEzPU5HcPkFFNQbBy11Kq+58IgKcVpwKA== + 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.5.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/7cfbd0da95edc66671e166aa83145b5e17ca76fc" From 4b25054d92d49f623bd6c62743e2050af284d9cc Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 29 Jan 2021 17:30:39 +0000 Subject: [PATCH 2/9] Upgrade matrix-react-sdk to 3.13.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 9660b5fbe1..da4c8e3612 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.6.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.13.0-rc.1", "matrix-widget-api": "^0.1.0-beta.12", "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 f88223582c..ae1661ccdf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7526,20 +7526,6 @@ matrix-js-sdk@9.6.0-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "9.5.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/7cfbd0da95edc66671e166aa83145b5e17ca76fc" - 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" @@ -7548,9 +7534,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.12.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/241955f7c27d7649525fac1bf750a532ea34ff46" +matrix-react-sdk@3.13.0-rc.1: + version "3.13.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.13.0-rc.1.tgz#8f4d47926e5eb339843ee6e32405006649a00ecd" + integrity sha512-/TDsGODmZG22WkimLwIS7nHqt5n2VVPgw/oZwhUbWJpg9vBcZHKQsH6vUngbqQcZP6F6o8pOX0L+WkNfkpd8gg== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7578,7 +7565,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.6.0-rc.1" matrix-widget-api "^0.1.0-beta.12" minimist "^1.2.5" pako "^2.0.3" From 2f9395e4a481c055c003e5fa1b5cfd3d9f846282 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 29 Jan 2021 17:34:02 +0000 Subject: [PATCH 3/9] Prepare changelog for v1.7.19-rc.1 --- CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa867a8257..a20361d3c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,39 @@ +Changes in [1.7.19-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.19-rc.1) (2021-01-29) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.18...v1.7.19-rc.1) + + * Upgrade to React SDK 3.13.0-rc.1 and JS SDK 9.6.0-rc.1 + * Translations update from Weblate + [\#16314](https://github.com/vector-im/element-web/pull/16314) + * Use history replaceState instead of redirect for SSO flow + [\#16292](https://github.com/vector-im/element-web/pull/16292) + * Document the mobile guide toast option + [\#16301](https://github.com/vector-im/element-web/pull/16301) + * Update widget-api to beta.12 + [\#16303](https://github.com/vector-im/element-web/pull/16303) + * Upgrade deps 2021-01 + [\#16294](https://github.com/vector-im/element-web/pull/16294) + * Move to newer base image for Docker builds + [\#16275](https://github.com/vector-im/element-web/pull/16275) + * Docs for the VoIP translate pattern option + [\#16236](https://github.com/vector-im/element-web/pull/16236) + * Fix Riot->Element in permalinkPrefix docs + [\#16227](https://github.com/vector-im/element-web/pull/16227) + * Supply server_name for optional federation-capable Jitsi auth + [\#16215](https://github.com/vector-im/element-web/pull/16215) + * Fix Widget API version confusion + [\#16212](https://github.com/vector-im/element-web/pull/16212) + * Add Hebrew language + [\#16210](https://github.com/vector-im/element-web/pull/16210) + * Update widget-api to beta 11 + [\#16177](https://github.com/vector-im/element-web/pull/16177) + * Fix develop Docker builds + [\#16192](https://github.com/vector-im/element-web/pull/16192) + * Skip the service worker for Electron + [\#16157](https://github.com/vector-im/element-web/pull/16157) + * Use isolated IPC API + [\#16137](https://github.com/vector-im/element-web/pull/16137) + Changes in [1.7.18](https://github.com/vector-im/element-web/releases/tag/v1.7.18) (2021-01-26) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.17...v1.7.18) From 341c806ac1158d1eeba94638ad2f02c93066c365 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 29 Jan 2021 17:34:02 +0000 Subject: [PATCH 4/9] v1.7.19-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index da4c8e3612..c34c9f2aa3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.18", + "version": "1.7.19-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From d2c161b45117ebc39fb95e394a31f2b4c06e56fa Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 2 Feb 2021 15:04:27 +0000 Subject: [PATCH 5/9] Upgrade matrix-widget-api --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c34c9f2aa3..9d3bf33697 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "katex": "^0.12.0", "matrix-js-sdk": "9.6.0-rc.1", "matrix-react-sdk": "3.13.0-rc.1", - "matrix-widget-api": "^0.1.0-beta.12", + "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", "react": "^16.14.0", diff --git a/yarn.lock b/yarn.lock index ae1661ccdf..7d8f940eb6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7596,10 +7596,10 @@ matrix-react-test-utils@^0.2.2: resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853" integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ== -matrix-widget-api@^0.1.0-beta.12: - version "0.1.0-beta.12" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.12.tgz#6cadeabde14f02949b7c3177434a4755942559b8" - integrity sha512-43xVAzLYzddYF73r6NK7NZ3geDLshQqCNAAcv0t5LFyFkKYGWDQG/cg8Vn8d37wm9WVBqYZUOXy9vBD4JcWVPA== +matrix-widget-api@^0.1.0-beta.12, matrix-widget-api@^0.1.0-beta.13: + version "0.1.0-beta.13" + resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.13.tgz#ebddc83eaef39bbb87b621a02a35902e1a29b9ef" + integrity sha512-DJAvuX2E7gxc/a9rtJPDh17ba9xGIOAoBHcWirNTN3KGodzsrZ+Ns+M/BREFWMwGS5yEBZko5eq7uhXStEbnyQ== dependencies: "@types/events" "^3.0.0" events "^3.2.0" From db0897f78e2948ddd1cdc8ef2570bfae322764af Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Feb 2021 12:16:48 +0000 Subject: [PATCH 6/9] Upgrade matrix-js-sdk to 9.6.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d3bf33697..d1e6c68d32 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.6.0-rc.1", + "matrix-js-sdk": "9.6.0", "matrix-react-sdk": "3.13.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 7d8f940eb6..fd06815966 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7511,6 +7511,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.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.6.0.tgz#e3aee2f2a2c395aaa8a90a19023addee7af02099" + integrity sha512-zoNqB7z0C0QDncN7yD1K50c4C88VPofWaCQ0gNXqO/Ac1dr/xLF/46iNF9Y+dBwq7siBO9wEh20WFHMaRpeLOg== + 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.6.0-rc.1: version "9.6.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.6.0-rc.1.tgz#f5dd325b9b5c5b3fdf5199351ab51ecab1b2113c" From 7c8ecaaca30afb5a8e16fbcdf5b84948e6deedc7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Feb 2021 12:21:31 +0000 Subject: [PATCH 7/9] Upgrade matrix-react-sdk to 3.13.0 --- package.json | 2 +- yarn.lock | 29 +++++++---------------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index d1e6c68d32..a5b7eca81d 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.6.0", - "matrix-react-sdk": "3.13.0-rc.1", + "matrix-react-sdk": "3.13.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 fd06815966..8a15dedd7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7526,21 +7526,6 @@ matrix-js-sdk@9.6.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@9.6.0-rc.1: - version "9.6.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.6.0-rc.1.tgz#f5dd325b9b5c5b3fdf5199351ab51ecab1b2113c" - integrity sha512-Da5C4uTm7LRfjyb9pM7dbmkwFVVYH8HdjRa7rpaRP9elHwptJmAeoKEzPU5HcPkFFNQbBy11Kq+58IgKcVpwKA== - 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" @@ -7549,10 +7534,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.13.0-rc.1: - version "3.13.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.13.0-rc.1.tgz#8f4d47926e5eb339843ee6e32405006649a00ecd" - integrity sha512-/TDsGODmZG22WkimLwIS7nHqt5n2VVPgw/oZwhUbWJpg9vBcZHKQsH6vUngbqQcZP6F6o8pOX0L+WkNfkpd8gg== +matrix-react-sdk@3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.13.0.tgz#6c34adc190338434849f946480e323d6d0c6f02d" + integrity sha512-G+9uLf07qIrpkLgtdhHkKhbNRvg6lX2xzXNwoi0pIn5L4MZmCrEmuixyCF0BVd8o8sYN2QMPeVTVSvLAl3BQHg== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7580,8 +7565,8 @@ matrix-react-sdk@3.13.0-rc.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "9.6.0-rc.1" - matrix-widget-api "^0.1.0-beta.12" + matrix-js-sdk "9.6.0" + matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" pako "^2.0.3" parse5 "^6.0.1" @@ -7611,7 +7596,7 @@ matrix-react-test-utils@^0.2.2: resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853" integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ== -matrix-widget-api@^0.1.0-beta.12, matrix-widget-api@^0.1.0-beta.13: +matrix-widget-api@^0.1.0-beta.13: version "0.1.0-beta.13" resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.13.tgz#ebddc83eaef39bbb87b621a02a35902e1a29b9ef" integrity sha512-DJAvuX2E7gxc/a9rtJPDh17ba9xGIOAoBHcWirNTN3KGodzsrZ+Ns+M/BREFWMwGS5yEBZko5eq7uhXStEbnyQ== From 0bce2de538af91b66e967f2f0cb4c5b795e3471e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Feb 2021 12:24:50 +0000 Subject: [PATCH 8/9] Prepare changelog for v1.7.19 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a20361d3c5..dcaff9f85e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [1.7.19](https://github.com/vector-im/element-web/releases/tag/v1.7.19) (2021-02-03) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.19-rc.1...v1.7.19) + + * Upgrade to React SDK 3.13.0 and JS SDK 9.6.0 + * [Release] Upgrade matrix-widget-api + [\#16348](https://github.com/vector-im/element-web/pull/16348) + Changes in [1.7.19-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.19-rc.1) (2021-01-29) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.18...v1.7.19-rc.1) From 56caad3ef27c614acce22a5ba280947c812b656b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Feb 2021 12:24:51 +0000 Subject: [PATCH 9/9] v1.7.19 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a5b7eca81d..ba4f3371cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.19-rc.1", + "version": "1.7.19", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {