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

package/dist/commands/blocks.js

@@ -195,8 +195,8 @@ async function runCommand({ srcFolder, distFolder, tsConfigLocation, postcssConf
     }
     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;

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

@@ -39,9 +39,11 @@ export async function handler() {
             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) => {
+                .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",
@@ -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

@@ -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

@@ -42,14 +42,14 @@ export async function handler() {
             console.log(`Plugins activated. (${convertMeasureToPrettyString(performance.measure("plugins", addCustomUser ? "add-custom-user" : "wordpress-tables"))})`);
             return execute(`wp theme activate ${themeName}`);
         })
-            .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.js

@@ -123,8 +123,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/utils.d.ts

@@ -14,7 +14,7 @@ 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[];

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;;;;;;;UAiEnC"}

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 */
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atomicsmash/cli",
-	"version": "8.2.0-beta.3",
+	"version": "9.0.0-beta.5",
 	"description": "A collection of CLI tools by Atomic Smash.",
 	"keywords": [],
 	"homepage": "https://www.atomicsmash.co.uk/",
@@ -64,7 +64,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",