From d2b287cb299cfbc54acb3b36547876c47ab2eae8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 22 Aug 2023 15:26:53 +0100 Subject: [PATCH 1/9] Upgrade matrix-js-sdk to 28.0.0-rc.1 --- package.json | 2 +- yarn.lock | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 3ce7b6809d..9ca6e8bb86 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "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": "28.0.0-rc.1", "matrix-widget-api": "^1.5.0", "memoize-one": "^6.0.0", "minimist": "^1.2.5", diff --git a/yarn.lock b/yarn.lock index 7d6df6f3ad..24fa2694ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1861,10 +1861,10 @@ emojibase "^15.0.0" emojibase-data "^15.0.0" -"@matrix-org/matrix-sdk-crypto-wasm@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-1.2.0.tgz#115cd21cb2bba3c8166cf09e7d61da0902aa8973" - integrity sha512-vmpbtXYFzfBSFjeAx/PNRjy7zyH+Xx2HVXNKdApgo3+hSALewcXwdOTJy5pKq+poumM2TjjKDhG2s6/zSDNUYg== +"@matrix-org/matrix-sdk-crypto-wasm@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-1.2.1.tgz#5b546c8a0e53b614f10b77b3b649818aed9d0db1" + integrity sha512-DCb7Q83PCQK0uav5vB3KNV/hJPlxAhT/ddar+VHz2kC39hMLKGzWYVhprpLYVcavaE/6OX+Q/xFkAoV/3QtUHQ== "@matrix-org/matrix-wysiwyg@^2.4.1": version "2.4.1" @@ -7310,12 +7310,13 @@ 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@github:matrix-org/matrix-js-sdk#develop": - version "27.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/97cf73bc52814c2a479161caffffb85fe6ce63c8" +matrix-js-sdk@28.0.0-rc.1: + version "28.0.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-28.0.0-rc.1.tgz#ee6e12bd889caea942a1456fff6feb7997b5a9cd" + integrity sha512-x/Vz8ZF3MXg6OWhplsr6BVySfKahUhJg9osCbslHI/u/wvp9Q1eROybTjF7iiO3KE8guyl/xvOeAe2nbIPkDFw== dependencies: "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.0" + "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.1" another-json "^0.2.0" bs58 "^5.0.0" content-type "^1.0.4" From dcdfb22b3767298f6724e5e0e9c28c28a1aad0ee Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 22 Aug 2023 15:30:03 +0100 Subject: [PATCH 2/9] Prepare changelog for v3.79.0-rc.1 --- CHANGELOG.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7238303b3c..89055bbbd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,27 @@ +Changes in [3.79.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.79.0-rc.1) (2023-08-22) +=============================================================================================================== + +## ✨ Features + * Hide account deactivation for externally managed accounts ([\#11445](https://github.com/matrix-org/matrix-react-sdk/pull/11445)). Fixes vector-im/element-web#26022. Contributed by @kerryarchibald. + * OIDC: Redirect to delegated auth provider when signing out ([\#11432](https://github.com/matrix-org/matrix-react-sdk/pull/11432)). Fixes vector-im/element-web#26000. Contributed by @kerryarchibald. + * Disable 3pid fields in settings when `m.3pid_changes` capability is disabled ([\#11430](https://github.com/matrix-org/matrix-react-sdk/pull/11430)). Fixes vector-im/element-web#25995. Contributed by @kerryarchibald. + * OIDC: disable multi session signout for OIDC-aware servers in session manager ([\#11431](https://github.com/matrix-org/matrix-react-sdk/pull/11431)). Contributed by @kerryarchibald. + * Implement updated open dialog method of the Module API ([\#11395](https://github.com/matrix-org/matrix-react-sdk/pull/11395)). Contributed by @dhenneke. + * Polish & delabs `Exploring public spaces` feature ([\#11423](https://github.com/matrix-org/matrix-react-sdk/pull/11423)). + * Treat lists with a single empty item as plain text, not Markdown. ([\#6833](https://github.com/matrix-org/matrix-react-sdk/pull/6833)). Fixes vector-im/element-meta#1265. + * Allow managing room knocks ([\#11404](https://github.com/matrix-org/matrix-react-sdk/pull/11404)). Contributed by @charlynguyen. + * Pin the action buttons to the bottom of the scrollable dialogs ([\#11407](https://github.com/matrix-org/matrix-react-sdk/pull/11407)). Contributed by @dhenneke. + * Support Matrix 1.1 (drop legacy r0 versions) ([\#9819](https://github.com/matrix-org/matrix-react-sdk/pull/9819)). + +## 🐛 Bug Fixes + * Fix export type "Current timeline" to match its behaviour to its name ([\#11426](https://github.com/matrix-org/matrix-react-sdk/pull/11426)). Fixes vector-im/element-web#25988. + * Fix Room Settings > Notifications file upload input being shown superfluously ([\#11415](https://github.com/matrix-org/matrix-react-sdk/pull/11415)). Fixes vector-im/element-web#18392. + * Simplify registration with email validation ([\#11398](https://github.com/matrix-org/matrix-react-sdk/pull/11398)). Fixes vector-im/element-web#25832 vector-im/element-web#23601 and vector-im/element-web#22297. + * correct home server URL ([\#11391](https://github.com/matrix-org/matrix-react-sdk/pull/11391)). Fixes vector-im/element-web#25931. Contributed by @NSV1991. + * Include non-matching DMs in Spotlight recent conversations when the DM's userId is part of the search API results ([\#11374](https://github.com/matrix-org/matrix-react-sdk/pull/11374)). Contributed by @mgcm. + * Fix useRoomMembers missing updates causing incorrect membership counts ([\#11392](https://github.com/matrix-org/matrix-react-sdk/pull/11392)). Fixes vector-im/element-web#17096. + * Show error when searching public rooms fails ([\#11378](https://github.com/matrix-org/matrix-react-sdk/pull/11378)). + Changes in [3.78.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.78.0) (2023-08-15) ===================================================================================================== From d4f681375df83e9af073174f6f4639e5533a641e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 22 Aug 2023 15:30:05 +0100 Subject: [PATCH 3/9] v3.79.0-rc.1 --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 9ca6e8bb86..1866bb192f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.78.0", + "version": "3.79.0-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { @@ -23,7 +23,7 @@ "package.json", ".stylelintrc.js" ], - "main": "./src/index.ts", + "main": "./lib/index.ts", "matrix_src_main": "./src/index.ts", "matrix_lib_main": "./lib/index.ts", "matrix_lib_typings": "./lib/index.d.ts", @@ -229,5 +229,6 @@ "outputDirectory": "coverage", "outputName": "jest-sonar-report.xml", "relativePaths": true - } + }, + "typings": "./lib/index.d.ts" } From 81804b82a2af75553b55e4253a011de0711fc039 Mon Sep 17 00:00:00 2001 From: Andy Balaam Date: Wed, 23 Aug 2023 10:51:27 +0100 Subject: [PATCH 4/9] Avoid importing mkEvent from matrix-js-sdk/spec since that is not in the package (#11450) (cherry picked from commit e79b03a2df744be8e23b758954cf2d863093d9af) --- test/components/views/dialogs/RoomSettingsDialog-test.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/components/views/dialogs/RoomSettingsDialog-test.tsx b/test/components/views/dialogs/RoomSettingsDialog-test.tsx index 714d2527d6..9a5f9b6745 100644 --- a/test/components/views/dialogs/RoomSettingsDialog-test.tsx +++ b/test/components/views/dialogs/RoomSettingsDialog-test.tsx @@ -16,7 +16,6 @@ limitations under the License. import React from "react"; import { fireEvent, render, screen } from "@testing-library/react"; -import { mkEvent } from "matrix-js-sdk/spec/test-utils/test-utils"; import { EventTimeline, EventType, @@ -133,7 +132,7 @@ describe("", () => { jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Invite); mockClient.emit( RoomStateEvent.Events, - new MatrixEvent(mkEvent({ content: {}, type: EventType.RoomJoinRules })), + new MatrixEvent({ content: {}, type: EventType.RoomJoinRules }), room.getLiveTimeline().getState(EventTimeline.FORWARDS)!, null, ); From e2f92769e1cf8ee631ec8689db936cd552041c58 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 23 Aug 2023 11:45:49 +0100 Subject: [PATCH 5/9] Prepare changelog for v3.79.0-rc.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89055bbbd5..41330302c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [3.79.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.79.0-rc.2) (2023-08-23) +=============================================================================================================== + +## 🐛 Bug Fixes + * Fix build error ([\#11450](https://github.com/matrix-org/matrix-react-sdk/pull/11450)) + Changes in [3.79.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.79.0-rc.1) (2023-08-22) =============================================================================================================== From 169f6fd2188eca7d78821b1b46f729a60adb01b8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 23 Aug 2023 11:45:51 +0100 Subject: [PATCH 6/9] v3.79.0-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1866bb192f..2da4d85e01 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.79.0-rc.1", + "version": "3.79.0-rc.2", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 71a5df30148df1ddb8223b97b822234a52776c08 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 29 Aug 2023 10:58:12 +0100 Subject: [PATCH 7/9] Upgrade matrix-js-sdk to 28.0.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2da4d85e01..322b84d95e 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "maplibre-gl": "^2.0.0", "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "0.0.1", - "matrix-js-sdk": "28.0.0-rc.1", + "matrix-js-sdk": "28.0.0", "matrix-widget-api": "^1.5.0", "memoize-one": "^6.0.0", "minimist": "^1.2.5", diff --git a/yarn.lock b/yarn.lock index 24fa2694ac..0c3673c1a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7310,10 +7310,10 @@ 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@28.0.0-rc.1: - version "28.0.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-28.0.0-rc.1.tgz#ee6e12bd889caea942a1456fff6feb7997b5a9cd" - integrity sha512-x/Vz8ZF3MXg6OWhplsr6BVySfKahUhJg9osCbslHI/u/wvp9Q1eROybTjF7iiO3KE8guyl/xvOeAe2nbIPkDFw== +matrix-js-sdk@28.0.0: + version "28.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-28.0.0.tgz#9fc50de7ad540ff84b5a537531f27f723fa8bc8c" + integrity sha512-AdvFETHFkAx/Hf94+JXrdPePWiPQOHu4OsqkVbhoOGDlScLCeafWJzdp5sKNx1Yq12ULXWBCgRO2AL1pU8ZY/A== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.1" From f80a69e19395cc403bb11e8721de61f2a3c5dcc0 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 29 Aug 2023 11:00:11 +0100 Subject: [PATCH 8/9] Prepare changelog for v3.79.0 --- CHANGELOG.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41330302c3..b588020eb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,5 @@ -Changes in [3.79.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.79.0-rc.2) (2023-08-23) -=============================================================================================================== - -## 🐛 Bug Fixes - * Fix build error ([\#11450](https://github.com/matrix-org/matrix-react-sdk/pull/11450)) - -Changes in [3.79.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.79.0-rc.1) (2023-08-22) -=============================================================================================================== +Changes in [3.79.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.79.0) (2023-08-29) +===================================================================================================== ## ✨ Features * Hide account deactivation for externally managed accounts ([\#11445](https://github.com/matrix-org/matrix-react-sdk/pull/11445)). Fixes vector-im/element-web#26022. Contributed by @kerryarchibald. From 313aebfeba94d018224be5690dc8643384cc1a3d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 29 Aug 2023 11:00:13 +0100 Subject: [PATCH 9/9] v3.79.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 322b84d95e..ccab7e93f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.79.0-rc.2", + "version": "3.79.0", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {