@caweb/cli 1.15.21 → 1.16.0

package/commands/webpack/webpack.js

@@ -77,7 +77,7 @@ export default async function webpack({
     }        
 
     let unknown = false;
-    let unkownArgs = [];
+    let unknownArgs = [];
 
     // we have to filter out unknown args to avoid webpack errors
     webPackArgs = webPackArgs.filter( (e) => {
@@ -88,7 +88,7 @@ export default async function webpack({
 
                     // save unknown flag
                     if( unknown ){
-                        unkownArgs.push(e);
+                        unknownArgs.push(e);
                     }
 
                     // return if known flag 
@@ -96,7 +96,7 @@ export default async function webpack({
                 }else{
                     // save unknown args
                     if( unknown ){
-                        unkownArgs.push(e);
+                        unknownArgs.push(e);
                     }
 
                     // if flag was known return the value, else false 
@@ -114,7 +114,7 @@ export default async function webpack({
         ],
         {
             stdio: 'inherit',
-            argv0: unkownArgs.join(' ')
+            unknownArgs
         }
 	);
 };

package/configs/webpack.plugins.js

@@ -36,7 +36,7 @@ let patterns = fs.readdirSync(path.join(templatePath, 'patterns'), { withFileTyp
     .map( ( dirent ) => {
 
                 let fileTemplate = path.join( dirent.parentPath, dirent.name );
-                let filename = fileTemplate.replace(path.join(templatePath, 'patterns'), '').replace(/\\/g, '');
+                let filename = fileTemplate.replace(path.join(templatePath, 'patterns'), '').replace(/^[\\\/]/, '');
 
                 // we ignore the default and blank patterns since those are used as templates and not actual pages
                 // if there is no Google Search Id we ignore the search pattern since that is only used for the Search Results page
@@ -63,7 +63,7 @@ let additionalPages = ! fs.existsSync( basePageDir ) ? [] :
             .map( ( dirent ) => {
 
                 let fileTemplate = path.join( dirent.parentPath, dirent.name );
-                let filename = fileTemplate.replace(basePageDir, '').replace(/\\/, '');
+                let filename = fileTemplate.replace(basePageDir, '').replace(/^[\\\/]/, '');
 
                 // if additionl pages match a pattern page we remove ours
                 let override = patterns.find( (p) => p.filename === filename );
@@ -103,7 +103,7 @@ export default {
             
             let data = {
                     ...caweb.site,
-                    scheme
+                    scheme,
                 };
             
             let compiler = Handlebars.compile( content );
@@ -118,7 +118,7 @@ export default {
                     partial: compiledContent,
                 },
             })
-        }) ,
+        }).filter( Boolean ) ,
 
         // Sitemap Generation
         ( ! flagExists('sitemap') || (flagExists('sitemap') && getArgVal('sitemap'))) && new SitemapWebpackPlugin.default({

package/lib/helpers.js

@@ -7,7 +7,6 @@ import spawn from 'cross-spawn';
 import { fileURLToPath } from 'url';
 import { sync as resolveBin } from 'resolve-bin';
 import * as dockerCompose from 'docker-compose';
-import { promisify } from 'util';
 import crypto from 'crypto';
 
 /**
@@ -62,7 +61,26 @@ async function runCmd(cmd, args,opts = { stdio: 'pipe' }){
 			break;
 	}
 
-	return spawn.sync( cmd, args, {...opts, env: process.env});
+	// on Mac we can't pass unknown flags to the NODE_OPTIONS so instead we pass it to CAWEB_NODE_OPTIONS
+	// we always make sure the CAWEB_NODE_OPTIONS has a value even if its just blank
+	process.env.CAWEB_NODE_OPTIONS = process.env.CAWEB_NODE_OPTIONS ?? '';
+
+	// unknownArgs get appened to the CAWEB_NODE_OPTIONS
+	let uArgs = '';
+
+	if( opts.unknownArgs ){
+		uArgs = opts.unknownArgs.join(' ');
+		delete opts.unknownArgs;
+
+		process.env.CAWEB_NODE_OPTIONS += ' ' + uArgs;
+
+	}
+
+
+	return spawn.sync( cmd, args, {
+		...opts, 
+		env: process.env
+	});
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/cli",
-  "version": "1.15.21",
+  "version": "1.16.0",
   "description": "CAWebPublishing Command Line Interface.",
   "exports": "./lib/env.js",
   "type": "module",
@@ -40,11 +40,11 @@
     "access": "public"
   },
   "config": {
-    "WP_VER": "6.9",
+    "WP_VER": "6.9.1",
     "PHP_VER": "8.4",
     "CAWEB_VER": "1.13.3",
-    "DIVI_VER": "4.27.4",
-    "QUERY_MONITOR": "3.20.0",
+    "DIVI_VER": "4.27.5",
+    "QUERY_MONITOR": "3.20.2",
     "DEFAULTS": {
       "FS_METHOD": "direct",
       "WP_DEBUG": true,
@@ -64,14 +64,15 @@
     }
   },
   "dependencies": {
-    "@caweb/a11y-webpack-plugin": "^2.1.4",
-    "@caweb/css-audit-webpack-plugin": "^2.1.3",
-    "@caweb/html-webpack-plugin": "^2.1.7",
-    "@caweb/jshint-webpack-plugin": "^2.1.3",
-    "@caweb/webpack": "^1.6.8",
-    "@inquirer/prompts": "^8.2.0",
-    "@wordpress/create-block": "^4.82.0",
-    "@wordpress/env": "^10.39.0",
+    "@caweb/a11y-webpack-plugin": "^2.1.5",
+    "@caweb/css-audit-webpack-plugin": "^2.1.4",
+    "@caweb/html-webpack-plugin": "^2.1.8",
+    "@caweb/jshint-webpack-plugin": "^2.1.4",
+    "@caweb/webpack": "^1.6.9",
+    "@inquirer/prompts": "^8.2.1",
+    "@noble/hashes": "^1.8.0",
+    "@wordpress/create-block": "^4.83.0",
+    "@wordpress/env": "^11.0.0",
     "axios": "^1.13.5",
     "axios-retry": "^4.5.0",
     "chalk": "^5.6.2",
@@ -80,15 +81,15 @@
     "crypto": "^1.0.1",
     "deepmerge": "^4.3.1",
     "docker-compose": "^1.3.1",
-    "fast-xml-parser": "^5.3.5",
+    "fast-xml-parser": "^5.3.6",
     "fs-extra": "^11.3.3",
     "html-to-json-parser": "^2.0.1",
     "inquirer-select-pro": "^1.0.0-alpha.9",
-    "jsdom": "^28.0.0",
+    "jsdom": "^28.1.0",
     "node-html-parser": "^7.0.2",
     "ora": "^9.3.0",
     "resolve-bin": "^1.0.1",
-    "rimraf": "^6.1.2",
+    "rimraf": "^6.1.3",
     "sitemap-webpack-plugin": "^1.1.1",
     "terminal-link": "^5.0.0"
   }