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

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

@@ -1 +1 @@
-{"version":3,"file":"pull-database.d.ts","sourceRoot":"","sources":["../../src/commands/pull-database.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,OAAO,kBAAkB,CAAC;AACvC,eAAO,MAAM,QAAQ,oEAC6C,CAAC;AACnE,wBAAsB,OAAO,kBA4I5B"}
+{"version":3,"file":"pull-database.d.ts","sourceRoot":"","sources":["../../src/commands/pull-database.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,OAAO,kBAAkB,CAAC;AACvC,eAAO,MAAM,QAAQ,oEAC6C,CAAC;AACnE,wBAAsB,OAAO,kBA4I5B"}

package/dist/commands/pull-database.js

@@ -2,7 +2,8 @@ import { exec } from "node:child_process";
 import { unlink as deleteFile } from "node:fs/promises";
 import { performance } from "node:perf_hooks";
 import { promisify } from "node:util";
-import { convertMeasureToPrettyString, getSmashConfig, startRunningMessage, } from "../utils.js";
+import { getSmashConfig } from "@atomicsmash/smash-config";
+import { convertMeasureToPrettyString, startRunningMessage } from "../utils.js";
 export const command = "pull-database";
 export const describe = "Pull the database down from staging and replace local database.";
 export async function handler() {

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":"AAKA,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

@@ -1,7 +1,8 @@
 import { exec } from "node:child_process";
 import { performance } from "node:perf_hooks";
 import { promisify } from "node:util";
-import { convertMeasureToPrettyString, getSmashConfig, startRunningMessage, } from "../utils.js";
+import { getSmashConfig } from "@atomicsmash/smash-config";
+import { convertMeasureToPrettyString, startRunningMessage } from "../utils.js";
 import "dotenv/config";
 function extractDependenciesFromError(errorMessage) {
     // Extract plugin names from error messages like:
@@ -9,7 +10,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 +34,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 +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} attempts. Remaining: ${remainingPlugins.join(", ")}`);
     }
 }
 export const command = "setup-database";
@@ -89,14 +91,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":"AAcA,eAAO,MAAM,OAAO,UAAU,CAAC;AAC/B,eAAO,MAAM,QAAQ,kDAAkD,CAAC;AACxE,wBAAsB,OAAO,kBAsQ5B"}

package/dist/commands/setup.js

@@ -4,7 +4,8 @@ import { constants, copyFile, unlink as deleteFile, mkdir, } from "node:fs/promi
 import { resolve } from "node:path";
 import { performance } from "node:perf_hooks";
 import { promisify } from "node:util";
-import { convertMeasureToPrettyString, getSmashConfig, startRunningMessage, } from "../utils.js";
+import { getSmashConfig } from "@atomicsmash/smash-config";
+import { convertMeasureToPrettyString, startRunningMessage } from "../utils.js";
 export const command = "setup";
 export const describe = "Run all the common setup tasks for a project.";
 export async function handler() {
@@ -17,6 +18,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 +28,7 @@ export async function handler() {
         const stopRunningMessage = startRunningMessage("Running setup");
         performance.mark("Start");
         await Promise.allSettled([
-            ...(shouldInstallAndBuildOnly
+            ...(isCI || shouldInstallAndBuildOnly
                 ? []
                 : [
                     (async () => {
@@ -110,7 +112,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 +121,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 +131,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 +152,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 +161,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 +177,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/dist/index.d.ts

@@ -1,16 +1,2 @@
-import { Options } from "sass";
-export type SCSSAliases = {
-    loadPaths?: Options<"async">["loadPaths"];
-    importers?: Options<"async">["importers"];
-};
-export type SmashConfig = {
-    projectName: string;
-    themePath: string;
-    themeFolderName?: string;
-    assetsOutputFolder?: string;
-    npmInstallPaths?: string[];
-    composerInstallPaths?: string[];
-    scssAliases?: SCSSAliases;
-};
-export { getSmashConfig } from "./utils.js";
+export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,MAAM,MAAM,WAAW,GAAG;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC1B,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}

package/dist/index.js

@@ -1 +1 @@
-export { getSmashConfig } from "./utils.js";
+export {};

package/dist/utils.d.ts

@@ -1,4 +1,3 @@
-import type { SCSSAliases, SmashConfig } from "./index.js";
 import type { ExecException } from "node:child_process";
 import type { PerformanceMeasure } from "node:perf_hooks";
 import type { PackageJson } from "type-fest";
@@ -15,13 +14,4 @@ export declare function execute(command: string, options?: {
 export declare function toCamelCase(text: string): string;
 export declare function convertMeasureToPrettyString(measure: PerformanceMeasure): string;
 export declare function startRunningMessage(message: string): () => Promise<void>;
-export declare function getSmashConfig(): Promise<Required<SmashConfig> | {
-    npmInstallPaths: string[];
-    composerInstallPaths: string[];
-    assetsOutputFolder: string;
-    projectName: string;
-    themePath: string;
-    themeFolderName: string;
-    scssAliases: SCSSAliases;
-} | null>;
 //# sourceMappingURL=utils.d.ts.map

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,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3D,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;AAQ7C,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;AAyBD,wBAAsB,cAAc;;;;;;;;UAmEnC"}
+{"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"}

package/dist/utils.js

@@ -1,8 +1,6 @@
 import { exec } from "node:child_process";
 import { createRequire } from "node:module";
-import { normalize, resolve } from "node:path";
-import { pathToFileURL } from "node:url";
-import { cosmiconfig } from "cosmiconfig";
+import { resolve } from "node:path";
 const require = createRequire(import.meta.url);
 export const packageJson = require("../package.json");
 if (packageJson.bin === undefined) {
@@ -84,93 +82,3 @@ export function startRunningMessage(message) {
         /* do nothing */
     };
 }
-const getDefaultSCSSAliases = (themePath) => ({
-    importers: [
-        {
-            findFileUrl(url) {
-                if (!url.startsWith("sitecss:"))
-                    return null;
-                const pathname = url.substring(8);
-                return pathToFileURL(`${resolve(process.cwd(), themePath, "src/styles")}${pathname.startsWith("/") ? pathname : `/${pathname}`}`);
-            },
-        },
-        {
-            findFileUrl(url) {
-                if (!url.startsWith("launchpad:"))
-                    return null;
-                const pathname = url.substring(10);
-                return pathToFileURL(`${resolve(process.cwd(), themePath, "../launchpad/src/styles")}${pathname.startsWith("/") ? pathname : `/${pathname}`}`);
-            },
-        },
-    ],
-});
-export async function getSmashConfig() {
-    const explorer = cosmiconfig("smash");
-    const config = await explorer
-        .load(resolve(process.cwd(), "smash.config.ts"))
-        .then((result) => {
-        if (!result || result.isEmpty) {
-            throw new Error("Return default config.");
-        }
-        const config = result.config;
-        if (isValidSmashConfig(config)) {
-            return {
-                scssAliases: getDefaultSCSSAliases(config.themePath),
-                themeFolderName: config.projectName,
-                ...config,
-                // Normalize and resolve paths to cwd.
-                npmInstallPaths: config.npmInstallPaths?.map((path) => {
-                    return normalize(resolve(process.cwd(), path));
-                }) ?? [],
-                composerInstallPaths: config.composerInstallPaths?.map((path) => {
-                    return normalize(resolve(process.cwd(), path));
-                }) ?? [],
-                assetsOutputFolder: config.assetsOutputFolder
-                    ? normalize(config.assetsOutputFolder)
-                    : "dist",
-            };
-        }
-        throw new Error("Return default config.");
-    })
-        .catch(async () => {
-        const { themeName, themePath } = await import("dotenv")
-            .then((dotenv) => {
-            dotenv.config();
-            const themeName = process.env.THEME_NAME ?? process.env.npm_package_config_theme_name;
-            const themePath = process.env.THEME_PATH ?? process.env.npm_package_config_theme_path;
-            return {
-                themeName,
-                themePath,
-            };
-        })
-            .catch(() => {
-            return {
-                themeName: false,
-                themePath: false,
-            };
-        });
-        if (!themeName || !themePath) {
-            return null;
-        }
-        console.warn("Using env vars for theme name and path is deprecated and will be removed in a future version. Create a smash.config.ts file with the relevant properties in it instead.");
-        const defaultConfig = {
-            projectName: themeName,
-            themePath,
-            themeFolderName: themeName,
-            assetsOutputFolder: "dist",
-            npmInstallPaths: [],
-            composerInstallPaths: [],
-            scssAliases: getDefaultSCSSAliases(themePath),
-        };
-        return defaultConfig;
-    });
-    return config;
-}
-function isValidSmashConfig(config) {
-    return (typeof config === "object" &&
-        config !== null &&
-        "projectName" in config &&
-        typeof config.projectName === "string" &&
-        "themePath" in config &&
-        typeof config.themePath === "string");
-}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atomicsmash/cli",
-	"version": "10.0.0-beta.0",
+	"version": "10.0.0-beta.2",
 	"description": "A collection of CLI tools by Atomic Smash.",
 	"keywords": [],
 	"homepage": "https://www.atomicsmash.co.uk/",
@@ -41,6 +41,7 @@
 	},
 	"dependencies": {
 		"@atomicsmash/date-php": "^2.1.0",
+		"@atomicsmash/smash-config": "^1.0.0-beta.0",
 		"@types/vinyl": "^2.0.12",
 		"cosmiconfig": "^9.0.0",
 		"glob-promise": "^6.0.7",