piral-cli-webpack5 0.14.5 → 0.14.6-beta.3419

package/extend-config.js

@@ -2,7 +2,11 @@ function changePlugin(config, classRef, cb) {
   config.module.plugins = config.module.plugins
     .map((plugin) => {
       if (plugin instanceof classRef) {
-        return cb(plugin);
+        if (typeof cb === 'function') {
+          return cb(plugin);
+        } else {
+          return cb;
+        }
       }
 
       return plugin;
@@ -17,7 +21,11 @@ function changeRule(config, name, cb) {
       const uses = rule.use || [];
 
       if (uses.some((m) => m && (m === loaderPath || (typeof m === 'object' && m.loader === loaderPath)))) {
-        return cb(rule);
+        if (typeof cb === 'function') {
+          return cb(rule);
+        } else {
+          return cb;
+        }
       }
 
       return rule;
@@ -31,9 +39,17 @@ function changeLoader(config, name, cb) {
   changeRule(config, name, (rule) => {
     rule.use = rule.use.map((m) => {
       if (m === loaderPath) {
-        return cb({ loader: m });
+        if (typeof cb === 'function') {
+          return cb({ loader: m });
+        } else {
+          return cb;
+        }
       } else if (m.loader === loaderPath) {
-        return cb(m);
+        if (typeof cb === 'function') {
+          return cb(m);
+        } else {
+          return cb;
+        }
       } else {
         return m;
       }
@@ -97,22 +113,38 @@ module.exports = function (override) {
         );
       }
 
-      if ('rules' in override && Array.isArray(override.rules)) {
-        config.module.rules.push(...override.rules);
+      if ('updateRules' in override && Array.isArray(override.updateRules)) {
+        override.updateRules.forEach((def) => {
+          if (typeof def.name === 'string' && def.rule) {
+            changeRule(config, def.name, def.rule);
+          }
+        });
       }
 
       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(...override.plugins);
+      if ('rules' in override && Array.isArray(override.rules)) {
+        config.module.rules.push(...override.rules);
+      }
+
+      if ('updatePlugins' in override && Array.isArray(override.updatePlugins)) {
+        override.updatePlugins.forEach((def) => {
+          if (def.type && def.rule) {
+            changePlugin(config, def.type, def.plugin);
+          }
+        });
       }
 
       if ('removePlugins' in override && Array.isArray(override.removePlugins)) {
         override.removePlugins.forEach((plugin) => changePlugin(config, plugin, () => undefined));
       }
 
+      if ('plugins' in override && Array.isArray(override.plugins)) {
+        config.plugins.push(...override.plugins);
+      }
+
       if ('change' in override && typeof override.change === 'function') {
         config = override.change(config);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli-webpack5",
-  "version": "0.14.5",
+  "version": "0.14.6-beta.3419",
   "description": "Provides debug and build capabilities for pilets and Piral instances using Webpack v5.",
   "keywords": [
     "piral-cli",
@@ -48,7 +48,7 @@
     "@types/node": "^13.9.0",
     "@types/terser-webpack-plugin": "^5.0.0",
     "@types/yargs": "^15.0.4",
-    "piral-cli": "^0.14.5",
+    "piral-cli": "0.14.6-beta.3419",
     "strip-ansi": "^3.0.0",
     "typescript": "^4.0.2"
   },
@@ -77,5 +77,5 @@
     "webpack": "^5.1.3",
     "webpack-inject-plugin": "^1.5.5"
   },
-  "gitHead": "d2c53e25895f855fb7be6f7a09afe6ebe8b599e6"
+  "gitHead": "7c83ddb2a2b193991fa16153c92b84356d8a30f4"
 }