Fixed webpack(5) config extender

smapiot · Dec 13, 2021 · 36be271 · 36be271
1 parent 85b5609
commit 36be271
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Improved `piral debug` to respect `--public-url` like `piral build`
 - Fixed `publicPath` in pilets built with Webpack to be `./` instead of `/`
 - Fixed default imports of shared dependencies with `v2` schema (#433)
+- Fixed usage of `rules` in `extend-config` of `piral-cli-webpack(5)`
 - Fixed usage of custom public path with `piral-ng` (#434)
 - Removed `file-loader` from `piral-cli-webpack5`
 - Added env variable `PIRAL_PUBLIC_PATH` during `piral build` and `piral debug` (#434)

diff --git a/src/converters/piral-ng/extend-webpack.js b/src/converters/piral-ng/extend-webpack.js
@@ -1,5 +1,6 @@
-const { AngularWebpackPlugin } = require('@ngtools/webpack');
 const CopyPlugin = require('copy-webpack-plugin');
+
+const { AngularWebpackPlugin } = require('@ngtools/webpack');
 const { resolve } = require('path');
 
 const ngtoolsLoader = require.resolve('@ngtools/webpack');

diff --git a/src/tooling/piral-cli-webpack/extend-config.js b/src/tooling/piral-cli-webpack/extend-config.js
@@ -98,7 +98,7 @@ module.exports = function (override) {
       }
 
       if ('rules' in override && Array.isArray(override.rules)) {
-        config.module.rules.push(...rules);
+        config.module.rules.push(...override.rules);
       }
 
       if ('removeRules' in override && Array.isArray(override.removeRules)) {

diff --git a/src/tooling/piral-cli-webpack5/extend-config.js b/src/tooling/piral-cli-webpack5/extend-config.js
@@ -98,15 +98,15 @@ module.exports = function (override) {
       }
 
       if ('rules' in override && Array.isArray(override.rules)) {
-        config.module.rules.push(...rules);
+        config.module.rules.push(...override.rules);
       }
 
       if ('removeRules' in override && Array.isArray(override.removeRules)) {
         override.removeRules.forEach((rule) => changeRule(config, rule, () => undefined));
       }
 
       if ('plugins' in override && Array.isArray(override.plugins)) {
-        config.plugins.push(...plugins);
+        config.plugins.push(...override.plugins);
       }
 
       if ('removePlugins' in override && Array.isArray(override.removePlugins)) {