@atomicsmash/compiler 3.0.0-beta.2 → 3.0.0

package/dist/config.d.ts

@@ -1,3 +1,4 @@
+import type { SCSSAliases } from "@atomicsmash/smash-config";
 import type { PathData } from "webpack";
 import DependencyExtractionWebpackPlugin from "@wordpress/dependency-extraction-webpack-plugin";
 import CopyPlugin from "copy-webpack-plugin";
@@ -9,7 +10,6 @@ import webpack from "webpack";
 import { WebpackAssetsManifest } from "webpack-assets-manifest";
 import { BundleAnalyzerPlugin } from "webpack-bundle-analyzer";
 import { BlocksPlugin } from "./BlocksPlugin.js";
-import { SCSSAliases } from "./index.js";
 export declare function config(options: {
     /**
      * The directory where the source files can be found. Relative to cwd.
@@ -128,7 +128,7 @@ export declare function config(options: {
             oneOf?: undefined;
         })[];
     };
-    plugins: (BlocksPlugin | DependencyExtractionWebpackPlugin | CopyPlugin | SVGSpritemapPlugin | import("vue-loader").VueLoaderPlugin | WebpackAssetsManifest | BundleAnalyzerPlugin | webpack.DefinePlugin)[];
+    plugins: (BlocksPlugin | DependencyExtractionWebpackPlugin | CopyPlugin | import("vue-loader").VueLoaderPlugin | WebpackAssetsManifest | SVGSpritemapPlugin | BundleAnalyzerPlugin | webpack.DefinePlugin)[];
     optimization: {
         minimizer: EsbuildPlugin[];
     };

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;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,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yCAyM4B,QAAQ;;;;;;;;;;;;;;;qCAeV,QAAQ;;;;;;;;;;sCA9PW,CAAC;;;;;;;;;;;;;;;;;;;;;;;GAyb9C"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAiB,QAAQ,EAAe,MAAM,SAAS,CAAC;AAUpE,OAAO,iCAAiC,MAAM,iDAAiD,CAAC;AAEhG,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAC7C,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;AAGjD,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,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yCAyM4B,QAAQ;;;;;;;;;;;;;;;qCAeV,QAAQ;;;;;;;;;;sCA7PA,CAAC;;;;;;;;;;;;;;;;;;;;;;;GA4bnC"}

package/dist/config.js

@@ -1,10 +1,9 @@
 import { sep as pathSeparator, extname, resolve as resolvePath, relative, join, } from "node:path";
 import { pathToFileURL } from "node:url";
-import { getSmashConfig } from "@atomicsmash/cli";
+import { getSmashConfig } from "@atomicsmash/smash-config";
 import DependencyExtractionWebpackPlugin from "@wordpress/dependency-extraction-webpack-plugin";
 import browserslistToEsbuild from "browserslist-to-esbuild";
 import CopyPlugin from "copy-webpack-plugin";
-import { cosmiconfig } from "cosmiconfig";
 import cssNano from "cssnano";
 import { EsbuildPlugin } from "esbuild-loader";
 import glob from "fast-glob";
@@ -320,6 +319,10 @@ export async function config(options) {
                         entry.key = "icons/sprite.svg";
                         return entry;
                     }
+                    if (entry.key.startsWith("icons/sprite") && entry.key.endsWith(".svg")) {
+                        entry.key = "icons/sprite.svg";
+                        return entry;
+                    }
                     if (entry.key.startsWith("/")) {
                         entry.key = entry.key.slice(1);
                     }
@@ -389,52 +392,25 @@ async function getSassOptions(srcFolder) {
     if (smashConfig) {
         return smashConfig.scssAliases;
     }
-    // Legacy fallback.
-    const explorer = cosmiconfig("scssAliases");
-    const config = await explorer
-        .load(resolvePath(process.cwd(), "scssAliases.config.ts"))
-        .then((result) => {
-        if (!result || result.isEmpty) {
-            throw new Error("Return default config.");
-        }
-        const config = result.config;
-        if (typeof config === "object" &&
-            config !== null &&
-            Object.keys(config).length <= 2) {
-            if (Object.keys(config).length === 2 &&
-                "importers" in config &&
-                "loadPaths" in config) {
-                return config;
-            }
-            if (Object.keys(config).length === 1 &&
-                ("importers" in config || "loadPaths" in config)) {
-                return config;
-            }
-        }
-        throw new Error("Return default config.");
-    })
-        .catch(() => {
-        const defaultConfig = {
-            importers: [
-                {
-                    findFileUrl(url) {
-                        if (!url.startsWith("sitecss:"))
-                            return null;
-                        const pathname = url.substring(8);
-                        return pathToFileURL(`${resolvePath(srcFolder, "../css")}${pathname.startsWith("/") ? pathname : `/${pathname}`}`);
-                    },
+    const defaultConfig = {
+        importers: [
+            {
+                findFileUrl(url) {
+                    if (!url.startsWith("sitecss:"))
+                        return null;
+                    const pathname = url.substring(8);
+                    return pathToFileURL(`${resolvePath(srcFolder, "../css")}${pathname.startsWith("/") ? pathname : `/${pathname}`}`);
                 },
-                {
-                    findFileUrl(url) {
-                        if (!url.startsWith("launchpad:"))
-                            return null;
-                        const pathname = url.substring(10);
-                        return pathToFileURL(`${resolvePath(process.cwd(), "public/wp-content/themes/launchpad/src/styles")}${pathname.startsWith("/") ? pathname : `/${pathname}`}`);
-                    },
+            },
+            {
+                findFileUrl(url) {
+                    if (!url.startsWith("launchpad:"))
+                        return null;
+                    const pathname = url.substring(10);
+                    return pathToFileURL(`${resolvePath(process.cwd(), "public/wp-content/themes/launchpad/src/styles")}${pathname.startsWith("/") ? pathname : `/${pathname}`}`);
                 },
-            ],
-        };
-        return defaultConfig;
-    });
-    return config;
+            },
+        ],
+    };
+    return defaultConfig;
 }

package/dist/index.d.ts

@@ -1,6 +1,2 @@
-import type { Options } from "sass";
-export type SCSSAliases = {
-    loadPaths?: Options<"async">["loadPaths"];
-    importers?: Options<"async">["importers"];
-};
+export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAIpC,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}

package/dist/index.js

@@ -1 +1,3 @@
 export {};
+// export { config } from "./config";
+// export { config as default } from "./config";

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@atomicsmash/compiler",
 	"type": "module",
-	"version": "3.0.0-beta.2",
+	"version": "3.0.0",
 	"description": "A universal compiler for all Atomic Smash projects.",
 	"keywords": [
 		"cli",
@@ -47,10 +47,10 @@
 	},
 	"dependencies": {
 		"@atomicsmash/date-php": "^2.1.0",
-		"@wordpress/dependency-extraction-webpack-plugin": "^6.35.0",
+		"@atomicsmash/smash-config": "^1.0.0",
+		"@wordpress/dependency-extraction-webpack-plugin": "^6.36.0",
 		"browserslist-to-esbuild": "^2.1.1",
-		"copy-webpack-plugin": "^12.0.2",
-		"cosmiconfig": "^9.0.0",
+		"copy-webpack-plugin": "^13.0.1",
 		"cssnano": "^7.1.2",
 		"esbuild-loader": "^4.4.0",
 		"fast-glob": "^3.3.3",
@@ -58,20 +58,19 @@
 		"json2php": "^0.0.12",
 		"postcss": "^8.5.6",
 		"postcss-loader": "^8.2.0",
-		"postcss-preset-env": "^10.4.0",
-		"sass": "^1.94.1",
+		"postcss-preset-env": "^10.5.0",
+		"sass": "^1.97.0",
 		"sass-loader": "^16.0.6",
-		"svg-spritemap-webpack-plugin": "^4.7.0",
+		"svg-spritemap-webpack-plugin": "^5.1.0",
 		"tsconfig-paths-webpack-plugin": "^4.2.0",
-		"tsx": "^4.20.6",
-		"webpack": "^5.103.0",
-		"webpack-assets-manifest": "^6.4.0",
-		"webpack-bundle-analyzer": "^4.10.2",
-		"yargs": "^17.7.2"
+		"tsx": "^4.21.0",
+		"webpack": "^5.104.0",
+		"webpack-assets-manifest": "^6.5.0",
+		"webpack-bundle-analyzer": "^5.1.0",
+		"yargs": "^18.0.0"
 	},
 	"devDependencies": {
-		"@tailwindcss/postcss": "^4.1.17",
-		"@types/svg-spritemap-webpack-plugin": "^4.4.4",
+		"@tailwindcss/postcss": "^4.1.18",
 		"@types/webpack": "^5.28.5",
 		"@types/webpack-assets-manifest": "^5.1.4",
 		"@types/webpack-bundle-analyzer": "^4.7.0",
@@ -81,8 +80,5 @@
 	},
 	"engines": {
 		"node": "^20 || >=22"
-	},
-	"peerDependencies": {
-		"@atomicsmash/cli": "^10.0.0-beta.1"
 	}
 }