@atomicsmash/cli 10.0.0-beta.0 → 10.0.0-beta.1

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":"AAQA,OAAO,eAAe,CAAC;AAiEvB,eAAO,MAAM,OAAO,mBAAmB,CAAC;AACxC,eAAO,MAAM,QAAQ,mEAC4C,CAAC;AAClE,wBAAsB,OAAO,kBAkG5B"}
+{"version":3,"file":"setup-database.d.ts","sourceRoot":"","sources":["../../src/commands/setup-database.ts"],"names":[],"mappings":"AAQA,OAAO,eAAe,CAAC;AA+EvB,eAAO,MAAM,OAAO,mBAAmB,CAAC;AACxC,eAAO,MAAM,QAAQ,mEAC4C,CAAC;AAClE,wBAAsB,OAAO,kBAgH5B"}

package/dist/commands/setup-database.js

@@ -9,7 +9,7 @@ function extractDependenciesFromError(errorMessage) {
     const regex = /requires \d+ plugin[s]? to be installed and activated: (.+)\./;
     const match = regex.exec(errorMessage);
     if (match?.[1]) {
-        return match[1].split(',').map(dep => dep.trim());
+        return match[1].split(",").map((dep) => dep.trim());
     }
     return [];
 }
@@ -33,10 +33,11 @@ async function activatePluginsWithRetry(execute, pluginsToActivate, excludedPlug
                 // Check if this is a dependency error
                 const dependencies = extractDependenciesFromError(errorMessage);
                 if (dependencies.length > 0) {
-                    console.log(`⚠ ${pluginName} requires dependencies: ${dependencies.join(', ')}`);
+                    console.log(`⚠ ${pluginName} requires dependencies: ${dependencies.join(", ")}`);
                     // Add dependencies to the remaining plugins list if they're not already there
                     for (const dep of dependencies) {
-                        if (!pluginsToActivate.includes(dep) && !excludedPlugins.includes(dep)) {
+                        if (!pluginsToActivate.includes(dep) &&
+                            !excludedPlugins.includes(dep)) {
                             pluginsToActivate.push(dep);
                         }
                         if (!remainingPlugins.includes(dep)) {
@@ -54,7 +55,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} attempts. Remaining: ${remainingPlugins.join(", ")}`);
     }
 }
 export const command = "setup-database";
@@ -89,14 +90,19 @@ export async function handler() {
                 performance.mark("add-custom-user");
                 console.log(`Custom user ${process.env.WORDPRESS_USER} added. (${convertMeasureToPrettyString(performance.measure("add-custom-user", "wordpress-tables"))})`);
             }
-            const excludedPlugins = ['stream', 'shortpixel-image-optimiser', 'wordfence'];
-            const { stdout: pluginList } = await execute('wp plugin list --format=json');
+            const excludedPlugins = [
+                "stream",
+                "shortpixel-image-optimiser",
+                "wordfence",
+                "wp-mail-smtp",
+            ];
+            const { stdout: pluginList } = await execute("wp plugin list --format=json");
             const allPlugins = JSON.parse(pluginList);
             // Filter out excluded plugins and already active plugins
             const pluginsToActivate = allPlugins
-                .filter(plugin => !excludedPlugins.includes(plugin.name) &&
-                plugin.status !== 'active')
-                .map(plugin => plugin.name);
+                .filter((plugin) => !excludedPlugins.includes(plugin.name) &&
+                plugin.status !== "active")
+                .map((plugin) => plugin.name);
             await activatePluginsWithRetry(execute, pluginsToActivate, excludedPlugins);
         })
             .then(() => {

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

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

package/dist/commands/setup.js

@@ -17,6 +17,7 @@ export async function handler() {
         .catch(() => {
         return false;
     });
+    const isCI = process.env.CI ?? false;
     const smashConfig = await getSmashConfig();
     if (!smashConfig) {
         throw new Error("Unable to determine project setup information. Please add a smash.config.ts file with the required info.");
@@ -26,7 +27,7 @@ export async function handler() {
         const stopRunningMessage = startRunningMessage("Running setup");
         performance.mark("Start");
         await Promise.allSettled([
-            ...(shouldInstallAndBuildOnly
+            ...(isCI || shouldInstallAndBuildOnly
                 ? []
                 : [
                     (async () => {
@@ -110,7 +111,7 @@ export async function handler() {
                         }
                     })(),
                 ]),
-            execute("composer install")
+            execute(`composer install${isCI ? " --prefer-dist" : ""}`)
                 .then(() => {
                 console.log(`Root composer install done. (${convertMeasureToPrettyString(performance.measure("root composer install", "Start"))})`);
             })
@@ -119,7 +120,7 @@ export async function handler() {
                 throw new Error("Failed to run composer install in the root directory.");
             }),
             ...(composerInstallPaths?.map((path, index) => {
-                return execute(`cd "${resolve(process.cwd(), path)}"; composer install`)
+                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"))})`);
                 })
@@ -129,7 +130,7 @@ export async function handler() {
                 });
             }) ?? []),
             (async () => {
-                await execute("npm install")
+                await execute(`npm ${isCI ? "ci" : "install"}`)
                     .then(() => {
                     performance.mark("root npm install done");
                     console.log(`Root npm install done. (${convertMeasureToPrettyString(performance.measure("root npm install", "Start"))})`);
@@ -150,7 +151,7 @@ export async function handler() {
                 throw new Error(reason);
             }),
             ...(npmInstallPaths?.map((path, index) => {
-                return execute(`cd "${resolve(process.cwd(), path)}"; npm install`)
+                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"))})`);
                 })
@@ -159,7 +160,8 @@ export async function handler() {
                     throw new Error(`Failed to run additional npm install ${index + 1}.`);
                 });
             }) ?? []),
-        ]).then(async (results) => {
+        ])
+            .then(async (results) => {
             await stopRunningMessage();
             if (results.some((result) => result.status === "rejected")) {
                 process.exitCode = 1;
@@ -174,7 +176,8 @@ export async function handler() {
             else {
                 console.log(`Setup is complete. ${convertMeasureToPrettyString(performance.measure("everything", "Start"))}`);
             }
-        }).catch((error) => {
+        })
+            .catch((error) => {
             console.error(error);
             process.exitCode = 1;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atomicsmash/cli",
-	"version": "10.0.0-beta.0",
+	"version": "10.0.0-beta.1",
 	"description": "A collection of CLI tools by Atomic Smash.",
 	"keywords": [],
 	"homepage": "https://www.atomicsmash.co.uk/",