From 78d6ad8f29f53692bad3a302125221d88cf27d4e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 10 Feb 2021 16:55:28 +0000 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 9.7.0-rc.1 --- package.json | 2 +- yarn.lock | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index ae27775025..6e88c2f68c 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.7.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 e78fafea4b..87132cf549 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.7.0-rc.1: + version "9.7.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.7.0-rc.1.tgz#30cabda3f2b416d09c95afc4fe138bba44534c76" + integrity sha512-y6D2bXYKQqGrtf1PLHjjHf6wW67DIhdrwQ77nKOhEd/rfaEqcMf99wqSvF/nzFexbG1Y7PG4IdM4YTdOQ9UD+g== + 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.6.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6ad3fb16b3813c717943f6bc8bca5a55fe325477" @@ -8890,16 +8905,7 @@ postcss-attribute-case-insensitive@^4.0.1: postcss "^7.0.2" postcss-selector-parser "^6.0.2" -postcss-calc@^7.0.1: - version "7.0.5" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" - integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== - dependencies: - postcss "^7.0.27" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.0.2" - -postcss-calc@^7.0.5: +postcss-calc@^7.0.1, postcss-calc@^7.0.5: version "7.0.5" resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== From f998f85c3c168cbdc13c3a17aa07bbb0ddc89fbd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 10 Feb 2021 16:56:55 +0000 Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 3.14.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 6e88c2f68c..7f4d40cf72 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.7.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.14.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 87132cf549..1154f57395 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7526,20 +7526,6 @@ matrix-js-sdk@9.7.0-rc.1: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "9.6.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6ad3fb16b3813c717943f6bc8bca5a55fe325477" - 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.13.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e9740f5a693861fb993bf9b85560d6c25784bca9" +matrix-react-sdk@3.14.0-rc.1: + version "3.14.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.14.0-rc.1.tgz#a6a6891ca6ca32b581e3921b6293e49800141e2f" + integrity sha512-19tASw75pUDaUHAxCimEKquaOvG/eRcvc38wPTIWnfcx5Nm4a4gioOy6spu5moV9hd/2JDRJHRrU5dbsvVW8Gg== 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.7.0-rc.1" matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" pako "^2.0.3" From 402f97b43091c733615dbe4eb44b208bcc44fca7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 10 Feb 2021 17:03:39 +0000 Subject: [PATCH 3/8] Prepare changelog for v1.7.21-rc.1 --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c2441bc70..90e9376b9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +Changes in [1.7.21-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.21-rc.1) (2021-02-10) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.20...v1.7.21-rc.1) + + * Upgrade to React SDK 3.14.0-rc.1 and JS SDK 9.7.0-rc.1 + * Translations update from Weblate + [\#16427](https://github.com/vector-im/element-web/pull/16427) + * Add RegExp dotAll feature test + [\#16408](https://github.com/vector-im/element-web/pull/16408) + * Fix Electron type merging + [\#16405](https://github.com/vector-im/element-web/pull/16405) + * README: remove Jenkins reference + [\#16381](https://github.com/vector-im/element-web/pull/16381) + * Enable PostCSS Calc in webpack builds + [\#16307](https://github.com/vector-im/element-web/pull/16307) + * Add configuration security best practices to the README. + [\#16367](https://github.com/vector-im/element-web/pull/16367) + * Upgrade matrix-widget-api + [\#16347](https://github.com/vector-im/element-web/pull/16347) + Changes in [1.7.20](https://github.com/vector-im/element-web/releases/tag/v1.7.20) (2021-02-04) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.19...v1.7.20) From c4c1b728cc9bf4eecca0245cb2f73329fae275ec Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 10 Feb 2021 17:03:39 +0000 Subject: [PATCH 4/8] v1.7.21-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f4d40cf72..4bf37c0ab0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.20", + "version": "1.7.21-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 31ec953a921ac6ac2a03a8ace651007a698f6c2d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 16 Feb 2021 11:11:43 +0000 Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 9.7.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4bf37c0ab0..4df9211e3a 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.7.0-rc.1", + "matrix-js-sdk": "9.7.0", "matrix-react-sdk": "3.14.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 1154f57395..44ac977cdc 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.7.0: + version "9.7.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.7.0.tgz#fbd03c188546f9733b28ea1752476b22ca63d2f2" + integrity sha512-cVBHhQVGk2WWQ2kv0Ov8CTcgZVJhMuZBejXZnKqp6qEgSpmb4xQRxewbxjF53ixO7uRUzGFtAlDiW4BeHZnN/g== + 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.7.0-rc.1: version "9.7.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.7.0-rc.1.tgz#30cabda3f2b416d09c95afc4fe138bba44534c76" From afb469ce4244cb0365e34cc4e2cdff92d6337140 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 16 Feb 2021 11:14:40 +0000 Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 3.14.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 4df9211e3a..01175cef09 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^10.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.7.0", - "matrix-react-sdk": "3.14.0-rc.1", + "matrix-react-sdk": "3.14.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 44ac977cdc..c039416bae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7526,21 +7526,6 @@ matrix-js-sdk@9.7.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@9.7.0-rc.1: - version "9.7.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.7.0-rc.1.tgz#30cabda3f2b416d09c95afc4fe138bba44534c76" - integrity sha512-y6D2bXYKQqGrtf1PLHjjHf6wW67DIhdrwQ77nKOhEd/rfaEqcMf99wqSvF/nzFexbG1Y7PG4IdM4YTdOQ9UD+g== - 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.14.0-rc.1: - version "3.14.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.14.0-rc.1.tgz#a6a6891ca6ca32b581e3921b6293e49800141e2f" - integrity sha512-19tASw75pUDaUHAxCimEKquaOvG/eRcvc38wPTIWnfcx5Nm4a4gioOy6spu5moV9hd/2JDRJHRrU5dbsvVW8Gg== +matrix-react-sdk@3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.14.0.tgz#86cd273e7828da2f9b9d3bcf6a5d1e7046e37788" + integrity sha512-W/MTmkESvnsOi6K4VwP6sfSXY9HxdINtPP3Jvlr9EO1PxahYs9BxxQ90gguij6I38dwM9/miChBG9uAO7mL9+A== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7580,7 +7565,7 @@ matrix-react-sdk@3.14.0-rc.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "9.7.0-rc.1" + matrix-js-sdk "9.7.0" matrix-widget-api "^0.1.0-beta.13" minimist "^1.2.5" pako "^2.0.3" From 2e00314dc0eff86d2ceb8a788c28f2db4bea8a2f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 16 Feb 2021 11:18:00 +0000 Subject: [PATCH 7/8] Prepare changelog for v1.7.21 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90e9376b9b..76e7c0b42e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.21](https://github.com/vector-im/element-web/releases/tag/v1.7.21) (2021-02-16) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.21-rc.1...v1.7.21) + + * Upgrade to React SDK 3.14.0 and JS SDK 9.7.0 + Changes in [1.7.21-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.21-rc.1) (2021-02-10) ========================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.20...v1.7.21-rc.1) From dd0e2e52f8dc78e541b4fc9306e32acfe3132f68 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 16 Feb 2021 11:18:00 +0000 Subject: [PATCH 8/8] v1.7.21 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01175cef09..b90111dbee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.21-rc.1", + "version": "1.7.21", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {