Site Health: Add missing dashicons class to error span fixes #65014

.github/workflows/test-old-branches.yml

@@ -7,7 +7,7 @@ on:
       - trunk
     paths:
       - '.github/workflows/test-old-branches.yml'
-      - '.github/workflows/reusable-phpunit-tests-v[1-2].yml'
+      - '.github/workflows/reusable-phpunit-tests-v[1-3].yml'
   # Run twice a month on the 1st and 15th at 00:00 UTC.
   schedule:
     - cron: '0 0 1 * *'

Gruntfile.js

@@ -41,18 +41,43 @@ module.exports = function(grunt) {
 			'wp-admin/css/colors/**/*.css',
 		],
 
-		// Built js files, in /src or /build.
+		// Built JavaScript files that do not belong to a more specific group.
 		jsFiles = [
 			'wp-admin/js/',
-			'wp-includes/js/',
+			'wp-includes/js/*',
+			/*
+			 * This directory has shared responsibility and is managed through
+			 * gutenbergUnversionedFiles, webpackFiles, and copy:vendor-js.
+			 */
+			'!wp-includes/js/dist',
+			'wp-includes/js/dist/vendor/*.js',
+			// Managed by the Gutenberg-related tasks.
+			'!wp-includes/js/dist/vendor/react-jsx-runtime*',
+		],
+
+		// Files sourced from the Gutenberg repository built asset that are ignored by version control.
+		gutenbergUnversionedFiles = [
+			SOURCE_DIR + 'wp-includes/blocks/*/*.css',
+			SOURCE_DIR + 'wp-includes/css/dist',
+			SOURCE_DIR + 'wp-includes/js/dist/*.js',
+			SOURCE_DIR + 'wp-includes/js/dist/script-modules',
+			SOURCE_DIR + 'wp-includes/js/dist/vendor/react-jsx-runtime*',
 		],
 
-		// All files copied from the Gutenberg repository excluded from version control.
-		gutenbergFiles = [
-			'wp-includes/js/dist',
-			'wp-includes/css/dist',
-			// Old location kept temporarily to ensure they are cleaned up.
-			'wp-includes/icons',
+		// Files sourced from the Gutenberg repository built asset that are managed through version control.
+		gutenbergVersionedFiles = [
+			// Block assets (block.json, top-level PHP, nested PHP helpers).
+			SOURCE_DIR + 'wp-includes/blocks/*',
+			'!' + SOURCE_DIR + 'wp-includes/blocks/index.php',
+			SOURCE_DIR + 'wp-includes/images/icon-library',
+			SOURCE_DIR + 'wp-includes/theme.json',
+			SOURCE_DIR + 'wp-includes/theme-i18n.json',
+			// Routes and pages.
+			SOURCE_DIR + 'wp-includes/build',
+			// PHP manifests generated by gutenberg:copy.
+			SOURCE_DIR + 'wp-includes/assets/icon-library-manifest.php',
+			SOURCE_DIR + 'wp-includes/assets/script-loader-packages.php',
+			SOURCE_DIR + 'wp-includes/assets/script-modules-packages.php',
 		],
 
 		// All files built by Webpack, in /src or /build.
@@ -241,10 +266,32 @@ module.exports = function(grunt) {
 				return setFilePath( WORKING_DIR, file );
 			} ),
 
-			// Clean files built by the tools/gutenberg scripts.
-			gutenberg: gutenbergFiles.map( function( file ) {
-				return setFilePath( WORKING_DIR, file );
-			}),
+			/*
+			 * Clean files sourced from the downloaded zip file built by the Gutenberg repository.
+			 *
+			 * All files originating from the Gutenberg repository's built assets (both tracked and untracked by version
+			 * control) are deleted when `clean:gutenberg` is explicitly called. This ensures that versioned files that
+			 * have been deleted upstream are also removed from version control in this repository.
+			 *
+			 * When `clean:gutenberg` is not explicitly called and run through `grunt clean`, only ignored files are
+			 * cleaned.
+			 */
+			gutenberg: {
+				get src() {
+					const cli = grunt.cli.tasks;
+					// Preserve versioned files only when running bare `grunt clean`.
+					const isBareCleanSweep =
+						cli.includes( 'clean' ) &&
+						! cli.includes( 'clean:gutenberg' );
+
+					if ( isBareCleanSweep ) {
+						return gutenbergUnversionedFiles;
+					} else {
+						return gutenbergUnversionedFiles.concat( gutenbergVersionedFiles );
+					}
+				},
+			},
+
 			dynamic: {
 				dot: true,
 				expand: true,
@@ -289,7 +336,6 @@ module.exports = function(grunt) {
 						expand: true,
 						cwd: SOURCE_DIR,
 						src: buildFiles.concat( [
-							'!wp-includes/assets/**', // Assets is extracted into separate copy tasks.
 							'!js/**', // JavaScript is extracted into separate copy tasks.
 							'!.{svn,git}', // Exclude version control folders.
 							'!wp-includes/version.php', // Exclude version.php.
@@ -666,24 +712,18 @@ module.exports = function(grunt) {
 						'constants.php',
 						'pages/**/*.php',
 					],
-					dest: WORKING_DIR + 'wp-includes/build/',
+					dest: SOURCE_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.
+			 * The list of route source files is populated from the contents of the registry.php file at task runtime by
+			 * `routes:setup`.
 			 */
 			routes: {
 				expand: true,
 				cwd: 'gutenberg/build',
 				src: [],
-				dest: WORKING_DIR + 'wp-includes/build/',
+				dest: SOURCE_DIR + 'wp-includes/build/',
 			},
 			'gutenberg-js': {
 				files: [ {
@@ -692,7 +732,7 @@ module.exports = function(grunt) {
 					src: [
 						'pages/**/*.js',
 					],
-					dest: WORKING_DIR + 'wp-includes/build/',
+					dest: SOURCE_DIR + 'wp-includes/build/',
 				} ],
 			},
 			'gutenberg-modules': {
@@ -706,7 +746,7 @@ module.exports = function(grunt) {
 						// with no debugging value over the minified versions.
 						'!vips/!(*.min).js',
 					],
-					dest: WORKING_DIR + 'wp-includes/js/dist/script-modules/',
+					dest: SOURCE_DIR + 'wp-includes/js/dist/script-modules/',
 				} ],
 			},
 			'gutenberg-styles': {
@@ -719,7 +759,7 @@ module.exports = function(grunt) {
 						// Per-block CSS is copied to wp-includes/blocks/ by tools/gutenberg/copy.js.
 						'!block-library/*/**',
 					],
-					dest: WORKING_DIR + 'wp-includes/css/dist/',
+					dest: SOURCE_DIR + 'wp-includes/css/dist/',
 				} ],
 			},
 			'gutenberg-theme-json': {
@@ -738,20 +778,20 @@ module.exports = function(grunt) {
 				files: [
 					{
 						src: 'gutenberg/lib/theme.json',
-						dest: WORKING_DIR + 'wp-includes/theme.json',
+						dest: SOURCE_DIR + 'wp-includes/theme.json',
 					},
 					{
 						src: 'gutenberg/lib/theme-i18n.json',
-						dest: WORKING_DIR + 'wp-includes/theme-i18n.json',
+						dest: SOURCE_DIR + 'wp-includes/theme-i18n.json',
 					},
 				],
 			},
 			'icon-library-images': {
 				files: [ {
 					expand: true,
 					cwd: 'gutenberg/packages/icons/src/library',
-					src: '*.svg',
-					dest: WORKING_DIR + 'wp-includes/images/icon-library',
+					src: [ '*.svg' ],
+					dest: SOURCE_DIR + 'wp-includes/images/icon-library',
 				} ],
 			},
 			'icon-library-manifest': {
@@ -773,7 +813,7 @@ module.exports = function(grunt) {
 				},
 				files: [ {
 					src: 'gutenberg/packages/icons/src/manifest.php',
-					dest: WORKING_DIR + 'wp-includes/assets/icon-library-manifest.php',
+					dest: SOURCE_DIR + 'wp-includes/assets/icon-library-manifest.php',
 				} ],
 			},
 		},
@@ -1667,7 +1707,7 @@ module.exports = function(grunt) {
 			 */
 			grunt.util.spawn( {
 				grunt: true,
-				args: [ 'build:gutenberg', '--dev' ],
+				args: [ 'build:gutenberg' ],
 				opts: { stdio: 'inherit' }
 			}, function( buildError ) {
 				done( ! buildError );
@@ -1677,10 +1717,9 @@ module.exports = function(grunt) {
 
 	grunt.registerTask( 'gutenberg:copy', 'Copies Gutenberg JS packages and block assets to WordPress Core.', function() {
 		const done = this.async();
-		const buildDir = grunt.option( 'dev' ) ? 'src' : 'build';
 		grunt.util.spawn( {
 			cmd: 'node',
-			args: [ 'tools/gutenberg/copy.js', `--build-dir=${ buildDir }` ],
+			args: [ 'tools/gutenberg/copy.js' ],
 			opts: { stdio: 'inherit' }
 		}, function( error ) {
 			done( ! error );
@@ -2164,10 +2203,23 @@ module.exports = function(grunt) {
 		} );
 	} );
 
-	grunt.registerTask( 'build:gutenberg', [
-		'copy:gutenberg-php',
+	// Detects and copies stable routes.
+	grunt.registerTask( 'build:routes', [
 		'routes:setup',
 		'copy:routes',
+	] );
+
+	/*
+	 * Refresh the Gutenberg-sourced content in src/.
+	 *
+	 * clean:gutenberg must run first to ensure files removed upstream are purged.
+	 *
+	 * Because all of these tasks write to src/, the outcome is identical for build and build:dev.
+	 */
+	grunt.registerTask( 'build:gutenberg', [
+		'clean:gutenberg',
+		'copy:gutenberg-php',
+		'build:routes',
 		'copy:gutenberg-js',
 		'gutenberg:copy',
 		'copy:gutenberg-modules',
@@ -2181,21 +2233,21 @@ module.exports = function(grunt) {
 		if ( grunt.option( 'dev' ) ) {
 			grunt.task.run( [
 				'gutenberg:verify',
+				'build:gutenberg',
 				'build:js',
 				'build:css',
 				'build:codemirror',
-				'build:gutenberg',
 				'build:certificates'
 			] );
 		} else {
 			grunt.task.run( [
 				'gutenberg:verify',
+				'build:gutenberg',
 				'build:certificates',
 				'build:files',
 				'build:js',
 				'build:css',
 				'build:codemirror',
-				'build:gutenberg',
 				'replace:source-maps',
 				'verify:build'
 			] );

composer.json

@@ -16,7 +16,8 @@
 		"php": ">=7.4"
 	},
 	"suggest": {
-		"ext-dom": "*"
+		"ext-dom": "*",
+		"ext-mysqli": "*"
 	},
 	"require-dev": {
 		"composer/ca-bundle": "1.5.12",

package.json

@@ -141,6 +141,6 @@
 		"typecheck:php": "node ./tools/local-env/scripts/docker.js run --rm php composer phpstan",
 		"gutenberg:copy": "node tools/gutenberg/copy.js",
 		"gutenberg:verify": "node tools/gutenberg/utils.js",
-		"gutenberg:download": "node tools/gutenberg/download.js && grunt build:gutenberg --dev"
+		"gutenberg:download": "node tools/gutenberg/download.js && grunt build:gutenberg"
 	}
 }

src/wp-admin/css/common.css

@@ -934,6 +934,7 @@ a#remove-post-thumbnail:hover,
 	border-top: 1px solid #dcdcde;
 	background: #f6f7f7;
 	display: flex;
+	flex-wrap: wrap;
 	align-items: center;
 	justify-content: space-between;
 }

src/wp-admin/includes/class-wp-site-health.php

@@ -1357,7 +1357,7 @@ public function get_test_dotorg_communication() {
 			$result['description'] .= sprintf(
 				'<p>%s</p>',
 				sprintf(
-					'<span class="error"><span class="screen-reader-text">%s</span></span> %s',
+					'<span class="dashicons error" aria-hidden="true"></span><span class="screen-reader-text">%s</span> %s',
 					/* translators: Hidden accessibility text. */
 					__( 'Error' ),
 					sprintf(

src/wp-admin/includes/class-wp-upgrader.php

@@ -528,7 +528,7 @@ public function install_package( $args = array() ) {
 		/*
 		 * Give the upgrade an additional 300 seconds (5 minutes) to ensure the install
 		 * doesn't prematurely timeout having used up the maximum script execution time
-		 * upacking and downloading in WP_Upgrader->run().
+		 * downloading and unpacking in WP_Upgrader->run().
 		 */
 		if ( function_exists( 'set_time_limit' ) ) {
 			set_time_limit( 300 );

src/wp-admin/includes/image.php

@@ -316,7 +316,7 @@ function wp_create_image_subsizes( $file, $attachment_id ) {
 		}
 
 		if ( $scale_down ) {
-			// Resize the image. This will also convet it if needed.
+			// Resize the image. This will also convert it if needed.
 			$resized = $editor->resize( $threshold, $threshold );
 		} elseif ( $convert ) {
 			// The image will be converted (if possible) when saved.