@caweb/webpack 1.6.6 → 1.6.8

package/lib/args.js

@@ -25,9 +25,15 @@ let { values: flags } = parseArgs( {
     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
+    // 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',
       },

package/lib/server.js

@@ -98,6 +98,7 @@ let devServer = {
     hot: true,
     
     historyApiFallback: {
+      index: '/404.html',
       rewrites: [
         // Rewrite any request that doesn't have a file extension to your 404 page
         // This is a simple regex; adjust as needed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "CAWebPublishing Webpack Configuration",
   "main": "webpack.config.js",
   "files": [
@@ -47,7 +47,7 @@
     "html-webpack-skip-assets-plugin": "^1.0.4",
     "thread-loader": "^4.0.4",
     "ts-loader": "^9.5.4",
-    "webpack": "^5.105.1",
+    "webpack": "^5.105.2",
     "webpack-cli": "^6.0.1",
     "webpack-dev-server": "^5.2.3",
     "webpack-merge": "^6.0.1",

package/tests/webpack.tests.js

@@ -15,7 +15,7 @@ import Handlebars from 'handlebars';
 /**
  * Internal Dependencies
 */
-import { getArgVal } from '../lib/args.js';
+import { getArgVal, flags } from '../lib/args.js';
 
 // this is the path to the current project directory
 const appPath = process.cwd();
@@ -36,51 +36,15 @@ let caweb = deepmerge( testCaweb, defaultCaweb  );
 
 let templatePath = path.join(appPath, 'node_modules', '@caweb', 'template');
 let template = getArgVal( 'template', path.join(templatePath, 'patterns', 'default.html') );
-let searchTemplate = getArgVal( 'search-template', path.join(templatePath, 'patterns', 'search.html') );
-
 let scheme = getArgVal( 'scheme', 'oceanside' );
 let favicon = caweb?.site?.favicon ?? null;
 
-// // Additional pages directory
-let basePageDir = path.join(appPath, 'content', 'pages');
-
-let additionalPages = ! fs.existsSync( basePageDir ) ? [] :
-    fs.readdirSync( basePageDir, { withFileTypes: true, recursive: true } )
-        .filter( dirent => dirent.isFile() && (dirent.name.endsWith('.html') || dirent.name.endsWith('.handlebars')) )
-        .map( ( dirent ) => {
-
-            let fileTemplate = path.join( dirent.parentPath, dirent.name );
-            
-            // replace .html, uppercase the first letter of each word
-            // this is to make sure the title is readable
-            // and not just a file name
-            let title = dirent.name.replace('.html', '').replace(/\b\w/g, c => c.toUpperCase());
-            let content = fs.readFileSync( fileTemplate, 'utf-8' );
-            let data = {
-                ...caweb.site,
-                scheme
-            };
-            let compiler = Handlebars.compile( content );
-            let compiledContent = compiler(data);
-
-            return new HtmlWebpackPlugin({
-                template,
-                filename: fileTemplate.replace(basePageDir, ''),
-                title,
-                templateParameters: {
-                    ...caweb.site, // we spread the site data found in the caweb.json file
-                    scheme,
-                    partial: compiledContent,
-                },
-
-            });
-        });
 
 export default {
     plugins: [
         // this plugin generates the main landing page using the template found in patterns/index.html
         new HtmlWebpackPlugin({
-            template,
+            template: path.resolve(template),
             favicon,
             templateParameters: {
                 ...caweb.site, // we spread the site data found in the caweb.json file
@@ -88,19 +52,5 @@ export default {
             }
         }),
 
-        // this plugin generates Search Results page using the template found in patterns/search.html
-        caweb?.site?.google?.search ? new HtmlWebpackPlugin({
-            template: searchTemplate,
-            favicon,
-            filename: 'serp.html',
-            title: 'Search Results Page',
-            templateParameters: {
-                ...caweb.site, // we spread the site data found in the caweb.json file
-                scheme 
-            },
-        }) : false,
-
-        // this plugin generates additional pages under content/pages directory using the template found in patterns/index.html
-        ...additionalPages
     ].filter(Boolean)
 };

package/webpack.config.js

@@ -102,8 +102,7 @@ let webpackConfig = {
    filename: isProduction ? '[name].min.js' : '[name].js',
    chunkFilename: isProduction ? '[name].min.js?v=[chunkhash]' : '[name].js?v=[chunkhash]',
    pathinfo: false,
-   clean: isProduction,
-   publicPath: '/',
+   clean: isProduction
   },
   
   /**