@atomicsmash/cli 9.0.0-beta.5 → 9.0.0-beta.7

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,6 +191,7 @@ 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);
             });
         });
@@ -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.js

@@ -32,7 +32,7 @@ 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 () => {
@@ -50,7 +50,7 @@ export async function handler() {
                     });
                     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();

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,7 +40,7 @@ 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(async () => {
             performance.mark("theme");

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":"AAYA,eAAO,MAAM,OAAO,UAAU,CAAC;AAC/B,eAAO,MAAM,QAAQ,kDAAkD,CAAC;AACxE,wBAAsB,OAAO,kBAkM5B"}

package/dist/commands/setup.js

@@ -22,7 +22,7 @@ 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([
@@ -44,7 +44,8 @@ export async function handler() {
                         throw new Error("Failed to copy .env file.");
                     }),
                     (async () => {
-                        if (existsSync(resolve(process.cwd(), "herd.yml")) &&
+                        if ((existsSync(resolve(process.cwd(), "herd.yaml")) ||
+                            existsSync(resolve(process.cwd(), "herd.yml"))) &&
                             (await execute(`herd --version`)
                                 .then(() => true)
                                 .catch(() => false))) {
@@ -60,7 +61,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"))})`);
                             })

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

@@ -19,8 +19,9 @@ 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,uBAiClD;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

@@ -116,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) => {
@@ -153,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: [],
@@ -167,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": "9.0.0-beta.5",
+	"version": "9.0.0-beta.7",
 	"description": "A collection of CLI tools by Atomic Smash.",
 	"keywords": [],
 	"homepage": "https://www.atomicsmash.co.uk/",