Changeset 58334

Timestamp:

06/04/2024 02:50:24 PM (2 months ago)

Author:

joemcgill

Message:

Editor: Cache global styles for blocks.

This caches the generated CSS from block nodes in merged Theme JSON data to avoid repeated costly operations required to compute style properties for blocks. The generated CSS is saved to a transient that expires every hour.

Props thekt12, spacedmonkey, pereirinha, mukesh27, isabel_brison, oandregal, andrewserong, ramonjd.
Fixes #59595.

Location:

trunk

Files:

• src/wp-includes/global-styles-and-settings.php (modified) (2 diffs)
• tests/phpunit/tests/theme/wpAddGlobalStylesForBlocks.php (modified) (2 diffs)

trunk/src/wp-includes/global-styles-and-settings.php

@@ -308 +308 @@
     $tree        = WP_Theme_JSON_Resolver::get_merged_data();
     $block_nodes = $tree->get_styles_block_nodes();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     foreach ( $block_nodes as $metadata ) {
-        $block_css = $tree->get_styles_for_block( $metadata );
+
+        if ( $can_use_cached ) {
+            // Use the block name as the key for cached CSS data. Otherwise, use a hash of the metadata.
+            $cache_node_key = isset( $metadata['name'] ) ? $metadata['name'] : md5( wp_json_encode( $metadata ) );
+
+            if ( isset( $cached[ $cache_node_key ] ) ) {
+                $block_css = $cached[ $cache_node_key ];
+            } else {
+                $block_css                 = $tree->get_styles_for_block( $metadata );
+                $cached[ $cache_node_key ] = $block_css;
+                $update_cache              = true;
+            }
+        } else {
+            $block_css = $tree->get_styles_for_block( $metadata );
+        }
 
         if ( ! wp_should_load_separate_core_block_assets() ) {
@@ -355 +391 @@
         }
     }
+
+
+
+
 }
 

trunk/tests/phpunit/tests/theme/wpAddGlobalStylesForBlocks.php

@@ -77 +77 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * @ticket 56915
      * @ticket 61165
@@ -254 +335 @@
         return is_array( $actual ) ? $actual : array();
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }