From 9ca55b76b0a6d7193904f7dcb91210abd0f17982 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 19 Jan 2024 13:56:49 +0000 Subject: [PATCH 1/5] Upgrade matrix-react-sdk to 3.90.0 --- package.json | 2 +- yarn.lock | 30 +++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7c67f48c8b..1b015bc4e7 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "31.0.0", - "matrix-react-sdk": "3.89.0", + "matrix-react-sdk": "3.90.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index d4c20538b6..0af6a5de13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8582,6 +8582,26 @@ matrix-js-sdk@31.0.0: unhomoglyph "^1.0.6" uuid "9" +matrix-js-sdk@31.1.0: + version "31.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-31.1.0.tgz#d87a1ea86b6458bbfa1c6db81a7268dd58e4d7e1" + integrity sha512-3xtmepoCmvIJMDahIcbBdAKSCylgkffaRs9Y5/vOnbBxMi5uSO/MEY8uCUGB2B9M7P1mfgcWSkNeU7Oco521MQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^3.5.0" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + jwt-decode "^3.1.2" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^2.2.4" + 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" @@ -8589,10 +8609,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.89.0: - version "3.89.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.89.0.tgz#b3ab4d15f1e4740218be688e48ea48693c8670bb" - integrity sha512-Uc1CP8u5IqGObZlNnVYEwHqAk26Tg3vkSXH2RXYFh37R/Hv7CJu50/YXLor40aGb+hOMwQytuzPkxrcc1/RdMw== +matrix-react-sdk@3.90.0: + version "3.90.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.90.0.tgz#fed27de87ebd53763700f531a4922f54e71fe0f3" + integrity sha512-RN007TIp7s8aofNru3B4ZjYfFxD7kvAE2fkzdtktasHVarxjoaUsO+Qk3JIVAN2G3BinaM3rgXmZqVB2+3oPmA== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.9.0" @@ -8635,7 +8655,7 @@ matrix-react-sdk@3.89.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "31.0.0" + matrix-js-sdk "31.1.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From 1669477d870125c5c7cb4a3ecd4b972f50008dce Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 19 Jan 2024 13:56:58 +0000 Subject: [PATCH 2/5] Upgrade matrix-js-sdk to 31.1.0 --- package.json | 2 +- yarn.lock | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/package.json b/package.json index 1b015bc4e7..9ef18fe293 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "31.0.0", + "matrix-js-sdk": "31.1.0", "matrix-react-sdk": "3.90.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 0af6a5de13..a809c935ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8562,26 +8562,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@31.0.0: - version "31.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-31.0.0.tgz#2aacab066466f33b0aa956b8a2c765bfe1bde384" - integrity sha512-2TqDwEK34NFS0uiOti02CBCupwJcAIxWarOSD0yIrgMpIwSVNB795jEnXxNXz+bgPKsepDmiqeg2DrlinIoW1w== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^3.5.0" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - jwt-decode "^3.1.2" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.6.0" - oidc-client-ts "^2.2.4" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "9" - matrix-js-sdk@31.1.0: version "31.1.0" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-31.1.0.tgz#d87a1ea86b6458bbfa1c6db81a7268dd58e4d7e1" From bb3954c2355be25c428ca2f4068fda645f442c07 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 19 Jan 2024 13:57:00 +0000 Subject: [PATCH 3/5] v1.11.55 --- CHANGELOG.md | 13 +++++++++++++ package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40badd9f28..6c909d942e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +Changes in [1.11.55](https://github.com/element-hq/element-web/releases/tag/v1.11.55) (2024-01-19) +================================================================================================== + + +## ✨ Features + +* Broaden support for matrix spec versions ([#12159](https://github.com/matrix-org/matrix-react-sdk/pull/12159)). Contributed by @RiotRobot. + +## 🐛 Bug Fixes + +* Fixed shield alignment on message Input ([#12155](https://github.com/matrix-org/matrix-react-sdk/pull/12155)). Contributed by @RiotRobot. + + Changes in [1.11.54](https://github.com/element-hq/element-web/releases/tag/v1.11.54) (2024-01-16) ================================================================================================== ## 🐛 Bug Fixes diff --git a/package.json b/package.json index 9ef18fe293..4e9a59756a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.54", + "version": "1.11.55", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 5b6f5e8c4c61e05340285e0a2c6f8ca8818383eb Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 19 Jan 2024 14:00:31 +0000 Subject: [PATCH 4/5] Reset matrix-react-sdk back to develop branch --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index f256d6bb43..05354c8539 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8626,8 +8626,8 @@ matrix-mock-request@^2.5.0: expect "^28.1.0" "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.89.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/3c405ac34d217bba86f7dc2690ef9125181d2e58" + version "3.90.0" + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/d8202be772ca081e38a2183b31df82d4dd8f2e4e" dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.9.0" From 927b3165ab6e40aa6a36a87f6897e674772c2117 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 19 Jan 2024 14:00:42 +0000 Subject: [PATCH 5/5] Reset matrix-js-sdk back to develop branch --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 05354c8539..2d87c0c128 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8600,8 +8600,8 @@ matrix-events-sdk@0.0.1: integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "31.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/76b9c3950bfdfca922bec7f70502ff2da93bd731" + version "31.1.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2337d5a7af6265bbcabbd42c1594cd8b1829b00b" dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^3.6.0"