Merge remote-tracking branch 'github.com/develop' into develop

# Conflicts:
#	package.json
#	res/css/views/rooms/_MessageComposer.pcss
#	src/components/views/rooms/EventTile.tsx
#	src/components/views/rooms/MessageComposer.tsx
#	src/utils/WellKnownUtils.ts
#	yarn.lock

webpack.config.js

@@ -1,3 +1,10 @@
+/*
+Copyright 2025 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
 /* eslint-disable quote-props */
 
 const dotenv = require("dotenv");
@@ -207,13 +214,15 @@ module.exports = (env, argv) => {
                     __dirname,
                     "node_modules/@matrix-org/react-sdk-module-api",
                 ),
-                // and matrix-events-sdk & matrix-widget-api
-                "matrix-events-sdk": path.resolve(__dirname, "node_modules/matrix-events-sdk"),
+                // and matrix-widget-api
                 "matrix-widget-api": path.resolve(__dirname, "node_modules/matrix-widget-api"),
                 "oidc-client-ts": path.resolve(__dirname, "node_modules/oidc-client-ts"),
 
                 // Define a variable so the i18n stuff can load
                 "$webapp": path.resolve(__dirname, "webapp"),
+
+                // Make shared-components imports resolve to EW counterpart
+                "counterpart": path.resolve(__dirname, "node_modules/counterpart"),
             },
             fallback: {
                 // Mock out the NodeFS module: The opus decoder imports this wrongly.
@@ -265,6 +274,10 @@ module.exports = (env, argv) => {
                         // our own source needs babel-ing
                         if (f.startsWith(path.resolve(__dirname, "src"))) return true;
 
+                        // We import the typescript source directly from shared-components
+                        // to avoid having to build as we dev, so include them too.
+                        if (f.startsWith(path.resolve(__dirname, "packages", "shared-components"))) return true;
+
                         // we use the original source files of js-sdk, so we need to
                         // run them through babel. Because the path tested is the resolved, absolute
                         // path, these could be anywhere thanks to yarn link. We must also not
@@ -680,6 +693,12 @@ module.exports = (env, argv) => {
                         context: path.resolve(__dirname, "node_modules/@element-hq/element-call-embedded/dist"),
                         to: path.join(__dirname, "webapp", "widgets", "element-call"),
                     },
+                    // Mobile guide assets
+                    {
+                        from: "assets/**",
+                        context: path.resolve(__dirname, "src/vector/mobile_guide"),
+                        to: "mobile_guide",
+                    },
                 ],
             }),
 
@@ -772,6 +791,8 @@ module.exports = (env, argv) => {
 function getAssetOutputPath(url, resourcePath) {
     const isKaTeX = resourcePath.includes("KaTeX");
     const isFontSource = resourcePath.includes("@fontsource");
+    const mobileGuideAssetsPath = path.join("mobile_guide", "assets");
+    const isMobileGuide = resourcePath.includes(mobileGuideAssetsPath);
     // `res` is the parent dir for our own assets in various layers
     // `dist` is the parent dir for KaTeX assets
     // `files` is the parent dir for @fontsource assets
@@ -805,6 +826,11 @@ function getAssetOutputPath(url, resourcePath) {
         outputDir = "fonts";
     }
 
+    if (isMobileGuide) {
+        // Specific handling for the mobile guide assets, as they live alongside the page sources.
+        outputDir = mobileGuideAssetsPath;
+    }
+
     if (isKaTeX) {
         // Add a clearly named directory segment, rather than leaving the KaTeX
         // assets loose in each asset type directory.