Changeset 56064 for trunk/src/wp-includes/blocks/index.php

Timestamp:

06/27/2023 11:26:12 AM (16 months ago)

Author:

spacedmonkey

Message:

Script Loader: Fix performance issues in wp_common_block_scripts_and_styles.

In [52069] the function wp_common_block_scripts_and_styles was changed load individual theme stylesheets, if the current theme supports block styles and loading separate core block assets. To do this, the function calls many expensive file operation functions, such as glob, file_exists and file_get_contents. This is wasteful, as these functions are loaded on every page request, even request that do not include blocks, like REST API calls. In [56044] all core block styles are registered in a single place. In register_core_block_style_handles calls glob to get all css styles in block directories. While registering style and editor styles, also register block theme styles, under a new style handle. Example wp-block-avatar-theme. If the current theme supports block styles, also request the block to enqueue the theme style on the front end. As these new stylesheets have a path attribute set, the function wp_maybe_inline_styles will automatically inline the styles for you.

Props spacedmonkey, flixos90, oandregal, costdev, audrasjb, mukesh27.
Fixes #58560.

File:

• trunk/src/wp-includes/blocks/index.php (modified) (3 diffs)

trunk/src/wp-includes/blocks/index.php

@@ -56 +56 @@
     }
 
+    $register_style = static function( $name, $filename, $style_handle ) use ( $includes_path, $includes_url, $suffix, $wp_styles, $files ) {
+        $style_path = "blocks/{$name}/{$filename}{$suffix}.css";
+        $path       = $includes_path . $style_path;
+
+        if ( ! in_array( $path, $files, true ) ) {
+            $wp_styles->add(
+                $style_handle,
+                false
+            );
+            return;
+        }
+
+        $wp_styles->add( $style_handle, $includes_url . $style_path );
+        $wp_styles->add_data( $style_handle, 'path', $path );
+
+        $rtl_file = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $path );
+        if ( is_rtl() && in_array( $rtl_file, $files, true ) ) {
+            $wp_styles->add_data( $style_handle, 'rtl', 'replace' );
+            $wp_styles->add_data( $style_handle, 'suffix', $suffix );
+            $wp_styles->add_data( $style_handle, 'path', $rtl_file );
+        }
+    };
+
     foreach ( $core_blocks_meta as $name => $schema ) {
         /** This filter is documented in wp-includes/blocks.php */
@@ -68 +91 @@
         }
 
+        // Register block theme styles.
+        $register_style( $name, 'theme', "wp-block-{$name}-theme" );
+
         foreach ( $style_fields as $style_field => $filename ) {
             $style_handle = $schema[ $style_field ];
@@ -73 +99 @@
                 continue;
             }
-
-            $style_path = "blocks/{$name}/{$filename}{$suffix}.css";
-            $path       = $includes_path . $style_path;
-
-            if ( ! in_array( $path, $files, true ) ) {
-                $wp_styles->add(
-                    $style_handle,
-                    false
-                );
-                continue;
-            }
-
-            $wp_styles->add( $style_handle, $includes_url . $style_path );
-            $wp_styles->add_data( $style_handle, 'path', $path );
-
-            $rtl_file = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $path );
-            if ( is_rtl() && in_array( $rtl_file, $files, true ) ) {
-                $wp_styles->add_data( $style_handle, 'rtl', 'replace' );
-                $wp_styles->add_data( $style_handle, 'suffix', $suffix );
-                $wp_styles->add_data( $style_handle, 'path', $rtl_file );
-            }
+            $register_style( $name, $filename, $style_handle );
         }
     }