From 4bb0cdf298e36133acb5451e553fc45360bb195c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 14 Nov 2023 16:23:27 +0000 Subject: [PATCH 1/9] Upgrade matrix-react-sdk to 3.85.0-rc.1 --- package.json | 2 +- yarn.lock | 73 +++++++++++++++++++++++++++++++++++----------------- 2 files changed, 51 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index b9ec57d3c3..b3922fe009 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "30.0.1", - "matrix-react-sdk": "3.84.1", + "matrix-react-sdk": "3.85.0-rc.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 2a7d965391..b21853b287 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1666,6 +1666,11 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.2.0.tgz#7c60afe01915281a6b71502821bc8e01afbfa70d" integrity sha512-txmvaTiZpVV0/kWCRcE7tZvRESCEc1ynLJDVh9OUsFlaXfl13c7qdD3E6IJEJ8YiPMIn+PHogdfBZsO84reaMg== +"@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-wysiwyg@2.4.1": version "2.4.1" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.4.1.tgz#e1325a42366a1c891b2ba90c88e597b39187b2cb" @@ -1676,13 +1681,6 @@ 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.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.2.0.tgz#cb284601a82448dc23fac31949c466eb34ec64b4" - integrity sha512-HSicxLdagZRbQp35d3t2SeDFTiT4GmEQDQGih8dWSKRHXK4krVQjb6Kf1NkwweiFDAeU0qgbz2pP4RZqbv0XIg== - dependencies: - "@babel/runtime" "^7.17.9" - "@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" @@ -1980,6 +1978,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-slot" "1.0.2" +"@radix-ui/react-separator@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@radix-ui/react-separator/-/react-separator-1.0.3.tgz#be5a931a543d5726336b112f465f58585c04c8aa" + integrity sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-slot@1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.2.tgz#a9ff4423eade67f501ffb32ec22064bc9d3099ab" @@ -2921,19 +2927,20 @@ 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@^0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-0.0.6.tgz#dd25364e947d0f06b404f9bfba69daa0f7cda998" - integrity sha512-Jij7Vfzed7UL+AfVK4ykuJhufbzWu/aaEYn9swOS7Rhy9wJFp35CaUY32Du51lwg7Rkt3OwSWXSYeHKcZAsEEA== +"@vector-im/compound-design-tokens@^0.0.7": + version "0.0.7" + resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-0.0.7.tgz#b0716dd4782dd95900491e45b003b58f93748024" + integrity sha512-RCQc6qr+s8cp4xKbNi/I3OL43uPCH+N4L9vYf0r+qwRy4WCKdI4QL0TBTV4bOo8hF49z8e+BgU5ZIu5TVQXNMQ== dependencies: svg2vectordrawable "^2.9.1" -"@vector-im/compound-web@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-0.5.4.tgz#a99b346fe8de34a6f8bcbf9e1040ce1d79615dbc" - integrity sha512-w4Nwzid5Y89Dt9GaxKO+kWPTjSitLpkmoAjMYHVUajNMCfUxluzu4eOgjPRCpubPH5lZUB6/95y43wOI+pEC1Q== +"@vector-im/compound-web@0.6.3": + version "0.6.3" + resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-0.6.3.tgz#e5d025a3e5de1d94e721b0f6a5127dfa90968a2b" + integrity sha512-Jw63AWRltUC/AH4f+0rxdeWgf/qin7fc9E3ZqtdI10tGAOz9YdHadeGg4aGTKjUgv8/J0GvF8VnEfVq9kRAbag== dependencies: "@radix-ui/react-form" "^0.0.3" + "@radix-ui/react-separator" "^1.0.3" "@radix-ui/react-tooltip" "^1.0.6" classnames "^2.3.2" graphemer "^1.4.0" @@ -8950,6 +8957,26 @@ matrix-js-sdk@30.0.1: unhomoglyph "^1.0.6" uuid "9" +matrix-js-sdk@30.1.0-rc.1: + version "30.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.1.0-rc.1.tgz#ed083c15ed64454942af7b682006bae0005cf181" + integrity sha512-8Vb7BJuxXhLLzGy4V5UX8veG3jcRcx3FxYPpwIZbBjhjzDgjsQ1yIVjYhCTolzGAyi65uZSBCtPxIOHjCUA/FA== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^3.0.1" + 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" @@ -8957,22 +8984,22 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.84.1: - version "3.84.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.84.1.tgz#2e915c3b6253a2157dadcde33deed1240a1acb12" - integrity sha512-yVL+vevxQxxZwN1gcOjEqz+I0RN6Ou6dXMxkO1zjTQdplJyVhOmePM0P8gH13ZLpsnLEc0ut9tFphPQdpoRypw== +matrix-react-sdk@3.85.0-rc.1: + version "3.85.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.85.0-rc.1.tgz#25ab186900a41868ad94e4081bee2cd9f83c2c26" + integrity sha512-OxXgvLXxrTgQfyzxt5qhk+U3Yzbkb136YugmQQ+WWuGm/aGo5PRnx/UHugEvCZNVOgxa2szWNcF5BMC77puNBQ== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.8.0" "@matrix-org/emojibase-bindings" "^1.1.2" "@matrix-org/matrix-wysiwyg" "2.4.1" - "@matrix-org/react-sdk-module-api" "^2.2.0" + "@matrix-org/react-sdk-module-api" "^2.2.1" "@matrix-org/spec" "^1.7.0" "@sentry/browser" "^7.0.0" "@sentry/tracing" "^7.0.0" "@testing-library/react-hooks" "^8.0.1" - "@vector-im/compound-design-tokens" "^0.0.6" - "@vector-im/compound-web" "0.5.4" + "@vector-im/compound-design-tokens" "^0.0.7" + "@vector-im/compound-web" "0.6.3" "@zxcvbn-ts/core" "^3.0.4" "@zxcvbn-ts/language-common" "^3.0.4" "@zxcvbn-ts/language-en" "^3.0.2" @@ -9003,7 +9030,7 @@ matrix-react-sdk@3.84.1: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "30.0.1" + matrix-js-sdk "30.1.0-rc.1" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From 613b50a4c6571ad2c03feaa4042745855b344106 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 14 Nov 2023 16:23:37 +0000 Subject: [PATCH 2/9] Upgrade matrix-js-sdk to 30.1.0-rc.1 --- package.json | 2 +- yarn.lock | 47 +++++++++++------------------------------------ 2 files changed, 12 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index b3922fe009..81158df4d2 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "30.0.1", + "matrix-js-sdk": "30.1.0-rc.1", "matrix-react-sdk": "3.85.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index b21853b287..5095c65f3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1661,11 +1661,6 @@ emojibase "^15.0.0" emojibase-data "^15.0.0" -"@matrix-org/matrix-sdk-crypto-wasm@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.2.0.tgz#7c60afe01915281a6b71502821bc8e01afbfa70d" - integrity sha512-txmvaTiZpVV0/kWCRcE7tZvRESCEc1ynLJDVh9OUsFlaXfl13c7qdD3E6IJEJ8YiPMIn+PHogdfBZsO84reaMg== - "@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" @@ -2480,9 +2475,9 @@ "@types/node" "*" "@types/events@^3.0.0": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.2.tgz#c9b18152fdac34e924260532762255e34ef1d491" - integrity sha512-v4Mr60wJuF069iZZCdY5DKhfj0l6eXNJtbSM/oMDNdRLoBEUsktmKnswkz0X3OAic5W8Qy/YU6owKE4A66Y46A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.3.tgz#a8ef894305af28d1fc6d2dfdfc98e899591ea529" + integrity sha512-trOc4AAUThEz9hapPtSd7wf5tiQKvTtu5b371UxXdTuqzIh0ArcRspRP0i0Viu+LXstIQ1z96t1nsPxT9ol01g== "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": version "4.17.36" @@ -4737,10 +4732,10 @@ crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-js@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf" - integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw== +crypto-js@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" + integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== css-blank-pseudo@^0.1.4: version "0.1.4" @@ -8937,26 +8932,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@30.0.1: - version "30.0.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.0.1.tgz#33a1fb2d9a9a8875f51f48a1b3124c1e82457472" - integrity sha512-/yefRQ7e8xU0Aox8w6lYUDjYdK+9Wmpz59K1SJZX3E1KE1SUvIo4rkPkGojN3RkRFqXXBBP4ciJiy5vH6OodAg== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^2.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-js-sdk@30.1.0-rc.1: version "30.1.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.1.0-rc.1.tgz#ed083c15ed64454942af7b682006bae0005cf181" @@ -9808,11 +9783,11 @@ obuf@^1.0.0, obuf@^1.1.2: integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== oidc-client-ts@^2.2.4: - version "2.3.0" - resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-2.3.0.tgz#43c90f1f0cc3be2e4ede38b8c68642ba00bfa8f6" - integrity sha512-7RUKU+TJFQo+4X9R50IGJAIDF18uRBaFXyZn4VVCfwmwbSUhKcdDnw4zgeut3uEXkiD3NqURq+d88sDPxjf1FA== + version "2.4.0" + resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-2.4.0.tgz#764c8a33de542026e2798de9849ce8049047d7e5" + integrity sha512-WijhkTrlXK2VvgGoakWJiBdfIsVGz6CFzgjNNqZU1hPKV2kyeEaJgLs7RwuiSp2WhLfWBQuLvr2SxVlZnk3N1w== dependencies: - crypto-js "^4.1.1" + crypto-js "^4.2.0" jwt-decode "^3.1.2" on-finished@2.4.1: From 2a26d39867691dc8a24d7977ee583b44ee3cb578 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 14 Nov 2023 16:23:38 +0000 Subject: [PATCH 3/9] v1.11.50-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 81158df4d2..0cb059f58e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.49", + "version": "1.11.50-rc.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From ccaef6f14b5175fc27aedc88469f3a92415850a4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 16 Nov 2023 09:18:24 +0000 Subject: [PATCH 4/9] Update build_debian.yaml --- .github/workflows/build_debian.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_debian.yaml b/.github/workflows/build_debian.yaml index 0b157dfae1..50c9419481 100644 --- a/.github/workflows/build_debian.yaml +++ b/.github/workflows/build_debian.yaml @@ -57,7 +57,6 @@ jobs: - name: Build deb package run: | VERSION=$(cat package.json | jq -r .version) - sudo chmod -R u=rw,go=r debian/tmp/usr/share/element-web/ dpkg-gencontrol -v"$VERSION" -ldebian/tmp/DEBIAN/changelog dpkg-deb -Zxz --root-owner-group --build debian/tmp element-web.deb From eb31e39f9ef7ec3ec84ddff0897bd68f0fbb7a31 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 16 Nov 2023 09:29:09 +0000 Subject: [PATCH 5/9] v1.11.50-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0cb059f58e..5b12484d26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.50-rc.0", + "version": "1.11.50-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From c8b916fdffc65d8f575ec15a52483e4ef949cda4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 21 Nov 2023 11:21:32 +0000 Subject: [PATCH 6/9] Upgrade matrix-react-sdk to 3.85.0 --- package.json | 2 +- yarn.lock | 30 +++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5b12484d26..7d2e310f3f 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "30.1.0-rc.1", - "matrix-react-sdk": "3.85.0-rc.1", + "matrix-react-sdk": "3.85.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 5095c65f3f..6245636315 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8932,6 +8932,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.1.0: + version "30.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.1.0.tgz#5ab8caf933ddc646ffd1076c5ce6b5d48376d392" + integrity sha512-QhYAMD6kD6vE3DLsbEnPVLmvk8LQrGIMvVEnQGOkBq3eUjg0r49gZEtDeRbCfOVwFO1hoTfxIgm6CfqG0l5AAg== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^3.0.1" + 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.1.0-rc.1: version "30.1.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.1.0-rc.1.tgz#ed083c15ed64454942af7b682006bae0005cf181" @@ -8959,10 +8979,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.85.0-rc.1: - version "3.85.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.85.0-rc.1.tgz#25ab186900a41868ad94e4081bee2cd9f83c2c26" - integrity sha512-OxXgvLXxrTgQfyzxt5qhk+U3Yzbkb136YugmQQ+WWuGm/aGo5PRnx/UHugEvCZNVOgxa2szWNcF5BMC77puNBQ== +matrix-react-sdk@3.85.0: + version "3.85.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.85.0.tgz#f58b27f80809503f20d7d5b794a54f8b237260cf" + integrity sha512-nU5uN/W3CoXInayJ6bmGLk4vzSyl6ALLlMNGc4ZoU4WoJn9Ek+Pa8fG9m49z4/Yr0lyk2eGSA0UMH8MxL0+h0Q== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.8.0" @@ -9005,7 +9025,7 @@ matrix-react-sdk@3.85.0-rc.1: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "30.1.0-rc.1" + matrix-js-sdk "30.1.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From af3f25eb4d1bb3f2a8f4e02a818cdc267bbee13a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 21 Nov 2023 11:21:41 +0000 Subject: [PATCH 7/9] Upgrade matrix-js-sdk to 30.1.0 --- package.json | 2 +- yarn.lock | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/package.json b/package.json index 7d2e310f3f..acff5f1b0f 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "30.1.0-rc.1", + "matrix-js-sdk": "30.1.0", "matrix-react-sdk": "3.85.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 6245636315..6f8234378c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8952,26 +8952,6 @@ matrix-js-sdk@30.1.0: unhomoglyph "^1.0.6" uuid "9" -matrix-js-sdk@30.1.0-rc.1: - version "30.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.1.0-rc.1.tgz#ed083c15ed64454942af7b682006bae0005cf181" - integrity sha512-8Vb7BJuxXhLLzGy4V5UX8veG3jcRcx3FxYPpwIZbBjhjzDgjsQ1yIVjYhCTolzGAyi65uZSBCtPxIOHjCUA/FA== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^3.0.1" - 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 38dd45a51c8c23855f267b5a7c6be5d5177e0a07 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 21 Nov 2023 11:21:42 +0000 Subject: [PATCH 8/9] v1.11.50 --- CHANGELOG.md | 15 +++++++++++++++ package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d2e6b189f..74f6cb2c69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +Changes in [1.11.50](https://github.com/vector-im/element-web/releases/tag/v1.11.50) (2023-11-21) +================================================================================================= +## ✨ Features + +* Ship element-web as a debian package ([#26533](https://github.com/vector-im/element-web/pull/26533)). Contributed by @t3chguy. + +* Update room summary card header ([#11823](https://github.com/matrix-org/matrix-react-sdk/pull/11823)). Contributed by @germain-gg. +* Add feature flag for disabling encryption in Element Call ([#11837](https://github.com/matrix-org/matrix-react-sdk/pull/11837)). Contributed by @toger5. +* Adapt the rendering of extra icons in the room header ([#11835](https://github.com/matrix-org/matrix-react-sdk/pull/11835)). Contributed by @charlynguyen. +* Implement new unreachable state and fix broken string ref ([#11748](https://github.com/matrix-org/matrix-react-sdk/pull/11748)). Contributed by @MidhunSureshR. +* Allow adding extra icons to the room header ([#11799](https://github.com/matrix-org/matrix-react-sdk/pull/11799)). Contributed by @charlynguyen. + + + + Changes in [1.11.49](https://github.com/vector-im/element-web/releases/tag/v1.11.49) (2023-11-13) ================================================================================================= diff --git a/package.json b/package.json index acff5f1b0f..184727923c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.50-rc.1", + "version": "1.11.50", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 4bd9336be1d1c67e58641c5808890559d81604c4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 21 Nov 2023 11:35:01 +0000 Subject: [PATCH 9/9] Update release-gitflow.yml --- .github/workflows/release-gitflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-gitflow.yml b/.github/workflows/release-gitflow.yml index 3602bf4cd9..22ad5bcb84 100644 --- a/.github/workflows/release-gitflow.yml +++ b/.github/workflows/release-gitflow.yml @@ -7,7 +7,8 @@ concurrency: ${{ github.repository }}-${{ github.workflow }} jobs: merge: uses: matrix-org/matrix-js-sdk/.github/workflows/release-gitflow.yml@develop - secrets: inherit + secrets: + ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} with: dependencies: | matrix-react-sdk