Merge branch 'trunk' into add-fatal-error-to-email

Author: tlloancy

.github/workflows/check-built-files.yml

@@ -23,11 +23,14 @@ on:
       - '.nvmrc'
       - 'Gruntfile.js'
       - 'webpack.config.js'
+      - 'tools/gutenberg/**'
+      - 'tools/vendors/**'
       - 'tools/webpack/**'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/check-built-files.yml'
+      - '.github/workflows/reusable-check-built-files.yml'
       # Changes to the default themes should be handled by the themes workflows.
       - '!src/wp-content/themes/twenty**'
 

.github/workflows/end-to-end-tests.yml

@@ -28,6 +28,8 @@ on:
       - '.nvmrc'
       - 'Gruntfile.js'
       - 'webpack.config.js'
+      - 'tools/gutenberg/**'
+      - 'tools/vendors/**'
       - 'tools/webpack/**'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'

.github/workflows/javascript-tests.yml

@@ -26,6 +26,8 @@ on:
       - '.nvmrc'
       - 'Gruntfile.js'
       - 'webpack.config.js'
+      - 'tools/gutenberg/**'
+      - 'tools/vendors/**'
       - 'tools/webpack/**'
       # This file configures ESLint. Changes could affect the outcome.
       - '.eslintignore'

.github/workflows/javascript-type-checking.yml

@@ -21,6 +21,7 @@ on:
       # These files configure npm. Changes could affect the outcome.
       - 'package*.json'
       - '.nvmrc'
+      - '.npmrc'
       # This file configures TypeScript. Changes could affect the outcome.
       - 'tsconfig.json'
       # This directory contains TypeScript definitions. Changes could affect the outcome.

.github/workflows/local-docker-environment.yml

@@ -17,6 +17,8 @@ on:
       - 'package*.json'
       - 'Gruntfile.js'
       - 'webpack.config.js'
+      - 'tools/gutenberg/**'
+      - 'tools/vendors/**'
       - 'tools/webpack/**'
       - '.npmrc'
       - '.nvmrc'
@@ -106,6 +108,7 @@ jobs:
           - db-version: '9.2'
           - db-version: '9.3'
           - db-version: '9.4'
+          - db-version: '9.5'
           # No PHP 8.5 + Memcached support yet.
           - php: '8.5'
             memcached: true

.github/workflows/performance.yml

@@ -28,6 +28,8 @@ on:
       - '.nvmrc'
       - 'Gruntfile.js'
       - 'webpack.config.js'
+      - 'tools/gutenberg/**'
+      - 'tools/vendors/**'
       - 'tools/webpack/**'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'

.github/workflows/test-build-processes.yml

@@ -26,6 +26,8 @@ on:
       - '.nvmrc'
       - 'Gruntfile.js'
       - 'webpack.config.js'
+      - 'tools/gutenberg/**'
+      - 'tools/vendors/**'
       - 'tools/webpack/**'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'

.gitignore

@@ -33,15 +33,16 @@ wp-tests-config.php
 /src/wp-admin/css/colors/*/*.css
 /src/wp-admin/js
 /src/wp-includes/assets/*
+!/src/wp-includes/assets/icon-library-manifest.php
+!/src/wp-includes/assets/script-loader-packages.php
+!/src/wp-includes/assets/script-modules-packages.php
 /src/wp-includes/js
 /src/wp-includes/css/dist
 /src/wp-includes/css/*.min.css
 /src/wp-includes/css/*-rtl.css
-/src/wp-includes/blocks/*
-!/src/wp-includes/blocks/index.php
-/src/wp-includes/icons
-/src/wp-includes/build
-/src/wp-includes/theme.json
+/src/wp-includes/blocks/**/*.css
+/src/wp-includes/blocks/**/*.js
+/src/wp-includes/blocks/**/*.js.map
 /packagehash.txt
 /.gutenberg-hash
 /artifacts

Gruntfile.js

@@ -55,6 +55,8 @@ module.exports = function(grunt) {
 			'wp-includes/css/dist',
 			'wp-includes/blocks/**/*',
 			'!wp-includes/blocks/index.php',
+			'wp-includes/images/icon-library',
+			// Old location kept temporarily to ensure they are cleaned up.
 			'wp-includes/icons',
 		],
 
@@ -601,7 +603,7 @@ module.exports = function(grunt) {
 				src: 'vendor/composer/ca-bundle/res/cacert.pem',
 				dest: SOURCE_DIR + 'wp-includes/certificates/ca-bundle.crt'
 			},
-			// Gutenberg PHP infrastructure files (routes.php, pages.php, constants.php, pages/, routes/).
+			// Gutenberg PHP infrastructure files (routes.php, pages.php, constants.php, pages/).
 			'gutenberg-php': {
 				options: {
 					process: function( content ) {
@@ -620,18 +622,32 @@ module.exports = function(grunt) {
 						'pages.php',
 						'constants.php',
 						'pages/**/*.php',
-						'routes/**/*.php',
 					],
 					dest: WORKING_DIR + 'wp-includes/build/',
 				} ],
 			},
+			/*
+			 * Only copy files relevant to the routes specified in the registry file.
+			 *
+			 * While the registry file does not contain any experimental routes, the `gutenberg/build/routes` directory
+			 * includes the files for all registered routes. Only the files related to the routes specified in the
+			 * registry should be included in the WordPress build.
+			 *
+			 * The `src` list is populated at task runtime by `routes:setup`, which reads the registry after
+			 * `gutenberg:download` has run. See the `routes:setup` task registration for implementation details.
+			 */
+			routes: {
+				expand: true,
+				cwd: 'gutenberg/build',
+				src: [],
+				dest: WORKING_DIR + 'wp-includes/build/',
+			},
 			'gutenberg-js': {
 				files: [ {
 					expand: true,
 					cwd: 'gutenberg/build',
 					src: [
 						'pages/**/*.js',
-						'routes/**/*.js',
 					],
 					dest: WORKING_DIR + 'wp-includes/build/',
 				} ],
@@ -643,9 +659,7 @@ module.exports = function(grunt) {
 					src: [
 						'**/*',
 						'!**/*.map',
-						// Skip non-minified VIPS files — they are ~16MB of inlined WASM
-						// with no debugging value over the minified versions.
-						'!vips/!(*.min).js',
+						'!vips/**',
 					],
 					dest: WORKING_DIR + 'wp-includes/js/dist/script-modules/',
 				} ],
@@ -654,7 +668,12 @@ module.exports = function(grunt) {
 				files: [ {
 					expand: true,
 					cwd: 'gutenberg/build/styles',
-					src: [ '**/*', '!**/*.map' ],
+					src: [
+						'**/*',
+						'!**/*.map',
+						// Per-block CSS is copied to wp-includes/blocks/ by tools/gutenberg/copy.js.
+						'!block-library/*/**',
+					],
 					dest: WORKING_DIR + 'wp-includes/css/dist/',
 				} ],
 			},
@@ -682,31 +701,35 @@ module.exports = function(grunt) {
 					},
 				],
 			},
-			'gutenberg-icons': {
+			'icon-library-images': {
+				files: [ {
+					expand: true,
+					cwd: 'gutenberg/packages/icons/src/library',
+					src: '*.svg',
+					dest: WORKING_DIR + 'wp-includes/images/icon-library',
+				} ],
+			},
+			'icon-library-manifest': {
 				options: {
-					process: function( content, srcpath ) {
-						// Remove the 'gutenberg' text domain from _x() calls in manifest.php.
-						if ( path.basename( srcpath ) === 'manifest.php' ) {
-							return content.replace(
+					process: function( content ) {
+						return content
+							// Remove the 'gutenberg' text domain from _x() calls.
+							.replace(
 								/_x\(\s*([^,]+),\s*([^,]+),\s*['"]gutenberg['"]\s*\)/g,
 								'_x( $1, $2 )'
+							)
+							// Strip the 'library/' prefix from filePath values so they
+							// resolve correctly relative to wp-includes/images/icon-library/.
+							.replace(
+								/'filePath' => 'library\//g,
+								'\'filePath\' => \''
 							);
-						}
-						return content;
 					}
 				},
-				files: [
-					{
-						src: 'gutenberg/packages/icons/src/manifest.php',
-						dest: WORKING_DIR + 'wp-includes/icons/manifest.php',
-					},
-					{
-						expand: true,
-						cwd: 'gutenberg/packages/icons/src/library',
-						src: '*.svg',
-						dest: WORKING_DIR + 'wp-includes/icons/library/',
-					},
-				],
+				files: [ {
+					src: 'gutenberg/packages/icons/src/manifest.php',
+					dest: WORKING_DIR + 'wp-includes/assets/icon-library-manifest.php',
+				} ],
 			},
 		},
 		sass: {
@@ -2052,19 +2075,64 @@ module.exports = function(grunt) {
 			} );
 	} );
 
+	grunt.registerTask( 'routes:setup', 'Reads the routes registry and configures the copy:routes task.', function() {
+		const registryPath = 'gutenberg/build/routes/registry.php';
+		let registryContent;
+		try {
+			registryContent = fs.readFileSync( registryPath, 'utf8' );
+		} catch ( e ) {
+			grunt.fatal(
+				'Route registry not found at ' + registryPath + '. Run `grunt gutenberg:download` first.'
+			);
+		}
+		const namePattern = /'name'\s*=>\s*'([^']+)'/g;
+		const routeNames = [];
+		let match;
+		while ( ( match = namePattern.exec( registryContent ) ) !== null ) {
+			routeNames.push( match[ 1 ] );
+		}
+
+		if ( routeNames.length === 0 ) {
+			grunt.fatal(
+				'No route names found in ' + registryPath + '. The format of the file may have changed.'
+			);
+		}
+
+		const validName = /^[A-Za-z0-9_-]+$/;
+		routeNames.forEach( function( name ) {
+			if ( ! validName.test( name ) ) {
+				grunt.fatal(
+					'Invalid route name \'' + name + '\' in ' + registryPath + '. Expected only letters, digits, hyphens, and underscores.'
+				);
+			}
+		} );
+
+		grunt.config( [ 'copy', 'routes', 'src' ], [ 'routes/registry.php' ].concat(
+			routeNames.flatMap( function( name ) {
+				return [
+					'routes/' + name + '/**/*.php',
+					'routes/' + name + '/**/*.js',
+				];
+			} )
+		) );
+	} );
+
 	grunt.registerTask( 'build:gutenberg', [
 		'copy:gutenberg-php',
+		'routes:setup',
+		'copy:routes',
 		'copy:gutenberg-js',
 		'gutenberg:copy',
 		'copy:gutenberg-modules',
 		'copy:gutenberg-styles',
 		'copy:gutenberg-theme-json',
-		'copy:gutenberg-icons',
+		'copy:icon-library-images',
+		'copy:icon-library-manifest',
 	] );
 
 	grunt.registerTask( 'build', function() {
 		var done = this.async();
-		
+
 		grunt.util.spawn( {
 			grunt: true,
 			args: [ 'clean', '--dev' ],

package.json

@@ -7,7 +7,7 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"gutenberg": {
-		"sha": "487a096a9782ba6110a7686d7b4b2d0c55ed1b06",
+		"sha": "3edafcc90fc4520939d69279e26ace69390582be",
 		"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
 	},
 	"engines": {