@caweb/cli 1.15.3 → 1.15.5

package/commands/webpack/webpack-flags.js

@@ -0,0 +1,121 @@
+// This file is auto-generated via "npm run update:webpack:flags"
+const buildFlags = [
+    "-c",
+    "--config",
+    "--config-name",
+    "-m",
+    "--merge",
+    "--disable-interpret",
+    "--env",
+    "--node-env",
+    "--config-node-env",
+    "--analyze",
+    "--progress",
+    "-j",
+    "--json",
+    "--fail-on-warnings",
+    "-d",
+    "--devtool",
+    "--no-devtool",
+    "--entry",
+    "-e",
+    "--extends",
+    "--mode",
+    "--name",
+    "-o",
+    "--output-path",
+    "--stats",
+    "--no-stats",
+    "-t",
+    "--target",
+    "--no-target",
+    "-w",
+    "--watch",
+    "--no-watch",
+    "--watch-options-stdin",
+    "--no-watch-options-stdin",
+    "--color",
+    "--no-color",
+    "-v",
+    "--version",
+    "-h",
+    "--help"
+];
+
+const serveFlags = [
+    "--allowed-hosts",
+    "--allowed-hosts-reset",
+    "--bonjour",
+    "--no-bonjour",
+    "--no-client",
+    "--client-logging",
+    "--client-overlay",
+    "--no-client-overlay",
+    "--client-overlay-errors",
+    "--no-client-overlay-errors",
+    "--client-overlay-warnings",
+    "--no-client-overlay-warnings",
+    "--client-overlay-runtime-errors",
+    "--no-client-overlay-runtime-errors",
+    "--client-overlay-trusted-types-policy-name",
+    "--client-progress",
+    "--no-client-progress",
+    "--client-reconnect",
+    "--no-client-reconnect",
+    "--client-web-socket-transport",
+    "--client-web-socket-url",
+    "--client-web-socket-url-hostname",
+    "--client-web-socket-url-pathname",
+    "--client-web-socket-url-password",
+    "--client-web-socket-url-port",
+    "--client-web-socket-url-protocol",
+    "--client-web-socket-url-username",
+    "--compress",
+    "--no-compress",
+    "--history-api-fallback",
+    "--no-history-api-fallback",
+    "--host",
+    "--hot",
+    "--no-hot",
+    "--ipc",
+    "--live-reload",
+    "--no-live-reload",
+    "--open",
+    "--no-open",
+    "--open-target",
+    "--open-app-name",
+    "--open-reset",
+    "--open-target-reset",
+    "--open-app-name-reset",
+    "--port",
+    "--server-type",
+    "--server-options-passphrase",
+    "--server-options-request-cert",
+    "--no-server-options-request-cert",
+    "--server-options-ca",
+    "--server-options-ca-reset",
+    "--server-options-cert",
+    "--server-options-cert-reset",
+    "--server-options-crl",
+    "--server-options-crl-reset",
+    "--server-options-key",
+    "--server-options-key-reset",
+    "--server-options-pfx",
+    "--server-options-pfx-reset",
+    "--static",
+    "--no-static",
+    "--static-directory",
+    "--static-public-path",
+    "--static-serve-index",
+    "--no-static-serve-index",
+    "--static-watch",
+    "--no-static-watch",
+    "--static-reset",
+    "--static-public-path-reset",
+    "--watch-files",
+    "--watch-files-reset",
+    "--no-web-socket-server",
+    "--web-socket-server-type"
+];
+
+export { buildFlags, serveFlags };

package/commands/webpack/webpack.js

@@ -11,6 +11,7 @@ import {
     runCmd
 } from '../../lib/index.js';
 
+import { buildFlags, serveFlags } from './webpack-flags.js';
 
 /**
  * Build the current project
@@ -29,7 +30,8 @@ export default async function webpack({
     externals
 } ) {
     const webpackCommand = 'build' === process.argv[2] ? 'build' : 'serve' ;
-    
+    const webpackAllowedFlags = 'build' === webpackCommand ? buildFlags : serveFlags ;
+
     // we use our default config from the @caweb/webpack
     const defaultConfigPath = path.resolve('node_modules', '@caweb', 'webpack', 'webpack.config.js' );
     
@@ -62,8 +64,39 @@ export default async function webpack({
 
     }
 
-    // add the --merge flag to allow merging configs.
-    webPackArgs.push( '--merge' );
+    // if -c or --config appears twice in the args we add the --merge flag
+    if( webPackArgs.filter( arg => '-c' === arg || '--config' === arg ).length > 1 ){
+        webPackArgs.push( '--merge' );
+    }        
+
+    let unknown = false;
+    let unkownArgs = [];
+
+    // we have to filter out unknown args to avoid webpack errors
+    webPackArgs = webPackArgs.filter( (e) => {
+                
+                if( e.startsWith('--')  ){
+                    // set unknown flag
+                    unknown = ! webpackAllowedFlags.includes(e);
+
+                    // save unknown flag
+                    if( unknown ){
+                        unkownArgs.push(e);
+                    }
+
+                    // return if known flag 
+                    return webpackAllowedFlags.includes(e);
+                }else{
+                    // save unknown args
+                    if( unknown ){
+                        unkownArgs.push(e);
+                    }
+
+                    // if flag was known return the value, else false 
+                    return ! unknown ? e : false;
+                }
+            } 
+        );
 
     // run the webpackCommand command.
     await runCmd(
@@ -74,6 +107,7 @@ export default async function webpack({
         ],
         {
             stdio: 'inherit',
+            argv0: unkownArgs.join(' ')
         }
 	);
 };

package/lib/cli.js

@@ -4,7 +4,7 @@
 //const wpenv_cli = require('@wordpress/env/lib/cli');
 import path from 'path';
 import fs from 'fs';
-import { Command, Argument, Option  } from 'commander';
+import { Command, Argument, Option, InvalidArgumentError  } from 'commander';
 
 /**
  * Internal dependencies
@@ -62,7 +62,22 @@ function addWebpackCmds(){
   // Serve Command.
   program.command('serve')
 	.description('Serves the current project using CAWebPublishing templates.')
-	.addOption(new Option('--template <template>', 'Serves the project using templating.').choices(['default', 'blank']).default('default'))
+	.addOption(new Option('--template <template>', 'Serves the project using templating.').choices(['default', 'blank', '<local file>']).default('default').argParser( ( choice, t ) => {
+		
+		// if choice is a valid option return it.
+		if( [ 'default', 'blank' ].includes( choice ) ){
+			return choice;
+		}
+
+		// if choice is a valid local file return the absolute path.
+		const localPath = path.resolve( choice );
+		if( fs.existsSync( localPath ) ){
+			return localPath;
+		}
+
+		// invalid option return error.
+		throw new InvalidArgumentError('Allowed choices are default, blank, <local file>.');
+	}))
 	.addOption(new Option('--scheme <scheme>', 'Serves the project using template colorscheme.').choices([
 		'delta',
 		'eureka',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/cli",
-  "version": "1.15.3",
+  "version": "1.15.5",
   "description": "CAWebPublishing Command Line Interface.",
   "exports": "./lib/env.js",
   "type": "module",
@@ -20,7 +20,8 @@
   ],
   "scripts": {
     "caweb": "node bin/caweb.js",
-    "doc": "node ./docs/tool/index.js",
+    "update:webpack:flags": "node ./scripts/webpack-flags.js",
+    "doc": "node ./scripts/documentation.js",
     "test": "echo \"Error: run tests from root\" && exit 0"
   },
   "homepage": "https://github.com/CAWebPublishing/cli#readme",
@@ -63,7 +64,7 @@
     }
   },
   "dependencies": {
-    "@caweb/webpack": "^1.5.11",
+    "@caweb/webpack": "^1.5.12",
     "@inquirer/prompts": "^8.1.0",
     "@wordpress/create-block": "^4.80.0",
     "@wordpress/env": "^10.37.0",