From 0cd36558c5207d46f9ae7f2f97d02a352dc44506 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 28 Mar 2024 16:46:25 +0000 Subject: [PATCH 1/3] Upgrade dependency to matrix-js-sdk@31.6.1 --- package.json | 2 +- yarn.lock | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index e36244b32d..ce6a61ba02 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "jsrsasign": "^11.0.0", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "31.6.0", + "matrix-js-sdk": "31.6.1", "matrix-react-sdk": "3.96.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index e4ec293d9b..ba4326067c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8258,6 +8258,26 @@ matrix-js-sdk@31.6.0: unhomoglyph "^1.0.6" uuid "9" +matrix-js-sdk@31.6.1: + version "31.6.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-31.6.1.tgz#13a9c5ed9d57497a57c71c575a80da22ba4d8d42" + integrity sha512-XDSafXV2mrOQvkyZ8i1eDwqmicjLVTkdA2iAw1QsfAZtERz4CAlp1QJULcN1X2WhBx7pMnsN8M/k98LruUqMMQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^4.6.0" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + jwt-decode "^4.0.0" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^3.0.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 2fb41f19a79d857d7b43bdfb350ef3e0f1e5b6a4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 28 Mar 2024 16:56:42 +0000 Subject: [PATCH 2/3] Upgrade dependency to matrix-react-sdk@3.96.1 --- package.json | 2 +- yarn.lock | 30 +++++------------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index ce6a61ba02..304fa2d7bc 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "31.6.1", - "matrix-react-sdk": "3.96.0", + "matrix-react-sdk": "3.96.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 ba4326067c..0846f4ed67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8238,26 +8238,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.6.0: - version "31.6.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-31.6.0.tgz#d414775c80d2c350d8bc168b2c4d364454bcb04f" - integrity sha512-5U/QOjR54gPa91MbHGv0vrrVUkmn7ts4J+vRI5fxF+W0B4cu/98I0hbRnxikOAltfc+iED7KclXaZLprGL6Pyg== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^4.6.0" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - jwt-decode "^4.0.0" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.6.0" - oidc-client-ts "^3.0.1" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "9" - matrix-js-sdk@31.6.1: version "31.6.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-31.6.1.tgz#13a9c5ed9d57497a57c71c575a80da22ba4d8d42" @@ -8285,10 +8265,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.96.0: - version "3.96.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.96.0.tgz#1913757642ea300fd648514c3a43895483f41aed" - integrity sha512-Hcmb0+qmdBpo7/sLpT3FzuW8uJYy/xwMppgme7g7Q7dtdOuhcnRt1ttFYBIOkrlmRiRzZ8N+MqCaLxCcplzVsQ== +matrix-react-sdk@3.96.1: + version "3.96.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.96.1.tgz#5ca9569bca311f987884ef5201716429bd08ebe3" + integrity sha512-Jfhj8PyXRIaCl2RiyJQpNPfEECJpH+uLOm0A83GrR9l+Jr9GiF8u6UYwtl9GW0HhfEEFhY2elfJue8gkr2fwOg== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.12.0" @@ -8332,7 +8312,7 @@ matrix-react-sdk@3.96.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "31.6.0" + matrix-js-sdk "31.6.1" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From e2b5cea7df95e3f09297146972477e4ead7630b2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 28 Mar 2024 17:02:41 +0000 Subject: [PATCH 3/3] v1.11.63 --- CHANGELOG.md | 11 +++++++++++ package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c9e48a7b0..3174bc0934 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +Changes in [1.11.63](https://github.com/element-hq/element-web/releases/tag/v1.11.63) (2024-03-28) +================================================================================================== +This is a hotfix release to fix a couple of issues: one where the client would sometimes call the client/server API to set a push rule in a loop, and one where authentication was not sent for widgets when it should have been. + +## 🐛 Bug Fixes + +* Revert "Make EC widget theme reactive - Update widget url when the theme changes" ([#12383](https://github.com/matrix-org/matrix-react-sdk/pull/12383)) in order to fix widgets that require authentication. +* Update to hotfixed js-sdk to fix an issue where Element could try to set a push rule in a loop. + + + Changes in [1.11.62](https://github.com/element-hq/element-web/releases/tag/v1.11.62) (2024-03-26) ================================================================================================== ## ✨ Features diff --git a/package.json b/package.json index 304fa2d7bc..2b0dd3473f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.62", + "version": "1.11.63", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {