From 5075d209440af0d8074d62a26bbd650f1331f2bf Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 28 Nov 2023 16:22:28 +0000 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 30.2.0-rc.0 --- package.json | 10 +++++----- yarn.lock | 17 +++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index dd468c2a32..80550525f2 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,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": "30.2.0-rc.0", "matrix-widget-api": "^1.5.0", "memoize-one": "^6.0.0", "minimist": "^1.2.5", @@ -130,6 +130,9 @@ "what-input": "^5.2.10" }, "devDependencies": { + "@action-validator/cli": "^0.5.3", + "@action-validator/core": "^0.5.3", + "@axe-core/playwright": "^4.8.1", "@babel/cli": "^7.12.10", "@babel/core": "^7.12.10", "@babel/eslint-parser": "^7.12.10", @@ -226,10 +229,7 @@ "stylelint-config-standard": "^34.0.0", "stylelint-scss": "^5.0.0", "ts-node": "^10.9.1", - "typescript": "5.2.2", - "@axe-core/playwright": "^4.8.1", - "@action-validator/core": "^0.5.3", - "@action-validator/cli": "^0.5.3" + "typescript": "5.2.2" }, "peerDependencies": { "postcss": "^8.4.19", diff --git a/yarn.lock b/yarn.lock index 20f71f9443..6a293ab58a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1860,10 +1860,10 @@ emojibase "^15.0.0" emojibase-data "^15.0.0" -"@matrix-org/matrix-sdk-crypto-wasm@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-3.0.1.tgz#56a0376f8a389264bcf4d5325b378a71f18b7664" - integrity sha512-r0PBfUKlLHm67+fpIV21netX5+DujbY2XjJy7JUGJ55oW4XWBNbSf9vElfaQkrdt/iDscL/8I5PoD5lCuVW6zA== +"@matrix-org/matrix-sdk-crypto-wasm@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-3.1.0.tgz#38d8707dd5bdad4e98a0a66bf266accfc401b3cd" + integrity sha512-jFl8jeL16u9pyo1NIdg6US4r+Srm7KixL+cMYVbRG8EwB4UpF4Bt+3TdBUhWGbVc1Qte1htdBjPs8ZB+gZWkYw== "@matrix-org/matrix-wysiwyg@2.17.0": version "2.17.0" @@ -7604,12 +7604,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 "30.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b2018ef81b1b5be71cef073e85f77592a9dadae3" +matrix-js-sdk@30.2.0-rc.0: + version "30.2.0-rc.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.2.0-rc.0.tgz#1afda91a54115a09c943b9873799fc87758739ad" + integrity sha512-Tf2qdKJnpYUZX/jddvVn+KbP7BHl5hGywSL1I+QA1hJ0L45HeEh6P1bHJvbChOI40VMHGVG611+WZXWw4pHv5A== dependencies: "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^3.0.1" + "@matrix-org/matrix-sdk-crypto-wasm" "^3.1.0" another-json "^0.2.0" bs58 "^5.0.0" content-type "^1.0.4" From 31f3b8208ffbec82055080a088cc214f8256f152 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 28 Nov 2023 16:22:30 +0000 Subject: [PATCH 2/8] v3.86.0-rc.0 --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 80550525f2..99e0e11628 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.85.0", + "version": "3.86.0-rc.0", "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", @@ -239,5 +239,6 @@ "outputDirectory": "coverage", "outputName": "jest-sonar-report.xml", "relativePaths": true - } + }, + "typings": "./lib/index.d.ts" } From ad0b90b2c1d7c5283186eb8ce686de37f7437180 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 28 Nov 2023 16:46:46 +0000 Subject: [PATCH 3/8] Fix types Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 1 + src/@types/global.d.ts | 3 --- yarn.lock | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 99e0e11628..780d7d7177 100644 --- a/package.json +++ b/package.json @@ -232,6 +232,7 @@ "typescript": "5.2.2" }, "peerDependencies": { + "@matrix-org/olm": "3.2.15", "postcss": "^8.4.19", "webpack": "^4.0.0 || ^5.0.0" }, diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts index 39e1eacbc8..b1c8a4ec14 100644 --- a/src/@types/global.d.ts +++ b/src/@types/global.d.ts @@ -58,9 +58,6 @@ declare global { interface Window { matrixChat: ReturnType; mxMatrixClientPeg: IMatrixClientPeg; - Olm: { - init: () => Promise; - }; mxReactSdkConfig: DeepReadonly; // Needed for Safari, unknown to TypeScript diff --git a/yarn.lock b/yarn.lock index 6a293ab58a..b93944f78b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1870,6 +1870,11 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.17.0.tgz#68c83da17826fb43828f0c1ddd8d6e0b9d155ae5" integrity sha512-PZGSrNqKCSdUnyUVglEvHrV8uowU3JuWUlYYKBslYnnIrJHw9aS2nnCpLVqwACFD6N82+L+Net8ME9i3qy7BGQ== +"@matrix-org/olm@3.2.15": + version "3.2.15" + resolved "https://registry.yarnpkg.com/@matrix-org/olm/-/olm-3.2.15.tgz#55f3c1b70a21bbee3f9195cecd6846b1083451ec" + integrity sha512-S7lOrndAK9/8qOtaTq/WhttJC/o4GAzdfK0MUPpo8ApzsJEC0QjtwrkC3KBXdFP1cD1MXi/mlKR7aaoVMKgs6Q== + "@matrix-org/react-sdk-module-api@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.2.1.tgz#308bcb42a780200d3e7994235376784b51819379" From 5afae541c1918e3ef9e97cb6370b478dbd23d87d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 28 Nov 2023 16:49:50 +0000 Subject: [PATCH 4/8] v3.86.0-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 780d7d7177..5b77bf8a1f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.86.0-rc.0", + "version": "3.86.0-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From e97e378805adce3fa86d8792a48b4ae5b71effda Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 28 Nov 2023 17:05:14 +0000 Subject: [PATCH 5/8] Fix types Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5b77bf8a1f..7ebd9f07ce 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "@matrix-org/analytics-events": "^0.9.0", "@matrix-org/emojibase-bindings": "^1.1.2", "@matrix-org/matrix-wysiwyg": "2.17.0", + "@matrix-org/olm": "3.2.15", "@matrix-org/react-sdk-module-api": "^2.2.1", "@matrix-org/spec": "^1.7.0", "@sentry/browser": "^7.0.0", @@ -232,7 +233,6 @@ "typescript": "5.2.2" }, "peerDependencies": { - "@matrix-org/olm": "3.2.15", "postcss": "^8.4.19", "webpack": "^4.0.0 || ^5.0.0" }, From 572bca403790f8c6da245c53a9e07eb780f2d55f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 28 Nov 2023 17:09:47 +0000 Subject: [PATCH 6/8] v3.86.0-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7ebd9f07ce..a4c869912c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.86.0-rc.1", + "version": "3.86.0-rc.2", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 8960f50ba17d67102b79323111a2451b52370833 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 5 Dec 2023 13:55:20 +0000 Subject: [PATCH 7/8] Upgrade matrix-js-sdk to 30.2.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a4c869912c..5ebcb10133 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "maplibre-gl": "^2.0.0", "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "0.0.1", - "matrix-js-sdk": "30.2.0-rc.0", + "matrix-js-sdk": "30.2.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 b93944f78b..e7ff413bce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7609,10 +7609,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@30.2.0-rc.0: - version "30.2.0-rc.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.2.0-rc.0.tgz#1afda91a54115a09c943b9873799fc87758739ad" - integrity sha512-Tf2qdKJnpYUZX/jddvVn+KbP7BHl5hGywSL1I+QA1hJ0L45HeEh6P1bHJvbChOI40VMHGVG611+WZXWw4pHv5A== +matrix-js-sdk@30.2.0: + version "30.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.2.0.tgz#a260f0d6699ef1f2c4e06649e978bf653a78d02f" + integrity sha512-EUWL6JMbjvnvo/5MidHNZyrA6VfNavelMqLwlQ3v76Fui9ORTqDlgxO/zu9XB+dBInJNbyGmI3EjQOR7f1AQUA== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^3.1.0" From d03d47504e6215d493f91332bb3a782f04686c1d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 5 Dec 2023 13:55:21 +0000 Subject: [PATCH 8/8] v3.86.0 --- CHANGELOG.md | 23 +++++++++++++++++++++++ package.json | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30778b2303..378eb1fa85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +Changes in [3.86.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.86.0) (2023-12-05) +===================================================================================================== +## 🦖 Deprecations + +* Remove Quote from MessageContextMenu as it is unsupported by WYSIWYG ([#11914](https://github.com/matrix-org/matrix-react-sdk/pull/11914)). Contributed by @t3chguy. + +## ✨ Features + +* Always allow call.member events on new rooms ([#11948](https://github.com/matrix-org/matrix-react-sdk/pull/11948)). Contributed by @toger5. +* Right panel: view third party invite info without clearing history ([#11934](https://github.com/matrix-org/matrix-react-sdk/pull/11934)). Contributed by @kerryarchibald. +* Allow switching to system emoji font ([#11925](https://github.com/matrix-org/matrix-react-sdk/pull/11925)). Contributed by @t3chguy. +* Update open in other tab message ([#11916](https://github.com/matrix-org/matrix-react-sdk/pull/11916)). Contributed by @weeman1337. +* Add menu for legacy and element call in 1:1 rooms ([#11910](https://github.com/matrix-org/matrix-react-sdk/pull/11910)). Contributed by @toger5. +* Add ringing for matrixRTC ([#11870](https://github.com/matrix-org/matrix-react-sdk/pull/11870)). Contributed by @toger5. + +## 🐛 Bug Fixes + +* Keep device language when it has been previosuly set, after a successful delegated authentication flow that clears localStorage ([#11902](https://github.com/matrix-org/matrix-react-sdk/pull/11902)). Contributed by @mgcm. +* Fix misunderstanding of functional members ([#11918](https://github.com/matrix-org/matrix-react-sdk/pull/11918)). Contributed by @toger5. +* Fix: Video Room Chat Header Button Removed ([#11911](https://github.com/matrix-org/matrix-react-sdk/pull/11911)). Contributed by @kerryarchibald. +* Fix "not attempting encryption" warning ([#11899](https://github.com/matrix-org/matrix-react-sdk/pull/11899)). Contributed by @richvdh. + + Changes in [3.85.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.85.0) (2023-11-21) ===================================================================================================== ## ✨ Features diff --git a/package.json b/package.json index 5ebcb10133..5f2862d440 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.86.0-rc.2", + "version": "3.86.0", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {