Changeset 62077

Timestamp:

03/20/2026 03:39:18 PM (8 days ago)

Author:

desrosj

Message:

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.

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• Gruntfile.js (modified) (3 diffs)
• src/wp-includes/class-wp-icons-registry.php (modified) (1 diff)
• src/wp-includes/images (modified) (1 prop)
• src/wp-includes/rest-api/endpoints/class-wp-rest-icons-controller.php (modified) (1 diff)

trunk/.gitignore

@@ -40 +40 @@
 /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

trunk/Gruntfile.js

@@ -56 +56 @@
             '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',
         ],
@@ -683 +685 @@
                 ],
             },
-            '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',
+                } ],
             },
         },
@@ -2060 +2066 @@
         'copy:gutenberg-styles',
         'copy:gutenberg-theme-json',
-        'copy:gutenberg-icons',
+        'copy:icon-library-images',
+        'copy:icon-library-manifest',
     ] );
 

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

@@ -42 +42 @@
      */
     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 ) ) {

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

@@ -12 +12 @@
  * 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