Merge branch 'develop' into update-shared-components-story-titles

ZacksBot · web-flow · commit 3fcfe4ab7096 · 2026-04-22T11:23:58.000+02:00
diff --git a/.github/actions/download-verify-element-tarball/action.yml b/.github/actions/download-verify-element-tarball/action.yml
@@ -11,7 +11,7 @@ runs:
     using: composite
     steps:
         - name: Download release tarball
-          uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1
+          uses: robinraju/release-downloader@28fc21f50d76778e7023361aa1f863e717d3d56f # v1
           with:
               tag: ${{ inputs.tag }}
               fileName: element-*.tar.gz*
diff --git a/.github/workflows/build_desktop_linux.yaml b/.github/workflows/build_desktop_linux.yaml
@@ -126,7 +126,7 @@ jobs:
             - name: "Get modified files"
               id: changed_files
               if: steps.cache.outputs.cache-hit != 'true' && github.event_name == 'pull_request' && github.repository == 'element-hq/element-web'
-              uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0 # v46
+              uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47
               with:
                   files: |
                       apps/desktop/dockerbuild/**
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -31,7 +31,7 @@ jobs:
                   persist-credentials: false
 
             - name: Install Cosign
-              uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3
+              uses: sigstore/cosign-installer@cad07c2e89fa2edd6e2d7bab4c1aa38e53f76003 # v4.1.1
 
             - name: Set up QEMU
               uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -26,7 +26,7 @@ jobs:
                   persist-credentials: false
 
             - name: Install Cosign
-              uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3
+              uses: sigstore/cosign-installer@cad07c2e89fa2edd6e2d7bab4c1aa38e53f76003 # v4.1.1
               if: github.event_name != 'pull_request'
 
             - name: Set up QEMU
diff --git a/.github/workflows/update-jitsi.yml b/.github/workflows/update-jitsi.yml
@@ -27,7 +27,7 @@ jobs:
               run: "pnpm vendor:jitsi"
 
             - name: Create Pull Request
-              uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8
+              uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   branch: actions/jitsi-update
diff --git a/apps/desktop/.node-version b/apps/desktop/.node-version
@@ -1 +1 @@
-24.14.1
+24.15.0
diff --git a/apps/desktop/dockerbuild/Dockerfile b/apps/desktop/dockerbuild/Dockerfile
@@ -1,7 +1,7 @@
 # Docker image to facilitate building Element Desktop's native bits using a glibc version (2.31)
 # with broader compatibility, down to Debian bullseye & Ubuntu focal.
 
-FROM rust:bullseye@sha256:bc19574c121fe10c1bc68fc2b1ea9b420d87d047a0c50fb1622b282199700cee
+FROM rust:bullseye@sha256:949b0903defbfc4e374dc85f947b153859e9ee0104e425cd9a74d94474a9a335
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -62,13 +62,13 @@
         "electron-window-state": "^5.0.3",
         "minimist": "^1.2.6",
         "png-to-ico": "^3.0.0",
-        "uuid": "^13.0.0"
+        "uuid": "^14.0.0"
     },
     "devDependencies": {
         "@babel/core": "^7.18.10",
         "@babel/preset-env": "^7.18.10",
         "@babel/preset-typescript": "^7.18.6",
-        "@electron/asar": "4.1.2",
+        "@electron/asar": "4.2.0",
         "@electron/fuses": "^2.1.1",
         "@playwright/test": "catalog:",
         "@stylistic/eslint-plugin": "^5.0.0",
@@ -79,12 +79,12 @@
         "@types/pacote": "^11.1.1",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
         "@typescript-eslint/parser": "^8.0.0",
-        "app-builder-lib": "26.8.2",
+        "app-builder-lib": "26.9.0",
         "chokidar": "^5.0.0",
         "detect-libc": "^2.0.0",
-        "electron": "41.1.0",
-        "electron-builder": "26.8.2",
-        "electron-builder-squirrel-windows": "26.8.2",
+        "electron": "41.2.2",
+        "electron-builder": "26.9.0",
+        "electron-builder-squirrel-windows": "26.9.0",
         "electron-devtools-installer": "^4.0.0",
         "eslint": "^8.26.0",
         "eslint-config-google": "^0.14.0",
diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
@@ -1,8 +1,8 @@
-# syntax=docker.io/docker/dockerfile:1.22-labs@sha256:4c116b618ed48404d579b5467127b20986f2a6b29e4b9be2fee841f632db6a86
+# syntax=docker.io/docker/dockerfile:1.23-labs@sha256:7eca9451d94f9b8ad22e44988b92d595d3e4d65163794237949a8c3413fbed5d
 # Context must be the root of the monorepo
 
 # Builder
-FROM --platform=$BUILDPLATFORM node:24-bullseye@sha256:27e462f5db2402700867dfa8ec35e3a68b127fdf61b505db0dd6ab98c38284bb AS builder
+FROM --platform=$BUILDPLATFORM node:24-bullseye@sha256:d2059a9c157c9f70739736979fa3635008bf3ca74560b30930dc181228bc427f AS builder
 
 # Support custom branch of the js-sdk. This also helps us build images of element-web develop.
 ARG USE_CUSTOM_SDKS=false
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -72,7 +72,7 @@
         "glob-to-regexp": "^0.4.1",
         "highlight.js": "^11.3.1",
         "html-entities": "^2.0.0",
-        "html-react-parser": "^5.2.2",
+        "html-react-parser": "^6.0.0",
         "is-ip": "^5.0.0",
         "js-xxhash": "^5.0.0",
         "jsrsasign": "^11.0.0",
@@ -104,7 +104,6 @@
         "sanitize-html": "2.17.3",
         "tar-js": "^0.3.0",
         "ua-parser-js": "1.0.40",
-        "uuid": "^13.0.0",
         "what-input": "^5.2.10"
     },
     "devDependencies": {
@@ -126,7 +125,7 @@
         "@babel/preset-react": "^7.12.10",
         "@babel/preset-typescript": "^7.12.7",
         "@casualbot/jest-sonar-reporter": "2.6.0",
-        "@element-hq/element-call-embedded": "0.18.0",
+        "@element-hq/element-call-embedded": "0.19.1",
         "@element-hq/element-web-playwright-common": "workspace:*",
         "@fetch-mock/jest": "^0.2.20",
         "@jest/globals": "^30.2.0",
@@ -205,14 +204,14 @@
         "mini-css-extract-plugin": "2.10.2",
         "modernizr": "^3.12.0",
         "playwright-core": "catalog:",
-        "postcss": "8.5.8",
+        "postcss": "8.5.10",
         "postcss-easings": "4.0.0",
         "postcss-hexrgba": "2.1.0",
         "postcss-import": "16.1.1",
         "postcss-loader": "8.2.1",
         "postcss-mixins": "12.1.2",
         "postcss-nested": "7.0.2",
-        "postcss-preset-env": "11.2.0",
+        "postcss-preset-env": "11.2.1",
         "postcss-scss": "4.0.9",
         "postcss-simple-vars": "7.0.1",
         "prettier": "3.8.1",
diff --git a/apps/web/playwright/testcontainers/synapse.ts b/apps/web/playwright/testcontainers/synapse.ts
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 import { SynapseContainer as BaseSynapseContainer } from "@element-hq/element-web-playwright-common/lib/testcontainers/index.js";
 
 const DOCKER_IMAGE =
-    "ghcr.io/element-hq/synapse:develop@sha256:926d95954cba30a2568dbe907da6628d8e10e06f2b19901f0ec61eb2993be450";
+    "ghcr.io/element-hq/synapse:develop@sha256:b2fec2c9460f5b297a3a4ce78037902590240a1978301ed1d4bc97918c451041";
 
 /**
  * SynapseContainer which freezes the docker digest to stabilise tests,
diff --git a/apps/web/project.json b/apps/web/project.json
@@ -47,11 +47,9 @@
             "dependsOn": ["^build", "^build:playwright"]
         },
         "test:unit": {
-            "executor": "@nx/jest:jest",
-            "options": {
-                "jestConfig": "{projectRoot}/jest.config.ts",
-                "cwd": "apps/web"
-            },
+            // We avoid the jest executor because it doesn't seem to give any benefit, and it mangles the summary of failing tests.
+            "command": "jest",
+            "options": { "cwd": "apps/web" },
             "dependsOn": ["^build"]
         },
         "test:playwright": {
@@ -60,7 +58,7 @@
             "dependsOn": ["^build:playwright"]
         },
         "test:playwright:screenshots": {
-            "command": "playwright-screenshots nx test:playwright -- --update-snapshots --project=Chrome --grep @screenshot",
+            "command": "playwright-screenshots playwright test --update-snapshots --project=Chrome --grep @screenshot",
             "options": { "cwd": "apps/web" },
             "dependsOn": ["^build:playwright"]
         }
diff --git a/apps/web/src/components/views/dialogs/devtools/StickyEventState.tsx b/apps/web/src/components/views/dialogs/devtools/StickyEventState.tsx
@@ -9,7 +9,6 @@ import React, { type ChangeEvent, useContext, useEffect, useMemo, useState } fro
 import { Pill } from "@element-hq/web-shared-components";
 import { MatrixEvent, type IContent, RoomStickyEventsEvent } from "matrix-js-sdk/src/matrix";
 import { Alert, Form, SettingsToggleInput } from "@vector-im/compound-web";
-import { v4 as uuidv4 } from "uuid";
 
 import BaseTool, { DevtoolsContext, type IDevtoolsProps } from "./BaseTool.tsx";
 import { _t, _td, UserFriendlyError } from "../../../../languageHandler.tsx";
@@ -330,7 +329,7 @@ export const StickyEventEditor: React.FC<IEditorProps> = ({ mxEvent, onBack }) =
     const defaultContent = mxEvent
         ? stringify(mxEvent.getContent())
         : stringify({
-              msc4354_sticky_key: uuidv4(),
+              msc4354_sticky_key: window.crypto.randomUUID(),
           });
     return <EventEditor fieldDefs={fields} defaultContent={defaultContent} onSend={onSend} onBack={onBack} />;
 };
diff --git a/apps/web/src/components/views/messages/CodeBlock.tsx b/apps/web/src/components/views/messages/CodeBlock.tsx
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type JSX, useState } from "react";
 import classNames from "classnames";
-import { type DOMNode, Element as ParserElement, domToReact } from "html-react-parser";
+import { type DOMNode, type Element as ParserElement, domToReact } from "html-react-parser";
 import { textContent, getInnerHTML } from "domutils";
 import { CollapseIcon, CopyIcon, ExpandIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
@@ -113,7 +113,7 @@ const CodeBlock: React.FC<Props> = ({ preNode }) => {
     let content = domToReact(preNode.children as DOMNode[]);
 
     // Add code element if it's missing since we depend on it
-    if (!preNode.children.some((child) => child instanceof ParserElement && child.tagName.toUpperCase() === "CODE")) {
+    if (!preNode.children.some((child) => child.type === "tag" && child.tagName.toUpperCase() === "CODE")) {
         content = <code>{content}</code>;
     }
 
diff --git a/apps/web/src/i18n/strings/zh_Hans.json b/apps/web/src/i18n/strings/zh_Hans.json
@@ -680,6 +680,12 @@
         "unfederated_label_default_on": "如果此房间将用于与拥有自己主服务器的外部团队协作，你可以禁用此功能。此设置以后无法更改。",
         "unsupported_version": "服务器不支持指定的房间版本。"
     },
+    "create_section_dialog": {
+        "create_section": "创建区域",
+        "description": "区域仅对你可见",
+        "label": "区域名称",
+        "title": "创建区域"
+    },
     "create_space": {
         "add_details_prompt": "添加一些信息以便人们识别。",
         "add_details_prompt_2": "你可以随时更改。",
@@ -3077,7 +3083,7 @@
         "category_messages": "消息",
         "category_other": "其它",
         "command_error": "指令出错",
-        "converttodm": "转换房间到私聊",
+        "converttodm": "转换房间为私聊",
         "converttoroom": "转换私聊到房间",
         "could_not_find_room": "无法找到房间",
         "deop": "通过指定的 ID 降权用户",
diff --git a/apps/web/src/renderer/utils.tsx b/apps/web/src/renderer/utils.tsx
@@ -6,7 +6,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type JSX } from "react";
-import { type DOMNode, Element, type HTMLReactParserOptions, type Text } from "html-react-parser";
+import { type DOMNode, type Element, type HTMLReactParserOptions, type Text } from "html-react-parser";
 import { type MatrixEvent, type Room } from "matrix-js-sdk/src/matrix";
 
 /**
@@ -89,7 +89,7 @@ export const combineRenderers =
                     if (result) return result;
                 }
             }
-            if (node instanceof Element) {
+            if (node.type === "tag") {
                 const tagName = node.tagName.toLowerCase() as keyof HTMLElementTagNameMap;
                 for (const replacer of renderers) {
                     const result = replacer[tagName]?.(node, parametersWithReplace, index);
diff --git a/apps/web/src/stores/room-list-v3/section.ts b/apps/web/src/stores/room-list-v3/section.ts
@@ -5,8 +5,6 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import { v4 as uuidv4 } from "uuid";
-
 import { SettingLevel } from "../../settings/SettingLevel";
 import SettingsStore from "../../settings/SettingsStore";
 import Modal from "../../Modal";
@@ -43,7 +41,7 @@ export async function createSection(): Promise<boolean> {
     const [shouldCreateSection, sectionName] = await modal.finished;
     if (!shouldCreateSection || !sectionName) return false;
 
-    const tag = `element.io.section.${uuidv4()}`;
+    const tag = `element.io.section.${window.crypto.randomUUID()}`;
     const newSection: CustomSection = { tag, name: sectionName };
 
     // Save the new section data
diff --git a/apps/web/src/utils/SessionLock.ts b/apps/web/src/utils/SessionLock.ts
@@ -7,7 +7,6 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { logger } from "matrix-js-sdk/src/logger";
-import { v4 as uuidv4 } from "uuid";
 
 /*
  * Functionality for checking that only one instance is running at once
@@ -107,7 +106,7 @@ export function checkSessionLockFree(): boolean {
  */
 export async function getSessionLock(onNewInstance: () => Promise<void>): Promise<boolean> {
     /** unique ID for this session */
-    const sessionIdentifier = uuidv4();
+    const sessionIdentifier = window.crypto.randomUUID();
 
     const prefixedLogger = logger.getChild(`getSessionLock[${sessionIdentifier}]`);
 
diff --git a/apps/web/test/unit-tests/SupportedBrowser-test.ts b/apps/web/test/unit-tests/SupportedBrowser-test.ts
@@ -67,15 +67,15 @@ describe("SupportedBrowser", () => {
         // Safari 26.0 on macOS
         "Mozilla/5.0 (Macintosh; Intel Mac OS X 15_7_2) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Safari/605.1.15",
         // Latest Firefox on macOS Sonoma
-        "Mozilla/5.0 (Macintosh; Intel Mac OS X 15.7; rv:145.0) Gecko/20100101 Firefox/147.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 15.7; rv:150.0) Gecko/20100101 Firefox/150.0",
         // Latest Edge on Windows
         "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36 Edg/146.0.3856.84",
         // Latest Edge on macOS
         "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36 Edg/146.0.3856.84",
         // Latest Firefox on Windows
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:147.0) Gecko/20100101 Firefox/147.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:150.0) Gecko/20100101 Firefox/150.0",
         // Latest Firefox on Linux
-        "Mozilla/5.0 (X11; Linux i686; rv:147.0) Gecko/20100101 Firefox/147.0",
+        "Mozilla/5.0 (X11; Linux i686; rv:150.0) Gecko/20100101 Firefox/150.0",
         // Latest Chrome on Windows
         "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36",
     ])("should not warn for supported browsers", testUserAgentFactory());
diff --git a/apps/web/test/unit-tests/utils/SessionLock-test.ts b/apps/web/test/unit-tests/utils/SessionLock-test.ts
@@ -253,8 +253,6 @@ describe("SessionLock", () => {
 
         // import the dependencies of getSessionLock into the new context
         // eslint-disable-next-line @typescript-eslint/no-require-imports
-        window2._uuid = require("uuid");
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
         window2._logger = require("matrix-js-sdk/src/logger");
         window2.SESSION_LOCK_CONSTANTS = SESSION_LOCK_CONSTANTS;
 
diff --git a/package.json b/package.json
@@ -28,7 +28,6 @@
         "@action-validator/cli": "^0.6.0",
         "@action-validator/core": "^0.6.0",
         "@nx-tools/nx-container": "^7.2.1",
-        "@nx/jest": "^22.5.0",
         "@playwright/test": "catalog:",
         "@types/node": "22",
         "cronstrue": "^3.0.0",
@@ -88,14 +87,14 @@
             "@types/react-dom": "catalog:",
             "oidc-client-ts": "3.5.0",
             "jwt-decode": "4.0.0",
-            "caniuse-lite": "1.0.30001781",
+            "caniuse-lite": "1.0.30001788",
             "markdown-it": "14.1.1",
             "testcontainers": "^11.0.0",
             "matrix-widget-api": "^1.17.0",
             "qs": "6.15.0",
             "@types/node": "18.19.130",
             "config-file-ts": "0.2.8-rc1",
-            "node-abi": "4.27.0",
+            "node-abi": "4.28.0",
             "@types/pg-pool": "2.0.7",
             "ajv@6.12.6": "6.14.0",
             "ajv@>=8 <8.18.0": "8.18.0",
diff --git a/packages/module-api/Dockerfile b/packages/module-api/Dockerfile
@@ -1,6 +1,6 @@
 ARG ELEMENT_VERSION=latest@sha256:c7fa40b5ba3891f8af3ce63da0818f457c1802a9ee4d2f5e46a9df36a2388eed
 
-FROM --platform=$BUILDPLATFORM node:lts-alpine@sha256:01743339035a5c3c11a373cd7c83aeab6ed1457b55da6a69e014a95ac4e4700b AS builder
+FROM --platform=$BUILDPLATFORM node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f AS builder
 
 ARG BUILD_CONTEXT
 
diff --git a/packages/module-api/vite.config.ts b/packages/module-api/vite.config.ts
@@ -11,6 +11,8 @@ import { defineConfig } from "vite";
 import dts from "vite-plugin-dts";
 import externalGlobals from "rollup-plugin-external-globals";
 
+import packageJson from "./package.json" with { type: "json" };
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 export default defineConfig({
@@ -32,7 +34,9 @@ export default defineConfig({
         }),
     ],
     define: {
-        __VERSION__: JSON.stringify(process.env.npm_package_version),
+        // We cannot use `process.env.npm_package_version` as when building element-web with module-api set to `workspace`
+        // this would contain the version of element-web rather than that of the module-api.
+        __VERSION__: JSON.stringify(packageJson.version),
         // Use production mode for the build as it is tested against production builds of Element Web,
         // this is required for React JSX versions to be compatible.
         process: { env: { NODE_ENV: "production" } },
diff --git a/packages/shared-components/package.json b/packages/shared-components/package.json
@@ -56,7 +56,7 @@
         "@vector-im/compound-design-tokens": "catalog:",
         "classnames": "^2.5.1",
         "counterpart": "^0.18.6",
-        "html-react-parser": "^5.2.2",
+        "html-react-parser": "^6.0.0",
         "linkify-html": "4.3.2",
         "linkify-react": "4.3.2",
         "linkify-string": "4.3.2",
@@ -108,7 +108,7 @@
         "eslint-plugin-unicorn": "^56.0.0",
         "prettier": "^3.6.2",
         "storybook": "^10.0.7",
-        "storybook-addon-vis": "^3.1.2",
+        "storybook-addon-vis": "^4.0.0",
         "typedoc": "^0.28.16",
         "typedoc-plugin-markdown": "^4.9.0",
         "typedoc-plugin-missing-exports": "^4.1.2",
@@ -124,6 +124,6 @@
     },
     "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319",
     "peerDependencies": {
-        "@vector-im/compound-web": "^8.3.5"
+        "@vector-im/compound-web": "^8.3.5 || ^9.0.0"
     }
 }
diff --git a/packages/shared-components/src/i18n/strings/zh_Hans.json b/packages/shared-components/src/i18n/strings/zh_Hans.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
