From ab3639f7eb2fc09616322c561574442e9cb2100d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 12 Dec 2023 17:05:52 +0000 Subject: [PATCH 1/6] Upgrade matrix-react-sdk to 3.87.0-rc.0 --- package.json | 2 +- yarn.lock | 31 ++++++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 207303bc91..f765b2ce1b 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.87.0-rc.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 d5b8c0e55b..3a8bc3e459 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1759,7 +1759,7 @@ emojibase "^15.0.0" emojibase-data "^15.0.0" -"@matrix-org/matrix-sdk-crypto-wasm@^3.2.0": +"@matrix-org/matrix-sdk-crypto-wasm@^3.2.0", "@matrix-org/matrix-sdk-crypto-wasm@^3.4.0": version "3.4.0" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-3.4.0.tgz#fc4474c220320687857e1f54f709944e78d48824" integrity sha512-noO6QnH+ypT//CxewoQdlK/z2iuyQo1Ecp1PDaYyr/NV5yXkWvGfGIIcShXqrQJfL5kuWxg/14edNplXsaXoDQ== @@ -8362,6 +8362,26 @@ 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@30.3.0-rc.0: + version "30.3.0-rc.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.3.0-rc.0.tgz#3bb3c1dcca098daa9ba54db8429ff199cd91e21f" + integrity sha512-lMXoO8na1ImftaWtZPz+2vIv4u+29subxJc3cjsLZXAsFDKq3oooqKBC6FtGy9k0LnX3QIRuDhLPH1IQ6AJeFg== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^3.4.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@github:matrix-org/matrix-js-sdk#develop": version "30.2.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/103617c70ef218d9dfffabac8802e626341d11a1" @@ -8388,9 +8408,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.86.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f48f400361b6735874c7aa8000051301ed2f7517" +matrix-react-sdk@3.87.0-rc.0: + version "3.87.0-rc.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.87.0-rc.0.tgz#973355be072f1391043fec884fcaaf822f45bfca" + integrity sha512-l70RAo4opHl5YZlfSAAMZsR7RZLtFjGhv1zaJ8nYDwPLw3BbwPBL/QXH3LpQjhnHOAM+GsCzhWDbTt6qXxorDg== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.9.0" @@ -8433,7 +8454,7 @@ matrix-mock-request@^2.5.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "30.3.0-rc.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From 01c1243fe41a5f76db292daf49e6bf0a26562778 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 12 Dec 2023 17:06:01 +0000 Subject: [PATCH 2/6] Upgrade matrix-js-sdk to 30.3.0-rc.0 --- package.json | 2 +- yarn.lock | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index f765b2ce1b..f99387cbbe 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": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "30.3.0-rc.0", "matrix-react-sdk": "3.87.0-rc.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 3a8bc3e459..801db1dee4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1759,7 +1759,7 @@ emojibase "^15.0.0" emojibase-data "^15.0.0" -"@matrix-org/matrix-sdk-crypto-wasm@^3.2.0", "@matrix-org/matrix-sdk-crypto-wasm@^3.4.0": +"@matrix-org/matrix-sdk-crypto-wasm@^3.4.0": version "3.4.0" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-3.4.0.tgz#fc4474c220320687857e1f54f709944e78d48824" integrity sha512-noO6QnH+ypT//CxewoQdlK/z2iuyQo1Ecp1PDaYyr/NV5yXkWvGfGIIcShXqrQJfL5kuWxg/14edNplXsaXoDQ== @@ -8382,25 +8382,6 @@ matrix-js-sdk@30.3.0-rc.0: unhomoglyph "^1.0.6" uuid "9" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "30.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/103617c70ef218d9dfffabac8802e626341d11a1" - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^3.2.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" From 9ae3bade0297da078bc5606657f2b91192f717c3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 12 Dec 2023 17:06:02 +0000 Subject: [PATCH 3/6] v1.11.52-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f99387cbbe..31448b0286 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.51", + "version": "1.11.52-rc.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 5881f4ef9bc6a0f64dfb5cb59281b4663d174f54 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 Dec 2023 15:59:24 +0000 Subject: [PATCH 4/6] Upgrade matrix-react-sdk to 3.87.0 --- package.json | 2 +- yarn.lock | 30 +++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 31448b0286..5609ffb152 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "30.3.0-rc.0", - "matrix-react-sdk": "3.87.0-rc.0", + "matrix-react-sdk": "3.87.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 801db1dee4..8b8c4f74b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8362,6 +8362,26 @@ 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@30.3.0: + version "30.3.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.3.0.tgz#f7046da2d6d6403c84aac46b16772248e068fb9e" + integrity sha512-yqAn1IhvrSxvqRP4UMToaWhtA/iC6FYTt4qj5K8H3BmAQDOqObw9qPLm43HmdbsBGk6VUwz9szgNblhVyq0sKg== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^3.4.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@30.3.0-rc.0: version "30.3.0-rc.0" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.3.0-rc.0.tgz#3bb3c1dcca098daa9ba54db8429ff199cd91e21f" @@ -8389,10 +8409,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.87.0-rc.0: - version "3.87.0-rc.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.87.0-rc.0.tgz#973355be072f1391043fec884fcaaf822f45bfca" - integrity sha512-l70RAo4opHl5YZlfSAAMZsR7RZLtFjGhv1zaJ8nYDwPLw3BbwPBL/QXH3LpQjhnHOAM+GsCzhWDbTt6qXxorDg== +matrix-react-sdk@3.87.0: + version "3.87.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.87.0.tgz#b65048952a6a7a07d00395f24896844a050a99d8" + integrity sha512-in6NxtQImsDu3Dypi8mXm7THxJRG+v+3P/+dOxnfjx5ItspvxO1wRXkTTsHfaBYf496XqDHEmnLScnpTvzc4hg== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.9.0" @@ -8435,7 +8455,7 @@ matrix-react-sdk@3.87.0-rc.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "30.3.0-rc.0" + matrix-js-sdk "30.3.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From 632d791c480bd64a0b597e16bf41e1296529d7c4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 Dec 2023 15:59:32 +0000 Subject: [PATCH 5/6] Upgrade matrix-js-sdk to 30.3.0 --- package.json | 2 +- yarn.lock | 26 +++----------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 5609ffb152..674b80f5e2 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": "30.3.0-rc.0", + "matrix-js-sdk": "30.3.0", "matrix-react-sdk": "3.87.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 8b8c4f74b8..4c65e74cf5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1760,9 +1760,9 @@ emojibase-data "^15.0.0" "@matrix-org/matrix-sdk-crypto-wasm@^3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-3.4.0.tgz#fc4474c220320687857e1f54f709944e78d48824" - integrity sha512-noO6QnH+ypT//CxewoQdlK/z2iuyQo1Ecp1PDaYyr/NV5yXkWvGfGIIcShXqrQJfL5kuWxg/14edNplXsaXoDQ== + version "3.5.0" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-3.5.0.tgz#997d63ae12304142513fe93c5e0872ff10ca30b4" + integrity sha512-7as0jJTje+rFu9AF8LEO0tmhtHcou2YQnZOtpiP+lS5rDfIPv5CL8/eb45fzDnbQybt9Jm5zdjBdiLBEaUg2dQ== "@matrix-org/matrix-wysiwyg@2.17.0": version "2.17.0" @@ -8382,26 +8382,6 @@ matrix-js-sdk@30.3.0: unhomoglyph "^1.0.6" uuid "9" -matrix-js-sdk@30.3.0-rc.0: - version "30.3.0-rc.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.3.0-rc.0.tgz#3bb3c1dcca098daa9ba54db8429ff199cd91e21f" - integrity sha512-lMXoO8na1ImftaWtZPz+2vIv4u+29subxJc3cjsLZXAsFDKq3oooqKBC6FtGy9k0LnX3QIRuDhLPH1IQ6AJeFg== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^3.4.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" From cce2dc91af3c4bee4be4dd318f1299c6627ddfb0 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 Dec 2023 15:59:33 +0000 Subject: [PATCH 6/6] v1.11.52 --- CHANGELOG.md | 16 ++++++++++++++++ package.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82b6c7033f..3796ca964b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +Changes in [1.11.52](https://github.com/element-hq/element-web/releases/tag/v1.11.52) (2023-12-19) +================================================================================================== + + +## ✨ Features + +* Keep more recent rageshake logs ([#12003](https://github.com/matrix-org/matrix-react-sdk/pull/12003)). Contributed by @richvdh. + +## 🐛 Bug Fixes + +* Fix bug which prevented correct clean up of rageshake store ([#12002](https://github.com/matrix-org/matrix-react-sdk/pull/12002)). Contributed by @richvdh. +* Set up key backup using non-deprecated APIs ([#12005](https://github.com/matrix-org/matrix-react-sdk/pull/12005)). Contributed by @andybalaam. +* Fix notifications appearing for old events ([#3946](https://github.com/matrix-org/matrix-js-sdk/pull/3946)). Contributed by @dbkr. +* Prevent phantom notifications from events not in a room's timeline ([#3942](https://github.com/matrix-org/matrix-js-sdk/pull/3942)). Contributed by @dbkr. + + Changes in [1.11.51](https://github.com/vector-im/element-web/releases/tag/v1.11.51) (2023-12-05) ================================================================================================= ## ✨ Features diff --git a/package.json b/package.json index 674b80f5e2..15952056e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.52-rc.0", + "version": "1.11.52", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {