Deprecate customisations in favour of Module API (#25736)

* 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>

.github/cfp_headers

@@ -1,6 +1,9 @@
 /*
+  ! 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

.github/workflows/build_develop.yml

@@ -106,7 +106,7 @@ jobs:
 
             - name: Deploy to Cloudflare Pages
               id: cfp
-              uses: cloudflare/pages-action@61eafe73baad0195ab582cb447b2c6e15a0df9ce # v1
+              uses: cloudflare/pages-action@f0a1cd58cd66095dee69bfa18fa5efd1dde93bca # v1
               with:
                   apiToken: ${{ secrets.CF_PAGES_TOKEN }}
                   accountId: ${{ secrets.CF_PAGES_ACCOUNT_ID }}

.github/workflows/dockerhub.yaml

@@ -18,22 +18,22 @@ 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@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2
+              uses: docker/setup-buildx-action@ecf95283f03858871ff00b787d79c419715afc34 # v2
               with:
                   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 }}
 
             - name: Docker meta
               id: meta
-              uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e # v4
+              uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4
               with:
                   images: |
                       vectorim/element-web
@@ -44,7 +44,7 @@ jobs:
                       latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
 
             - name: Build and push
-              uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4
+              uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4
               with:
                   context: .
                   push: true
@@ -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 }}

.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@df70b4b83e05105c15f20dc6cc61f1463411b2a6 # v1.0.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

CHANGELOG.md

@@ -1,3 +1,64 @@
+Changes in [1.11.35](https://github.com/vector-im/element-web/releases/tag/v1.11.35) (2023-07-04)
+=================================================================================================
+
+## 🦖 Deprecations
+ * Remove `feature_favourite_messages` as it is has been abandoned for now ([\#11097](https://github.com/matrix-org/matrix-react-sdk/pull/11097)). Fixes #25555.
+
+## ✨ Features
+ * Don't setup keys on login when encryption is force disabled ([\#11125](https://github.com/matrix-org/matrix-react-sdk/pull/11125)). Contributed by @kerryarchibald.
+ * OIDC: attempt dynamic client registration ([\#11074](https://github.com/matrix-org/matrix-react-sdk/pull/11074)). Fixes #25468 and #25467. Contributed by @kerryarchibald.
+ * OIDC: Check static client registration and add login flow ([\#11088](https://github.com/matrix-org/matrix-react-sdk/pull/11088)). Fixes #25467. Contributed by @kerryarchibald.
+ * Improve message body output from plain text editor ([\#11124](https://github.com/matrix-org/matrix-react-sdk/pull/11124)). Contributed by @alunturner.
+ * Disable encryption toggle in room settings when force disabled ([\#11122](https://github.com/matrix-org/matrix-react-sdk/pull/11122)). Contributed by @kerryarchibald.
+ * Add .well-known config option to force disable encryption on room creation ([\#11120](https://github.com/matrix-org/matrix-react-sdk/pull/11120)). Contributed by @kerryarchibald.
+ * Handle permalinks in room topic ([\#11115](https://github.com/matrix-org/matrix-react-sdk/pull/11115)). Fixes #23395.
+ * Add at room avatar for RTE ([\#11106](https://github.com/matrix-org/matrix-react-sdk/pull/11106)). Contributed by @alunturner.
+ * Remove new room breadcrumbs ([\#11104](https://github.com/matrix-org/matrix-react-sdk/pull/11104)).
+ * Update rich text editor dependency and associated changes ([\#11098](https://github.com/matrix-org/matrix-react-sdk/pull/11098)). Contributed by @alunturner.
+ * Implement new model, hooks and reconcilation code for new GYU notification settings ([\#11089](https://github.com/matrix-org/matrix-react-sdk/pull/11089)). Contributed by @justjanne.
+ * Allow maintaining a different right panel width for thread panels ([\#11064](https://github.com/matrix-org/matrix-react-sdk/pull/11064)). Fixes #25487.
+ * Make AppPermission pane scrollable ([\#10954](https://github.com/matrix-org/matrix-react-sdk/pull/10954)). Fixes #25438 and #25511. Contributed by @luixxiul.
+ * Integrate compound design tokens ([\#11091](https://github.com/matrix-org/matrix-react-sdk/pull/11091)). Fixes vector-im/internal-planning#450.
+ * Don't warn about the effects of redacting state events when redacting non-state-events ([\#11071](https://github.com/matrix-org/matrix-react-sdk/pull/11071)). Fixes #8478.
+ * Allow specifying help URLs in config.json ([\#11070](https://github.com/matrix-org/matrix-react-sdk/pull/11070)). Fixes #15268.
+
+## 🐛 Bug Fixes
+ * Fix error when generating error for polling for updates ([\#25609](https://github.com/vector-im/element-web/pull/25609)).
+ * Fix spurious notifications on non-live events ([\#11133](https://github.com/matrix-org/matrix-react-sdk/pull/11133)). Fixes #24336.
+ * Prevent auto-translation within composer ([\#11114](https://github.com/matrix-org/matrix-react-sdk/pull/11114)). Fixes #25624.
+ * Fix caret jump when backspacing into empty line at beginning of editor ([\#11128](https://github.com/matrix-org/matrix-react-sdk/pull/11128)). Fixes #22335.
+ * Fix server picker not allowing you to switch from custom to default ([\#11127](https://github.com/matrix-org/matrix-react-sdk/pull/11127)). Fixes #25650.
+ * Consider the unthreaded read receipt for Unread dot state ([\#11117](https://github.com/matrix-org/matrix-react-sdk/pull/11117)). Fixes #24229.
+ * Increase RTE resilience ([\#11111](https://github.com/matrix-org/matrix-react-sdk/pull/11111)). Fixes #25277. Contributed by @alunturner.
+ * Fix RoomView ignoring alias lookup errors due to them not knowing the roomId ([\#11099](https://github.com/matrix-org/matrix-react-sdk/pull/11099)). Fixes #24783 and #25562.
+ * Fix style inconsistencies on SecureBackupPanel ([\#11102](https://github.com/matrix-org/matrix-react-sdk/pull/11102)). Fixes #25615. Contributed by @luixxiul.
+ * Remove unknown MXIDs from invite suggestions ([\#11055](https://github.com/matrix-org/matrix-react-sdk/pull/11055)). Fixes #25446.
+ * Reduce volume of ring sounds to normalised levels ([\#9143](https://github.com/matrix-org/matrix-react-sdk/pull/9143)). Contributed by @JMoVS.
+ * Fix slash commands not being enabled in certain cases ([\#11090](https://github.com/matrix-org/matrix-react-sdk/pull/11090)). Fixes #25572.
+ * Prevent escape in threads from sending focus to main timeline composer ([\#11061](https://github.com/matrix-org/matrix-react-sdk/pull/11061)). Fixes #23397.
+
+Changes in [1.11.34](https://github.com/vector-im/element-web/releases/tag/v1.11.34) (2023-06-20)
+=================================================================================================
+
+## ✨ Features
+ * OIDC: add delegatedauthentication to validated server config ([\#11053](https://github.com/matrix-org/matrix-react-sdk/pull/11053)). Contributed by @kerryarchibald.
+ * Allow image pasting in plain mode in RTE ([\#11056](https://github.com/matrix-org/matrix-react-sdk/pull/11056)). Contributed by @alunturner.
+ * Show room options menu if "UIComponent.roomOptionsMenu" is enabled ([\#10365](https://github.com/matrix-org/matrix-react-sdk/pull/10365)). Contributed by @maheichyk.
+ * Allow image pasting in rich text mode in RTE ([\#11049](https://github.com/matrix-org/matrix-react-sdk/pull/11049)). Contributed by @alunturner.
+ * Update voice broadcast redaction to use MSC3912 `with_rel_type` instead of `with_relations` ([\#11014](https://github.com/matrix-org/matrix-react-sdk/pull/11014)). Fixes #25471.
+ * Add config to skip widget_build_url for DM rooms ([\#11044](https://github.com/matrix-org/matrix-react-sdk/pull/11044)). Fixes vector-im/customer-retainer#74.
+ * Inhibit interactions on forward dialog message previews ([\#11025](https://github.com/matrix-org/matrix-react-sdk/pull/11025)). Fixes #23459.
+ * Removed `DecryptionFailureBar.tsx` ([\#11027](https://github.com/matrix-org/matrix-react-sdk/pull/11027)). Fixes vector-im/element-meta#1358. Contributed by @florianduros.
+
+## 🐛 Bug Fixes
+ * Fix translucent `TextualEvent` on search results panel ([\#10810](https://github.com/matrix-org/matrix-react-sdk/pull/10810)). Fixes #25292. Contributed by @luixxiul.
+ * Matrix matrix scheme permalink constructor not stripping query params ([\#11060](https://github.com/matrix-org/matrix-react-sdk/pull/11060)). Fixes #25535.
+ * Fix: "manually verify by text" does nothing ([\#11059](https://github.com/matrix-org/matrix-react-sdk/pull/11059)). Fixes #25375. Contributed by @kerryarchibald.
+ * Make group calls respect the ICE fallback setting ([\#11047](https://github.com/matrix-org/matrix-react-sdk/pull/11047)). Fixes vector-im/voip-internal#65.
+ * Align list items on the tooltip to the start ([\#11041](https://github.com/matrix-org/matrix-react-sdk/pull/11041)). Fixes #25355. Contributed by @luixxiul.
+ * Clear thread panel event permalink when changing rooms ([\#11024](https://github.com/matrix-org/matrix-react-sdk/pull/11024)). Fixes #25484.
+ * Fix spinner placement on pinned widgets being reloaded ([\#10970](https://github.com/matrix-org/matrix-react-sdk/pull/10970)). Fixes #25431. Contributed by @luixxiul.
+
 Changes in [1.11.33](https://github.com/vector-im/element-web/releases/tag/v1.11.33) (2023-06-09)
 =================================================================================================
 

docs/config.md

@@ -144,6 +144,8 @@ complete re-branding/private labeling, a more personalised experience can be ach
     1. `title`: Required. Title to show at the top of the notice.
     2. `description`: Required. The description to use for the notice.
     3. `show_once`: Optional. If true then the notice will only be shown once per device.
+18. `help_url`: The URL to point users to for help with the app, defaults to `https://element.io/help`.
+19. `help_encrption_url`: The URL to point users to for help with encryption, defaults to `https://element.io/help#encryption`.
 
 ### `desktop_builds` and `mobile_builds`
 
@@ -320,7 +322,8 @@ The VoIP and Jitsi options are:
     }
     ```
     The `widget` is the `content` of a normal widget state event. The `layout` is the layout specifier for the widget being created,
-    as defined by the `io.element.widgets.layout` state event.
+    as defined by the `io.element.widgets.layout` state event. By default this applies to all rooms, but the behaviour can be skipped for DMs
+    by setting the option `widget_build_url_ignore_dm` to `true`.
 5. `audio_stream_url`: Optional URL to pass to Jitsi to enable live streaming. This option is considered experimental and may be removed
    at any time without notice.
 6. `element_call`: Optional configuration for native group calls using Element Call, with the following subkeys:

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.
 

docs/e2ee.md

@@ -16,6 +16,28 @@ Set the following on your homeserver's
 }
 ```
 
+## Disabling encryption
+
+Set the following on your homeserver's
+`/.well-known/matrix/client` config:
+
+```json
+{
+    "io.element.e2ee": {
+        "force_disable": true
+    }
+}
+```
+
+When `force_disable` is true:
+
+-   all rooms will be created with encryption disabled, and it will not be possible to enable
+    encryption from room settings.
+-   any `io.element.e2ee.default` value will be disregarded.
+
+Note: If the server is configured to forcibly enable encryption for some or all rooms,
+this behaviour will be overriden.
+
 # Secure backup
 
 By default, Element strongly encourages (but does not require) users to set up

docs/labs.md

@@ -105,11 +105,6 @@ For some sample themes, check out [aaronraimist/element-themes](https://github.c
 Allows users to receive encrypted messages by creating a device that is stored
 encrypted on the server, as described in [MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697).
 
-## Breadcrumbs v2 (`feature_breadcrumbs_v2`)
-
-Instead of showing the horizontal list of breadcrumbs under the filter field, the new UX is an interactive context menu
-triggered by the button to the right of the filter field.
-
 ## Spotlight search (`feature_spotlight`) [In Development]
 
 Switches to a new room search experience.
@@ -168,10 +163,6 @@ Enables rendering of MD / HTML in room topics.
 Enables exploring public spaces in the new search dialog. Requires the server to
 have [MSC3827](https://github.com/matrix-org/matrix-spec-proposals/pull/3827) enabled.
 
-## Favourite Messages (`feature_favourite_messages`) [In Development]
-
-Enables users to bookmark a message or content for a later reference.
-
 ## Sign in another device by showing a QR code (`feature_qr_signin_reciprocate_show`)
 
 Add capability to the session/device manager screens to generate a QR code to sign in another device + set up E2EE. This requires the homeserver to have support for [MSC3882](https://github.com/matrix-org/matrix-spec-proposals/pull/3882) and [MSC3886](https://github.com/matrix-org/matrix-spec-proposals/pull/3886) enabled.

element.io/develop/config.json

@@ -44,7 +44,7 @@
         "feature_video_rooms": true
     },
     "element_call": {
-        "url": "https://element-call.netlify.app"
+        "url": "https://element-call-livekit.netlify.app"
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.33",
+    "version": "1.11.35",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -70,12 +70,12 @@
     },
     "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",
-        "matrix-js-sdk": "26.0.1",
-        "matrix-react-sdk": "3.73.1",
+        "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",
         "react-dom": "17.0.2",
@@ -101,7 +101,7 @@
         "@babel/runtime": "^7.12.5",
         "@casualbot/jest-sonar-reporter": "^2.2.5",
         "@principalstudio/html-webpack-inject-preload": "^1.2.7",
-        "@sentry/webpack-plugin": "^1.18.1",
+        "@sentry/webpack-plugin": "^2.0.0",
         "@svgr/webpack": "^5.5.0",
         "@testing-library/react": "^12.1.5",
         "@types/jest": "^29.0.0",
@@ -123,7 +123,7 @@
         "cpx": "^1.5.0",
         "css-loader": "^4",
         "dotenv": "^16.0.2",
-        "eslint": "8.40.0",
+        "eslint": "8.43.0",
         "eslint-config-google": "^0.14.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-deprecate": "^0.7.0",
@@ -139,7 +139,7 @@
         "fs-extra": "^11.0.0",
         "html-webpack-plugin": "^4.5.2",
         "jest": "^29.0.0",
-        "jest-canvas-mock": "2.4.0",
+        "jest-canvas-mock": "2.5.1",
         "jest-environment-jsdom": "^29.0.0",
         "jest-mock": "^29.0.0",
         "jest-raw-loader": "^1.0.1",
@@ -166,7 +166,7 @@
         "prettier": "2.8.8",
         "raw-loader": "^4.0.2",
         "rimraf": "^5.0.0",
-        "semver": "^7.3.7",
+        "semver": "^7.5.2",
         "simple-proxy-agent": "^1.1.0",
         "string-replace-loader": "3",
         "style-loader": "2",

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
 

src/i18n/strings/nn.json

@@ -8,8 +8,8 @@
     "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: berre muleg å berre spesifiere ein av default_server_config, default_server_name eller default_hs_url.",
-    "Invalid configuration: no default server specified.": "Ugyldig oppsett: Ingen standardserver er spesifisert.",
+    "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.",
     "Go to your browser to complete Sign In": "Opna nettlesaren din for å fullføra innlogginga",
@@ -22,7 +22,7 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s brukar avanserte nettlesarfunksjonar som ikkje er støtta av den gjeldande nettlesaren din.",
     "Use %(brand)s on mobile": "Bruk %(brand)s på mobil",
     "Powered by Matrix": "Driven av Matrix",
-    "Your Element is misconfigured": "Element er feilkonfigurert",
+    "Your Element is misconfigured": "Din Element-klient er sett opp feil",
     "Failed to start": "Klarte ikkje å starta",
     "Open": "Opna",
     "Download Completed": "Nedlasting Fullført",

src/i18n/strings/pt.json

@@ -14,7 +14,7 @@
     "Open": "Abrir",
     "Download Completed": "Transferência concluída",
     "Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o ficheiro de configuração: atualize a página para tentar novamente.",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A configuração do Element contém um JSON inválido. Corrija o problema e recarregue a página.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A sua configuração do Element contém JSON inválido. Por favor, corrija o problema e recarregue a página.",
     "Your Element is misconfigured": "O Element está configurado incorretamente",
     "Powered by Matrix": "Desenvolvido por Matrix",
     "Go to element.io": "Visite element.io",
@@ -23,8 +23,10 @@
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para uma melhor experiência.",
     "Unsupported browser": "Browser não suportado",
     "Failed to start": "Erro ao iniciar",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funções avançadas que não são suportadas pelo teu atual browser.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funcionalidades avançadas que o seu Navegador actual não suporta.",
     "Your browser can't run %(brand)s": "O teu browser não consegue executar %(brand)s",
     "Use %(brand)s on mobile": "Usar %(brand)s no telemóvel",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat descentralizado e encriptado &amp; colaboração alimentada por $matrixLogo"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat descentralizado e encriptado &amp; colaboração alimentada por $matrixLogo",
+    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s",
+    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s em %(osName)s"
 }

src/i18n/strings/vi.json

@@ -23,10 +23,10 @@
     "Unable to load config file: please refresh the page to try again.": "Không thể tải tệp cấu hình: hãy tải lại trang để thử lại.",
     "Failed to start": "Không khởi động được",
     "Use %(brand)s on mobile": "Sử dụng %(brand)s trên di động",
-    "Powered by Matrix": "Được chạy trên giao thức Matrix",
+    "Powered by Matrix": "Chạy trên giao thức Matrix",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Thiết lập Element của bạn đang chứa mã JSON không hợp lệ. Vui lòng sửa lại và tải lại trang.",
     "Your Element is misconfigured": "Element đang bị thiết lập sai",
-    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Dịch vụ nhắn tin & liên lạc được mã hóa, phi tập trung. Được cung cấp bởi $matrixLogo",
+    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Dịch vụ nhắn tin & liên lạc được mã hóa, phi tập trung. Được vận hành trên $matrixLogo",
     "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s trên %(osName)s",
     "%(brand)s Desktop: %(platformName)s": "%(brand)s máy tính: %(platformName)s"
 }

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);
 }
 

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);

src/vector/platform/WebPlatform.ts

@@ -167,7 +167,7 @@ export default class WebPlatform extends VectorBasePlatform {
                 logger.error("Failed to poll for update", err);
                 return {
                     status: UpdateCheckStatus.Error,
-                    detail: err.message || err.status ? err.status.toString() : "Unknown Error",
+                    detail: err.message || (err.status ? err.status.toString() : "Unknown Error"),
                 };
             },
         );

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);
                 });
         });
 

tsconfig.json

@@ -7,16 +7,13 @@
         "module": "commonjs",
         "moduleResolution": "node",
         "target": "es2016",
-        "noImplicitAny": false,
         "noUnusedLocals": true,
         "sourceMap": false,
         "outDir": "./lib",
         "declaration": true,
         "jsx": "react",
         "lib": ["es2020", "dom", "dom.iterable"],
-        "alwaysStrict": true,
-        "strictBindCallApply": true,
-        "noImplicitThis": true
+        "strict": true
     },
     "include": [
         "./node_modules/matrix-js-sdk/src/@types/*.d.ts",

webpack.config.js

@@ -8,7 +8,7 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const TerserPlugin = require("terser-webpack-plugin");
 const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
 const HtmlWebpackInjectPreload = require("@principalstudio/html-webpack-inject-preload");
-const SentryCliPlugin = require("@sentry/webpack-plugin");
+const { sentryWebpackPlugin } = require("@sentry/webpack-plugin");
 const crypto = require("crypto");
 
 // XXX: mangle Crypto::createHash to replace md4 with sha256, output.hashFunction is insufficient as multiple bits
@@ -61,6 +61,15 @@ try {
     // stringify the output so it appears in logs correctly, as large files can sometimes get
     // represented as `<Object>` 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
 }
@@ -660,9 +669,11 @@ module.exports = (env, argv) => {
 
             // upload to sentry if sentry env is present
             process.env.SENTRY_DSN &&
-                new SentryCliPlugin({
+                sentryWebpackPlugin({
                     release: process.env.VERSION,
-                    include: "./webapp/bundles",
+                    sourcemaps: {
+                        paths: "./webapp/bundles/**",
+                    },
                     errorHandler: (err, invokeErr, compilation) => {
                         compilation.warnings.push("Sentry CLI Plugin: " + err.message);
                         console.log(`::warning title=Sentry error::${err.message}`);