From 11f56b06bfcc8c47c70811750a6d45b6dd285358 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 28 Mar 2023 14:37:24 +0100 Subject: [PATCH 1/4] Upgrade matrix-js-sdk to 24.0.0 --- package.json | 2 +- yarn.lock | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 30ed10fe18f..5eeff143340 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.16.0", - "matrix-js-sdk": "23.5.0", + "matrix-js-sdk": "24.0.0", "matrix-react-sdk": "3.68.0", "matrix-widget-api": "^1.1.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index d3709105ff4..ffbae185805 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8141,6 +8141,24 @@ matrix-js-sdk@23.5.0: unhomoglyph "^1.0.6" uuid "9" +matrix-js-sdk@24.0.0: + version "24.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-24.0.0.tgz#cc08c55e6a88dcc177341705a8ff7cdfe93e0c27" + integrity sha512-AOhO036ziDf6lwYoauj5DES/RJ6RDTq+vrK2yO/GW/8n+bAXhkjWc9AA/WcTK/9SkNHS46ZanmolkhS1n8WniQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.3" + 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.0.0" + 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 21fa0887bdf0d5bbf84fc2c4d91cbb90b1b6ed36 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 28 Mar 2023 14:37:43 +0100 Subject: [PATCH 2/4] Upgrade matrix-react-sdk to 3.69.0 --- package.json | 2 +- yarn.lock | 28 +++++----------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 5eeff143340..0aecfba234e 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "24.0.0", - "matrix-react-sdk": "3.68.0", + "matrix-react-sdk": "3.69.0", "matrix-widget-api": "^1.1.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index ffbae185805..b70d967dcbf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8123,24 +8123,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@23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.5.0.tgz#644a1546340160bfc3de44df30030373e7cc2fc9" - integrity sha512-jkHJBxXcLqzz0aZ4+Hjbx7hvgryIy+DZPOxvNfM2jJM0sc803Yyu4JMZLEdx/JLwFG1KE7bFZGiXP26g5yu6Mw== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.3" - 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.0.0" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "9" - matrix-js-sdk@24.0.0: version "24.0.0" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-24.0.0.tgz#cc08c55e6a88dcc177341705a8ff7cdfe93e0c27" @@ -8166,10 +8148,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.68.0: - version "3.68.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.68.0.tgz#792435db0211377376509145dca2166ad5bb5a07" - integrity sha512-h+QSxVW8cz3GbJDAkcMq/jgXNzMjI1+mbttRtc0pVmzckjVDHyU6d5hzyzFakgvgFrv6LnRrtalU/mmMurrg2Q== +matrix-react-sdk@3.69.0: + version "3.69.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.69.0.tgz#63bc203531b45c37f9aa928b389c89b205f940d1" + integrity sha512-QmMAk+k/W2eb+KMHcOWcDtQzg2OQ5KV38lUY6UGOnvlM2n823YzKaio2a0OhMPxhf6GQ0yIKPGiGBftV+SdDQw== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.5.0" @@ -8209,7 +8191,7 @@ matrix-react-sdk@3.68.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "23.5.0" + matrix-js-sdk "24.0.0" matrix-widget-api "^1.1.1" minimist "^1.2.5" opus-recorder "^8.0.3" From 4969a80c06835fcbbca4047a8136a6cf45fbe4ca Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 28 Mar 2023 14:40:54 +0100 Subject: [PATCH 3/4] Prepare changelog for v1.11.26 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bc80359fae..acb6b7f1c89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.11.26](https://github.com/vector-im/element-web/releases/tag/v1.11.26) (2023-03-28) +================================================================================================= + +## 🐛 Bug Fixes + * Changes for matrix-js-sdk v24.0.0 + * Changes for matrix-react-sdk v3.69.0 + Changes in [1.11.25](https://github.com/vector-im/element-web/releases/tag/v1.11.25) (2023-03-15) ================================================================================================= From 7a002341f4e67152ec7fa29f3d97f2291a5b9980 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 28 Mar 2023 14:40:55 +0100 Subject: [PATCH 4/4] v1.11.26 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0aecfba234e..9d3a15d0950 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.25", + "version": "1.11.26", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {