Merge branch 'main' of github.com:/element-hq/element-web-modules into t3chguy/wat/382

# Conflicts:
#	modules/restricted-guests/element-web/e2e/snapshots/restricted-guests.spec.ts/login-legacy-linux.png
#	modules/restricted-guests/element-web/e2e/snapshots/restricted-guests.spec.ts/login-mas-linux.png
#	playwright.config.ts

modules/banner/element-web/e2e/banner.spec.ts

@@ -26,7 +26,7 @@ test.describe("Banner", () => {
             for (const path of ["logo.svg", "app1.png", "app2.png", "opendesk/"]) {
                 await context.route(`/${path}*`, async (route) => {
                     const file = new URL(route.request().url()).pathname;
-                    await route.fulfill({ path: `${moduleDir}/tests/fixture/${file}` });
+                    await route.fulfill({ path: `${moduleDir}/e2e/fixture/${file}` });
                 });
             }
 
@@ -107,13 +107,13 @@ test.describe("Banner", () => {
                 await context.route("http://localhost:8080/ics/navigation.json*", async (route) => {
                     await navigationJsonResolver.promise;
                     await route.fulfill({
-                        path: `${moduleDir}/tests/fixture/navigation.json`,
+                        path: `${moduleDir}/e2e/fixture/navigation.json`,
                         contentType: "application/json",
                     });
                 });
                 await context.route("http://localhost:8080/ics/silent", async (route) => {
                     await route.fulfill({
-                        path: `${moduleDir}/tests/fixture/silent/index.html`,
+                        path: `${moduleDir}/e2e/fixture/silent/index.html`,
                         contentType: "text/html",
                     });
                 });

modules/banner/element-web/package.json

@@ -17,7 +17,7 @@
         "@types/node": "^22.10.7",
         "@types/react": "^19",
         "@vitejs/plugin-react": "^5.0.0",
-        "react": "^19",
+        "react": "19.2.4",
         "rollup-plugin-external-globals": "^0.13.0",
         "typescript": "^5.7.3",
         "vite": "^7.1.11",

modules/opendesk/element-web/e2e/opendesk.spec.ts

@@ -51,20 +51,20 @@ test.use({
     page: async ({ context, page, moduleDir }, use) => {
         for (const path of ["logo.svg", "app1.png", "app2.png"]) {
             await context.route(`/${path}*`, async (route) => {
-                await route.fulfill({ path: `${moduleDir}/tests/fixture/${path}` });
+                await route.fulfill({ path: `${moduleDir}/e2e/fixture/${path}` });
             });
         }
         await context.route("http://localhost:8080/ics/navigation.json*", async (route) => {
             await route.fulfill({
-                path: `${moduleDir}/tests/fixture/navigation.json`,
+                path: `${moduleDir}/e2e/fixture/navigation.json`,
                 contentType: "application/json",
             });
         });
         await context.route("http://localhost:8080/ics/silent", async (route) => {
-            await route.fulfill({ path: `${moduleDir}/tests/fixture/silent-login.html`, contentType: "text/html" });
+            await route.fulfill({ path: `${moduleDir}/e2e/fixture/silent-login.html`, contentType: "text/html" });
         });
         await context.route("http://localhost:8080/widget.html*", async (route) => {
-            await route.fulfill({ path: `${moduleDir}/tests/fixture/widget.html`, contentType: "text/html" });
+            await route.fulfill({ path: `${moduleDir}/e2e/fixture/widget.html`, contentType: "text/html" });
         });
 
         await page.goto("/");

modules/opendesk/element-web/package.json

@@ -22,8 +22,8 @@
         "@types/node": "^22.10.7",
         "@types/react": "^19",
         "@vitejs/plugin-react": "^5.0.0",
-        "react": "^19",
-        "react-dom": "^19",
+        "react": "19.2.4",
+        "react-dom": "19.2.4",
         "rollup-plugin-external-globals": "^0.13.0",
         "typescript": "^5.7.3",
         "vite": "^7.1.11",

modules/restricted-guests/element-web/package.json

@@ -17,7 +17,7 @@
         "@types/node": "^22.10.7",
         "@types/react": "^19",
         "@vitejs/plugin-react": "^5.0.0",
-        "react": "^19",
+        "react": "19.2.4",
         "rollup-plugin-external-globals": "^0.13.0",
         "typescript": "^5.7.3",
         "vite": "^7.1.11",