@caweb/webpack 1.4.0-beta.2 → 1.4.0

package/helpers/bootstrap/bsAttr.js

@@ -0,0 +1,41 @@
+export default function bsAttr(util, opt, options ) {
+    // Check if the utility is valid
+    switch ( util ) {
+        case 'text':
+            if( 'left' === opt ){
+                opt = 'start';
+            }else if( 'right' === opt ){
+                opt = 'end';
+            }
+
+            break;
+        case 'spacing':
+            util = 'm';
+            
+            if( 'string' === typeof options && 'm' === options ){
+                util = options;
+            };
+
+            switch ( opt ) {
+                case 'left':
+                    util +='e';
+                    opt = 'auto';
+                    break;
+                
+                case 'center':
+                    util +='x';
+                    opt = 'auto';
+                    break;
+                
+                case 'right':
+                    util +='s';
+                    opt = 'auto';
+                    break;
+            }
+
+            break;
+    }
+    
+    return opt ? ` ${util}-${opt}` : '';
+
+}

package/helpers/logic/ifCond.js

@@ -1,25 +1,52 @@
 export default function ifCond(v1, operator, v2, options){
+    let answer = false;
+
     switch(operator){
         case '&&':
-            return ( v1 && v2 ) ? options.fn(this) : options.inverse(this);
-        case '||':
-            return ( v1 || v2 ) ? options.fn(this) : options.inverse(this);
+            answer =  v1 && v2;
+            break;
+       case '||':
+            answer = v1 || v2 ;
+            break;
         case '==':
-            return ( v1 == v2 ) ? options.fn(this) : options.inverse(this);
+            answer = v1 == v2 ;
+            break;
         case '===':
-            return ( v1 === v2 ) ? options.fn(this) : options.inverse(this);
+            answer = v1 === v2;
+            break;
         case '!=':
-            return ( v1 != v2 ) ? options.fn(this) : options.inverse(this);
+            answer = v1 != v2 ;
+            break;
         case '!==':
-            return ( v1 !== v2 ) ? options.fn(this) : options.inverse(this);
+            answer = v1 !== v2 ;
+            break;
         case '<':
-            return ( v1 < v2 ) ? options.fn(this) : options.inverse(this);
+            answer = v1 < v2 ;
+            break;
         case '<=':
-            return ( v1 <= v2 ) ? options.fn(this) : options.inverse(this);
+            answer = v1 <= v2 ;
+            break;
         case '>':
-            return ( v1 > v2 ) ? options.fn(this) : options.inverse(this);
+            answer = v1 > v2 ;
+            break;
         case '>=':
-            return ( v1 >= v2 ) ? options.fn(this) : options.inverse(this);
+            answer = v1 >= v2 ;
+            break;
         
     }
+
+    // if the function is called as a block helper
+    // return the answer if true and the options has a fn
+    if( options['fn'] && answer ){
+        return options.fn(this);
+    // if the function is called as a block helper
+    // return the answer if false and the options has an inverse
+    }else if( options['inverse'] && !answer ){
+        return options.inverse(this);
+    
+    // if the function is called as a subexpression
+    // return the answer
+    }else{
+        return answer;
+    }
 }

package/helpers/logic/not.js

@@ -0,0 +1,3 @@
+export default function not(response, options ) {
+    return ! response;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "1.4.0-beta.2",
+  "version": "1.4.0",
   "description": "CAWebPublishing Webpack Configuration",
   "main": "webpack.config.js",
   "files": [
@@ -37,8 +37,8 @@
   },
   "homepage": "https://github.com/CAWebPublishing/webpack#readme",
   "dependencies": {
-    "@caweb/html-webpack-plugin": "^1.8.2",
-    "@wordpress/scripts": "^30.16.0",
+    "@caweb/html-webpack-plugin": "^1.8.4",
+    "@wordpress/scripts": "^30.17.0",
     "css-minimizer-webpack-plugin": "^7.0.2",
     "handlebars-loader": "^1.7.3",
     "html-webpack-link-type-plugin": "^1.1.1",

package/webpack.config.js

@@ -106,10 +106,28 @@ baseConfig.plugins.splice(1,1, false);
  */
 delete baseConfig.devServer;
 
+let customTemplateHelpers = [];
+
 // we allow the user to pass custom template helpers
-const customTemplateHelpers = fs.existsSync(path.resolve('helpers'), {withFileTypes: true} ) ?
-  fs.readdirSync(path.resolve('helpers'), {withFileTypes: true} ).filter( Dirent => Dirent.isDirectory()  ).map( Dirent => path.resolve(Dirent.parentPath, Dirent.name) ) :
-  [];
+
+if( fs.existsSync(path.join(appPath, 'helpers'), {withFileTypes: true} ) ) {
+  // we add the helpers directory
+  customTemplateHelpers = [ path.join(appPath, 'helpers') ];
+  
+  // we add any subdirectories
+  fs.readdirSync(
+      path.join(
+        appPath, 'helpers'
+      ), 
+      {
+        withFileTypes: true, 
+        recursive: true
+      } 
+    )
+    .filter( Dirent => Dirent.isDirectory()  )
+    .map( Dirent => customTemplateHelpers.push( path.resolve(Dirent.parentPath, Dirent.name) ) )
+
+} 
 
 // Wordpress ignores the webpack --mode flag
 // if the flag is passed we use that mode 
@@ -194,6 +212,7 @@ let webpackConfig = {
               case 'footer':
               case 'header': 
               case 'mobileControls': 
+              case 'navFooter':
               case 'navHeader': 
               case 'utilityHeader': 
                 partialDir = 'semantics';