From 66eebbe8e8f3f7ea82050fac842d172829bdc438 Mon Sep 17 00:00:00 2001
From: Matthew Kalinin <matthew44@mappable.world>
Date: Tue, 15 Oct 2024 11:02:57 +0300
Subject: [PATCH] rewrite webpack config

---
 webpack.config.js | 59 +++++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index bae70cb..73f7ff8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,34 +3,43 @@ const path = require('path');
 
 const ESM_BUILD = process.env.ESM_BUILD === 'true';
 
-/**
- * `style-loader` injects css styles directly into the DOM.
- * In the ESM build, all styles are assembled into a separate file (`index.css`),
- * so styles do not need to be injected directly into the DOM
- */
-const replaceStyleLoaderToCssExtract = (moduleRules) => {
-    moduleRules.forEach((loaderRule) => {
-        if (!loaderRule.use) {
-            return;
-        }
-        loaderRule.use.forEach((loader, index) => {
-            if (loader === 'style-loader') {
-                loaderRule.use[index] = MiniCssExtractPlugin.loader;
-            }
-        });
-    });
-};
-
 module.exports = (args, env, dir = process.cwd()) => {
     const coreWebpackModule = require('@mappable-world/mappable-cli/webpack.config')(args, env, dir);
 
-    if (ESM_BUILD) {
-        coreWebpackModule.experiments = {outputModule: true};
-        coreWebpackModule.entry = {index: {import: './src/index.ts', library: {type: 'module'}}};
-        coreWebpackModule.output.path = path.resolve(dir, 'dist/esm');
-        coreWebpackModule.plugins = [new MiniCssExtractPlugin()];
-        replaceStyleLoaderToCssExtract(coreWebpackModule.module.rules);
+    if (!ESM_BUILD) {
+        return coreWebpackModule;
     }
 
-    return coreWebpackModule;
+    return {
+        ...coreWebpackModule,
+        experiments: {outputModule: true},
+        entry: {index: {import: './src/index.ts', library: {type: 'module'}}},
+        output: {...coreWebpackModule.output, path: path.resolve(dir, 'dist/esm')},
+        plugins: [new MiniCssExtractPlugin()],
+        module: {
+            rules: [
+                {
+                    test: /\.(ts|tsx)$/i,
+                    loader: 'ts-loader',
+                    options: {
+                        compilerOptions: {declaration: true, declarationDir: 'dist/types'},
+                        onlyCompileBundledFiles: true
+                    },
+                    exclude: ['/node_modules/']
+                },
+                {
+                    test: /\.css$/i,
+                    use: [MiniCssExtractPlugin.loader, 'css-loader', 'postcss-loader']
+                },
+                {
+                    test: /\.(eot|ttf|woff|woff2|png|jpg|gif)$/i,
+                    type: 'asset'
+                },
+                {
+                    test: /\.(svg|frag|vert)$/i,
+                    oneOf: [{resourceQuery: /inline/, type: 'asset/inline'}, {type: 'asset/source'}]
+                }
+            ]
+        }
+    };
 };