Build/Test Tools: Move icon library SVG files to wp-includes/images.

This makes several changes to the build script to place the icon library files into more appropriate locations.
- The icon library SVG files are now copied into the `wp-includes/images/icon-library` directory instead of `wp-includes/icons`.
- The name of the `manifest.php` file has changed to `icon-library-manifest.php` and is now copied to `wp-includes/assets`.
- An unnecessary `trailingslashit()` has been removed.
- The `gutenberg-` prefix for the corresponding `grunt copy` tasks has been removed.

These values are merged into the `script-loader-packages.php` file during a `build`, so the original PHP files are not required.

Props mcsf, desrosj.
See #64393.

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

Author: desrosj

.gitignore

@@ -39,7 +39,7 @@ wp-tests-config.php
 /src/wp-includes/css/*-rtl.css
 /src/wp-includes/blocks/*
 !/src/wp-includes/blocks/index.php
-/src/wp-includes/icons
+/src/wp-includes/images/icon-library
 /src/wp-includes/build
 /src/wp-includes/theme.json
 /packagehash.txt

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',
 		],
 
@@ -682,31 +684,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: {
@@ -2059,7 +2065,8 @@ module.exports = function(grunt) {
 		'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() {

src/wp-includes/class-wp-icons-registry.php

@@ -41,9 +41,8 @@ class WP_Icons_Registry {
 	 * registry is loaded with those icons listed in the manifest.
 	 */
 	protected function __construct() {
-		$icons_directory = __DIR__ . '/icons/';
-		$icons_directory = trailingslashit( $icons_directory );
-		$manifest_path   = $icons_directory . 'manifest.php';
+		$icons_directory = __DIR__ . '/images/icon-library/';
+		$manifest_path   = __DIR__ . '/assets/icon-library-manifest.php';
 
 		if ( ! is_readable( $manifest_path ) ) {
 			wp_trigger_error(

src/wp-includes/rest-api/endpoints/class-wp-rest-icons-controller.php

@@ -11,8 +11,8 @@
 /**
  * Controller which provides a REST endpoint for the editor to read registered
  * icons. For the time being, only core icons are available, which are defined
- * in a single manifest file (wp-includes/icons/manifest.php). Icons are
- * comprised of their SVG source, a name and a translatable label.
+ * in a single manifest file (wp-includes/assets/icon-library-manifest.php).
+ * Icons are comprised of their SVG source, a name and a translatable label.
  *
  * @since 7.0.0
  *