@caweb/webpack 1.3.2 → 1.3.4

package/changelog.txt

@@ -1,3 +1,9 @@
+v1.3.4
+- Updated npm packages
+
+v1.3.3
+- Updated npm packages
+
 v1.3.2
 - Updated npm packages
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "CAWebPublishing Webpack Configuration",
   "main": "index.js",
   "type": "module",
@@ -37,7 +37,7 @@
   "dependencies": {
     "@caweb/a11y-webpack-plugin": "^1.0.9",
     "@caweb/css-audit-webpack-plugin": "^1.0.12",
-    "@caweb/html-webpack-plugin": "^1.5.3",
+    "@caweb/html-webpack-plugin": "^1.5.5",
     "@caweb/jshint-webpack-plugin": "^1.0.9"
   }
 }

package/plugins/html/changelog.txt

@@ -1,3 +1,11 @@
+v1.5.5
+- Refined toLower, toUpper, toTitleCase, replace helper functions
+
+v1.5.4
+- Updated npm scripts
+- Fixed issue with initial scheme selection for plugin
+- Added toLower, toUpper, toTitleCase, replace, jsonStringify, jsonParse handlebar loader helper functions
+
 v1.5.3
 - Updated anchor typography and nav-link variables colors to match schemes
 - Added update scripts script

package/plugins/html/helpers/object/jsonParse.js

@@ -0,0 +1,6 @@
+export default function jsonParse(value){
+    // if value is passed 
+    if( value && value.length ){
+        return JSON.parse(value);
+    }
+}

package/plugins/html/helpers/object/jsonStringify.js

@@ -0,0 +1,6 @@
+export default function jsonStringify(value){
+    // if value is passed 
+    if( value && value.length ){
+        return JSON.stringify(value);
+    }
+}

package/plugins/html/helpers/string/replace.js

@@ -0,0 +1,15 @@
+export default function replace(value, search, replace){
+    let response = '';
+
+    // if parameter is passed 
+    if( value && value.length ){
+        response = value.replace(new RegExp(search, "g"), replace);
+    }
+
+    // if nested content exists
+    if( value.fn && value.fn().length ){
+        response +=  value.fn().replace(new RegExp(search, "g"), replace);
+    }
+
+    return response;
+}

package/plugins/html/helpers/string/toLower.js

@@ -0,0 +1,16 @@
+export default function toLower(value, options){
+    let response = '';
+
+    // if parameter is passed 
+    if( value && value.length ){
+        response = value.toLowerCase();
+    }
+
+    // if nested content exists
+    if( (value.fn && value.fn().length) || (options.fn && options.fn().length ) ){
+        let content = value.fn ? value.fn() : options.fn();
+        response +=  content.toLowerCase();
+    }
+
+    return response;
+}

package/plugins/html/helpers/string/toTitleCase.js

@@ -0,0 +1,16 @@
+export default function toTitleCase(value, options){
+    let response = '';
+
+    // if parameter is passed 
+    if( value && value.length ){
+        response = value.split(' ').map( w => w.charAt(0).toUpperCase() + w.slice(1) ).join(' ');
+    }
+
+    // if nested content exists
+    if( (value.fn && value.fn().length) || (options.fn && options.fn().length ) ){
+        let content = value.fn ? value.fn() : options.fn();
+        response +=  content.split(' ').map( w => w.charAt(0).toUpperCase() + w.slice(1) ).join(' ');
+    }
+
+    return response;
+}

package/plugins/html/helpers/string/toUpper.js

@@ -0,0 +1,16 @@
+export default function toUpper(value, options){
+    let response = '';
+
+    // if parameter is passed 
+    if( value && value.length ){
+        response = value.toUpperCase();
+    }
+
+    // if nested content exists
+    if( (value.fn && value.fn().length) || (options.fn && options.fn().length ) ){
+        let content = value.fn ? value.fn() : options.fn();
+        response +=  content.toUpperCase();
+    }
+
+    return response;
+}

package/plugins/html/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "@caweb/html-webpack-plugin",
-    "version": "1.5.3",
+    "version": "1.5.5",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@caweb/html-webpack-plugin",
-            "version": "1.5.3",
+            "version": "1.5.5",
             "license": "ISC",
             "dependencies": {
                 "@caweb/a11y-webpack-plugin": "^1.0.9",

package/plugins/html/package.json

@@ -1,12 +1,13 @@
 {
     "name": "@caweb/html-webpack-plugin",
-    "version": "1.5.3",
+    "version": "1.5.5",
     "description": "CAWebPublishing Sample Page and Configurations",
     "main": "index.js",
     "type": "module",
     "files": [
         "build",
         "entry",
+        "helpers",
         "sample",
         "index.js",
         "README.md",
@@ -25,63 +26,63 @@
         "build:delta": "npm run build:delta:prod && npm run build:delta:dev",
         "build:delta:prod": "webpack build --config ./webpack.config.js ./entry/delta.js --merge --mode production",
         "build:delta:dev": "webpack build --config ./webpack.config.js ./entry/delta.js --merge --mode development",
-        "serve:delta": "webpack serve --config ./webpack.config.js ./entry/delta.js ./scripts/webpack.test.js --merge",
-        "serve:delta:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/delta.js ./scripts/webpack.test.js --merge",
+        "serve:delta": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/delta.js ./scripts/webpack.test.js --merge",
+        "serve:delta:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/delta.js ./scripts/webpack.test.js --merge",
         "build:eureka": "npm run build:eureka:prod && npm run build:eureka:dev",
         "build:eureka:prod": "webpack build --config ./webpack.config.js ./entry/eureka.js --merge --mode production",
         "build:eureka:dev": "webpack build --config ./webpack.config.js ./entry/eureka.js --merge --mode development",
-        "serve:eureka": "webpack serve --config ./webpack.config.js ./entry/eureka.js ./scripts/webpack.test.js --merge",
-        "serve:eureka:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/eureka.js ./scripts/webpack.test.js --merge",
+        "serve:eureka": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/eureka.js ./scripts/webpack.test.js --merge",
+        "serve:eureka:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/eureka.js ./scripts/webpack.test.js --merge",
         "build:mono": "npm run build:mono:prod && npm run build:mono:dev",
         "build:mono:prod": "webpack build --config ./webpack.config.js ./entry/mono.js --merge --mode production",
         "build:mono:dev": "webpack build --config ./webpack.config.js ./entry/mono.js --merge --mode development",
-        "serve:mono": "webpack serve --config ./webpack.config.js ./entry/mono.js ./scripts/webpack.test.js --merge",
-        "serve:mono:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/mono.js ./scripts/webpack.test.js --merge",
+        "serve:mono": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/mono.js ./scripts/webpack.test.js --merge",
+        "serve:mono:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/mono.js ./scripts/webpack.test.js --merge",
         "build:oceanside": "npm run build:oceanside:prod && npm run build:oceanside:dev",
         "build:oceanside:prod": "webpack build --config ./webpack.config.js ./entry/oceanside.js --merge --mode production",
         "build:oceanside:dev": "webpack build --config ./webpack.config.js ./entry/oceanside.js --merge --mode development",
-        "serve:oceanside": "webpack serve --config ./webpack.config.js ./entry/oceanside.js ./scripts/webpack.test.js --merge",
-        "serve:oceanside:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/oceanside.js ./scripts/webpack.test.js --merge",
+        "serve:oceanside": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/oceanside.js ./scripts/webpack.test.js --merge",
+        "serve:oceanside:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/oceanside.js ./scripts/webpack.test.js --merge",
         "build:orangecounty": "npm run build:orangecounty:prod && npm run build:orangecounty:dev",
         "build:orangecounty:prod": "webpack build --config ./webpack.config.js ./entry/orangecounty.js --merge --mode production",
         "build:orangecounty:dev": "webpack build --config ./webpack.config.js ./entry/orangecounty.js --merge --mode development",
-        "serve:orangecounty": "webpack serve --config ./webpack.config.js ./entry/orangecounty.js ./scripts/webpack.test.js --merge",
-        "serve:orangecounty:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/orangecounty.js ./scripts/webpack.test.js --merge",
+        "serve:orangecounty": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/orangecounty.js ./scripts/webpack.test.js --merge",
+        "serve:orangecounty:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/orangecounty.js ./scripts/webpack.test.js --merge",
         "build:pasorobles": "npm run build:pasorobles:prod && npm run build:pasorobles:dev",
         "build:pasorobles:prod": "webpack build --config ./webpack.config.js ./entry/pasorobles.js --merge --mode production",
         "build:pasorobles:dev": "webpack build --config ./webpack.config.js ./entry/pasorobles.js --merge --mode development",
-        "serve:pasorobles": "webpack serve --config ./webpack.config.js ./entry/pasorobles.js ./scripts/webpack.test.js --merge",
-        "serve:pasorobles:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/pasorobles.js ./scripts/webpack.test.js --merge",
+        "serve:pasorobles": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/pasorobles.js ./scripts/webpack.test.js --merge",
+        "serve:pasorobles:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/pasorobles.js ./scripts/webpack.test.js --merge",
         "build:sacramento": "npm run build:sacramento:prod && npm run build:sacramento:dev",
         "build:sacramento:prod": "webpack build --config ./webpack.config.js ./entry/sacramento.js --merge --mode production",
         "build:sacramento:dev": "webpack build --config ./webpack.config.js ./entry/sacramento.js --merge --mode development",
-        "serve:sacramento": "webpack serve --config ./webpack.config.js ./entry/sacramento.js ./scripts/webpack.test.js --merge",
-        "serve:sacramento:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/sacramento.js ./scripts/webpack.test.js --merge",
+        "serve:sacramento": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/sacramento.js ./scripts/webpack.test.js --merge",
+        "serve:sacramento:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/sacramento.js ./scripts/webpack.test.js --merge",
         "build:santabarbara": "npm run build:santabarbara:prod && npm run build:santabarbara:dev",
         "build:santabarbara:prod": "webpack build --config ./webpack.config.js ./entry/santabarbara.js --merge --mode production",
         "build:santabarbara:dev": "webpack build --config ./webpack.config.js ./entry/santabarbara.js --merge --mode development",
-        "serve:santabarbara": "webpack serve --config ./webpack.config.js ./entry/santabarbara.js ./scripts/webpack.test.js --merge",
-        "serve:santabarbara:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/santabarbara.js ./scripts/webpack.test.js --merge",
+        "serve:santabarbara": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/santabarbara.js ./scripts/webpack.test.js --merge",
+        "serve:santabarbara:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/santabarbara.js ./scripts/webpack.test.js --merge",
         "build:santacruz": "npm run build:santacruz:prod && npm run build:santacruz:dev",
         "build:santacruz:prod": "webpack build --config ./webpack.config.js ./entry/santacruz.js --merge --mode production",
         "build:santacruz:dev": "webpack build --config ./webpack.config.js ./entry/santacruz.js --merge --mode development",
-        "serve:santacruz": "webpack serve --config ./webpack.config.js ./entry/santacruz.js ./scripts/webpack.test.js --merge",
-        "serve:santacruz:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/santacruz.js ./scripts/webpack.test.js --merge",
+        "serve:santacruz": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/santacruz.js ./scripts/webpack.test.js --merge",
+        "serve:santacruz:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/santacruz.js ./scripts/webpack.test.js --merge",
         "build:shasta": "npm run build:shasta:prod && npm run build:shasta:dev",
         "build:shasta:prod": "webpack build --config ./webpack.config.js ./entry/shasta.js --merge --mode production",
         "build:shasta:dev": "webpack build --config ./webpack.config.js ./entry/shasta.js --merge --mode development",
-        "serve:shasta": "webpack serve --config ./webpack.config.js ./entry/shasta.js ./scripts/webpack.test.js --merge",
-        "serve:shasta:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/shasta.js ./scripts/webpack.test.js --merge",
+        "serve:shasta": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/shasta.js ./scripts/webpack.test.js --merge",
+        "serve:shasta:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/shasta.js ./scripts/webpack.test.js --merge",
         "build:sierra": "npm run build:sierra:prod && npm run build:sierra:dev",
         "build:sierra:prod": "webpack build --config ./webpack.config.js ./entry/sierra.js --merge --mode production",
         "build:sierra:dev": "webpack build --config ./webpack.config.js ./entry/sierra.js --merge --mode development",
-        "serve:sierra": "webpack serve --config ./webpack.config.js ./entry/sierra.js ./scripts/webpack.test.js --merge",
-        "serve:sierra:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/sierra.js ./scripts/webpack.test.js --merge",
+        "serve:sierra": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/sierra.js ./scripts/webpack.test.js --merge",
+        "serve:sierra:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/sierra.js ./scripts/webpack.test.js --merge",
         "build:trinity": "npm run build:trinity:prod && npm run build:trinity:dev",
         "build:trinity:prod": "webpack build --config ./webpack.config.js ./entry/trinity.js --merge --mode production",
         "build:trinity:dev": "webpack build --config ./webpack.config.js ./entry/trinity.js --merge --mode development",
-        "serve:trinity": "webpack serve --config ./webpack.config.js ./entry/trinity.js ./scripts/webpack.test.js --merge",
-        "serve:trinity:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y' && webpack serve --config ./webpack.config.js ./entry/trinity.js ./scripts/webpack.test.js --merge"
+        "serve:trinity": "set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/trinity.js ./scripts/webpack.test.js --merge",
+        "serve:trinity:quick": "set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/trinity.js ./scripts/webpack.test.js --merge"
     },
     "repository": {
         "type": "git",

package/plugins/html/scripts/update-scripts.js

@@ -31,7 +31,7 @@ fs.readdirSync(path.resolve('src', 'styles', 'colorschemes')).forEach((c) => {
     scripts[`build:${scheme}:dev`] = `webpack build --config ./webpack.config.js ./entry/${scheme}.js --merge --mode development`;
     
     // add serve scripts for each colorscheme 
-    scripts[`serve:${scheme}`] = `webpack serve --config ./webpack.config.js ./entry/${scheme}.js ./scripts/webpack.test.js --merge`;
+    scripts[`serve:${scheme}`] = `set NODE_OPTIONS='--scheme false' && webpack serve --config ./webpack.config.js ./entry/${scheme}.js ./scripts/webpack.test.js --merge`;
     scripts[`serve:${scheme}:quick`] = `set NODE_OPTIONS='--no-jshint --no-audit --no-a11y --scheme false' && webpack serve --config ./webpack.config.js ./entry/${scheme}.js ./scripts/webpack.test.js --merge`;
 
 })

package/plugins/html/webpack.config.js

@@ -31,6 +31,7 @@ import A11yPlugin from '@caweb/a11y-webpack-plugin';
 import CAWebHTMLPlugin from './index.js';
 
 const webpackCommand = 'build' === process.argv[2] ? 'build' : 'serve' ;
+const currentPath = path.dirname(fileURLToPath(import.meta.url));
 
 // flags can be passed via argv0 
 // we also add args from NODE_OPTIONS
@@ -127,6 +128,10 @@ let webpackConfig = {
         loader: 'handlebars-loader',
         options:{
           rootRelative: process.cwd(),
+          helperDirs: [
+            path.resolve(currentPath, 'helpers', 'string'),
+            path.resolve(currentPath, 'helpers', 'object')
+          ],
           partialResolver: function(partial, callback){
               /**
                * All template partials are loaded from the root sample directory
@@ -241,7 +246,7 @@ if( 'serve' === webpackCommand ){
     new CAWebHTMLPlugin({
         template,
         templateParameters: {
-          scheme 
+          scheme: 'false' !== scheme ? scheme : false 
         },
         skipAssets: [
             /.*-rtl.css/, // we skip the Right-to-Left Styles