@atomicsmash/cli 9.0.0-beta.8 → 9.0.0

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,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"}
+{"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;AAuJD,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

@@ -165,6 +165,9 @@ async function runCommand({ srcFolder, distFolder, tsConfigLocation, postcssConf
         mode: isProduction ? "production" : "development",
         node: { global: false },
     });
+    if (!compiler) {
+        throw new Error("Failed to initialise compiler.");
+    }
     if (isWatch) {
         console.log("The blocks command is now deprecated. " + deprecated);
         const watching = compiler.watch({
@@ -175,7 +178,7 @@ async function runCommand({ srcFolder, distFolder, tsConfigLocation, postcssConf
             if (error) {
                 console.error(error.stack ?? error);
                 process.exitCode = 1;
-                watching.close((closeError) => {
+                watching?.close((closeError) => {
                     console.error(closeError);
                 });
             }
@@ -190,7 +193,7 @@ async function runCommand({ srcFolder, distFolder, tsConfigLocation, postcssConf
             }
         });
         process.on("SIGINT", function () {
-            watching.close((closeError) => {
+            watching?.close((closeError) => {
                 console.log("The blocks command is now deprecated. " + deprecated);
                 console.error(closeError);
             });
@@ -198,8 +201,8 @@ async function runCommand({ srcFolder, distFolder, tsConfigLocation, postcssConf
     }
     else {
         const stopRunningMessage = startRunningMessage("Building blocks");
-        compiler.run(async (error, stats) => {
-            await stopRunningMessage();
+        compiler.run((error, stats) => {
+            void 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,kBAqH5B"}
+{"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,kBA8J5B"}

package/dist/commands/pull-database.js

@@ -13,6 +13,8 @@ export async function handler() {
     const stagingSSHUsername = process.env.STAGING_SSH_USERNAME;
     const stagingSSHHost = process.env.STAGING_SSH_HOST;
     const stagingSSHPort = process.env.STAGING_SSH_PORT;
+    const stagingDBPrefix = process.env.STAGING_DB_PREFIX ?? "wp_";
+    const stagingWebRoot = process.env.STAGING_WEB_ROOT ?? "public/current";
     const stagingUrl = process.env.STAGING_URL?.endsWith("/")
         ? process.env.STAGING_URL.slice(0, -1)
         : process.env.STAGING_URL;
@@ -37,8 +39,45 @@ export async function handler() {
         performance.mark("Start");
         await (async () => {
             const tmpFile = "/tmp/staging-database.sql";
+            const dbPrefixFile = "/tmp/db-prefix.txt";
             const tmpFileProcessed = "/tmp/staging-database.processed.sql";
-            await execute(`ssh -o "StrictHostKeyChecking no" ${stagingSSHUsername}@${stagingSSHHost} -p ${stagingSSHPort} "cd public/current && wp db export - --add-drop-table" > ${tmpFile}`)
+            const tablesToExclude = [
+                // WordFence
+                "wfauditevents",
+                "wfblockediplog",
+                "wfblocks7",
+                "wfconfig",
+                "wfcrawlers",
+                "wffilemods",
+                "wfhits",
+                "wfhoover",
+                "wfissues",
+                "wfknownfilelist",
+                "wflivetraffichuman",
+                "wflocs",
+                "wflogins",
+                "wfls_2fa_secrets",
+                "wfls_role_counts",
+                "wfls_settings",
+                "wfnotifications",
+                "wfpendingissues",
+                "wfreversecache",
+                "wfsecurityevents",
+                "wfsnipcache",
+                "wfstatus",
+                "wftrafficrates",
+                "wfwaffailures",
+                // WP All Import/Export
+                "pmxi_files",
+                "pmxi_geocoding",
+                "pmxi_hash",
+                "pmxi_history",
+                "pmxi_images",
+                "pmxi_imports",
+                "pmxi_posts",
+                "pmxi_templates",
+            ].map((tableName) => stagingDBPrefix + tableName);
+            await execute(`ssh -o "StrictHostKeyChecking no" ${stagingSSHUsername}@${stagingSSHHost} -p ${stagingSSHPort} "${stagingWebRoot !== "" ? `cd ${stagingWebRoot} && ` : ""}wp db export - --add-drop-table --exclude_tables=${tablesToExclude.join(",")}" > ${tmpFile}`)
                 .then(async () => {
                 await stopRunningMessage();
                 console.log("Database downloaded.");
@@ -81,6 +120,7 @@ export async function handler() {
                 const stopRunningMessage4 = startRunningMessage("Cleaning up");
                 await Promise.allSettled([
                     deleteFile(tmpFile),
+                    deleteFile(dbPrefixFile),
                     deleteFile(tmpFileProcessed),
                 ]).then(async () => {
                     await stopRunningMessage4();
@@ -93,6 +133,7 @@ export async function handler() {
                 console.error("Error during database pull:", error);
                 const cleanupResults = await Promise.allSettled([
                     deleteFile(tmpFile),
+                    deleteFile(dbPrefixFile),
                     deleteFile(tmpFileProcessed),
                 ]);
                 const failedCleanups = cleanupResults.filter((result) => result.status === "rejected");

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 -o "StrictHostKeyChecking no" ${ssh.port} "${ssh.username}@${ssh.host}:${remotePath}" "${localPath}"`);
+        await execute(`scp -r -p -O -o "StrictHostKeyChecking no" -P ${ssh.port} "${ssh.username}@${ssh.host}:${remotePath}" "${localPath}"`);
     }
     catch (error) {
         console.log(`Failed to download ${remotePath}`);

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,kBAkM5B"}
+{"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,kBA4P5B"}

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";
@@ -29,33 +29,68 @@ export async function handler() {
             ...(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.yaml")) ||
-                            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"))})`);
+                                performance.mark("herd init done");
+                                console.log(`Herd is configured. (${convertMeasureToPrettyString(performance.measure("herd-or-valet", "Start"))})`);
+                            })
+                                .catch((error) => {
+                                console.error(error);
+                                throw new Error("Failed to configure the site using Herd.");
+                            });
+                            await execute(`herd link ${projectName} --secure`)
+                                .then(() => {
+                                performance.mark("herd link done");
+                                console.log(`Herd is linked and secured. (${convertMeasureToPrettyString(performance.measure("herd link", "herd init done"))})`);
+                            })
+                                .catch((error) => {
+                                console.error(error);
+                                throw new Error("Failed to link the site using Herd.");
+                            });
+                            await execute(`herd isolate`)
+                                .then(() => {
+                                console.log(`Herd is isolated. (${convertMeasureToPrettyString(performance.measure("herd isolate", "herd link done"))})`);
                             })
                                 .catch((error) => {
                                 console.error(error);
-                                throw new Error("Failed to link the site using herd.");
+                                throw new Error("Failed to isolate the site using Herd.");
                             });
                         }
                         else if (await execute(`valet --version`)
@@ -71,7 +106,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.`);
                         }
                     })(),
                 ]),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atomicsmash/cli",
-	"version": "9.0.0-beta.8",
+	"version": "9.0.0",
 	"description": "A collection of CLI tools by Atomic Smash.",
 	"keywords": [],
 	"homepage": "https://www.atomicsmash.co.uk/",
@@ -42,43 +42,44 @@
 	"dependencies": {
 		"@atomicsmash/date-php": "^2.1.0",
 		"@pmmmwh/react-refresh-webpack-plugin": "^0.5.17",
-		"@wordpress/babel-preset-default": "^8.27.0",
-		"@wordpress/dependency-extraction-webpack-plugin": "^6.27.0",
-		"@wordpress/postcss-plugins-preset": "^5.27.0",
+		"@wordpress/babel-preset-default": "^8.32.0",
+		"@wordpress/dependency-extraction-webpack-plugin": "^6.32.0",
+		"@wordpress/postcss-plugins-preset": "^5.32.0",
 		"autoprefixer": "^10.4.21",
 		"babel-loader": "^9.2.1",
-		"browserslist": "^4.25.1",
+		"browserslist": "^4.26.3",
 		"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",
+		"cssnano": "^7.1.1",
 		"fast-glob": "^3.3.3",
 		"glob-promise": "^6.0.7",
-		"mini-css-extract-plugin": "^2.9.2",
+		"mini-css-extract-plugin": "^2.9.4",
 		"path": "^0.12.7",
 		"postcss": "^8.5.6",
 		"postcss-load-config": "^6.0.1",
-		"postcss-loader": "^8.1.1",
+		"postcss-loader": "^8.2.0",
 		"react-refresh": "^0.14.2",
 		"read-pkg-up": "^7.0.1",
 		"rtlcss-webpack-plugin": "^4.0.7",
-		"sass": "^1.89.2",
+		"sass": "^1.93.2",
 		"sass-loader": "^16.0.5",
-		"schema-utils": "^4.3.2",
+		"schema-utils": "^4.3.3",
 		"source-map-loader": "^3.0.2",
 		"svg-sprite": "^2.0.4",
 		"terser-webpack-plugin": "^5.3.14",
 		"tsconfig-paths": "^4.2.0",
 		"tsconfig-paths-webpack-plugin": "^4.2.0",
-		"tsx": "^4.20.3",
+		"tsx": "^4.20.6",
 		"vinyl": "^3.0.1",
-		"webpack": "^5.100.2",
+		"webpack": "^5.102.1",
 		"webpack-bundle-analyzer": "^4.10.2",
 		"yargs": "^18.0.0"
 	},
 	"devDependencies": {
-		"@atomicsmash/blocks-helpers": "^7.1.0-beta.1",
+		"@atomicsmash/blocks-helpers": "^7.1.0",
 		"@types/glob": "^8.1.0",
 		"@types/svg-sprite": "^0.0.39",
 		"@types/vinyl": "^2.0.12",
@@ -86,6 +87,7 @@
 		"type-fest": "^4.41.0"
 	},
 	"peerDependencies": {
-		"dotenv": "^16.6.1"
+		"dotenv": "^16.6.1",
+		"typescript": "^5.8.3"
 	}
 }