Build: Improve Gutenberg integration workflow.

This changeset improves the Gutenberg build integration to simplify the developer workflow and reinstore a flow similar to how package dependencies worked before the Gutenberg checkout-and-build approach was introduced.

Key improvements:
* Automatic rebuild on ref change: Adds a new `gutenberg:sync` script that stores a hash of the built ref in `.gutenberg-hash` and only rebuilds when the ref changes.
* Full integration on `npm install`: Running `npm install` now produces a fully working development environment with Gutenberg assets in `src/`.
* Clean Gutenberg checkout: Restores Gutenberg's `package.json` after the build completes.
* Stops copying `.js.map` files to `wp-includes/js/dist` since they reference non-existent paths.
* Remove package.json files from the build folder.
* Avoid closures and use prefixed functions.
* Updates build checks to use `jquery.js` instead of `edit-post.js` as the build indicator.

Props youknowriad, ellatrix, mcsf, dmsnell, ntsekouras, jorgefilipecosta, tobiasbg, peterwilsoncc.
Fixes #64393.


git-svn-id: https://develop.svn.wordpress.org/trunk@61492 602fd350-edb4-49c9-b593-d223f7449a82

Author: youknowriad

.gitignore

@@ -43,6 +43,7 @@ wp-tests-config.php
 /src/wp-includes/class-wp-block-parser-frame.php
 /src/wp-includes/theme.json
 /packagehash.txt
+/.gutenberg-hash
 /artifacts
 /setup.log
 /coverage

Gruntfile.js

@@ -1458,10 +1458,16 @@ module.exports = function(grunt) {
 		} );
 	} );
 
-	grunt.registerTask( 'gutenberg-integrate', 'Complete Gutenberg integration workflow.', [
-		'gutenberg-build',
-		'gutenberg-copy'
-	] );
+	grunt.registerTask( 'gutenberg-sync', 'Syncs Gutenberg checkout and build if ref has changed.', function() {
+		const done = this.async();
+		grunt.util.spawn( {
+			cmd: 'node',
+			args: [ 'tools/gutenberg/sync-gutenberg.js' ],
+			opts: { stdio: 'inherit' }
+		}, function( error ) {
+			done( ! error );
+		} );
+	} );
 
 	grunt.registerTask( 'copy-vendor-scripts', 'Copies vendor scripts from node_modules to wp-includes/js/dist/vendor/.', function() {
 		const done = this.async();
@@ -1896,7 +1902,8 @@ module.exports = function(grunt) {
 			grunt.task.run( [
 				'build:js',
 				'build:css',
-				'gutenberg-integrate',
+				'gutenberg-sync',
+				'gutenberg-copy',
 				'copy-vendor-scripts',
 				'build:certificates'
 			] );
@@ -1906,7 +1913,8 @@ module.exports = function(grunt) {
 				'build:files',
 				'build:js',
 				'build:css',
-				'gutenberg-integrate',
+				'gutenberg-sync',
+				'gutenberg-copy',
 				'copy-vendor-scripts',
 				'replace:source-maps',
 				'verify:build'

package.json

@@ -7,7 +7,7 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"gutenberg": {
-		"ref": "892bfad51d2261f44f3a21f934b1c72bd29a2449"
+		"ref": "7bf80ea84eb8b62eceb1bb3fe82e42163673ca79"
 	},
 	"engines": {
 		"node": ">=20.10.0",
@@ -99,7 +99,7 @@
 		"wicg-inert": "3.1.3"
 	},
 	"scripts": {
-		"postinstall": "npm run gutenberg:checkout",
+		"postinstall": "npm run gutenberg:sync && npm run gutenberg:copy -- --dev",
 		"build": "grunt build",
 		"build:dev": "grunt build --dev",
 		"dev": "grunt watch --dev",
@@ -126,7 +126,7 @@
 		"gutenberg:checkout": "node tools/gutenberg/checkout-gutenberg.js",
 		"gutenberg:build": "node tools/gutenberg/build-gutenberg.js",
 		"gutenberg:copy": "node tools/gutenberg/copy-gutenberg-build.js",
-		"gutenberg:integrate": "npm run gutenberg:checkout && npm run gutenberg:build && npm run gutenberg:copy",
+		"gutenberg:sync": "node tools/gutenberg/sync-gutenberg.js",
 		"vendor:copy": "node tools/vendors/copy-vendors.js",
 		"sync-gutenberg-packages": "grunt sync-gutenberg-packages",
 		"postsync-gutenberg-packages": "grunt wp-packages:sync-stable-blocks && grunt build --dev && grunt build"

src/index.php

@@ -15,7 +15,7 @@
  * Load the actual index.php file if the assets were already built.
  * Note: WPINC is not defined yet, it is defined later in wp-settings.php.
  */
-if ( file_exists( ABSPATH . 'wp-includes/js/dist/edit-post.js' ) ) {
+if ( file_exists( ABSPATH . 'wp-includes/js/jquery/jquery.js' ) && is_dir( ABSPATH . 'wp-includes/build' ) ) {
 	require_once ABSPATH . '_index.php';
 	return;
 }

src/wp-admin/font-library.php

@@ -19,10 +19,10 @@
 }
 
 // Check if Gutenberg build files are available
-if ( ! function_exists( 'font_library_wp_admin_render_page' ) ) {
+if ( ! function_exists( 'wp_font_library_wp_admin_render_page' ) ) {
 	wp_die(
 		'<h1>' . __( 'Font Library is not available.' ) . '</h1>' .
-		'<p>' . __( 'The Font Library requires Gutenberg integration. Please run <code>npm run gutenberg:integrate</code> to build the necessary files.' ) . '</p>',
+		'<p>' . __( 'The Font Library requires Gutenberg build files. Please run <code>npm install</code> to build the necessary files.' ) . '</p>',
 		503
 	);
 }
@@ -33,6 +33,6 @@
 require_once ABSPATH . 'wp-admin/admin-header.php';
 
 // Render the Font Library page
-font_library_wp_admin_render_page();
+wp_font_library_wp_admin_render_page();
 
 require_once ABSPATH . 'wp-admin/admin-footer.php';

src/wp-admin/index.php

@@ -6,7 +6,7 @@
  * please refer to wp-admin/_index.php.
  */
 
-if ( file_exists( __DIR__ . '/../wp-includes/js/dist/edit-post.js' ) ) {
+if ( file_exists( __DIR__ . '/../wp-includes/js/jquery/jquery.js' ) && is_dir( __DIR__ . '/../wp-includes/build' ) ) {
 	require_once __DIR__ . '/_index.php';
 	return;
 }

src/wp-includes/blocks.php

@@ -2421,6 +2421,10 @@ function parse_blocks( $content ) {
 	 */
 	$parser_class = apply_filters( 'block_parser_class', 'WP_Block_Parser' );
 
+	if ( ! class_exists( $parser_class ) ) {
+		return array();
+	}
+
 	$parser = new $parser_class();
 	return $parser->parse( $content );
 }

src/wp-includes/blocks/index.php

@@ -13,9 +13,15 @@
 define( 'BLOCKS_PATH', ABSPATH . WPINC . '/blocks/' );
 
 // Include files required for core blocks registration.
-require BLOCKS_PATH . 'legacy-widget.php';
-require BLOCKS_PATH . 'widget-group.php';
-require BLOCKS_PATH . 'require-dynamic-blocks.php';
+if ( file_exists( BLOCKS_PATH . 'legacy-widget.php' ) ) {
+	require BLOCKS_PATH . 'legacy-widget.php';
+}
+if ( file_exists( BLOCKS_PATH . 'widget-group.php' ) ) {
+	require BLOCKS_PATH . 'widget-group.php';
+}
+if ( file_exists( BLOCKS_PATH . 'require-dynamic-blocks.php' ) ) {
+	require BLOCKS_PATH . 'require-dynamic-blocks.php';
+}
 
 /**
  * Registers core block style handles.
@@ -43,6 +49,9 @@ function register_core_block_style_handles() {
 
 	static $core_blocks_meta;
 	if ( ! $core_blocks_meta ) {
+		if ( ! file_exists( BLOCKS_PATH . 'blocks-json.php' ) ) {
+			return;
+		}
 		$core_blocks_meta = require BLOCKS_PATH . 'blocks-json.php';
 	}
 
@@ -150,6 +159,9 @@ static function ( $file ) use ( $normalized_blocks_path ) {
  * @since 5.5.0
  */
 function register_core_block_types_from_metadata() {
+	if ( ! file_exists( BLOCKS_PATH . 'require-static-blocks.php' ) ) {
+		return;
+	}
 	$block_folders = require BLOCKS_PATH . 'require-static-blocks.php';
 	foreach ( $block_folders as $block_folder ) {
 		register_block_type_from_metadata(
@@ -169,6 +181,9 @@ function register_core_block_types_from_metadata() {
  * @since 6.7.0
  */
 function wp_register_core_block_metadata_collection() {
+	if ( ! file_exists( BLOCKS_PATH . 'blocks-json.php' ) ) {
+		return;
+	}
 	wp_register_block_metadata_collection(
 		BLOCKS_PATH,
 		BLOCKS_PATH . 'blocks-json.php'

src/wp-includes/formatting.php

@@ -5227,6 +5227,11 @@ function wp_pre_kses_less_than_callback( $matches ) {
  * @return string Filtered text to run through KSES.
  */
 function wp_pre_kses_block_attributes( $content, $allowed_html, $allowed_protocols ) {
+	// If the block parser isn't available, skip block attribute filtering.
+	if ( ! class_exists( 'WP_Block_Parser' ) ) {
+		return $content;
+	}
+
 	/*
 	 * `filter_block_content` is expected to call `wp_kses`. Temporarily remove
 	 * the filter to avoid recursion.

src/wp-includes/script-loader.php

@@ -281,7 +281,8 @@ function wp_default_packages_scripts( $scripts ) {
 	 *     'annotations.js' => array('dependencies' => array(...), 'version' => '...'),
 	 *     'api-fetch.js' => array(...
 	 */
-	$assets = include ABSPATH . WPINC . "/assets/script-loader-packages{$suffix}.php";
+	$assets_file = ABSPATH . WPINC . "/assets/script-loader-packages{$suffix}.php";
+	$assets      = file_exists( $assets_file ) ? include $assets_file : array();
 
 	foreach ( $assets as $file_name => $package_data ) {
 		$basename = str_replace( $suffix . '.js', '', basename( $file_name ) );