@caweb/cli 1.0.5 → 1.2.0

package/lib/wordpress.js

@@ -1,57 +1,71 @@
-'use strict';
-const { writeFile } = require('fs-extra');
-const path = require( 'path' );
-const { execSync } = require( 'child_process' );
-
 /**
  * External dependencies
  */
+import fs from 'fs-extra';
+import path from 'node:path';
 
 /**
  * Internal dependencies
  */
-const {runDockerCmds} = require('./docker');
+import {runCLICmds} from './utils.js';
+
+/**
+ * Promisified dependencies
+ */
+const { writeFile } = fs.promises;
 
 /**
  * Checks whether WordPress environment is a multisite installation.
  * 
  * @param {string}		environment	Which environment to check for multisite installation.
  * @param {WPConfig}    config      The wp-env config object.
+ * @param {Object} 		spinner     A CLI spinner which indicates progress.
  * @returns 
  */
-async function isMultisite( environment, config ){
-	return await runDockerCmds(
+async function isMultisite( environment, config, spinner ){
+
+	const result = await runCLICmds(
 		environment,
 		[ 'wp config get MULTISITE' ],
-		config
+		config,
+		spinner
 	)
+
+	/**
+	 * If the constant doesn't exist the wp cli returns an exit code of 1
+	 * we have to return false, otherwise we can just return the cli result.
+	 */
+	return typeof result === 'object' && result.exitCode ? false : result;
 }
 
 /**
  * Transforms an existing single-site installation into a multisite installation.
  * 
- * @param {string} environment Which environment to convert into a multisite installation.
- * @param {WPConfig} config The wp-env config object.
- * @param {boolean} subdomain   True if converting to multisite subdomain.
+ * @param {string} 		environment Which environment to convert into a multisite installation.
+ * @param {WPConfig} 	config 		The wp-env config object.
+ * @param {boolean} 	subdomain   True if converting to multisite subdomain.
+ * @param {Object} 		spinner     A CLI spinner which indicates progress.
  * @returns 
  */
-async function convertToMultisite( environment, config, subdomain ){
+async function convertToMultisite( environment, config, subdomain, spinner ){
 	// before we can conver to multisite all plugins must be deactivated.
 	// first lets get all plugins
-	let activePlugins = await runDockerCmds(
+	let activePlugins = await runCLICmds(
 		environment,
 		['wp option get active_plugins --format=json'],
-		config
+		config,
+		spinner
 	)
 
 	activePlugins = Object.values(JSON.parse( activePlugins ));
 
 	// deactivate all active plugins.
 	if( activePlugins.length ){
-		await runDockerCmds(
+		await runCLICmds(
 			environment,
 			['wp plugin deactivate ' + activePlugins.join(' ')],
-			config
+			config,
+			spinner
 		)
 	}
 	
@@ -62,10 +76,11 @@ async function convertToMultisite( environment, config, subdomain ){
 		command += ' --subdomains'
 	}
 
-	await runDockerCmds(
+	await runCLICmds(
 		environment, 
 		[command],
-		config
+		config,
+		spinner
 	)
 
 	// generate .htaccess
@@ -73,10 +88,11 @@ async function convertToMultisite( environment, config, subdomain ){
 
 	// network activate all active plugins again.
 	if( activePlugins.length ){
-		await runDockerCmds(
+		await runCLICmds(
 			environment,
 			['wp plugin activate ' + activePlugins.join(' ') + ' --network'],
-			config
+			config,
+			spinner
 		)
 	}
 
@@ -85,8 +101,8 @@ async function convertToMultisite( environment, config, subdomain ){
 /**
  * Generates .htaccess file content.
  * 
- * @param {string} environment Which environment to generate .htaccess for.
- * @param {boolean} subdomain True if converting to multisite subdomain.
+ * @param {string} 	environment Which environment to generate .htaccess for.
+ * @param {boolean} subdomain  	True if converting to multisite subdomain.
  */
 async function generateHTAccess(environment, workDirectoryPath, subdomain){
 	let trailingSlash = subdomain ? '^wp-admin$ wp-admin/ [R=301,L]' : '^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/';
@@ -115,6 +131,7 @@ async function generateHTAccess(environment, workDirectoryPath, subdomain){
 	await writeFile(path.join(workDirectoryPath, folder, '.htaccess'), htaccess);
 
 }
+
 /**
  * Configures WordPress for the given environment by installing WordPress,
  * activating all plugins, and activating the first theme. These steps are
@@ -137,20 +154,21 @@ async function configureWordPress(environment, config, spinner, multisite, subdo
 	if( multisite ){
 		spinner.text = 'Converting to multisite ' + ( subdomain ? 'subdomain' : 'subdirectory') + '...'
 		
-		await convertToMultisite( environment, config, subdomain )
+		await convertToMultisite( environment, config, subdomain, spinner )
 	}
 
 	// rewrite and flush permalink structure.
-	await runDockerCmds(
+	await runCLICmds(
 		environment,
 		[
 			`wp rewrite structure ${WP_PERMALINK} --hard`
 		],
-		config
+		config, 
+		spinner
 	);
 }
 
-module.exports = {
+export {
 	configureWordPress,
 	isMultisite,
 	convertToMultisite,

package/package.json

@@ -1,8 +1,10 @@
 {
   "name": "@caweb/cli",
-  "version": "1.0.5",
+  "version": "1.2.0",
   "description": "CAWebPublishing Command Line Interface.",
-  "main": "lib/env.js",
+  "exports": "./lib/env.js",
+  "type": "module",
+  "node": ">=16",
   "files": [
     "bin",
     "lib"
@@ -16,6 +18,7 @@
   },
   "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"
   },
@@ -37,15 +40,17 @@
   },
   "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",
     "PHP_VER": "8.1",
+    "CREATE_BLOCK_VER": "4.32.0",
     "DEFAULTS": {
-      "WP_DEFAULT_THEME": "CAWeb",
       "FS_METHOD": "direct",
       "WP_DEBUG": true,
       "WP_DEBUG_LOG": true,
@@ -56,7 +61,8 @@
       "ADMIN_COOKIE_PATH": "/",
       "COOKIE_DOMAIN": "",
       "COOKIEPATH": "",
-      "SITECOOKIEPATH": ""
+      "SITECOOKIEPATH": "",
+      "CONCATENATE_SCRIPTS": false
     }
   }
 }

package/lib/commands/tasks/index.js

@@ -1,13 +0,0 @@
-'use strict';
-/**
- * External dependencies
- */
-
-/**
- * Internal dependencies
- */
-const updatePlugins = require('./update-plugins')
-
-module.exports = {
-	updatePlugins,
-};

package/lib/docker.js

@@ -1,66 +0,0 @@
-'use strict';
-/**
- * External dependencies
- */
-const dockerCompose = require( 'docker-compose' );
-const path = require( 'path' );
-const loadConfig = require( '@wordpress/env/lib/config/load-config' );
-
-
-/**
- * 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.
- * 
- * @returns {Object}
- */
-async function runDockerCmds(
-	environment,
-	cmds,
-	config
-) {
-
-	try {
-		// Execute all setup commands in a batch.
-		return await dockerCompose.run(
-			environment === 'development' ? 'cli' : 'tests-cli',
-			[ 'bash', '-c', cmds.join( ' && ' ) ],
-			{
-				cwd: config.workDirectoryPath,
-				commandOptions: [ '--rm' ],
-				log: config.debug,
-			}
-		).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;
-			},
-			(output) => {
-				// Remove the Container information and new lines.
-				output.err = output.err.replace(/\s*Container .*Running\n|\n/g, '')
-
-				return false;
-			}
-		);
-
-	} catch(error) {
-		console.log(error)
-
-		process.exit( 1 );
-	}
-	
-}
-
-
-module.exports = {
-	runDockerCmds
-};