From fa21a0ee172d963c932e7b6ba997feb59a973da9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 9 Jun 2023 09:48:49 +0100 Subject: [PATCH 1/4] Upgrade matrix-js-sdk to 26.0.1 --- package.json | 2 +- yarn.lock | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 42b2605519..6df8db5405 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.16.0", - "matrix-js-sdk": "26.0.0", + "matrix-js-sdk": "26.0.1", "matrix-react-sdk": "3.73.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index c01876f576..88d4b7393c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8237,6 +8237,24 @@ matrix-js-sdk@26.0.0: unhomoglyph "^1.0.6" uuid "9" +matrix-js-sdk@26.0.1: + version "26.0.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-26.0.1.tgz#5b63eaf917ea1d24ec2a3af57c1b12523e3b0fdb" + integrity sha512-KJQiGhBPRtq/tyabDd90WW3BkiitsuzVBpbBAiCcdoClzsDS1CaG2aBvQ42M7uIBK2ItswLkVdpiNp7gq8cyog== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.9" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.3.1" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "9" + matrix-mock-request@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92" From 9358c41aadf8a8c271e754d382493ac43b85af82 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 9 Jun 2023 09:50:01 +0100 Subject: [PATCH 2/4] Upgrade matrix-react-sdk to 3.73.1 --- package.json | 2 +- yarn.lock | 28 +++++----------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 6df8db5405..e30aea7c38 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "26.0.1", - "matrix-react-sdk": "3.73.0", + "matrix-react-sdk": "3.73.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 88d4b7393c..cfe105f53d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8219,24 +8219,6 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== -matrix-js-sdk@26.0.0: - version "26.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-26.0.0.tgz#44134f4af8f401537edfee79a93a520b7effc6b3" - integrity sha512-HLosQgRjEb2/j4CpxncIqRklKKaWKZcfut6DDLswVf6d0pCXHbLp39iCy4obpJiWH2H/4k/HMvDzj3+8J8qWWw== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.9" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.3.1" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "9" - matrix-js-sdk@26.0.1: version "26.0.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-26.0.1.tgz#5b63eaf917ea1d24ec2a3af57c1b12523e3b0fdb" @@ -8262,10 +8244,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.73.0: - version "3.73.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.73.0.tgz#bdfb674c9ac07f23023474cb739ded08d43f5b6e" - integrity sha512-brh5K0fruqU2qXqCxqVi/k2ek+M8LiOItoaNQT+vDwwDsRsHTcZorApnjkjfQWcRSH29ZwoFGXBl+EqryR2DHQ== +matrix-react-sdk@3.73.1: + version "3.73.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.73.1.tgz#4bbd27d27b50ea6fa8053dd5080e00d4b3875a97" + integrity sha512-vZ8S2X56sx2B2uXCBxOqVRH1ktH4xlUMKydu6Ih7NTrduLOvgmBvAk6GGqtNKjk5ude2BRWR8KVbag9DkLAihA== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.5.0" @@ -8304,7 +8286,7 @@ matrix-react-sdk@3.73.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "26.0.0" + matrix-js-sdk "26.0.1" matrix-widget-api "^1.4.0" memoize-one "^6.0.0" minimist "^1.2.5" From 2ec33e8e414dcd946f3b2803ef53e161659caff7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 9 Jun 2023 09:53:50 +0100 Subject: [PATCH 3/4] Prepare changelog for v1.11.33 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bed92eaaa..0f6552c75a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.11.33](https://github.com/vector-im/element-web/releases/tag/v1.11.33) (2023-06-09) +================================================================================================= + +## 🐛 Bug Fixes + * Bump matrix-react-sdk to v3.73.1 for matrix-js-sdk v26.0.1. Fixes #25526. + Changes in [1.11.32](https://github.com/vector-im/element-web/releases/tag/v1.11.32) (2023-06-06) ================================================================================================= From 322dab0b58c559feef7e8e3395bc73a16904f095 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 9 Jun 2023 09:53:51 +0100 Subject: [PATCH 4/4] v1.11.33 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e30aea7c38..119a4ce8f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.32", + "version": "1.11.33", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {