Merge branch 'develop' of ssh://github.com/element-hq/element-web into renovate/npm-minor-patch

t3chguy · t3chguy · commit bf0e36e35672 · 2026-03-20T15:13:20.000Z
# Conflicts:
#	pnpm-lock.yaml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
               with:
                   persist-credentials: false
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               with:
                   # Disable cache on Windows as it is slower than not caching
diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
@@ -32,7 +32,7 @@ jobs:
               with:
                   persist-credentials: false
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               with:
                   cache: "pnpm"
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -37,13 +37,13 @@ jobs:
               uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3
+              uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4
 
             - name: Set up Docker Buildx
               id: builder
-              uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
+              uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               with:
                   node-version-file: package.json
@@ -53,7 +53,7 @@ jobs:
               run: "pnpm install --frozen-lockfile"
 
             - name: Login to GitHub Container Registry
-              uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+              uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
               with:
                   registry: ghcr.io
                   username: ${{ github.repository_owner }}
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -30,16 +30,16 @@ jobs:
               if: github.event_name != 'pull_request'
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3
+              uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
+              uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
               with:
                   install: true
 
             - name: Build and load
               id: test-build
-              uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
+              uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
               with:
                   context: .
                   file: apps/web/Dockerfile
@@ -83,7 +83,7 @@ jobs:
 
             - name: Docker meta
               id: meta
-              uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5
+              uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6
               if: github.event_name != 'pull_request'
               with:
                   images: |
@@ -97,22 +97,22 @@ jobs:
                       latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
 
             - name: Login to Docker Hub
-              uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+              uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
               if: github.event_name != 'pull_request'
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             - name: Login to GitHub Container Registry
-              uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+              uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
               if: github.event_name != 'pull_request'
               with:
                   registry: ghcr.io
                   username: ${{ github.repository_owner }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Connect to Tailscale
-              uses: tailscale/github-action@53acf823325fe9ca47f4cdaa951f90b4b0de5bb9 # v4
+              uses: tailscale/github-action@306e68a486fd2350f2bfc3b19fcd143891a4a2d8 # v4
               if: github.event_name != 'pull_request'
               with:
                   oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
@@ -140,7 +140,7 @@ jobs:
                       services/web-repositories/secret/data/oci.element.io password | OCI_PASSWORD ;
 
             - name: Login to oci.element.io Registry
-              uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+              uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
               if: github.event_name != 'pull_request'
               with:
                   registry: oci-push.vpn.infra.element.io
@@ -149,7 +149,7 @@ jobs:
 
             - name: Build and push
               id: build-and-push
-              uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
+              uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
               if: github.event_name != 'pull_request'
               with:
                   context: .
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -36,7 +36,7 @@ jobs:
                   path: matrix-js-sdk
                   persist-credentials: false
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
               with:
                   package_json_file: element-web/package.json
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
@@ -56,7 +56,7 @@ jobs:
                   repository: element-hq/element-web
                   persist-credentials: false
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               with:
                   cache: "pnpm"
@@ -138,7 +138,7 @@ jobs:
                   name: webapp
                   path: apps/web/webapp
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               with:
                   cache: "pnpm"
@@ -211,7 +211,7 @@ jobs:
                   persist-credentials: false
                   repository: element-hq/element-web
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
               if: inputs.skip != true
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               if: inputs.skip != true
diff --git a/.github/workflows/shared-component-publish.yaml b/.github/workflows/shared-component-publish.yaml
@@ -17,7 +17,7 @@ jobs:
               with:
                   persist-credentials: false
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - name: 🔧 Set up node environment
               uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               with:
diff --git a/.github/workflows/shared-component-storybook-build.yml b/.github/workflows/shared-component-storybook-build.yml
@@ -16,7 +16,7 @@ jobs:
               with:
                   persist-credentials: false
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - name: 🔧 Pnpm cache
               uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               with:
diff --git a/.github/workflows/shared-component-visual-tests.yaml b/.github/workflows/shared-component-visual-tests.yaml
@@ -26,7 +26,7 @@ jobs:
                   persist-credentials: false
                   repository: element-hq/element-web
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               with:
                   cache: "pnpm"
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -52,7 +52,7 @@ jobs:
               with:
                   persist-credentials: false
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               if: matrix.install != ''
               with:
@@ -110,7 +110,7 @@ jobs:
                     - name: Shared Components
                       path: "packages/shared-components"
         name: "i18n Check (${{ matrix.name }})"
-        uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@abf186831e2acb3e98fca13a0711a3fa1364d2b1
+        uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@6eda3835118f3bc3fb658a1a3c20b7da9d16ae42
         permissions:
             pull-requests: read
         with:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -45,7 +45,7 @@ jobs:
                   repository: ${{ inputs.matrix-js-sdk-sha && 'element-hq/element-web' || github.repository }}
                   persist-credentials: false
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - name: pnpm cache
               uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               with:
@@ -132,7 +132,7 @@ jobs:
                   repository: ${{ inputs.matrix-js-sdk-sha && 'element-hq/element-web' || github.repository }}
                   persist-credentials: false
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - name: pnpm cache
               uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               with:
diff --git a/.github/workflows/update-jitsi.yml b/.github/workflows/update-jitsi.yml
@@ -13,7 +13,7 @@ jobs:
               with:
                   persist-credentials: false
 
-            - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+            - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
             - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
               with:
                   cache: "pnpm"
diff --git a/apps/web/.dockerignore b/apps/web/.dockerignore
diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
@@ -1,7 +1,8 @@
-# syntax=docker.io/docker/dockerfile:1.21-labs@sha256:2e681d22e86e738a057075f930b81b2ab8bc2a34cd16001484a7453cfa7a03fb
+# syntax=docker.io/docker/dockerfile:1.22-labs@sha256:4c116b618ed48404d579b5467127b20986f2a6b29e4b9be2fee841f632db6a86
+# Context must be the root of the monorepo
 
 # Builder
-FROM --platform=$BUILDPLATFORM node:24-bullseye@sha256:d83f76ec9956d35fe14221022e8b5a87a5de6fcdb4edb1187eddeb7dc80cba71 AS builder
+FROM --platform=$BUILDPLATFORM node:24-bullseye@sha256:4bfbd78e049926e4ca595c1798810691ca7bb5aedd829ffd8a78b2ab30689810 AS builder
 
 # Support custom branch of the js-sdk. This also helps us build images of element-web develop.
 ARG USE_CUSTOM_SDKS=false
@@ -10,17 +11,21 @@ ARG JS_SDK_BRANCH="master"
 
 WORKDIR /src
 
-COPY --exclude=docker . /src
+# Install dependencies
+COPY --parents package.json pnpm-lock.yaml pnpm-workspace.yaml patches scripts **/package.json /src/
 RUN corepack enable
-RUN /src/scripts/docker-link-repos.sh
+RUN --mount=type=bind,source=.git,target=/src/.git /src/scripts/docker-link-repos.sh
 RUN pnpm install
-RUN /src/scripts/docker-package.sh
+
+# Build
+COPY --link --exclude=.git --exclude=apps/web/docker . /src
+RUN --mount=type=bind,source=.git,target=/src/.git /src/scripts/docker-package.sh
 
 # Copy the config now so that we don't create another layer in the app image
 RUN cp /src/apps/web/config.sample.json /src/apps/web/webapp/config.json
 
 # App
-FROM nginxinc/nginx-unprivileged:alpine-slim@sha256:800307aaf07c143f5d90aa9d4269cc1971dcfe5aee7cabd11579ac4c6bcf198f
+FROM nginxinc/nginx-unprivileged:alpine-slim@sha256:4011c42f28e9b54c86b52211598dbc6bcaa520311ddd55f211587cdd71f88a9c
 
 # Need root user to install packages & manipulate the usr directory
 USER root
diff --git a/apps/web/Dockerfile.dockerignore b/apps/web/Dockerfile.dockerignore
@@ -0,0 +1,28 @@
+# Exclude a bunch of stuff which can make the build context a larger than it needs to be
+**/test/
+**/*.stories.tsx
+**/*.test.ts
+**/*.test.tsx
+**/lib/
+**/dist/
+**/node_modules/
+**/coverage/
+**/.pnpm-store
+**/tsconfig.node.tsbuildinfo
+**/*.md
+**/*.rst
+
+.idea/
+.tmp/
+.nx/
+.link-config
+
+apps/web/config.json*
+apps/web/webpack-stats.json
+apps/web/playwright/
+apps/web/webapp/
+apps/web/debian/
+
+packages/shared-components/__vis__/
+packages/shared-components/storybook-static/
+packages/shared-components/typedoc/
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -43,7 +43,7 @@
         "@fontsource/fira-code": "^5",
         "@fontsource/inter": "catalog:",
         "@formatjs/intl-segmenter": "^12.0.0",
-        "@matrix-org/analytics-events": "^0.32.0",
+        "@matrix-org/analytics-events": "^0.33.0",
         "@matrix-org/emojibase-bindings": "^1.5.0",
         "@matrix-org/react-sdk-module-api": "^2.4.0",
         "@sentry/browser": "^10.0.0",
diff --git a/apps/web/playwright/testcontainers/mas.ts b/apps/web/playwright/testcontainers/mas.ts
@@ -11,7 +11,7 @@ import {
 } from "@element-hq/element-web-playwright-common/lib/testcontainers/index.js";
 
 const DOCKER_IMAGE =
-    "ghcr.io/element-hq/matrix-authentication-service:main@sha256:baa02c35e22dec0aad82b03de3157acd33b7b727a4b5fc68a67c512f0204684e";
+    "ghcr.io/element-hq/matrix-authentication-service:main@sha256:8065b3693143b93b82f446f0079c15e5d7c9e2eddd22bf828c763f5dd3a34a3e";
 
 /**
  * MatrixAuthenticationServiceContainer which freezes the docker digest to
diff --git a/apps/web/src/viewmodels/room-list/RoomListViewModel.ts b/apps/web/src/viewmodels/room-list/RoomListViewModel.ts
@@ -52,6 +52,9 @@ export class RoomListViewModel
 
     // Child view model management
     private roomItemViewModels = new Map<string, RoomListItemViewModel>();
+    // This map is intentionally additive (never cleared except on space changes) to avoid a race condition:
+    // a list update can refresh roomsResult and roomsMap before the view re-renders, so the view may still
+    // request a view model for a room that was removed from the latest list. Keeping old entries prevents a crash.
     private roomsMap = new Map<string, Room>();
 
     public constructor(props: RoomListViewModelProps) {
@@ -142,11 +145,11 @@ export class RoomListViewModel
     };
 
     /**
-     * Rebuild roomsMap when roomsResult changes.
+     * Add rooms from the RoomsResult to the roomsMap for quick lookup.
+     * This does not clear the roomsMap.
      * This maintains a quick lookup for room objects.
      */
     private updateRoomsMap(roomsResult: RoomsResult): void {
-        this.roomsMap.clear();
         for (const room of roomsResult.rooms) {
             this.roomsMap.set(room.roomId, room);
         }
@@ -181,11 +184,15 @@ export class RoomListViewModel
         let viewModel = this.roomItemViewModels.get(roomId);
 
         if (!viewModel) {
-            const room = this.roomsMap.get(roomId);
+            let room = this.roomsMap.get(roomId);
             if (!room) {
-                throw new Error(`Room ${roomId} not found in roomsMap`);
+                // Maybe the roomsMap is out of date due to a recent roomsResult change that hasn't been applied yet (race condition)
+                this.updateRoomsMap(this.roomsResult);
+                room = this.roomsMap.get(roomId);
             }
 
+            if (!room) throw new Error(`Room ${roomId} not found in roomsMap`);
+
             // Create new view model
             viewModel = new RoomListItemViewModel({
                 room,
@@ -298,8 +305,6 @@ export class RoomListViewModel
 
         // Refresh room data from store
         this.roomsResult = RoomListStoreV3.instance.getSortedRoomsInActiveSpace(filterKeys);
-        this.updateRoomsMap(this.roomsResult);
-
         const newSpaceId = this.roomsResult.spaceId;
 
         // Detect space change
@@ -308,6 +313,10 @@ export class RoomListViewModel
             // We only want to do this on space changes, not on regular list updates, to preserve view models when possible
             // The view models are disposed when scrolling out of view (handled by updateVisibleRooms)
             this.clearViewModels();
+            // Clear roomsMap to prevent stale room data - it will be repopulated with the new roomsResult
+            this.roomsMap.clear();
+
+            this.updateRoomsMap(this.roomsResult);
 
             // Space changed - get the last selected room for the new space to prevent flicker
             const lastSelectedRoom = SpaceStore.instance.getLastSelectedRoomIdForSpace(newSpaceId);
@@ -316,6 +325,8 @@ export class RoomListViewModel
             return;
         }
 
+        this.updateRoomsMap(this.roomsResult);
+
         // Normal room list update (not a space change)
         this.updateRoomListData();
     };
diff --git a/apps/web/test/unit-tests/SupportedBrowser-test.ts b/apps/web/test/unit-tests/SupportedBrowser-test.ts
diff --git a/apps/web/test/viewmodels/room-list/RoomListViewModel-test.tsx b/apps/web/test/viewmodels/room-list/RoomListViewModel-test.tsx
diff --git a/package.json b/package.json
diff --git a/packages/shared-components/patches/@matrix-org+react-sdk-module-api+2.5.0.patch b/packages/shared-components/patches/@matrix-org+react-sdk-module-api+2.5.0.patch
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
