@atomicsmash/cli 11.0.0-beta.2 → 11.0.0

package/README.md

@@ -10,18 +10,18 @@ smash-cli --help
 
 ## Development
 
-To develop this npm package, you will need to do the following after cloning the repo:
+To work on this package, navigate to the root of the project and run:
 
-1. `nvm use`
+1. `nvm use` - This will set the correct node environment (this is important for permissions for the following step)
+2. `npm install`
+3. `npm run dev` - To start tracking file changes and will transpile all `.ts` files down into usable `.js` files in dist.
 
-- This will set the correct node environment (this is important for permissions for the following step)
-
-2. `npm link`
+Once these commands are done, you're ready to start working on this project. Check the "CHECKLISTS" file for a checklist of tasks for any development work.
 
-- This will create a symlink in your npm global config, effectively pretending that you've installed the package globally.
+## Run the package locally
 
-3. `npm run dev`
+Navigate to the project/site you would like to work on, then run your selected command using:
 
-- This will transpile all `.ts` files down into usable `.js` files in dist.
+`npx <Absolute path to project>/packages/packages/cli <command>`
 
-Once these commands are done, you're ready to start working on this project. Check the "CHECKLISTS" file for a checklist of tasks for any development work.
+Instead of a package name from the npm registry, this points directly to a local directory on disk; npx will look inside that folder's package.json for the bin entry and execute it.

package/dist/commands/pull-database.js

@@ -126,7 +126,7 @@ export async function handler() {
                 ]);
                 const failedCleanups = cleanupResults.filter((result) => result.status === "rejected");
                 if (failedCleanups.length > 0) {
-                    console.warn(`Warning: Failed to delete ${failedCleanups.length} temporary file(s). You may need to clean them up manually.`);
+                    console.warn(`Warning: Failed to delete ${failedCleanups.length.toString()} temporary file(s). You may need to clean them up manually.`);
                 }
                 process.exitCode = 1;
             });

package/dist/commands/pull-media.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull-media.d.ts","sourceRoot":"","sources":["../../src/commands/pull-media.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,OAAO,eAAe,CAAC;AACpC,eAAO,MAAM,QAAQ,gDAAgD,CAAC;AACtE,wBAAsB,OAAO,kBA6E5B"}
+{"version":3,"file":"pull-media.d.ts","sourceRoot":"","sources":["../../src/commands/pull-media.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,OAAO,eAAe,CAAC;AACpC,eAAO,MAAM,QAAQ,gDAAgD,CAAC;AACtE,wBAAsB,OAAO,kBA+E5B"}

package/dist/commands/pull-media.js

@@ -66,21 +66,21 @@ export async function handler() {
                 await downloadFiles(mediaPath, localPath, ssh);
             }
             else {
-                console.log(`Downloading media for the last ${mediaMonths} months...`);
+                console.log(`Downloading media for the last ${mediaMonths.toString()} months...`);
                 // Download media for each month
                 for (let i = 0; i < mediaMonths; i++) {
                     const date = new Date();
                     date.setMonth(date.getMonth() - i);
                     const year = date.getFullYear();
                     const month = String(date.getMonth() + 1).padStart(2, "0");
-                    const remotePath = `${mediaPath}/${year}/${month}`;
-                    const localPath = `${mediaLocalPath}/${year}`;
+                    const remotePath = `${mediaPath}/${year.toString()}/${month}`;
+                    const localPath = `${mediaLocalPath}/${year.toString()}`;
                     console.log(`Attempting to download: ${remotePath} -> ${localPath}`);
                     try {
                         await downloadFiles(remotePath, localPath, ssh);
                     }
                     catch {
-                        console.log(`Skipping uploads/${year}/${month} - directory does not exist on remote server`);
+                        console.log(`Skipping uploads/${year.toString()}/${month} - directory does not exist on remote server`);
                         return; // Skip to next iteration
                     }
                 }

package/dist/commands/setup-database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-database.d.ts","sourceRoot":"","sources":["../../src/commands/setup-database.ts"],"names":[],"mappings":"AAKA,OAAO,eAAe,CAAC;AA+EvB,eAAO,MAAM,OAAO,mBAAmB,CAAC;AACxC,eAAO,MAAM,QAAQ,mEAC4C,CAAC;AAClE,wBAAsB,OAAO,kBAiH5B"}
+{"version":3,"file":"setup-database.d.ts","sourceRoot":"","sources":["../../src/commands/setup-database.ts"],"names":[],"mappings":"AAKA,OAAO,eAAe,CAAC;AA+EvB,eAAO,MAAM,OAAO,mBAAmB,CAAC;AACxC,eAAO,MAAM,QAAQ,mEAC4C,CAAC;AAClE,wBAAsB,OAAO,kBA6H5B"}

package/dist/commands/setup-database.js

@@ -56,7 +56,7 @@ async function activatePluginsWithRetry(execute, pluginsToActivate, excludedPlug
         retryCount++;
     }
     if (remainingPlugins.length > 0) {
-        console.warn(`⚠ Warning: Could not activate all plugins after ${maxRetries} attempts. Remaining: ${remainingPlugins.join(", ")}`);
+        console.warn(`⚠ Warning: Could not activate all plugins after ${maxRetries.toString()} attempts. Remaining: ${remainingPlugins.join(", ")}`);
     }
 }
 export const command = "setup-database";
@@ -65,9 +65,15 @@ export async function handler() {
     const execute = promisify(exec);
     const smashConfig = await getSmashConfig();
     // These must remain env vars because they differ for each dev.
-    const addCustomUser = process.env.WORDPRESS_USER &&
+    const newUserToAdd = process.env.WORDPRESS_USER &&
         process.env.WORDPRESS_USER_EMAIL &&
-        process.env.WORDPRESS_PASSWORD;
+        process.env.WORDPRESS_PASSWORD
+        ? {
+            user: process.env.WORDPRESS_USER,
+            email: process.env.WORDPRESS_USER_EMAIL,
+            password: process.env.WORDPRESS_PASSWORD,
+        }
+        : null;
     if (!smashConfig) {
         throw new Error("Unable to determine project setup information. Please add a smash.config.ts file with the required info.");
     }
@@ -82,14 +88,14 @@ export async function handler() {
             .then(() => {
             performance.mark("wordpress-tables");
             console.log(`Wordpress database tables installed. (${convertMeasureToPrettyString(performance.measure("wordpress-tables", "Start"))})`);
-            if (addCustomUser) {
-                return execute(`wp user create ${process.env.WORDPRESS_USER} ${process.env.WORDPRESS_USER_EMAIL} --user_pass=${process.env.WORDPRESS_PASSWORD} --role=administrator`);
+            if (newUserToAdd) {
+                return execute(`wp user create ${newUserToAdd.user} ${newUserToAdd.email} --user_pass=${newUserToAdd.password} --role=administrator`);
             }
         })
             .then(async () => {
-            if (addCustomUser) {
+            if (newUserToAdd) {
                 performance.mark("add-custom-user");
-                console.log(`Custom user ${process.env.WORDPRESS_USER} added. (${convertMeasureToPrettyString(performance.measure("add-custom-user", "wordpress-tables"))})`);
+                console.log(`Custom user ${newUserToAdd.user} added. (${convertMeasureToPrettyString(performance.measure("add-custom-user", "wordpress-tables"))})`);
             }
             const excludedPlugins = [
                 "stream",
@@ -109,18 +115,22 @@ export async function handler() {
         })
             .then(() => {
             performance.mark("plugins");
-            console.log(`Plugins activated. (${convertMeasureToPrettyString(performance.measure("plugins", addCustomUser ? "add-custom-user" : "wordpress-tables"))})`);
+            console.log(`Plugins activated. (${convertMeasureToPrettyString(performance.measure("plugins", newUserToAdd ? "add-custom-user" : "wordpress-tables"))})`);
             return execute(`wp theme activate ${themeFolderName}`);
         })
             .then(async () => {
             performance.mark("theme");
             console.log(`Theme activated. (${convertMeasureToPrettyString(performance.measure("theme", "plugins"))})`);
             await stopRunningMessage();
-            console.log(`Database set up${addCustomUser ? ` and ${process.env.WORDPRESS_USER} user added` : !process.env.CI ? ". To set up a user, run the `wp user create` command." : ""}. (${convertMeasureToPrettyString(performance.measure("everything", "Start"))})`);
+            console.log(`Database set up${newUserToAdd ? ` and ${newUserToAdd.user} user added` : !process.env.CI ? ". To set up a user, run the `wp user create` command." : ""}. (${convertMeasureToPrettyString(performance.measure("everything", "Start"))})`);
         })
             .catch(async (error) => {
             await stopRunningMessage();
-            if (error.stderr?.startsWith("ERROR 1007")) {
+            if (typeof error === "object" &&
+                error &&
+                "stderr" in error &&
+                typeof error.stderr === "string" &&
+                error.stderr.startsWith("ERROR 1007")) {
                 console.error("Database already exists with the name in the wp-config. Please delete that database first with `wp db drop --yes`");
             }
             else {

package/dist/commands/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,OAAO,UAAU,CAAC;AAC/B,eAAO,MAAM,QAAQ,kDAAkD,CAAC;AACxE,wBAAsB,OAAO,kBA8Q5B"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,OAAO,UAAU,CAAC;AAC/B,eAAO,MAAM,QAAQ,kDAAkD,CAAC;AACxE,wBAAsB,OAAO,kBAoQ5B"}

package/dist/commands/setup.js

@@ -72,25 +72,16 @@ export async function handler() {
                                 !existsSync(resolve(process.cwd(), "herd.yml"))) {
                                 throw new Error("Herd is present on your machine, but the project is missing a herd.yaml file. Please do the initial setup by running herd init.");
                             }
-                            await execute(`herd init`)
-                                .then(() => {
-                                performance.mark("herd init done");
-                                console.log(`Herd is configured. (${convertMeasureToPrettyString(performance.measure("herd-or-valet", "Start"))})`);
-                            })
-                                .catch((error) => {
-                                console.error(error);
-                                throw new Error("Failed to configure the site using Herd.");
-                            });
                             await execute(`herd link ${projectName} --secure`)
                                 .then(() => {
                                 performance.mark("herd link done");
-                                console.log(`Herd is linked and secured. (${convertMeasureToPrettyString(performance.measure("herd link", "herd init done"))})`);
+                                console.log(`Herd is linked and secured. (${convertMeasureToPrettyString(performance.measure("herd link", "Start"))})`);
                             })
                                 .catch((error) => {
                                 console.error(error);
                                 throw new Error("Failed to link the site using Herd.");
                             });
-                            await execute(`herd isolate`)
+                            await execute(`herd isolate --site=${projectName}`)
                                 .then(() => {
                                 console.log(`Herd is isolated. (${convertMeasureToPrettyString(performance.measure("herd isolate", "herd link done"))})`);
                                 clearTimeout(timeout);
@@ -126,16 +117,16 @@ export async function handler() {
                 console.error(error);
                 throw new Error("Failed to run composer install in the root directory.");
             }),
-            ...(composerInstallPaths?.map((path, index) => {
+            ...composerInstallPaths.map((path, index) => {
                 return execute(`cd "${resolve(process.cwd(), path)}"; composer install${isCI ? " --no-dev --classmap-authoritative" : ""}`)
                     .then(() => {
-                    console.log(`Additional composer install ${index + 1} done. (${convertMeasureToPrettyString(performance.measure(`additional composer install ${index + 1}`, "Start"))})`);
+                    console.log(`Additional composer install ${(index + 1).toString()} done. (${convertMeasureToPrettyString(performance.measure(`additional composer install ${(index + 1).toString()}`, "Start"))})`);
                 })
                     .catch((error) => {
                     console.error(error);
-                    throw new Error(`Failed to run additional composer install ${index + 1}.`);
+                    throw new Error(`Failed to run additional composer install ${(index + 1).toString()}.`);
                 });
-            }) ?? []),
+            }),
             (async () => {
                 await execute(`npm ${isCI ? "ci" : "install"}`)
                     .then(() => {
@@ -155,18 +146,21 @@ export async function handler() {
                     throw new Error("Failed to run a build after installing.");
                 });
             })().catch((reason) => {
-                throw new Error(reason);
+                if (typeof reason === "string") {
+                    throw new Error(reason);
+                }
+                throw reason;
             }),
-            ...(npmInstallPaths?.map((path, index) => {
+            ...npmInstallPaths.map((path, index) => {
                 return execute(`cd "${resolve(process.cwd(), path)}"; npm  ${isCI ? "ci --omit=dev" : "install"}`)
                     .then(() => {
-                    console.log(`Additional npm install ${index + 1} done. (${convertMeasureToPrettyString(performance.measure(`additional npm install ${index + 1}`, "Start"))})`);
+                    console.log(`Additional npm install ${(index + 1).toString()} done. (${convertMeasureToPrettyString(performance.measure(`additional npm install ${(index + 1).toString()}`, "Start"))})`);
                 })
                     .catch((error) => {
                     console.error(error);
-                    throw new Error(`Failed to run additional npm install ${index + 1}.`);
+                    throw new Error(`Failed to run additional npm install ${(index + 1).toString()}.`);
                 });
-            }) ?? []),
+            }),
         ])
             .then(async (results) => {
             await stopRunningMessage();
@@ -176,7 +170,7 @@ export async function handler() {
                 console.error(results
                     .filter((result) => result.status === "rejected")
                     .map((result) => {
-                    return `- ${result.reason}`;
+                    return `- ${typeof result.reason === "string" ? result.reason : "Unknown reason."}`;
                 })
                     .join(`\n`));
             }

package/dist/index.js

@@ -1 +0,0 @@
-export {};

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAM7C,eAAO,MAAM,WAAW,EAAiC,WAAW,CAAC;AAIrE,eAAO,MAAM,WAAW,QAA6D,CAAC;AAItF,eAAO,MAAM,cAAc,QAAsB,CAAC;AAElD,wBAAsB,OAAO,CAC5B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,KAAK,EAAE,OAAO,CAAA;CAAqB;WAGtC,aAAa,GAAG,IAAI;YACnB,MAAM;YACN,MAAM;GAaf;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAQvC;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,kBAAkB,UAevE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,uBAiClD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAM7C,eAAO,MAAM,WAAW,EAAiC,WAAW,CAAC;AAIrE,eAAO,MAAM,WAAW,QAA6D,CAAC;AAItF,eAAO,MAAM,cAAc,QAAsB,CAAC;AAElD,wBAAsB,OAAO,CAC5B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,KAAK,EAAE,OAAO,CAAA;CAAqB;WAGtC,aAAa,GAAG,IAAI;YACnB,MAAM;YACN,MAAM;GAaf;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAQvC;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,kBAAkB,UAevE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,uBA+BlD"}

package/dist/utils.js

@@ -33,20 +33,20 @@ export function toCamelCase(text) {
     });
 }
 export function convertMeasureToPrettyString(measure) {
-    const duration = Number(measure.duration);
+    const duration = measure.duration;
     if (duration < 1) {
-        return `${duration * 1000}µs`;
+        return `${(duration * 1000).toString()}µs`;
     }
     if (duration < 999) {
-        return `${Math.round(duration)}ms`;
+        return `${Math.round(duration).toString()}ms`;
     }
     const timeInSeconds = Number((duration / 1000).toFixed(2));
     if (timeInSeconds < 60) {
-        return `${timeInSeconds}s`;
+        return `${timeInSeconds.toString()}s`;
     }
     const minutes = Math.floor(timeInSeconds / 60);
     const seconds = Math.ceil(timeInSeconds % 60);
-    return `${minutes}m ${seconds}s`;
+    return `${minutes.toString()}m ${seconds.toString()}s`;
 }
 export function startRunningMessage(message) {
     let $i = 3;
@@ -63,19 +63,17 @@ export function startRunningMessage(message) {
             process.stdout.write(`${message}${".".repeat($i)}\r`);
         }, 200);
         return async () => {
-            if (interval) {
-                clearInterval(interval);
-                await new Promise((resolve) => {
-                    process.stdout.clearLine(0, () => {
-                        resolve();
-                    });
+            clearInterval(interval);
+            await new Promise((resolve) => {
+                process.stdout.clearLine(0, () => {
+                    resolve();
                 });
-                await new Promise((resolve) => {
-                    process.stdout.cursorTo(0, () => {
-                        resolve();
-                    });
+            });
+            await new Promise((resolve) => {
+                process.stdout.cursorTo(0, () => {
+                    resolve();
                 });
-            }
+            });
         };
     }
     return async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atomicsmash/cli",
-	"version": "11.0.0-beta.2",
+	"version": "11.0.0",
 	"description": "A collection of CLI tools by Atomic Smash.",
 	"keywords": [],
 	"homepage": "https://www.atomicsmash.co.uk/",
@@ -40,8 +40,8 @@
 		"lint:types": "tsc -b"
 	},
 	"dependencies": {
-		"@atomicsmash/date-php": "^2.2.0-beta.0",
-		"@atomicsmash/smash-config": "^1.0.2-beta.0",
+		"@atomicsmash/date-php": "^2.2.0",
+		"@atomicsmash/smash-config": "^1.0.2",
 		"@types/vinyl": "^2.0.12",
 		"glob-promise": "^6.0.7",
 		"svg-sprite": "^2.0.4",
@@ -49,8 +49,9 @@
 		"yargs": "^18.0.0"
 	},
 	"devDependencies": {
-		"@atomicsmash/blocks-helpers": "^7.2.2-beta.0",
-		"@types/svg-sprite": "^0.0.39"
+		"@atomicsmash/blocks-helpers": "^7.2.2",
+		"@types/svg-sprite": "^0.0.39",
+		"type-fest": "^5.6.0"
 	},
 	"peerDependencies": {
 		"dotenv": "^17.3.1",