@caweb/webpack 2.0.0 → 2.0.2

package/lib/args.js

@@ -1,7 +1,8 @@
 /**
  * External dependencies
  */
-import { parseArgs } from 'node:util';
+// import { parseArgs } from 'node:util';
+import minimist from 'minimist';
 
 /**
  * Internal dependencies  
@@ -16,62 +17,14 @@ let argv0 = process.argv0.replace(/.*node[.a-z\s]*/, '');
 // flags can be passed via argv0 
 // we also add args from NODE_OPTIONS
 // we also add args from CAWEB_NODE_OPTIONS
-let { values: flags } = parseArgs( {
-    args: [
+let flags = minimist( [
         ...argv,
         ...argv0.split(' '),
         ...(process.env.NODE_OPTIONS ? process.env.NODE_OPTIONS.trim().replace(/(^'|'$)/g, '').split(' ') : []).filter( Boolean ),
         ...(process.env.CAWEB_NODE_OPTIONS ? process.env.CAWEB_NODE_OPTIONS.trim().replace(/(^'|'$)/g, '').split(' ') : []).filter( Boolean )
-    ].filter( Boolean ),
-    strict: false,
-    allowPositionals: true,
-    allowNegative: true,
-
-    // in order for the flags to work with the cli's params, 
-    // we need to set the options 
-    options: {
-      template: {
-        type: 'string',
-      },
-      scheme: {
-        type: 'string',
-      },
-      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',
-      }
-    } 
-} )
-
+      ].filter( Boolean )
+    )
+    
 // function to add a flag
 function addFlag(flag, value = null){
     if( ! flagExists(flag) ){
@@ -81,7 +34,7 @@ function addFlag(flag, value = null){
 
 // check if a flag exists
 function flagExists(flag){
-  // parseArgs removes the leading dashes from flags, so we need to account for that
+  // minimist removes the leading dashes from flags, so we need to account for that
   return Object.keys(flags).includes(flag.replace(/^-+/, ''));
 }
 

package/lib/handlebars.js

@@ -17,7 +17,9 @@ let templatePartials = {
     'header': 'semantics/header.html',
     'mobileControls': 'semantics/mobile-controls.html',
     'navFooter': 'semantics/nav-footer.html',
-    'navHeader': 'semantics/nav-header.html',
+    'navSingle': 'semantics/nav-single.html',
+    'navDropdown': 'semantics/nav-dropdown.html',
+    'navMegaDropdown': 'semantics/nav-mega-dropdown.html',
     'utilityHeader': 'semantics/utility-header.html',
     'head': 'semantics/head.html',
     'alert': 'components/alert/alert.html',

package/lib/loader.js

@@ -41,7 +41,9 @@ const partialResolver = ( partial, callback ) => {
         case 'header': 
         case 'mobileControls': 
         case 'navFooter':
-        case 'navHeader': 
+        case 'navSingle': 
+        case 'navDropdown': 
+        case 'navMegaDropdown': 
         case 'utilityHeader': 
         case 'head':
           partialDir = 'semantics';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "CAWebPublishing Webpack Configuration",
   "main": "webpack.config.js",
   "files": [

package/tests/webpack.tests.js

@@ -9,8 +9,6 @@ import path from 'path';
 import fs from 'fs';
 import { fileURLToPath } from 'url';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-import deepmerge from 'deepmerge';
-import Handlebars from 'handlebars';
 
 /**
  * Internal Dependencies
@@ -29,10 +27,10 @@ let testCaweb = JSON.parse( fs.readFileSync( path.join(currentPath, 'caweb.json'
 // we read the app caweb.json file if it exists
 let defaultCaweb = fs.existsSync( path.join(appPath, 'caweb.json') ) ? 
 JSON.parse(fs.readFileSync(path.join(appPath, 'caweb.json'))) 
-: {};
+: null;
 
 // merge the two caweb.json files, with the project data taking precedence
-let caweb = deepmerge( testCaweb, defaultCaweb  );
+let caweb = defaultCaweb ?? testCaweb;
 
 let templatePath = path.join(appPath, 'node_modules', '@caweb', 'template');
 let template = getArgVal( 'template', path.join(templatePath, 'patterns', 'default.html') );

package/webpack.config.js

@@ -82,6 +82,7 @@ if( 'serve' === webpackCommand ){
 
 // main webpack configuration object
 let webpackConfig = {
+  entry: path.join( process.cwd(), 'src', 'index.js' ),
   mode,
   // target: 'web',
   name: isProduction ? 'compressed' : 'uncompressed',