From 8419ac62be9a6cfb4d454a9f607ca192a5a5eadd Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 17 Oct 2023 15:30:52 +0100 Subject: [PATCH 01/16] Upgrade matrix-react-sdk to 3.83.0-rc.1 --- package.json | 2 +- yarn.lock | 67 ++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 89e8aac47b..48718b9d64 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,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.83.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 e5cafb08d6..37d2d3197a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1690,6 +1690,11 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-1.2.3-alpha.0.tgz#f6f93e3ee44c5f1e0e255badd26f4a7d3fb1dab8" integrity sha512-BFLqfq/WbYZ+83r4UWLhwtBYvTp5DKTHNeWUSDBVvudFtqBvkntNAAUz+xmhmO1XkyNm+sBaElxF8IS9S8zdww== +"@matrix-org/matrix-sdk-crypto-wasm@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.0.0.tgz#a4e9682705f090c94a58f6b851054f7598de9e83" + integrity sha512-8tKmI9u35URvtAr6zcfNGphImWt1y458iKq2PSPOSARlsmVk2lkrhsBFihBnWJY1oJC2EMsyfI8XTRuVYv00TQ== + "@matrix-org/matrix-wysiwyg@^2.4.1": version "2.8.0" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.8.0.tgz#180fe79b1499fc40c482c4a4c06c82ac00636d79" @@ -2809,23 +2814,22 @@ "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" -"@vector-im/compound-design-tokens@^0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-0.0.5.tgz#33ef2c9dae9c52bbf2a6a62ddc143dbb4efa1a00" - integrity sha512-JSe2IXe374jVk7It6HnSGnri1+g47sTv/aP+hsxtex85OpK84Gd/WxBViNQHGBCT3dhPYKjIwodyB52EsXDWZQ== +"@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== dependencies: svg2vectordrawable "^2.9.1" -"@vector-im/compound-web@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-0.4.0.tgz#c4adf10785722c4b0fd5e20e72576ade2ef386d0" - integrity sha512-45pshpwpVBwOwIevKZrnWX718Z+qPvxnrSUv3KY4x4ej+PDMt8Qorxv1n98bB7fgF7vwBHK5PQdjq2kTFit+wQ== +"@vector-im/compound-web@^0.5.0": + 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== dependencies: "@radix-ui/react-form" "^0.0.3" "@radix-ui/react-tooltip" "^1.0.6" classnames "^2.3.2" graphemer "^1.4.0" - rimraf "^3.0.1" "@webassemblyjs/ast@1.9.0": version "1.9.0" @@ -3658,10 +3662,10 @@ bluebird@^3.5.5: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -blurhash@^1.1.3: - version "1.1.5" - resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.5.tgz#3034104cd5dce5a3e5caa871ae2f0f1f2d0ab566" - integrity sha512-a+LO3A2DfxTaTztsmkbLYmUzUeApi0LZuKalwbNmqAHR6HhJGMt1qSV/R3wc+w4DL28holjqO3Bg74aUGavGjg== +blurhash@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-2.0.5.tgz#efde729fc14a2f03571a6aa91b49cba80d1abe4b" + integrity sha512-cRygWd7kGBQO3VEhPiTgq4Wc43ctsM+o46urrmPOiuAe+07fzlSB9OJVdpgDL0jPqXUVQ9ht7aq7kxOeJHRK+w== bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: version "4.12.0" @@ -8921,6 +8925,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@29.1.0-rc.1: + version "29.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-29.1.0-rc.1.tgz#863819b40d4797490824b6b0c86793a76b88ad82" + integrity sha512-FC2kWotwec5JKUYr8zS86G2WiUvJ03RQcv3kwQazP59a3htI9OrfYOGKp3M3GBW5+nu11QwvZn21bbJFbW8Yuw== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^2.0.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 "29.0.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3cf6f568f3d489e38ca14b5a8927ff27996d96bb" @@ -8947,9 +8971,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.82.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/217073b7f5d9fc387d190e0ba4f507acece1eb12" +matrix-react-sdk@3.83.0-rc.1: + version "3.83.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.83.0-rc.1.tgz#c270fe9bb834d2e937a3a5d49f0b446b0137b16b" + integrity sha512-vvqT4fl1YOG2PfnMuJx3B5EqMMPd6kxmQwV9hdiqY77okeMTP/dGXixIOgeuh8etTLxgSqxnN3VcWO7SZCOKtg== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.7.0" @@ -8960,13 +8985,13 @@ matrix-mock-request@^2.5.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.5" - "@vector-im/compound-web" "^0.4.0" + "@vector-im/compound-design-tokens" "^0.0.6" + "@vector-im/compound-web" "^0.5.0" "@zxcvbn-ts/core" "^3.0.4" "@zxcvbn-ts/language-common" "^3.0.4" "@zxcvbn-ts/language-en" "^3.0.2" await-lock "^2.1.0" - blurhash "^1.1.3" + blurhash "^2.0.3" classnames "^2.2.6" commonmark "^0.30.0" counterpart "^0.18.6" @@ -8992,7 +9017,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 "29.1.0-rc.1" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" @@ -11700,7 +11725,7 @@ rimraf@^2.5.4, rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.1, rimraf@^3.0.2: +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== From 0cd55e1f1bac6d789dc89b2abc2d8ffe1bc98ccc Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 17 Oct 2023 15:33:37 +0100 Subject: [PATCH 02/16] Upgrade matrix-js-sdk to 29.1.0-rc.1 --- package.json | 2 +- yarn.lock | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/package.json b/package.json index 48718b9d64..d03a0e6bef 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": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "29.1.0-rc.1", "matrix-react-sdk": "3.83.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 37d2d3197a..835635d243 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1685,11 +1685,6 @@ emojibase "^15.0.0" emojibase-data "^15.0.0" -"@matrix-org/matrix-sdk-crypto-wasm@^1.2.3-alpha.0": - version "1.2.3-alpha.0" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-1.2.3-alpha.0.tgz#f6f93e3ee44c5f1e0e255badd26f4a7d3fb1dab8" - integrity sha512-BFLqfq/WbYZ+83r4UWLhwtBYvTp5DKTHNeWUSDBVvudFtqBvkntNAAUz+xmhmO1XkyNm+sBaElxF8IS9S8zdww== - "@matrix-org/matrix-sdk-crypto-wasm@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.0.0.tgz#a4e9682705f090c94a58f6b851054f7598de9e83" @@ -8945,25 +8940,6 @@ matrix-js-sdk@29.1.0-rc.1: unhomoglyph "^1.0.6" uuid "9" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "29.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3cf6f568f3d489e38ca14b5a8927ff27996d96bb" - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.3-alpha.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 64d596ad26d31cd86eb0e38a3d162c109844749c Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 17 Oct 2023 15:40:36 +0100 Subject: [PATCH 03/16] Prepare changelog for v1.11.47-rc.1 --- CHANGELOG.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9dbbfaf5c..921ea38767 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,38 @@ +Changes in [1.11.47-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.47-rc.1) (2023-10-17) +=========================================================================================================== + +## 🦖 Deprecations + * Deprecate customisations in favour of Module API ([\#25736](https://github.com/vector-im/element-web/pull/25736)). Fixes #25733. + +## ✨ Features + * vector-im/element-x-ios/issues/1824 - Convert the apple-app-site-association file to a newer format… ([\#26307](https://github.com/vector-im/element-web/pull/26307)). Contributed by @stefanceriu. + * Iterate `io.element.late_event` decoration ([\#11760](https://github.com/matrix-org/matrix-react-sdk/pull/11760)). Fixes #26384. + * Render timeline separator for late event groups ([\#11739](https://github.com/matrix-org/matrix-react-sdk/pull/11739)). + * OIDC: revoke tokens on logout ([\#11718](https://github.com/matrix-org/matrix-react-sdk/pull/11718)). Fixes #25394. Contributed by @kerryarchibald. + * Show `io.element.late_event` in MessageTimestamp when known ([\#11733](https://github.com/matrix-org/matrix-react-sdk/pull/11733)). + * Show all labs flags if developerMode enabled ([\#11746](https://github.com/matrix-org/matrix-react-sdk/pull/11746)). Fixes #24571 and #8498. + * Use Compound tooltips on MessageTimestamp to improve UX of date time discovery ([\#11732](https://github.com/matrix-org/matrix-react-sdk/pull/11732)). Fixes #25913. + * Consolidate 4s passphrase input fields and use stable IDs ([\#11743](https://github.com/matrix-org/matrix-react-sdk/pull/11743)). Fixes #26228. + * Disable upgraderoom command without developer mode enabled ([\#11744](https://github.com/matrix-org/matrix-react-sdk/pull/11744)). Fixes #17620. + * Avoid rendering app download buttons if disabled in config ([\#11741](https://github.com/matrix-org/matrix-react-sdk/pull/11741)). Fixes #26309. + * OIDC: refresh tokens ([\#11699](https://github.com/matrix-org/matrix-react-sdk/pull/11699)). Fixes #25839. Contributed by @kerryarchibald. + * OIDC: register ([\#11727](https://github.com/matrix-org/matrix-react-sdk/pull/11727)). Fixes #25393. Contributed by @kerryarchibald. + * Use stable get_login_token and remove unstable MSC3882 support ([\#11001](https://github.com/matrix-org/matrix-react-sdk/pull/11001)). Contributed by @hughns. + +## 🐛 Bug Fixes + * Avoid error when DMing oneself ([\#11754](https://github.com/matrix-org/matrix-react-sdk/pull/11754)). Fixes #7242. + * Fix: Message shield alignment is not right. ([\#11703](https://github.com/matrix-org/matrix-react-sdk/pull/11703)). Fixes #26142. Contributed by @manancodes. + * fix logging full event ([\#11755](https://github.com/matrix-org/matrix-react-sdk/pull/11755)). Fixes #26376. + * OIDC: use delegated auth account URL from `OidcClientStore` ([\#11723](https://github.com/matrix-org/matrix-react-sdk/pull/11723)). Fixes #26305. Contributed by @kerryarchibald. + * Fix: Members list shield alignment is not right. ([\#11700](https://github.com/matrix-org/matrix-react-sdk/pull/11700)). Fixes #26261. Contributed by @manancodes. + * Fix: HTML elements clickable area too wide. ([\#11666](https://github.com/matrix-org/matrix-react-sdk/pull/11666)). Fixes #25454. Contributed by @manancodes. + * Fix untranslated headings in the devtools dialog ([\#11734](https://github.com/matrix-org/matrix-react-sdk/pull/11734)). + * Fixes invite dialog alignment and pill color contrast ([\#11722](https://github.com/matrix-org/matrix-react-sdk/pull/11722)). Contributed by @gabrc52. + * Prevent select element in General settings overflowing in a room with very long room-id ([\#11597](https://github.com/matrix-org/matrix-react-sdk/pull/11597)). Contributed by @ABHIXIT2. + * Fix: Clicking on members pile does nothing. ([\#11657](https://github.com/matrix-org/matrix-react-sdk/pull/11657)). Fixes #26164. Contributed by @manancodes. + * Fix: Wierd shadow below room avatar in dark mode. ([\#11678](https://github.com/matrix-org/matrix-react-sdk/pull/11678)). Fixes #26153. Contributed by @manancodes. + * Fix start_sso / start_cas URLs failing to redirect to a authentication prompt ([\#11681](https://github.com/matrix-org/matrix-react-sdk/pull/11681)). Contributed by @Half-Shot. + Changes in [1.11.46](https://github.com/vector-im/element-web/releases/tag/v1.11.46) (2023-10-10) ================================================================================================= From 8862bcda294c8e73a94a5a3d4995027235d5129f Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 17 Oct 2023 15:40:36 +0100 Subject: [PATCH 04/16] v1.11.47-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d03a0e6bef..447e52c68c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.46", + "version": "1.11.47-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 06e034519b77e06a981ebf5130477be67e44c9ed Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Tue, 24 Oct 2023 14:34:24 +0100 Subject: [PATCH 05/16] Enable rust cryptography on develop.element.io (#26291) Once this lands, *existing* sessions will continue to use legacy crypto, but *new* logins will use rust crypto. --- element.io/develop/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/element.io/develop/config.json b/element.io/develop/config.json index 99b6ce8004..9dde7eccdc 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -48,7 +48,8 @@ }, "privacy_policy_url": "https://element.io/cookie-policy", "features": { - "feature_video_rooms": true + "feature_video_rooms": true, + "feature_rust_crypto": true }, "element_call": { "url": "https://call.element.dev" From bd151bf42c52aff086d40f0115d89a409f15ba09 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 24 Oct 2023 15:39:25 +0100 Subject: [PATCH 06/16] Upgrade matrix-react-sdk to 3.83.0 --- package.json | 2 +- yarn.lock | 30 +++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 447e52c68c..aee0204df6 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "29.1.0-rc.1", - "matrix-react-sdk": "3.83.0-rc.1", + "matrix-react-sdk": "3.83.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 835635d243..2dfa3f715c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8920,6 +8920,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@29.1.0: + version "29.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-29.1.0.tgz#4d1dd66575e77030a6446f033e86dd203d08b7b5" + integrity sha512-nF+ACFioDltGCf2KFfXK7QoJ70Ytnzm4Jse2UI+BDXeR9WCjtKefXJtboN2rmU4MFmLCTHcnBTmu6yig67YUqw== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^2.0.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@29.1.0-rc.1: version "29.1.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-29.1.0-rc.1.tgz#863819b40d4797490824b6b0c86793a76b88ad82" @@ -8947,10 +8967,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.83.0-rc.1: - version "3.83.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.83.0-rc.1.tgz#c270fe9bb834d2e937a3a5d49f0b446b0137b16b" - integrity sha512-vvqT4fl1YOG2PfnMuJx3B5EqMMPd6kxmQwV9hdiqY77okeMTP/dGXixIOgeuh8etTLxgSqxnN3VcWO7SZCOKtg== +matrix-react-sdk@3.83.0: + version "3.83.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.83.0.tgz#301da45291c8eb12b98accd2cecb77f7e13d35d5" + integrity sha512-gJ5I/otFUoGijPqWWZoWxBRE7JRVPEhxOt5ZAMXSrhHfWJ0no6C2vq39mZJjit4nEl0ncDBIH0zTXrY1BBjBTA== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.7.0" @@ -8993,7 +9013,7 @@ matrix-react-sdk@3.83.0-rc.1: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "29.1.0-rc.1" + matrix-js-sdk "29.1.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From 51cd6cc9e62eb030d3eeece7a9e9812281cc2205 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 24 Oct 2023 15:39:33 +0100 Subject: [PATCH 07/16] Upgrade matrix-js-sdk to 29.1.0 --- package.json | 2 +- yarn.lock | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/package.json b/package.json index aee0204df6..9742295bb6 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": "29.1.0-rc.1", + "matrix-js-sdk": "29.1.0", "matrix-react-sdk": "3.83.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 2dfa3f715c..a9d363e5ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8940,26 +8940,6 @@ matrix-js-sdk@29.1.0: unhomoglyph "^1.0.6" uuid "9" -matrix-js-sdk@29.1.0-rc.1: - version "29.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-29.1.0-rc.1.tgz#863819b40d4797490824b6b0c86793a76b88ad82" - integrity sha512-FC2kWotwec5JKUYr8zS86G2WiUvJ03RQcv3kwQazP59a3htI9OrfYOGKp3M3GBW5+nu11QwvZn21bbJFbW8Yuw== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^2.0.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 30a370644dc2c4985474d4c5b3c32bb2c2f6e11d Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 24 Oct 2023 15:42:21 +0100 Subject: [PATCH 08/16] Prepare changelog for v1.11.47 --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 921ea38767..bc3e4d1a44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -Changes in [1.11.47-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.47-rc.1) (2023-10-17) -=========================================================================================================== +Changes in [1.11.47](https://github.com/vector-im/element-web/releases/tag/v1.11.47) (2023-10-24) +================================================================================================= ## 🦖 Deprecations * Deprecate customisations in favour of Module API ([\#25736](https://github.com/vector-im/element-web/pull/25736)). Fixes #25733. @@ -20,6 +20,7 @@ Changes in [1.11.47-rc.1](https://github.com/vector-im/element-web/releases/tag/ * Use stable get_login_token and remove unstable MSC3882 support ([\#11001](https://github.com/matrix-org/matrix-react-sdk/pull/11001)). Contributed by @hughns. ## 🐛 Bug Fixes + * Set max size for Element logo in search warning ([\#11779](https://github.com/matrix-org/matrix-react-sdk/pull/11779)). Fixes #26408. * Avoid error when DMing oneself ([\#11754](https://github.com/matrix-org/matrix-react-sdk/pull/11754)). Fixes #7242. * Fix: Message shield alignment is not right. ([\#11703](https://github.com/matrix-org/matrix-react-sdk/pull/11703)). Fixes #26142. Contributed by @manancodes. * fix logging full event ([\#11755](https://github.com/matrix-org/matrix-react-sdk/pull/11755)). Fixes #26376. From c22670db778480815116e9ba61aa9673f3b3701d Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 24 Oct 2023 15:42:21 +0100 Subject: [PATCH 09/16] v1.11.47 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9742295bb6..96cabc8a9e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.47-rc.1", + "version": "1.11.47", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From aab9e5de016d59f049fc5431e053ab845c918600 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 24 Oct 2023 15:47:03 +0100 Subject: [PATCH 10/16] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 76 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 50 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index b223a56037..bcffa8c234 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "29.1.0", - "matrix-react-sdk": "3.83.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index d761813ec5..5f629e9f3d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1643,10 +1643,10 @@ resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe" integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q== -"@matrix-org/analytics-events@^0.7.0": - version "0.7.0" - resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.7.0.tgz#a9ea47209473d1075704db4eabb6d94c8d99be25" - integrity sha512-9M1ESpFbXaU0v8Kzm0N61eAiVymv0tlXP5FfqCUH+BDP7DmW/tqyIpDs9ooUxXoFg1bBEQaRy/xOyO15ZykCAg== +"@matrix-org/analytics-events@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.8.0.tgz#2e99ee00913f94dfba82092300c6b225d26e9ef6" + integrity sha512-gwA6DSw43krshh4GFFLHcxcFOBgg+q/bvI4TQ19Lxh+OjHyHDAiIHghfoErco9q0Yl6rlpVemg9/7cNcP2WkaA== "@matrix-org/emojibase-bindings@^1.1.2": version "1.1.3" @@ -1661,14 +1661,18 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.0.0.tgz#a4e9682705f090c94a58f6b851054f7598de9e83" integrity sha512-8tKmI9u35URvtAr6zcfNGphImWt1y458iKq2PSPOSARlsmVk2lkrhsBFihBnWJY1oJC2EMsyfI8XTRuVYv00TQ== -"@matrix-org/matrix-wysiwyg@^2.4.1": - version "2.14.1" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.14.1.tgz#015b4b3a463aea32d573c3eff2834a2f9b651def" - integrity sha512-Qn+ekGA/XvLmdmxs/ZTZjMNaSpv5OVRRc3AP4g/JxAN1DTzIBG8B+jLkhOccybCpsAsrvHRKJE0Ui2YDpn/b8A== +"@matrix-org/matrix-sdk-crypto-wasm@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.1.1.tgz#5b20125d73eb404b1c49b61380f443c5fcfbacd2" + integrity sha512-PNFdLr68uLNT81iFmJL0PH98t7/U4g+a51d5+BmbKo0LEqchLkEKNraD1vq/kzPK6X7p/3IapQI5P+5Lr8jHsg== + +"@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" + integrity sha512-RyUijZXVKenE9s3LczDUhWFeOfIyLcsOrAyHqYxnizXX5nxMkHxTgLeoTvaIJ+1dOhI+H2SS9G4VcN6odZ0aNg== "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz": version "3.2.14" - uid acd96c00a881d0f462e1f97a56c73742c8dbc984 resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz#acd96c00a881d0f462e1f97a56c73742c8dbc984" "@matrix-org/react-sdk-module-api@^2.1.0", "@matrix-org/react-sdk-module-api@^2.1.1": @@ -2778,7 +2782,7 @@ dependencies: svg2vectordrawable "^2.9.1" -"@vector-im/compound-web@^0.5.0": +"@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== @@ -6199,10 +6203,10 @@ filename-regex@^2.0.0: resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" integrity sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ== -filesize@10.0.12: - version "10.0.12" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.0.12.tgz#6eef217c08e9633cdbf438d9124e8f5f524ffa05" - integrity sha512-6RS9gDchbn+qWmtV2uSjo5vmKizgfCQeb5jKmqx8HyzA3MoLqqyQxN+QcjkGBJt7FjJ9qFce67Auyya5rRRbpw== +filesize@10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.1.0.tgz#846f5cd8d16e073c5d6767651a8264f6149183cd" + integrity sha512-GTLKYyBSDz3nPhlLVPjPWZCnhkd9TrrRArNcy8Z+J2cqScB7h2McAzR6NBX6nYOoWafql0roY8hrocxnZBv9CQ== fill-range@^2.1.0: version "2.2.4" @@ -8870,6 +8874,25 @@ matrix-js-sdk@29.1.0: unhomoglyph "^1.0.6" uuid "9" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "29.1.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d750e33ec955a9305a29426e5a64f05e66b14310" + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^2.1.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" @@ -8877,22 +8900,21 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.83.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.83.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.83.0.tgz#301da45291c8eb12b98accd2cecb77f7e13d35d5" - integrity sha512-gJ5I/otFUoGijPqWWZoWxBRE7JRVPEhxOt5ZAMXSrhHfWJ0no6C2vq39mZJjit4nEl0ncDBIH0zTXrY1BBjBTA== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/6e24b4d221e6deb9b84173f1afb753ce7211de00" dependencies: "@babel/runtime" "^7.12.5" - "@matrix-org/analytics-events" "^0.7.0" + "@matrix-org/analytics-events" "^0.8.0" "@matrix-org/emojibase-bindings" "^1.1.2" - "@matrix-org/matrix-wysiwyg" "^2.4.1" + "@matrix-org/matrix-wysiwyg" "2.4.1" "@matrix-org/react-sdk-module-api" "^2.1.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.0" + "@vector-im/compound-web" "0.5.4" "@zxcvbn-ts/core" "^3.0.4" "@zxcvbn-ts/language-common" "^3.0.4" "@zxcvbn-ts/language-en" "^3.0.2" @@ -8906,7 +8928,7 @@ matrix-react-sdk@3.83.0: emojibase-regex "15.2.0" escape-html "^1.0.3" file-saver "^2.0.5" - filesize "10.0.12" + filesize "10.1.0" gfm.css "^1.1.2" glob-to-regexp "^0.4.1" graphemer "^1.4.0" @@ -8923,7 +8945,7 @@ matrix-react-sdk@3.83.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "29.1.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" @@ -8931,7 +8953,7 @@ matrix-react-sdk@3.83.0: opus-recorder "^8.0.3" pako "^2.0.3" png-chunks-extract "^1.0.0" - posthog-js "1.77.2" + posthog-js "1.83.0" proposal-temporal "^0.9.0" qrcode "1.5.3" re-resizable "^6.9.0" @@ -10843,10 +10865,10 @@ postcss@^8.2.1, postcss@^8.3.11, postcss@^8.4.28, postcss@^8.4.31: picocolors "^1.0.0" source-map-js "^1.0.2" -posthog-js@1.77.2: - version "1.77.2" - resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.77.2.tgz#c5ecb2dc0b0e732fe05f50920ec22a30e3db4916" - integrity sha512-I3l5GipPUFe6qd5/0Bgm8Ot4pF8ysWhNgeLWvk69myh58HREfXACgLSYMZBho6L9xC6OcFvQilpcH+Dj3Y2uIQ== +posthog-js@1.83.0: + version "1.83.0" + resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.83.0.tgz#e13d114922f863f4bfbf7c7cc4e11dc194139a91" + integrity sha512-3dp/yNbRCYsOgvJovFUMCLv9/KxnwmGBy5Ft27Q7/rbW++iJXVR64liX7i0NrXkudjoL9j1GW1LGh84rV7kv8Q== dependencies: fflate "^0.4.1" From 5eb399276d2b92c3cf6594662c35bc40591a4c0b Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 24 Oct 2023 15:47:18 +0100 Subject: [PATCH 11/16] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- yarn.lock | 25 ------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/package.json b/package.json index bcffa8c234..b2aace40dd 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": "29.1.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 5f629e9f3d..752fb6e534 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1656,11 +1656,6 @@ emojibase "^15.0.0" emojibase-data "^15.0.0" -"@matrix-org/matrix-sdk-crypto-wasm@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.0.0.tgz#a4e9682705f090c94a58f6b851054f7598de9e83" - integrity sha512-8tKmI9u35URvtAr6zcfNGphImWt1y458iKq2PSPOSARlsmVk2lkrhsBFihBnWJY1oJC2EMsyfI8XTRuVYv00TQ== - "@matrix-org/matrix-sdk-crypto-wasm@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.1.1.tgz#5b20125d73eb404b1c49b61380f443c5fcfbacd2" @@ -8854,26 +8849,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@29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-29.1.0.tgz#4d1dd66575e77030a6446f033e86dd203d08b7b5" - integrity sha512-nF+ACFioDltGCf2KFfXK7QoJ70Ytnzm4Jse2UI+BDXeR9WCjtKefXJtboN2rmU4MFmLCTHcnBTmu6yig67YUqw== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^2.0.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 "29.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d750e33ec955a9305a29426e5a64f05e66b14310" From 54820501f337dddf1429da2890acc044602da91a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 25 Oct 2023 13:18:31 +0100 Subject: [PATCH 12/16] Document `feedback.new_issue_url` & `feedback.existing_issues_url` (#26446) --- docs/config.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/config.md b/docs/config.md index 6a2a59fc5a..0f59e8ba37 100644 --- a/docs/config.md +++ b/docs/config.md @@ -355,6 +355,8 @@ If you run your own rageshake server to collect bug reports, the following optio 2. `uisi_autorageshake_app`: If a user has enabled the "automatically send debug logs on decryption errors" flag, this option will be sent alongside the rageshake so the rageshake server can filter them by app name. By default, this will be `element-auto-uisi` (in contrast to other rageshakes submitted by the app, which use `element-web`). +3. `existing_issues_url`: URL for where to find existing issues. +4. `new_issue_url`: URL for where to sub\*\*\*\*mit new issues. If you would like to use [Sentry](https://sentry.io/) for rageshake data, add a `sentry` object to your config with the following values: From 875657eb45596d0878dc8baab1d889724690e855 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 25 Oct 2023 14:00:06 +0100 Subject: [PATCH 13/16] Update update-topics.yaml --- .github/workflows/update-topics.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml index e9fd33d4fe..5d853ddf9c 100644 --- a/.github/workflows/update-topics.yaml +++ b/.github/workflows/update-topics.yaml @@ -62,6 +62,11 @@ jobs: headers, }); + if (!res.ok) { + console.log(roomId, "failed to fetch", await res.text()); + return; + } + const data = await res.json(); const topic = data.topic.replace(regex, releaseTopic); if (topic === data.topic) { From 6fa6c6517c8c1ed39be72fea82a0a3ed0c0bae31 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 25 Oct 2023 14:09:28 +0100 Subject: [PATCH 14/16] Update update-topics.yaml --- .github/workflows/update-topics.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml index 5d853ddf9c..8035e212d5 100644 --- a/.github/workflows/update-topics.yaml +++ b/.github/workflows/update-topics.yaml @@ -68,6 +68,8 @@ jobs: } const data = await res.json(); + console.log(roomId, "got event", data); + const topic = data.topic.replace(regex, releaseTopic); if (topic === data.topic) { console.log(roomId, "nothing to do"); From 16ec8edd5867b7fc1fcaa2d64f52ef5c396267a4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 25 Oct 2023 14:39:44 +0100 Subject: [PATCH 15/16] Iterate build_debian.yaml workflow (#26434) --- .github/workflows/build_debian.yaml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_debian.yaml b/.github/workflows/build_debian.yaml index fa4bedf01d..7448a4611a 100644 --- a/.github/workflows/build_debian.yaml +++ b/.github/workflows/build_debian.yaml @@ -6,26 +6,37 @@ concurrency: ${{ github.workflow }} jobs: build: name: Build package - if: github.event.release.prerelease == false environment: packages.element.io runs-on: ubuntu-latest env: R2_INCOMING_BUCKET: ${{ vars.R2_INCOMING_BUCKET }} R2_URL: ${{ vars.CF_R2_S3_API }} + VERSION: ${{ github.ref_name }} steps: - uses: actions/checkout@v4 + - name: Download package + run: | + wget "https://github.com/vector-im/element-web/releases/download/$VERSION/element-$VERSION.tar.gz" + wget "https://github.com/vector-im/element-web/releases/download/$VERSION/element-$VERSION.tar.gz.asc" + + - name: Check GPG signature + run: | + wget "https://packages.element.io/element-release-key.gpg" + gpg --import element-release-key.gpg + gpg --fingerprint "$FINGERPRINT" + gpg --verify "element-$VERSION.tar.gz.asc" "element-$VERSION.tar.gz" + env: + FINGERPRINT: ${{ vars.GPG_FINGERPRINT }} + - name: Prepare run: | mkdir -p /tmp/element-web-debian/DEBIAN cp -R debian/ /tmp/element-web-debian/DEBIAN/ mkdir -p /tmp/element-web-debian/usr/share/element-web/ - wget https://github.com/vector-im/element-web/releases/download/$VERSION/element-$VERSION.tar.gz - mv element-* /tmp/element-web-debian/usr/share/element-web - mv debian/usr/share/element-web/config.sample.json /tmp/element-web-debian/usr/share/element-web/config.json - env: - VERSION: ${{ github.ref_name }} + tar -xf "element-$VERSION.tar.gz" -C /tmp/element-web/debian/usr/share/element-web --strip-components=1 + cp config.sample.json /tmp/element-web-debian/usr/share/element-web/config.json - name: Build deb package run: | @@ -41,7 +52,8 @@ jobs: retention-days: 14 #- name: Upload incoming deb - # run: aws s3 cp element-io-archive-keyring.deb "s3://$R2_INCOMING_BUCKET" --endpoint-url "$R2_URL" --region auto + # if: github.event.release.prerelease == false + # run: aws s3 cp element-web.deb "s3://$R2_INCOMING_BUCKET" --endpoint-url "$R2_URL" --region auto # env: # AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }} # AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }} @@ -49,7 +61,7 @@ jobs: #reprepro: # needs: build # name: Run reprepro - # if: inputs.deploy && github.event.release.prerelease == false + # if: github.event.release.prerelease == false # uses: ./.github/workflows/reprepro.yaml # secrets: inherit # with: From 413c50f503d6accf3bc289c67b6ac12300939069 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 25 Oct 2023 15:34:31 +0100 Subject: [PATCH 16/16] Update config.md --- docs/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config.md b/docs/config.md index 0f59e8ba37..69d10f0526 100644 --- a/docs/config.md +++ b/docs/config.md @@ -356,7 +356,7 @@ If you run your own rageshake server to collect bug reports, the following optio alongside the rageshake so the rageshake server can filter them by app name. By default, this will be `element-auto-uisi` (in contrast to other rageshakes submitted by the app, which use `element-web`). 3. `existing_issues_url`: URL for where to find existing issues. -4. `new_issue_url`: URL for where to sub\*\*\*\*mit new issues. +4. `new_issue_url`: URL for where to submit new issues. If you would like to use [Sentry](https://sentry.io/) for rageshake data, add a `sentry` object to your config with the following values: