From 2a33d553e43c4f478b0fbac82435cc70694a8fe8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 8 Oct 2024 10:28:51 +0100
Subject: [PATCH] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .env.example      | 14 --------------
 webpack.config.js | 26 ++------------------------
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 .env.example

diff --git a/.env.example b/.env.example
deleted file mode 100644
index df13702cc9..0000000000
--- a/.env.example
+++ /dev/null
@@ -1,14 +0,0 @@
-# To use the full page error dialog, set this to 1. Please report false positives to
-# the issue tracker for handling.
-FULL_PAGE_ERRORS=0
-# To use a single theme, uncomment the line with the theme you want to hot-reload.
-MATRIX_THEMES='light'
-#MATRIX_THEMES='dark'
-#MATRIX_THEMES='legacy-light'
-#MATRIX_THEMES='legacy-dark'
-#MATRIX_THEMES='light-custom'
-#MATRIX_THEMES='dark-custom'
-# You can also enable multiple themes by using a comma-separated list.
-# When multiple themes are enabled, switching between them may require a full page reload.
-# Note that compilation times are proportional to the number of enabled themes.
-#MATRIX_THEMES='light,dark'
diff --git a/webpack.config.js b/webpack.config.js
index 07710306be..ff0e8cfaeb 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -36,15 +36,6 @@ const cssThemes = {
     "theme-dark-custom": "./node_modules/matrix-react-sdk/res/themes/dark-custom/css/dark-custom.pcss",
 };
 
-function getActiveThemes() {
-    // Default to `light` theme when the MATRIX_THEMES environment variable is not defined.
-    const theme = process.env.MATRIX_THEMES ?? "light";
-    return theme
-        .split(",")
-        .map((x) => x.trim())
-        .filter(Boolean);
-}
-
 // See docs/customisations.md
 let fileOverrides = {
     /* {[file: string]: string} */
@@ -129,19 +120,6 @@ module.exports = (env, argv) => {
     const reactSdkSrcDir = path.resolve(require.resolve("matrix-react-sdk/package.json"), "..", "src");
     const jsSdkSrcDir = path.resolve(require.resolve("matrix-js-sdk/package.json"), "..", "src");
 
-    const ACTIVE_THEMES = getActiveThemes();
-    function getThemesImports() {
-        const imports = ACTIVE_THEMES.map((t) => {
-            return cssThemes[`theme-${t}`].replace("./node_modules/", ""); // theme import path
-        });
-        const s = JSON.stringify(ACTIVE_THEMES);
-        return `
-            window.MX_insertedThemeStylesCounter = 0;
-            window.MX_DEV_ACTIVE_THEMES = (${s});
-            ${imports.map((i) => `import("${i}")`).join("\n")};
-        `;
-    }
-
     return {
         ...development,
 
@@ -598,8 +576,8 @@ module.exports = (env, argv) => {
 
             // This exports our CSS using the splitChunks and loaders above.
             new MiniCssExtractPlugin({
-                filename: "bundles/[name].css",
-                chunkFilename: "bundles/[name].css",
+                filename: "bundles/[fullhash]/[name].css",
+                chunkFilename: "bundles/[fullhash]/[name].css",
                 ignoreOrder: false, // Enable to remove warnings about conflicting order
             }),