@caweb/webpack 1.6.5 → 1.6.7

package/helpers/string/replace.js

@@ -7,7 +7,7 @@ export default function replace(value, search, replace, options){
     }
 
     // if nested content exists
-    if( value.fn && value.fn().length ){
+    if( value && value.fn && value.fn().length ){
         response +=  value.fn().replace(new RegExp(search, "g"), replace);
     }
 

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/handlebars.js

@@ -0,0 +1,69 @@
+// This handlebars assumes we are using the @caweb/template as the fallback for any partials that are not found in the application. This allows us to use the default template partials without having to copy them into the application. It also allows us to use any custom partials that the application may have without having to worry about them being overwritten by the default template partials.
+import Handlebars from 'handlebars';
+import path from 'path';
+import fs from 'fs';
+import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
+
+const currentPath = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+
+let appPath = process.cwd();
+let fallbackPath = path.join(appPath, 'node_modules', '@caweb', 'template');
+
+let templatePartials = {
+    'branding': 'semantics/branding.html',
+    'footer': 'semantics/footer.html',
+    'header': 'semantics/header.html',
+    'mobileControls': 'semantics/mobile-controls.html',
+    'navFooter': 'semantics/nav-footer.html',
+    'navHeader': 'semantics/nav-header.html',
+    'utilityHeader': 'semantics/utility-header.html',
+    'head': 'semantics/head.html',
+    'alert': 'components/alert/alert.html',
+    'searchForm': 'forms/search.html'
+}
+
+// Register partials.
+Object.entries(templatePartials).forEach(
+    ([p, f]) => {
+        let partial = false;
+
+        // if the application has a partial with the same name as the template partials we use that instead of the default template partial
+        if( fs.existsSync( path.join(appPath, f) ) ){
+            partial = path.join(appPath, f);
+        // the fallback path exists we use that
+        } else if( fs.existsSync( path.join(fallbackPath, f) ) ){
+            partial = path.join(fallbackPath, f);
+        }
+        
+        if( partial ) {
+            Handlebars.registerPartial(p, fs.readFileSync(partial).toString() );
+        }
+    } );
+
+// Register helpers.
+fs.readdirSync( path.join(currentPath, '..', 'helpers'), { recursive:true } )
+    .filter( (file) => file.endsWith('.js') )
+    .filter( Boolean )
+    .map( (file) => {
+        let name = path.basename(file).replace('.js', '');
+        let helper = require( path.join(currentPath, '..', 'helpers', file) ).default;
+
+        Handlebars.registerHelper( name, helper );
+     } );
+
+// Register customer helpers from the application if they exist.
+if( fs.existsSync( path.join(appPath, 'helpers') ) ){
+    fs.readdirSync( path.join(appPath, 'helpers'), { recursive:true } )
+        .filter( (file) => file.endsWith('.js') )
+        .filter( Boolean )
+        .map( (file) => {
+            let name = path.basename(file).replace('.js', '');
+            let helper = require( path.join(appPath, 'helpers', file) ).default;
+
+            Handlebars.registerHelper( name, helper );
+        } );
+}
+
+export default Handlebars;

package/lib/server.js

@@ -97,6 +97,18 @@ let devServer = {
     liveReload: true,
     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
+        {
+          from: /^\/.*[^.][^/]*$/, // Matches paths without file extensions
+          to: '/404.html',
+        },
+      ],
+    },
+
     // watchFiles
     // we watch all folders in the app except build, node_modules and src
     watchFiles: {

package/lib/webpack.wp.config.js

@@ -18,7 +18,7 @@ import { getArgVal } from './args.js';
 // Wordpress ignores the webpack --mode flag
 // if the flag is passed we use that mode 
 // otherwise use whatever Wordpress is using
-let mode = getArgVal('--mode') ? getArgVal('--mode') : baseConfig.mode;
+let mode = getArgVal('mode') ? getArgVal('mode') : baseConfig.mode;
 let isProduction = mode === 'production';
 
 // Update some of the default WordPress webpack rules.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "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

@@ -31,7 +31,7 @@ import {HtmlWebpackSkipAssetsPlugin} from 'html-webpack-skip-assets-plugin';
 /**
  * Internal dependencies
 */
-import { flags, flagExists, getArgVal, addFlag } from './lib/args.js';
+import { getArgVal } from './lib/args.js';
 import handlebarsLoaderOptions from './lib/loader.js';
 import { addToServer, getServer, updateTarget } from './lib/server.js';