@caweb/webpack 1.6.2 → 1.6.4

package/lib/args.js

@@ -3,15 +3,65 @@
  */
 import { parseArgs } from 'node:util';
 
+/**
+ * Internal dependencies  
+ */
+
+// process.argv first two values are the node executable and the script being executed, so we can ignore those
+let argv = process.argv.slice(2);
+
+// process.argv0 first value is the node executable, so we can remove that
+let argv0 = process.argv0.replace(/.*node[.a-z\s]*/, '');
+
 // flags can be passed via argv0 
 // we also add args from NODE_OPTIONS
 let { values: flags } = parseArgs( {
     args: [
-        ...process.argv,
-        ...process.argv0.split(' '),
-        process.env.NODE_OPTIONS ? process.env.NODE_OPTIONS.split(' ') : []
+        ...argv,
+        ...argv0.split(' '),
+        ...(process.env.NODE_OPTIONS ? process.env.NODE_OPTIONS.trim().replace(/(^'|'$)/g, '').split(' ') : []).filter( Boolean )
     ].filter( Boolean ),
     strict: false,
+    allowPositionals: true,
+    allowNegative: true,
+
+    // in order for the flags to work in the cli's afterStart hook, 
+    // we need to set the options that are used in the start command
+    options: {
+      cwd: {
+        type: 'string',
+      },
+      update: {
+        type: 'boolean',
+      },
+      xdebug: {
+        type: 'string'
+      },
+      spx: {
+        type: 'string'
+      },
+      scripts: {
+        type: 'boolean',
+      },
+      sync: {
+        type: 'boolean',
+      },
+      plugin: {
+        type: 'boolean',
+        short: 'p'
+      },
+      theme: {
+        type: 'boolean',
+        short: 't'
+      },
+      multisite: {
+        type: 'boolean',
+        short: 'm'
+      },
+      subdomain: {
+        type: 'boolean',
+      }
+    } 
 } )
 
 // function to add a flag
@@ -23,17 +73,24 @@ function addFlag(flag, value = null){
 
 // check if a flag exists
 function flagExists(flag){
-  return Object.keys(flags).includes(flag)
+  // parseArgs removes the leading dashes from flags, so we need to account for that
+  return Object.keys(flags).includes(flag.replace(/^-+/, ''));
 }
 
 // get the value of a flag
 function getArgVal(flag, defaultValue = null){
-  return flagExists(flag) ? flags[flag] : (defaultValue ?? false);
+  return flagExists(flag) ? flags[flag.replace(/^-+/, '')] : (defaultValue ?? false);
+}
+
+// get all flags
+function getAllFlags(){
+  return flags;
 }
 
 export { 
   flags,
-    flagExists, 
-    addFlag,
-    getArgVal 
+  flagExists, 
+  addFlag,
+  getArgVal,
+  getAllFlags
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "CAWebPublishing Webpack Configuration",
   "main": "webpack.config.js",
   "files": [
@@ -37,7 +37,7 @@
   "homepage": "https://github.com/CAWebPublishing/webpack#readme",
   "dependencies": {
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@wordpress/scripts": "^31.3.0",
+    "@wordpress/scripts": "^31.4.0",
     "css-minimizer-webpack-plugin": "^7.0.4",
     "deepmerge": "^4.3.1",
     "handlebars": "^4.7.8",
@@ -47,7 +47,7 @@
     "html-webpack-skip-assets-plugin": "^1.0.4",
     "thread-loader": "^4.0.4",
     "ts-loader": "^9.5.4",
-    "webpack": "^5.104.1",
+    "webpack": "^5.105.1",
     "webpack-cli": "^6.0.1",
     "webpack-dev-server": "^5.2.3",
     "webpack-merge": "^6.0.1",