@caweb/cli 1.14.2 → 1.14.3

package/commands/env/start.js

@@ -3,30 +3,20 @@
  */
 import path from 'path';
 import fs from 'fs';
-import * as dockerCompose from 'docker-compose';
-import os from 'os';
 import deepmerge from 'deepmerge';
+import os from 'os';
+
 /**
  * WordPress dependencies
  */
 import WPEnv from '@wordpress/env';
-import { md5} from '../../lib/helpers.js';
-// import { canAccessWPORG } from '../../lib/wordpress/index.js';
-
-const CONFIG_CACHE_KEY = 'config_checksum';
-const CACHE_FILE_NAME = 'wp-env-cache.json';
 
 /**
  * Internal dependencies
  */
 import { 
 	appPath,
-	projectPath,
-	currentPath,
-	configureCAWeb,
-	configureWordPress,
-	runCmd,
-	runCLICmds
+	md5
 } from '../../lib/index.js';
 
 import { wpEnvConfig, wpEnvOverrideConfig } from '../../configs/wp-env.js';
@@ -74,7 +64,6 @@ async function getCacheDirectory() {
  * @param {boolean} options.scripts Indicates whether or not lifecycle scripts should be executed.
  * @param {boolean} options.debug   True if debug mode is enabled.
  * @param {boolean} options.sync   Will attempt to sync changes from a CAWebPublishing static site to this WordPress instance..
- * @param {boolean} options.bare   True if excluding any CAWeb Configurations.
  * @param {boolean} options.plugin   True if root directory is a plugin.
  * @param {boolean} options.theme   True if root directory is a theme.
  * @param {boolean} options.multisite   True if converting to multisite.
@@ -89,7 +78,6 @@ export default async function start({
 	debug,
 	spx,
 	sync,
-	bare,
 	plugin,
 	theme,
 	multisite,
@@ -98,6 +86,7 @@ export default async function start({
 	let configFilePath = path.resolve( appPath, '.wp-env.json' );
 	let configOverrideFilePath = path.resolve( appPath, '.wp-env.override.json' );
 
+	// taken from @wordpress/env source code so we can get the working directory path before the env starts.
 	const workDirectoryPath = path.resolve(
 		await getCacheDirectory(),
 		md5( configFilePath )
@@ -110,7 +99,7 @@ export default async function start({
 	
 		fs.writeFileSync(
 			configOverrideFilePath,
-			JSON.stringify( await wpEnvOverrideConfig({workDirectoryPath,bare, multisite, subdomain, plugin, theme}), null, 4 )
+			JSON.stringify( await wpEnvOverrideConfig({workDirectoryPath, multisite, subdomain, plugin, theme}), null, 4 )
 		);
 
 		spinner.start('Writing .wp-env.override.json file...');
@@ -122,7 +111,7 @@ export default async function start({
 		if( ! overrideConfig.config.ET_USERNAME || ! overrideConfig.config.ET_API_KEY ){
 			spinner.stop()
 
-			let diviConfig = await wpEnvOverrideConfig({workDirectoryPath,bare, multisite, subdomain, plugin, theme});
+			let diviConfig = await wpEnvOverrideConfig({workDirectoryPath, multisite, subdomain, plugin, theme});
 
 			fs.writeFileSync(
 				configOverrideFilePath,
@@ -138,7 +127,7 @@ export default async function start({
 		
 	fs.writeFileSync(
 		configFilePath,
-		JSON.stringify( await wpEnvConfig({workDirectoryPath,bare, multisite, subdomain, plugin, theme}), null, 4 )
+		JSON.stringify( await wpEnvConfig({workDirectoryPath, multisite, subdomain, plugin, theme}), null, 4 )
 	);
 
 	spinner.start('Writing .wp-env.json file...');

package/configs/wp-env.js

@@ -12,8 +12,8 @@ import {
     projectPath
 } from '../lib/helpers.js';
 import { promptForDivi } from './prompts.js';
-import { config, env } from 'process';
 import { CAWEB_OPTIONS, DIVI_OPTIONS } from'../lib/wordpress/options.js';
+import { env } from 'process';
 
 const localFile = path.join(projectPath, 'package.json');
 const pkg = JSON.parse( fs.readFileSync(localFile) );
@@ -25,7 +25,6 @@ const cawebJson = fs.existsSync( path.join(appPath, 'caweb.json') ) ?
 /**
  * Build .wp-env.json
  * 
- * @param {boolean} bare   True if excluding any CAWeb Configurations.
  * @param {boolean} multisite   True if converting to multisite.
  * @param {boolean} subdomain   True if converting to multisite subdomain.
  * @param {boolean} plugin   True if root directory is a plugin.
@@ -33,14 +32,19 @@ const cawebJson = fs.existsSync( path.join(appPath, 'caweb.json') ) ?
  * 
  * @returns object
  */
-async function wpEnvConfig ( {workDirectoryPath: cwd , bare, multisite, subdomain, plugin, theme} ) {
+async function wpEnvConfig ( {workDirectoryPath: cwd , multisite, subdomain, plugin, theme} ) {
     let themes = [];
     let plugins = [];
-    let args = {cwd, bare, multisite, subdomain, plugin, theme};
+    let args = {cwd, multisite, subdomain, plugin, theme};
     let argString = Object.entries( args ).map( ([k, v]) => `--${k} ${v}` ).join( ' ' );
 
     let setupFile = path.join( projectPath, 'lib', 'wordpress', 'setup', 'index.js' );
     
+    if( multisite && subdomain ){
+        // if subdomain add the subdomain constant
+        pkg.config.DEFAULTS.SUBDOMAIN_INSTALL= true;
+    }
+
     let envConfig = {
         core: `WordPress/WordPress#${pkg.config.WP_VER}`,
         phpVersion: `${pkg.config.PHP_VER}`,
@@ -72,16 +76,9 @@ async function wpEnvConfig ( {workDirectoryPath: cwd , bare, multisite, subdomai
         }
     }
 
-    if( multisite ){
-        if( ! bare ){   
-            // if multisite set default theme to CAWeb
-            // this allows for any new sites created to use CAWeb as the default theme.
-            pkg.config.DEFAULTS.WP_DEFAULT_THEME = 'CAWeb';
-        }
+    if( multisite && subdomain ){
         // if subdomain add the subdomain constant
-        if( subdomain ){
-            pkg.config.DEFAULTS.SUBDOMAIN_INSTALL= true;
-        }
+        envConfig.config.SUBDOMAIN_INSTALL= true;
     }
 
     // iterate over available CAWeb options.
@@ -182,7 +179,6 @@ async function wpEnvConfig ( {workDirectoryPath: cwd , bare, multisite, subdomai
 /**
  * Build .wp-env.override.json
  * 
- * @param {boolean} bare   True if excluding any CAWeb Configurations.
  * @param {boolean} multisite   True if converting to multisite.
  * @param {boolean} subdomain   True if converting to multisite subdomain.
  * @param {boolean} plugin   True if root directory is a plugin.

package/lib/cli.js

@@ -181,11 +181,6 @@ function addWPEnvCommands(){
 			'Will attempt to sync changes from a CAWebPublishing static site to this WordPress instance.',
 			false
 		)
-		.option(
-			'--bare',
-			'True if excluding any downloads from CAWeb, use this if you want to use a local version of the CAWeb Theme, Configurations will still be applied.',
-			false
-		)
 		.option(
 			'-p, --plugin',
 			'True if root directory is a plugin.',

package/lib/index.js

@@ -7,6 +7,7 @@ import {
     writeLine,
     writeError,
     clearLine,
+    md5
 } from './helpers.js';
 
 // Spinner
@@ -32,6 +33,7 @@ export {
     writeLine,
     writeError,
     clearLine,
+    md5,
     runCmd,
     withSpinner,
     runCLICmds,

package/lib/wordpress/index.js

@@ -1,5 +1,5 @@
-import { isCAWebActive, configureCAWeb } from "./setup/caweb.js";
-import { configureDivi } from "./setup/divi.js";
+import { isCAWeb, configureCAWeb } from "./setup/caweb.js";
+import { isDivi, configureDivi } from "./setup/divi.js";
 import { 
 	configureWordPress
 } from "./wordpress.js";
@@ -7,8 +7,9 @@ import { getTaxonomies, createTaxonomies }  from "./api.js";
 import { CAWEB_OPTIONS, DIVI_OPTIONS } from './options.js';
 
 export {
-	isCAWebActive,
+	isCAWeb,
     configureCAWeb,
+	isDivi, 
 	configureDivi,
 	configureWordPress,
 	getTaxonomies,

package/lib/wordpress/setup/caweb.js

@@ -9,18 +9,20 @@ import { CAWEB_OPTIONS } from'../options.js';
 import { runCLICmds } from'../../helpers.js';
 
 /**
- * Activates the CAWeb Theme for the WordPress Environment if it's installed.
+ * Checks for the CAWeb Theme in the WordPress Environment.
  * 
  * @param {string}		environment   Which environment to activate the theme on.
  * @param {WPConfig} 	config	      The wp-env config object.
  * @param {Object}   	spinner A CLI spinner which indicates progress.
  */
-async function isCAWebActive({environment, cwd}){
-	return await runCLICmds({
+async function isCAWeb({environment, cwd, is = 'active'}) {
+	let answer = await runCLICmds({
 		environment,
-		cmds: ['wp theme is-installed CAWeb'],
+		cmds: [`wp theme is-${is} CAWeb && echo $?`],
 		cwd
-	});
+	})
+
+	return '0' === answer;
 
 }
 
@@ -35,11 +37,11 @@ async function isCAWebActive({environment, cwd}){
  */
 async function configureCAWeb( {environment, cwd, configs} ) {
 
-	const isThemeActivated = await isCAWebActive({environment, cwd});
+	const isThemeActive = await isCAWeb({environment, cwd});
 	let cmds = [];
 
 	// if our theme is active.
-	if( false !== isThemeActivated ){
+	if( false !== isThemeActive ){
 		
 		// iterate over possible CAWeb Options.
 		for(const [k,v] of Object.entries(CAWEB_OPTIONS)){
@@ -57,6 +59,6 @@ async function configureCAWeb( {environment, cwd, configs} ) {
 }
 
 export {
-	isCAWebActive,
+	isCAWeb,
 	configureCAWeb,
 };

package/lib/wordpress/setup/divi.js

@@ -3,9 +3,26 @@
  */
 import { runCLICmds } from '../../helpers.js';
 import { DIVI_OPTIONS } from '../options.js';
-import { isCAWebActive } from './caweb.js';
 
 
+/**
+ * Checks for the Divi Theme in the WordPress Environment.
+ * 
+ * @param {string}		environment   Which environment to activate the theme on.
+ * @param {WPConfig} 	config	      The wp-env config object.
+ * @param {Object}   	spinner A CLI spinner which indicates progress.
+ */
+async function isDivi({environment, cwd, is = 'active'}) {
+	let answer = await runCLICmds({
+		environment,
+		cmds: [`wp theme is-${is} Divi && echo $?`],
+		cwd
+	})
+
+	return '0' === answer;
+
+}
+
 /**
  * Configures Divi for CAWebPublishing Service for the given environment by configure settings.
  * These steps are performed sequentially so as to not overload the WordPress instance.
@@ -16,11 +33,11 @@ import { isCAWebActive } from './caweb.js';
  */
 async function configureDivi( {environment, cwd, configs} ) {
 	
-	const isThemeActivated = await isCAWebActive( {environment, cwd} );
+	const isThemeInstalled = await isDivi( {environment, cwd, is: 'installed'} );
 	let cmds = [];
 
 	// if CAWeb theme is active.
-	if( false !== isThemeActivated ){
+	if( false !== isThemeInstalled ){
 		let diviOptions = await runCLICmds({
 			environment,
 			cmds: [ 'wp option get et_divi --format=json' ], 
@@ -86,5 +103,6 @@ async function configureDivi( {environment, cwd, configs} ) {
 }
 
 export {
+	isDivi,
 	configureDivi
 };

package/lib/wordpress/setup/index.js

@@ -10,8 +10,8 @@ import { format } from 'util';
  */
 import { runCLICmds } from '../../helpers.js';
 import { configureWordPress } from '../wordpress.js';
-import { configureCAWeb } from './caweb.js';
-import { configureDivi } from './divi.js';
+import { isCAWeb, configureCAWeb } from './caweb.js';
+import { isDivi, configureDivi } from './divi.js';
 
 
 function processArgs( arr ){
@@ -55,19 +55,38 @@ let configs = {};
         configs[item.name] = item.value;
     });
 
+    
+let cawebInstalled = await isCAWeb({ 
+        environment: 'development',
+        cwd: workingDirectoryPath,
+        is: 'installed'
+    });
+
+let diviInstalled = await isDivi({ 
+        environment: 'development',
+        cwd: workingDirectoryPath,
+        is: 'installed'
+    });
+
+let multisite = flagExists('--multisite') ? getArgVal('--multisite') : false;
 // wp cli commands that will be ran.
 // process.stdout.write(`\nConfiguring WordPress...\n`);
 let cmds = [
     ...await configureWordPress({
         environment: 'development',
         cwd: workingDirectoryPath,
-        multisite: flagExists('--multisite') ? getArgVal('--multisite') : false,
+        multisite,
         configs
     })
 ];
 
 // Download any resources required for CAWeb.
-if( ! flagExists('--bare') || ( flagExists('--bare') && getArgVal('--bare') ) ){
+ if( cawebInstalled ){   
+
+    // if multisite set default theme to CAWeb
+    // this allows for any new sites created to use CAWeb as the default theme.
+    cmds.push('wp config set WP_DEFAULT_THEME CAWeb');
+
     // Delete all default themes.
     let defaultThemes = [ 
         'twentyten', 
@@ -86,10 +105,11 @@ if( ! flagExists('--bare') || ( flagExists('--bare') && getArgVal('--bare') ) ){
         'twentytwentyfour', 
         'twentytwentyfive' 
     ];
+
     cmds.push( `wp theme delete ${defaultThemes.join(' ')} --force` );
 
     // If Elegant Themes credentials are available, download Divi.
-    if( configs.ET_USERNAME && configs.ET_API_KEY ){
+    if( configs.ET_USERNAME && configs.ET_API_KEY && ! diviInstalled ){
         // generate Divi download URL.
         let et_url = `https://www.elegantthemes.com/api/api_downloads.php?api_update=1&theme=%s&api_key=${configs.ET_API_KEY}&username=${configs.ET_USERNAME}`;
 
@@ -103,23 +123,20 @@ if( ! flagExists('--bare') || ( flagExists('--bare') && getArgVal('--bare') ) ){
     // Activate CAWeb theme.
     cmds.push( 'wp theme activate CAWeb' );
 
-}
-
-
-cmds.push(
-    ...await configureCAWeb({
-        environment: 'development',
-        cwd: workingDirectoryPath,
-        configs,
-    }),
-    ...await configureDivi({
-        environment: 'development',
-        cwd: workingDirectoryPath,
-        configs,
-    })
-);
+    // Configure CAWeb and Divi options.
+    cmds.push(
+        ...await configureCAWeb({
+            environment: 'development',
+            cwd: workingDirectoryPath,
+            configs,
+        }),
+        ...await configureDivi({
+            environment: 'development',
+            cwd: workingDirectoryPath,
+            configs,
+        })
+    );
 
-if( cmds.length ){  
     process.stdout.write(`\nConfiguring CAWeb...\n`);
     await runCLICmds({ 
         environment: 'development',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/cli",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "CAWebPublishing Command Line Interface.",
   "exports": "./lib/env.js",
   "type": "module",