From 8f466061c3047071c6c75767eeb498e0ac966fc2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Nov 2022 09:37:16 +0000 Subject: [PATCH 1/4] Upgrade matrix-js-sdk to 21.0.1 --- package.json | 2 +- yarn.lock | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 082bf43a25..520a9714ba 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.16.0", - "matrix-js-sdk": "21.0.0", + "matrix-js-sdk": "21.0.1", "matrix-react-sdk": "3.59.0", "matrix-widget-api": "^1.1.1", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 1581f599fc..1d97027e6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3150,6 +3150,11 @@ brorand@^1.0.1, brorand@^1.1.0: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== +browser-request@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17" + integrity sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg== + browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -8177,7 +8182,21 @@ matrix-js-sdk@21.0.0: dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" - browser-request "^0.3.3" + bs58 "^5.0.0" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "^0.0.1-beta.7" + p-retry "4" + qs "^6.9.6" + unhomoglyph "^1.0.6" + +matrix-js-sdk@21.0.1: + version "21.0.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-21.0.1.tgz#4ba88505a1b96b4d23288066865b67ccc17079a0" + integrity sha512-xrJibvMwj38fMeNX7e9kfEzR9xv5UNwWkYGlyQE+ag81HGLacbJvEix/2zkEQ40TypB9ENVioVFIyVYGN9Rv2Q== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" bs58 "^5.0.0" content-type "^1.0.4" loglevel "^1.7.1" @@ -8208,7 +8227,6 @@ matrix-react-sdk@3.59.0: "@types/ua-parser-js" "^0.7.36" await-lock "^2.1.0" blurhash "^1.1.3" - browser-request "^0.3.3" cheerio "^1.0.0-rc.9" classnames "^2.2.6" commonmark "^0.29.3" From 3402b388a11f2ae19c9c11da0037b0198ff48ff8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Nov 2022 09:38:52 +0000 Subject: [PATCH 2/4] Upgrade matrix-react-sdk to 3.59.1 --- package.json | 2 +- yarn.lock | 30 +++++------------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 520a9714ba..1bc29b684d 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "21.0.1", - "matrix-react-sdk": "3.59.0", + "matrix-react-sdk": "3.59.1", "matrix-widget-api": "^1.1.1", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 1d97027e6c..5c8fc7c002 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3150,11 +3150,6 @@ brorand@^1.0.1, brorand@^1.1.0: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== -browser-request@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17" - integrity sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg== - browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -8175,21 +8170,6 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -matrix-js-sdk@21.0.0: - version "21.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-21.0.0.tgz#e81d7c64d370ba9f3dddf6f4cfb7d4ae2e7174e1" - integrity sha512-x4mUdp+ozWHrfm6qBiAxq3htQJWza0AMqdmaDOCr7/74U3cUcwCZrKOdKA7IHWN9W0WrpzJ9TG/ZA2hDKB5FJA== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "^0.0.1-beta.7" - p-retry "4" - qs "^6.9.6" - unhomoglyph "^1.0.6" - matrix-js-sdk@21.0.1: version "21.0.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-21.0.1.tgz#4ba88505a1b96b4d23288066865b67ccc17079a0" @@ -8212,10 +8192,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.59.0: - version "3.59.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.59.0.tgz#ad98103ba65e17639452b0b13bd19178e6c2f550" - integrity sha512-JxJA3oEQTB0lb9+PDdHa9X8vwTyZKsw0vG0Vl4krmPaDjT0Hs9zBa3d5/KmLswnBKBtyGWIqadVIrm3PHzuolQ== +matrix-react-sdk@3.59.1: + version "3.59.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.59.1.tgz#c195052c944c0e352621b77d51510ec756692e4c" + integrity sha512-pK3d8hWkMTvQieuK9M7jPbBjXWEnvIuoF7O10ib6deHdNh7Vm87B3pPEmgoTfPKwWRTiQgT9pqhs57/IvD1e4w== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.2.0" @@ -8255,7 +8235,7 @@ matrix-react-sdk@3.59.0: maplibre-gl "^1.15.2" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "^0.0.1-beta.7" - matrix-js-sdk "21.0.0" + matrix-js-sdk "21.0.1" matrix-widget-api "^1.1.1" minimist "^1.2.5" opus-recorder "^8.0.3" From e347f5070070bce5ab2e2bff6a2a1811a00d4fd0 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Nov 2022 10:01:34 +0000 Subject: [PATCH 3/4] Prepare changelog for v1.11.13 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a70708e0a..4bb48aafcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [1.11.13](https://github.com/vector-im/element-web/releases/tag/v1.11.13) (2022-11-01) +================================================================================================= + +## 🐛 Bug Fixes + * Fix default behavior of Room.getBlacklistUnverifiedDevices ([\#2830](https://github.com/matrix-org/matrix-js-sdk/pull/2830)). Contributed by @duxovni. + * Catch server versions API call exception when starting the client ([\#2828](https://github.com/matrix-org/matrix-js-sdk/pull/2828)). Fixes vector-im/element-web#23634. + * Fix authedRequest including `Authorization: Bearer undefined` for password resets ([\#2822](https://github.com/matrix-org/matrix-js-sdk/pull/2822)). Fixes vector-im/element-web#23655. + Changes in [1.11.12](https://github.com/vector-im/element-web/releases/tag/v1.11.12) (2022-10-26) ================================================================================================= From 6882e6432bf49832c2f6ba1b08eac669329134c5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Nov 2022 10:01:35 +0000 Subject: [PATCH 4/4] v1.11.13 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1bc29b684d..cdbc1664fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.12", + "version": "1.11.13", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {