Block Editor: Load the WP_Theme_JSON_Resolver class in `wp-admin/lo…

…ad-styles.php`.

This ensures correct load order when style concatenation is used, e.g. when `SCRIPT_DEBUG` is off.

Additionally, make sure the `WP_CONTENT_DIR` constant is defined for use in `get_theme_root()` via `get_stylesheet_directory()`.

Follow-up to [50992], [51001], [51013].

Props nosolosw.
See #53175.
Built from https://develop.svn.wordpress.org/trunk@51056


git-svn-id: http://core.svn.wordpress.org/trunk@50665 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/load-styles.php

@@ -13,8 +13,11 @@
 }
 
 define( 'WPINC', 'wp-includes' );
+define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
 
 require ABSPATH . 'wp-admin/includes/noop.php';
+require ABSPATH . WPINC . '/theme.php';
+require ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
 require ABSPATH . WPINC . '/script-loader.php';
 require ABSPATH . WPINC . '/version.php';
 

wp-includes/script-loader.php

@@ -34,14 +34,6 @@
 /** WordPress Styles Functions */
 require ABSPATH . WPINC . '/functions.wp-styles.php';
 
-// get_stylesheet_directory() is used by WP_Theme_JSON_Resolver::theme_has_support().
-if ( ! function_exists( 'get_stylesheet_directory' ) ) {
-	require_once ABSPATH . WPINC . '/theme.php';
-}
-if ( ! class_exists( 'WP_Theme_JSON_Resolver' ) ) {
-	require_once ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
-}
-
 /**
  * Registers TinyMCE scripts.
  *

wp-includes/version.php

@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-alpha-51055';
+$wp_version = '5.8-alpha-51056';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

wp-settings.php

@@ -171,6 +171,7 @@
 require ABSPATH . WPINC . '/theme.php';
 require ABSPATH . WPINC . '/class-wp-theme.php';
 require ABSPATH . WPINC . '/class-wp-theme-json.php';
+require ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
 require ABSPATH . WPINC . '/class-wp-block-template.php';
 require ABSPATH . WPINC . '/block-template-utils.php';
 require ABSPATH . WPINC . '/block-template.php';