@wordpress/build 0.4.1-next.6deb34194.0 → 0.4.1-next.76cff8c98.0

package/src/dependency-graph.mjs

@@ -5,30 +5,17 @@
  * and determine the correct build order using topological sorting.
  */
 
-/**
- * External dependencies
- */
-import toposort from 'toposort';
-
-/**
- * Node dependencies
- */
 import path from 'path';
-
-/**
- * Internal dependencies
- */
-import { getPackageInfo, getPackageInfoFromFile } from './package-utils.mjs';
+import { getPackageInfoFromFile } from './package-utils.mjs';
 
 /**
  * Check if a package is a script or script module.
  * A package is a script if it has wpScript or wpScriptModuleExports.
  *
- * @param {string} packageName The full package name (e.g., '@wordpress/blocks').
+ * @param {import('./package-utils.mjs').PackageJson|null|undefined} packageJson The package.json object.
  * @return {boolean} True if the package is a script or script module.
  */
-function isScriptOrModule( packageName ) {
-	const packageJson = getPackageInfo( packageName );
+function isScriptOrModule( packageJson ) {
 	if ( ! packageJson ) {
 		return false;
 	}
@@ -36,13 +23,12 @@ function isScriptOrModule( packageName ) {
 }
 
 /**
- * Get package dependencies from a package.json file.
+ * Get package dependencies from a package.json object.
  *
- * @param {string} packageName The full package name (e.g., '@wordpress/blocks').
+ * @param {import('./package-utils.mjs').PackageJson|null|undefined} packageJson The package.json object.
  * @return {string[]} Array of package names this package depends on.
  */
-function getDependencies( packageName ) {
-	const packageJson = getPackageInfo( packageName );
+function getDependencies( packageJson ) {
 	if ( ! packageJson ) {
 		return [];
 	}
@@ -52,78 +38,15 @@ function getDependencies( packageName ) {
 	return Object.keys( deps );
 }
 
-/**
- * Build a dependency graph for the given packages.
- *
- * @param {string[]} packages Array of full package names to analyze.
- * @return {Array<[string, string]>} Array of [dependent, dependency] edges.
- */
-function buildDependencyGraph( packages ) {
-	/** @type {Array<[string, string]>} */
-	const edges = [];
-	const packagesSet = new Set( packages );
-
-	for ( const packageName of packages ) {
-		const deps = getDependencies( packageName );
-
-		// Only include edges where both packages are in our list
-		for ( const dep of deps ) {
-			if ( packagesSet.has( dep ) ) {
-				edges.push( [ packageName, dep ] );
-			}
-		}
-
-		// If package has no dependencies in our list, add a self-reference
-		// This ensures it appears in the sorted output
-		if ( deps.filter( ( dep ) => packagesSet.has( dep ) ).length === 0 ) {
-			edges.push( [ packageName, packageName ] );
-		}
-	}
-
-	return edges;
-}
-
-/**
- * Sort packages in topological order based on their dependencies.
- *
- * @param {string[]} packages Array of full package names to sort.
- * @return {string[]} Sorted array where dependencies come before dependents.
- */
-function topologicalSort( packages ) {
-	const edges = buildDependencyGraph( packages );
-
-	try {
-		// toposort returns dependencies first, then dependents
-		/** @type {Array<string>} */
-		const sorted = toposort( edges );
-
-		// Filter to only include packages in our input list
-		// (toposort might include extra nodes)
-		const packagesSet = new Set( packages );
-		return sorted.filter( ( pkg ) => packagesSet.has( pkg ) );
-	} catch ( error ) {
-		if ( error instanceof Error && error.message.includes( 'cyclic' ) ) {
-			console.error(
-				'❌ Cyclic dependency detected in packages:',
-				error.message
-			);
-			throw new Error(
-				'Cannot build packages due to cyclic dependencies'
-			);
-		}
-		throw error;
-	}
-}
-
 /**
  * Group packages by dependency depth level.
  * Packages at the same depth level can be built in parallel.
  *
- * @param {string[]} packages Array of full package names to group.
- * @return {string[][]} Array of arrays, where each inner array is a depth level.
+ * @param {Map<string, import('./package-utils.mjs').PackageJson>} packages Map of package names to package.json objects.
+ * @return {string[][]} Array of arrays, where each inner array is a depth level containing package names.
  */
 function groupByDepth( packages ) {
-	const packagesSet = new Set( packages );
+	const packagesSet = new Set( packages.keys() );
 	const depths = new Map();
 	const visited = new Set();
 
@@ -145,7 +68,8 @@ function groupByDepth( packages ) {
 
 		visited.add( packageName );
 
-		const deps = getDependencies( packageName );
+		const packageJson = packages.get( packageName );
+		const deps = getDependencies( packageJson );
 		const relevantDeps = deps.filter( ( dep ) => packagesSet.has( dep ) );
 
 		if ( relevantDeps.length === 0 ) {
@@ -163,7 +87,7 @@ function groupByDepth( packages ) {
 	}
 
 	// Calculate depth for all packages
-	for ( const packageName of packages ) {
+	for ( const packageName of packages.keys() ) {
 		calculateDepth( packageName );
 	}
 
@@ -172,7 +96,7 @@ function groupByDepth( packages ) {
 	const maxDepth = Math.max( ...depths.values() );
 
 	for ( let depth = 0; depth <= maxDepth; depth++ ) {
-		const packagesAtDepth = packages.filter(
+		const packagesAtDepth = Array.from( packages.keys() ).filter(
 			( pkg ) => depths.get( pkg ) === depth
 		);
 		if ( packagesAtDepth.length > 0 ) {
@@ -186,15 +110,15 @@ function groupByDepth( packages ) {
 /**
  * Get packages that depend on a given package (reverse dependencies).
  *
- * @param {string}   packageName The full package name to find dependents of.
- * @param {string[]} allPackages Array of all full package names to search.
+ * @param {string}                                                 packageName       The full package name to find dependents of.
+ * @param {Map<string, import('./package-utils.mjs').PackageJson>} workspacePackages Map of workspace package names to package.json objects.
  * @return {string[]} Array of package names that depend on the given package.
  */
-function getReverseDependencies( packageName, allPackages ) {
+function getReverseDependencies( packageName, workspacePackages ) {
 	const dependents = [];
 
-	for ( const pkg of allPackages ) {
-		const deps = getDependencies( pkg );
+	for ( const [ pkg, packageJson ] of workspacePackages ) {
+		const deps = getDependencies( packageJson );
 		if ( deps.includes( packageName ) ) {
 			dependents.push( pkg );
 		}
@@ -218,14 +142,15 @@ function getReverseDependencies( packageName, allPackages ) {
  * - D (script) depends on C
  * Result: Only C needs rebundling (D stops at C boundary)
  *
- * @param {string}   changedPackage The full package name that changed.
- * @param {string[]} allPackages    Array of all full package names.
+ * @param {string}                                                 changedPackage    The full package name that changed.
+ * @param {Map<string, import('./package-utils.mjs').PackageJson>} workspacePackages Map of workspace package names to package.json objects.
  * @return {string[]} Array of script/module package names to rebundle.
  */
-function findScriptsToRebundle( changedPackage, allPackages ) {
+function findScriptsToRebundle( changedPackage, workspacePackages ) {
 	// If the changed package itself is a script/module, no need to find others
 	// (it will be rebuilt by the regular watch logic)
-	if ( isScriptOrModule( changedPackage ) ) {
+	const changedPackageJson = workspacePackages.get( changedPackage );
+	if ( isScriptOrModule( changedPackageJson ) ) {
 		return [];
 	}
 
@@ -244,13 +169,14 @@ function findScriptsToRebundle( changedPackage, allPackages ) {
 		// Get all packages that depend on the current package
 		const dependents = getReverseDependencies(
 			currentPackage,
-			allPackages
+			workspacePackages
 		);
 
 		for ( const dependent of dependents ) {
 			// If this dependent is a script/module, add it to the result
 			// but don't traverse further (stop at script boundaries)
-			if ( isScriptOrModule( dependent ) ) {
+			const dependentPackageJson = workspacePackages.get( dependent );
+			if ( isScriptOrModule( dependentPackageJson ) ) {
 				scriptsToRebundle.add( dependent );
 			} else if ( ! visited.has( dependent ) ) {
 				// If it's a bundled package, continue traversing
@@ -296,21 +222,22 @@ function getRouteDependencies( rootDir, routeName ) {
  * - home (route) depends on B
  * Result: Both C and home need rebuilding
  *
- * @param {string}   changedPackage The full package name that changed.
- * @param {string[]} allPackages    Array of all full package names.
- * @param {string}   rootDir        Root directory path.
- * @param {string[]} allRoutes      Array of all route names.
+ * @param {string}                                                 changedPackage    The full package name that changed.
+ * @param {Map<string, import('./package-utils.mjs').PackageJson>} workspacePackages Map of workspace package names to package.json objects.
+ * @param {string}                                                 rootDir           Root directory path.
+ * @param {string[]}                                               allRoutes         Array of all route names.
  * @return {string[]} Array of route names to rebuild.
  */
 function findRoutesToRebuild(
 	changedPackage,
-	allPackages,
+	workspacePackages,
 	rootDir,
 	allRoutes
 ) {
 	// If the changed package itself is a script/module, routes won't be affected
 	// (routes depend on bundled packages, not scripts/modules)
-	if ( isScriptOrModule( changedPackage ) ) {
+	const changedPackageJson = workspacePackages.get( changedPackage );
+	if ( isScriptOrModule( changedPackageJson ) ) {
 		return [];
 	}
 
@@ -337,14 +264,15 @@ function findRoutesToRebuild(
 		// Get all packages that depend on the current package
 		const dependents = getReverseDependencies(
 			currentPackage,
-			allPackages
+			workspacePackages
 		);
 
 		for ( const dependent of dependents ) {
 			// If this dependent is a script/module, don't traverse further
 			// (stop at script boundaries)
+			const dependentPackageJson = workspacePackages.get( dependent );
 			if (
-				! isScriptOrModule( dependent ) &&
+				! isScriptOrModule( dependentPackageJson ) &&
 				! visited.has( dependent )
 			) {
 				// If it's a bundled package, continue traversing
@@ -358,8 +286,6 @@ function findRoutesToRebuild(
 
 export {
 	getDependencies,
-	buildDependencyGraph,
-	topologicalSort,
 	groupByDepth,
 	isScriptOrModule,
 	getReverseDependencies,

package/src/package-utils.mjs

@@ -1,8 +1,9 @@
 /**
  * External dependencies
  */
-import { readFileSync } from 'fs';
-import { fileURLToPath } from 'url';
+import { readFileSync, existsSync } from 'fs';
+import { createRequire } from 'module';
+import path from 'path';
 
 /**
  * Shared cache for package.json files to avoid redundant reads.
@@ -40,21 +41,55 @@ const packagePathCache = new Map();
  * @typedef {PackageJson & { route: { path: string; page?: string } }} RoutePackageJson
  */
 
+/**
+ * Find the nearest package root directory by walking up from the given directory.
+ * Looks for a directory containing package.json.
+ *
+ * @param {string} startDir The directory to start searching from.
+ * @return {string} The package root directory, or the start directory if no package.json found.
+ */
+function findPackageRoot( startDir ) {
+	let current = startDir;
+	const root = path.parse( current ).root;
+
+	while ( current !== root ) {
+		const packageJsonPath = path.join( current, 'package.json' );
+		if ( existsSync( packageJsonPath ) ) {
+			return current;
+		}
+		current = path.dirname( current );
+	}
+
+	// Fallback to the start directory if no package.json found
+	return startDir;
+}
+
 /**
  * Get package.json info using Node's module resolution.
- * Resolves the package using import.meta.resolve and reads its package.json.
+ * Resolves packages from the appropriate context to support both workspace packages
+ * and external dependencies in pnpm/yarn/npm workspaces.
  *
- * @param {string} fullPackageName The full package name (e.g., '@wordpress/blocks').
+ * @param {string}      fullPackageName The full package name (e.g., '@wordpress/blocks').
+ * @param {string|null} resolveDir      Optional directory context for resolution (from esbuild).
  * @return {PackageJson|null} Package.json object or null if not found.
  */
-export function getPackageInfo( fullPackageName ) {
-	if ( packageJsonCache.has( fullPackageName ) ) {
-		return packageJsonCache.get( fullPackageName );
+export function getPackageInfo( fullPackageName, resolveDir = null ) {
+	// Determine the package root for cache keying
+	const packageRoot = resolveDir
+		? findPackageRoot( resolveDir )
+		: process.cwd();
+	const cacheKey = `${ fullPackageName }@${ packageRoot }`;
+
+	if ( packageJsonCache.has( cacheKey ) ) {
+		return packageJsonCache.get( cacheKey );
 	}
 
-	const resolved = import.meta.resolve( `${ fullPackageName }/package.json` );
-	const result = getPackageInfoFromFile( fileURLToPath( resolved ) );
-	packageJsonCache.set( fullPackageName, result );
+	// Resolve from the package root context to get correct versions
+	const contextPath = path.join( packageRoot, 'package.json' );
+	const require = createRequire( contextPath );
+	const resolved = require.resolve( `${ fullPackageName }/package.json` );
+	const result = getPackageInfoFromFile( resolved );
+	packageJsonCache.set( cacheKey, result );
 
 	return result;
 }

package/src/php-generator.mjs

@@ -15,10 +15,11 @@ const __dirname = path.dirname( fileURLToPath( import.meta.url ) );
 /**
  * Get PHP replacements from root package.json.
  *
- * @param {string} rootDir Root directory path.
- * @return {Promise<Record<string, string>>} Replacements object with {{PREFIX}}, {{VERSION}}, {{VERSION_CONSTANT}}.
+ * @param {string} rootDir           Root directory path.
+ * @param {string} baseUrlExpression PHP expression for base URL (e.g. "includes_url( 'build' )").
+ * @return {Promise<Record<string, string>>} Replacements object with {{PREFIX}}, {{VERSION}}, {{BASE_URL}}.
  */
-export async function getPhpReplacements( rootDir ) {
+export async function getPhpReplacements( rootDir, baseUrlExpression ) {
 	const rootPackageJson = getPackageInfoFromFile(
 		path.join( rootDir, 'package.json' )
 	);
@@ -29,13 +30,11 @@ export async function getPhpReplacements( rootDir ) {
 	// @ts-expect-error specific override to package.json
 	const name = rootPackageJson.wpPlugin?.name || 'gutenberg';
 	const version = rootPackageJson.version;
-	const versionConstant =
-		name.toUpperCase().replace( /-/g, '_' ) + '_VERSION';
 
 	return {
 		'{{PREFIX}}': name,
 		'{{VERSION}}': version,
-		'{{VERSION_CONSTANT}}': versionConstant,
+		'{{BASE_URL}}': baseUrlExpression,
 	};
 }
 

package/src/route-utils.mjs

@@ -30,9 +30,9 @@ export function getAllRoutes( rootDir ) {
 
 /**
  * @typedef {Object} RouteMetadata
- * @property {string}      name Route name.
- * @property {string}      path Route path.
- * @property {string|null} page Page slug this route belongs to.
+ * @property {string}   name  Route name.
+ * @property {string}   path  Route path.
+ * @property {string[]} pages Array of page slugs this route belongs to.
  */
 
 /**
@@ -54,10 +54,19 @@ export function getRouteMetadata( rootDir, routeName ) {
 		return null;
 	}
 
+	// Normalize page field to always be an array
+	// Supports both "page": "string" and "page": ["array"]
+	const pageField = routePackageJson.route.page;
+	/** @type {string[]} */
+	let pages = [];
+	if ( pageField ) {
+		pages = Array.isArray( pageField ) ? pageField : [ pageField ];
+	}
+
 	return {
 		name: routeName,
 		path: routePackageJson.route.path,
-		page: routePackageJson.route.page || null,
+		pages,
 	};
 }
 

package/src/wordpress-externals-plugin.mjs

@@ -1,15 +1,46 @@
 /**
  * External dependencies
  */
-import { writeFile, mkdir } from 'fs/promises';
+import { writeFile, mkdir, readFile } from 'fs/promises';
 import path from 'path';
 import { camelCase } from 'change-case';
+import { createHash } from 'crypto';
 
 /**
  * Internal dependencies
  */
 import { getPackageInfo } from './package-utils.mjs';
 
+/**
+ * Generate a content hash from file contents.
+ * Uses SHA256 algorithm for broad compatibility across Node.js versions.
+ *
+ * @param {string[]} filePaths - Absolute paths to files to hash
+ * @param {string}   algorithm - Hash algorithm (default: 'sha256')
+ * @param {number}   length    - Hash length (default: 20)
+ * @return {Promise<string>} Content hash string
+ */
+async function generateContentHash(
+	filePaths,
+	algorithm = 'sha256',
+	length = 20
+) {
+	const hashBuilder = createHash( algorithm );
+
+	// Sort paths for deterministic ordering
+	const sortedPaths = [ ...filePaths ].sort();
+
+	// Read and hash each file
+	for ( const filePath of sortedPaths ) {
+		const content = await readFile( filePath );
+		hashBuilder.update( content );
+	}
+
+	// Generate hash as hex string and truncate
+	const fullHash = hashBuilder.digest( 'hex' );
+	return fullHash.slice( 0, length );
+}
+
 /**
  * Create WordPress externals plugin for esbuild.
  * This plugin handles WordPress package externals and vendor libraries,
@@ -33,12 +64,14 @@ export function createWordpressExternalsPlugin(
 	 * @param {string}        assetName         Base name for the asset file (e.g., 'index.min').
 	 * @param {string}        buildFormat       Build format: 'iife' for classic scripts, 'esm' for modules.
 	 * @param {Array<string>} extraDependencies Additional dependencies to include in the asset file.
+	 * @param {boolean}       generateAssetFile Whether to generate the .asset.php file. Default true.
 	 * @return {Object} esbuild plugin object.
 	 */
 	return function wordpressExternalsPlugin(
 		assetName = 'index.min',
 		buildFormat = 'iife',
-		extraDependencies = []
+		extraDependencies = [],
+		generateAssetFile = true
 	) {
 		return {
 			name: 'wordpress-externals',
@@ -180,7 +213,10 @@ export function createWordpressExternalsPlugin(
 							const shortName = parts[ 1 ];
 							const handle = `${ externalConfig.handlePrefix }-${ shortName }`;
 
-							const packageJson = getPackageInfo( packageName );
+							const packageJson = getPackageInfo(
+								packageName,
+								args.resolveDir
+							);
 
 							if ( ! packageJson ) {
 								return undefined;
@@ -281,17 +317,6 @@ export function createWordpressExternalsPlugin(
 							return;
 						}
 
-						// Merge discovered dependencies with extra dependencies
-						const allDependencies = new Set( [
-							...dependencies,
-							...extraDependencies,
-						] );
-
-						const dependenciesString = Array.from( allDependencies )
-							.sort()
-							.map( ( dep ) => `'${ dep }'` )
-							.join( ', ' );
-
 						// Format module dependencies as array of arrays with 'id' and 'import' keys
 						const moduleDependenciesArray = Array.from(
 							moduleDependencies.entries()
@@ -307,7 +332,44 @@ export function createWordpressExternalsPlugin(
 								? moduleDependenciesArray.join( ', ' )
 								: '';
 
-						const version = Date.now();
+						// Only generate asset file if requested
+						if ( ! generateAssetFile ) {
+							return;
+						}
+
+						// Merge discovered dependencies with extra dependencies
+						const allDependencies = new Set( [
+							...dependencies,
+							...extraDependencies,
+						] );
+
+						const dependenciesString = Array.from( allDependencies )
+							.sort()
+							.map( ( dep ) => `'${ dep }'` )
+							.join( ', ' );
+
+						// Determine output file path from build config
+						let outputFilePath;
+						if ( build.initialOptions.outfile ) {
+							outputFilePath = build.initialOptions.outfile;
+						} else if ( build.initialOptions.outdir ) {
+							// Construct expected output filename from assetName
+							// e.g., assetName='index.min' -> 'index.min.js'
+							outputFilePath = path.join(
+								build.initialOptions.outdir,
+								`${ assetName }.js`
+							);
+						}
+
+						// Collect files to hash
+						const filesToHash = [];
+						if ( outputFilePath ) {
+							filesToHash.push( outputFilePath );
+						}
+
+						// Generate content-based version hash
+						const version =
+							await generateContentHash( filesToHash );
 
 						const parts = [
 							`'dependencies' => array(${ dependenciesString })`,

package/templates/constants.php.template

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Plugin constants - Auto-generated by build process.
+ * Do not edit this file manually.
+ *
+ * Returns an array of constants for use in other templates.
+ *
+ * @package {{PREFIX}}
+ */
+
+return array(
+	'version' => '{{VERSION}}',
+	'build_url' => {{BASE_URL}},
+);

package/templates/index.php.template

@@ -6,12 +6,6 @@
  * @package {{PREFIX}}
  */
 
-// Load version constant.
-$version_file = __DIR__ . '/version.php';
-if ( file_exists( $version_file ) ) {
-	require_once $version_file;
-}
-
 // Load script module registration.
 $modules_file = __DIR__ . '/modules.php';
 if ( file_exists( $modules_file ) ) {

package/templates/module-registration.php.template

@@ -11,6 +11,8 @@ if ( ! function_exists( '{{PREFIX}}_register_script_modules' ) ) {
 	 * Register all script modules.
 	 */
 	function {{PREFIX}}_register_script_modules() {
+		// Load build constants
+		$build_constants = require __DIR__ . '/constants.php';
 		$modules_dir = __DIR__ . '/modules';
 		$modules_file = $modules_dir . '/index.php';
 
@@ -19,7 +21,7 @@ if ( ! function_exists( '{{PREFIX}}_register_script_modules' ) ) {
 		}
 
 		$modules = require $modules_file;
-		$base_url = plugins_url( 'build/modules/', dirname( __FILE__ ) );
+		$base_url = $build_constants['build_url'] . 'modules/';
 		$extension = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.js' : '.min.js';
 
 		foreach ( $modules as $module ) {