piral-cli-webpack5 0.14.5-beta.3344 → 0.14.6-beta.3361

package/README.md

@@ -42,10 +42,6 @@ Right now it includes:
 
 As such it should be prepared to include assets (images, videos, ...), stylesheets (CSS and SASS), and work with TypeScript.
 
-> Right now the output of this plugin is for the **v1** pilet schema only!
-
-No support for the legacy **v0** pilet schema.
-
 ### Customizing
 
 You can still leverage your own `webpack.config.js`. Either just export *what you want to have overwritten*, e.g.,

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(...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(...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/lib/enhancers/html5-entry-webpack-config-enhancer/index.js

@@ -11,7 +11,17 @@ const html5EntryWebpackConfigEnhancer = (options) => (compilerOptions) => {
     const [template] = (0, helpers_1.getTemplates)(entry);
     if (template) {
         const src = (0, path_1.dirname)(template);
-        const templateContent = (0, cheerio_1.load)((0, fs_1.readFileSync)(template, 'utf8'));
+        const html = (0, fs_1.readFileSync)(template, 'utf8');
+        const templateContent = (0, cheerio_1.load)(
+        // try to replace ejs tags, if any
+        html.replace(/<%=([\w\W]*?)%>/g, function (match, group) {
+            try {
+                return eval(group);
+            }
+            catch (_a) {
+                return match;
+            }
+        }));
         const entries = (0, helpers_1.extractParts)(templateContent).map((entry) => (0, path_1.join)(src, entry));
         const plugins = [
             new HtmlWebpackPlugin(Object.assign(Object.assign({}, options), { templateContent: templateContent.html() })),

package/lib/enhancers/html5-entry-webpack-config-enhancer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/enhancers/html5-entry-webpack-config-enhancer/index.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AAEzD,qCAA+B;AAC/B,2BAAkC;AAClC,+BAAqC;AACrC,uCAAmE;AAI5D,MAAM,+BAA+B,GAC1C,CAAC,OAAuC,EAAE,EAAE,CAAC,CAAC,eAA8B,EAAE,EAAE;IAC9E,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC;IACpC,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;IAEvC,IAAI,QAAQ,EAAE;QACZ,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;QAC9B,MAAM,eAAe,GAAG,IAAA,cAAI,EAAC,IAAA,iBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG;YACd,IAAI,iBAAiB,iCAChB,OAAO,KACV,eAAe,EAAE,eAAe,CAAC,IAAI,EAAE,IACvC;SACH,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAElF,IAAA,oBAAU,EAAC,eAAe,EAAE,QAAQ,EAAE,OAAqC,CAAC,CAAC;QAE7E,eAAe,CAAC,OAAO,GAAG,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC;KACpE;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAxBS,QAAA,+BAA+B,mCAwBxC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/enhancers/html5-entry-webpack-config-enhancer/index.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AAEzD,qCAA+B;AAC/B,2BAAkC;AAClC,+BAAqC;AACrC,uCAAmE;AAI5D,MAAM,+BAA+B,GAC1C,CAAC,OAAuC,EAAE,EAAE,CAAC,CAAC,eAA8B,EAAE,EAAE;IAC9E,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC;IACpC,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;IAEvC,IAAI,QAAQ,EAAE;QACZ,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,IAAA,iBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC5C,MAAM,eAAe,GAAG,IAAA,cAAI;QAC1B,kCAAkC;QAClC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,UAAU,KAAK,EAAE,KAAK;YACrD,IAAI;gBACF,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;aACpB;YAAC,WAAM;gBACN,OAAO,KAAK,CAAC;aACd;QACH,CAAC,CAAC,CACH,CAAC;QACF,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG;YACd,IAAI,iBAAiB,iCAChB,OAAO,KACV,eAAe,EAAE,eAAe,CAAC,IAAI,EAAE,IACvC;SACH,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAElF,IAAA,oBAAU,EAAC,eAAe,EAAE,QAAQ,EAAE,OAAqC,CAAC,CAAC;QAE7E,eAAe,CAAC,OAAO,GAAG,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC;KACpE;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAlCS,QAAA,+BAA+B,mCAkCxC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli-webpack5",
-  "version": "0.14.5-beta.3344",
+  "version": "0.14.6-beta.3361",
   "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-beta.3344",
+    "piral-cli": "0.14.6-beta.3361",
     "strip-ansi": "^3.0.0",
     "typescript": "^4.0.2"
   },
@@ -77,5 +77,5 @@
     "webpack": "^5.1.3",
     "webpack-inject-plugin": "^1.5.5"
   },
-  "gitHead": "b462c344e9ea09919e3f9b9f3da058b773cd5814"
+  "gitHead": "de8dd4b06e6115257363f763e9d24fedf740fdc6"
 }

package/src/enhancers/html5-entry-webpack-config-enhancer/index.ts

@@ -14,7 +14,17 @@ export const html5EntryWebpackConfigEnhancer =
 
     if (template) {
       const src = dirname(template);
-      const templateContent = load(readFileSync(template, 'utf8'));
+      const html = readFileSync(template, 'utf8');
+      const templateContent = load(
+        // try to replace ejs tags, if any
+        html.replace(/<%=([\w\W]*?)%>/g, function (match, group) {
+          try {
+            return eval(group);
+          } catch {
+            return match;
+          }
+        }),
+      );
       const entries = extractParts(templateContent).map((entry) => join(src, entry));
       const plugins = [
         new HtmlWebpackPlugin({