From 4c03780afb6bcfa9ec577ebab53015e3da204159 Mon Sep 17 00:00:00 2001
From: vitorsemeano <vitorsemeano@gmail.com>
Date: Sun, 18 Oct 2020 20:37:54 +0100
Subject: [PATCH] webpack config fixed for production

---
 webpack.common.js | 48 ++++++++++++++++++++++++++++++++++++++++++++++-
 webpack.dev.js    | 46 ---------------------------------------------
 webpack.prod.js   | 44 -------------------------------------------
 3 files changed, 47 insertions(+), 91 deletions(-)

diff --git a/webpack.common.js b/webpack.common.js
index b19cbdbec9..4a401501e0 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
+const packageConfig = require('./package.json');
 
 module.exports = {
     context: path.resolve(__dirname, 'src'),
@@ -16,7 +17,7 @@ module.exports = {
             patterns: [
                 {
                     from: 'config*.json',
-                    to: '/'
+                    to: ''
                 },
                 {
                     from: 'themes/',
@@ -31,6 +32,51 @@ module.exports = {
     },
     module: {
         rules: [
+            {
+                test: /\.(html)$/,
+                use: {
+                    loader: 'html-loader'
+                }
+            },
+            {
+                test: /\.js$/,
+                exclude: /node_modules[\\/](?!date-fns|epubjs)/,
+                use: [{
+                    loader: 'babel-loader',
+                    options: {
+                        presets: packageConfig.babel.presets
+                    }
+                }]
+            },
+            {
+                test: /\.css$/i,
+                use: [
+                    'style-loader',
+                    'css-loader',
+                    {
+                        loader: 'postcss-loader',
+                        options: {
+                            config: {
+                                path: __dirname
+                            }
+                        }
+                    }
+                ]
+            },
+            {
+                test: /\.(png|jpg|gif|svg)$/i,
+                use: ['file-loader']
+            },
+            {
+                test: /\.(woff|woff2|eot|ttf|otf)$/,
+                use: [
+                    'file-loader'
+                ]
+            },
+            {
+                test: /\.(mp3)$/i,
+                use: ['file-loader']
+            },
             {
                 test: require.resolve('jquery'),
                 loader: 'expose-loader',
diff --git a/webpack.dev.js b/webpack.dev.js
index 96b014831c..ba9963411d 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -1,7 +1,6 @@
 const path = require('path');
 const common = require('./webpack.common');
 const merge = require('webpack-merge');
-const packageConfig = require('./package.json');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = merge(common, {
@@ -10,56 +9,11 @@ module.exports = merge(common, {
     devtool: 'source-map',
     module: {
         rules: [
-            {
-                test: /\.(html)$/,
-                use: {
-                    loader: 'html-loader'
-                }
-            },
-            {
-                test: /\.js$/,
-                exclude: /node_modules[\\/](?!date-fns|epubjs|query-string|split-on-first)/,
-                use: [{
-                    loader: 'babel-loader',
-                    options: {
-                        presets: packageConfig.babel.presets
-                    }
-                }]
-            },
             {
                 test: /\.js$/,
                 enforce: 'pre',
                 use: ['source-map-loader']
             },
-            {
-                test: /\.css$/i,
-                use: [
-                    'style-loader',
-                    'css-loader',
-                    {
-                        loader: 'postcss-loader',
-                        options: {
-                            config: {
-                                path: __dirname
-                            }
-                        }
-                    }
-                ]
-            },
-            {
-                test: /\.(png|jpg|gif|svg)$/i,
-                use: ['file-loader']
-            },
-            {
-                test: /\.(woff|woff2|eot|ttf|otf)$/,
-                use: [
-                    'file-loader'
-                ]
-            },
-            {
-                test: /\.(mp3)$/i,
-                use: ['file-loader']
-            }
         ]
     },
     plugins: [
diff --git a/webpack.prod.js b/webpack.prod.js
index d27e32b7ad..c4e17ea9dc 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -1,51 +1,7 @@
 const common = require('./webpack.common');
 const merge = require('webpack-merge');
-const packageConfig = require('./package.json');
 
 module.exports = merge(common, {
     mode: 'production',
     entry: './scripts/site.js',
-    module: {
-        rules: [
-            {
-                test: /\.js$/,
-                exclude: /node_modules[\\/](?!date-fns|epubjs|libarchive|jellyfin-apiclient|query-string|split-on-first|strict-uri-encode|xmldom)/,
-                use: {
-                    loader: 'babel-loader',
-                    options: {
-                        presets: packageConfig.babel.presets
-                    }
-                }
-            },
-            {
-                test: /\.css$/i,
-                use: [
-                    'style-loader',
-                    'css-loader',
-                    {
-                        loader: 'postcss-loader',
-                        options: {
-                            config: {
-                                path: __dirname
-                            }
-                        }
-                    }
-                ]
-            },
-            {
-                test: /\.(png|jpg|gif)$/i,
-                use: ['file-loader']
-            },
-            {
-                test: /\.(woff|woff2|eot|ttf|otf)$/,
-                use: [
-                    'file-loader'
-                ]
-            },
-            {
-                test: /\.(mp3)$/i,
-                use: ['file-loader']
-            }
-        ]
-    }
 });