@atomicsmash/compiler 1.1.0 → 2.0.0-beta.1

package/dist/cli.js

@@ -8,12 +8,10 @@ import { config as defaultConfig } from "./config.js";
 const argv = await yargs(hideBin(process.argv))
     .options({
     in: {
-        demandOption: true,
         describe: "The directory where the source files can be found. Relative to cwd.",
         type: "string",
     },
     out: {
-        demandOption: true,
         describe: "The directory where the compiled files will out output. Relative to cwd.",
         type: "string",
     },
@@ -41,13 +39,6 @@ const argv = await yargs(hideBin(process.argv))
 })
     .showHelpOnFail(false, "Specify --help for available options")
     .parse();
-// const explorer = cosmiconfig("smash-compiler");
-// const config = await explorer.search().then(async (config) => {
-// 	if (!config) {
-// 		return await defaultConfig({ ...argv });
-// 	}
-// 	return config.config as Configuration;
-// });
 const compiler = webpack(await defaultConfig({ ...argv }));
 if (argv.watch) {
     const watching = compiler.watch({

package/dist/config.d.ts

@@ -14,11 +14,11 @@ export declare function config(options: {
     /**
      * The directory where the source files can be found. Relative to cwd.
      */
-    in: string;
+    in?: string;
     /**
      * The directory where the compiled files will out output. Relative to cwd.
      */
-    out: string;
+    out?: string;
     /**
      * Whether to watch the files in the source folder for changes and compile.
      */

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,QAAQ,EAAe,MAAM,SAAS,CAAC;AAQpE,OAAO,iCAAiC,MAAM,iDAAiD,CAAC;AAEhG,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAE7C,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,kBAAkB,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,wBAAsB,MAAM,CAAC,OAAO,EAAE;IACrC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAChD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCA6K6B,QAAQ;;;;;;;;;;;qCAeX,QAAQ;;;;;;;;;;sCA1OrB,CAAC;;;;;;;;;;;;;;;;;;;;;GAyad"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,QAAQ,EAAe,MAAM,SAAS,CAAC;AAUpE,OAAO,iCAAiC,MAAM,iDAAiD,CAAC;AAEhG,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAE7C,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,kBAAkB,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,wBAAsB,MAAM,CAAC,OAAO,EAAE;IACrC;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAChD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCA8L6B,QAAQ;;;;;;;;;;;qCAeX,QAAQ;;;;;;;;;;sCA7PrB,CAAC;;;;;;;;;;;;;;;;;;;;;GA4bd"}

package/dist/config.js

@@ -1,5 +1,6 @@
-import { sep as pathSeparator, extname, resolve as resolvePath, relative, } from "node:path";
+import { sep as pathSeparator, extname, resolve as resolvePath, relative, join, } from "node:path";
 import { pathToFileURL } from "node:url";
+import { getSmashConfig } from "@atomicsmash/cli";
 import DependencyExtractionWebpackPlugin from "@wordpress/dependency-extraction-webpack-plugin";
 import browserslistToEsbuild from "browserslist-to-esbuild";
 import CopyPlugin from "copy-webpack-plugin";
@@ -16,6 +17,7 @@ import { BundleAnalyzerPlugin } from "webpack-bundle-analyzer";
 import { BlocksPlugin } from "./BlocksPlugin.js";
 import { getBlocksAssetsEntryPoints } from "./getBlocksAssetsEntryPoints.js";
 export async function config(options) {
+    const smashConfig = await getSmashConfig();
     const argv = {
         watch: false,
         analyse: false,
@@ -26,8 +28,19 @@ export async function config(options) {
     const MODE = process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test"
         ? "development"
         : "production";
-    const srcFolder = resolvePath(argv.in);
-    const distFolder = resolvePath(argv.out);
+    const srcFolder = argv.in
+        ? resolvePath(argv.in)
+        : smashConfig?.themePath
+            ? resolvePath(join(smashConfig?.themePath, "src"))
+            : null;
+    const distFolder = argv.out
+        ? resolvePath(argv.out)
+        : smashConfig?.themePath
+            ? resolvePath(join(smashConfig?.themePath, smashConfig.assetsOutputFolder))
+            : null;
+    if (!srcFolder || !distFolder) {
+        throw new Error("Failed to get the in or out folders for the blocks. Please add a smash.config.ts file to your project with a themeName and a themePath.");
+    }
     // Add optional support for Tailwind if tailwind postcss plugin is installed
     const tailwindPostCSSPlugin = await import("@tailwindcss/postcss")
         .then((tailwindPostCSS) => [tailwindPostCSS.default])
@@ -368,6 +381,11 @@ export async function config(options) {
     };
 }
 async function getSassOptions(srcFolder) {
+    const smashConfig = await getSmashConfig();
+    if (smashConfig) {
+        return smashConfig.scssAliases;
+    }
+    // Legacy fallback.
     const explorer = cosmiconfig("scssAliases");
     const config = await explorer
         .load(resolvePath(process.cwd(), "scssAliases.config.ts"))

package/dist/utils.d.ts

@@ -1,5 +1,13 @@
 import type { BlockMetaData } from "@atomicsmash/blocks-helpers";
+import type { ExecException } from "node:child_process";
 export type BlockJson = BlockMetaData<never, never>;
 export declare function getBlockJsonScriptFields(blockJson: BlockJson): Partial<Pick<BlockJson, "viewScript" | "script" | "editorScript">> | null;
 export declare function getBlockJsonStyleFields(blockJson: BlockJson): Partial<Pick<BlockJson, "editorStyle" | "style" | "viewStyle">> | null;
+export declare function execute(command: string, options?: {
+    debug: boolean;
+}): Promise<{
+    error: ExecException | null;
+    stdout: string;
+    stderr: string;
+}>;
 //# 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,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAEpD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,SAAS,6EAW5D;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,0EAW3D"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGxD,MAAM,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAEpD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,SAAS,6EAW5D;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,0EAW3D;AAED,wBAAsB,OAAO,CAC5B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,KAAK,EAAE,OAAO,CAAA;CAAqB;WAGtC,aAAa,GAAG,IAAI;YACnB,MAAM;YACN,MAAM;GAaf"}

package/dist/utils.js

@@ -1,3 +1,4 @@
+import { exec } from "node:child_process";
 export function getBlockJsonScriptFields(blockJson) {
     const scriptFields = ["viewScript", "script", "editorScript"];
     let result = null;
@@ -20,3 +21,17 @@ export function getBlockJsonStyleFields(blockJson) {
     }
     return result;
 }
+export async function execute(command, options = { debug: false }) {
+    return new Promise((resolve, reject) => {
+        exec(command, (error, stdout, stderr) => {
+            if (error) {
+                if (options.debug) {
+                    console.error({ error, stdout, stderr });
+                }
+                // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors -- This is preferred in this instance
+                reject({ error, stdout, stderr });
+            }
+            resolve({ error, stdout, stderr });
+        });
+    });
+}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@atomicsmash/compiler",
 	"type": "module",
-	"version": "1.1.0",
+	"version": "2.0.0-beta.1",
 	"description": "A universal compiler for all Atomic Smash projects.",
 	"keywords": [
 		"cli",
@@ -79,5 +79,8 @@
 	},
 	"engines": {
 		"node": "^20 || >=22"
+	},
+	"peerDependencies": {
+		"@atomicsmash/cli": "^8.2.0-beta.2"
 	}
 }