@atomicsmash/compiler 2.0.0-beta.3 → 2.0.0-beta.5

package/dist/BlocksPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BlocksPlugin.d.ts","sourceRoot":"","sources":["../src/BlocksPlugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAS/D,qBAAa,YAAa,YAAW,qBAAqB;IACzD,UAAU,SAAkB;IAC5B,SAAS,EAAE,MAAM,CAAC;gBAEN,SAAS,EAAE,MAAM;IAI7B,KAAK,CAAC,QAAQ,EAAE,QAAQ;CA4JxB"}
+{"version":3,"file":"BlocksPlugin.d.ts","sourceRoot":"","sources":["../src/BlocksPlugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAS/D,qBAAa,YAAa,YAAW,qBAAqB;IACzD,UAAU,SAAkB;IAC5B,SAAS,EAAE,MAAM,CAAC;gBAEN,SAAS,EAAE,MAAM;IAI7B,KAAK,CAAC,QAAQ,EAAE,QAAQ;CA8JxB"}

package/dist/BlocksPlugin.js

@@ -90,11 +90,13 @@ export class BlocksPlugin {
                     blocksManifest[blockName] = newBlockJson;
                 });
             }
-            const phpContent = `<?php
-// This file is generated. Do not modify it manually.
-return ${printer(blocksManifest)};
-`;
-            await writeFile(`${compilation.outputOptions.path}${pathSeparator}blocks${pathSeparator}blocks-manifest.php`, phpContent);
+            if (Object.keys(blocksManifest).length > 0) {
+                const phpContent = `<?php
+	// This file is generated. Do not modify it manually.
+	return ${printer(blocksManifest)};
+	`;
+                await writeFile(`${compilation.outputOptions.path}${pathSeparator}blocks${pathSeparator}blocks-manifest.php`, phpContent);
+            }
             await writeFile(`${compilation.outputOptions.path}${pathSeparator}wordpress-assets-info.php`, `<?php return ${json2php(wordpressAssets)};\n`);
             await deleteFile(wordpressAssetsFilePath);
         });

package/dist/cli.js

@@ -29,6 +29,7 @@ const argv = await yargs(hideBin(process.argv))
         boolean: true,
         default: false,
         describe: "Enable experimental support for WordPress blocks compilation.",
+        deprecate: "Blocks support is enabled by default now. You can remove this option from your command.",
     },
     excludeBlocks: {
         array: true,
@@ -39,7 +40,9 @@ const argv = await yargs(hideBin(process.argv))
 })
     .showHelpOnFail(false, "Specify --help for available options")
     .parse();
-const compiler = webpack(await defaultConfig({ ...argv }));
+// eslint-disable-next-line @typescript-eslint/naming-convention -- Experimental option.
+const { experimentalBlocksSupport, ...compilerOptions } = argv;
+const compiler = webpack(await defaultConfig({ ...compilerOptions }));
 if (argv.watch) {
     const watching = compiler.watch({
         // Example

package/dist/config.d.ts

@@ -27,10 +27,6 @@ export declare function config(options: {
      * See a report of the generated bundle once built.
      */
     analyse?: boolean | undefined;
-    /**
-     * Enable experimental support for WordPress blocks compilation.
-     */
-    experimentalBlocksSupport?: boolean | undefined;
     /**
      * A comma separated list of the folder names of blocks to exclude from compilation. Requires experimental blocks support.
      */
@@ -117,7 +113,7 @@ export declare function config(options: {
             })[];
         })[];
     };
-    plugins: (BlocksPlugin | DependencyExtractionWebpackPlugin | CopyPlugin | SVGSpritemapPlugin | import("vue-loader").VueLoaderPlugin | webpack.ProgressPlugin | WebpackAssetsManifest | BundleAnalyzerPlugin | webpack.DefinePlugin)[];
+    plugins: (BlocksPlugin | DependencyExtractionWebpackPlugin | CopyPlugin | SVGSpritemapPlugin | import("vue-loader").VueLoaderPlugin | WebpackAssetsManifest | 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,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"}
+{"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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCAyL0B,QAAQ;;;;;;;;;;;qCAaR,QAAQ;;;;;;;;;;sCAlPrB,CAAC;;;;;;;;;;;;;;;;;;;;;GA6ad"}

package/dist/config.js

@@ -21,7 +21,6 @@ export async function config(options) {
     const argv = {
         watch: false,
         analyse: false,
-        experimentalBlocksSupport: false,
         excludeBlocks: ["__TEMPLATE__"],
         ...options,
     };
@@ -88,7 +87,7 @@ export async function config(options) {
             },
             exclude: (file) => {
                 // Exclude all block.json.ts files (handled by a separate loader).
-                if (argv.experimentalBlocksSupport && file.includes("block.json")) {
+                if (file.includes("block.json")) {
                     return true;
                 }
                 // Exclude node_modules files from transpilation unless they are vue files and the vue-loader is present
@@ -113,9 +112,8 @@ export async function config(options) {
         // Set the environment mode from NODE_ENV.
         mode: MODE,
         entry: await glob([
-            ...(argv.experimentalBlocksSupport
-                ? [`${srcFolder}/blocks/**/block.json.ts`]
-                : []),
+            // Parse all block json typescript files in the blocks folder.
+            `${srcFolder}/blocks/**/block.json.ts`,
             // Parse all direct children of the JS folder, as long as they are JS & TS files
             `${srcFolder}/scripts/*.{js,ts,jsx,tsx}`,
             // Parse all direct children of the CSS folder, as long as they are CSS files
@@ -123,13 +121,9 @@ export async function config(options) {
             // Parse all nested children of the CSS folder, as long as they are non-partial SCSS files
             `${srcFolder}/styles/**/[^_]*.s[ac]ss`,
         ], {
-            ignore: argv.experimentalBlocksSupport
-                ? argv.excludeBlocks.map((blockName) => `${srcFolder}/blocks/**/${blockName}/block.json.ts`)
-                : [],
+            ignore: argv.excludeBlocks.map((blockName) => `${srcFolder}/blocks/**/${blockName}/block.json.ts`),
         }).then(async (paths) => {
-            const { restOfPaths, entryPoints } = argv.experimentalBlocksSupport
-                ? await getBlocksAssetsEntryPoints(paths, {}, srcFolder)
-                : { restOfPaths: paths, entryPoints: {} };
+            const { restOfPaths, entryPoints } = await getBlocksAssetsEntryPoints(paths, {}, srcFolder);
             restOfPaths.forEach((path) => {
                 const entryName = path.replace(srcFolder, "");
                 entryPoints[entryName] = {
@@ -179,20 +173,16 @@ export async function config(options) {
                     resourceQuery: (value) => !value.includes("vue"),
                     ...getEsBuildLoaderSetup("default"),
                 },
-                ...(argv.experimentalBlocksSupport
-                    ? [
-                        {
-                            test: /block\.json\.ts$/,
-                            type: "asset/resource",
-                            generator: {
-                                filename: (pathData) => relative(srcFolder, pathData.filename ?? "").slice(0, -3),
-                            },
-                            use: {
-                                loader: resolvePath(import.meta.dirname, "./BlocksLoader.js"),
-                            },
-                        },
-                    ]
-                    : []),
+                {
+                    test: /block\.json\.ts$/,
+                    type: "asset/resource",
+                    generator: {
+                        filename: (pathData) => relative(srcFolder, pathData.filename ?? "").slice(0, -3),
+                    },
+                    use: {
+                        loader: resolvePath(import.meta.dirname, "./BlocksLoader.js"),
+                    },
+                },
                 // Transpile SCSS files and run the result through postcss
                 {
                     test: /\.s[ac]ss$/i,
@@ -292,7 +282,7 @@ export async function config(options) {
         },
         plugins: [
             // Output progress information when compiling
-            new webpack.ProgressPlugin(),
+            // new webpack.ProgressPlugin(),
             // Generate a manifest file of assets to make it possible to target fingerprinted files
             new WebpackAssetsManifest({
                 writeToDisk: true,
@@ -305,10 +295,13 @@ export async function config(options) {
                         entry.key === "wordpress-assets-info.php" ||
                         entry.key.endsWith(".map") ||
                         entry.key.startsWith("fonts") ||
-                        entry.key.startsWith("images") ||
-                        entry.key === "spritemap.svg") {
+                        entry.key.startsWith("images")) {
                         return false;
                     }
+                    if (entry.key === "spritemap.svg") {
+                        entry.key = "icons/sprite.svg";
+                        return entry;
+                    }
                     if (entry.key.startsWith("/")) {
                         entry.key = entry.key.slice(1);
                     }
@@ -325,7 +318,7 @@ export async function config(options) {
             ...((await glob(`${srcFolder}/icons/*.svg`)).length
                 ? [
                     new SVGSpritemapPlugin(`${srcFolder}/icons/*.svg`, {
-                        output: { filename: "icons/sprite.svg" },
+                        output: { filename: "icons/sprite.[contenthash].svg" },
                         sprite: { prefix: "", generate: { title: false } },
                     }),
                 ]
@@ -357,19 +350,12 @@ export async function config(options) {
             new DependencyExtractionWebpackPlugin({
                 combineAssets: true,
                 // Blocks plugin converts this to php, but it must be output as json here.
-                ...(argv.experimentalBlocksSupport
-                    ? {
-                        outputFormat: "json",
-                        combinedOutputFile: "wordpress-assets-info.json",
-                    }
-                    : {
-                        outputFormat: "php",
-                        combinedOutputFile: "wordpress-assets-info.php",
-                    }),
+                outputFormat: "json",
+                combinedOutputFile: "wordpress-assets-info.json",
             }),
             // Support Vue files if vue-loader is present
             ...vueConfig.plugin,
-            ...(argv.experimentalBlocksSupport ? [new BlocksPlugin(srcFolder)] : []),
+            new BlocksPlugin(srcFolder),
             new webpack.DefinePlugin({ ...vueConfig.globals }),
         ],
         optimization: {

package/package.json

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