From 5fe009d094be37fc04e1d27cac8fc1cef4f4c8a2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 Mar 2024 16:43:03 +0000 Subject: [PATCH 1/4] Upgrade dependency to matrix-react-sdk@3.95.0-rc.0 --- package.json | 2 +- yarn.lock | 50 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index c02ec68c21..e89b6cdbb4 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "31.5.0", - "matrix-react-sdk": "3.94.0", + "matrix-react-sdk": "3.95.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 fe80b63c2b..d682f3e0af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3385,10 +3385,10 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== -"@vector-im/compound-design-tokens@^1.0.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-1.1.0.tgz#9b1a91317c404a1cd0d76d2fd5a7f2df5f1bf0a6" - integrity sha512-1HcCm6YsOda98rGXO4fg0WjEdrMnx/0tdtFmYIlnYkDYTbnfpFg+ffIDY7jgammWbOYwUZpZhM5q9ofb7/EgkA== +"@vector-im/compound-design-tokens@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-1.2.0.tgz#ccb15fffc24cc70d83593bfc5348e6a0198cc08a" + integrity sha512-8LSbb38KxvStcOQZDSi7lI4oqtCuHFEgEQi9Q0KUx+5OnklfdyJ638txM1bznX/Cp9lHgMk4dHrTiQHBOE0ZuA== dependencies: svg2vectordrawable "^2.9.1" @@ -8627,10 +8627,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.94.0: - version "3.94.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.94.0.tgz#25c39caab65af7c531018d0967e8ad4e6b7097c4" - integrity sha512-qVu5MdgU/tY3dQOEepE2Qz/zw/FINKMwoMzPNBuCitV1yilM/UWfMHZhBOyqqLeA3qJoeP+1O+XByg3aks9J/Q== +matrix-react-sdk@3.95.0-rc.0: + version "3.95.0-rc.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.95.0-rc.0.tgz#24360ccdd2d5b5b328f6588dca6638c3608411e6" + integrity sha512-Gdy1BUiA/lrmsIJvpv83L5IVMd6HNRg5t1eeIXk7chbj7hVx8GYWO8fTfEOUwP5t2WSc9uO8gigdG7xf1d7oAw== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.10.0" @@ -8641,7 +8641,7 @@ matrix-react-sdk@3.94.0: "@matrix-org/spec" "^1.7.0" "@sentry/browser" "^7.0.0" "@testing-library/react-hooks" "^8.0.1" - "@vector-im/compound-design-tokens" "^1.0.0" + "@vector-im/compound-design-tokens" "^1.2.0" "@vector-im/compound-web" "^3.1.1" "@zxcvbn-ts/core" "^3.0.4" "@zxcvbn-ts/language-common" "^3.0.4" @@ -11417,7 +11417,16 @@ string-replace-loader@3: loader-utils "^2.0.0" schema-utils "^3.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -11499,7 +11508,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -12674,8 +12690,7 @@ wildcard@^2.0.0: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: - name wrap-ansi-cjs +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -12693,6 +12708,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 02a315814f602200d7bbc1e504c7fcc3cc3f083f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 Mar 2024 16:47:16 +0000 Subject: [PATCH 2/4] v1.11.61-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e89b6cdbb4..a93c6b23df 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.60", + "version": "1.11.61-rc.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 33ea45301ec2c48c38ec28cb0d266a9c1c33f62c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 Mar 2024 17:17:29 +0000 Subject: [PATCH 3/4] Upgrade dependency to matrix-react-sdk@3.95.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a93c6b23df..0d9f522ca5 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "31.5.0", - "matrix-react-sdk": "3.95.0-rc.0", + "matrix-react-sdk": "3.95.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 d682f3e0af..7fbd5b0e67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8627,10 +8627,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.95.0-rc.0: - version "3.95.0-rc.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.95.0-rc.0.tgz#24360ccdd2d5b5b328f6588dca6638c3608411e6" - integrity sha512-Gdy1BUiA/lrmsIJvpv83L5IVMd6HNRg5t1eeIXk7chbj7hVx8GYWO8fTfEOUwP5t2WSc9uO8gigdG7xf1d7oAw== +matrix-react-sdk@3.95.0: + version "3.95.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.95.0.tgz#8d19038fd4755c6589b8340e1055258433463197" + integrity sha512-KHH0vD38LTxt99D5zusHdKQsZJWP3nts6Nj55Q0oTIS/n/i25VS36I9OCWXKZMMmxpWEtmRSw90TrYmwrztcwQ== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.10.0" From ba2336ac5c952a2dea36f70fc8e727cf9fe1d6a4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 Mar 2024 17:36:16 +0000 Subject: [PATCH 4/4] v1.11.61 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2959e87766..b6a53d7d66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +Changes in [1.11.61](https://github.com/element-hq/element-web/releases/tag/v1.11.61) (2024-03-14) +================================================================================================== +* No changes + +## 🐛 Bug Fixes + +* Update `@vector-im/compound-design-tokens` in package.json ([#12340](https://github.com/matrix-org/matrix-react-sdk/pull/12340)). + + + Changes in [1.11.60](https://github.com/element-hq/element-web/releases/tag/v1.11.60) (2024-03-12) ================================================================================================== ## ✨ Features diff --git a/package.json b/package.json index 0d9f522ca5..a7a671a8e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.61-rc.0", + "version": "1.11.61", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {