@wordpress/create-block 4.80.2-next.ba3aee3a2.0 → 4.81.0

package/lib/index.js

@@ -127,6 +127,7 @@ program
 						// Transforms slug to title as a fallback.
 						title: capitalCase( slug ),
 						...optionsValues,
+						variant,
 					};
 					await scaffold( projectTemplate, answers );
 				} else {

package/lib/scaffold.js

@@ -1,8 +1,8 @@
 /**
  * External dependencies
  */
-const { pascalCase, snakeCase } = require( 'change-case' );
 const { join } = require( 'path' );
+const { pascalCase, snakeCase } = require( 'change-case' );
 
 /**
  * Internal dependencies
@@ -16,7 +16,12 @@ const { writeOutputAsset, writeOutputTemplate } = require( './output' );
 const { getOutputTemplates, getOutputAssets } = require( './templates' );
 
 module.exports = async (
-	{ blockOutputTemplates, pluginOutputTemplates, outputAssets },
+	{
+		blockOutputTemplates,
+		pluginOutputTemplates,
+		outputAssets,
+		variantTemplates,
+	},
 	{
 		$schema,
 		apiVersion,
@@ -59,6 +64,7 @@ module.exports = async (
 		customBlockJSON,
 		example,
 		transformer,
+		variant,
 		pluginTemplatesPath: variantPluginTemplatesPath,
 		blockTemplatesPath: variantBlockTemplatesPath,
 		assetsPath: variantAssetsPath,
@@ -118,29 +124,49 @@ module.exports = async (
 		...variantVars,
 	};
 
-	// Check for the pluginTemplates path in the variant
-	if ( variantPluginTemplatesPath === null ) {
-		pluginOutputTemplates = {};
-	} else if ( variantPluginTemplatesPath ) {
-		pluginOutputTemplates = await getOutputTemplates(
-			variantPluginTemplatesPath
-		);
-	}
+	// Check for variant-specific templates
+	// If the variant has pre-processed templates, use them; otherwise fall back to path-based loading
+	if ( variant && variantTemplates && variantTemplates[ variant ] ) {
+		const variantTemplate = variantTemplates[ variant ];
 
-	// Check for the blockTemplatesPath path in the variant
-	if ( variantBlockTemplatesPath === null ) {
-		blockOutputTemplates = {};
-	} else if ( variantBlockTemplatesPath ) {
-		blockOutputTemplates = await getOutputTemplates(
-			variantBlockTemplatesPath
-		);
-	}
+		// null = use default from main template, {} or object = use variant's templates
+		if ( variantTemplate.pluginOutputTemplates !== null ) {
+			pluginOutputTemplates = variantTemplate.pluginOutputTemplates;
+		}
 
-	// Check for the assetsPath
-	if ( variantAssetsPath === null ) {
-		outputAssets = {};
-	} else if ( variantAssetsPath ) {
-		outputAssets = await getOutputAssets( variantAssetsPath );
+		if ( variantTemplate.blockOutputTemplates !== null ) {
+			blockOutputTemplates = variantTemplate.blockOutputTemplates;
+		}
+
+		if ( variantTemplate.outputAssets !== null ) {
+			outputAssets = variantTemplate.outputAssets;
+		}
+	} else {
+		// Fallback: legacy path-based loading for backward compatibility
+		// Check for the pluginTemplates path in the variant
+		if ( variantPluginTemplatesPath === null ) {
+			pluginOutputTemplates = {};
+		} else if ( variantPluginTemplatesPath ) {
+			pluginOutputTemplates = await getOutputTemplates(
+				variantPluginTemplatesPath
+			);
+		}
+
+		// Check for the blockTemplatesPath path in the variant
+		if ( variantBlockTemplatesPath === null ) {
+			blockOutputTemplates = {};
+		} else if ( variantBlockTemplatesPath ) {
+			blockOutputTemplates = await getOutputTemplates(
+				variantBlockTemplatesPath
+			);
+		}
+
+		// Check for the assetsPath
+		if ( variantAssetsPath === null ) {
+			outputAssets = {};
+		} else if ( variantAssetsPath ) {
+			outputAssets = await getOutputAssets( variantAssetsPath );
+		}
 	}
 
 	if ( ! plugin && Object.keys( blockOutputTemplates ) < 1 ) {

package/lib/templates.js

@@ -1,15 +1,14 @@
 /**
  * External dependencies
  */
+const { existsSync } = require( 'fs' );
+const { mkdtemp, readFile } = require( 'fs' ).promises;
+const { tmpdir } = require( 'os' );
+const { join, resolve } = require( 'path' );
 const inquirer = require( '@inquirer/prompts' );
 const { command } = require( 'execa' );
 const glob = require( 'fast-glob' );
-const { resolve } = require( 'path' );
-const { existsSync } = require( 'fs' );
-const { mkdtemp, readFile } = require( 'fs' ).promises;
 const npmPackageArg = require( 'npm-package-arg' );
-const { tmpdir } = require( 'os' );
-const { join } = require( 'path' );
 const rimraf = require( 'rimraf' ).sync;
 
 /**
@@ -153,6 +152,49 @@ const configToTemplate = async ( {
 			blockTemplatesPath || join( __dirname, 'templates', 'block' );
 	}
 
+	// Process variant-specific template paths
+	const variantTemplates = {};
+	for ( const [ variantName, variantConfig ] of Object.entries( variants ) ) {
+		if ( ! variantConfig ) {
+			continue;
+		}
+
+		const variantPluginTemplatesPath = variantConfig.pluginTemplatesPath;
+		const variantBlockTemplatesPath = variantConfig.blockTemplatesPath;
+		const variantAssetsPath = variantConfig.assetsPath;
+
+		let pluginOutputTemplates = null;
+		if ( variantPluginTemplatesPath === null ) {
+			pluginOutputTemplates = {};
+		} else if ( variantPluginTemplatesPath ) {
+			pluginOutputTemplates = await getOutputTemplates(
+				variantPluginTemplatesPath
+			);
+		}
+
+		let blockOutputTemplates = null;
+		if ( variantBlockTemplatesPath === null ) {
+			blockOutputTemplates = {};
+		} else if ( variantBlockTemplatesPath ) {
+			blockOutputTemplates = await getOutputTemplates(
+				variantBlockTemplatesPath
+			);
+		}
+
+		let outputAssets = null;
+		if ( variantAssetsPath === null ) {
+			outputAssets = {};
+		} else if ( variantAssetsPath ) {
+			outputAssets = await getOutputAssets( variantAssetsPath );
+		}
+
+		variantTemplates[ variantName ] = {
+			pluginOutputTemplates,
+			blockOutputTemplates,
+			outputAssets,
+		};
+	}
+
 	return {
 		blockOutputTemplates: blockTemplatesPath
 			? await getOutputTemplates( blockTemplatesPath )
@@ -161,6 +203,7 @@ const configToTemplate = async ( {
 		outputAssets: assetsPath ? await getOutputAssets( assetsPath ) : {},
 		defaultValues,
 		variants,
+		variantTemplates,
 	};
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block",
-	"version": "4.80.2-next.ba3aee3a2.0",
+	"version": "4.81.0",
 	"description": "Generates PHP, JS and CSS code for registering a block for a WordPress plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -38,7 +38,7 @@
 	},
 	"dependencies": {
 		"@inquirer/prompts": "^7.2.0",
-		"@wordpress/lazy-import": "^2.37.1-next.ba3aee3a2.0",
+		"@wordpress/lazy-import": "^2.38.0",
 		"chalk": "^4.0.0",
 		"change-case": "^4.1.2",
 		"check-node-version": "^4.1.0",
@@ -54,5 +54,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "67d2e486fcd40c753591cf911ca0659132f519ca"
+	"gitHead": "50c4c0f51e4797c217946ce42adfaa5eb026f33f"
 }