From 5052f9bc43680ced387179382e6d6537b25c1f25 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Jan 2021 12:12:41 +0000 Subject: [PATCH 1/4] Upgrade matrix-js-sdk to 9.5.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6fe1e7e476..ec5ce0481e 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", + "matrix-js-sdk": "9.5.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", diff --git a/yarn.lock b/yarn.lock index 27ab233f77..8d0e9040d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7914,6 +7914,21 @@ matrix-js-sdk@9.5.0: request "^2.88.2" unhomoglyph "^1.0.6" +matrix-js-sdk@9.5.1: + version "9.5.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.5.1.tgz#f2e27b7131a8d1a75fd2a803434e63fe672415ef" + integrity sha512-01YbRuU50BDYytTZ5fdmdoQLqOGDT2F7X6vDBrYHpdaRN2jWuLCspQlOKFJKgv73gNhw9V9jfoZN+NxuwuUpUQ== + 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" From cd8a9e44b33520cbb9f625c65f124c0e2dea36fc Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Jan 2021 12:13:51 +0000 Subject: [PATCH 2/4] Upgrade matrix-react-sdk to 3.12.1 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index ec5ce0481e..ddde1c1823 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsrsasign": "^9.1.5", "katex": "^0.12.0", "matrix-js-sdk": "9.5.1", - "matrix-react-sdk": "3.12.0", + "matrix-react-sdk": "3.12.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 8d0e9040d3..72f5668a94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7899,21 +7899,6 @@ 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.1: version "9.5.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.5.1.tgz#f2e27b7131a8d1a75fd2a803434e63fe672415ef" @@ -7937,10 +7922,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -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== +matrix-react-sdk@3.12.1: + version "3.12.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.12.1.tgz#4f527404220427328d96462bc8a0cf065b9b31bf" + integrity sha512-RM//2mm5Bh4k7XQuYjbe8u/hSgXnxGgpq4/YcKmH2hKqdg46IVyVcoPrCswtdWqt0hpO3taoORrMwpGy3QhHBQ== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7969,7 +7954,7 @@ matrix-react-sdk@3.12.0: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.5.0" + matrix-js-sdk "9.5.1" matrix-widget-api "^0.1.0-beta.10" minimist "^1.2.5" pako "^1.0.11" From b04f76dc27375041b7eee1a9d33fca46f923bae2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Jan 2021 12:17:44 +0000 Subject: [PATCH 3/4] Prepare changelog for v1.7.18 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dda6f367fa..aa867a8257 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +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) + + * Upgrade to React SDK 3.12.1 and JS SDK 9.5.1 + 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) From 9a1b667c27fc61d1a99fcd4668628aa21c038580 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Jan 2021 12:17:44 +0000 Subject: [PATCH 4/4] v1.7.18 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ddde1c1823..8a24916472 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.17", + "version": "1.7.18", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {