From cbcd247b77c187426cfd4525e5ae35eb82915668 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2026 13:10:47 +0100
Subject: [PATCH] Iterate

---
 apps/web/jest.config.ts    |  2 --
 apps/web/webpack.config.ts | 13 +------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/apps/web/jest.config.ts b/apps/web/jest.config.ts
index 5d3d16f464..37c2a1d9e7 100644
--- a/apps/web/jest.config.ts
+++ b/apps/web/jest.config.ts
@@ -33,8 +33,6 @@ const config: Config = {
         "\\$webapp/i18n/languages.json": "<rootDir>/__mocks__/languages.json",
         "^react$": "<rootDir>/../../node_modules/react",
         "^react-dom$": "<rootDir>/../../node_modules/react-dom",
-        "^matrix-js-sdk$": "<rootDir>/../../node_modules/matrix-js-sdk/src",
-        "^matrix-react-sdk$": "<rootDir>/src",
         "decoderWorker\\.min\\.js": "<rootDir>/__mocks__/empty.js",
         "decoderWorker\\.min\\.wasm": "<rootDir>/__mocks__/empty.js",
         "waveWorker\\.min\\.js": "<rootDir>/__mocks__/empty.js",
diff --git a/apps/web/webpack.config.ts b/apps/web/webpack.config.ts
index f6b0c0c6d9..48220d296d 100644
--- a/apps/web/webpack.config.ts
+++ b/apps/web/webpack.config.ts
@@ -153,11 +153,6 @@ export default (env: string, argv: Record<string, any>): webpack.Configuration =
         development["devtool"] = "source-map";
     }
 
-    // Resolve the directories for the js-sdk for later use. We resolve these early, so we
-    // don't have to call them over and over. We also resolve to the package.json instead of the src
-    // directory, so we don't have to rely on an index.js or similar file existing.
-    const jsSdkSrcDir = path.join(getPackageRoot("matrix-js-sdk"), "src");
-
     return {
         ...development,
 
@@ -241,7 +236,7 @@ export default (env: string, argv: Record<string, any>): webpack.Configuration =
                 "react": getPackageRoot("react"),
                 "react-dom": getPackageRoot("react-dom"),
 
-                // Same goes for js/react-sdk - we don't need two copies.
+                // Same goes for js-sdk/module-api - we don't need two copies.
                 "matrix-js-sdk": getPackageRoot("matrix-js-sdk"),
                 "@matrix-org/react-sdk-module-api": getPackageRoot("@matrix-org/react-sdk-module-api"),
                 // and matrix-widget-api
@@ -305,12 +300,6 @@ export default (env: string, argv: Record<string, any>): webpack.Configuration =
                         // our own source needs babel-ing
                         if (f.startsWith(path.resolve(__dirname, "src"))) 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 linking. We must also not
-                        // include node modules inside these modules, so we add 'src'.
-                        if (f.startsWith(jsSdkSrcDir)) return true;
-
                         // Some of the syntax in this package is not understood by
                         // either webpack or our babel setup.
                         // When we do get to upgrade our current setup, this should