Improve webpack

sfu-dhil · Oct 11, 2023 · b4b2ff1 · b4b2ff1
1 parent 4b2ec1d
commit b4b2ff1
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 22 deletions.
diff --git a/public/js/dist/main.js.map b/public/js/dist/main.js.map
diff --git a/public/js/dist/main.js → public/js/dist/mvm.js b/public/js/dist/main.js → public/js/dist/mvm.js
diff --git a/public/js/dist/main.js.LICENSE.txt → public/js/dist/mvm.js.LICENSE.txt b/public/js/dist/main.js.LICENSE.txt → public/js/dist/mvm.js.LICENSE.txt
diff --git a/public/js/dist/mvm.js.map b/public/js/dist/mvm.js.map
diff --git a/public/package.json b/public/package.json
@@ -26,7 +26,6 @@
     "sass": "^1.63.6",
     "sass-loader": "^13.3.2",
     "webpack": "^5.76.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-remove-empty-scripts": "^1.0.3"
+    "webpack-cli": "^5.1.4"
   }
 }
diff --git a/public/webpack.config.js b/public/webpack.config.js
@@ -1,11 +1,12 @@
 const path = require('path');
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const RemoveEmptyScriptsPlugin = require('webpack-remove-empty-scripts');
 
 module.exports = {
     entry: {
-        main: './js/mvm.js',
-        mvm: './sass/mvm.scss',
+        mvm: [
+          './js/mvm.js',
+          './sass/mvm.scss',
+        ],
     },
     mode: 'production',
     stats: {
@@ -51,11 +52,16 @@ module.exports = {
     },
     plugins: [
       // css extraction into dedicated file
-      new RemoveEmptyScriptsPlugin({ verbose: true }),
       new MiniCssExtractPlugin({
         filename: './css/[name].css',
       }),
     ],
+    watchOptions: {
+      ignored: [
+        '**/fonts',
+        '**/images',
+      ],
+    },
     resolve: {
       extensions: ['.js', '.scss'],
       modules: ['node_modules'],

diff --git a/public/yarn.lock b/public/yarn.lock
@@ -308,11 +308,6 @@ ajv@^8.0.0, ajv@^8.9.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-[email protected]:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/ansis/-/ansis-1.5.2.tgz#c9bada6ff5dd88b0b979ab8df0b51096b9dda4bb"
-  integrity sha512-T3vUABrcgSj/HXv27P+A/JxGk5b/ydx0JjN3lgjBTC2iZUFxQGjh43zCzLSbU4C1QTgmx9oaPeWNJFM+auI8qw==
-
 anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
@@ -1161,13 +1156,6 @@ webpack-merge@^5.7.3:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
-webpack-remove-empty-scripts@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/webpack-remove-empty-scripts/-/webpack-remove-empty-scripts-1.0.3.tgz#9ca80d4cf5f1ad2776b970a415649869b0004aef"
-  integrity sha512-1+Gg43r+4REb+3AUWbgjM3LIlxxE8YIqMnGpOmmhnaYK2rv4q58WbHYhZ9IRhTyt/+1qWoKQoPz/ebze5RnRYA==
-  dependencies:
-    ansis "1.5.2"
-
 webpack-sources@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"

diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -114,7 +114,7 @@
             </div>
         </footer>
 
-        <script src="{{ asset_prefix|default('') ~ asset('js/dist/main.js') }}"></script>
+        <script src="{{ asset_prefix|default('') ~ asset('js/dist/mvm.js') }}"></script>
         {% block javascripts %}
         {% endblock %}