Merge branch 'matrix-org:develop' into improve-message-voiceover

.eslintrc.js

@@ -169,7 +169,7 @@ module.exports = {
     },
     overrides: [
         {
-            files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "cypress/**/*.ts", "playwright/**/*.ts"],
+            files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "playwright/**/*.ts"],
             extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
             rules: {
                 "@typescript-eslint/explicit-function-return-type": [
@@ -233,14 +233,14 @@ module.exports = {
             },
         },
         {
-            files: ["test/**/*.{ts,tsx}", "cypress/**/*.ts", "playwright/**/*.ts"],
+            files: ["test/**/*.{ts,tsx}", "playwright/**/*.ts"],
             extends: ["plugin:matrix-org/jest"],
             rules: {
                 // We don't need super strict typing in test utilities
                 "@typescript-eslint/explicit-function-return-type": "off",
                 "@typescript-eslint/explicit-member-accessibility": "off",
 
-                // Jest/Cypress specific
+                // Jest/Playwright specific
 
                 // Disabled tests are a reality for now but as soon as all of the xits are
                 // eliminated, we should enforce this.
@@ -255,29 +255,11 @@ module.exports = {
                 ],
             },
         },
-        {
-            files: ["cypress/**/*.ts"],
-            parserOptions: {
-                project: ["./cypress/tsconfig.json"],
-            },
-            rules: {
-                // Cypress "promises" work differently - disable some related rules
-                "jest/valid-expect": "off",
-                "jest/valid-expect-in-promise": "off",
-                "jest/no-done-callback": "off",
-            },
-        },
         {
             files: ["playwright/**/*.ts"],
             parserOptions: {
                 project: ["./playwright/tsconfig.json"],
             },
-            rules: {
-                // Cypress "promises" work differently - disable some related rules
-                "jest/valid-expect": "off",
-                "jest/valid-expect-in-promise": "off",
-                "jest/no-done-callback": "off",
-            },
         },
     ],
     settings: {

.github/CODEOWNERS

@@ -1,5 +1,14 @@
-*                         @matrix-org/element-web
-/.github/workflows/**     @matrix-org/element-web-app-team
-/package.json             @matrix-org/element-web-app-team
-/yarn.lock                @matrix-org/element-web-app-team
+*                         @matrix-org/element-web-reviewers
+/.github/workflows/**     @matrix-org/element-web-team
+/package.json             @matrix-org/element-web-team
+/yarn.lock                @matrix-org/element-web-team
+
+/src/SecurityManager.ts                           @matrix-org/element-crypto-web-reviewers
+/test/SecurityManager-test.ts                     @matrix-org/element-crypto-web-reviewers
+/src/async-components/views/dialogs/security/     @matrix-org/element-crypto-web-reviewers
+/src/components/views/dialogs/security/           @matrix-org/element-crypto-web-reviewers
+/test/components/views/dialogs/security/          @matrix-org/element-crypto-web-reviewers
+/src/stores/SetupEncryptionStore.ts               @matrix-org/element-crypto-web-reviewers
+/test/stores/SetupEncryptionStore-test.ts         @matrix-org/element-crypto-web-reviewers
+
 /src/i18n/strings

.github/workflows/element-web.yaml

@@ -3,12 +3,6 @@
 # as an artifact and run integration tests.
 name: Element Web - Build
 on:
-    # We only need the nightly run for Percy which is disabled while we're
-    # figuring out https://github.com/vector-im/wat-internal/issues/36 and
-    # https://github.com/vector-im/wat-internal/issues/56. We're hoping to
-    # turn it back on or switch to an alternative in the future.
-    # schedule:
-    #     - cron: "17 4 * * 1-5" # every weekday at 04:17 UTC
     pull_request: {}
     merge_group:
         types: [checks_requested]
@@ -29,6 +23,10 @@ on:
                 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."
+            element-web-sha:
+                type: string
+                required: false
+                description: "The Git SHA of element-web to build against. By default, will use a matching branch name if it exists, or develop."
 
 concurrency:
     group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
@@ -55,8 +53,9 @@ jobs:
             - name: Fetch layered build
               id: layered_build
               env:
-                  # tell layered.sh to check out the right sha of the JS-SDK, if we were given one
+                  # 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 }}
+                  ELEMENT_WEB_GITHUB_BASE_REF: ${{ inputs.element-web-sha }}
               run: |
                   scripts/ci/layered.sh
                   JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
@@ -77,13 +76,13 @@ jobs:
                   echo $VERSION > webapp/version
               working-directory: ./element-web
 
-            # Record the react-sdk sha so our cypress tests are from the same sha
+            # Record the react-sdk sha so our Playwright tests are from the same sha
             - name: Record react-sdk SHA
               run: |
                   git rev-parse HEAD > element-web/webapp/sha
 
             - name: Upload Artifact
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: previewbuild
                   path: element-web/webapp