Update typescript-eslint monorepo to v8 (major)

.editorconfig

@@ -1,16 +1,8 @@
+# Copyright 2024 New Vector Ltd.
 # Copyright 2017 Aviral Dasgupta
 #
-# 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.
+# SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+# Please see LICENSE files in the repository root for full details.
 
 root = true
 
@@ -27,3 +19,6 @@ indent_size = 4
 
 [package.json]
 indent_size = 2
+
+[*.tsx.snap]
+trim_trailing_whitespace = false

.eslintignore

@@ -1,4 +1,8 @@
 src/vector/modernizr.js
+test/end-to-end-tests/node_modules/
+test/end-to-end-tests/element/
+test/end-to-end-tests/synapse/
+test/end-to-end-tests/lib/
 # Legacy skinning file that some people might still have
 src/component-index.js
 # Auto-generated file

.eslintrc-module_system.js

@@ -45,24 +45,12 @@ module.exports = {
  name: "matrix-js-sdk/src/index",
  message: "Please use matrix-js-sdk/src/matrix instead",
  },
- {
- name: "matrix-react-sdk",
- message: "Please use matrix-react-sdk/src/index instead",
- },
- {
- name: "matrix-react-sdk/",
- message: "Please use matrix-react-sdk/src/index instead",
- },
  ],
  patterns: [
  {
  group: ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
  message: "Please use matrix-js-sdk/src/* instead",
  },
- {
- group: ["matrix-react-sdk/lib", "matrix-react-sdk/lib/", "matrix-react-sdk/lib/**"],
- message: "Please use matrix-react-sdk/src/* instead",
- },
  ],
  },
  ],

.git-blame-ignore-revs

@@ -1,2 +1,3 @@
 # prettier
+526645c79160ab1ad4b4c3845de27d51263a405e
 7921a6cbf86b035d2b0c1daecb4c24beaf5a5abc

.github/CODEOWNERS

@@ -2,4 +2,17 @@
 /.github/workflows/** @element-hq/element-web-team
 /package.json @element-hq/element-web-team
 /yarn.lock @element-hq/element-web-team
+
+/src/SecurityManager.ts @element-hq/element-crypto-web-reviewers
+/test/SecurityManager-test.ts @element-hq/element-crypto-web-reviewers
+/src/async-components/views/dialogs/security/ @element-hq/element-crypto-web-reviewers
+/src/components/views/dialogs/security/ @element-hq/element-crypto-web-reviewers
+/test/components/views/dialogs/security/ @element-hq/element-crypto-web-reviewers
+/src/stores/SetupEncryptionStore.ts @element-hq/element-crypto-web-reviewers
+/test/stores/SetupEncryptionStore-test.ts @element-hq/element-crypto-web-reviewers
+
+# Ignore translations as those will be updated by GHA for Localazy download
 /src/i18n/strings
+# Ignore the synapse plugin as this is updated by GHA for docker image updating
+/playwright/plugins/homeserver/synapse/index.ts
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,4 +5,4 @@
 - [ ] Tests written for new code (and old code if feasible).
 - [ ] New or updated `public`/`exported` symbols have accurate [TSDoc](https://tsdoc.org/) documentation.
 - [ ] Linter and other CI checks pass.
-- [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/element-hq/element-web/blob/develop/CONTRIBUTING.md)).
+- [ ] I have licensed the changes to Element by completing the [Contributor License Agreement (CLA)](https://cla-assistant.io/element-hq/element-web)

.github/release-drafter.yml

@@ -1,3 +1,3 @@
-_extends: element-hq/matrix-react-sdk
+_extends: matrix-org/matrix-js-sdk
 version-resolver:
  default: patch

.github/workflows/docs.yml

@@ -30,12 +30,6 @@ jobs:
  with:
  path: element-web
 
- - name: Fetch matrix-react-sdk
- uses: actions/checkout@v4
- with:
- repository: element-hq/matrix-react-sdk
- path: matrix-react-sdk
-
  - name: Fetch matrix-js-sdk
  uses: actions/checkout@v4
  with:
@@ -52,7 +46,7 @@ jobs:
  working-directory: element-web
  run: |
  yarn install --frozen-lockfile
- yarn ts-node ./scripts/gen-workflow-mermaid.ts ../element-desktop ../element-web ../matrix-react-sdk ../matrix-js-sdk > docs/automations.md
+ yarn ts-node ./scripts/gen-workflow-mermaid.ts ../element-desktop ../element-web ../matrix-js-sdk > docs/automations.md
  echo "- [Automations](automations.md)" >> docs/SUMMARY.md
 
  - name: Setup mdBook
@@ -74,9 +68,6 @@ jobs:
  mv element-web/docs/lib docs/
  mv element-web/docs "docs/Element Web"
 
- mv matrix-react-sdk/README.md matrix-react-sdk/docs/
- mv matrix-react-sdk/docs "docs/Matrix React SDK"
-
  mv matrix-js-sdk/README.md matrix-js-sdk/docs/
  mv matrix-js-sdk/docs "docs/Matrix JS SDK"
 

.github/workflows/end-to-end-tests-netlify.yaml

@@ -0,0 +1,43 @@
+# Triggers after the playwright tests have finished,
+# taking the artifact and uploading it to Netlify for easier viewing
+name: Upload End to End Test report to Netlify
+on:
+ workflow_run:
+ workflows: ["End to End Tests"]
+ types:
+ - completed
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch || github.run_id }}
+ cancel-in-progress: ${{ github.event.workflow_run.event == 'pull_request' }}
+
+jobs:
+ report:
+ if: github.event.workflow_run.conclusion != 'cancelled'
+ name: Report results
+ runs-on: ubuntu-22.04
+ environment: Netlify
+ permissions:
+ statuses: write
+ deployments: write
+ steps:
+ - name: Download HTML report
+ uses: actions/download-artifact@v4
+ with:
+ github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+ run-id: ${{ github.event.workflow_run.id }}
+ name: html-report
+ path: playwright-report
+
+ - name: 📤 Deploy to Netlify
+ uses: matrix-org/netlify-pr-preview@v3
+ with:
+ path: playwright-report
+ owner: ${{ github.event.workflow_run.head_repository.owner.login }}
+ branch: ${{ github.event.workflow_run.head_branch }}
+ revision: ${{ github.event.workflow_run.head_sha }}
+ token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ site_id: ${{ vars.NETLIFY_SITE_ID }}
+ desc: Playwright Report
+ deployment_env: EndToEndTests
+ prefix: "e2e-"

.github/workflows/end-to-end-tests.yaml

@@ -1,29 +1,190 @@
-# Triggers after the "Downstream artifacts" build has finished, to run the
-# matrix-react-sdk playwright tests (with access to repo secrets)
-
-name: matrix-react-sdk End to End Tests
+# Produce a build of element-web with this version of react-sdk
+# and any matching branches of element-web and js-sdk, output it
+# as an artifact and run end-to-end tests.
+name: End to End Tests
 on:
+ pull_request: {}
  merge_group:
  types: [checks_requested]
- pull_request: {}
  push:
  branches: [develop, master]
+ repository_dispatch:
+ types: [element-web-notify]
+
+ # support triggering from other workflows
+ workflow_call:
+ inputs:
+ skip:
+ type: boolean
+ required: false
+ default: false
+ description: "A boolean to skip the playwright check itself while still creating the passing check. Useful when only running in Merge Queues."
+
+ matrix-js-sdk-sha:
+ type: string
+ required: false
+ description: "The Git SHA of matrix-js-sdk to build against. By default, will use a matching branch name if it exists, or develop."
 
 concurrency:
- group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch || github.run_id }}
- cancel-in-progress: ${{ github.event.workflow_run.event == 'pull_request' }}
+ group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+ cancel-in-progress: true
+
+env:
+ # fetchdep.sh needs to know our PR number
+ PR_NUMBER: ${{ github.event.pull_request.number }}
 
 jobs:
+ build:
+ name: "Build Element-Web"
+ runs-on: ubuntu-22.04
+ if: inputs.skip != true
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v4
+ with:
+ repository: element-hq/element-web
+
+ - uses: actions/setup-node@v4
+ with:
+ cache: "yarn"
+ node-version: "lts/*"
+
+ - name: Fetch layered build
+ id: layered_build
+ env:
+ # tell layered.sh to check out the right sha of the JS-SDK & EW, if they were given one
+ JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
+ run: |
+ scripts/layered.sh
+ JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
+ VECTOR_SHA=$(git rev-parse --short=12 HEAD)
+ echo "VERSION=$VECTOR_SHA--js-$JSSDK_SHA" >> $GITHUB_OUTPUT
+
+ - name: Copy config
+ run: cp element.io/develop/config.json config.json
+
+ - name: Build
+ env:
+ CI_PACKAGE: true
+ VERSION: "${{ steps.layered_build.outputs.VERSION }}"
+ run: |
+ yarn build
+ echo $VERSION > webapp/version
+
+ - name: Upload Artifact
+ uses: actions/upload-artifact@v4
+ with:
+ name: webapp
+ path: webapp
+ retention-days: 1
+
  playwright:
- name: Playwright
- uses: element-hq/matrix-react-sdk/.github/workflows/end-to-end-tests.yaml@develop
+ name: "Run Tests ${{ matrix.runner }}/${{ strategy.job-total }}"
+ needs: build
+ if: inputs.skip != true
+ runs-on: ubuntu-22.04
  permissions:
  actions: read
  issues: read
  pull-requests: read
- with:
- element-web-sha: ${{ github.sha }}
- react-sdk-repository: element-hq/matrix-react-sdk
- # We only want to run the playwright tests on merge queue to prevent regressions
- # from creeping in. They take a long time to run and consume multiple concurrent runners.
- skip: ${{ github.event_name != 'merge_group' }}
+ strategy:
+ fail-fast: false
+ matrix:
+ # Run multiple instances in parallel to speed up the tests
+ runner: [1, 2, 3, 4, 5, 6]
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ persist-credentials: false
+ repository: element-hq/element-web
+
+ - name: 📥 Download artifact
+ uses: actions/download-artifact@v4
+ with:
+ name: webapp
+ path: webapp
+
+ - uses: actions/setup-node@v4
+ with:
+ cache: "yarn"
+ cache-dependency-path: yarn.lock
+ node-version: "lts/*"
+
+ - name: Install dependencies
+ run: yarn install --frozen-lockfile
+
+ - name: Get installed Playwright version
+ id: playwright
+ run: echo "version=$(yarn list --pattern @playwright/test --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name')" >> $GITHUB_OUTPUT
+
+ - name: Cache playwright binaries
+ uses: actions/cache@v4
+ id: playwright-cache
+ with:
+ path: |
+ ~/.cache/ms-playwright
+ key: ${{ runner.os }}-playwright-${{ steps.playwright.outputs.version }}
+
+ - name: Install Playwright browsers
+ if: steps.playwright-cache.outputs.cache-hit != 'true'
+ run: yarn playwright install --with-deps
+
+ - name: Run Playwright tests
+ run: yarn playwright test --shard ${{ matrix.runner }}/${{ strategy.job-total }}
+
+ - name: Upload blob report to GitHub Actions Artifacts
+ if: always()
+ uses: actions/upload-artifact@v4
+ with:
+ name: all-blob-reports-${{ matrix.runner }}
+ path: blob-report
+ retention-days: 1
+
+ complete:
+ name: end-to-end-tests
+ needs: playwright
+ if: always()
+ runs-on: ubuntu-22.04
+ steps:
+ - uses: actions/checkout@v4
+ if: inputs.skip != true
+ with:
+ persist-credentials: false
+ repository: element-hq/element-web
+
+ - uses: actions/setup-node@v4
+ if: inputs.skip != true
+ with:
+ cache: "yarn"
+ node-version: "lts/*"
+
+ - name: Install dependencies
+ if: inputs.skip != true
+ run: yarn install --frozen-lockfile
+
+ - name: Download blob reports from GitHub Actions Artifacts
+ if: inputs.skip != true
+ uses: actions/download-artifact@v4
+ with:
+ pattern: all-blob-reports-*
+ path: all-blob-reports
+ merge-multiple: true
+
+ - name: Merge into HTML Report
+ if: inputs.skip != true
+ run: yarn playwright merge-reports --reporter=html,./playwright/flaky-reporter.ts,./playwright/stale-screenshot-reporter.ts ./all-blob-reports
+ env:
+ # Only pass creds to the flaky-reporter on main branch runs
+ GITHUB_TOKEN: ${{ github.ref_name == 'develop' && secrets.ELEMENT_BOT_TOKEN || '' }}
+
+ # Upload the HTML report even if one of our reporters fails, this can happen when stale screenshots are detected
+ - name: Upload HTML report
+ if: always() && inputs.skip != true
+ uses: actions/upload-artifact@v4
+ with:
+ name: html-report
+ path: playwright-report
+ retention-days: 14
+
+ - if: needs.playwright.result != 'skipped' && needs.playwright.result != 'success'
+ run: exit 1