@atomicsmash/cli 8.2.0-beta.3 → 9.0.0-beta.10

package/dist/commands/blocks.d.ts

@@ -4,6 +4,7 @@ import type { ArgumentsCamelCase } from "yargs";
 import webpack from "webpack";
 export declare const command = "blocks";
 export declare const describe = "A command to generate WordPress blocks from a src folder.";
+export declare const deprecated = "Please migrate to using the @atomicsmash/compiler package. This command will be removed in the next major version.";
 export declare const builder: (yargs: YargsInstance) => import("yargs").Argv<import("yargs").Omit<{}, "in" | "out" | "tsConfigPath" | "postcssConfigPath" | "watch" | "excludeBlocks" | "excludeRootFiles" | "alwaysCompileRootFiles" | "ignoreWarnings"> & import("yargs").InferredOptionTypes<{
     in: {
         string: true;

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

@@ -1 +1 @@
-{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../src/commands/blocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAIjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAwBhD,OAAO,OAAO,MAAM,SAAS,CAAC;AAM9B,eAAO,MAAM,OAAO,WAAW,CAAC;AAChC,eAAO,MAAM,QAAQ,8DACuC,CAAC;AAC7D,eAAO,MAAM,OAAO,GAAa,OAAO,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA0ClC,MAAM,EAAE;;;;;;;;;;;;;GAqB1B,CAAC;AAEF,wBAAsB,OAAO,CAC5B,IAAI,EAAE,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBA4CrE;AAkJD,wBAAsB,wBAAwB,CAAC,EAC9C,SAAS,EACT,gBAAgB,GAChB,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC3B,gCAmCA;AAED,wBAAgB,yBAAyB,CAAC,EACzC,SAAS,EACT,MAAM,GACN,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CACb,MAAM,EACN;QACC,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,SAAS,CAAC;KACrB,CACD,CAAC;CACF,uBAkCA;AAED,KAAK,SAAS,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAE7C,wBAAsB,iBAAiB,CACtC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EAAE;iBAUqB,MAAM;eAAa,SAAS;IAuBxE;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,SAAS,6EAW5D;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,0EAW3D"}
+{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../src/commands/blocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAIjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAwBhD,OAAO,OAAO,MAAM,SAAS,CAAC;AAM9B,eAAO,MAAM,OAAO,WAAW,CAAC;AAChC,eAAO,MAAM,QAAQ,8DACuC,CAAC;AAC7D,eAAO,MAAM,UAAU,uHAC8F,CAAC;AACtH,eAAO,MAAM,OAAO,GAAa,OAAO,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA0ClC,MAAM,EAAE;;;;;;;;;;;;;GAqB1B,CAAC;AAEF,wBAAsB,OAAO,CAC5B,IAAI,EAAE,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBA4CrE;AAqJD,wBAAsB,wBAAwB,CAAC,EAC9C,SAAS,EACT,gBAAgB,GAChB,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC3B,gCAmCA;AAED,wBAAgB,yBAAyB,CAAC,EACzC,SAAS,EACT,MAAM,GACN,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CACb,MAAM,EACN;QACC,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,SAAS,CAAC;KACrB,CACD,CAAC;CACF,uBAkCA;AAED,KAAK,SAAS,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAE7C,wBAAsB,iBAAiB,CACtC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EAAE;iBAUqB,MAAM;eAAa,SAAS;IAuBxE;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,SAAS,6EAW5D;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,0EAW3D"}

package/dist/commands/blocks.js

@@ -20,6 +20,7 @@ import { getSmashConfig, startRunningMessage, toCamelCase } from "../utils.js";
 const isProduction = process.env.NODE_ENV === "production";
 export const command = "blocks";
 export const describe = "A command to generate WordPress blocks from a src folder.";
+export const deprecated = "Please migrate to using the @atomicsmash/compiler package. This command will be removed in the next major version.";
 export const builder = function (yargs) {
     return yargs
         .options({
@@ -165,6 +166,7 @@ async function runCommand({ srcFolder, distFolder, tsConfigLocation, postcssConf
         node: { global: false },
     });
     if (isWatch) {
+        console.log("The blocks command is now deprecated. " + deprecated);
         const watching = compiler.watch({
             // Example
             aggregateTimeout: 300,
@@ -189,14 +191,15 @@ async function runCommand({ srcFolder, distFolder, tsConfigLocation, postcssConf
         });
         process.on("SIGINT", function () {
             watching.close((closeError) => {
+                console.log("The blocks command is now deprecated. " + deprecated);
                 console.error(closeError);
             });
         });
     }
     else {
         const stopRunningMessage = startRunningMessage("Building blocks");
-        compiler.run((error, stats) => {
-            stopRunningMessage();
+        compiler.run(async (error, stats) => {
+            await stopRunningMessage();
             if (error) {
                 console.error(error);
                 process.exitCode = 1;
@@ -216,6 +219,7 @@ async function runCommand({ srcFolder, distFolder, tsConfigLocation, postcssConf
                 }
             }
             compiler.close((closeError) => {
+                console.log("The blocks command is now deprecated. " + deprecated);
                 if (closeError) {
                     process.exitCode = 1;
                 }

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":"AAYA,eAAO,MAAM,OAAO,kBAAkB,CAAC;AACvC,eAAO,MAAM,QAAQ,oEAC6C,CAAC;AACnE,wBAAsB,OAAO,kBAgG5B"}
+{"version":3,"file":"pull-database.d.ts","sourceRoot":"","sources":["../../src/commands/pull-database.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,OAAO,kBAAkB,CAAC;AACvC,eAAO,MAAM,QAAQ,oEAC6C,CAAC;AACnE,wBAAsB,OAAO,kBAqH5B"}

package/dist/commands/pull-database.js

@@ -32,23 +32,25 @@ export async function handler() {
         throw new Error("STAGING_URL is missing from .env file.");
     }
     else {
-        const { themeName } = smashConfig;
+        const { projectName } = smashConfig;
         const stopRunningMessage = startRunningMessage("Pulling database from staging");
         performance.mark("Start");
         await (async () => {
             const tmpFile = "/tmp/staging-database.sql";
             const tmpFileProcessed = "/tmp/staging-database.processed.sql";
-            await execute(`ssh ${stagingSSHUsername}@${stagingSSHHost} -p ${stagingSSHPort} "cd public/current && wp db export - --add-drop-table" > ${tmpFile}`)
-                .then(() => {
-                console.log("Database downloaded. Updating URLs in database SQL...");
-                return new Promise((resolve, reject) => {
+            await execute(`ssh -o "StrictHostKeyChecking no" ${stagingSSHUsername}@${stagingSSHHost} -p ${stagingSSHPort} "cd public/current && wp db export - --add-drop-table" > ${tmpFile}`)
+                .then(async () => {
+                await stopRunningMessage();
+                console.log("Database downloaded.");
+                const stopRunningMessage2 = startRunningMessage("Updating URLs in database SQL");
+                await new Promise((resolve, reject) => {
                     const readStream = createReadStream(tmpFile, { encoding: "utf8" });
                     const writeStream = createWriteStream(tmpFileProcessed, {
                         encoding: "utf8",
                     });
                     const rl = readline.createInterface({ input: readStream });
                     rl.on("line", (line) => {
-                        writeStream.write(line.replaceAll(stagingUrl, `//${themeName}.test`) + "\n");
+                        writeStream.write(line.replaceAll(stagingUrl, `//${projectName}.test`) + "\n");
                     });
                     rl.on("close", () => {
                         writeStream.end();
@@ -56,19 +58,38 @@ export async function handler() {
                     writeStream.on("finish", resolve);
                     writeStream.on("error", reject);
                     readStream.on("error", reject);
+                })
+                    .then(async () => {
+                    await stopRunningMessage2();
+                    console.log("URLs updated.");
+                })
+                    .catch(async (error) => {
+                    await stopRunningMessage2();
+                    throw error;
                 });
             })
                 .then(async () => {
-                console.log("Importing database...");
-                await execute(`wp db query < ${tmpFileProcessed}`);
-                await deleteFile(tmpFile);
-                await deleteFile(tmpFileProcessed);
-                stopRunningMessage();
+                const stopRunningMessage3 = startRunningMessage("Importing database");
+                await execute(`wp db query < ${tmpFileProcessed}`)
+                    .then(async () => {
+                    await stopRunningMessage3();
+                })
+                    .catch(async (error) => {
+                    await stopRunningMessage3();
+                    throw error;
+                });
+                const stopRunningMessage4 = startRunningMessage("Cleaning up");
+                await Promise.allSettled([
+                    deleteFile(tmpFile),
+                    deleteFile(tmpFileProcessed),
+                ]).then(async () => {
+                    await stopRunningMessage4();
+                });
                 console.log(`Database import complete! ${convertMeasureToPrettyString(performance.measure("everything", "Start"))}`);
                 console.log("If you want to download recent media you can use `npm run pull:media`, you can also change the number of months to download in your `.env` file.");
             })
                 .catch(async (error) => {
-                stopRunningMessage();
+                await stopRunningMessage();
                 console.error("Error during database pull:", error);
                 const cleanupResults = await Promise.allSettled([
                     deleteFile(tmpFile),

package/dist/commands/pull-media.js

@@ -10,7 +10,7 @@ async function downloadFiles(remotePath, localPath, ssh) {
         // Create local directory if it doesn't exist
         await mkdir(localPath, { recursive: true });
         // Download files using scp
-        await execute(`scp -r -p -O -P ${ssh.port} "${ssh.username}@${ssh.host}:${remotePath}" "${localPath}"`);
+        await execute(`scp -r -p -O -P -o "StrictHostKeyChecking no" ${ssh.port} "${ssh.username}@${ssh.host}:${remotePath}" "${localPath}"`);
     }
     catch (error) {
         console.log(`Failed to download ${remotePath}`);
@@ -87,12 +87,12 @@ export async function handler() {
                 console.log("Finished attempting to download all requested months");
             }
         })()
-            .then(() => {
-            stopRunningMessage();
+            .then(async () => {
+            await stopRunningMessage();
             console.log("Media download complete!");
         })
-            .catch(() => {
-            stopRunningMessage();
+            .catch(async () => {
+            await stopRunningMessage();
             console.log("There was an error downloading the media, see the message above.");
         });
     }

package/dist/commands/setup-database.js

@@ -16,12 +16,12 @@ export async function handler() {
         throw new Error("Unable to determine project setup information. Please add a smash.config.ts file with the required info.");
     }
     else {
-        const { themeName } = smashConfig;
+        const { projectName, themeFolderName } = smashConfig;
         const stopRunningMessage = startRunningMessage("Initialising database");
         performance.mark("Start");
         await execute("wp db create")
             .then(() => {
-            return execute(`wp core install --url=http://${process.env.CI ? "127.0.0.1" : `${themeName}.test`}/ --title=Temp --admin_user=Bot --admin_email=fake@fake.com --admin_password=password`);
+            return execute(`wp core install --url=http://${process.env.CI ? "127.0.0.1" : `${projectName}.test`}/ --title=Temp --admin_user=Bot --admin_email=fake@fake.com --admin_password=password`);
         })
             .then(() => {
             performance.mark("wordpress-tables");
@@ -40,16 +40,16 @@ export async function handler() {
             .then(() => {
             performance.mark("plugins");
             console.log(`Plugins activated. (${convertMeasureToPrettyString(performance.measure("plugins", addCustomUser ? "add-custom-user" : "wordpress-tables"))})`);
-            return execute(`wp theme activate ${themeName}`);
+            return execute(`wp theme activate ${themeFolderName}`);
         })
-            .then(() => {
+            .then(async () => {
             performance.mark("theme");
             console.log(`Theme activated. (${convertMeasureToPrettyString(performance.measure("theme", "plugins"))})`);
-            stopRunningMessage();
+            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"))})`);
         })
-            .catch((error) => {
-            stopRunningMessage();
+            .catch(async (error) => {
+            await stopRunningMessage();
             if (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`");
             }

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

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,OAAO,UAAU,CAAC;AAC/B,eAAO,MAAM,QAAQ,kDAAkD,CAAC;AACxE,wBAAsB,OAAO,kBAiM5B"}
+{"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,kBAkO5B"}

package/dist/commands/setup.js

@@ -1,6 +1,6 @@
 import { exec } from "node:child_process";
 import { existsSync } from "node:fs";
-import { constants, copyFile } from "node:fs/promises";
+import { constants, copyFile, unlink as deleteFile, mkdir, } from "node:fs/promises";
 import { resolve } from "node:path";
 import { performance } from "node:perf_hooks";
 import { promisify } from "node:util";
@@ -22,32 +22,50 @@ export async function handler() {
         throw new Error("Unable to determine project setup information. Please add a smash.config.ts file with the required info.");
     }
     else {
-        const { themeName, composerInstallPaths, npmInstallPaths } = smashConfig;
+        const { projectName, composerInstallPaths, npmInstallPaths } = smashConfig;
         const stopRunningMessage = startRunningMessage("Running setup");
         performance.mark("Start");
         await Promise.allSettled([
             ...(shouldInstallAndBuildOnly
                 ? []
                 : [
-                    copyFile(".env.example", ".env", constants.COPYFILE_EXCL)
-                        .then(() => {
-                        console.log(`.env.example file copied to .env. (${convertMeasureToPrettyString(performance.measure("Copy env file", "Start"))})`);
-                    })
-                        .catch((error) => {
-                        if (error instanceof Error &&
-                            "code" in error &&
-                            error.code === "EEXIST") {
-                            console.log(`Didn't copy .env file because one already exists. (${convertMeasureToPrettyString(performance.measure("Copy env file", "Start"))})`);
-                            return;
+                    (async () => {
+                        if (existsSync(".env.example")) {
+                            if (existsSync(".config/environments/.env.dev")) {
+                                throw new Error("Both .env.example and .config/environments/.env.dev files found. Please copy values from the .env.example to the .config/environments/.env.dev file and then delete the .env.example file.");
+                            }
+                            else {
+                                console.log("Moving .env.example to .config/environments/.env.dev");
+                                if (!existsSync(".config/environments")) {
+                                    await mkdir(".config/environments", { recursive: true });
+                                }
+                                await copyFile(".env.example", ".config/environments/.env.dev", constants.COPYFILE_EXCL);
+                                await deleteFile(".env.example");
+                            }
                         }
-                        console.error(error);
-                        throw new Error("Failed to copy .env file.");
-                    }),
+                        await copyFile(".config/environments/.env.dev", ".env", constants.COPYFILE_EXCL)
+                            .then(() => {
+                            console.log(`.config/environments/.env.dev file copied to .env. (${convertMeasureToPrettyString(performance.measure("Copy env file", "Start"))})`);
+                        })
+                            .catch((error) => {
+                            if (error instanceof Error &&
+                                "code" in error &&
+                                error.code === "EEXIST") {
+                                console.log(`Didn't copy .env file because one already exists. (${convertMeasureToPrettyString(performance.measure("Copy env file", "Start"))})`);
+                                return;
+                            }
+                            console.error(error);
+                            throw new Error("Failed to copy .env file.");
+                        });
+                    })(),
                     (async () => {
-                        if (existsSync(resolve(process.cwd(), "herd.yml")) &&
-                            (await execute(`herd --version`)
-                                .then(() => true)
-                                .catch(() => false))) {
+                        if (await execute(`herd --version`)
+                            .then(() => true)
+                            .catch(() => false)) {
+                            if (!existsSync(resolve(process.cwd(), "herd.yaml")) &&
+                                !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(() => {
                                 console.log(`Herd is linked, secured and isolated. (${convertMeasureToPrettyString(performance.measure("herd-or-valet", "Start"))})`);
@@ -60,7 +78,7 @@ export async function handler() {
                         else if (await execute(`valet --version`)
                             .then(() => true)
                             .catch(() => false)) {
-                            await execute(`valet link ${themeName} --secure --isolate`)
+                            await execute(`valet link ${projectName} --secure --isolate`)
                                 .then(() => {
                                 console.log(`Valet is linked, secured and isolated. (${convertMeasureToPrettyString(performance.measure("herd-or-valet", "Start"))})`);
                             })
@@ -70,7 +88,7 @@ export async function handler() {
                             });
                         }
                         else {
-                            console.log(`Neither Herd nor Valet is available. Site has not been linked.`);
+                            throw new Error(`Neither Herd nor Valet is present on your machine, check everything is installed correctly.`);
                         }
                     })(),
                 ]),
@@ -123,8 +141,8 @@ export async function handler() {
                     throw new Error(`Failed to run additional npm install ${index + 1}.`);
                 });
             }) ?? []),
-        ]).then((results) => {
-            stopRunningMessage();
+        ]).then(async (results) => {
+            await stopRunningMessage();
             if (results.some((result) => result.status === "rejected")) {
                 process.exitCode = 1;
                 console.error("Setup failed with the following errors:\n");

package/dist/external/wordpress.webpack.config.cjs

@@ -216,6 +216,9 @@ const baseConfig = {
                         loader: require.resolve("sass-loader"),
                         options: {
                             sourceMap: !isProduction,
+                            warnRuleAsWarning: false,
+                            implementation: require("sass"),
+                            api: "legacy",
                         },
                     },
                 ],

package/dist/external/wordpress.webpack.config.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"wordpress.webpack.config.d.cts","sourceRoot":"","sources":["../../src/external/wordpress.webpack.config.cjs"],"names":[],"mappings":";;AA+SA,oCAAoC;AACpC,4BADW,OAAO,CAAC,aAAa,CA2G9B"}
+{"version":3,"file":"wordpress.webpack.config.d.cts","sourceRoot":"","sources":["../../src/external/wordpress.webpack.config.cjs"],"names":[],"mappings":";;AAkTA,oCAAoC;AACpC,4BADW,OAAO,CAAC,aAAa,CA2G9B"}

package/dist/index.d.ts

@@ -4,8 +4,9 @@ export type SCSSAliases = {
     importers?: Options<"async">["importers"];
 };
 export type SmashConfig = {
-    themeName: string;
+    projectName: string;
     themePath: string;
+    themeFolderName?: string;
     assetsOutputFolder?: string;
     npmInstallPaths?: string[];
     composerInstallPaths?: string[];

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,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,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":"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"}

package/dist/utils.d.ts

@@ -14,13 +14,14 @@ 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): () => void;
+export declare function startRunningMessage(message: string): () => Promise<void>;
 export declare function getSmashConfig(): Promise<Required<SmashConfig> | {
     npmInstallPaths: string[];
     composerInstallPaths: string[];
     assetsOutputFolder: string;
-    themeName: 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,cAyBlD;AAyBD,wBAAsB,cAAc;;;;;;;UAiEnC"}
+{"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"}

package/dist/utils.js

@@ -64,15 +64,23 @@ export function startRunningMessage(message) {
             process.stdout.cursorTo(0);
             process.stdout.write(`${message}${".".repeat($i)}\r`);
         }, 200);
-        return () => {
+        return async () => {
             if (interval) {
                 clearInterval(interval);
-                process.stdout.clearLine(0);
-                process.stdout.cursorTo(0);
+                await new Promise((resolve) => {
+                    process.stdout.clearLine(0, () => {
+                        resolve();
+                    });
+                });
+                await new Promise((resolve) => {
+                    process.stdout.cursorTo(0, () => {
+                        resolve();
+                    });
+                });
             }
         };
     }
-    return () => {
+    return async () => {
         /* do nothing */
     };
 }
@@ -108,6 +116,7 @@ export async function getSmashConfig() {
         if (isValidSmashConfig(config)) {
             return {
                 scssAliases: getDefaultSCSSAliases(config.themePath),
+                themeFolderName: config.projectName,
                 ...config,
                 // Normalize and resolve paths to cwd.
                 npmInstallPaths: config.npmInstallPaths?.map((path) => {
@@ -145,8 +154,9 @@ export async function getSmashConfig() {
         }
         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 = {
-            themeName,
+            projectName: themeName,
             themePath,
+            themeFolderName: themeName,
             assetsOutputFolder: "dist",
             npmInstallPaths: [],
             composerInstallPaths: [],
@@ -159,8 +169,8 @@ export async function getSmashConfig() {
 function isValidSmashConfig(config) {
     return (typeof config === "object" &&
         config !== null &&
-        "themeName" in config &&
-        typeof config.themeName === "string" &&
+        "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": "8.2.0-beta.3",
+	"version": "9.0.0-beta.10",
 	"description": "A collection of CLI tools by Atomic Smash.",
 	"keywords": [],
 	"homepage": "https://www.atomicsmash.co.uk/",
@@ -51,6 +51,7 @@
 		"chalk": "^4.1.2",
 		"clean-webpack-plugin": "^4.0.0",
 		"copy-webpack-plugin": "^12.0.2",
+		"cosmiconfig": "^9.0.0",
 		"css-loader": "^7.1.2",
 		"cssnano": "^7.1.0",
 		"fast-glob": "^3.3.3",
@@ -64,7 +65,7 @@
 		"read-pkg-up": "^7.0.1",
 		"rtlcss-webpack-plugin": "^4.0.7",
 		"sass": "^1.89.2",
-		"sass-loader": "^12.6.0",
+		"sass-loader": "^16.0.5",
 		"schema-utils": "^4.3.2",
 		"source-map-loader": "^3.0.2",
 		"svg-sprite": "^2.0.4",
@@ -86,6 +87,7 @@
 		"type-fest": "^4.41.0"
 	},
 	"peerDependencies": {
-		"dotenv": "^16.6.1"
+		"dotenv": "^16.6.1",
+		"typescript": ">=4.9.5"
 	}
 }