@caweb/cli 1.2.0 → 1.3.1

package/lib/wordpress/index.js

@@ -0,0 +1,19 @@
+import { activateCAWeb, configureCAWeb } from "./caweb.js";
+import { downloadSources } from "./download-sources.js";
+import { configureDivi, isDiviThemeActive } from "./divi.js";
+import { configureWordPress, isMultisite, convertToMultisite, generateHTAccess } from "./wordpress.js";
+import { getTaxonomies, createTaxonomies }  from "./api.js";
+
+export {
+    activateCAWeb,
+    configureCAWeb,
+    downloadSources,
+	configureDivi,
+	isDiviThemeActive,
+	configureWordPress,
+	isMultisite,
+	convertToMultisite,
+	generateHTAccess,
+	getTaxonomies,
+    createTaxonomies
+}

package/lib/{wordpress.js → wordpress/wordpress.js}

@@ -1,18 +1,14 @@
 /**
  * External dependencies
  */
-import fs from 'fs-extra';
-import path from 'node:path';
+import fs from 'fs';
+import path from 'path';
 
 /**
  * Internal dependencies
  */
-import {runCLICmds} from './utils.js';
+import {runCLICmds} from '../helpers.js';
 
-/**
- * Promisified dependencies
- */
-const { writeFile } = fs.promises;
 
 /**
  * Checks whether WordPress environment is a multisite installation.
@@ -128,7 +124,7 @@ async function generateHTAccess(environment, workDirectoryPath, subdomain){
 
 	let folder = 'development' === environment ? 'WordPress' : 'Tests-WordPress'
 
-	await writeFile(path.join(workDirectoryPath, folder, '.htaccess'), htaccess);
+	fs.writeFileSync(path.join(workDirectoryPath, folder, '.htaccess'), htaccess);
 
 }
 

package/package.json

@@ -1,53 +1,44 @@
 {
   "name": "@caweb/cli",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "CAWebPublishing Command Line Interface.",
   "exports": "./lib/env.js",
   "type": "module",
-  "node": ">=16",
-  "files": [
-    "bin",
-    "lib"
-  ],
-  "directories": {
-    "doc": "docs",
-    "lib": "lib"
-  },
+  "node": ">=20",
+  "author": "CAWebPublishing",
+  "license": "ISC",
   "bin": {
     "caweb": "bin/caweb"
   },
+  "files": [
+    "assets",
+    "bin",
+    "commands",
+    "configs",
+    "gen",
+    "lib",
+    "template"
+  ],
   "scripts": {
-    "caweb": "caweb",
-    "wp-env": "wp-env",
-    "local": "npm pack && npm i caweb-cli-%npm_package_version%.tgz",
     "test": "echo \"Error: run tests from root\" && exit 0"
   },
+  "homepage": "https://github.com/CAWebPublishing/caweb-cli#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/CAWebPublishing/caweb-cli.git"
   },
+  "bugs": {
+    "url": "https://github.com/CAWebPublishing/caweb-cli/issues"
+  },
   "keywords": [
     "caweb",
     "cagov"
   ],
-  "author": "CAWebPublishing",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/CAWebPublishing/caweb-cli/issues"
-  },
   "publishConfig": {
     "access": "public"
   },
-  "homepage": "https://github.com/CAWebPublishing/caweb-cli#readme",
-  "dependencies": {
-    "@wordpress/create-block": "^4.32.0",
-    "@wordpress/env": "^9.0.0",
-    "chalk": "^4.0.0",
-    "commander": "^11.1.0",
-    "fs-extra": "^11.1.1"
-  },
   "config": {
-    "WP_VER": "6.4.2",
+    "WP_VER": "6.4.3",
     "PHP_VER": "8.1",
     "CREATE_BLOCK_VER": "4.32.0",
     "DEFAULTS": {
@@ -64,5 +55,28 @@
       "SITECOOKIEPATH": "",
       "CONCATENATE_SCRIPTS": false
     }
+  },
+  "dependencies": {
+    "@wordpress/env": "^9.4.0",
+    "@wordpress/scripts": "^27.3.0",
+    "accessibility-checker": "^3.1.67",
+    "autoprefixer": "^10.4.17",
+    "axios": "^1.6.7",
+    "chalk": "^5.3.0",
+    "commander": "^12.0.0",
+    "cross-spawn": "^7.0.3",
+    "css-loader": "^6.10.0",
+    "docker-compose": "^0.24.6",
+    "handlebars-loader": "^1.7.3",
+    "html-to-json-parser": "^2.0.1",
+    "html-webpack-plugin": "^5.6.0",
+    "mini-css-extract-plugin": "^2.8.0",
+    "ora": "^8.0.1",
+    "postcss-loader": "^8.1.0",
+    "resolve-bin": "^1.0.1",
+    "sass-loader": "^14.1.1",
+    "terminal-link": "^3.0.0",
+    "url": "^0.11.3",
+    "webpack": "^5.90.3"
   }
 }

package/lib/commands/test.js

@@ -1,46 +0,0 @@
-/**
- * External dependencies
- */
-import path from 'node:path';
-import loadConfig from '@wordpress/env/lib/config/load-config.js';
-import fs from 'fs-extra';
-
-/**
- * Internal dependencies
- */
-import { runCLICmds, runCmd } from '../utils.js';
-import generateOverridesMD from '../admin.js';
-import { CAWEB_OPTIONS, DIVI_OPTIONS } from '../options.js';
-
-/**
- * Promisified dependencies
- */
-
-/**
- * Test code.
- * 
- * @param {Object}  options
- * @param {Object}  options.spinner A CLI spinner which indicates progress.
- * @param {boolean} options.environment   Which environment to test in.
- * @param {boolean} options.debug   True if debug mode is enabled.
- */
-export default async function test({
-	spinner,
-	debug,
-	environment
-} ) {
-
-	spinner.text = "Testing Code Functionality";
-		const config = await loadConfig(path.resolve('.'));
-		
-		let result = await runCLICmds(
-			'development', 
-			['wp --version'], 
-			config, 
-			spinner
-		)
-
-
-		console.log( result );
-
-};

package/lib/utils.js

@@ -1,150 +0,0 @@
-/**
- * External dependencies
- */
-import { spawn } from 'node:child_process';
-import dockerCompose from 'docker-compose';
-import path from 'node:path';
-import loadConfig from '@wordpress/env/lib/config/load-config.js';
-import getHostUser from '@wordpress/env/lib/get-host-user.js';
-import { env } from 'node:process';
-
-
-/**
- * Internal dependencies
- */
-
-/**
- * Runs commands on the given WordPress environment.
- * 
- * @param {string}		environment	Which environment to run docker command on.
- * @param {string[]} 	cmds   		Array of commands to run.
- * @param {WPConfig} 	config      The wp-env config object.
- * @param {Object}   	spinner A CLI spinner which indicates progress.
- * 
- * @returns {Promise}
- */
-async function runCLICmds(
-	environment,
-	cmds,
-	config,
-	spinner
-) {
-
-	// We return the promise whether there is an output or an error.
-	return await dockerCompose.run(
-			environment === 'development' ? 'cli' : 'tests-cli',
-			[ 'bash', '-c', cmds.join( ' && ' ) ],
-			{
-				cwd: config.workDirectoryPath,
-				commandOptions: [],
-				log: config.debug,
-				callback: (buffer, result) => {
-					if( config.debug ){
-						spinner.text = buffer.toString();
-					}
-				}
-			}
-		).then(
-			(output) => {
-				// Remove the Container information and new lines.
-				output.err = output.err.replace(/\s*Container .*Running\n|\n/g, '')
-				output.out = output.out.replace(/\s*Container .*Running\n|\n/g, '')
-
-				return '' !== output.out ? output.out : output.err;
-			},
-			(error) => {
-				// Remove the Container information and new lines.
-				error.err = error.err.replace(/\s*Container .*Running\n|\n/g, '')
-
-				return error;
-			}
-		);
-
-}
-
-/**
- * Runs command directly.
- * 
- * @param {string} 		cmd		Command to run.
- * @param {string[]} 	args	List of command arguments.
- * @param {string[]}  opts   List of spawn options.
- * @param {Object}   	spinner A CLI spinner which indicates progress.
- * @param {boolean}  debug   True if debug mode is enabled.
- * 
- * @returns {Promise}
- */
-async function runCmd(cmd, args,spinner, opts = { stdio: 'pipe' },  debug = false){
-	// fix various commands.
-	switch (cmd) {
-		case 'npm':
-		case 'npx':
-		/**
-		 * On Windows we run npm.cmd, on Linux we run npm
-		 */
-		cmd += /^win/.test(process.platform) ? '.cmd' : '';
-		break;
-	}
-
-	// save output for handling
-	let output = opts.stdio;
-
-	return  await new Promise( (resolve, reject) => {
-		let result = [];
-		const childProc = spawn(
-			cmd,
-			args,
-			{
-				...opts,
-				stdio: 'pipe' // output is always piped and handled when stdout receives data.
-			},
-			spinner
-	   	);
-
-		childProc.stdout.on( 'data', (data) => {
-			// remove new lines from data
-			data = data.toString().replace('\n', '');
-
-			// push all data to results array if piping data
-			if( '\n' !== data && '' !== data && data.length ){
-				// output accordingly.
-				switch( output ){
-					case 'initial': // write output to spinner text
-						spinner.text = data;
-					case 'inherit': // write output to persistent spinner text
-						spinner.stopAndPersist({
-							text: data
-						});
-						break;
-					case 'pipe': // save output to result array and output on exit
-					default:
-						result.push( data );
-						break;
-				}
-			}
-		});
-		
-		childProc.on( 'error', reject );
-		childProc.on( 'exit', ( code ) => {
-			// resolved with no issues return result array
-			if ( code === 0 ) {
-				resolve(result.join('\n'));
-				// if there was an error 
-			} else {
-				if( debug ){
-					// if debugging return exit code
-					reject( `Command failed with exit code ${ code }` );
-				}else{
-					// resolve as false.
-					resolve(false);
-				}
-			}
-		} );
-	   
-   });
-
-}
-
-export {
-	runCLICmds,
-	runCmd
-};