@caweb/cli 1.15.15 → 1.15.17

package/commands/gen-scripts.js

@@ -38,12 +38,13 @@ export default async function genScripts({
 			"caweb": "caweb",
 			"create-site": "caweb create-site",
 			"serve": "caweb serve",
+			"serve:no-audit": "caweb serve --no-audit --no-jshint --no-a11y",
 			"build": "caweb build",
 			"convert-site": "caweb convert-site",
 			"launch": "caweb launch",
 			"launch:multi": "caweb launch --multisite",
 			"launch:multi:subdomain": "caweb launch --multisite --subdomain",
-			"launch:sync": "caweb launch --sync --update",
+			"launch:sync": "caweb launch --sync",
 			"launch:update": "caweb launch --update",
 			"stop": "caweb stop",
 			"shutdown": "caweb destroy",

package/commands/sites/convert-site.js

@@ -623,6 +623,13 @@ function generateShortcodes( mainContent,  opts = {
 			// all theses elements can go in other modules
 			// they also need to be added to the allowedModules list
 			case 'a':
+				// if the element first child is an image
+				if( content[0] && content[0].rawTagName === 'img' ) {
+					// add the anchors attributes to the image
+					content[0].rawAttrs = content[0].rawAttrs + ' ' + rawAttrs;
+					output += generateModuleShortcode('image', content[0] );
+					break;
+				}
 			case 'b':
 			case 'p':
 			case 'ol':
@@ -809,17 +816,20 @@ function generateModuleShortcode(module, element  ){
 	let attrs = {};
 	let moduleName = 'et_pb_' + module;
 
+	// commonly named attributes can be declared here to avoid repetition
+	let header, title, img;
+
 	switch( module ) {
-		case 'blurb': {
+		case 'blurb': 
 			/**
 			 * if blurb module is requested
 			 * we try and make the shortcode as if the element
 			 * was made with a Card Component
 			 */
 
-			let header = element.querySelector('.card-header');
-			let title = element.querySelector('.card-title');
-			let img = element.children.filter( c => c.tagName.toLowerCase() === 'img' );
+			header = element.querySelector('.card-header');
+			title = element.querySelector('.card-title');
+			img = element.children.filter( c => c.tagName.toLowerCase() === 'img' );
 			
 			content = element.querySelector('.card-body');
 
@@ -887,14 +897,14 @@ function generateModuleShortcode(module, element  ){
 				}
 			}
 			break;
-		}
-		case 'ca_card': {
+		
+		case 'ca_card': 
 			/**
 			 * if card module is requested
 			 */
-			let header = element.querySelector('.card-header');
-			let title = element.querySelector('.card-title');
-			let img = element.children.filter( c => c.tagName.toLowerCase() === 'img' );
+			header = element.querySelector('.card-header');
+			title = element.querySelector('.card-title');
+			img = element.children.filter( c => c.tagName.toLowerCase() === 'img' );
 			let layout = element.classList.toString().match(/card-(\w+)/g)[0].replace('card-', '');
 
 			content = element.querySelector('.card-body');
@@ -962,8 +972,8 @@ function generateModuleShortcode(module, element  ){
 				}
 			}
 			break;
-		}
-		case 'heading': {
+		
+		case 'heading': 
 
 			attrs = {
 				title: element.innerHTML.trim(),
@@ -986,7 +996,12 @@ function generateModuleShortcode(module, element  ){
 			content = element.innerHTML.trim()
 
 			break;
-		}
+		
+		case 'image':
+			let {src, href: url} = convertRawAttrs( element.rawAttrs )
+			attrs = { src, url };
+
+		break;
 	}
 
 	if( element.classList.length ){

package/configs/webpack.plugins.js

@@ -2,28 +2,100 @@
 /**
  * External dependencies
  */
+import path from 'path';
+import fs from 'fs';
+import Handlebars from 'handlebars';
+
 import CAWebHTMLPlugin from "@caweb/html-webpack-plugin";
 import CAWebA11yPlugin from '@caweb/a11y-webpack-plugin';
 import CAWebCSSAuditPlugin from '@caweb/css-audit-webpack-plugin';
 import CAWebJSHintPlugin from '@caweb/jshint-webpack-plugin';
 
-import { flagExists } from '@caweb/webpack/lib/args.js';
+import { flagExists, getArgVal } from '@caweb/webpack/lib/args.js';
+
+
+// this is the path to the current project directory
+const appPath = process.cwd();
+
+let templatePath = path.join(appPath, 'node_modules', '@caweb', 'template');
+
+// we read the app caweb.json file if it exists
+let caweb = fs.existsSync( path.join(appPath, 'caweb.json') ) ? 
+JSON.parse(fs.readFileSync(path.join(appPath, 'caweb.json'))) 
+: {};
+
+// argument variables
+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' );
+
+// 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 CAWebHTMLPlugin({
+                    template,
+                    filename: fileTemplate.replace(basePageDir, '') ,
+                    title,
+                    templateParameters: {
+                        scheme,
+                        partial: compiledContent,
+                    },
+
+                });
+        })
 
 export default {
 
     plugins: [
         // add custom plugins here
         // Used for Site Generation
-        new CAWebHTMLPlugin(),
+        new CAWebHTMLPlugin({
+            template,
+            templateParameters: {
+                scheme,
+            },
+        }),
+
+        // this plugin generates Search Results page using the template found in patterns/search.html
+        caweb?.site?.google?.search ? new CAWebHTMLPlugin({
+            template: searchTemplate,
+            // favicon,
+            filename: 'serp.html',
+            title: 'Search Results Page',
+            templateParameters: {
+                scheme 
+            },
+        }) : false,
+        
+        // Additional pages from content/pages directory
+        ...additionalPages,
 
         // // IBM Accessibility
-        ! flagExists('no-a11y') && new CAWebA11yPlugin(),
+        flagExists('a11y') && getArgVal('a11y') && new CAWebA11yPlugin(),
 
         // // WP CSS Auditor
-        ! flagExists( 'no-audit' ) && new CAWebCSSAuditPlugin(),
+        flagExists('audit') && getArgVal('audit') && new CAWebCSSAuditPlugin(),
 
         // // JSHint
-        ! flagExists( 'no-jshint' ) && new CAWebJSHintPlugin(),
+        flagExists('jshint') && getArgVal('jshint') && new CAWebJSHintPlugin(),
         
     ].filter( Boolean ),
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/cli",
-  "version": "1.15.15",
+  "version": "1.15.17",
   "description": "CAWebPublishing Command Line Interface.",
   "exports": "./lib/env.js",
   "type": "module",
@@ -66,9 +66,9 @@
   "dependencies": {
     "@caweb/a11y-webpack-plugin": "^2.1.0",
     "@caweb/css-audit-webpack-plugin": "^2.1.0",
-    "@caweb/html-webpack-plugin": "^2.1.2",
+    "@caweb/html-webpack-plugin": "^2.1.4",
     "@caweb/jshint-webpack-plugin": "^2.1.0",
-    "@caweb/webpack": "^1.6.4",
+    "@caweb/webpack": "^1.6.5",
     "@inquirer/prompts": "^8.2.0",
     "@wordpress/create-block": "^4.82.0",
     "@wordpress/env": "^10.39.0",