Merge branch 'develop' into fix/rerender

Author: rbondesson

.github/workflows/build-and-test.yaml

@@ -206,6 +206,8 @@ jobs:
         needs: prepare_ed
         name: "Desktop Windows"
         uses: ./.github/workflows/build_desktop_windows.yaml
+        # Skip Windows builds on PRs, as the Linux amd64 build is enough of a smoke test and includes the screenshot tests
+        if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'X-Run-All-Tests')
         strategy:
             matrix:
                 arch: [x64, ia32, arm64]
@@ -223,10 +225,13 @@ jobs:
                 arch: [amd64, arm64]
                 runAllTests:
                     - ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'X-Run-All-Tests') }}
-                # We ship static sqlcipher builds, so delegate testing the system builds to the merge queue
                 exclude:
+                    # We ship static sqlcipher builds, so delegate testing the system builds to the merge queue
                     - runAllTests: false
                       sqlcipher: system
+                    # Additionally skip arm64 system builds on PRs, as the amd64 test is enough for a smoke test and includes the screenshot tests
+                    - runAllTests: false
+                      arch: arm64
         with:
             sqlcipher: ${{ matrix.sqlcipher }}
             arch: ${{ matrix.arch }}
@@ -236,6 +241,9 @@ jobs:
         needs: prepare_ed
         name: "Desktop macOS"
         uses: ./.github/workflows/build_desktop_macos.yaml
+        # Skip macOS builds on PRs, as the Linux amd64 build is enough of a smoke test and includes the screenshot tests
+        # and we have a very low limit of concurrent macos runners (5) across the Github org.
+        if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'X-Run-All-Tests')
         with:
             blob_report: true
 

.github/workflows/shared-component-visual-tests-netlify.yaml

@@ -25,9 +25,6 @@ jobs:
             actions: read
             deployments: write
         steps:
-            - name: Install tree
-              run: "sudo apt-get install -y tree"
-
             - name: Download Diffs
               uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
               with:

.github/workflows/shared-component-visual-tests.yaml

@@ -45,11 +45,12 @@ jobs:
               working-directory: packages/shared-components
               run: "pnpm test:storybook --run"
 
-            # Workaround for vis silently adding new baselines if they didn't exist
-            # Can be removed once https://github.com/repobuddy/visual-testing/issues/516 is released
-            - run: |
-                  git add -N .
-                  git diff --exit-code
+            - name: Detect stale screenshots
+              run: |
+                  if diff -rq __baselines__ __results__ | grep "^Only in __baselines__"; then
+                      exit 1
+                  fi
+              working-directory: packages/shared-components/__vis__/linux
 
             - name: Upload received images & diffs
               if: always()

.github/workflows/static_analysis.yaml

@@ -103,7 +103,7 @@ jobs:
                           voip|element_call
                           error|invalid_json
                           error|misconfigured
-                          welcome_to_element
+                          welcome|title_element
                           devtools|settings|elementCallUrl
                           labs|sliding_sync_description
                           settings|voip|noise_suppression_description

apps/desktop/hak/tsconfig.json

@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
-        "moduleResolution": "node",
+        "moduleResolution": "node16",
+        "module": "Node16",
         "esModuleInterop": true,
         "target": "es2022",
         "sourceMap": false,

apps/desktop/package.json

@@ -100,7 +100,7 @@
         "prettier": "^3.0.0",
         "rimraf": "^6.0.0",
         "tar": "^7.5.8",
-        "typescript": "5.9.3"
+        "typescript": "6.0.3"
     },
     "hakDependencies": {
         "matrix-seshat": "4.2.0"

apps/desktop/playwright/element-desktop-test.ts

@@ -17,14 +17,14 @@ import { PassThrough } from "node:stream";
  * A PassThrough stream that captures all data written to it.
  */
 class CapturedPassThrough extends PassThrough {
-    private _chunks = [];
+    private _chunks: any[] = [];
 
     public constructor() {
         super();
         super.on("data", this.onData);
     }
 
-    private onData = (chunk): void => {
+    private onData = (chunk: any): void => {
         this._chunks.push(chunk);
     };
 

apps/desktop/playwright/snapshots/launch/launch.spec.ts/App-launch-should-launch-and-render-the-welcome-view-successfully-1-linux.png

@@ -1,11 +1,12 @@
 {
     "compilerOptions": {
         "resolveJsonModule": true,
-        "moduleResolution": "node",
+        "moduleResolution": "bundler",
         "esModuleInterop": true,
         "target": "es2022",
-        "module": "es2022",
-        "lib": ["es2022", "dom"],
+        "module": "ESNext",
+        "lib": ["es2024", "dom", "dom.iterable"],
+        "strictNullChecks": false,
         "types": ["node"]
     },
     "include": ["**/*.ts"]

apps/desktop/playwright/tsconfig.json

@@ -25,7 +25,7 @@ RUN --mount=type=bind,source=.git,target=/src/.git /src/scripts/docker-package.s
 RUN cp /src/apps/web/config.sample.json /src/apps/web/webapp/config.json
 
 # App
-FROM nginxinc/nginx-unprivileged:alpine-slim@sha256:b5831ee7f7aa827cbae87df4a30a642f62c747d8525f5674365389f3adab278d
+FROM nginxinc/nginx-unprivileged:alpine-slim@sha256:360465db60105a4cbf5215cd9e5a2ba40ef956978dd94f99707e9674050e38ea
 
 # Need root user to install packages & manipulate the usr directory
 USER root