From 4ab85cb5699e6ca151fcce0dc4e1e29d424a5728 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 12:21:01 +0100 Subject: [PATCH 01/48] Update dependency @types/node to v16.18.35 (#25590) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0a9f8410c..9f6dbe286 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2288,9 +2288,9 @@ integrity sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q== "@types/node@^16": - version "16.18.34" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.34.tgz#62d2099b30339dec4b1b04a14c96266459d7c8b2" - integrity sha512-VmVm7gXwhkUimRfBwVI1CHhwp86jDWR04B5FGebMMyxV90SlCmFujwUHrxTD4oO+SOYU86SoxvhgeRQJY7iXFg== + version "16.18.36" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.36.tgz#0db5d7efc4760d36d0d1d22c85d1a53accd5dc27" + integrity sha512-8egDX8dE50XyXWH6C6PRCNkTP106DuUrvdrednFouDSmCi7IOvrqr0frznfZaHifHH/3aq/7a7v9N4wdXMqhBQ== "@types/normalize-package-data@^2.4.0": version "2.4.1" From 6113541b5f257935b215886ba64839a2bd808d5a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 12:21:12 +0100 Subject: [PATCH 02/48] Update dependency @types/jest to v29.5.2 (#25589) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9f6dbe286..8bb96496d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -35,13 +35,20 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== dependencies: "@babel/highlight" "^7.18.6" +"@babel/code-frame@^7.12.13": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" + integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ== + dependencies: + "@babel/highlight" "^7.22.5" + "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.5": version "7.21.7" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc" @@ -273,11 +280,16 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd" integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w== -"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": +"@babel/helper-validator-identifier@^7.19.1": version "7.19.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== +"@babel/helper-validator-identifier@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" + integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== + "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" @@ -302,12 +314,12 @@ "@babel/traverse" "^7.21.5" "@babel/types" "^7.21.5" -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== +"@babel/highlight@^7.18.6", "@babel/highlight@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" + integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw== dependencies: - "@babel/helper-validator-identifier" "^7.18.6" + "@babel/helper-validator-identifier" "^7.22.5" chalk "^2.0.0" js-tokens "^4.0.0" @@ -2212,9 +2224,9 @@ "@types/istanbul-lib-report" "*" "@types/jest@^29.0.0": - version "29.5.1" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.1.tgz#83c818aa9a87da27d6da85d3378e5a34d2f31a47" - integrity sha512-tEuVcHrpaixS36w7hpsfLBLpjtMRJUE09/MHXn923LOVojDwyC14cWcfc0rDs0VEfUyYmt/+iX1kxxp+gZMcaQ== + version "29.5.2" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.2.tgz#86b4afc86e3a8f3005b297ed8a72494f89e6395b" + integrity sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg== dependencies: expect "^29.0.0" pretty-format "^29.0.0" @@ -2283,9 +2295,9 @@ integrity sha512-jhMOZSS0UGYTS9pqvt6q3wtT3uvOSve5piTEmTMx3zzTuBLvSIMxSIBIc3d5lajVD5h4xc41AMZD2M5orN3PxA== "@types/node@*": - version "18.16.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.3.tgz#6bda7819aae6ea0b386ebc5b24bdf602f1b42b01" - integrity sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q== + version "20.3.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.1.tgz#e8a83f1aa8b649377bb1fb5d7bac5cb90e784dfe" + integrity sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg== "@types/node@^16": version "16.18.36" From f35bbf01731bfa87ba79a100b729af0a9682be9c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 12:21:31 +0100 Subject: [PATCH 03/48] Update typescript-eslint monorepo to v5.60.0 (#25591) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 92 +++++++++++++++++++++++++++---------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8bb96496d..36d499b5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2448,14 +2448,14 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^5.45.0": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.8.tgz#1e7a3e5318ece22251dfbc5c9c6feeb4793cc509" - integrity sha512-JDMOmhXteJ4WVKOiHXGCoB96ADWg9q7efPWHRViT/f09bA8XOMLAVHHju3l0MkZnG1izaWXYmgvQcUjTRcpShQ== + version "5.60.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.60.0.tgz#2f4bea6a3718bed2ba52905358d0f45cd3620d31" + integrity sha512-78B+anHLF1TI8Jn/cD0Q00TBYdMgjdOn980JfAVa9yw5sop8nyTfVOQAv6LWywkOGLclDBtv5z3oxN4w7jxyNg== dependencies: "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.59.8" - "@typescript-eslint/type-utils" "5.59.8" - "@typescript-eslint/utils" "5.59.8" + "@typescript-eslint/scope-manager" "5.60.0" + "@typescript-eslint/type-utils" "5.60.0" + "@typescript-eslint/utils" "5.60.0" debug "^4.3.4" grapheme-splitter "^1.0.4" ignore "^5.2.0" @@ -2464,71 +2464,71 @@ tsutils "^3.21.0" "@typescript-eslint/parser@^5.45.0": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.8.tgz#60cbb00671d86cf746044ab797900b1448188567" - integrity sha512-AnR19RjJcpjoeGojmwZtCwBX/RidqDZtzcbG3xHrmz0aHHoOcbWnpDllenRDmDvsV0RQ6+tbb09/kyc+UT9Orw== + version "5.60.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.60.0.tgz#08f4daf5fc6548784513524f4f2f359cebb4068a" + integrity sha512-jBONcBsDJ9UoTWrARkRRCgDz6wUggmH5RpQVlt7BimSwaTkTjwypGzKORXbR4/2Hqjk9hgwlon2rVQAjWNpkyQ== dependencies: - "@typescript-eslint/scope-manager" "5.59.8" - "@typescript-eslint/types" "5.59.8" - "@typescript-eslint/typescript-estree" "5.59.8" + "@typescript-eslint/scope-manager" "5.60.0" + "@typescript-eslint/types" "5.60.0" + "@typescript-eslint/typescript-estree" "5.60.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.8.tgz#ff4ad4fec6433647b817c4a7d4b4165d18ea2fa8" - integrity sha512-/w08ndCYI8gxGf+9zKf1vtx/16y8MHrZs5/tnjHhMLNSixuNcJavSX4wAiPf4aS5x41Es9YPCn44MIe4cxIlig== +"@typescript-eslint/scope-manager@5.60.0": + version "5.60.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.60.0.tgz#ae511967b4bd84f1d5e179bb2c82857334941c1c" + integrity sha512-hakuzcxPwXi2ihf9WQu1BbRj1e/Pd8ZZwVTG9kfbxAMZstKz8/9OoexIwnmLzShtsdap5U/CoQGRCWlSuPbYxQ== dependencies: - "@typescript-eslint/types" "5.59.8" - "@typescript-eslint/visitor-keys" "5.59.8" + "@typescript-eslint/types" "5.60.0" + "@typescript-eslint/visitor-keys" "5.60.0" -"@typescript-eslint/type-utils@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.8.tgz#aa6c029a9d7706d26bbd25eb4666398781df6ea2" - integrity sha512-+5M518uEIHFBy3FnyqZUF3BMP+AXnYn4oyH8RF012+e7/msMY98FhGL5SrN29NQ9xDgvqCgYnsOiKp1VjZ/fpA== +"@typescript-eslint/type-utils@5.60.0": + version "5.60.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.60.0.tgz#69b09087eb12d7513d5b07747e7d47f5533aa228" + integrity sha512-X7NsRQddORMYRFH7FWo6sA9Y/zbJ8s1x1RIAtnlj6YprbToTiQnM6vxcMu7iYhdunmoC0rUWlca13D5DVHkK2g== dependencies: - "@typescript-eslint/typescript-estree" "5.59.8" - "@typescript-eslint/utils" "5.59.8" + "@typescript-eslint/typescript-estree" "5.60.0" + "@typescript-eslint/utils" "5.60.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.8.tgz#212e54414733618f5d0fd50b2da2717f630aebf8" - integrity sha512-+uWuOhBTj/L6awoWIg0BlWy0u9TyFpCHrAuQ5bNfxDaZ1Ppb3mx6tUigc74LHcbHpOHuOTOJrBoAnhdHdaea1w== +"@typescript-eslint/types@5.60.0": + version "5.60.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.60.0.tgz#3179962b28b4790de70e2344465ec97582ce2558" + integrity sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA== -"@typescript-eslint/typescript-estree@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.8.tgz#801a7b1766481629481b3b0878148bd7a1f345d7" - integrity sha512-Jy/lPSDJGNow14vYu6IrW790p7HIf/SOV1Bb6lZ7NUkLc2iB2Z9elESmsaUtLw8kVqogSbtLH9tut5GCX1RLDg== +"@typescript-eslint/typescript-estree@5.60.0": + version "5.60.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.0.tgz#4ddf1a81d32a850de66642d9b3ad1e3254fb1600" + integrity sha512-R43thAuwarC99SnvrBmh26tc7F6sPa2B3evkXp/8q954kYL6Ro56AwASYWtEEi+4j09GbiNAHqYwNNZuNlARGQ== dependencies: - "@typescript-eslint/types" "5.59.8" - "@typescript-eslint/visitor-keys" "5.59.8" + "@typescript-eslint/types" "5.60.0" + "@typescript-eslint/visitor-keys" "5.60.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.8.tgz#34d129f35a2134c67fdaf024941e8f96050dca2b" - integrity sha512-Tr65630KysnNn9f9G7ROF3w1b5/7f6QVCJ+WK9nhIocWmx9F+TmCAcglF26Vm7z8KCTwoKcNEBZrhlklla3CKg== +"@typescript-eslint/utils@5.60.0": + version "5.60.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.60.0.tgz#4667c5aece82f9d4f24a667602f0f300864b554c" + integrity sha512-ba51uMqDtfLQ5+xHtwlO84vkdjrqNzOnqrnwbMHMRY8Tqeme8C2Q8Fc7LajfGR+e3/4LoYiWXUM6BpIIbHJ4hQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.59.8" - "@typescript-eslint/types" "5.59.8" - "@typescript-eslint/typescript-estree" "5.59.8" + "@typescript-eslint/scope-manager" "5.60.0" + "@typescript-eslint/types" "5.60.0" + "@typescript-eslint/typescript-estree" "5.60.0" eslint-scope "^5.1.1" semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.8.tgz#aa6a7ef862add919401470c09e1609392ef3cc40" - integrity sha512-pJhi2ms0x0xgloT7xYabil3SGGlojNNKjK/q6dB3Ey0uJLMjK2UDGJvHieiyJVW/7C3KI+Z4Q3pEHkm4ejA+xQ== +"@typescript-eslint/visitor-keys@5.60.0": + version "5.60.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.0.tgz#b48b29da3f5f31dd1656281727004589d2722a66" + integrity sha512-wm9Uz71SbCyhUKgcaPRauBdTegUyY/ZWl8gLwD/i/ybJqscrrdVSFImpvUz16BLPChIeKBK5Fa9s6KDQjsjyWw== dependencies: - "@typescript-eslint/types" "5.59.8" + "@typescript-eslint/types" "5.60.0" eslint-visitor-keys "^3.3.0" "@vector-im/compound-design-tokens@^0.0.3": From 8b481fdef2b67b0cf2669c8769abf2566923a405 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 12:26:21 +0100 Subject: [PATCH 04/48] Update docker/setup-buildx-action digest to ecf9528 (#25586) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 467585cb3..c0c5c2ae5 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -21,7 +21,7 @@ jobs: uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2 + uses: docker/setup-buildx-action@ecf95283f03858871ff00b787d79c419715afc34 # v2 with: install: true From 9be30a892f13e6d6da30b863dbe2b2e91b7ddf05 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 11:40:08 +0000 Subject: [PATCH 05/48] Update docker/login-action digest to 465a078 (#25584) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index c0c5c2ae5..4def559ac 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -26,7 +26,7 @@ jobs: install: true - name: Login to Docker Hub - uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2 + uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From cd3a88eb0d5a074159eb0decc91ceaf6bb0defa6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 12:32:40 +0000 Subject: [PATCH 06/48] Update docker/setup-qemu-action digest to 2b82ce8 (#25587) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 4def559ac..a8ae9c5a1 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -18,7 +18,7 @@ jobs: fetch-depth: 0 # needed for docker-package to be able to calculate the version - name: Set up QEMU - uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2 + uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2 - name: Set up Docker Buildx uses: docker/setup-buildx-action@ecf95283f03858871ff00b787d79c419715afc34 # v2 From 51baaf66673368c68b7fcc1844fb7c470d8c6f55 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 18:12:11 +0100 Subject: [PATCH 07/48] Update peter-evans/dockerhub-description digest to dc67fad (#25671) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index a8ae9c5a1..ee0ffd303 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -53,7 +53,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} - name: Update repo description - uses: peter-evans/dockerhub-description@579f64ca0abced29dbbc44ab4c6a0b9e33ab3588 # v3 + uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v3 continue-on-error: true with: username: ${{ secrets.DOCKERHUB_USERNAME }} From 6bbc2b82383d12a157046bcbc3385af891888420 Mon Sep 17 00:00:00 2001 From: Kerry Date: Wed, 28 Jun 2023 11:27:45 +1200 Subject: [PATCH 08/48] remove auth params from url after login attempt (#25664) --- src/vector/app.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/vector/app.tsx b/src/vector/app.tsx index 463ef1346..7371ccf0f 100644 --- a/src/vector/app.tsx +++ b/src/vector/app.tsx @@ -75,13 +75,17 @@ function makeRegistrationUrl(params: QueryDict): string { function onTokenLoginCompleted(): void { // if we did a token login, we're now left with the token, hs and is - // url as query params in the url; a little nasty but let's redirect to - // clear them. + // url as query params in the url; + // if we did an oidc authorization code flow login, we're left with the auth code and state + // as query params in the url; + // a little nasty but let's redirect to clear them. const url = new URL(window.location.href); url.searchParams.delete("loginToken"); + url.searchParams.delete("state"); + url.searchParams.delete("code"); - logger.log(`Redirecting to ${url.href} to drop loginToken from queryparams`); + logger.log(`Redirecting to ${url.href} to drop delegated authentication params from queryparams`); window.history.replaceState(null, "", url.href); } From 0299aef79dfbb81fb9949f1a0aa6efed8c66e1f8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 28 Jun 2023 15:09:36 +0100 Subject: [PATCH 09/48] Conform more of the codebase to strictNullChecks & noImplicitAny (#25680) --- src/vector/jitsi/index.ts | 43 ++++++++++++++++++++++++++++----- test/app-tests/loading-test.tsx | 4 +-- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index f50fa0d8d..0f8e85463 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -37,9 +37,40 @@ import type { AudioMuteStatusChangedEvent, LogEvent, VideoMuteStatusChangedEvent, + ExternalAPIOptions as _ExternalAPIOptions, + Config as _Config, + InterfaceConfig as _InterfaceConfig, } from "jitsi-meet"; import { getVectorConfig } from "../getconfig"; +interface Config extends _Config { + // Jitsi's types are missing these fields + prejoinConfig?: { + enabled: boolean; + hideDisplayName?: boolean; + hideExtraJoinButtons?: string[]; + }; + toolbarButtons?: string[]; + conferenceInfo?: { + alwaysVIsible?: string[]; + autoHide?: string[]; + }; + disableSelfViewSettings?: boolean; +} + +interface InterfaceConfig extends _InterfaceConfig { + // XXX: It is unclear whether this is a typo of TOOLBAR_BUTTONS or if its just really undocumented, + // either way it is missing in types, yet we try and use it + MAIN_TOOLBAR_BUTTONS?: string[]; +} + +interface ExternalAPIOptions extends _ExternalAPIOptions { + configOverwrite?: Config; + interfaceConfigOverwrite?: InterfaceConfig; + // Jitsi's types are missing these fields + lang?: string; +} + // We have to trick webpack into loading our CSS for us. require("./index.pcss"); @@ -382,7 +413,7 @@ async function joinConference(audioInput?: string | null, videoInput?: string | "our fragment values and not recognizing the options.", ); - const options = { + const options: ExternalAPIOptions = { width: "100%", height: "100%", parentNode: document.querySelector("#jitsiContainer") ?? undefined, @@ -421,20 +452,20 @@ async function joinConference(audioInput?: string | null, videoInput?: string | if (isVideoChannel) { // Ensure that we skip Jitsi Meet's native prejoin screen, for // deployments that have it enabled - options.configOverwrite.prejoinConfig = { enabled: false }; + options.configOverwrite!.prejoinConfig = { enabled: false }; // Use a simplified set of toolbar buttons - options.configOverwrite.toolbarButtons = ["microphone", "camera", "tileview", "hangup"]; + options.configOverwrite!.toolbarButtons = ["microphone", "camera", "tileview", "hangup"]; // Note: We can hide the screenshare button in video rooms but not in // normal conference calls, since in video rooms we control exactly what // set of controls appear, but in normal calls we need to leave that up // to the deployment's configuration. // https://github.com/vector-im/element-web/issues/4880#issuecomment-940002464 - if (supportsScreensharing) options.configOverwrite.toolbarButtons.splice(2, 0, "desktop"); + if (supportsScreensharing) options.configOverwrite!.toolbarButtons.splice(2, 0, "desktop"); // Hide all top bar elements - options.configOverwrite.conferenceInfo = { autoHide: [] }; + options.configOverwrite!.conferenceInfo = { autoHide: [] }; // Remove the ability to hide your own tile, since we're hiding the // settings button which would be the only way to get it back - options.configOverwrite.disableSelfViewSettings = true; + options.configOverwrite!.disableSelfViewSettings = true; } meetApi = new JitsiMeetExternalAPI(jitsiDomain, options); diff --git a/test/app-tests/loading-test.tsx b/test/app-tests/loading-test.tsx index 7cbe650c5..feb4a750c 100644 --- a/test/app-tests/loading-test.tsx +++ b/test/app-tests/loading-test.tsx @@ -460,8 +460,8 @@ describe("loading:", function () { httpBackend.verifyNoOutstandingExpectation(); expect(matrixChat?.container.querySelector(".mx_Welcome")).toBeTruthy(); expect(windowLocation?.hash).toEqual("#/welcome"); - expect(MatrixClientPeg.get().baseUrl).toEqual(DEFAULT_HS_URL); - expect(MatrixClientPeg.get().idBaseUrl).toEqual(DEFAULT_IS_URL); + expect(MatrixClientPeg.safeGet().baseUrl).toEqual(DEFAULT_HS_URL); + expect(MatrixClientPeg.safeGet().idBaseUrl).toEqual(DEFAULT_IS_URL); }); }); From 4f1ce3c39a1c3aa9879cd2ec9a3eba4507ce6ca0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 14:35:27 +0000 Subject: [PATCH 10/48] Update all non-major dependencies (#25588) * Update all non-major dependencies * Roll back typescript --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 2 +- yarn.lock | 264 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 155 insertions(+), 111 deletions(-) diff --git a/package.json b/package.json index a7aec36a8..d68dd764a 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "cpx": "^1.5.0", "css-loader": "^4", "dotenv": "^16.0.2", - "eslint": "8.41.0", + "eslint": "8.43.0", "eslint-config-google": "^0.14.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-deprecate": "^0.7.0", diff --git a/yarn.lock b/yarn.lock index 36d499b5c..f1096da38 100644 --- a/yarn.lock +++ b/yarn.lock @@ -35,20 +35,20 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" - integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/code-frame@^7.12.13": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ== dependencies: "@babel/highlight" "^7.22.5" +"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" + integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== + dependencies: + "@babel/highlight" "^7.18.6" + "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.5": version "7.21.7" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc" @@ -1078,6 +1078,13 @@ dependencies: regenerator-runtime "^0.13.11" +"@babel/runtime@^7.21.0": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec" + integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA== + dependencies: + regenerator-runtime "^0.13.11" + "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" @@ -1163,7 +1170,7 @@ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== -"@csstools/css-parser-algorithms@^2.1.1": +"@csstools/css-parser-algorithms@^2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.2.0.tgz#1268b07196d1118296443aeff41bca27d94b0981" integrity sha512-9BoQ/jSrPq4vv3b9jjLW+PNNv56KlDH5JMx5yASSNrCtvq70FCNZUjXRvbCeR9hYj9ZyhURtqpU/RFIgg6kiOw== @@ -1173,10 +1180,10 @@ resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.1.1.tgz#07ae11a0a06365d7ec686549db7b729bc036528e" integrity sha512-GbrTj2Z8MCTUv+52GE0RbFGM527xuXZ0Xa5g0Z+YN573uveS4G0qi6WNOMyz3yrFM/jaILTTwJ0+umx81EzqfA== -"@csstools/media-query-list-parser@^2.0.4": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.0.tgz#6e1a5e12e0d103cd13b94bddb88b878bd6866103" - integrity sha512-MXkR+TeaS2q9IkpyO6jVCdtA/bfpABJxIrfkLswThFN8EZZgI2RfAHhm6sDNDuYV25d5+b8Lj1fpTccIcSLPsQ== +"@csstools/media-query-list-parser@^2.1.0": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.1.tgz#7c92053c957f188c35acb30c0678a90d460a4bb4" + integrity sha512-pUjtFbaKbiFNjJo8pprrIaXLvQvWIlwPiFnRI4sEnc4F0NIGTOsw8kaJSR3CmZAKEvV8QYckovgAnWQC0bgLLQ== "@csstools/selector-specificity@^2.2.0": version "2.2.0" @@ -1215,20 +1222,20 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.41.0": - version "8.41.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.41.0.tgz#080321c3b68253522f7646b55b577dd99d2950b3" - integrity sha512-LxcyMGxwmTh2lY9FwHPGWOHmYFCZvbrFCBZL4FzSSsxsRPuhrYUg/49/0KDfW8tnIEaEHtfmn6+NPN+1DqaNmA== +"@eslint/js@8.43.0": + version "8.43.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.43.0.tgz#559ca3d9ddbd6bf907ad524320a0d14b85586af0" + integrity sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg== "@gar/promisify@^1.0.1": version "1.1.3" resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@humanwhocodes/config-array@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" - integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== +"@humanwhocodes/config-array@^0.11.10": + version "0.11.10" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2" + integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" @@ -1824,22 +1831,23 @@ "@sentry/utils" "7.47.0" tslib "^1.9.3" -"@sentry/bundler-plugin-core@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.2.0.tgz#3d9fcc8bc7640b644218f3cbc119f5922bf54c1a" - integrity sha512-yiN1xsn82npb+4pZCQjJOIts5Ffi+rNLW9GB/kjZDtCkTCIfby5F1WPX9Ofk2MCruMguXSoc/3fi3x4tuXbFkA== +"@sentry/bundler-plugin-core@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.3.0.tgz#4d3e6bb92cd0954846cffa8bac74a724fae8842c" + integrity sha512-PiX3yJ8UFKBIPRfhytweYjVdGfcruYJYdwSlbwFNe28fSMTKYPAF9/IqAOav9G8izlICnJm7ROyXlFlfMw0gRA== dependencies: "@sentry/cli" "^2.17.0" "@sentry/node" "7.53.1" + "@sentry/utils" "7.53.1" find-up "5.0.0" glob "9.3.2" magic-string "0.27.0" unplugin "1.0.1" "@sentry/cli@^2.17.0": - version "2.18.1" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.18.1.tgz#c44f189a1a72a83087a297c5fcc7668f86dd4308" - integrity sha512-lc/dX/cvcmznWNbLzDbzxn224vwY5zLIDBe3yOO6Usg3CDgkZZ3xfjN4AIUZwkiTEPIOELodrOfdoMxqpXyYDw== + version "2.19.3" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.19.3.tgz#dbc2368036169a3bc5569686aaebf70b4a347d22" + integrity sha512-E/3jQHuGwRiGAZs5ImVXMDfQf3ojK7s1nMUId+ckjOLZtH0mF3gdOMKthZR/UV6Qy+XpCjCAEvRYJ6S+ngHdOw== dependencies: https-proxy-agent "^5.0.0" node-fetch "^2.6.7" @@ -1922,11 +1930,11 @@ tslib "^1.9.3" "@sentry/webpack-plugin@^2.0.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-2.2.0.tgz#bd7a28a7132f139f74aa1068b168ab735fb9ddea" - integrity sha512-GzwoIQ2ygau0u76uKBK7gAyJAi6Te9zgJuP//OBfmJoXupm6HIUWC6RmPFy0yMlsK4gq1Ak/KziX7PZIe5NLaA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-2.3.0.tgz#48b9d8c97ce632dc5f2674e4effef3d639fe2ab7" + integrity sha512-rdrL9LISNIYMlJhRWn5NNXXVvovwNMWSC81qXgwu9PHbNp1RFKJiZ6oCGDvZRJEyvNTxpiyPMJGQzUPGSFSTRg== dependencies: - "@sentry/bundler-plugin-core" "2.2.0" + "@sentry/bundler-plugin-core" "2.3.0" unplugin "1.0.1" uuid "^9.0.0" @@ -2734,7 +2742,12 @@ acorn@^6.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== -acorn@^8.0.4, acorn@^8.1.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.0, acorn@^8.8.1: +acorn@^8.0.4, acorn@^8.8.1: + version "8.9.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59" + integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ== + +acorn@^8.1.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.0: version "8.8.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== @@ -4017,19 +4030,19 @@ concat-stream@^1.5.0: typedarray "^0.0.6" concurrently@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.0.1.tgz#80c0591920a9fa3e68ba0dd8aa6eac8487eb904c" - integrity sha512-Sh8bGQMEL0TAmAm2meAXMjcASHZa7V0xXQVDBLknCPa9TPtkY9yYs+0cnGGgfdkW0SV1Mlg+hVGfXcoI8d3MJA== + version "8.2.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.0.tgz#cdc9f621a4d913366600355d68254df2c5e782f3" + integrity sha512-nnLMxO2LU492mTUj9qX/az/lESonSZu81UznYDoXtz1IQf996ixVqPAgHXwvHiHCAef/7S8HIK+fTFK7Ifk8YA== dependencies: chalk "^4.1.2" - date-fns "^2.29.3" + date-fns "^2.30.0" lodash "^4.17.21" - rxjs "^7.8.0" - shell-quote "^1.8.0" - spawn-command "0.0.2-1" + rxjs "^7.8.1" + shell-quote "^1.8.1" + spawn-command "0.0.2" supports-color "^8.1.1" tree-kill "^1.2.2" - yargs "^17.7.1" + yargs "^17.7.2" connect-history-api-fallback@^1.6.0: version "1.6.0" @@ -4143,10 +4156,10 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: path-type "^4.0.0" yaml "^1.10.0" -cosmiconfig@^8.1.3: - version "8.1.3" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz#0e614a118fcc2d9e5afc2f87d53cd09931015689" - integrity sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw== +cosmiconfig@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd" + integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ== dependencies: import-fresh "^3.2.1" js-yaml "^4.1.0" @@ -4501,10 +4514,12 @@ data-urls@^3.0.2: whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" -date-fns@^2.29.3: - version "2.29.3" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" - integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== +date-fns@^2.30.0: + version "2.30.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0" + integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw== + dependencies: + "@babel/runtime" "^7.21.0" date-names@^0.1.11: version "0.1.13" @@ -4879,7 +4894,7 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: dependencies: domelementtype "^2.2.0" -domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3: +domhandler@^5.0.2, domhandler@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== @@ -4904,13 +4919,13 @@ domutils@^2.5.2, domutils@^2.8.0: domhandler "^4.2.0" domutils@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" - integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== + version "3.1.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e" + integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA== dependencies: dom-serializer "^2.0.0" domelementtype "^2.3.0" - domhandler "^5.0.1" + domhandler "^5.0.3" dot-case@^3.0.4: version "3.0.4" @@ -4921,9 +4936,9 @@ dot-case@^3.0.4: tslib "^2.0.3" dotenv@^16.0.2: - version "16.0.3" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" - integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ== + version "16.3.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" + integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" @@ -5045,9 +5060,9 @@ entities@^2.0.0: integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== entities@^4.2.0, entities@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" - integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== entities@~2.0: version "2.0.3" @@ -5284,9 +5299,9 @@ eslint-plugin-import@^2.26.0: tsconfig-paths "^3.14.1" eslint-plugin-matrix-org@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-matrix-org/-/eslint-plugin-matrix-org-1.1.0.tgz#cb3c313b58aa84ee0dd52c57f4a614a1795e8744" - integrity sha512-UArLqthBuaCljVajS2TtlPQLXNMZZAPKRt+gA8D0ayzcAj+Ghl50amwGtvLHMzISGv3sqNDBFBMD9cElntE1zA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-matrix-org/-/eslint-plugin-matrix-org-1.2.0.tgz#84b78969c93e6d3d593fe8bf25ee67ec4dcd2883" + integrity sha512-Wp5CeLnyEwGBn8ZfVbSuO2y0Fs51IWonPJ1QRQTntaRxOkEQnnky3gOPwpfGJ8JB0CxYr1zXfeHh8LcYHW4wcg== eslint-plugin-react-hooks@^4.3.0: version "4.6.0" @@ -5375,16 +5390,16 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== -eslint@8.41.0: - version "8.41.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.41.0.tgz#3062ca73363b4714b16dbc1e60f035e6134b6f1c" - integrity sha512-WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q== +eslint@8.43.0: + version "8.43.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.43.0.tgz#3e8c6066a57097adfd9d390b8fc93075f257a094" + integrity sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.4.0" "@eslint/eslintrc" "^2.0.3" - "@eslint/js" "8.41.0" - "@humanwhocodes/config-array" "^0.11.8" + "@eslint/js" "8.43.0" + "@humanwhocodes/config-array" "^0.11.10" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" @@ -7981,9 +7996,9 @@ jszip@^3.7.0: setimmediate "^1.0.5" katex@^0.16.0: - version "0.16.7" - resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.7.tgz#36be1d4ed96e8afdc5863407e70f8fb250aeafd5" - integrity sha512-Xk9C6oGKRwJTfqfIbtr0Kes9OSv6IFsuhFGc7tW4urlpMJtuh+7YhzU6YEG9n8gmWKcMAFzkp7nr+r69kV0zrA== + version "0.16.8" + resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.8.tgz#89b453f40e8557f423f31a1009e9298dd99d5ceb" + integrity sha512-ftuDnJbcbOckGY11OO+zg3OofESlbR5DRl2cmN8HeWeeFIV7wTXvAOx8kEjZjobhA+9wh2fbKeO6cdcA9Mnovg== dependencies: commander "^8.3.0" @@ -8228,9 +8243,9 @@ lru-cache@^6.0.0: yallist "^4.0.0" lru-cache@^9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.1.tgz#c58a93de58630b688de39ad04ef02ef26f1902f1" - integrity sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A== + version "9.1.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835" + integrity sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ== lru-queue@^0.1.0: version "0.1.0" @@ -10255,7 +10270,7 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: version "6.0.11" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== @@ -10263,7 +10278,7 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.11, postcss-selecto cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-selector-parser@^6.0.12: +postcss-selector-parser@^6.0.13: version "6.0.13" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== @@ -10320,7 +10335,7 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.1 picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.2.1, postcss@^8.3.11, postcss@^8.4.16, postcss@^8.4.23: +postcss@^8.2.1, postcss@^8.3.11, postcss@^8.4.16, postcss@^8.4.24: version "8.4.24" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df" integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg== @@ -11107,10 +11122,10 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@^7.8.0: - version "7.8.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" - integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== +rxjs@^7.8.1: + version "7.8.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" + integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== dependencies: tslib "^2.1.0" @@ -11159,7 +11174,7 @@ sanitize-filename@^1.6.3: dependencies: truncate-utf8-bytes "^1.0.0" -sanitize-html@2.10.0, sanitize-html@^2.3.2: +sanitize-html@2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.10.0.tgz#74d28848dfcf72c39693139131895c78900ab452" integrity sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ== @@ -11171,6 +11186,18 @@ sanitize-html@2.10.0, sanitize-html@^2.3.2: parse-srcset "^1.0.2" postcss "^8.3.11" +sanitize-html@^2.3.2: + version "2.11.0" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.11.0.tgz#9a6434ee8fcaeddc740d8ae7cd5dd71d3981f8f6" + integrity sha512-BG68EDHRaGKqlsNjJ2xUB7gpInPA8gVx/mvjO743hZaeMCZ2DwzW7xvsqZ+KNU4QKwj86HJ3uu2liISf2qBBUA== + dependencies: + deepmerge "^4.2.2" + escape-string-regexp "^4.0.0" + htmlparser2 "^8.0.0" + is-plain-object "^5.0.0" + parse-srcset "^1.0.2" + postcss "^8.3.11" + sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -11254,9 +11281,9 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2: - version "7.5.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb" - integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ== + version "7.5.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" + integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ== dependencies: lru-cache "^6.0.0" @@ -11385,7 +11412,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.6.1, shell-quote@^1.8.0: +shell-quote@^1.6.1, shell-quote@^1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== @@ -11569,10 +11596,10 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== -spawn-command@0.0.2-1: - version "0.0.2-1" - resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0" - integrity sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg== +spawn-command@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e" + integrity sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ== spdx-correct@^3.0.0: version "3.2.0" @@ -11920,27 +11947,27 @@ stylelint-config-standard@^33.0.0: stylelint-config-recommended "^12.0.0" stylelint-scss@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.0.0.tgz#2ec6323bac8003fa64871f3fbb75108270e99b83" - integrity sha512-5Ee5kG3JIcP2jk2PMoFMiNmW/815V+wK5o37X5ke90ihWMpPXI9iyqeA6zEWipWSRXeQc0kqbd7hKqiR+wPKNA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.0.1.tgz#b33a6580b5734eace083cfc2cc3021225e28547f" + integrity sha512-n87iCRZrr2J7//I/QFsDXxFLnHKw633U4qvWZ+mOW6KDAp/HLj06H+6+f9zOuTYy+MdGdTuCSDROCpQIhw5fvQ== dependencies: postcss-media-query-parser "^0.2.3" postcss-resolve-nested-selector "^0.1.1" - postcss-selector-parser "^6.0.11" + postcss-selector-parser "^6.0.13" postcss-value-parser "^4.2.0" stylelint@^15.3.0: - version "15.6.2" - resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.6.2.tgz#06d9005b62a83b72887eed623520e9b472af8c15" - integrity sha512-fjQWwcdUye4DU+0oIxNGwawIPC5DvG5kdObY5Sg4rc87untze3gC/5g/ikePqVjrAsBUZjwMN+pZsAYbDO6ArQ== + version "15.9.0" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.9.0.tgz#f5522fac58f806b59ebddbca360ed470dc5b419c" + integrity sha512-sXtAZi64CllWr6A+8ymDWnlIaYwuAa7XRmGnJxLQXFNnLjd3Izm4HAD+loKVaZ7cpK6SLxhAUX1lwPJKGCn0mg== dependencies: - "@csstools/css-parser-algorithms" "^2.1.1" + "@csstools/css-parser-algorithms" "^2.2.0" "@csstools/css-tokenizer" "^2.1.1" - "@csstools/media-query-list-parser" "^2.0.4" + "@csstools/media-query-list-parser" "^2.1.0" "@csstools/selector-specificity" "^2.2.0" balanced-match "^2.0.0" colord "^2.9.3" - cosmiconfig "^8.1.3" + cosmiconfig "^8.2.0" css-functions-list "^3.1.0" css-tree "^2.3.1" debug "^4.3.4" @@ -11961,11 +11988,11 @@ stylelint@^15.3.0: micromatch "^4.0.5" normalize-path "^3.0.0" picocolors "^1.0.0" - postcss "^8.4.23" + postcss "^8.4.24" postcss-media-query-parser "^0.2.3" postcss-resolve-nested-selector "^0.1.1" postcss-safe-parser "^6.0.0" - postcss-selector-parser "^6.0.12" + postcss-selector-parser "^6.0.13" postcss-value-parser "^4.2.0" resolve-from "^5.0.0" string-width "^4.2.3" @@ -11974,7 +12001,6 @@ stylelint@^15.3.0: supports-hyperlinks "^3.0.0" svg-tags "^1.0.0" table "^6.8.1" - v8-compile-cache "^2.3.0" write-file-atomic "^5.0.1" subarg@^1.0.0: @@ -12420,11 +12446,16 @@ tslib@^1.8.1, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0: +tslib@^2.0.0, tslib@^2.0.3: version "2.5.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== +tslib@^2.1.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" + integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== + tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" @@ -12795,7 +12826,7 @@ v8-compile-cache-lib@^3.0.1: resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== -v8-compile-cache@^2.1.1, v8-compile-cache@^2.3.0: +v8-compile-cache@^2.1.1: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== @@ -12903,9 +12934,9 @@ webidl-conversions@^7.0.0: integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== webpack-bundle-analyzer@^4.8.0: - version "4.8.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04" - integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg== + version "4.9.0" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.0.tgz#fc093c4ab174fd3dcbd1c30b763f56d10141209d" + integrity sha512-+bXGmO1LyiNx0i9enBu3H8mv42sj/BJWhZNFwjz92tVnBa9J3JMGo2an2IXlEleoDOPn/Hofl5hr/xCpObUDtw== dependencies: "@discoveryjs/json-ext" "0.5.7" acorn "^8.0.4" @@ -13369,7 +13400,7 @@ yargs@^15.3.1, yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^17.0.1, yargs@^17.3.1, yargs@^17.7.1: +yargs@^17.0.1, yargs@^17.3.1: version "17.7.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== @@ -13382,6 +13413,19 @@ yargs@^17.0.1, yargs@^17.3.1, yargs@^17.7.1: y18n "^5.0.5" yargs-parser "^21.1.1" +yargs@^17.7.2: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 7164aeb65b9f39a0c3848e69fa6c07905995ae16 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 3 Jul 2023 15:30:28 +0100 Subject: [PATCH 11/48] Align develop.e.io cloudflare pages headers with other deploys (#25700) --- .github/cfp_headers | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/cfp_headers b/.github/cfp_headers index 4a1d4d441..5eb050e22 100644 --- a/.github/cfp_headers +++ b/.github/cfp_headers @@ -2,6 +2,8 @@ ! Access-Control-Allow-Origin X-XSS-Protection: 1; mode=block X-Content-Type-Options: nosniff + X-Frame-Options: SAMEORIGIN + Content-Security-Policy: frame-ancestors 'self' Strict-Transport-Security: max-age=31536000; includeSubDomains; preload /version From 210a8eee7fe7ece0530d348e936d233b4ecda17c Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 4 Jul 2023 15:26:50 +0100 Subject: [PATCH 12/48] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 91 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 0dd2491c0..eb985aa4e 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "26.2.0", - "matrix-react-sdk": "3.75.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 25ace7ba1..cf1bc3c6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1605,6 +1605,11 @@ resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.5.0.tgz#38b69c4e29d243944c5712cca7b674a3432056e6" integrity sha512-uL5kf7MqC+GxsGJtimPVbFliyaFinohTHSzohz31JTysktHsjRR2SC+vV7sy2/dstTWVdG9EGOnohyPsB+oi3A== +"@matrix-org/matrix-sdk-crypto-js@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0.tgz#766580036d4df12120ded223e13b5640e77db136" + integrity sha512-ra/bcFdleC1iRNms2I96UXA0NvQYWpMsHrV5EfJRS7qV1PtnQNvgsvMfjMbkx8QT2ErEmIhsvB5fPCpfp8BSuw== + "@matrix-org/matrix-sdk-crypto-js@^0.1.0-alpha.11": version "0.1.0-alpha.11" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.11.tgz#24d705318c3159ef7dbe43bca464ac2bdd11e45d" @@ -7995,6 +8000,11 @@ jszip@^3.7.0: readable-stream "~2.3.6" setimmediate "^1.0.5" +jwt-decode@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59" + integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A== + katex@^0.16.0: version "0.16.8" resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.8.tgz#89b453f40e8557f423f31a1009e9298dd99d5ceb" @@ -8092,10 +8102,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -linkify-element@4.0.0-beta.4: - version "4.0.0-beta.4" - resolved "https://registry.yarnpkg.com/linkify-element/-/linkify-element-4.0.0-beta.4.tgz#31bb5dff7430c4debc34030466bd8f3e297793a7" - integrity sha512-dsu5qxk6MhQHxXUlPjul33JknQPx7Iv/N8zisH4JtV31qVk0qZg/5gn10Hr76GlMuixcdcxVvGHNfVcvbut13w== +linkify-element@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/linkify-element/-/linkify-element-4.1.1.tgz#049221d53250e67c053cd94dd0ef411cccb87b28" + integrity sha512-G//YNU6WXu1uo/oneLfGE6UPlz5cdk4M43l+WHPezdWUQ/B703g9CtvxtLgfNFU8a/9+c9XjI+d+vfQTiH+KHg== linkify-it@^3.0.1: version "3.0.3" @@ -8104,20 +8114,20 @@ linkify-it@^3.0.1: dependencies: uc.micro "^1.0.1" -linkify-react@4.0.0-beta.4: - version "4.0.0-beta.4" - resolved "https://registry.yarnpkg.com/linkify-react/-/linkify-react-4.0.0-beta.4.tgz#75311ade523a52d43054dd841d724d746d43f60d" - integrity sha512-o4vFe28vtk6i8a6tbtkLyusIyhLJSYoHC3gEpmJEVqi6Hy3aguVEenYmtaOjmAQehDrBYeHv9s4qcneZOf7SWQ== +linkify-react@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/linkify-react/-/linkify-react-4.1.1.tgz#79cc29c6e5c0fd660be74a6a51d25c1b36977cf7" + integrity sha512-2K9Y1cUdvq40dFWqCJ//X+WP19nlzIVITFGI93RjLnA0M7KbnxQ/ffC3AZIZaEIrLangF9Hjt3i0GQ9/anEG5A== -linkify-string@4.0.0-beta.4: - version "4.0.0-beta.4" - resolved "https://registry.yarnpkg.com/linkify-string/-/linkify-string-4.0.0-beta.4.tgz#0982509bc6ce81c554bff8d7121057193b84ea32" - integrity sha512-1U90tclSloCMAhbcuu4S+BN7ZisZkFB6ggKS1ofdYy1bmtgxdXGDppVUV+qRp5rcAudla7K0LBgOiwCQ0WzrYQ== +linkify-string@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/linkify-string/-/linkify-string-4.1.1.tgz#461eb30b66752dec21f3557ebe55983ae3f5b195" + integrity sha512-9+kj8xr7GLiyNyO9ri7lIxq2ixVYjjqvtomPQpeYNNT56/PxQq6utzXFLm8HxOaGTiMpimj1UAQWwYYPV88L1g== -linkifyjs@4.0.0-beta.4: - version "4.0.0-beta.4" - resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.0.0-beta.4.tgz#8a03e7a999ed0b578a14d690585a32706525c45e" - integrity sha512-j8IUYMqyTT0aDrrkA5kf4hn6QurSKjGiQbqjNr4qc8dwEXIniCGp0JrdXmsGcTOEyhKG03GyRnJjp3NDTBBPDQ== +linkifyjs@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.1.1.tgz#73d427e3bbaaf4ca8e71c589ad4ffda11a9a5fde" + integrity sha512-zFN/CTVmbcVef+WaDXT63dNzzkfRBKT1j464NJQkV7iSgJU0sLBus9W0HBwnXK13/hf168pbrx/V/bjEHOXNHA== loader-runner@^2.4.0: version "2.4.0" @@ -8399,6 +8409,24 @@ matrix-js-sdk@26.2.0: unhomoglyph "^1.0.6" uuid "9" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "26.2.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5751df1288b340fe08358145e5d47d28ed69465a" + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-js" "^0.1.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.3.1" + 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" @@ -8406,10 +8434,9 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.75.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.75.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.75.0.tgz#677646d9fc1fc6a617f579e8d4bc4bbbccafdf74" - integrity sha512-iniSUalf1Be4r8lr1+kdDfFllQxMTbtrfBLmZxA0aGtBTavGceQFp+wiLwzYYykdRPNVC4U7ojmt3lxWD/3aXQ== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/cf11b5f400616d45c5551cdce98c7b633e07828c" dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.5.0" @@ -8441,15 +8468,15 @@ matrix-react-sdk@3.75.0: is-ip "^3.1.0" jszip "^3.7.0" katex "^0.16.0" - linkify-element "4.0.0-beta.4" - linkify-react "4.0.0-beta.4" - linkify-string "4.0.0-beta.4" - linkifyjs "4.0.0-beta.4" + linkify-element "4.1.1" + linkify-react "4.1.1" + linkify-string "4.1.1" + linkifyjs "4.1.1" lodash "^4.17.20" maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "26.2.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^1.4.0" memoize-one "^6.0.0" minimist "^1.2.5" @@ -8468,7 +8495,7 @@ matrix-react-sdk@3.75.0: react-transition-group "^4.4.1" rfc4648 "^1.4.0" sanitize-filename "^1.6.3" - sanitize-html "2.10.0" + sanitize-html "2.11.0" tar-js "^0.3.0" ua-parser-js "^1.0.2" what-input "^5.2.10" @@ -11176,19 +11203,7 @@ sanitize-filename@^1.6.3: dependencies: truncate-utf8-bytes "^1.0.0" -sanitize-html@2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.10.0.tgz#74d28848dfcf72c39693139131895c78900ab452" - integrity sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ== - dependencies: - deepmerge "^4.2.2" - escape-string-regexp "^4.0.0" - htmlparser2 "^8.0.0" - is-plain-object "^5.0.0" - parse-srcset "^1.0.2" - postcss "^8.3.11" - -sanitize-html@^2.3.2: +sanitize-html@2.11.0, sanitize-html@^2.3.2: version "2.11.0" resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.11.0.tgz#9a6434ee8fcaeddc740d8ae7cd5dd71d3981f8f6" integrity sha512-BG68EDHRaGKqlsNjJ2xUB7gpInPA8gVx/mvjO743hZaeMCZ2DwzW7xvsqZ+KNU4QKwj86HJ3uu2liISf2qBBUA== From faa602d73af40b0af456c897c0ce5900e17425d0 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 4 Jul 2023 15:26:57 +0100 Subject: [PATCH 13/48] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- yarn.lock | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/package.json b/package.json index eb985aa4e..483892018 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.16.0", - "matrix-js-sdk": "26.2.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 cf1bc3c6c..6e75da973 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1610,11 +1610,6 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0.tgz#766580036d4df12120ded223e13b5640e77db136" integrity sha512-ra/bcFdleC1iRNms2I96UXA0NvQYWpMsHrV5EfJRS7qV1PtnQNvgsvMfjMbkx8QT2ErEmIhsvB5fPCpfp8BSuw== -"@matrix-org/matrix-sdk-crypto-js@^0.1.0-alpha.11": - version "0.1.0-alpha.11" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.11.tgz#24d705318c3159ef7dbe43bca464ac2bdd11e45d" - integrity sha512-HD3rskPkqrUUSaKzGLg97k/bN+OZrkcX7ODB/pNBs/jqq+/A0wDKqsszJotzFwsQcDPpWn78BmMyvBo4tLxKjw== - "@matrix-org/matrix-wysiwyg@^2.3.0": version "2.3.0" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.3.0.tgz#7a815fb90600342cc74c03a3cc7c9908a1d15dd1" @@ -8391,24 +8386,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@26.2.0: - version "26.2.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-26.2.0.tgz#0b7dfbb2d1ca1fb699f627d85c7ed10137947c33" - integrity sha512-Om6p8iC/2ojw0MQBmz/DYqbz3sFSJF2jE92sZcpLA/cki1SaXLpD2V5N9RcZgcHGmtm3w49822sIs8nWVyBAFQ== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.11" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.3.1" - 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 "26.2.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5751df1288b340fe08358145e5d47d28ed69465a" From d31a4984571c73d48c66959e39201c95539cb998 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 4 Jul 2023 17:14:31 +0100 Subject: [PATCH 14/48] Tweak branch matching to allow not applying outside of PRs for matrix-analytics-events (#25712) --- scripts/layered.sh | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/scripts/layered.sh b/scripts/layered.sh index 62b8b5a0b..c9c78cfe1 100755 --- a/scripts/layered.sh +++ b/scripts/layered.sh @@ -21,27 +21,30 @@ export PR_ORG=vector-im export PR_REPO=element-web # Set up the js-sdk first -node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-js-sdk +node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-js-sdk develop pushd matrix-js-sdk yarn link yarn install --frozen-lockfile popd -# Also set up matrix-analytics-events so we get the latest from -# the main branch or a branch with matching name -node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-analytics-events main -pushd matrix-analytics-events -yarn link -yarn install --frozen-lockfile -yarn build:ts -popd +# Also set up matrix-analytics-events for branch with matching name +node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-analytics-events +# We don't pass a default branch so cloning may fail when we are not in a PR +# This is expected as this project does not share a release cycle but we still branch match it +if [ -d matrix-analytics-events ]; then + pushd matrix-analytics-events + yarn link + yarn install --frozen-lockfile + yarn build:ts + popd +fi # Now set up the react-sdk -node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-react-sdk +node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-react-sdk develop pushd matrix-react-sdk yarn link yarn link matrix-js-sdk -yarn link @matrix-org/analytics-events +[ -d matrix-analytics-events ] && yarn link @matrix-org/analytics-events yarn install --frozen-lockfile popd From 01a234aafaa4ed5e9ecac57c2ae430f8128dc31a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 4 Jul 2023 17:19:09 +0100 Subject: [PATCH 15/48] Update matrix-react-sdk yarn.lock --- yarn.lock | 174 +++++++++++++++++++++++++++++------------------------- 1 file changed, 93 insertions(+), 81 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6e75da973..ef2875523 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1071,7 +1071,14 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.9", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.15.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438" + integrity sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ== + dependencies: + regenerator-runtime "^0.13.11" + +"@babel/runtime@^7.12.5", "@babel/runtime@^7.17.9", "@babel/runtime@^7.8.4": version "7.21.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200" integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q== @@ -1611,9 +1618,9 @@ integrity sha512-ra/bcFdleC1iRNms2I96UXA0NvQYWpMsHrV5EfJRS7qV1PtnQNvgsvMfjMbkx8QT2ErEmIhsvB5fPCpfp8BSuw== "@matrix-org/matrix-wysiwyg@^2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.3.0.tgz#7a815fb90600342cc74c03a3cc7c9908a1d15dd1" - integrity sha512-VtA+Bti2IdqpnpCNaTFHMjbpKXe4xHR+OWWJl/gjuYgn4NJO9lfeeEIv34ftC6dBh7R280JEiMxQ9mDcH0J54g== + version "2.3.1" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.3.1.tgz#4b607323f3ffd8c332abeba7226010ecc031ed12" + integrity sha512-OxJvA+pSGdP2f55foZGEDmU2qvILFLLjV53MOgPw1F6zDAp8nDL1rPPIzFv1qgDj5W7d4Rzq7FnN25vINnAu+A== "@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" @@ -1799,16 +1806,6 @@ resolved "https://registry.yarnpkg.com/@principalstudio/html-webpack-inject-preload/-/html-webpack-inject-preload-1.2.7.tgz#0c1f0b32a34d814b36ce84111f89990441cc64e8" integrity sha512-KJKkiKG63ugBjf8U0e9jUcI9CLPTFIsxXplEDE0oi3mPpxd90X9SJovo3W2l7yh/ARKIYXhQq8fSXUN7M29TzQ== -"@sentry-internal/tracing@7.47.0": - version "7.47.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.47.0.tgz#45e92eb4c8d049d93bd4fab961eaa38a4fb680f3" - integrity sha512-udpHnCzF8DQsWf0gQwd0XFGp6Y8MOiwnl8vGt2ohqZGS3m1+IxoRLXsSkD8qmvN6KKDnwbaAvYnK0z0L+AW95g== - dependencies: - "@sentry/core" "7.47.0" - "@sentry/types" "7.47.0" - "@sentry/utils" "7.47.0" - tslib "^1.9.3" - "@sentry-internal/tracing@7.53.1": version "7.53.1" resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.53.1.tgz#85517ba93ee721424c865706f7ff4eaab1569e6d" @@ -1819,17 +1816,27 @@ "@sentry/utils" "7.53.1" tslib "^1.9.3" -"@sentry/browser@^7.0.0": - version "7.47.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.47.0.tgz#c0d10f348d1fb9336c3ef8fa2f6638f26d4c17a8" - integrity sha512-L0t07kS/G1UGVZ9fpD6HLuaX8vVBqAGWgu+1uweXthYozu/N7ZAsakjU/Ozu6FSXj1mO3NOJZhOn/goIZLSj5A== +"@sentry-internal/tracing@7.57.0": + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.57.0.tgz#cb761931b635f8f24c84be0eecfacb8516b20551" + integrity sha512-tpViyDd8AhQGYYhI94xi2aaDopXOPfL2Apwrtb3qirWkomIQ2K86W1mPmkce+B0cFOnW2Dxv/ZTFKz6ghjK75A== dependencies: - "@sentry-internal/tracing" "7.47.0" - "@sentry/core" "7.47.0" - "@sentry/replay" "7.47.0" - "@sentry/types" "7.47.0" - "@sentry/utils" "7.47.0" - tslib "^1.9.3" + "@sentry/core" "7.57.0" + "@sentry/types" "7.57.0" + "@sentry/utils" "7.57.0" + tslib "^2.4.1 || ^1.9.3" + +"@sentry/browser@^7.0.0": + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.57.0.tgz#6e724c9eac680dba99ced0fdf81be8d1e3b3bceb" + integrity sha512-E0HaYYlaqHFiIRZXxcvOO8Odvlt+TR1vFFXzqUWXPOvDRxURglTOCQ3EN/u6bxtAGJ6y/Zc2obgihTtypuel/w== + dependencies: + "@sentry-internal/tracing" "7.57.0" + "@sentry/core" "7.57.0" + "@sentry/replay" "7.57.0" + "@sentry/types" "7.57.0" + "@sentry/utils" "7.57.0" + tslib "^2.4.1 || ^1.9.3" "@sentry/bundler-plugin-core@2.3.0": version "2.3.0" @@ -1855,15 +1862,6 @@ proxy-from-env "^1.1.0" which "^2.0.2" -"@sentry/core@7.47.0": - version "7.47.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.47.0.tgz#6a723d96f64009a9c1b9bc44e259956b7eca0a3f" - integrity sha512-EFhZhKdMu7wKmWYZwbgTi8FNZ7Fq+HdlXiZWNz51Bqe3pHmfAkdHtAEs0Buo0v623MKA0CA4EjXIazGUM34XTg== - dependencies: - "@sentry/types" "7.47.0" - "@sentry/utils" "7.47.0" - tslib "^1.9.3" - "@sentry/core@7.53.1": version "7.53.1" resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.53.1.tgz#c091a9d7fd010f8a2cb1dd71d949a8e453e35d4c" @@ -1873,6 +1871,15 @@ "@sentry/utils" "7.53.1" tslib "^1.9.3" +"@sentry/core@7.57.0": + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.57.0.tgz#65093d739c04f320a54395a21be955fcbe326acb" + integrity sha512-l014NudPH0vQlzybtXajPxYFfs9w762NoarjObC3gu76D1jzBBFzhdRelkGpDbSLNTIsKhEDDRpgAjBWJ9icfw== + dependencies: + "@sentry/types" "7.57.0" + "@sentry/utils" "7.57.0" + tslib "^2.4.1 || ^1.9.3" + "@sentry/node@7.53.1": version "7.53.1" resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.53.1.tgz#d4c47477cf4305e352b511635d1d3d4d160e8bd7" @@ -1887,39 +1894,31 @@ lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/replay@7.47.0": - version "7.47.0" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.47.0.tgz#d2fc8fd3be2360950497426035d1ba0bd8a97b8f" - integrity sha512-BFpVZVmwlezZ83y0L43TCTJY142Fxh+z+qZSwTag5HlhmIpBKw/WKg06ajOhrYJbCBkhHmeOvyKkxX0jnc39ZA== +"@sentry/replay@7.57.0": + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.57.0.tgz#c8f7eae7b7edc9d32c3d2955b337f3b3c76dff39" + integrity sha512-pN4ryNS3J5EYbkXvR+O/+hseAJha7XDl8mPFtK0OGTHG10JzCi4tQJazblHQdpb5QBaMMPCeZ+isyfoQLDNXnw== dependencies: - "@sentry/core" "7.47.0" - "@sentry/types" "7.47.0" - "@sentry/utils" "7.47.0" + "@sentry/core" "7.57.0" + "@sentry/types" "7.57.0" + "@sentry/utils" "7.57.0" "@sentry/tracing@^7.0.0": - version "7.47.0" - resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.47.0.tgz#5f665cec7ab1703e3d0250da9284a9d8dc2eb604" - integrity sha512-hJCpKdekwaFNbCVXxfCz5IxfSEJIKnkPmRSVHITOm5VhKwq2e5kmy4Rn6bzSETwJFSDE8LGbR/3eSfGTqw37XA== + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.57.0.tgz#8bd07317db7b88ec5ecae48ad680e269af71b54d" + integrity sha512-D8eKJMYN529mDP9lsOLyhe0Rf9Qiexo7Ul4+MQwDlwRr9c9tc0AdGwFlnKGvCMDh7ucITzvZkMZDHBapU3WHNQ== dependencies: - "@sentry-internal/tracing" "7.47.0" - -"@sentry/types@7.47.0": - version "7.47.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.47.0.tgz#fd07dbec11a26ae861532a9abe75bd31663ca09b" - integrity sha512-GxXocplN0j1+uczovHrfkykl9wvkamDtWxlPUQgyGlbLGZn+UH1Y79D4D58COaFWGEZdSNKr62gZAjfEYu9nQA== + "@sentry-internal/tracing" "7.57.0" "@sentry/types@7.53.1": version "7.53.1" resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.53.1.tgz#3eefbad851f2d0deff67285d7e976d23d7d06a41" integrity sha512-/ijchRIu+jz3+j/zY+7KRPfLSCY14fTx5xujjbOdmEKjmIHQmwPBdszcQm40uwofrR8taV4hbt5MFN+WnjCkCw== -"@sentry/utils@7.47.0": - version "7.47.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.47.0.tgz#e62fdede15e45387b40c9fa135feba48f0960826" - integrity sha512-A89SaOLp6XeZfByeYo2C8Ecye/YAtk/gENuyOUhQEdMulI6mZdjqtHAp7pTMVgkBc/YNARVuoa+kR/IdRrTPkQ== - dependencies: - "@sentry/types" "7.47.0" - tslib "^1.9.3" +"@sentry/types@7.57.0": + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.57.0.tgz#4fdb80cbd49ba034dd8d9be0c0005a016d5db3ce" + integrity sha512-D7ifoUfxuVCUyktIr5Gc+jXUbtcUMmfHdTtTbf1XCZHua5mJceK9wtl3YCg3eq/HK2Ppd52BKnTzEcS5ZKQM+w== "@sentry/utils@7.53.1": version "7.53.1" @@ -1929,6 +1928,14 @@ "@sentry/types" "7.53.1" tslib "^1.9.3" +"@sentry/utils@7.57.0": + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.57.0.tgz#8253c6fcf35138b4c424234b8da1596e11b98ad8" + integrity sha512-YXrkMCiNklqkXctn4mKYkrzNCf/dfVcRUQrkXjeBC+PHXbcpPyaJgInNvztR7Skl8lE3JPGPN4v5XhLxK1bUUg== + dependencies: + "@sentry/types" "7.57.0" + tslib "^2.4.1 || ^1.9.3" + "@sentry/webpack-plugin@^2.0.0": version "2.3.0" resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-2.3.0.tgz#48b9d8c97ce632dc5f2674e4effef3d639fe2ab7" @@ -4628,7 +4635,7 @@ default-gateway@^4.2.0: execa "^1.0.0" ip-regex "^2.1.0" -define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4: +define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== @@ -4759,9 +4766,9 @@ diffie-hellman@^5.0.0: randombytes "^2.0.0" dijkstrajs@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257" - integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz#4c8dbdea1f0f6478bff94d9c49c784d623e4fc23" + integrity sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA== dir-glob@2.0.0: version "2.0.0" @@ -6114,7 +6121,7 @@ function.prototype.name@^1.1.5: es-abstract "^1.19.0" functions-have-names "^1.2.2" -functions-have-names@^1.2.2: +functions-have-names@^1.2.2, functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== @@ -6135,12 +6142,13 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== + version "1.2.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" + integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== dependencies: function-bind "^1.1.1" has "^1.0.3" + has-proto "^1.0.1" has-symbols "^1.0.3" get-package-type@^0.1.0: @@ -6505,9 +6513,9 @@ he@^1.2.0: integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== highlight.js@^11.3.1: - version "11.7.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.7.0.tgz#3ff0165bc843f8c9bce1fd89e2fda9143d24b11e" - integrity sha512-1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ== + version "11.8.0" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.8.0.tgz#966518ea83257bae2e7c9a48596231856555bb65" + integrity sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg== hmac-drbg@^1.0.1: version "1.0.1" @@ -6572,9 +6580,9 @@ html-entities@^1.3.1: integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA== html-entities@^2.0.0: - version "2.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" - integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== + version "2.4.0" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061" + integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ== html-escaper@^2.0.0: version "2.0.2" @@ -8413,7 +8421,7 @@ matrix-mock-request@^2.5.0: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.75.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/cf11b5f400616d45c5551cdce98c7b633e07828c" + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/1a2d201863e1a61d62b84fefe0760fee622b1d5f" dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.5.0" @@ -10897,7 +10905,7 @@ regexp-tree@^0.1.24, regexp-tree@~0.1.1: resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz#3d6fa238450a4d66e5bc9c4c14bb720e2196829d" integrity sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw== -regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3: +regexp.prototype.flags@^1.2.0: version "1.4.3" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== @@ -10906,6 +10914,15 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3: define-properties "^1.1.3" functions-have-names "^1.2.2" +regexp.prototype.flags@^1.4.3: + version "1.5.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" + integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + functions-have-names "^1.2.3" + regexpu-core@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" @@ -12440,12 +12457,7 @@ tslib@^1.8.1, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.3: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" - integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== - -tslib@^2.1.0: +tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, "tslib@^2.4.1 || ^1.9.3": version "2.6.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== @@ -13152,9 +13164,9 @@ which-collection@^1.0.1: is-weakset "^2.0.1" which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== + version "2.0.1" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" + integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== which-typed-array@^1.1.9: version "1.1.9" From 658e2829293ece69bbd1d7a0d5bf29c3802364b5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 6 Jul 2023 16:03:52 +0100 Subject: [PATCH 16/48] Enable strictNullChecks and noImplicitAny (#25724) --- tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index f2ee3b70c..3e09c30e3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,7 @@ "module": "commonjs", "moduleResolution": "node", "target": "es2016", - "noImplicitAny": false, + "noImplicitAny": true, "noUnusedLocals": true, "sourceMap": false, "outDir": "./lib", @@ -16,6 +16,7 @@ "lib": ["es2020", "dom", "dom.iterable"], "alwaysStrict": true, "strictBindCallApply": true, + "strictNullChecks": true, "noImplicitThis": true }, "include": [ From fad458d8c5ae8063756f63f49be3feba3c1cac25 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 7 Jul 2023 12:40:41 +0100 Subject: [PATCH 17/48] Enable strictPropertyInitialization (#25729) --- tsconfig.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 3e09c30e3..bb0859890 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,17 +7,15 @@ "module": "commonjs", "moduleResolution": "node", "target": "es2016", - "noImplicitAny": true, "noUnusedLocals": true, "sourceMap": false, "outDir": "./lib", "declaration": true, "jsx": "react", "lib": ["es2020", "dom", "dom.iterable"], - "alwaysStrict": true, - "strictBindCallApply": true, - "strictNullChecks": true, - "noImplicitThis": true + "strict": true, + "strictFunctionTypes": false, + "useUnknownInCatchVariables": false }, "include": [ "./node_modules/matrix-js-sdk/src/@types/*.d.ts", From 6726b93cb4cd7b6145ff6621998a4a86009d009a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 7 Jul 2023 13:44:33 +0100 Subject: [PATCH 18/48] Enable strictFunctionTypes (#25730) --- package.json | 2 +- tsconfig.json | 1 - yarn.lock | 7 +++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 483892018..519762565 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ }, "dependencies": { "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz", - "@matrix-org/react-sdk-module-api": "^0.0.5", + "@matrix-org/react-sdk-module-api": "^0.0.6", "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.16.0", diff --git a/tsconfig.json b/tsconfig.json index bb0859890..3c0a77e8b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,6 @@ "jsx": "react", "lib": ["es2020", "dom", "dom.iterable"], "strict": true, - "strictFunctionTypes": false, "useUnknownInCatchVariables": false }, "include": [ diff --git a/yarn.lock b/yarn.lock index ef2875523..dee726dd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1633,6 +1633,13 @@ dependencies: "@babel/runtime" "^7.17.9" +"@matrix-org/react-sdk-module-api@^0.0.6": + version "0.0.6" + resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-0.0.6.tgz#941872ed081acdca9d247ccd6e146265aa24010b" + integrity sha512-FydbJYSMecpDIGk4fVQ9djjckQdbJPV9bH3px78TQ+MX/WHmzPmjEpMPTeP3uDSeg0EWmfoIFdNypJglMqAHpw== + dependencies: + "@babel/runtime" "^7.17.9" + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" From 0a4a205fbe847f3c6d7608ef61d79a47f294b2c9 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 7 Jul 2023 14:46:14 +0100 Subject: [PATCH 19/48] Enable strictPropertyInitialization (#25735) --- .github/workflows/static_analysis.yaml | 38 -------------------------- tsconfig.json | 3 +- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml index 61f5c2040..0384758a6 100644 --- a/.github/workflows/static_analysis.yaml +++ b/.github/workflows/static_analysis.yaml @@ -26,44 +26,6 @@ jobs: - name: Typecheck run: "yarn run lint:types" - tsc-strict: - name: Typescript Strict Error Checker - if: github.event_name == 'pull_request' - runs-on: ubuntu-latest - permissions: - pull-requests: read - checks: write - steps: - - uses: actions/checkout@v3 - - - name: Install Deps - run: "scripts/layered.sh" - - - name: Get diff lines - id: diff - uses: Equip-Collaboration/diff-line-numbers@e752977e2cb4207d671bb9e4dad18c07c1b73d52 # v1.1.0 - with: - include: '["\\.tsx?$"]' - - - name: Detecting files changed - id: files - uses: futuratrepadeira/changed-files@0239328a3a6268aad16af7c3e4efc78e32d6c0f0 # v4.0.1 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - pattern: '^.*\.tsx?$' - - - uses: t3chguy/typescript-check-action@main - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - use-check: false - check-fail-mode: added - output-behaviour: annotate - ts-extra-args: "--strict --noImplicitAny" - files-changed: ${{ steps.files.outputs.files_updated }} - files-added: ${{ steps.files.outputs.files_created }} - files-deleted: ${{ steps.files.outputs.files_deleted }} - line-numbers: ${{ steps.diff.outputs.lineNumbers }} - i18n_lint: name: "i18n Check" uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop diff --git a/tsconfig.json b/tsconfig.json index 3c0a77e8b..ac8ea2d73 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,8 +13,7 @@ "declaration": true, "jsx": "react", "lib": ["es2020", "dom", "dom.iterable"], - "strict": true, - "useUnknownInCatchVariables": false + "strict": true }, "include": [ "./node_modules/matrix-js-sdk/src/@types/*.d.ts", From bac0da3fe93dc227258d4aca04feced30e6e4a1d Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 7 Jul 2023 15:25:22 +0100 Subject: [PATCH 20/48] Deprecate customisations in favour of Module API (#25736) --- docs/customisations.md | 8 ++++++++ webpack.config.js | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/docs/customisations.md b/docs/customisations.md index 730e9da79..b1ae00527 100644 --- a/docs/customisations.md +++ b/docs/customisations.md @@ -1,5 +1,13 @@ # Customisations +### 🦖 DEPRECATED + +Customisations have been deprecated in favour of the [Module API](https://github.com/vector-im/element-web/blob/develop/docs/modules.md). +If you have use cases from customisations which are not yet available via the Module API please open an issue. +Customisations will be removed from the codebase in a future release. + +--- + Element Web and the React SDK support "customisation points" that can be used to easily add custom logic specific to a particular deployment of Element Web. diff --git a/webpack.config.js b/webpack.config.js index 514bf32d0..b77825e39 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -61,6 +61,15 @@ try { // stringify the output so it appears in logs correctly, as large files can sometimes get // represented as `` which is less than helpful. console.log("Using customisations.json : " + JSON.stringify(fileOverrides, null, 4)); + + process.on("exit", () => { + console.log(""); // blank line + console.warn("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + console.warn("!! Customisations have been deprecated and will be removed in a future release !!"); + console.warn("!! See https://github.com/vector-im/element-web/blob/develop/docs/customisations.md !!"); + console.warn("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + console.log(""); // blank line + }); } catch (e) { // ignore - not important } From d18c69eb6538f74bf8666a21e21e8556ed78b9dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 09:18:16 +0100 Subject: [PATCH 21/48] Bump stylelint from 15.9.0 to 15.10.1 (#25739) Bumps [stylelint](https://github.com/stylelint/stylelint) from 15.9.0 to 15.10.1. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/15.9.0...15.10.1) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 188 +++++++++++++++++++++++++++++---------------------- 2 files changed, 109 insertions(+), 81 deletions(-) diff --git a/package.json b/package.json index 519762565..86f45af52 100644 --- a/package.json +++ b/package.json @@ -170,7 +170,7 @@ "simple-proxy-agent": "^1.1.0", "string-replace-loader": "3", "style-loader": "2", - "stylelint": "^15.3.0", + "stylelint": "^15.10.1", "stylelint-config-standard": "^33.0.0", "stylelint-scss": "^5.0.0", "terser-webpack-plugin": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index dee726dd8..3e1a56e49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1177,25 +1177,25 @@ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== -"@csstools/css-parser-algorithms@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.2.0.tgz#1268b07196d1118296443aeff41bca27d94b0981" - integrity sha512-9BoQ/jSrPq4vv3b9jjLW+PNNv56KlDH5JMx5yASSNrCtvq70FCNZUjXRvbCeR9hYj9ZyhURtqpU/RFIgg6kiOw== +"@csstools/css-parser-algorithms@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.0.tgz#0cc3a656dc2d638370ecf6f98358973bfbd00141" + integrity sha512-dTKSIHHWc0zPvcS5cqGP+/TPFUJB0ekJ9dGKvMAFoNuBFhDPBt9OMGNZiIA5vTiNdGHHBeScYPXIGBMnVOahsA== "@csstools/css-tokenizer@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.1.1.tgz#07ae11a0a06365d7ec686549db7b729bc036528e" integrity sha512-GbrTj2Z8MCTUv+52GE0RbFGM527xuXZ0Xa5g0Z+YN573uveS4G0qi6WNOMyz3yrFM/jaILTTwJ0+umx81EzqfA== -"@csstools/media-query-list-parser@^2.1.0": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.1.tgz#7c92053c957f188c35acb30c0678a90d460a4bb4" - integrity sha512-pUjtFbaKbiFNjJo8pprrIaXLvQvWIlwPiFnRI4sEnc4F0NIGTOsw8kaJSR3CmZAKEvV8QYckovgAnWQC0bgLLQ== +"@csstools/media-query-list-parser@^2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.2.tgz#6ef642b728d30c1009bfbba3211c7e4c11302728" + integrity sha512-M8cFGGwl866o6++vIY7j1AKuq9v57cf+dGepScwCcbut9ypJNr4Cj+LLTWligYUZ0uyhEoJDKt5lvyBfh2L3ZQ== -"@csstools/selector-specificity@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016" - integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw== +"@csstools/selector-specificity@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz#798622546b63847e82389e473fd67f2707d82247" + integrity sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g== "@discoveryjs/json-ext@0.5.7": version "0.5.7" @@ -2306,7 +2306,7 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== -"@types/minimist@^1.2.0": +"@types/minimist@^1.2.2": version "1.2.2" resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== @@ -3670,21 +3670,22 @@ camelcase-css@^2.0.1: resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== -camelcase-keys@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" - integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== +camelcase-keys@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-7.0.2.tgz#d048d8c69448745bb0de6fc4c1c52a30dfbe7252" + integrity sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg== dependencies: - camelcase "^5.3.1" - map-obj "^4.0.0" - quick-lru "^4.0.1" + camelcase "^6.3.0" + map-obj "^4.1.0" + quick-lru "^5.1.1" + type-fest "^1.2.1" camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0, camelcase@^6.2.0: +camelcase@^6.0.0, camelcase@^6.2.0, camelcase@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== @@ -4574,6 +4575,11 @@ decamelize@^1.1.0, decamelize@^1.2.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== +decamelize@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9" + integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA== + decimal.js@^10.4.2: version "10.4.3" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" @@ -5743,10 +5749,10 @@ fast-glob@^2.0.2: merge2 "^1.2.3" micromatch "^3.1.10" -fast-glob@^3.2.12, fast-glob@^3.2.7, fast-glob@^3.2.9: - version "3.2.12" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" - integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== +fast-glob@^3.2.7, fast-glob@^3.2.9, fast-glob@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0" + integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -6833,6 +6839,11 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== +indent-string@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5" + integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg== + indexes-of@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" @@ -8328,7 +8339,7 @@ map-obj@^1.0.0: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== -map-obj@^4.0.0: +map-obj@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== @@ -8584,23 +8595,23 @@ memory-fs@^0.5.0: errno "^0.1.3" readable-stream "^2.0.1" -meow@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364" - integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ== +meow@^10.1.5: + version "10.1.5" + resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.5.tgz#be52a1d87b5f5698602b0f32875ee5940904aa7f" + integrity sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw== dependencies: - "@types/minimist" "^1.2.0" - camelcase-keys "^6.2.2" - decamelize "^1.2.0" + "@types/minimist" "^1.2.2" + camelcase-keys "^7.0.0" + decamelize "^5.0.0" decamelize-keys "^1.1.0" hard-rejection "^2.1.0" minimist-options "4.1.0" - normalize-package-data "^3.0.0" - read-pkg-up "^7.0.1" - redent "^3.0.0" - trim-newlines "^3.0.0" - type-fest "^0.18.0" - yargs-parser "^20.2.3" + normalize-package-data "^3.0.2" + read-pkg-up "^8.0.0" + redent "^4.0.0" + trim-newlines "^4.0.2" + type-fest "^1.2.2" + yargs-parser "^20.2.9" merge-descriptors@1.0.1: version "1.0.1" @@ -8703,7 +8714,7 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -min-indent@^1.0.0: +min-indent@^1.0.0, min-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== @@ -9057,7 +9068,7 @@ normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-package-data@^3.0.0: +normalize-package-data@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== @@ -10291,15 +10302,7 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: - version "6.0.11" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" - integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-selector-parser@^6.0.13: +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: version "6.0.13" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== @@ -10610,10 +10613,10 @@ queue-microtask@^1.2.2: resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== -quick-lru@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" - integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== +quick-lru@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== quickselect@^2.0.0: version "2.0.0" @@ -10791,6 +10794,15 @@ read-pkg-up@^7.0.1: read-pkg "^5.2.0" type-fest "^0.8.1" +read-pkg-up@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-8.0.0.tgz#72f595b65e66110f43b052dd9af4de6b10534670" + integrity sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ== + dependencies: + find-up "^5.0.0" + read-pkg "^6.0.0" + type-fest "^1.0.1" + read-pkg@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" @@ -10801,6 +10813,16 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" +read-pkg@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-6.0.0.tgz#a67a7d6a1c2b0c3cd6aa2ea521f40c458a4a504c" + integrity sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^3.0.2" + parse-json "^5.2.0" + type-fest "^1.0.1" + "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" @@ -10848,13 +10870,13 @@ realistic-structured-clone@^3.0.0: typeson "^6.1.0" typeson-registry "^1.0.0-alpha.20" -redent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" - integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== +redent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-4.0.0.tgz#0c0ba7caabb24257ab3bb7a4fd95dd1d5c5681f9" + integrity sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag== dependencies: - indent-string "^4.0.0" - strip-indent "^3.0.0" + indent-string "^5.0.0" + strip-indent "^4.0.0" redux@^4.0.0, redux@^4.0.4: version "4.2.1" @@ -11926,6 +11948,13 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" +strip-indent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853" + integrity sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA== + dependencies: + min-indent "^1.0.1" + strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" @@ -11974,22 +12003,22 @@ stylelint-scss@^5.0.0: postcss-selector-parser "^6.0.13" postcss-value-parser "^4.2.0" -stylelint@^15.3.0: - version "15.9.0" - resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.9.0.tgz#f5522fac58f806b59ebddbca360ed470dc5b419c" - integrity sha512-sXtAZi64CllWr6A+8ymDWnlIaYwuAa7XRmGnJxLQXFNnLjd3Izm4HAD+loKVaZ7cpK6SLxhAUX1lwPJKGCn0mg== +stylelint@^15.10.1: + version "15.10.1" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.10.1.tgz#93f189958687e330c106b010cbec0c41dcae506d" + integrity sha512-CYkzYrCFfA/gnOR+u9kJ1PpzwG10WLVnoxHDuBA/JiwGqdM9+yx9+ou6SE/y9YHtfv1mcLo06fdadHTOx4gBZQ== dependencies: - "@csstools/css-parser-algorithms" "^2.2.0" + "@csstools/css-parser-algorithms" "^2.3.0" "@csstools/css-tokenizer" "^2.1.1" - "@csstools/media-query-list-parser" "^2.1.0" - "@csstools/selector-specificity" "^2.2.0" + "@csstools/media-query-list-parser" "^2.1.2" + "@csstools/selector-specificity" "^3.0.0" balanced-match "^2.0.0" colord "^2.9.3" cosmiconfig "^8.2.0" css-functions-list "^3.1.0" css-tree "^2.3.1" debug "^4.3.4" - fast-glob "^3.2.12" + fast-glob "^3.3.0" fastest-levenshtein "^1.0.16" file-entry-cache "^6.0.1" global-modules "^2.0.0" @@ -12002,12 +12031,11 @@ stylelint@^15.3.0: is-plain-object "^5.0.0" known-css-properties "^0.27.0" mathml-tag-names "^2.1.3" - meow "^9.0.0" + meow "^10.1.5" micromatch "^4.0.5" normalize-path "^3.0.0" picocolors "^1.0.0" postcss "^8.4.24" - postcss-media-query-parser "^0.2.3" postcss-resolve-nested-selector "^0.1.1" postcss-safe-parser "^6.0.0" postcss-selector-parser "^6.0.13" @@ -12393,10 +12421,10 @@ tree-kill@^1.2.2: resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== -trim-newlines@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" - integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== +trim-newlines@^4.0.2: + version "4.1.1" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125" + integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ== "true-myth@^4.1.0": version "4.1.1" @@ -12505,11 +12533,6 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@^0.18.0: - version "0.18.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" - integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== - type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" @@ -12530,6 +12553,11 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== +type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" + integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== + type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -13370,7 +13398,7 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^20.2.3: +yargs-parser@^20.2.9: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== From 9ec3f79198b51914c172544dea63acc5c85320a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 09:24:21 +0100 Subject: [PATCH 22/48] Bump tough-cookie from 4.1.2 to 4.1.3 (#25743) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3e1a56e49..256e5d59c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12381,9 +12381,9 @@ totalist@^1.0.0: integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== tough-cookie@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" - integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== dependencies: psl "^1.1.33" punycode "^2.1.1" From 93c17104f19d99a217d3d4a13aaf8b03fed34dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= <23130178+ShadowRZ@users.noreply.github.com> Date: Mon, 10 Jul 2023 16:56:24 +0800 Subject: [PATCH 23/48] Allow default_server_config as a fallback config (#25682) --- docs/config.md | 5 +- src/i18n/strings/en_EN.json | 2 +- src/vector/app.tsx | 12 +++-- src/vector/mobile_guide/index.ts | 20 ++++--- test/app-tests/server-config-test.ts | 79 ++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 13 deletions(-) create mode 100644 test/app-tests/server-config-test.ts diff --git a/docs/config.md b/docs/config.md index a3f470fe6..0666f03cc 100644 --- a/docs/config.md +++ b/docs/config.md @@ -45,8 +45,9 @@ One of the following options **must** be supplied: information. These are the same values seen as `base_url` in the `default_server_config` example, with `default_is_url` being optional. -If a combination of these three methods is used then Element will fail to load. This is because it is unclear which -should be considered "first". +If both `default_server_config` and `default_server_name` are used, Element will try to look up the connection +infomation using `.well-known`, and if that fails, take `default_server_config` as the homeserver connection +infomation. ## Labs flags diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 0a0634199..b51d8cc19 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1,5 +1,5 @@ { - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.", + "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config", "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.", "Your Element is misconfigured": "Your Element is misconfigured", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.", diff --git a/src/vector/app.tsx b/src/vector/app.tsx index 7371ccf0f..05f1cd5b8 100644 --- a/src/vector/app.tsx +++ b/src/vector/app.tsx @@ -169,11 +169,11 @@ async function verifyServerConfig(): Promise { const isUrl = config["default_is_url"]; const incompatibleOptions = [wkConfig, serverName, hsUrl].filter((i) => !!i); - if (incompatibleOptions.length > 1) { + if (hsUrl && (wkConfig || serverName)) { // noinspection ExceptionCaughtLocallyJS throw new UserFriendlyError( - "Invalid configuration: can only specify one of default_server_config, default_server_name, " + - "or default_hs_url.", + "Invalid configuration: a default_hs_url can't be specified along with default_server_name " + + "or default_server_config", ); } if (incompatibleOptions.length < 1) { @@ -201,7 +201,7 @@ async function verifyServerConfig(): Promise { } let discoveryResult: ClientConfig | undefined; - if (wkConfig) { + if (!serverName && wkConfig) { logger.log("Config uses a default_server_config - validating object"); discoveryResult = await AutoDiscovery.fromDiscoveryConfig(wkConfig); } @@ -213,6 +213,10 @@ async function verifyServerConfig(): Promise { "use default_server_config instead.", ); discoveryResult = await AutoDiscovery.findClientConfig(serverName); + if (discoveryResult["m.homeserver"].base_url === null && wkConfig) { + logger.log("Finding base_url failed but a default_server_config was found - using it as a fallback"); + discoveryResult = await AutoDiscovery.fromDiscoveryConfig(wkConfig); + } } validatedConfig = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, discoveryResult, true); diff --git a/src/vector/mobile_guide/index.ts b/src/vector/mobile_guide/index.ts index 5f9344074..7c14a2586 100644 --- a/src/vector/mobile_guide/index.ts +++ b/src/vector/mobile_guide/index.ts @@ -44,10 +44,10 @@ async function initPage(): Promise { const defaultIsUrl = config?.["default_is_url"]; const incompatibleOptions = [wkConfig, serverName, defaultHsUrl].filter((i) => !!i); - if (incompatibleOptions.length > 1) { + if (defaultHsUrl && (wkConfig || serverName)) { return renderConfigError( - "Invalid configuration: can only specify one of default_server_config, default_server_name, " + - "or default_hs_url.", + "Invalid configuration: a default_hs_url can't be specified along with default_server_name " + + "or default_server_config", ); } if (incompatibleOptions.length < 1) { @@ -57,7 +57,7 @@ async function initPage(): Promise { let hsUrl: string | undefined; let isUrl: string | undefined; - if (typeof wkConfig?.["m.homeserver"]?.["base_url"] === "string") { + if (!serverName && typeof wkConfig?.["m.homeserver"]?.["base_url"] === "string") { hsUrl = wkConfig["m.homeserver"]["base_url"]; if (typeof wkConfig["m.identity_server"]?.["base_url"] === "string") { @@ -78,8 +78,16 @@ async function initPage(): Promise { } } } catch (e) { - logger.error(e); - return renderConfigError("Unable to fetch homeserver configuration"); + if (wkConfig && wkConfig["m.homeserver"]) { + hsUrl = wkConfig["m.homeserver"]["base_url"] || undefined; + + if (wkConfig["m.identity_server"]) { + isUrl = wkConfig["m.identity_server"]["base_url"] || undefined; + } + } else { + logger.error(e); + return renderConfigError("Unable to fetch homeserver configuration"); + } } } diff --git a/test/app-tests/server-config-test.ts b/test/app-tests/server-config-test.ts new file mode 100644 index 000000000..22b830445 --- /dev/null +++ b/test/app-tests/server-config-test.ts @@ -0,0 +1,79 @@ +/* +Copyright 2023 Yorusaka Miyabi + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import SdkConfig from "matrix-react-sdk/src/SdkConfig"; +import PlatformPeg from "matrix-react-sdk/src/PlatformPeg"; +import fetchMock from "fetch-mock-jest"; + +import { loadApp } from "../../src/vector/app"; +import WebPlatform from "../../src/vector/platform/WebPlatform"; + +fetchMock.config.overwriteRoutes = true; + +describe("Loading server config", function () { + beforeEach(async () => { + SdkConfig.reset(); + PlatformPeg.set(new WebPlatform()); + fetchMock.get("https://matrix-client.matrix.org/_matrix/client/versions", { + unstable_features: {}, + versions: [], + }); + fetchMock.get("https://matrix.org/.well-known/matrix/client", { + "m.homeserver": { + base_url: "https://matrix-client.matrix.org", + }, + }); + fetchMock.get("/version", "1.10.13"); + }); + + it("should use the default_server_config", async function () { + SdkConfig.put({ + default_server_config: { + "m.homeserver": { + base_url: "https://matrix-client.matrix.org", + }, + }, + }); + await loadApp({}); + expect((SdkConfig.get("validated_server_config") || {}).hsUrl).toBe("https://matrix-client.matrix.org"); + }); + + it("should use the default_server_name when resolveable", async function () { + SdkConfig.put({ + default_server_name: "matrix.org", + }); + await loadApp({}); + expect((SdkConfig.get("validated_server_config") || {}).hsUrl).toBe("https://matrix-client.matrix.org"); + }); + + it( + "should not throw when both default_server_name and default_server_config is specified " + + "and default_server_name isn't resolvable", + async function () { + fetchMock.get("https://matrix.org/.well-known/matrix/client", 500); + SdkConfig.put({ + default_server_name: "matrix.org", + default_server_config: { + "m.homeserver": { + base_url: "https://matrix-client.matrix.org", + }, + }, + }); + await loadApp({}); + expect((SdkConfig.get("validated_server_config") || {}).hsUrl).toBe("https://matrix-client.matrix.org"); + }, + ); +}); From ccb0a306c8c8e8c97b3e2042f46ee5c41c0a6c90 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 10 Jul 2023 11:06:05 +0100 Subject: [PATCH 24/48] Utility automation for updating topics as part of release process (#25725) --- .github/workflows/update-topics.yaml | 72 ++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 .github/workflows/update-topics.yaml diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml new file mode 100644 index 000000000..be0a962b3 --- /dev/null +++ b/.github/workflows/update-topics.yaml @@ -0,0 +1,72 @@ +name: Update release topics +on: + workflow_dispatch: + inputs: + expected_status: + description: What type of release is the next expected release + required: true + default: RC + type: choice + options: + - RC + - Release + expected_date: + description: Expected release date e.g. July 11th + required: true + type: string +concurrency: ${{ github.workflow }} +jobs: + bot: + name: Release topic update + runs-on: ubuntu-latest + environment: Matrix + steps: + - id: stable + uses: fangqiuming/latest-release-version@45b2da0e20968cd18c356c548d3c5ccb7318bb8f + + - uses: actions/github-script@v6 + env: + HS_URL: ${{ secrets.BETABOT_HS_URL }} + LOBBY_ROOM_ID: ${{ secrets.ROOM_ID }} + PUBLIC_ROOM_ID: "!YTvKGNlinIzlkMTVRl:matrix.org" + ANNOUNCEMENT_ROOM_ID: "!bijaLdadorKgNGtHdA:matrix.org" + TOKEN: ${{ secrets.BETABOT_ACCESS_TOKEN }} + RELEASE_TOPIC: "Stable: v${{ steps.stable.outputs.tag_name }} | Release status: ${{ inputs.expected_status }} expected ${{ inputs.expected_date }}" + with: + script: | + const { HS_URL, TOKEN, RELEASE_TOPIC, LOBBY_ROOM_ID, PUBLIC_ROOM_ID, ANNOUNCEMENT_ROOM_ID } = process.env; + + const regex = /Stable: v(\d+.\d+.\d+) \| Release status: (\w+) expected (\w+ \d+\w+)/gm; + + async function updateReleaseInTopic(roomId) { + const apiUrl = `${HS_URL}/_matrix/client/v3/rooms/${roomId}/state/m.room.topic/`; + const headers = { + "Content-Type": "application/json", + "Authorization": `Bearer ${TOKEN}`, + }; + const res = await fetch(apiUrl, { + method: "GET", + headers, + }); + + const data = await res.json(); + const topic = data.topic.replace(regex, RELEASE_TOPIC); + if (topic === data.topic) { + console.log(roomId, "nothing to do"); + } + + await fetch(apiUrl, { + method: "PUT", + body: { + ...data, + topic, + }, + headers, + }); + console.log(roomId, "topic updated"); + } + + await updateReleaseInTopic(LOBBY_ROOM_ID); + +# await updateReleaseInTopic(PUBLIC_ROOM_ID); +# await updateReleaseInTopic(ANNOUNCEMENT_ROOM_ID); From a4eb2f40bbc90e7685cbe5f8d6aa28d7b445b519 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 10 Jul 2023 11:12:17 +0100 Subject: [PATCH 25/48] Update update-topics.yaml --- .github/workflows/update-topics.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml index be0a962b3..320e92f9c 100644 --- a/.github/workflows/update-topics.yaml +++ b/.github/workflows/update-topics.yaml @@ -53,6 +53,7 @@ jobs: const topic = data.topic.replace(regex, RELEASE_TOPIC); if (topic === data.topic) { console.log(roomId, "nothing to do"); + return; } await fetch(apiUrl, { @@ -63,7 +64,7 @@ jobs: }, headers, }); - console.log(roomId, "topic updated"); + console.log(roomId, "topic updated:", topic); } await updateReleaseInTopic(LOBBY_ROOM_ID); From 98e36ffd0e927ef65fb24591f3c4c3b058996ab9 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Mon, 10 Jul 2023 04:12:53 -0600 Subject: [PATCH 26/48] Add `default_server_config` fallback to element.io configs (#19695) Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- element.io/app/config.json | 8 ++++++++ element.io/develop/config.json | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/element.io/app/config.json b/element.io/app/config.json index 0ecec414c..a549322c6 100644 --- a/element.io/app/config.json +++ b/element.io/app/config.json @@ -1,5 +1,13 @@ { "default_server_name": "matrix.org", + "default_server_config": { + "m.homeserver": { + "base_url": "https://matrix-client.matrix.org" + }, + "m.identity_server": { + "base_url": "https://vector.im" + } + }, "brand": "Element", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", diff --git a/element.io/develop/config.json b/element.io/develop/config.json index e5c3f22e7..43e7e3635 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -1,5 +1,13 @@ { "default_server_name": "matrix.org", + "default_server_config": { + "m.homeserver": { + "base_url": "https://matrix-client.matrix.org" + }, + "m.identity_server": { + "base_url": "https://vector.im" + } + }, "brand": "Element", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", From 96103269c70c30347b5f9999d48bffca6ac1b322 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 10 Jul 2023 11:14:03 +0100 Subject: [PATCH 27/48] Update update-topics.yaml --- .github/workflows/update-topics.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml index 320e92f9c..ee1febcb4 100644 --- a/.github/workflows/update-topics.yaml +++ b/.github/workflows/update-topics.yaml @@ -31,7 +31,7 @@ jobs: PUBLIC_ROOM_ID: "!YTvKGNlinIzlkMTVRl:matrix.org" ANNOUNCEMENT_ROOM_ID: "!bijaLdadorKgNGtHdA:matrix.org" TOKEN: ${{ secrets.BETABOT_ACCESS_TOKEN }} - RELEASE_TOPIC: "Stable: v${{ steps.stable.outputs.tag_name }} | Release status: ${{ inputs.expected_status }} expected ${{ inputs.expected_date }}" + RELEASE_TOPIC: "Stable: ${{ steps.stable.outputs.tag_name }} | Release status: ${{ inputs.expected_status }} expected ${{ inputs.expected_date }}" with: script: | const { HS_URL, TOKEN, RELEASE_TOPIC, LOBBY_ROOM_ID, PUBLIC_ROOM_ID, ANNOUNCEMENT_ROOM_ID } = process.env; @@ -56,7 +56,7 @@ jobs: return; } - await fetch(apiUrl, { + const res = await fetch(apiUrl, { method: "PUT", body: { ...data, @@ -64,7 +64,12 @@ jobs: }, headers, }); - console.log(roomId, "topic updated:", topic); + + if (res.ok) { + console.log(roomId, "topic updated:", topic); + } else { + console.log(roomId, await res.text()); + } } await updateReleaseInTopic(LOBBY_ROOM_ID); From 71ab30432b2c582f6fc0205966f8e985da8e2a69 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 10 Jul 2023 11:16:18 +0100 Subject: [PATCH 28/48] Update update-topics.yaml --- .github/workflows/update-topics.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml index ee1febcb4..c4ba39b1a 100644 --- a/.github/workflows/update-topics.yaml +++ b/.github/workflows/update-topics.yaml @@ -44,7 +44,7 @@ jobs: "Content-Type": "application/json", "Authorization": `Bearer ${TOKEN}`, }; - const res = await fetch(apiUrl, { + let res = await fetch(apiUrl, { method: "GET", headers, }); @@ -56,7 +56,7 @@ jobs: return; } - const res = await fetch(apiUrl, { + res = await fetch(apiUrl, { method: "PUT", body: { ...data, From cb2d5efa4e86ec794f853e2448f4093c69983f50 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 10 Jul 2023 11:18:28 +0100 Subject: [PATCH 29/48] Update update-topics.yaml --- .github/workflows/update-topics.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml index c4ba39b1a..2b5b0bedd 100644 --- a/.github/workflows/update-topics.yaml +++ b/.github/workflows/update-topics.yaml @@ -58,10 +58,10 @@ jobs: res = await fetch(apiUrl, { method: "PUT", - body: { + body: JSON.stringify({ ...data, topic, - }, + }), headers, }); From 4c9baa60eccf48629f18a6f93c6b0fc64a1fa343 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 10 Jul 2023 11:27:41 +0100 Subject: [PATCH 30/48] 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 2b5b0bedd..1f6be1f61 100644 --- a/.github/workflows/update-topics.yaml +++ b/.github/workflows/update-topics.yaml @@ -55,6 +55,11 @@ jobs: console.log(roomId, "nothing to do"); return; } + if (data["org.matrix.msc3765.topic"]) { + data["org.matrix.msc3765.topic"].forEach(d => { + data.body = data.body.replace(regex, RELEASE_TOPIC); + }); + } res = await fetch(apiUrl, { method: "PUT", From 29037c8543fa62a58547a4acf9d6f978a90cfb64 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 10 Jul 2023 11:33:00 +0100 Subject: [PATCH 31/48] Update update-topics.yaml --- .github/workflows/update-topics.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml index 1f6be1f61..4135463d7 100644 --- a/.github/workflows/update-topics.yaml +++ b/.github/workflows/update-topics.yaml @@ -57,7 +57,7 @@ jobs: } if (data["org.matrix.msc3765.topic"]) { data["org.matrix.msc3765.topic"].forEach(d => { - data.body = data.body.replace(regex, RELEASE_TOPIC); + d.body = d.body.replace(regex, RELEASE_TOPIC); }); } From 77db00cef1941d165cc8cf4f04d298221ebedf75 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 10 Jul 2023 11:36:28 +0100 Subject: [PATCH 32/48] Update update-topics.yaml --- .github/workflows/update-topics.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml index 4135463d7..0529a18fa 100644 --- a/.github/workflows/update-topics.yaml +++ b/.github/workflows/update-topics.yaml @@ -78,6 +78,5 @@ jobs: } await updateReleaseInTopic(LOBBY_ROOM_ID); - -# await updateReleaseInTopic(PUBLIC_ROOM_ID); -# await updateReleaseInTopic(ANNOUNCEMENT_ROOM_ID); + await updateReleaseInTopic(PUBLIC_ROOM_ID); + await updateReleaseInTopic(ANNOUNCEMENT_ROOM_ID); From 80075ee2cfcfd8bac46db881e59ca94c859e1259 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 10 Jul 2023 11:49:38 +0100 Subject: [PATCH 33/48] Update update-topics.yaml --- .github/workflows/update-topics.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml index 0529a18fa..7b0e35c1d 100644 --- a/.github/workflows/update-topics.yaml +++ b/.github/workflows/update-topics.yaml @@ -44,6 +44,12 @@ jobs: "Content-Type": "application/json", "Authorization": `Bearer ${TOKEN}`, }; + await fetch(`${HS_URL}/_matrix/client/v3/rooms/${roomId}/join`, { + method: "POST", + headers, + body: "{}", + }); + let res = await fetch(apiUrl, { method: "GET", headers, From 311c5fec664dbaf9836ee200a262df7193a66c3a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 10 Jul 2023 16:48:06 +0100 Subject: [PATCH 34/48] Delete redundant make-icons.sh (#25747) --- scripts/make-icons.sh | 116 ------------------------------------------ 1 file changed, 116 deletions(-) delete mode 100755 scripts/make-icons.sh diff --git a/scripts/make-icons.sh b/scripts/make-icons.sh deleted file mode 100755 index 5a3dd940e..000000000 --- a/scripts/make-icons.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/usr/bin/env bash -# -# Converts an svg logo into the various image resources required by -# the various platforms deployments. -# -# On debian-based systems you need these deps: -# apt-get install xmlstarlet python3-cairosvg icnsutils - -if [ $# != 1 ] -then - echo "Usage: $0 " - exit -fi - -set -ex - -tmpdir=`mktemp -d 2>/dev/null || mktemp -d -t 'icontmp'` - -for i in 1024 512 310 256 192 180 152 150 144 128 120 114 96 76 72 70 64 60 57 48 36 32 24 16 -do - #convert -background none -density 1000 -resize $i -extent $i -gravity center "$1" "$tmpdir/$i.png" - - # Above is the imagemagick command to render an svg to png. Unfortunately, its support for SVGs - # with CSS isn't very good (with rsvg and even moreso the built in renderer) so we use cairosvg. - # This can be installed with: - # pip install cairosvg==1.0.22 # Version 2 doesn't support python 2 - # pip install tinycss - # pip install cssselect # These are necessary for CSS support - # You'll also need xmlstarlet from your favourite package manager - # - # Cairosvg doesn't suport rendering at a specific size (https://github.com/Kozea/CairoSVG/issues/83#issuecomment-215720176) - # so we have to 'resize the svg' first (add width and height attributes to the svg element) to make it render at the - # size we need. - # XXX: This will break if the svg already has width and height attributes - cp "$1" "$tmpdir/tmp.svg" - xmlstarlet ed -N x="http://www.w3.org/2000/svg" --insert "/x:svg" --type attr -n width -v $i "$tmpdir/tmp.svg" > "$tmpdir/tmp2.svg" - xmlstarlet ed -N x="http://www.w3.org/2000/svg" --insert "/x:svg" --type attr -n height -v $i "$tmpdir/tmp2.svg" > "$tmpdir/tmp3.svg" - cairosvg -f png -o "$tmpdir/$i.png" "$tmpdir/tmp3.svg" - rm "$tmpdir/tmp.svg" "$tmpdir/tmp2.svg" "$tmpdir/tmp3.svg" -done - -# one more for the non-square mstile -cp "$1" "$tmpdir/tmp.svg" -xmlstarlet ed -N x="http://www.w3.org/2000/svg" --insert "/x:svg" --type attr -n width -v 310 "$tmpdir/tmp.svg" > "$tmpdir/tmp2.svg" -xmlstarlet ed -N x="http://www.w3.org/2000/svg" --insert "/x:svg" --type attr -n height -v 150 "$tmpdir/tmp2.svg" > "$tmpdir/tmp3.svg" -cairosvg -f png -o "$tmpdir/310x150.png" "$tmpdir/tmp3.svg" -rm "$tmpdir/tmp.svg" "$tmpdir/tmp2.svg" "$tmpdir/tmp3.svg" - -mkdir "$tmpdir/Riot.iconset" -cp "$tmpdir/16.png" "$tmpdir/Riot.iconset/icon_16x16.png" -cp "$tmpdir/32.png" "$tmpdir/Riot.iconset/icon_16x16@2x.png" -cp "$tmpdir/32.png" "$tmpdir/Riot.iconset/icon_32x32.png" -cp "$tmpdir/64.png" "$tmpdir/Riot.iconset/icon_32x32@2x.png" -cp "$tmpdir/128.png" "$tmpdir/Riot.iconset/icon_128x128.png" -cp "$tmpdir/256.png" "$tmpdir/Riot.iconset/icon_128x128@2x.png" -cp "$tmpdir/256.png" "$tmpdir/Riot.iconset/icon_256x256.png" -cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_256x256@2x.png" -cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_512x512.png" -cp "$tmpdir/1024.png" "$tmpdir/Riot.iconset/icon_512x512@2x.png" - -if [ -x "$(command -v iconutil)" ]; then - # available on macos - iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset" -elif [ -x "$(command -v png2icns)" ]; then - # available on linux - # png2icns is more finicky about its input than iconutil - # 1. it doesn't support a 64x64 (aka 32x32@2x) - # 2. it doesn't like duplicates (128x128@2x == 256x256) - rm "$tmpdir/Riot.iconset/icon_128x128@2x.png" - rm "$tmpdir/Riot.iconset/icon_256x256@2x.png" - rm "$tmpdir/Riot.iconset/icon_16x16@2x.png" - rm "$tmpdir/Riot.iconset/icon_32x32@2x.png" - png2icns electron_app/build/icon.icns "$tmpdir"/Riot.iconset/*png -else - echo "WARNING: Unsupported platform. Skipping icns build" -fi - -cp "$tmpdir/36.png" "res/vector-icons/android-chrome-36x36.png" -cp "$tmpdir/48.png" "res/vector-icons/android-chrome-48x48.png" -cp "$tmpdir/72.png" "res/vector-icons/android-chrome-72x72.png" -cp "$tmpdir/96.png" "res/vector-icons/android-chrome-96x96.png" -cp "$tmpdir/144.png" "res/vector-icons/android-chrome-144x144.png" -cp "$tmpdir/192.png" "res/vector-icons/android-chrome-192x192.png" -cp "$tmpdir/180.png" "res/vector-icons/apple-touch-icon.png" -cp "$tmpdir/180.png" "res/vector-icons/apple-touch-icon-precomposed.png" -cp "$tmpdir/57.png" "res/vector-icons/apple-touch-icon-57x57.png" -cp "$tmpdir/60.png" "res/vector-icons/apple-touch-icon-60x60.png" -cp "$tmpdir/72.png" "res/vector-icons/apple-touch-icon-72x72.png" -cp "$tmpdir/76.png" "res/vector-icons/apple-touch-icon-76x76.png" -cp "$tmpdir/114.png" "res/vector-icons/apple-touch-icon-114x114.png" -cp "$tmpdir/120.png" "res/vector-icons/apple-touch-icon-120x120.png" -cp "$tmpdir/144.png" "res/vector-icons/apple-touch-icon-144x144.png" -cp "$tmpdir/152.png" "res/vector-icons/apple-touch-icon-152x152.png" -cp "$tmpdir/180.png" "res/vector-icons/apple-touch-icon-180x180.png" -cp "$tmpdir/16.png" "res/vector-icons/favicon-16x16.png" -cp "$tmpdir/32.png" "res/vector-icons/favicon-32x32.png" -cp "$tmpdir/96.png" "res/vector-icons/favicon-96x96.png" -cp "$tmpdir/70.png" "res/vector-icons/mstile-70x70.png" -cp "$tmpdir/144.png" "res/vector-icons/mstile-144x144.png" -cp "$tmpdir/150.png" "res/vector-icons/mstile-150x150.png" -cp "$tmpdir/310.png" "res/vector-icons/mstile-310x310.png" -cp "$tmpdir/310x150.png" "res/vector-icons/mstile-310x150.png" -cp "$tmpdir/180.png" "electron_app/img/riot.png" - -convert "$tmpdir/16.png" "$tmpdir/32.png" "$tmpdir/64.png" "$tmpdir/128.png" "$tmpdir/256.png" "res/vector-icons/favicon.ico" - -cp "res/vector-icons/favicon.ico" "electron_app/build/icon.ico" -cp "res/vector-icons/favicon.ico" "electron_app/img/riot.ico" - -# https://github.com/electron-userland/electron-builder/blob/3f97b86993d4ea5172e562b182230a194de0f621/src/targets/LinuxTargetHelper.ts#L127 -for i in 24 96 16 48 64 128 256 512 -do - cp "$tmpdir/$i.png" "electron_app/build/icons/${i}x${i}.png" -done - -rm -r "$tmpdir" From ef30662c0466debe43b8671163dfd0cce2f8f0b9 Mon Sep 17 00:00:00 2001 From: Kerry Date: Tue, 11 Jul 2023 14:19:15 +1200 Subject: [PATCH 35/48] store fragmentafterlogin in sesison storage for oidc login (#25688) --- src/vector/app.tsx | 6 ++- src/vector/routing.ts | 33 ++++++++++++++ test/unit-tests/vector/routing-test.ts | 60 +++++++++++++++++++++++++- 3 files changed, 96 insertions(+), 3 deletions(-) diff --git a/src/vector/app.tsx b/src/vector/app.tsx index 05f1cd5b8..8fe4a7eb1 100644 --- a/src/vector/app.tsx +++ b/src/vector/app.tsx @@ -38,7 +38,7 @@ import { QueryDict, encodeParams } from "matrix-js-sdk/src/utils"; import { parseQs } from "./url_utils"; import VectorBasePlatform from "./platform/VectorBasePlatform"; -import { getScreenFromLocation, init as initRouting, onNewScreen } from "./routing"; +import { getInitialScreenAfterLogin, getScreenFromLocation, init as initRouting, onNewScreen } from "./routing"; // add React and ReactPerf to the global namespace, to make them easier to access via the console // this incidentally means we can forget our React imports in JSX files without penalty. @@ -133,6 +133,8 @@ export async function loadApp(fragParams: {}): Promise { const defaultDeviceName = snakedConfig.get("default_device_display_name") ?? platform?.getDefaultDeviceDisplayName(); + const initialScreenAfterLogin = getInitialScreenAfterLogin(window.location); + return ( { startingFragmentQueryParams={fragParams} enableGuest={!config.disable_guests} onTokenLoginCompleted={onTokenLoginCompleted} - initialScreenAfterLogin={getScreenFromLocation(window.location)} + initialScreenAfterLogin={initialScreenAfterLogin} defaultDeviceDisplayName={defaultDeviceName} /> ); diff --git a/src/vector/routing.ts b/src/vector/routing.ts index 04d455f51..2420ee2fe 100644 --- a/src/vector/routing.ts +++ b/src/vector/routing.ts @@ -76,3 +76,36 @@ export function onNewScreen(screen: string, replaceLast = false): void { export function init(): void { window.addEventListener("hashchange", onHashChange); } + +const ScreenAfterLoginStorageKey = "mx_screen_after_login"; +function getStoredInitialScreenAfterLogin(): ReturnType | undefined { + const screenAfterLogin = sessionStorage.getItem(ScreenAfterLoginStorageKey); + + return screenAfterLogin ? JSON.parse(screenAfterLogin) : undefined; +} + +function setInitialScreenAfterLogin(screenAfterLogin?: ReturnType): void { + if (screenAfterLogin?.screen) { + sessionStorage.setItem(ScreenAfterLoginStorageKey, JSON.stringify(screenAfterLogin)); + } +} + +/** + * Get the initial screen to be displayed after login, + * for example when trying to view a room via a link before logging in + * + * If the current URL has a screen set that in session storage + * Then retrieve the screen from session storage and return it + * Using session storage allows us to remember login fragments from when returning from OIDC login + * @returns screen and params or undefined + */ +export function getInitialScreenAfterLogin(location: Location): ReturnType | undefined { + const screenAfterLogin = getScreenFromLocation(location); + + if (screenAfterLogin.screen || screenAfterLogin.params) { + setInitialScreenAfterLogin(screenAfterLogin); + } + + const storedScreenAfterLogin = getStoredInitialScreenAfterLogin(); + return storedScreenAfterLogin; +} diff --git a/test/unit-tests/vector/routing-test.ts b/test/unit-tests/vector/routing-test.ts index 3b8df5302..bb7adccac 100644 --- a/test/unit-tests/vector/routing-test.ts +++ b/test/unit-tests/vector/routing-test.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { onNewScreen } from "../../../src/vector/routing"; +import { getInitialScreenAfterLogin, onNewScreen } from "../../../src/vector/routing"; describe("onNewScreen", () => { it("should replace history if stripping via fields", () => { @@ -45,3 +45,61 @@ describe("onNewScreen", () => { expect(window.location.replace).not.toHaveBeenCalled(); }); }); + +describe("getInitialScreenAfterLogin", () => { + beforeEach(() => { + jest.spyOn(sessionStorage.__proto__, "getItem").mockClear().mockReturnValue(null); + jest.spyOn(sessionStorage.__proto__, "setItem").mockClear(); + }); + + const makeMockLocation = (hash = "") => { + const url = new URL("https://test.org"); + url.hash = hash; + return url as unknown as Location; + }; + + describe("when current url has no hash", () => { + it("does not set an initial screen in session storage", () => { + getInitialScreenAfterLogin(makeMockLocation()); + expect(sessionStorage.setItem).not.toHaveBeenCalled(); + }); + + it("returns undefined when there is no initial screen in session storage", () => { + expect(getInitialScreenAfterLogin(makeMockLocation())).toBeUndefined(); + }); + + it("returns initial screen from session storage", () => { + const screen = { + screen: "/room/!test", + }; + jest.spyOn(sessionStorage.__proto__, "getItem").mockReturnValue(JSON.stringify(screen)); + expect(getInitialScreenAfterLogin(makeMockLocation())).toEqual(screen); + }); + }); + + describe("when current url has a hash", () => { + it("sets an initial screen in session storage", () => { + const hash = "/room/!test"; + getInitialScreenAfterLogin(makeMockLocation(hash)); + expect(sessionStorage.setItem).toHaveBeenCalledWith( + "mx_screen_after_login", + JSON.stringify({ + screen: "room/!test", + params: {}, + }), + ); + }); + + it("sets an initial screen in session storage with params", () => { + const hash = "/room/!test?param=test"; + getInitialScreenAfterLogin(makeMockLocation(hash)); + expect(sessionStorage.setItem).toHaveBeenCalledWith( + "mx_screen_after_login", + JSON.stringify({ + screen: "room/!test", + params: { param: "test" }, + }), + ); + }); + }); +}); From a952f258bec5638559e55dfff3e4a29c714c590e Mon Sep 17 00:00:00 2001 From: Element Translate Bot Date: Tue, 11 Jul 2023 12:52:31 +0200 Subject: [PATCH 36/48] Translations update from Weblate (#25750) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Translated using Weblate (Vietnamese) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/vi/ * Added translation using Weblate (Swahili) * Translated using Weblate (Swahili) Currently translated at 3.3% (1 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sw/ * Translated using Weblate (Swahili) Currently translated at 3.3% (1 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sw/ * Translated using Weblate (Swahili) Currently translated at 3.3% (1 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sw/ * Translated using Weblate (Latvian) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/lv/ * Translated using Weblate (Latvian) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/lv/ * Translated using Weblate (Swahili) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sw/ * Translated using Weblate (Slovak) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/sk/ * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/ * Translated using Weblate (German) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/de/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/uk/ * Translated using Weblate (Estonian) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/et/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/zh_Hant/ * Translated using Weblate (French) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/fr/ --------- Co-authored-by: Someone Co-authored-by: walito-arch Co-authored-by: Weblate Co-authored-by: Edgars Andersons Co-authored-by: Jozef Gaal Co-authored-by: Vri Co-authored-by: Ihor Hordiichuk Co-authored-by: Priit Jõerüüt Co-authored-by: Jeff Huang Co-authored-by: Glandos --- src/i18n/strings/ar.json | 1 - src/i18n/strings/az.json | 1 - src/i18n/strings/bg.json | 1 - src/i18n/strings/bn_BD.json | 4 +--- src/i18n/strings/bn_IN.json | 3 +-- src/i18n/strings/bs.json | 1 - src/i18n/strings/ca.json | 1 - src/i18n/strings/cs.json | 1 - src/i18n/strings/cy.json | 1 - src/i18n/strings/da.json | 1 - src/i18n/strings/de_DE.json | 4 ++-- src/i18n/strings/el.json | 1 - src/i18n/strings/en_US.json | 1 - src/i18n/strings/eo.json | 1 - src/i18n/strings/es.json | 1 - src/i18n/strings/et.json | 4 ++-- src/i18n/strings/eu.json | 1 - src/i18n/strings/fa.json | 1 - src/i18n/strings/fi.json | 1 - src/i18n/strings/fr.json | 4 ++-- src/i18n/strings/fy.json | 3 +-- src/i18n/strings/ga.json | 1 - src/i18n/strings/gl.json | 1 - src/i18n/strings/he.json | 1 - src/i18n/strings/hi.json | 1 - src/i18n/strings/hu.json | 1 - src/i18n/strings/id.json | 1 - src/i18n/strings/is.json | 1 - src/i18n/strings/it.json | 1 - src/i18n/strings/ja.json | 1 - src/i18n/strings/jbo.json | 1 - src/i18n/strings/ka.json | 3 +-- src/i18n/strings/kab.json | 1 - src/i18n/strings/ko.json | 1 - src/i18n/strings/lo.json | 3 +-- src/i18n/strings/lt.json | 1 - src/i18n/strings/lv.json | 39 ++++++++++++++++++----------------- src/i18n/strings/ml.json | 1 - src/i18n/strings/mn.json | 1 - src/i18n/strings/nb_NO.json | 1 - src/i18n/strings/ne.json | 3 +-- src/i18n/strings/nl.json | 1 - src/i18n/strings/nn.json | 1 - src/i18n/strings/oc.json | 1 - src/i18n/strings/pl.json | 1 - src/i18n/strings/pt.json | 1 - src/i18n/strings/pt_BR.json | 1 - src/i18n/strings/ro.json | 1 - src/i18n/strings/ru.json | 1 - src/i18n/strings/si.json | 1 - src/i18n/strings/sk.json | 7 +++---- src/i18n/strings/sl.json | 1 - src/i18n/strings/sq.json | 1 - src/i18n/strings/sr.json | 1 - src/i18n/strings/sr_Latn.json | 1 - src/i18n/strings/sv.json | 1 - src/i18n/strings/sw.json | 31 ++++++++++++++++++++++++++++ src/i18n/strings/ta.json | 1 - src/i18n/strings/th.json | 3 +-- src/i18n/strings/tr.json | 1 - src/i18n/strings/uk.json | 4 ++-- src/i18n/strings/vi.json | 3 +-- src/i18n/strings/vls.json | 1 - src/i18n/strings/zh_Hans.json | 1 - src/i18n/strings/zh_Hant.json | 4 ++-- 65 files changed, 72 insertions(+), 99 deletions(-) create mode 100644 src/i18n/strings/sw.json diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json index 55c6f122b..320a83e47 100644 --- a/src/i18n/strings/ar.json +++ b/src/i18n/strings/ar.json @@ -5,7 +5,6 @@ "Create Account": "أنشِئ حسابًا", "Explore rooms": "استكشِف الغرف", "Sign In": "لِج", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "الضبط غير صالح: يمكنك تحديد واحدًا من الآتي فقط: default_server_config أو default_server_name أو default_hs_url.", "Invalid configuration: no default server specified.": "الضبط غير صالح: لم تحدّد خادومًا مبدئيًا.", "Your Element is misconfigured": "لم يُضبط تطبيق Element كما ينبغي", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "يحتوي ضبط تطبيق Element على تنسيق JSON غير صالح. من فضلك صحّح المشكلة وأعِد تحميل الصفحة.", diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json index 7a1016ecd..3dd38c2e9 100644 --- a/src/i18n/strings/az.json +++ b/src/i18n/strings/az.json @@ -5,7 +5,6 @@ "Create Account": "Hesab Aç", "Explore rooms": "Otaqları kəşf edin", "Unexpected error preparing the app. See console for details.": "Tətbiqin başladılmasında gözlənilməz xəta.Təfərrüatlar üçün konsola baxın.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Yanlış konfiqurasiya: bunlardan yalnız birini təyin edin - default_server_config, default_server_name, və ya default_hs_url.", "Invalid configuration: no default server specified.": "Yanlış konfiqurasiya: standart server göstərilməyib.", "The message from the parser is: %(message)s": "Sözügedən mesaj: %(message)s", "Dismiss": "Nəzərə almayın", diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index 16fbcf347..04d43af39 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -6,7 +6,6 @@ "Create Account": "Създай профил", "Explore rooms": "Открий стаи", "Unexpected error preparing the app. See console for details.": "Неочаквана грешка при подготвянето на приложението. Вижте конзолата за подробности.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невалидна конфигурация: може да е указано само едно от: default_server_config, default_server_name, или default_hs_url.", "Invalid configuration: no default server specified.": "Невалидна конфигурация: не е указан сървър по подразбиране.", "The message from the parser is: %(message)s": "Грешката от парсъра е: %(message)s", "Invalid JSON": "Невалиден JSON", diff --git a/src/i18n/strings/bn_BD.json b/src/i18n/strings/bn_BD.json index 83d47866a..0967ef424 100644 --- a/src/i18n/strings/bn_BD.json +++ b/src/i18n/strings/bn_BD.json @@ -1,3 +1 @@ -{ - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "ভুল পছন্দসমূহ: এগয়লোর যেকোনো একটি কেবল নির্দিষ্ট করা যাবে default_server_config, default_server_name বা default_hs_url।" -} +{} diff --git a/src/i18n/strings/bn_IN.json b/src/i18n/strings/bn_IN.json index 19a9d2052..125790260 100644 --- a/src/i18n/strings/bn_IN.json +++ b/src/i18n/strings/bn_IN.json @@ -1,5 +1,4 @@ { "Your Element is misconfigured": "আপনার এলিমেন্ট টি ভুল ভাবে কনফিগার করা হয়েছে", - "Invalid configuration: no default server specified.": "ভুল কনফিগারেশনঃ কোনো মূল সার্ভার উল্লেখ করা হয়নি।", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "ভুল কনফিগারেশনঃ এদের মধ্যে কেবলমাত্র একটাই উল্লেখ করা যেতে পারেঃ default_server_config, default_server_name অথবা default_hs_url." + "Invalid configuration: no default server specified.": "ভুল কনফিগারেশনঃ কোনো মূল সার্ভার উল্লেখ করা হয়নি।" } diff --git a/src/i18n/strings/bs.json b/src/i18n/strings/bs.json index e2385a702..249a725b3 100644 --- a/src/i18n/strings/bs.json +++ b/src/i18n/strings/bs.json @@ -1,5 +1,4 @@ { - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neispravna konfiguracija: navesti se samo može jedan od default_server_config, default_server_name ili default_hs_url.", "Invalid configuration: no default server specified.": "Neispravna konfiguracija: nije naveden zadani server.", "Your Element is misconfigured": "Vaš element je pogrešno konfiguriran", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracija vašeg elementa sadrži nevažeći JSON. Ispravite problem i ponovo učitajte stranicu.", diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json index 7f89cb117..4aad2b0a8 100644 --- a/src/i18n/strings/ca.json +++ b/src/i18n/strings/ca.json @@ -8,7 +8,6 @@ "Invalid configuration: no default server specified.": "Configuració invàlida: no s'ha especificat cap servidor predeterminat.", "Invalid JSON": "JSON invàlid", "Go to your browser to complete Sign In": "Vés al navegador per completar l'inici de sessió", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuració invàlida: només pots especificar una únic default_server_config, default_server_name, o default_hs_url.", "Your Element is misconfigured": "Element està mal configurat", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configuració d'Element conté un JSON invàlid. Soluciona el problema i actualitza la pàgina.", "The message from the parser is: %(message)s": "El missatge de l'analitzador és: %(message)s", diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index 19c6477e4..e24b1daff 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -8,7 +8,6 @@ "The message from the parser is: %(message)s": "Zpráva z parseru je: %(message)s", "Invalid JSON": "Neplatný JSON", "Unexpected error preparing the app. See console for details.": "Neočekávaná chyba při přípravě aplikace. Podrobnosti najdete v konzoli.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neplatná konfigurace: je možné specifikovat pouze jednu volbu z default_server_config, default_server_name, nebo default_hs_url.", "Invalid configuration: no default server specified.": "Neplatná konfigurace: není zadán výchozí server.", "Go to your browser to complete Sign In": "Přejděte do prohlížeče a dokončete přihlášení", "Your Element is misconfigured": "Váš Element je nesprávně nastaven", diff --git a/src/i18n/strings/cy.json b/src/i18n/strings/cy.json index ab608c102..99a4a89ac 100644 --- a/src/i18n/strings/cy.json +++ b/src/i18n/strings/cy.json @@ -2,7 +2,6 @@ "The message from the parser is: %(message)s": "Y neges gan y dosrannudd yn: %(message)s", "Invalid JSON": "JSON annilys", "Unexpected error preparing the app. See console for details.": "Gwall annisgwyl wrth baratoi'r app. Gweler y consol am fanylion.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Gosodiad annilys: dim ond un o default_server_config, default_server_name, neu default_hs_url y gall ei nodi.", "Invalid configuration: no default server specified.": "Gosodiad annilys: ni nodwyd gweinydd diofyn.", "Unknown device": "Dyfais anhysbys", "Dismiss": "Wfftio", diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json index 698a66272..599f76bb4 100644 --- a/src/i18n/strings/da.json +++ b/src/i18n/strings/da.json @@ -5,7 +5,6 @@ "The message from the parser is: %(message)s": "Beskeden fra parseren er: %(message)s", "Invalid JSON": "Ugyldig JSON", "Unexpected error preparing the app. See console for details.": "Uventet fejl ved forberedelse af appen. Se konsollen for detaljer.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig konfiguration: kan kun angive en af default_server_config, default_server_name eller default_hs_url.", "Invalid configuration: no default server specified.": "Ugyldig konfiguration: Ingen standardserver er angivet.", "Sign In": "Log ind", "Create Account": "Opret brugerkonto", diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index cc4708ded..02f2750de 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -6,7 +6,6 @@ "Create Account": "Konto erstellen", "Explore rooms": "Räume erkunden", "Unexpected error preparing the app. See console for details.": "Unerwarteter Fehler bei der Vorbereitung der App; mehr Details in der Konsole.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ungültige Konfiguration: Es kann nur eine der Optionen default_server_config, default_server_name oder default_hs_url angegeben werden.", "Invalid configuration: no default server specified.": "Ungültige Konfiguration: Es wurde kein Standardserver angegeben.", "The message from the parser is: %(message)s": "Die Nachricht des Parsers ist: %(message)s", "Invalid JSON": "Ungültiges JSON", @@ -28,5 +27,6 @@ "Use %(brand)s on mobile": "Verwende %(brand)s am Handy", "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Dezentralisierter, verschlüsselter Chat & Zusammenarbeit unterstützt von $matrixLogo", "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s auf %(osName)s", - "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s" + "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s", + "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Ungültige Konfiguration: default_hs_url kann nicht zeitgleich mit default_server_name oder default_server_config festgelegt werden" } diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index 77fa06edf..12a437495 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -7,7 +7,6 @@ "The message from the parser is: %(message)s": "Το μήνυμα από τον αναλυτή είναι: %(message)s", "Invalid JSON": "Μη έγκυρο JSON", "Unexpected error preparing the app. See console for details.": "Απρόοπτο σφάλμα κατά την προετοιμασία της εφαρμογής. Δείτε το τερματικό για λεπτομέρειες.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Μη έγκυρη ρύθμιση: δυνατότητα ορισμού μόνο ένα από τα default_server_config, default_server_name, ή default_hs_url.", "Invalid configuration: no default server specified.": "Μη έγκυρη ρύθμιση παραμέτρων: δεν έχει οριστεί προκαθορισμένος διακομιστής.", "Explore rooms": "Εξερευνήστε δωμάτια", "Open": "Άνοιγμα", diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index 0bb2d786f..bb95b43f8 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -8,7 +8,6 @@ "The message from the parser is: %(message)s": "The message from the parser is: %(message)s", "Invalid JSON": "Invalid JSON", "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.", "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.", "Failed to start": "Failed to start", "Go to element.io": "Go to element.io", diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json index 43c3734ec..d46861fdc 100644 --- a/src/i18n/strings/eo.json +++ b/src/i18n/strings/eo.json @@ -6,7 +6,6 @@ "Create Account": "Krei konton", "Explore rooms": "Esplori ĉambrojn", "Unexpected error preparing the app. See console for details.": "Neatendita eraro okazis dum la preparado de la aplikaĵo. Rigardu la konzolon por detaloj.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Nevalida agordo: vi povas specifi nur unu elekteblon el « default_server_config », « default_server_name », aŭ « default_hs_url ».", "Invalid configuration: no default server specified.": "Nevalida agordo: neniu implicita servilo estas specifita.", "The message from the parser is: %(message)s": "La mesaĝo el la analizilo estas: %(message)s", "Invalid JSON": "Nevalida JSON", diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index e54ccd35f..fc4fefe7d 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -6,7 +6,6 @@ "Create Account": "Crear cuenta", "Explore rooms": "Explorar salas", "Unexpected error preparing the app. See console for details.": "Error inesperado preparando la aplicación. Ver la consola para más detalles.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración errónea: sólo puede especificar uno de default_server_config, default_server_name, o default_hs_url.", "Invalid configuration: no default server specified.": "Configuración errónea: no se ha especificado servidor.", "The message from the parser is: %(message)s": "El mensaje del parser es: %(message)s", "Invalid JSON": "JSON inválido", diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json index 0ea8e9e2c..d0a6c21e9 100644 --- a/src/i18n/strings/et.json +++ b/src/i18n/strings/et.json @@ -8,7 +8,6 @@ "Go to your browser to complete Sign In": "Sisselogimiseks ava oma brauser", "Dismiss": "Loobu", "Explore rooms": "Tutvu jututubadega", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Vigane seadistus. Sa võid määrata vaid ühe alljärgnevatest: default_server_config, default_server_name või default_hs_url.", "Welcome to Element": "Tere tulemast kasutama suhtlusrakendust Element", "Sign In": "Logi sisse", "Create Account": "Loo konto", @@ -28,5 +27,6 @@ "Use %(brand)s on mobile": "Kasuta rakendust %(brand)s nutiseadmes", "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Hajutatud ja krüpteeritud suhtlus- ning ühistöörakendus, mille aluseks on $matrixLogo", "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s operatsioonisüsteemis %(osName)s", - "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s" + "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s", + "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Vigane seadistus: default_hs_url ei saa olla määratud koos default_server_name või default_server_config tunnustega" } diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 0fb124e8f..cade2a181 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -7,7 +7,6 @@ "Explore rooms": "Arakatu gelak", "Unexpected error preparing the app. See console for details.": "Ustekabeko errorea aplikazioa prestatzean. Ikusi xehetasunak kontsolan.", "Invalid configuration: no default server specified.": "Konfigurazio baliogabea: Ez da lehenetsitako zerbitzaririk zehaztu.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Konfigurazio baliogabea: default_server_config, default_server_name, edo default_hs_url bat bakarra zehaztu daiteke.", "The message from the parser is: %(message)s": "Prozesatzailearen mezua hau da: %(message)s", "Invalid JSON": "JSON baliogabea", "Go to your browser to complete Sign In": "Joan zure nabigatzailera izena ematen bukatzeko", diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json index 484958b45..e355ceb9c 100644 --- a/src/i18n/strings/fa.json +++ b/src/i18n/strings/fa.json @@ -7,7 +7,6 @@ "Sign In": "ورود", "Create Account": "ایجاد حساب کاربری", "Explore rooms": "جستجو در اتاق ها", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "پیکربندی نامعتبر: فقط میتوانید یکی از default_server_config، default_server_name یا default_hs_url را مشخص کنید.", "Invalid configuration: no default server specified.": "پیکربندی نامعتبر: سرور پیشفرض مشخص نشده است.", "Your Element is misconfigured": "Element شما پیکربندی نشده است", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "پیکربندی المنت شما شامل JSON نا معتبر است. لطفا مشکل را اصلاح کنید و صفحه را بارگذاری مجدد کنید.", diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index e47549c82..560fe18c9 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -6,7 +6,6 @@ "Create Account": "Luo tili", "Explore rooms": "Selaa huoneita", "Unexpected error preparing the app. See console for details.": "Odottamaton virhe sovellusta valmisteltaessa. Katso konsolista lisätietoja.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Virheellinen asetus. Vain yhden seuraavista voi määrittää: default_server_config, default_server_name, tai default_hs_url.", "Invalid configuration: no default server specified.": "Virheellinen asetus: oletuspalvelinta ei ole määritetty.", "The message from the parser is: %(message)s": "Viesti jäsentimeltä: %(message)s", "Invalid JSON": "Virheellinen JSON", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index c5d5d9f22..32d230e02 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -6,7 +6,6 @@ "Create Account": "Créer un compte", "Explore rooms": "Parcourir les salons", "Unexpected error preparing the app. See console for details.": "Une erreur inattendue est survenue pendant la préparation de l’application. Consultez la console pour avoir des détails.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuration invalide : il ne faut spécifier qu’un des trois champs parmi default_server_config, default_server_name et default_hs_url.", "Invalid configuration: no default server specified.": "Configuration invalide : aucun serveur par défaut indiqué.", "The message from the parser is: %(message)s": "Le message de l’analyseur est : %(message)s", "Invalid JSON": "JSON non valide", @@ -28,5 +27,6 @@ "Use %(brand)s on mobile": "Utiliser %(brand)s sur téléphone", "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Messagerie décentralisée, chiffrée & une collaboration alimentée par $matrixLogo", "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s : %(browserName)s pour %(osName)s", - "%(brand)s Desktop: %(platformName)s": "%(brand)s pour bureau : %(platformName)s" + "%(brand)s Desktop: %(platformName)s": "%(brand)s pour bureau : %(platformName)s", + "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Configuration invalide : default_hs_url ne peut pas être défini en même temps que default_server_name ou default_server_config" } diff --git a/src/i18n/strings/fy.json b/src/i18n/strings/fy.json index 66d3ad84f..0fc49a4af 100644 --- a/src/i18n/strings/fy.json +++ b/src/i18n/strings/fy.json @@ -24,6 +24,5 @@ "Open": "Iepenje", "Invalid JSON": "Unjildige JSON", "Your Element is misconfigured": "Jo Element is net goed konfigurearre", - "Invalid configuration: no default server specified.": "Unjildiche konfiguraasje: gjin standertserver selektearre.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Unjildige konfiguraasje: kin allinnich kieze út default_server_config, default_server_name, as default_hs_url." + "Invalid configuration: no default server specified.": "Unjildiche konfiguraasje: gjin standertserver selektearre." } diff --git a/src/i18n/strings/ga.json b/src/i18n/strings/ga.json index 88189d897..a15ac3321 100644 --- a/src/i18n/strings/ga.json +++ b/src/i18n/strings/ga.json @@ -21,7 +21,6 @@ "Invalid JSON": "JSON neamhbhailí", "The message from the parser is: %(message)s": "Is í an teachtaireacht as an parsálaí: %(message)s", "Invalid configuration: no default server specified.": "Cumraíocht neamhbhailí: Níl aon freastalaí réamhshocraithe a sonrú.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Cumraíocht neamhbhailí: ní féidir ach ceann de default_server_config, default_server_name, nó default_hs_url a shonrú.", "Powered by Matrix": "Cumhachtaithe ag Matrix", "Go to element.io": "Téigh go element.io", "Open": "Oscail", diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index c492b68f5..918a4d17b 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -8,7 +8,6 @@ "The message from the parser is: %(message)s": "A mensaxe desde o intérprete é: %(message)s", "Invalid JSON": "JSON non válido", "Unexpected error preparing the app. See console for details.": "Fallo non agardado ao preparar a app. Detalles na consola.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración non válida: só se pode indicar un de default_server_config, default_server_name, ou default_hs_url.", "Invalid configuration: no default server specified.": "Configuración non válida: non se indicou servidor por defecto.", "Unable to load config file: please refresh the page to try again.": "Non se cargou o ficheiro de configuración: actualiza a páxina para reintentalo.", "Go to your browser to complete Sign In": "Abre o navegador para realizar a Conexión", diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json index c624524fa..946327d78 100644 --- a/src/i18n/strings/he.json +++ b/src/i18n/strings/he.json @@ -3,7 +3,6 @@ "Unknown device": "מכשיר לא ידוע", "Welcome to Element": "ברוכים הבאים ל Element", "Invalid JSON": "JSON לא חוקי", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "תצורה שגויה: ניתן לציין רק אחד מהערכים הבאים, default_server_config, default_server_name, או default_hs_url.", "Invalid configuration: no default server specified.": "תצורה שגויה: לא צוין שרת ברירת מחדל.", "Go to your browser to complete Sign In": "עבור לדפדפן להמשך ההתחברות", "Explore rooms": "גלה חדרים", diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json index 93b16b841..687784831 100644 --- a/src/i18n/strings/hi.json +++ b/src/i18n/strings/hi.json @@ -5,7 +5,6 @@ "Sign In": "साइन करना", "Create Account": "खाता बनाएं", "Explore rooms": "रूम का अन्वेषण करें", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "अमान्य कॉन्फ़िगरेशन: केवल default_server_config, default_server_name, या default_hs_url में से कोई एक निर्दिष्ट कर सकता है।", "Failed to start": "प्रारंभ करने में विफल", "Go to element.io": "element.io पर जाएं", "I understand the risks and wish to continue": "मैं जोखिमों को समझता हूं और जारी रखना चाहता हूं", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 1fe5ba029..78b5915e6 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -6,7 +6,6 @@ "Create Account": "Fiók létrehozása", "Explore rooms": "Szobák felderítése", "Unexpected error preparing the app. See console for details.": "Váratlan hiba történt az alkalmazás előkészítésénél. A részletekért lásd a konzolt.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Érvénytelen konfiguráció: ezek közül csak egyet lehet megadni: default_server_config, default_server_name és default_hs_url.", "Invalid configuration: no default server specified.": "Érvénytelen konfiguráció: nincs megadva alapértelmezett kiszolgáló.", "The message from the parser is: %(message)s": "A feldolgozó algoritmus üzenete: %(message)s", "Invalid JSON": "Érvénytelen JSON", diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json index 496a4d0ae..be5206e4d 100644 --- a/src/i18n/strings/id.json +++ b/src/i18n/strings/id.json @@ -25,7 +25,6 @@ "Invalid JSON": "JSON tidak absah", "The message from the parser is: %(message)s": "Pesan dari pengurai adalah: %(message)s", "Your Element is misconfigured": "Anda salah mengatur Element", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Konfigurasi tidak absah: hanya bisa menentukan satu dari default_server_config, default_server_name, atau default_hs_url.", "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Obrolan & kolaborasi terdesentralisasi dan terenkripsi diberdayakan oleh $matrixLogo", "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s di %(osName)s", "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s" diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json index 50be151fc..e852bb32c 100644 --- a/src/i18n/strings/is.json +++ b/src/i18n/strings/is.json @@ -24,7 +24,6 @@ "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element-stillingar þínar innihalda ógilt JSON. Leiðréttu vandamálið og endurlestu síðuna.", "Your Element is misconfigured": "Element-tilvikið þitt er rangt stillt", "Invalid configuration: no default server specified.": "Ógild uppsetning: enginn sjálfgefinn vefþjónn tilgreindur.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ógild uppsetning: getur aðeins tilgreint eitt af default_server_config, default_server_name eða default_hs_url.", "Use %(brand)s on mobile": "Nota %(brand)s í síma", "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Dreifstýrt, dulritað spjall og samskipti keyrt með $matrixLogo", "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s á %(osName)s", diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 2cf7d68ff..45a8f9a7c 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -6,7 +6,6 @@ "Create Account": "Crea account", "Explore rooms": "Esplora stanze", "Unexpected error preparing the app. See console for details.": "Errore inaspettato preparando l'app. Vedi la console per i dettagli.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configurazione non valida: specificare solo uno di default_server_config, default_server_name, o default_hs_url.", "Invalid configuration: no default server specified.": "Configurazione non valida: nessun server predefinito specificato.", "The message from the parser is: %(message)s": "Il messaggio dal parser è: %(message)s", "Invalid JSON": "JSON non valido", diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index 8e71f803c..f9bda1a5f 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -9,7 +9,6 @@ "Explore rooms": "ルームを探す", "The message from the parser is: %(message)s": "パーサーのメッセージ：%(message)s", "Invalid JSON": "不正なJSON", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "不正な設定：default_server_config、default_server_name、またはdefault_hs_urlのいずれか一つのみを指定できます。", "Please install Chrome, Firefox, or Safari for the best experience.": "最高のユーザー体験を得るためには、ChromeかFirefox、もしくはSafariをインストールしてください。", "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "現在のブラウザーを使い続けることもできますが、いくつか（もしくは全ての）機能が動作しなかったり、外観が崩れたりする可能性があります。", "I understand the risks and wish to continue": "リスクを理解して続行", diff --git a/src/i18n/strings/jbo.json b/src/i18n/strings/jbo.json index c1733e86b..37a54f348 100644 --- a/src/i18n/strings/jbo.json +++ b/src/i18n/strings/jbo.json @@ -17,7 +17,6 @@ "Sign In": "nu co'a jaspu", "Create Account": "nu pa re'u co'a jaspu", "Explore rooms": "nu facki le du'u ve zilbe'i", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": ".i le tcimi'e vreji na drani le ka jai do'e fai gi jo nai zoi zoi. default_server_config .zoi gi zoi zoi. default_server_name .zoi gi zoi zoi. default_hs_url .zoi cmene da", "Invalid configuration: no default server specified.": ".i le tcimi'e vreji na drani le ka jai do'e zmicu'a fo le ka samtcise'u", "Your Element is misconfigured": ".i le tcimi'e be la .elyment. be'o vreji na drani", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": ".i le tcimi'e be la .elyment. be'o vreji na drani le ka veirdjeisano .i gau ko drani je ba kibycpa le kibypapri", diff --git a/src/i18n/strings/ka.json b/src/i18n/strings/ka.json index 50be1fccb..88d4d6d86 100644 --- a/src/i18n/strings/ka.json +++ b/src/i18n/strings/ka.json @@ -27,6 +27,5 @@ "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s იყენებს ბრაუზერის გაფართოებულ ფუნქციებს, რომლებიც არ არის მხარდაჭერილი თქვენი ამჟამინდელი ბრაუზერის მიერ.", "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s %(osName)s-ზე", "%(brand)s Desktop: %(platformName)s": "%(brand)s სამუშაო მაგიდა: %(platformName)s", - "The message from the parser is: %(message)s": "პარსერის შეტყობინებაა: %(message)s", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "არასწორი კონფიგურაცია: შეიძლება მიუთითოთ მხოლოდ ერთი default_server_config, default_server_name ან default_hs_url." + "The message from the parser is: %(message)s": "პარსერის შეტყობინებაა: %(message)s" } diff --git a/src/i18n/strings/kab.json b/src/i18n/strings/kab.json index 1ab3b7d7a..6d23572bc 100644 --- a/src/i18n/strings/kab.json +++ b/src/i18n/strings/kab.json @@ -6,7 +6,6 @@ "Dismiss": "Agwi", "Sign In": "Kcem", "Explore rooms": "Snirem tixxamin", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Tawila d tarmeɣtut: mudd-d kan yiwen seg default_server_config, default_server_name, neɣ default_hs_url.", "Invalid configuration: no default server specified.": "Tawila d tarmeɣtut: ulac aqeddac amezwer i d-yettwafernen.", "The message from the parser is: %(message)s": "Izen n umaslaḍ d: %(message)s", "Unable to load config file: please refresh the page to try again.": "Yegguma ad d-yali ufaylu n twila: ma ulac aɣilif smiren asebter akken ad tεerḍeḍ tikkelt-nniḍen.", diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index 79f4db1d0..f3e955d40 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -5,7 +5,6 @@ "The message from the parser is: %(message)s": "파서에서 온 메시지: %(message)s", "Invalid JSON": "유효하지 않은 JSON", "Unexpected error preparing the app. See console for details.": "앱을 준비하는 동안 예기치 않은 오류가 발생했습니다. 자세한 내용은 콘솔을 확인하세요.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "잘못된 설정: default_server_config 와 defalut_server_name, default_hs_url 중 하나만 지정할 수 있습니다.", "Invalid configuration: no default server specified.": "잘못된 설정: 기본 서버가 지정되지 않았습니다.", "Sign In": "로그인", "Create Account": "계정 만들기", diff --git a/src/i18n/strings/lo.json b/src/i18n/strings/lo.json index 0cc81e864..273f25c71 100644 --- a/src/i18n/strings/lo.json +++ b/src/i18n/strings/lo.json @@ -25,6 +25,5 @@ "The message from the parser is: %(message)s": "ຂໍ້ຄວາມຈາກຕົວປ່ຽນແມ່ນ: %(message)s", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "ການຕັ້ງຄ່າແອັບ Element ຂອງທ່ານມີຄ່າ JSON ທີ່ບໍ່ຖືກຕ້ອງ. ກະລຸນາແກ້ໄຂບັນຫາ ແລະໂຫຼດໜ້ານີ້ຄືນໃໝ່.", "Your Element is misconfigured": "ການຕັ້ງຄ່າແອັບ Element ຂອງທ່ານບໍ່ຖືກຕ້ອງ", - "Invalid configuration: no default server specified.": "ການຕັ້ງຄ່າບໍ່ຖືກຕ້ອງ: ບໍ່ໄດ້ລະບຸເຊີບເວີເລີ່ມຕົ້ນ.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "ການຕັ້ງຄ່າບໍ່ຖືກຕ້ອງ: ສາມາດລະບຸໄດ້ພຽງແຕ່ອັນດຽວຂອງ default_server_config, default_server_name, or default_hs_url." + "Invalid configuration: no default server specified.": "ການຕັ້ງຄ່າບໍ່ຖືກຕ້ອງ: ບໍ່ໄດ້ລະບຸເຊີບເວີເລີ່ມຕົ້ນ." } diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json index 79384fc54..21959db47 100644 --- a/src/i18n/strings/lt.json +++ b/src/i18n/strings/lt.json @@ -8,7 +8,6 @@ "The message from the parser is: %(message)s": "Analizatoriaus žinutė yra: %(message)s", "Invalid JSON": "Klaidingas JSON", "Unexpected error preparing the app. See console for details.": "Netikėta klaida ruošiant programą. Norėdami sužinoti daugiau detalių, žiūrėkite konsolę.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Klaidinga konfigūracija: galima nurodyti tik vieną iš default_server_config, default_server_name, arba default_hs_url.", "Invalid configuration: no default server specified.": "Klaidinga konfigūracija: nenurodytas numatytasis serveris.", "Go to your browser to complete Sign In": "Norėdami užbaigti prisijungimą, eikite į naršyklę", "Unable to load config file: please refresh the page to try again.": "Nepavyko įkelti konfigūracijos failo: atnaujinkite puslapį, kad pabandytumėte dar kartą.", diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index 9d0abbc6c..19ced90d9 100644 --- a/src/i18n/strings/lv.json +++ b/src/i18n/strings/lv.json @@ -1,30 +1,31 @@ { "Dismiss": "Aizvērt", "Unknown device": "Nezināma ierīce", - "Welcome to Element": "Esiet laipni gaidīti Elementā", - "Sign In": "Ierakstīties", + "Welcome to Element": "Laipni lūdzam Element!", + "Sign In": "Pieteikties", "Create Account": "Izveidot kontu", "Explore rooms": "Pārlūkot istabas", - "Unexpected error preparing the app. See console for details.": "Negaidīta kļūda, sagatavojot lietotni. Sīkāku informāciju skatiet konsolē.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Kļūdaina konfigurācija: var norādīt tikai vienu no parametriem default_server_config, default_server_name, vai default_hs_url.", - "Invalid configuration: no default server specified.": "Kļūdaina konfigurācija: nav norādīts noklusējuma serveris.", - "The message from the parser is: %(message)s": "No pārsētāja ir ziņa: %(message)s", - "Invalid JSON": "Kļūdains JSON", - "Unable to load config file: please refresh the page to try again.": "Neizdevās ielādēt konfigurācijas failu. Lai atkārtotu mēģinātu, lūdzu pārlādējiet lapu.", - "Go to your browser to complete Sign In": "Dodieties uz pārlūku, lai pabeigtu pierakstīšanos", + "Unexpected error preparing the app. See console for details.": "Lietotnes sagatavošanā gadījās negaidīta kļūda. Izvērsums ir atrodams konsolē.", + "Invalid configuration: no default server specified.": "Nederīga konfigurācija: nav norādīts noklusējuma serveris.", + "The message from the parser is: %(message)s": "Ziņa no pārsētāja ir: %(message)s", + "Invalid JSON": "Nederīgs JSON", + "Unable to load config file: please refresh the page to try again.": "Neizdevās ielādēt konfigurācijas datni. Lūgums pārlādēt lapu, lai mēģinātu vēlreiz.", + "Go to your browser to complete Sign In": "Jādodas uz pārlūku, lai pabeigtu pieteikšanos", "Unsupported browser": "Neatbalstīts pārlūks", - "Please install Chrome, Firefox, or Safari for the best experience.": "Lai gūtu labāko lietošanas pieredzi, lūdzu, instalējiet Chromium, Firefox vai Safari pārlūku.", - "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Jūs varat turpināt lietot savu pašreizējo pārlūku, bet dažas funkcijas nestrādās un lietotnes izskats/saskarne var būt atspoguļoti nekorekti.", + "Please install Chrome, Firefox, or Safari for the best experience.": "Lūgums uzstādīt Chromium, Firefox vai Safari, lai gūtu labāko lietošanas pieredzi.", + "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Var turpināt izmantot savu pašreizējo pārlūku, bet dažas iespējas nedarbosies, un lietotnes izskats un saskarne var būt nepilnīga.", "I understand the risks and wish to continue": "Es apzinos riskus un vēlos turpināt", "Go to element.io": "Doties uz element.io", "Failed to start": "Neizdevās palaist", - "Powered by Matrix": "Griežas uz Matrix tehnoloģijas", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s izmanto pārlūku papildfunkcijas, kuras netiek atbalstītas šajā pārlūkā.", - "Your browser can't run %(brand)s": "Jūsu pārlūks nevar palaist %(brand)s", + "Powered by Matrix": "Darbina Matrix", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s izmanto pārlūku iespējas, kuras nav pieejamas šajā pārlūkā.", + "Your browser can't run %(brand)s": "Šajā pārlūkā nevar palaist %(brand)s", "Open": "Atvērt", - "Download Completed": "Lejuplāde pabeigta", - "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jūsu Element konfigurācija satur kļūdainu JSON. Lūdzu, izlabojiet un pārlādējiet lapu.", - "Your Element is misconfigured": "Jūsu Element ir nokonfigurēts kļūdaini", - "Use %(brand)s on mobile": "Mobilajā tālrunī izmanojiet %(brand)s", - "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Decentralizēta, šifrēta saziņa & sadarbība, ko nodrošina $matrixLogo" + "Download Completed": "Lejuplāde ir pabeigta", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element konfigurācija satur nederīgu JSON. Lūgums novērst kļūmi un pārlādēt lapu.", + "Your Element is misconfigured": "Element ir kļūdaini iestatīts", + "Use %(brand)s on mobile": "Viedtālrunī jāizmanto %(brand)s", + "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Decentralizēta, šifrēta saziņa un sadarbība, ko nodrošina $matrixLogo", + "%(brand)s Desktop: %(platformName)s": "%(brand)s darbvirsma: %(platformName)s", + "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s %(osName)s" } diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json index 1b3c58458..ffac7cd80 100644 --- a/src/i18n/strings/ml.json +++ b/src/i18n/strings/ml.json @@ -4,7 +4,6 @@ "Please install Chrome, Firefox, or Safari for the best experience.": "ദയവായി Chrome, Firefox, അല്ലെങ്കിൽ Safari ഇൻസ്റ്റാൾ ചെയ്യുക.", "Your Element is misconfigured": "നിങ്ങളുടെ Element തെറ്റായിട്ടാണ് കോൺഫിഗർ ചെയ്തിരിക്കുന്നത്", "Invalid configuration: no default server specified.": "അസാധുവായ കോൺഫിഗറേഷൻ: സ്ഥിര സെർവർ ഒന്നും വ്യക്തമാക്കിയില്ല.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "അസാധുവായ കോൺഫിഗറേഷൻ: default_server_config, default_server_name, or default_hs_url-ൽ ഒരെണ്ണം മാത്രമേ വ്യക്തമാക്കാൻ കഴിയൂ.", "Download Completed": "ഡൗൺലോഡ് പൂർത്തിയായി", "Unsupported browser": "പിന്തുണയ്‌ക്കാത്ത ബ്രൗസർ", "I understand the risks and wish to continue": "ഞാൻ അപകടസാധ്യതകൾ മനസിലാക്കുകയും തുടരാൻ ആഗ്രഹിക്കുകയും ചെയ്യുന്നു", diff --git a/src/i18n/strings/mn.json b/src/i18n/strings/mn.json index d314f356d..9a17d6105 100644 --- a/src/i18n/strings/mn.json +++ b/src/i18n/strings/mn.json @@ -2,7 +2,6 @@ "The message from the parser is: %(message)s": "Парсераас ирсэн мессеж нь: %(message)s", "Invalid JSON": "Буруу ЖСОН", "Unexpected error preparing the app. See console for details.": "Апп бэлдэх үед гарах ёсгүй алдаа. Дэлгэрэнгүйг консолоос харна уу.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Буруу тохиргоо: default_server_config, default_server_name, эсвэл default_hs_url утгын зөвхөн аль нэгийг л зааж болно.", "Invalid configuration: no default server specified.": "Буруу тохиргоо: Өгөгдсөл серверийг зааж өгөөгүй байна.", "Unknown device": "Үл мэдэгдэх төхөөрөмж", "Dismiss": "Орхих", diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json index 176922f05..abc228449 100644 --- a/src/i18n/strings/nb_NO.json +++ b/src/i18n/strings/nb_NO.json @@ -9,7 +9,6 @@ "Invalid JSON": "Ugyldig JSON", "Invalid configuration: no default server specified.": "Ugyldig konfigurasjon: ingen standardserver spesifisert.", "Unexpected error preparing the app. See console for details.": "Uventet feil ved klargjøring av appen. Se konsollen for detaljer.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig konfigurasjon: Spesifiser kun en av følgende: default_server_config, default_server_name eller default_hs_url.", "Go to your browser to complete Sign In": "Gå til nettleseren din for å fullføre innloggingen", "Failed to start": "Kunne ikke starte", "Go to element.io": "Gå til element.io", diff --git a/src/i18n/strings/ne.json b/src/i18n/strings/ne.json index b19a309e6..1365f4623 100644 --- a/src/i18n/strings/ne.json +++ b/src/i18n/strings/ne.json @@ -25,6 +25,5 @@ "The message from the parser is: %(message)s": "पार्सर का संदेश है: %(message)s", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "आपके एलीमेंट कॉन्फ़िगरेशन में अमान्य JSON है. कृपया समस्या को ठीक करें और पृष्ठ को पुनः लोड करें।", "Your Element is misconfigured": "आपका तत्व गलत कॉन्फ़िगर किया गया है", - "Invalid configuration: no default server specified.": "अमान्य कॉन्फ़िगरेशन: कोई डिफ़ॉल्ट सर्वर निर्दिष्ट नहीं है।", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "अमान्य कॉन्फ़िगरेशन: केवल default_server_config, default_server_name, या default_hs_url में से कोई एक निर्दिष्ट कर सकता है।" + "Invalid configuration: no default server specified.": "अमान्य कॉन्फ़िगरेशन: कोई डिफ़ॉल्ट सर्वर निर्दिष्ट नहीं है।" } diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 1705f746b..606a78928 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -6,7 +6,6 @@ "Create Account": "Registreren", "Explore rooms": "Kamers ontdekken", "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Zie de console voor details.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratiefout: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.", "Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.", "The message from the parser is: %(message)s": "De ontleder meldt: %(message)s", "Invalid JSON": "Ongeldige JSON", diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json index 71581287b..bab496139 100644 --- a/src/i18n/strings/nn.json +++ b/src/i18n/strings/nn.json @@ -8,7 +8,6 @@ "The message from the parser is: %(message)s": "Meldinga frå kodetolkaren er: %(message)s", "Invalid JSON": "Ugyldig JSON", "Unexpected error preparing the app. See console for details.": "Uventa feil under lasting av programmet. Sjå konsollen for detaljar.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig oppsett: du kan berre spesifiere ein av default_server_config, default_server_name eller default_hs_url.", "Invalid configuration: no default server specified.": "Ugyldig oppsett: Ingen standardtener er spesifisert.", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Oppsettet for din Element inneheld ugyldig JSON. Sjekk konfigurasjonsfila, deretter last om sida.", "Unable to load config file: please refresh the page to try again.": "Fekk ikkje til å lasta konfigurasjonsfila: last inn sida for å prøva om att.", diff --git a/src/i18n/strings/oc.json b/src/i18n/strings/oc.json index e0b66ba78..f4e51e42b 100644 --- a/src/i18n/strings/oc.json +++ b/src/i18n/strings/oc.json @@ -10,7 +10,6 @@ "Create Account": "Crear un compte", "Explore rooms": "Percórrer las salas", "Invalid configuration: no default server specified.": "Configuracion invalida : pas de servidor per defauta especificat.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuracion invalida : podètz unicament especifiar un champ entre default_server_config, default_server_name, o default_hs_url.", "Failed to start": "Se pòt pas lançar", "Go to element.io": "Anar vès element.io", "I understand the risks and wish to continue": "Comprène los risques e vòle contunhar", diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index 4886270ca..8191697e1 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -8,7 +8,6 @@ "The message from the parser is: %(message)s": "Wiadomość od parsera to: %(message)s", "Invalid JSON": "Błędny JSON", "Unexpected error preparing the app. See console for details.": "Niespodziewany błąd podczas przygotowywania aplikacji. Otwórz konsolę po szczegóły.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Błędna konfiguracja. Akceptowalne wartości to: default_server_config, default_server_name, default_hs_url.", "Invalid configuration: no default server specified.": "Błędna konfiguracja: nie wybrano domyślnego serwera.", "Go to your browser to complete Sign In": "Aby dokończyć proces rejestracji, przejdź do swojej przeglądarki", "Unable to load config file: please refresh the page to try again.": "Nie udało się załadować pliku konfiguracyjnego: odśwież stronę, aby spróbować ponownie.", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index 01aa23e69..a3cf646be 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -5,7 +5,6 @@ "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s", "Invalid JSON": "JSON inválido", "Unexpected error preparing the app. See console for details.": "Erro inesperado na preparação da aplicação. Veja a consola para mais detalhes.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: só pode especificar uma das default_server_config, default_server_name, ou default_hs_url.", "Invalid configuration: no default server specified.": "Configuração inválida: servidor padrão não especificado.", "Sign In": "Iniciar sessão", "Create Account": "Criar conta", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index e12239c55..81cf36c5e 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -8,7 +8,6 @@ "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s", "Invalid JSON": "JSON inválido", "Unexpected error preparing the app. See console for details.": "Erro inesperado preparando o app. Veja console para detalhes.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: só pode especificar um de default_server_config, default_server_name, ou default_hs_url.", "Invalid configuration: no default server specified.": "Configuração inválida: nenhum servidor default especificado.", "Unable to load config file: please refresh the page to try again.": "Incapaz de carregar arquivo de configuração: por favor atualize a página para tentar de novo.", "Download Completed": "Download Concluído", diff --git a/src/i18n/strings/ro.json b/src/i18n/strings/ro.json index 2c6f360c8..c41241d25 100644 --- a/src/i18n/strings/ro.json +++ b/src/i18n/strings/ro.json @@ -5,7 +5,6 @@ "Sign In": "Autentifică-te", "Create Account": "Creează-ți Cont", "Explore rooms": "Explorează camerele", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configurație invalidă: se poate specifica doar una dintre default_server_config, default_server_name, sau default_hs_url.", "Invalid JSON": "JSON invalid", "Unsupported browser": "Acest browser nu este suportat", "Please install Chrome, Firefox, or Safari for the best experience.": "Instalați vă rog Chrome, Firefox, sau Safari pentru cea mai bună experiență.", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 5b7b8c411..f633789a4 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -6,7 +6,6 @@ "Create Account": "Создать учётную запись", "Explore rooms": "Обзор комнат", "Unexpected error preparing the app. See console for details.": "Неожиданная ошибка при подготовке приложения. Подробности см. в консоли.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Неверная конфигурация: можно указывать только один из следующих параметров: default_server_config, default_server_name или default_hs_url.", "Invalid configuration: no default server specified.": "Неверная конфигурация: сервер по умолчанию не указан.", "The message from the parser is: %(message)s": "Сообщение из парсера: %(message)s", "Invalid JSON": "Неверный JSON", diff --git a/src/i18n/strings/si.json b/src/i18n/strings/si.json index cbb9c872e..35cb49ba2 100644 --- a/src/i18n/strings/si.json +++ b/src/i18n/strings/si.json @@ -16,7 +16,6 @@ "%(brand)s uses advanced browser features which aren't supported by your current browser.": "ඔබගේ වත්මන් අතිරික්සුව සහාය නොදක්වන උසස් විශේෂාංග %(brand)s භාවිත කරයි.", "The message from the parser is: %(message)s": "විග්‍රහය වෙතින් පණිවිඩය: %(message)s", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "ඔබගේ ඉලෙමන්ට් වින්‍යාසයෙහි වැරදි JSON අඩංගුය. ගැටලුව නිවැරදි කර පිටුව නැවුම් කරන්න.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "වින්‍යාසය වැරදිය: default_server_config, default_server_name, හෝ default_hs_url න් එකක් සඳහන් කළ හැකිය.", "Invalid configuration: no default server specified.": "වින්‍යාසය වලංගු නොවේ: පෙරනිමි සේවාදායකයක් දක්වා නැත.", "Your Element is misconfigured": "ඉලෙමන්ට් වැරදියට වින්‍යාසගතයි", "Unable to load config file: please refresh the page to try again.": "වින්‍යාස ගොනුව පූරණය කළ නොහැකිය: පිටුව නැවුම් කරන්න.", diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index 6bcf13747..19787f40e 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -9,7 +9,6 @@ "Invalid JSON": "Neplatný JSON", "Unexpected error preparing the app. See console for details.": "Neočakávaná chyba počas pripravovania aplikácie. Pre podrobnosti pozri konzolu.", "Invalid configuration: no default server specified.": "Neplatné nastavenie: nebol určený východiskový server.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neplatná konfigurácia: je možné špecifikovať len jednu možnosť z default_server_config, default_server_name, alebo default_hs_url.", "Unable to load config file: please refresh the page to try again.": "Nemožno načítať konfiguračný súbor: prosím obnovte stránku a skúste to znova.", "Go to your browser to complete Sign In": "Prejdite do prehliadača a dokončite prihlásenie", "Unsupported browser": "Nepodporovaný prehliadač", @@ -17,15 +16,15 @@ "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Môžete naďalej používať váš súčasný prehliadač, ale niektoré alebo všetky funkcie nemusia fungovať a zážitok z aplikácie nemusí byť optimálny.", "I understand the risks and wish to continue": "Rozumiem riziku a chcem pokračovať", "Go to element.io": "Prejsť na element.io", - "Failed to start": "Zapnutie zlyhalo", + "Failed to start": "Spustenie zlyhalo", "Download Completed": "Preberanie dokončené", "Open": "Otvoriť", "Your Element is misconfigured": "Váš Element je nesprávne nastavený", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Vaša konfigurácia Elementu obsahuje nesprávny údaj JSON. Prosím, opravte chybu a obnovte stránku.", - "Your browser can't run %(brand)s": "Váš prehliadač nerozbehne %(brand)s", + "Your browser can't run %(brand)s": "Váš prehliadač nedokáže spustiť %(brand)s", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používa pokročilé funkcie prehliadača, ktoré nie sú podporované vaším aktuálnym prehliadačom.", "Powered by Matrix": "používa protokol Matrix", - "Use %(brand)s on mobile": "Používať %(brand)s pri mobilných zariadeniach", + "Use %(brand)s on mobile": "Používať %(brand)s na mobilnom zariadení", "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Decentralizované, šifrované konverzácie a spolupráca na platforme $matrixLogo", "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s na %(osName)s", "%(brand)s Desktop: %(platformName)s": "%(brand)s Stolný počítač: %(platformName)s" diff --git a/src/i18n/strings/sl.json b/src/i18n/strings/sl.json index c3b767700..833fcdd54 100644 --- a/src/i18n/strings/sl.json +++ b/src/i18n/strings/sl.json @@ -5,7 +5,6 @@ "Sign In": "Prijava", "Create Account": "Registracija", "Explore rooms": "Raziščite sobe", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neveljavna konfiguracija: lahko izberete samo eno izmed default_server_config, default_server_name ali default_hs_url.", "Invalid configuration: no default server specified.": "Neveljavna konfiguracija: privzeti strežnik ni nastavljen.", "Your Element is misconfigured": "Vaš Element je napačno nastavljen", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracije vašega Elementa vsebujejo neveljaven JSON. Prosim, popravite napako in znova naložite stran.", diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json index 4911cc2d3..315599ec1 100644 --- a/src/i18n/strings/sq.json +++ b/src/i18n/strings/sq.json @@ -6,7 +6,6 @@ "Create Account": "Krijoni Llogari", "Explore rooms": "Eksploroni dhoma", "Unexpected error preparing the app. See console for details.": "Gabim i papritur gjatë përgatitjes së aplikacionit. Për hollësi, shihni konsolën.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Formësim i pavlefshëm: mund të caktohet vetëm një prej default_server_config, default_server_name, ose default_hs_url.", "Invalid configuration: no default server specified.": "Formësim i pavlefshëm: s’është caktuar shërbyes parazgjedhje.", "The message from the parser is: %(message)s": "Mesazhi prej procesit është: %(message)s", "Invalid JSON": "JSON i pavlefshëm", diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index 3797e6107..cfb9ec4c7 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -9,7 +9,6 @@ "The message from the parser is: %(message)s": "Порука из парсера: %(message)s", "Invalid JSON": "Погрешан JSON", "Unexpected error preparing the app. See console for details.": "Неочекивана грешка приликом припреме апликације. Погледајте конзолу за више детаља.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Погрешно подешавање: можете навести само једну вредност од default_server_config, default_server_name, или default_hs_url.", "Your Element is misconfigured": "Ваша Елемент апликација је лоше подешена", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Подешавање ваше Елемент апликације садржи неисправни „JSON“. Поправите проблем па поново учитајте ову страницу.", "Unable to load config file: please refresh the page to try again.": "Не могу да учитам датотеку подешавања: освежите страницу и покушајте поново.", diff --git a/src/i18n/strings/sr_Latn.json b/src/i18n/strings/sr_Latn.json index 78672667d..679a9faaa 100644 --- a/src/i18n/strings/sr_Latn.json +++ b/src/i18n/strings/sr_Latn.json @@ -2,7 +2,6 @@ "The message from the parser is: %(message)s": "Poruka iz parsera je: %(message)s", "Invalid JSON": "Pogrešan JSON", "Unexpected error preparing the app. See console for details.": "Neočekivana greška prilikom pripreme aplikacije. Pogledajte konzolu za više detalja.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Pogrešno podešavanje: možete navesti samo jednu vrednost od default_server_config, default_server_name, or default_hs_url.", "Invalid configuration: no default server specified.": "Pogrešno podešavanje: podrazumevani server nije naveden.", "Unknown device": "Nepoznat uređaj", "Dismiss": "Odbaci", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 6bdebea18..95adbb16b 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -8,7 +8,6 @@ "The message from the parser is: %(message)s": "Meddelandet från parsern är: %(message)s", "Invalid JSON": "Ogiltig JSON", "Unexpected error preparing the app. See console for details.": "Oväntat fel vid appstart. Se konsolen för mer information.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ogiltiga inställningar: det är enbart möjligt att specificera en default_config, default_server, eller default_hs_url.", "Invalid configuration: no default server specified.": "Ogiltiga inställningar: ingen standardserver specificerad.", "Go to your browser to complete Sign In": "Gå till din webbläsare för att slutföra inloggningen", "Unable to load config file: please refresh the page to try again.": "Kan inte ladda konfigurationsfilen: ladda om sidan för att försöka igen.", diff --git a/src/i18n/strings/sw.json b/src/i18n/strings/sw.json new file mode 100644 index 000000000..268bf06fc --- /dev/null +++ b/src/i18n/strings/sw.json @@ -0,0 +1,31 @@ +{ + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Mipangilio wa Element yako una JSON batili. Tafadhali sahihisha tatizo na upakie upya ukurasa.", + "The message from the parser is: %(message)s": "Ujumbe kutoka kwa mchanganuzi ni: %(message)s", + "Invalid JSON": "JSON ni batili", + "Unable to load config file: please refresh the page to try again.": "Haiwezekani kupakia faili ya mipangilio: tafadhali pakia upya ukurasa ili kujaribu tena.", + "Unexpected error preparing the app. See console for details.": "Hitilafu isiyotarajiwa katika kuandaa programu. Tazama console kwa maelezo.", + "Download Completed": "Upakuaji Umekamilika", + "Open": "Fungua", + "Dismiss": "Sisitiza", + "%(brand)s Desktop: %(platformName)s": "%(brand)s Kompyuta ya mezani: %(platformName)s", + "Go to your browser to complete Sign In": "Nenda kwenye kivinjari chako ili ukamilishe Ingia", + "Unknown device": "Kifaa kisichojulikana", + "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s kwenye%(osName)s", + "Powered by Matrix": "Inaendeshwa na Matrix", + "Use %(brand)s on mobile": "Tumia %(brand)s kwenye simu", + "Unsupported browser": "Kivinjari kisichotumika", + "Your browser can't run %(brand)s": "Kivinjari chako hakifanyi kazi %(brand)s", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s hutumia vipengele vya kina vya kivinjari ambavyo havitumiki kwenye kivinjari chako cha sasa.", + "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Unaweza kuendelea kutumia kivinjari chako cha sasa, lakini baadhi au vipengele vyote vinaweza kutofanya kazi na muonekano na hisia ya programu inaweza kuwa si sahihi.", + "I understand the risks and wish to continue": "Ninaelewa hatari na ningependa kuendelea", + "Go to element.io": "Nenda kwenye element.io", + "Failed to start": "Imeshindwa kuanza", + "Welcome to Element": "Karibu katika Elementi", + "Please install Chrome, Firefox, or Safari for the best experience.": "Tafadhali sakinisha Chrome, Firefox, au Safari kwa uzoefu bora zaidi.", + "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Ujumbe umesambazwa, nakufichwa & ushirikiano unaoendeshwa na", + "Sign In": "Ingia", + "Create Account": "Tengeneza Akaunti", + "Explore rooms": "Tafuta nafasi", + "Invalid configuration: no default server specified.": "Mpangilio batili: hakuna seva chaguo-msingi iliyobainishwa.", + "Your Element is misconfigured": "Element yako imesanifiwa vibaya" +} diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json index d940009a1..286fa8387 100644 --- a/src/i18n/strings/ta.json +++ b/src/i18n/strings/ta.json @@ -5,7 +5,6 @@ "The message from the parser is: %(message)s": "பாகுபடுத்தி அனுப்பிய செய்தி: %(message)s", "Invalid JSON": "தவறான JSON", "Unexpected error preparing the app. See console for details.": "பயன்பாட்டைத் தயார் செய்வதில் எதிர்பாராத பிழை. விவரங்களுக்கு console ஐப் பார்க்கவும்.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "தவறான உள்ளமைவு: default_server_config, default_server_name அல்லது default_hs_url இல் ஒன்றை மட்டுமே குறிப்பிட முடியும்.", "Invalid configuration: no default server specified.": "தவறான உள்ளமைவு: இயல்புநிலை சேவையகம் குறிப்பிடப்படவில்லை.", "Sign In": "உள்நுழைக", "Create Account": "உங்கள் கணக்கை துவங்குங்கள்", diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index 251c31ff1..0651f5ba0 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -27,6 +27,5 @@ "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "คุณสามารถใช้เบราว์เซอร์ปัจจุบันของคุณต่อไปได้ แต่คุณสมบัติบางอย่างหรือทั้งหมดอาจไม่ทำงาน และรูปลักษณ์ของแอปพลิเคชันอาจไม่ถูกต้อง.", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s ใช้คุณลักษณะขั้นสูงของเบราว์เซอร์ซึ่งไม่รองรับโดยเบราว์เซอร์ปัจจุบันของคุณ.", "Use %(brand)s on mobile": "ใช้ %(brand)s บนมือถือ", - "Go to your browser to complete Sign In": "ไปที่เบราว์เซอร์ของคุณเพื่อลงชื่อเข้าใช้ให้เสร็จสมบูรณ์.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "การกำหนดค่าไม่ถูกต้อง: สามารถระบุได้เพียงอย่างใดอย่างหนึ่ง default_server_config, default_server_name, or default_hs_url." + "Go to your browser to complete Sign In": "ไปที่เบราว์เซอร์ของคุณเพื่อลงชื่อเข้าใช้ให้เสร็จสมบูรณ์." } diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index aed0f38bb..28769ced1 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -7,7 +7,6 @@ "Explore rooms": "Odaları keşfet", "Invalid JSON": "Hatalı JSON", "Unexpected error preparing the app. See console for details.": "Uygulama hazırlanırken beklenmeyen bir hata oldu. Detaylar için konsola bakın.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Hatalı ayarlar: default_server_config, default_server_name ve default_hs_url ayarlarından en fazla biri girilebilir.", "Invalid configuration: no default server specified.": "Hatalı ayarlar: varsayılan sunucu belirlenmemiş.", "The message from the parser is: %(message)s": "Ayrıştırıcıdan gelen mesaj: %(message)s", "Go to your browser to complete Sign In": "Oturum açmayı tamamlamak için tarayıcınıza gidin", diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index 36b0e9d56..9e39ddf32 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -6,7 +6,6 @@ "Create Account": "Створити обліковий запис", "Explore rooms": "Каталог кімнат", "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при підготовці програми. Дивіться деталі у виводі консолі.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невірна конфігурація: можна вказати лише default_server_config, default_server_name або default_hs_url.", "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано сервер за замовчуванням.", "The message from the parser is: %(message)s": "Повідомлення від аналізатора : %(message)s", "Invalid JSON": "Хибний JSON", @@ -28,5 +27,6 @@ "Use %(brand)s on mobile": "Користуйтеся %(brand)s на мобільному", "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Децентралізована, зашифрована бесіда та співпраця на основі $matrixLogo", "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s на %(osName)s", - "%(brand)s Desktop: %(platformName)s": "%(brand)s для комп'ютера: %(platformName)s" + "%(brand)s Desktop: %(platformName)s": "%(brand)s для комп'ютера: %(platformName)s", + "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "Неправильна конфігурація: не можна вказати default_hs_url разом з default_server_name або default_server_config" } diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json index 9c0a17542..20529ddbd 100644 --- a/src/i18n/strings/vi.json +++ b/src/i18n/strings/vi.json @@ -5,13 +5,12 @@ "Unexpected error preparing the app. See console for details.": "Có lỗi xảy ra trong lúc thiết lập ứng dụng. Mở bảng điều khiển (console) để biết chi tiết.", "The message from the parser is: %(message)s": "Thông báo của trình xử lý là: %(message)s", "Invalid JSON": "JSON không hợp lệ", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Thiết lập không hợp lệ: chỉ có thể điền một trong số sau default_server_config, default_server_name, hoặc default_hs_url.", "Invalid configuration: no default server specified.": "Thiết lập không hợp lệ: chưa chỉ định máy chủ mặc định.", "Sign In": "Đăng nhập", "Create Account": "Tạo tài khoản", "Explore rooms": "Khám phá các phòng", "Download Completed": "Tải xuống hoàn tất", - "Go to element.io": "Đến element.io", + "Go to element.io": "Qua element.io", "I understand the risks and wish to continue": "Tôi hiểu rủi ro và muốn tiếp tục", "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Bạn có thể tiếp tục sử dụng trình duyệt hiện tại, tuy nhiên các tính năng có thể sẽ không hoạt động và trải nghiệm ứng dụng có thể sẽ không được tốt.", "Please install Chrome, Firefox, or Safari for the best experience.": "Hãy cài đặt Chrome, Firefox, hoặc Safari để có trải nghiệm tốt nhất.", diff --git a/src/i18n/strings/vls.json b/src/i18n/strings/vls.json index 19e6fef81..234878fd9 100644 --- a/src/i18n/strings/vls.json +++ b/src/i18n/strings/vls.json @@ -1,6 +1,5 @@ { "Unexpected error preparing the app. See console for details.": "’t Is een onverwachte foute ipgetreedn by ’t voorbereidn van den app. Bekykt de console vo details.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Oungeldige configuroasje: ku moar één van default_server_config, default_server_name, of default_hs_url ingeevn.", "Invalid configuration: no default server specified.": "Oungeldige configuroasje: geen standoardserver ingegeevn.", "Unknown device": "Ounbekend toestel", "Dismiss": "Afwyzn", diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index 3cd191ea1..8c82f0c8d 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -8,7 +8,6 @@ "The message from the parser is: %(message)s": "来自解析器的消息：%(message)s", "Invalid JSON": "无效的 JSON", "Unexpected error preparing the app. See console for details.": "准备软件时出现意外错误，详细信息请查看控制台。", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "配置无效：只能指定default_server_config、default_server_name或default_hs_url其中之一。", "Invalid configuration: no default server specified.": "配置无效：没有指定默认服务器。", "Unable to load config file: please refresh the page to try again.": "无法加载配置文件：请刷新页面以重试。", "Go to your browser to complete Sign In": "转到您的浏览器以完成登录", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 5929b71b0..2f3c0a3bb 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -6,7 +6,6 @@ "Create Account": "建立帳號", "Explore rooms": "探索聊天室", "Unexpected error preparing the app. See console for details.": "準備應用程式時發生未知錯誤。請見主控台以取得更多資訊。", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "無效設定：只能指定 default_server_config、default_server_name 或 default_hs_url 其中之一。", "Invalid configuration: no default server specified.": "無效設定：未指定預設伺服器。", "The message from the parser is: %(message)s": "解析器收到的訊息：%(message)s", "Invalid JSON": "無效的 JSON", @@ -28,5 +27,6 @@ "Use %(brand)s on mobile": "在行動裝置上使用 %(brand)s", "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "由 $matrixLogo 驅動的去中心化、加密的聊天與協作工具", "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s：%(osName)s 的 %(browserName)s", - "%(brand)s Desktop: %(platformName)s": "%(brand)s 桌面版：%(platformName)s" + "%(brand)s Desktop: %(platformName)s": "%(brand)s 桌面版：%(platformName)s", + "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config": "無效設定：default_hs_url 不能與 default_server_name 或 default_server_config 一起指定" } From f859db9054155d2bf35e4e750a0c3d46afb64d30 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 11 Jul 2023 15:58:50 +0100 Subject: [PATCH 37/48] Upgrade matrix-js-sdk to 27.0.0-rc.1 --- package.json | 2 +- yarn.lock | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 86f45af52..f41f14fd9 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.16.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "27.0.0-rc.1", "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 256e5d59c..23e812ef8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1617,6 +1617,11 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0.tgz#766580036d4df12120ded223e13b5640e77db136" integrity sha512-ra/bcFdleC1iRNms2I96UXA0NvQYWpMsHrV5EfJRS7qV1PtnQNvgsvMfjMbkx8QT2ErEmIhsvB5fPCpfp8BSuw== +"@matrix-org/matrix-sdk-crypto-js@^0.1.1": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.2.tgz#b58679e161f3d734359a8665922956309b1a4417" + integrity sha512-bbal0RcWwerS/DgqhOgM7wkXJ2YSv9fySK/qgLlrAsdYLpMSTqG8wDQ89/v+RYo9WmA5hwUN/wXcCDdFaFEXQQ== + "@matrix-org/matrix-wysiwyg@^2.3.0": version "2.3.1" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.3.1.tgz#4b607323f3ffd8c332abeba7226010ecc031ed12" @@ -4287,6 +4292,11 @@ 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== + css-blank-pseudo@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5" @@ -8412,6 +8422,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@27.0.0-rc.1: + version "27.0.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-27.0.0-rc.1.tgz#85a8a64b6d88fd57d3d1ee0b69a515ebb039e882" + integrity sha512-6bo4PbUCTvjqAf2urBf3L1UxE72//ubL4QsNOJmU9/IfLZQOql+ByvRKrKES245H4KxQHLg1s4lug8sIcfISBQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-js" "^0.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.3.1" + 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 "26.2.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5751df1288b340fe08358145e5d47d28ed69465a" @@ -9259,6 +9289,14 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== +oidc-client-ts@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-2.2.4.tgz#7d86b5efe2248f3637a6f3a0ee1af86764aea125" + integrity sha512-nOZwIomju+AmXObl5Oq5PjrES/qTt8bLsENJCIydVgi9TEWk7SCkOU6X3RNkY7yfySRM1OJJvDKdREZdmnDT2g== + dependencies: + crypto-js "^4.1.1" + jwt-decode "^3.1.2" + on-finished@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" From 137f5c96d344acaf3a12fa1a4670f99955fb8862 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 11 Jul 2023 15:59:29 +0100 Subject: [PATCH 38/48] Upgrade matrix-react-sdk to 3.76.0-rc.1 --- package.json | 2 +- yarn.lock | 41 ++++++----------------------------------- 2 files changed, 7 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index f41f14fd9..a0849eb3d 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "27.0.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.76.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 23e812ef8..0d2a0fbbd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1612,11 +1612,6 @@ resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.5.0.tgz#38b69c4e29d243944c5712cca7b674a3432056e6" integrity sha512-uL5kf7MqC+GxsGJtimPVbFliyaFinohTHSzohz31JTysktHsjRR2SC+vV7sy2/dstTWVdG9EGOnohyPsB+oi3A== -"@matrix-org/matrix-sdk-crypto-js@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0.tgz#766580036d4df12120ded223e13b5640e77db136" - integrity sha512-ra/bcFdleC1iRNms2I96UXA0NvQYWpMsHrV5EfJRS7qV1PtnQNvgsvMfjMbkx8QT2ErEmIhsvB5fPCpfp8BSuw== - "@matrix-org/matrix-sdk-crypto-js@^0.1.1": version "0.1.2" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.2.tgz#b58679e161f3d734359a8665922956309b1a4417" @@ -1631,13 +1626,6 @@ version "3.2.14" 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@^0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-0.0.5.tgz#78bd80f42b918394978965ef3e08496e97948c7a" - integrity sha512-QhH1T1E6Q6csCUitQzm32SRnX49Ox73TF5BZ4p5TOGFpPD3QuYc5/dDC1Yh3xUljgqOS2C6H24qaskw6olCtfQ== - dependencies: - "@babel/runtime" "^7.17.9" - "@matrix-org/react-sdk-module-api@^0.0.6": version "0.0.6" resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-0.0.6.tgz#941872ed081acdca9d247ccd6e146265aa24010b" @@ -8442,24 +8430,6 @@ matrix-js-sdk@27.0.0-rc.1: unhomoglyph "^1.0.6" uuid "9" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "26.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5751df1288b340fe08358145e5d47d28ed69465a" - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-js" "^0.1.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.3.1" - 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" @@ -8467,14 +8437,15 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.75.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/1a2d201863e1a61d62b84fefe0760fee622b1d5f" +matrix-react-sdk@3.76.0-rc.1: + version "3.76.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.76.0-rc.1.tgz#e38ea878735670a6a77ad1325de11a7ca2d82432" + integrity sha512-qIA0hOWc9mY5mqDqwXnV1gXWHqv4zDDdnk9gEPvYquQoUxwPikavmmzPBiP0OJrcdF9Nq1S4dU5ieplSbO61VQ== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.5.0" "@matrix-org/matrix-wysiwyg" "^2.3.0" - "@matrix-org/react-sdk-module-api" "^0.0.5" + "@matrix-org/react-sdk-module-api" "^0.0.6" "@sentry/browser" "^7.0.0" "@sentry/tracing" "^7.0.0" "@testing-library/react-hooks" "^8.0.1" @@ -8509,7 +8480,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 "27.0.0-rc.1" matrix-widget-api "^1.4.0" memoize-one "^6.0.0" minimist "^1.2.5" From ea0edf75f7ead73a8dddf45701aaf1523c9fb274 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 11 Jul 2023 16:01:17 +0100 Subject: [PATCH 39/48] Prepare changelog for v1.11.36-rc.1 --- CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b6de3288..a5e5e1027 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,52 @@ +Changes in [1.11.36-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.36-rc.1) (2023-07-11) +=========================================================================================================== + +## 🦖 Deprecations + * Deprecate customisations in favour of Module API ([\#25736](https://github.com/vector-im/element-web/pull/25736)). Fixes #25733. + +## ✨ Features + * OIDC: store initial screen in session storage ([\#25688](https://github.com/vector-im/element-web/pull/25688)). Fixes #25656. Contributed by @kerryarchibald. + * Allow default_server_config as a fallback config ([\#25682](https://github.com/vector-im/element-web/pull/25682)). Contributed by @ShadowRZ. + * OIDC: remove auth params from url after login attempt ([\#25664](https://github.com/vector-im/element-web/pull/25664)). Contributed by @kerryarchibald. + * feat(faq): remove keyboard shortcuts button ([\#9342](https://github.com/matrix-org/matrix-react-sdk/pull/9342)). Fixes #22625. Contributed by @gefgu. + * GYU: Update banner ([\#11211](https://github.com/matrix-org/matrix-react-sdk/pull/11211)). Fixes #25530. Contributed by @justjanne. + * Linkify mxc:// URLs as links to your media repo ([\#11213](https://github.com/matrix-org/matrix-react-sdk/pull/11213)). Fixes #6942. + * OIDC: Log in ([\#11199](https://github.com/matrix-org/matrix-react-sdk/pull/11199)). Fixes #25657. Contributed by @kerryarchibald. + * Handle all permitted url schemes in linkify ([\#11215](https://github.com/matrix-org/matrix-react-sdk/pull/11215)). Fixes #4457 and #8720. + * Autoapprove Element Call oidc requests ([\#11209](https://github.com/matrix-org/matrix-react-sdk/pull/11209)). Contributed by @toger5. + * Allow creating knock rooms ([\#11182](https://github.com/matrix-org/matrix-react-sdk/pull/11182)). Contributed by @charlynguyen. + * Expose and pre-populate thread ID in devtools dialog ([\#10953](https://github.com/matrix-org/matrix-react-sdk/pull/10953)). + * Hide URL preview if it will be empty ([\#9029](https://github.com/matrix-org/matrix-react-sdk/pull/9029)). + * Change wording from avatar to profile picture ([\#7015](https://github.com/matrix-org/matrix-react-sdk/pull/7015)). Fixes vector-im/element-meta#1331. Contributed by @aaronraimist. + * Quick and dirty devtool to explore state history ([\#11197](https://github.com/matrix-org/matrix-react-sdk/pull/11197)). + * Consider more user inputs when calculating zxcvbn score ([\#11180](https://github.com/matrix-org/matrix-react-sdk/pull/11180)). + * GYU: Account Notification Settings ([\#11008](https://github.com/matrix-org/matrix-react-sdk/pull/11008)). Fixes #24567. Contributed by @justjanne. + * Compound Typography pass ([\#11103](https://github.com/matrix-org/matrix-react-sdk/pull/11103)). Fixes #25548. + * OIDC: navigate to authorization endpoint ([\#11096](https://github.com/matrix-org/matrix-react-sdk/pull/11096)). Fixes #25574. Contributed by @kerryarchibald. + +## 🐛 Bug Fixes + * Make checkboxes less rounded ([\#11224](https://github.com/matrix-org/matrix-react-sdk/pull/11224)). Contributed by @andybalaam. + * GYU: Fix issues with audible keywords without activated mentions ([\#11218](https://github.com/matrix-org/matrix-react-sdk/pull/11218)). Contributed by @justjanne. + * PosthogAnalytics unwatch settings on logout ([\#11207](https://github.com/matrix-org/matrix-react-sdk/pull/11207)). Fixes #25703. + * Avoid trying to set room account data for pinned events as guest ([\#11216](https://github.com/matrix-org/matrix-react-sdk/pull/11216)). Fixes #6300. + * GYU: Disable sound for DMs checkbox when DM notifications are disabled ([\#11210](https://github.com/matrix-org/matrix-react-sdk/pull/11210)). Contributed by @justjanne. + * force to allow calls without video and audio in embedded mode ([\#11131](https://github.com/matrix-org/matrix-react-sdk/pull/11131)). Contributed by @EnricoSchw. + * Fix room tile text clipping ([\#11196](https://github.com/matrix-org/matrix-react-sdk/pull/11196)). Fixes #25718. + * Handle newlines in user pills ([\#11166](https://github.com/matrix-org/matrix-react-sdk/pull/11166)). Fixes #10994. + * Limit width of user menu in space panel ([\#11192](https://github.com/matrix-org/matrix-react-sdk/pull/11192)). Fixes #22627. + * Add isLocation to ComposerEvent analytics events ([\#11187](https://github.com/matrix-org/matrix-react-sdk/pull/11187)). Contributed by @andybalaam. + * Fix: hide unsupported login elements ([\#11185](https://github.com/matrix-org/matrix-react-sdk/pull/11185)). Fixes #25711. Contributed by @kerryarchibald. + * Scope smaller font size to user info panel ([\#11178](https://github.com/matrix-org/matrix-react-sdk/pull/11178)). Fixes #25683. + * Apply i18n to strings in the html export ([\#11176](https://github.com/matrix-org/matrix-react-sdk/pull/11176)). + * Inhibit url previews on MXIDs containing slashes same as those without ([\#11160](https://github.com/matrix-org/matrix-react-sdk/pull/11160)). + * Make event info size consistent with state events ([\#11181](https://github.com/matrix-org/matrix-react-sdk/pull/11181)). + * Fix markdown content spacing ([\#11177](https://github.com/matrix-org/matrix-react-sdk/pull/11177)). Fixes #25685. + * Fix font-family definition for emojis ([\#11170](https://github.com/matrix-org/matrix-react-sdk/pull/11170)). Fixes #25686. + * Fix spurious error sending receipt in thread errors ([\#11157](https://github.com/matrix-org/matrix-react-sdk/pull/11157)). + * Consider the empty push rule actions array equiv to deprecated dont_notify ([\#11155](https://github.com/matrix-org/matrix-react-sdk/pull/11155)). Fixes #25674. + * Only trap escape key for cancel reply if there is a reply ([\#11140](https://github.com/matrix-org/matrix-react-sdk/pull/11140)). Fixes #25640. + * Update linkify to 4.1.1 ([\#11132](https://github.com/matrix-org/matrix-react-sdk/pull/11132)). Fixes #23806. + Changes in [1.11.35](https://github.com/vector-im/element-web/releases/tag/v1.11.35) (2023-07-04) ================================================================================================= From 98f073578450a89fbe866fa5c9199fce52c8ba86 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 11 Jul 2023 16:01:18 +0100 Subject: [PATCH 40/48] v1.11.36-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a0849eb3d..edef70ec6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.35", + "version": "1.11.36-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From d77877dc209b222df407bbbf8b248397f59bf6ca Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 14 Jul 2023 16:33:43 +0100 Subject: [PATCH 41/48] Upgrade matrix-js-sdk to 27.0.0-rc.2 --- package.json | 2 +- yarn.lock | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index edef70ec6..a383b7f33 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.16.0", - "matrix-js-sdk": "27.0.0-rc.1", + "matrix-js-sdk": "27.0.0-rc.2", "matrix-react-sdk": "3.76.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 0d2a0fbbd..19dc95c02 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8430,6 +8430,26 @@ matrix-js-sdk@27.0.0-rc.1: unhomoglyph "^1.0.6" uuid "9" +matrix-js-sdk@27.0.0-rc.2: + version "27.0.0-rc.2" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-27.0.0-rc.2.tgz#7b77e118dd419776a42d061ba03fa72616a92d26" + integrity sha512-KC9Dd2LsGO3i7cW+c6RDJt90q/41kry2jTg4ZOukHfnmZ0cTO9JfmwxRtL/UgrVLdCeVDf2j/h4kckjWuKYsNA== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-js" "^0.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.3.1" + 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 3ee4cbd992e78759b6b2b9efbdff7493b15acaf4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 14 Jul 2023 16:34:14 +0100 Subject: [PATCH 42/48] Upgrade matrix-react-sdk to 3.76.0-rc.2 --- package.json | 2 +- yarn.lock | 30 +++++------------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index a383b7f33..7768e0c89 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "27.0.0-rc.2", - "matrix-react-sdk": "3.76.0-rc.1", + "matrix-react-sdk": "3.76.0-rc.2", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 19dc95c02..818cd2a5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8410,26 +8410,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@27.0.0-rc.1: - version "27.0.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-27.0.0-rc.1.tgz#85a8a64b6d88fd57d3d1ee0b69a515ebb039e882" - integrity sha512-6bo4PbUCTvjqAf2urBf3L1UxE72//ubL4QsNOJmU9/IfLZQOql+ByvRKrKES245H4KxQHLg1s4lug8sIcfISBQ== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-js" "^0.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.3.1" - oidc-client-ts "^2.2.4" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "9" - matrix-js-sdk@27.0.0-rc.2: version "27.0.0-rc.2" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-27.0.0-rc.2.tgz#7b77e118dd419776a42d061ba03fa72616a92d26" @@ -8457,10 +8437,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.76.0-rc.1: - version "3.76.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.76.0-rc.1.tgz#e38ea878735670a6a77ad1325de11a7ca2d82432" - integrity sha512-qIA0hOWc9mY5mqDqwXnV1gXWHqv4zDDdnk9gEPvYquQoUxwPikavmmzPBiP0OJrcdF9Nq1S4dU5ieplSbO61VQ== +matrix-react-sdk@3.76.0-rc.2: + version "3.76.0-rc.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.76.0-rc.2.tgz#079d0d762cd670d141f52a52398255e5814bfa86" + integrity sha512-mdcWwEM1hY4qd6epHaklYOhMnCoCy5eSnM1jWA8rm34K+wyuJ/EwIvh/fbzb6chfS3ZystpG1xJ87qUhul5ASQ== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.5.0" @@ -8500,7 +8480,7 @@ matrix-react-sdk@3.76.0-rc.1: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "27.0.0-rc.1" + matrix-js-sdk "27.0.0-rc.2" matrix-widget-api "^1.4.0" memoize-one "^6.0.0" minimist "^1.2.5" From 49c78214f590429adcc37974b918858817a5cff1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 14 Jul 2023 16:36:24 +0100 Subject: [PATCH 43/48] Prepare changelog for v1.11.36-rc.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5e5e1027..9e80b33e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.11.36-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.11.36-rc.2) (2023-07-14) +=========================================================================================================== + +## 🐛 Bug Fixes + * Fix read receipt sending behaviour around thread roots ([\#3600](https://github.com/matrix-org/matrix-js-sdk/pull/3600)). + * Fix missing metaspace notification badges ([\#11269](https://github.com/matrix-org/matrix-react-sdk/pull/11269)). Fixes #25679. + Changes in [1.11.36-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.36-rc.1) (2023-07-11) =========================================================================================================== From dd9678d97c9dd8b524096729e783c74e8c082b44 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 14 Jul 2023 16:36:25 +0100 Subject: [PATCH 44/48] v1.11.36-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7768e0c89..59c5d6c38 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.36-rc.1", + "version": "1.11.36-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 9be4fcf7d2253ea30903072aa972ceb95f081e92 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 18 Jul 2023 15:09:16 +0100 Subject: [PATCH 45/48] Upgrade matrix-js-sdk to 27.0.0 --- package.json | 2 +- yarn.lock | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 59c5d6c38..0ee7f77b1 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.16.0", - "matrix-js-sdk": "27.0.0-rc.2", + "matrix-js-sdk": "27.0.0", "matrix-react-sdk": "3.76.0-rc.2", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 818cd2a5b..750806459 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8410,6 +8410,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@27.0.0: + version "27.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-27.0.0.tgz#83dae79930325a5aa552f9d9899b31351ecc7bf3" + integrity sha512-Py9My7t72sU0YawdqRCs1BvDwjvAUR5gmwa/oXBxMPFIV5qDrm4F8NvUJLNA80DnYxQT4nDjnM69H8QLv5IRfg== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-js" "^0.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.3.1" + oidc-client-ts "^2.2.4" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "9" + matrix-js-sdk@27.0.0-rc.2: version "27.0.0-rc.2" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-27.0.0-rc.2.tgz#7b77e118dd419776a42d061ba03fa72616a92d26" From af929fcf0de4054cac36bfbc7bae1f83fc3c58b8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 18 Jul 2023 15:09:36 +0100 Subject: [PATCH 46/48] Upgrade matrix-react-sdk to 3.76.0 --- package.json | 2 +- yarn.lock | 30 +++++------------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 0ee7f77b1..c6eb0338c 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "27.0.0", - "matrix-react-sdk": "3.76.0-rc.2", + "matrix-react-sdk": "3.76.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 750806459..cd101ffb4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8430,26 +8430,6 @@ matrix-js-sdk@27.0.0: unhomoglyph "^1.0.6" uuid "9" -matrix-js-sdk@27.0.0-rc.2: - version "27.0.0-rc.2" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-27.0.0-rc.2.tgz#7b77e118dd419776a42d061ba03fa72616a92d26" - integrity sha512-KC9Dd2LsGO3i7cW+c6RDJt90q/41kry2jTg4ZOukHfnmZ0cTO9JfmwxRtL/UgrVLdCeVDf2j/h4kckjWuKYsNA== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-js" "^0.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.3.1" - 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" @@ -8457,10 +8437,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.76.0-rc.2: - version "3.76.0-rc.2" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.76.0-rc.2.tgz#079d0d762cd670d141f52a52398255e5814bfa86" - integrity sha512-mdcWwEM1hY4qd6epHaklYOhMnCoCy5eSnM1jWA8rm34K+wyuJ/EwIvh/fbzb6chfS3ZystpG1xJ87qUhul5ASQ== +matrix-react-sdk@3.76.0: + version "3.76.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.76.0.tgz#c6d334812b61e69a56042cc9217c70a00b62abad" + integrity sha512-rrnI7BTy7PCxHJ29ZfPJ0VY0JiMZBfvqQ5XKCbaxyF5R+E6HkLzWZbDh170q6ch3JFKD3ghtxl83iEHd8t9byw== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.5.0" @@ -8500,7 +8480,7 @@ matrix-react-sdk@3.76.0-rc.2: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "27.0.0-rc.2" + matrix-js-sdk "27.0.0" matrix-widget-api "^1.4.0" memoize-one "^6.0.0" minimist "^1.2.5" From 29ca7a4bd9acc0e6e6e6c56c37a000b122a0dce7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 18 Jul 2023 15:13:03 +0100 Subject: [PATCH 47/48] Prepare changelog for v1.11.36 --- CHANGELOG.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e80b33e1..9e63d4916 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,8 @@ -Changes in [1.11.36-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.11.36-rc.2) (2023-07-14) -=========================================================================================================== +Changes in [1.11.36](https://github.com/vector-im/element-web/releases/tag/v1.11.36) (2023-07-18) +================================================================================================= -## 🐛 Bug Fixes - * Fix read receipt sending behaviour around thread roots ([\#3600](https://github.com/matrix-org/matrix-js-sdk/pull/3600)). - * Fix missing metaspace notification badges ([\#11269](https://github.com/matrix-org/matrix-react-sdk/pull/11269)). Fixes #25679. - -Changes in [1.11.36-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.36-rc.1) (2023-07-11) -=========================================================================================================== +## 🔒 Security + * Fixes for [CVE-2023-37259](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-37259) / [GHSA-c9vx-2g7w-rp65](https://github.com/matrix-org/matrix-react-sdk/security/advisories/GHSA-c9vx-2g7w-rp65) ## 🦖 Deprecations * Deprecate customisations in favour of Module API ([\#25736](https://github.com/vector-im/element-web/pull/25736)). Fixes #25733. @@ -32,6 +28,8 @@ Changes in [1.11.36-rc.1](https://github.com/vector-im/element-web/releases/tag/ * OIDC: navigate to authorization endpoint ([\#11096](https://github.com/matrix-org/matrix-react-sdk/pull/11096)). Fixes #25574. Contributed by @kerryarchibald. ## 🐛 Bug Fixes + * Fix read receipt sending behaviour around thread roots ([\#3600](https://github.com/matrix-org/matrix-js-sdk/pull/3600)). + * Fix missing metaspace notification badges ([\#11269](https://github.com/matrix-org/matrix-react-sdk/pull/11269)). Fixes #25679. * Make checkboxes less rounded ([\#11224](https://github.com/matrix-org/matrix-react-sdk/pull/11224)). Contributed by @andybalaam. * GYU: Fix issues with audible keywords without activated mentions ([\#11218](https://github.com/matrix-org/matrix-react-sdk/pull/11218)). Contributed by @justjanne. * PosthogAnalytics unwatch settings on logout ([\#11207](https://github.com/matrix-org/matrix-react-sdk/pull/11207)). Fixes #25703. From 494cb39984f16474024b495557fa46adb2d5ad36 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 18 Jul 2023 15:13:04 +0100 Subject: [PATCH 48/48] v1.11.36 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c6eb0338c..4f1a858a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.36-rc.2", + "version": "1.11.36", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {