From 35264ca89cc653055d80a23ddd2cd25b5ac7a296 Mon Sep 17 00:00:00 2001
From: ramonopoly <ramonopoly@git.wordpress.org>
Date: Tue, 29 Oct 2024 03:13:19 +0000
Subject: [PATCH] Global styles: preload `/global-styles` endpoint responses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit fixes a regression whereby requests to global styles endpoints were not being preloaded, resulting in several requests being fired clientside unnecessarily.

For performance reasons, we  preload the requests so that the data is in the editor store and ready to use straight away.

The outcome is that the editor loads more quickly.

Follow-up to [62042].

Props ellatrix, ramonopoly, apermo, peterwilsoncc.
Fixes #62315.


Built from https://develop.svn.wordpress.org/trunk@59316


git-svn-id: http://core.svn.wordpress.org/trunk@58702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-form-blocks.php | 6 +++++-
 wp-admin/site-editor.php      | 5 +++--
 wp-includes/version.php       | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/wp-admin/edit-form-blocks.php b/wp-admin/edit-form-blocks.php
index c4727ea3ba..5dbb9f33e4 100644
--- a/wp-admin/edit-form-blocks.php
+++ b/wp-admin/edit-form-blocks.php
@@ -51,6 +51,8 @@ wp_enqueue_script( 'wp-edit-post' );
 
 $rest_path = rest_get_route_for_post( $post );
 
+$active_theme = get_stylesheet();
+
 // Preload common data.
 $preload_paths = array(
 	'/wp/v2/types?context=view',
@@ -65,8 +67,10 @@ $preload_paths = array(
 	sprintf( '%s/autosaves?context=edit', $rest_path ),
 	'/wp/v2/settings',
 	array( '/wp/v2/settings', 'OPTIONS' ),
-	'/wp/v2/global-styles/themes/' . get_stylesheet(),
+	'/wp/v2/global-styles/themes/' . $active_theme . '?context=view',
+	'/wp/v2/global-styles/themes/' . $active_theme . '/variations?context=view',
 	'/wp/v2/themes?context=edit&status=active',
+	array( '/wp/v2/global-styles/' . WP_Theme_JSON_Resolver::get_user_global_styles_post_id(), 'OPTIONS' ),
 	'/wp/v2/global-styles/' . WP_Theme_JSON_Resolver::get_user_global_styles_post_id() . '?context=edit',
 );
 
diff --git a/wp-admin/site-editor.php b/wp-admin/site-editor.php
index a678fc1e44..3207bccdf2 100644
--- a/wp-admin/site-editor.php
+++ b/wp-admin/site-editor.php
@@ -97,8 +97,9 @@ $preload_paths = array(
 	'/wp/v2/template-parts?context=edit&per_page=-1',
 	'/wp/v2/themes?context=edit&status=active',
 	'/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
-	'/wp/v2/global-styles/' . $active_global_styles_id,
-	'/wp/v2/global-styles/themes/' . $active_theme,
+	array( '/wp/v2/global-styles/' . $active_global_styles_id, 'OPTIONS' ),
+	'/wp/v2/global-styles/themes/' . $active_theme . '?context=view',
+	'/wp/v2/global-styles/themes/' . $active_theme . '/variations?context=view',
 	array( $navigation_rest_route, 'OPTIONS' ),
 	array(
 		add_query_arg(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1560bf96da..b6c825543a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.8-alpha-59315';
+$wp_version = '6.8-alpha-59316';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.