From 7e6a8f6f85db1449fcaf3fb2442f3aaf05decf32 Mon Sep 17 00:00:00 2001
From: Ben Dwyer <ben@scruffian.com>
Date: Thu, 21 Apr 2022 12:06:08 +0100
Subject: [PATCH 1/5] Global Style: Add Global Styles CSS to inline block CSS

---
 ...enberg.php => class-wp-theme-json-6-0.php} |   2 +-
 .../wordpress-6.1/class-wp-theme-json-6-1.php | 190 ++++++++++++++++++
 .../class-wp-theme-json-resolver-6-1.php      |  36 ++++
 .../get-global-styles-and-settings.php        | 133 ++++++++++++
 lib/compat/wordpress-6.1/script-loader.php    |  49 +++++
 .../class-wp-theme-json-gutenberg.php         |  19 ++
 lib/load.php                                  |   7 +-
 7 files changed, 434 insertions(+), 2 deletions(-)
 rename lib/compat/wordpress-6.0/{class-wp-theme-json-gutenberg.php => class-wp-theme-json-6-0.php} (99%)
 create mode 100644 lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php
 create mode 100644 lib/compat/wordpress-6.1/class-wp-theme-json-resolver-6-1.php
 create mode 100644 lib/compat/wordpress-6.1/get-global-styles-and-settings.php
 create mode 100644 lib/compat/wordpress-6.1/script-loader.php
 create mode 100644 lib/experimental/class-wp-theme-json-gutenberg.php

diff --git a/lib/compat/wordpress-6.0/class-wp-theme-json-gutenberg.php b/lib/compat/wordpress-6.0/class-wp-theme-json-6-0.php
similarity index 99%
rename from lib/compat/wordpress-6.0/class-wp-theme-json-gutenberg.php
rename to lib/compat/wordpress-6.0/class-wp-theme-json-6-0.php
index 668082863114fa..1a0945b1754223 100644
--- a/lib/compat/wordpress-6.0/class-wp-theme-json-gutenberg.php
+++ b/lib/compat/wordpress-6.0/class-wp-theme-json-6-0.php
@@ -14,7 +14,7 @@
  *
  * @access private
  */
-class WP_Theme_JSON_Gutenberg extends WP_Theme_JSON_5_9 {
+class WP_Theme_JSON_6_0 extends WP_Theme_JSON_5_9 {
 	/**
 	 * Metadata for style properties.
 	 *
diff --git a/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php b/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php
new file mode 100644
index 00000000000000..a22bc75762dd00
--- /dev/null
+++ b/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * WP_Theme_JSON_6_1 class
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Class that encapsulates the processing of structures that adhere to the theme.json spec.
+ *
+ * This class is for internal core usage and is not supposed to be used by extenders (plugins and/or themes).
+ * This is a low-level API that may need to do breaking changes. Please,
+ * use get_global_settings, get_global_styles, and get_global_stylesheet instead.
+ *
+ * @access private
+ */
+class WP_Theme_JSON_6_1 extends WP_Theme_JSON_6_0 {
+	/**
+	 * Returns the stylesheet that results of processing
+	 * the theme.json structure this object represents.
+	 *
+	 * @param array $types    Types of styles to load. Will load all by default. It accepts:
+	 *                         'variables': only the CSS Custom Properties for presets & custom ones.
+	 *                         'styles': only the styles section in theme.json.
+	 *                         'presets': only the classes for the presets.
+	 * @param array $origins A list of origins to include. By default it includes VALID_ORIGINS.
+	 * @return string Stylesheet.
+	 */
+	public function get_stylesheet( $types = array( 'variables', 'styles', 'presets' ), $origins = null ) {
+		if ( null === $origins ) {
+			$origins = static::VALID_ORIGINS;
+		}
+
+		if ( is_string( $types ) ) {
+			// Dispatch error and map old arguments to new ones.
+			_deprecated_argument( __FUNCTION__, '5.9' );
+			if ( 'block_styles' === $types ) {
+				$types = array( 'styles', 'presets' );
+			} elseif ( 'css_variables' === $types ) {
+				$types = array( 'variables' );
+			} else {
+				$types = array( 'variables', 'styles', 'presets' );
+			}
+		}
+
+		$blocks_metadata = static::get_blocks_metadata();
+		$separate_block_assets = wp_should_load_separate_core_block_assets();
+		$style_nodes_without_blocks = static::get_style_nodes( $this->theme_json, $blocks_metadata, $separate_block_assets );
+		$setting_nodes   = static::get_setting_nodes( $this->theme_json, $blocks_metadata );
+
+		$stylesheet = '';
+
+		if ( in_array( 'variables', $types, true ) ) {
+			$stylesheet .= $this->get_css_variables( $setting_nodes, $origins );
+		}
+
+		if ( in_array( 'styles', $types, true ) ) {
+			$stylesheet .= $this->get_block_classes( $style_nodes_without_blocks );
+		}
+
+		if ( in_array( 'presets', $types, true ) ) {
+			$stylesheet .= $this->get_preset_classes( $setting_nodes, $origins );
+		}
+
+		return $stylesheet;
+	}
+
+	/**
+	 * Builds metadata for the style nodes, which returns in the form of:
+	 *
+	 *     [
+	 *       [
+	 *         'path'     => [ 'path', 'to', 'some', 'node' ],
+	 *         'selector' => 'CSS selector for some node',
+	 *         'duotone'  => 'CSS selector for duotone for some node'
+	 *       ],
+	 *       [
+	 *         'path'     => ['path', 'to', 'other', 'node' ],
+	 *         'selector' => 'CSS selector for other node',
+	 *         'duotone'  => null
+	 *       ],
+	 *     ]
+	 *
+	 * @since 5.8.0
+	 *
+	 * @param array $theme_json     The tree to extract style nodes from.
+	 * @param array $selectors      List of selectors per block.
+	 * @param array $exclude_blocks Exclude blocks from the style nodes.
+	 * @return array
+	 */
+	protected static function get_style_nodes( $theme_json, $selectors = array(), $exclude_blocks = false ) {
+		$nodes = array();
+		if ( ! isset( $theme_json['styles'] ) ) {
+			return $nodes;
+		}
+
+		// Top-level.
+		$nodes[] = array(
+			'path'     => array( 'styles' ),
+			'selector' => static::ROOT_BLOCK_SELECTOR,
+		);
+
+		if ( isset( $theme_json['styles']['elements'] ) ) {
+			foreach ( $theme_json['styles']['elements'] as $element => $node ) {
+				$nodes[] = array(
+					'path'     => array( 'styles', 'elements', $element ),
+					'selector' => static::ELEMENTS[ $element ],
+				);
+			}
+		}
+
+		if ( $exclude_blocks ) {
+			return $nodes;
+		}
+
+		// Blocks.
+		if ( ! isset( $theme_json['styles']['blocks'] ) ) {
+			return $nodes;
+		}
+
+		// TODO - test this ( turn off separate assets i think)
+		$nodes = array_merge( $nodes, static::get_block_nodes_private( $theme_json ) );
+
+		return $nodes;
+	}
+
+	// TODO - this is duplicated from get_style_nodes.
+	public function get_block_nodes() {
+		return static::get_block_nodes_private( $this->theme_json );
+	}
+
+	private static function get_block_nodes_private( $theme_json ) {
+		$selectors = static::get_blocks_metadata();
+		$nodes = array();
+		if ( ! isset( $theme_json['styles'] ) ) {
+			return $nodes;
+		}
+
+		// Blocks.
+		if ( ! isset( $theme_json['styles']['blocks'] ) ) {
+			return $nodes;
+		}
+
+		foreach ( $theme_json['styles']['blocks'] as $name => $node ) {
+			$selector = null;
+			if ( isset( $selectors[ $name ]['selector'] ) ) {
+				$selector = $selectors[ $name ]['selector'];
+			}
+
+			$duotone_selector = null;
+			if ( isset( $selectors[ $name ]['duotone'] ) ) {
+				$duotone_selector = $selectors[ $name ]['duotone'];
+			}
+
+			$nodes[] = array(
+				'name'     => $name,
+				'path'     => array( 'styles', 'blocks', $name ),
+				'selector' => $selector,
+				'duotone'  => $duotone_selector,
+			);
+
+			if ( isset( $theme_json['styles']['blocks'][ $name ]['elements'] ) ) {
+				foreach ( $theme_json['styles']['blocks'][ $name ]['elements'] as $element => $node ) {
+					$nodes[] = array(
+						'path'     => array( 'styles', 'blocks', $name, 'elements', $element ),
+						'selector' => $selectors[ $name ]['elements'][ $element ],
+					);
+				}
+			}
+		}
+
+		return $nodes;
+	}
+
+	/**
+	 * Gets the CSS rules for a particular block from theme.json.
+	 *
+	 * @param array $block_metadata Meta data about the block to get styles for.
+	 *
+	 * @return array Styles for the block.
+	 */
+	public function get_styles_for_block( $block_metadata ) {
+		$node         = _wp_array_get( $this->theme_json, $block_metadata['path'], array() );
+		$selector     = $block_metadata['selector'];
+		$settings     = _wp_array_get( $this->theme_json, array( 'settings' ) );
+		$declarations = static::compute_style_properties( $node, $settings );
+		$block_rules = static::to_ruleset( $selector, $declarations );
+		return $block_rules;
+	}
+}
diff --git a/lib/compat/wordpress-6.1/class-wp-theme-json-resolver-6-1.php b/lib/compat/wordpress-6.1/class-wp-theme-json-resolver-6-1.php
new file mode 100644
index 00000000000000..e155a1db73e81d
--- /dev/null
+++ b/lib/compat/wordpress-6.1/class-wp-theme-json-resolver-6-1.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * WP_Theme_JSON_Resolver_6_1 class
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Class that abstracts the processing of the different data sources
+ * for site-level config and offers an API to work with them.
+ *
+ * This class is for internal core usage and is not supposed to be used by extenders (plugins and/or themes).
+ * This is a low-level API that may need to do breaking changes. Please,
+ * use get_global_settings, get_global_styles, and get_global_stylesheet instead.
+ *
+ * @access private
+ */
+class WP_Theme_JSON_Resolver_6_1 extends WP_Theme_JSON_Resolver_6_0 {
+
+	// This is just here so we can get the 6.1 version of the class.
+	public static function get_merged_data( $origin = 'custom' ) {
+		if ( is_array( $origin ) ) {
+			_deprecated_argument( __FUNCTION__, '5.9.0' );
+		}
+
+		$result = new WP_Theme_JSON_6_1();
+		$result->merge( static::get_core_data() );
+		$result->merge( static::get_theme_data() );
+
+		if ( 'custom' === $origin ) {
+			$result->merge( static::get_user_data() );
+		}
+
+		return $result;
+	}
+}
diff --git a/lib/compat/wordpress-6.1/get-global-styles-and-settings.php b/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
new file mode 100644
index 00000000000000..f920a6ad35102c
--- /dev/null
+++ b/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * API to interact with global settings & styles.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Returns the stylesheet resulting of merging core, theme, and user data.
+ * This is a duplicate of wp_get_global_stylesheet
+ *
+ * @since 5.9.0
+ *
+ * @param array $types Types of styles to load. Optional.
+ *                     It accepts 'variables', 'styles', 'presets' as values.
+ *                     If empty, it'll load all for themes with theme.json support
+ *                     and only [ 'variables', 'presets' ] for themes without theme.json support.
+ *
+ * @return string Stylesheet.
+ */
+function wp_get_global_stylesheet_gutenberg( $types = array() ) {
+	// Return cached value if it can be used and exists.
+	// It's cached by theme to make sure that theme switching clears the cache.
+	$can_use_cached = (
+		( empty( $types ) ) &&
+		( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) &&
+		( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ) &&
+		( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST ) &&
+		! is_admin()
+	);
+	$transient_name = 'global_styles_' . get_stylesheet();
+	if ( $can_use_cached ) {
+		$cached = get_transient( $transient_name );
+		if ( $cached ) {
+			return $cached;
+		}
+	}
+
+	$tree = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data();
+
+	$supports_theme_json = WP_Theme_JSON_Resolver_Gutenberg::theme_has_support();
+	if ( empty( $types ) && ! $supports_theme_json ) {
+		$types = array( 'variables', 'presets' );
+	} elseif ( empty( $types ) ) {
+		$types = array( 'variables', 'styles', 'presets' );
+	}
+
+	/*
+	 * If variables are part of the stylesheet,
+	 * we add them for all origins (default, theme, user).
+	 * This is so themes without a theme.json still work as before 5.9:
+	 * they can override the default presets.
+	 * See https://core.trac.wordpress.org/ticket/54782
+	 */
+	$styles_variables = '';
+	if ( in_array( 'variables', $types, true ) ) {
+		$styles_variables = $tree->get_stylesheet( array( 'variables' ) );
+		$types            = array_diff( $types, array( 'variables' ) );
+	}
+
+	/*
+	 * For the remaining types (presets, styles), we do consider origins:
+	 *
+	 * - themes without theme.json: only the classes for the presets defined by core
+	 * - themes with theme.json: the presets and styles classes, both from core and the theme
+	 */
+	$styles_rest = '';
+	if ( ! empty( $types ) ) {
+		$origins = array( 'default', 'theme', 'custom' );
+		if ( ! $supports_theme_json ) {
+			$origins = array( 'default' );
+		}
+		$styles_rest = $tree->get_stylesheet( $types, $origins );
+	}
+
+	$stylesheet = $styles_variables . $styles_rest;
+
+	if ( $can_use_cached ) {
+		// Cache for a minute.
+		// This cache doesn't need to be any longer, we only want to avoid spikes on high-traffic sites.
+		set_transient( $transient_name, $stylesheet, MINUTE_IN_SECONDS );
+	}
+
+	return $stylesheet;
+}
+
+/**
+ * Adds global style rules to the inline style for each block.
+ */
+function wp_add_global_styles_for_blocks() {
+	$tree = WP_Theme_JSON_Resolver_6_1::get_merged_data();
+	// TODO some nodes dont have a name...
+	$block_nodes = $tree->get_block_nodes();
+
+	foreach ( $block_nodes as $metadata ) {
+
+		$block_css = $tree->get_styles_for_block( $metadata );
+		$block_name = str_replace( 'core/', '', $metadata['name'] );
+		wp_add_inline_style( "wp-block-" . $block_name, $block_css );
+
+		/* this might be needed for duotone styles?
+
+		if ( null === $metadata['selector'] ) {
+			continue;
+		}
+		$node         = _wp_array_get( $this->theme_json, $metadata['path'], array() );
+		$selector     = $metadata['selector'];
+		$settings     = _wp_array_get( $this->theme_json, array( 'settings' ) );
+		$declarations = static::compute_style_properties( $node, $settings );
+
+		// 1. Separate the ones who use the general selector
+		// and the ones who use the duotone selector.
+		$declarations_duotone = array();
+		foreach ( $declarations as $index => $declaration ) {
+			if ( 'filter' === $declaration['name'] ) {
+				unset( $declarations[ $index ] );
+				$declarations_duotone[] = $declaration;
+			}
+		}
+
+		// 2. Generate the rules that use the general selector.
+		$block_rules .= static::to_ruleset( $selector, $declarations );
+
+		// 3. Generate the rules that use the duotone selector.
+		if ( isset( $metadata['duotone'] ) && ! empty( $declarations_duotone ) ) {
+			$selector_duotone = static::scope_selector( $metadata['selector'], $metadata['duotone'] );
+			$block_rules     .= static::to_ruleset( $selector_duotone, $declarations_duotone );
+		}*/
+
+
+	}
+
+}
diff --git a/lib/compat/wordpress-6.1/script-loader.php b/lib/compat/wordpress-6.1/script-loader.php
new file mode 100644
index 00000000000000..36add7e913e44d
--- /dev/null
+++ b/lib/compat/wordpress-6.1/script-loader.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Enqueues the global styles defined via theme.json.
+ * This should replace wp_enqueue_global_styles.
+ *
+ * @since 5.8.0
+ */
+function gutenberg_enqueue_global_styles() {
+	$separate_assets  = wp_should_load_separate_core_block_assets();
+	$is_block_theme   = wp_is_block_theme();
+	$is_classic_theme = ! $is_block_theme;
+
+	/*
+	 * Global styles should be printed in the head when loading all styles combined.
+	 * The footer should only be used to print global styles for classic themes with separate core assets enabled.
+	 *
+	 * See https://core.trac.wordpress.org/ticket/53494.
+	 */
+	if (
+		( $is_block_theme && doing_action( 'wp_footer' ) ) ||
+		( $is_classic_theme && doing_action( 'wp_footer' ) && ! $separate_assets ) ||
+		( $is_classic_theme && doing_action( 'wp_enqueue_scripts' ) && $separate_assets )
+	) {
+		return;
+	}
+
+	if ( $separate_assets ) {
+		// add each block as an inline css.
+		wp_add_global_styles_for_blocks();
+	}
+	$stylesheet = wp_get_global_stylesheet_gutenberg();
+
+	if ( empty( $stylesheet ) ) {
+		return;
+	}
+
+	wp_register_style( 'global-styles', false, array(), true, true );
+	wp_add_inline_style( 'global-styles', $stylesheet );
+	wp_enqueue_style( 'global-styles' );
+}
+
+remove_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles' );
+remove_action( 'wp_footer', 'wp_enqueue_global_styles' );
+remove_action( 'wp_enqueue_scripts', 'gutenberg_enqueue_global_styles_assets' );
+remove_action( 'wp_footer', 'gutenberg_enqueue_global_styles_assets' );
+
+add_action( 'wp_enqueue_scripts', 'gutenberg_enqueue_global_styles' );
+add_action( 'wp_footer', 'gutenberg_enqueue_global_styles', 1 );
diff --git a/lib/experimental/class-wp-theme-json-gutenberg.php b/lib/experimental/class-wp-theme-json-gutenberg.php
new file mode 100644
index 00000000000000..0fa63cd44eed54
--- /dev/null
+++ b/lib/experimental/class-wp-theme-json-gutenberg.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * WP_Theme_JSON_6_1 class
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Class that encapsulates the processing of structures that adhere to the theme.json spec.
+ *
+ * This class is for internal core usage and is not supposed to be used by extenders (plugins and/or themes).
+ * This is a low-level API that may need to do breaking changes. Please,
+ * use get_global_settings, get_global_styles, and get_global_stylesheet instead.
+ *
+ * @access private
+ */
+class WP_Theme_JSON_Gutenberg extends WP_Theme_JSON_6_1 {
+
+}
diff --git a/lib/load.php b/lib/load.php
index 5d153d72b791b8..308bae3c0854c0 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -114,7 +114,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.0/blocks.php';
 require __DIR__ . '/compat/wordpress-6.0/block-template-utils.php';
 require __DIR__ . '/compat/wordpress-6.0/functions.php';
-require __DIR__ . '/compat/wordpress-6.0/class-wp-theme-json-gutenberg.php';
+require __DIR__ . '/compat/wordpress-6.0/class-wp-theme-json-6-0.php';
 require __DIR__ . '/compat/wordpress-6.0/class-wp-theme-json-resolver-6-0.php';
 require __DIR__ . '/compat/wordpress-6.0/block-patterns.php';
 require __DIR__ . '/compat/wordpress-6.0/block-template.php';
@@ -124,10 +124,15 @@ function gutenberg_is_experiment_enabled( $name ) {
 
 // WordPress 6.1 compat.
 require __DIR__ . '/compat/wordpress-6.1/blocks.php';
+require __DIR__ . '/compat/wordpress-6.1/get-global-styles-and-settings.php';
+require __DIR__ . '/compat/wordpress-6.1/class-wp-theme-json-6-1.php';
+require __DIR__ . '/compat/wordpress-6.1/class-wp-theme-json-resolver-6-1.php';
+require __DIR__ . '/compat/wordpress-6.1/script-loader.php';
 
 // Experimental features.
 require __DIR__ . '/experimental/block-editor-settings-mobile.php';
 require __DIR__ . '/experimental/register-webfonts-from-theme-json.php';
+require __DIR__ . '/experimental/class-wp-theme-json-gutenberg.php';
 require __DIR__ . '/experimental/class-wp-theme-json-resolver-gutenberg.php';
 require __DIR__ . '/experimental/class-wp-webfonts.php';
 require __DIR__ . '/experimental/class-wp-webfonts-provider.php';

From 51a3b43240ec1556166699ac1ba412df7a7de268 Mon Sep 17 00:00:00 2001
From: Ben Dwyer <ben@scruffian.com>
Date: Thu, 21 Apr 2022 12:18:42 +0100
Subject: [PATCH 2/5] remove unneeded code

---
 .../class-wp-theme-json-resolver-6-1.php      | 36 -------------------
 .../get-global-styles-and-settings.php        |  2 +-
 lib/load.php                                  |  1 -
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 lib/compat/wordpress-6.1/class-wp-theme-json-resolver-6-1.php

diff --git a/lib/compat/wordpress-6.1/class-wp-theme-json-resolver-6-1.php b/lib/compat/wordpress-6.1/class-wp-theme-json-resolver-6-1.php
deleted file mode 100644
index e155a1db73e81d..00000000000000
--- a/lib/compat/wordpress-6.1/class-wp-theme-json-resolver-6-1.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * WP_Theme_JSON_Resolver_6_1 class
- *
- * @package gutenberg
- */
-
-/**
- * Class that abstracts the processing of the different data sources
- * for site-level config and offers an API to work with them.
- *
- * This class is for internal core usage and is not supposed to be used by extenders (plugins and/or themes).
- * This is a low-level API that may need to do breaking changes. Please,
- * use get_global_settings, get_global_styles, and get_global_stylesheet instead.
- *
- * @access private
- */
-class WP_Theme_JSON_Resolver_6_1 extends WP_Theme_JSON_Resolver_6_0 {
-
-	// This is just here so we can get the 6.1 version of the class.
-	public static function get_merged_data( $origin = 'custom' ) {
-		if ( is_array( $origin ) ) {
-			_deprecated_argument( __FUNCTION__, '5.9.0' );
-		}
-
-		$result = new WP_Theme_JSON_6_1();
-		$result->merge( static::get_core_data() );
-		$result->merge( static::get_theme_data() );
-
-		if ( 'custom' === $origin ) {
-			$result->merge( static::get_user_data() );
-		}
-
-		return $result;
-	}
-}
diff --git a/lib/compat/wordpress-6.1/get-global-styles-and-settings.php b/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
index f920a6ad35102c..631bc3ad60cfb2 100644
--- a/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
+++ b/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
@@ -88,7 +88,7 @@ function wp_get_global_stylesheet_gutenberg( $types = array() ) {
  * Adds global style rules to the inline style for each block.
  */
 function wp_add_global_styles_for_blocks() {
-	$tree = WP_Theme_JSON_Resolver_6_1::get_merged_data();
+	$tree = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data();
 	// TODO some nodes dont have a name...
 	$block_nodes = $tree->get_block_nodes();
 
diff --git a/lib/load.php b/lib/load.php
index 308bae3c0854c0..1688d65a822631 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -126,7 +126,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.1/blocks.php';
 require __DIR__ . '/compat/wordpress-6.1/get-global-styles-and-settings.php';
 require __DIR__ . '/compat/wordpress-6.1/class-wp-theme-json-6-1.php';
-require __DIR__ . '/compat/wordpress-6.1/class-wp-theme-json-resolver-6-1.php';
 require __DIR__ . '/compat/wordpress-6.1/script-loader.php';
 
 // Experimental features.

From 109cac5f46a99efba15d95714c18f67fe84678f7 Mon Sep 17 00:00:00 2001
From: Ben Dwyer <ben@scruffian.com>
Date: Thu, 21 Apr 2022 12:49:07 +0100
Subject: [PATCH 3/5] remove old comments

---
 lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php b/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php
index a22bc75762dd00..5def1984eb6e26 100644
--- a/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php
+++ b/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php
@@ -118,13 +118,11 @@ protected static function get_style_nodes( $theme_json, $selectors = array(), $e
 			return $nodes;
 		}
 
-		// TODO - test this ( turn off separate assets i think)
 		$nodes = array_merge( $nodes, static::get_block_nodes_private( $theme_json ) );
 
 		return $nodes;
 	}
 
-	// TODO - this is duplicated from get_style_nodes.
 	public function get_block_nodes() {
 		return static::get_block_nodes_private( $this->theme_json );
 	}

From ee5a64a6fc482706ac70c6f7f1adc21243c7a5a5 Mon Sep 17 00:00:00 2001
From: Ben Dwyer <ben@scruffian.com>
Date: Thu, 21 Apr 2022 13:39:21 +0100
Subject: [PATCH 4/5] remove old comments

---
 .../get-global-styles-and-settings.php        | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/lib/compat/wordpress-6.1/get-global-styles-and-settings.php b/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
index 631bc3ad60cfb2..679064c231f2e4 100644
--- a/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
+++ b/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
@@ -93,41 +93,9 @@ function wp_add_global_styles_for_blocks() {
 	$block_nodes = $tree->get_block_nodes();
 
 	foreach ( $block_nodes as $metadata ) {
-
 		$block_css = $tree->get_styles_for_block( $metadata );
 		$block_name = str_replace( 'core/', '', $metadata['name'] );
 		wp_add_inline_style( "wp-block-" . $block_name, $block_css );
-
-		/* this might be needed for duotone styles?
-
-		if ( null === $metadata['selector'] ) {
-			continue;
-		}
-		$node         = _wp_array_get( $this->theme_json, $metadata['path'], array() );
-		$selector     = $metadata['selector'];
-		$settings     = _wp_array_get( $this->theme_json, array( 'settings' ) );
-		$declarations = static::compute_style_properties( $node, $settings );
-
-		// 1. Separate the ones who use the general selector
-		// and the ones who use the duotone selector.
-		$declarations_duotone = array();
-		foreach ( $declarations as $index => $declaration ) {
-			if ( 'filter' === $declaration['name'] ) {
-				unset( $declarations[ $index ] );
-				$declarations_duotone[] = $declaration;
-			}
-		}
-
-		// 2. Generate the rules that use the general selector.
-		$block_rules .= static::to_ruleset( $selector, $declarations );
-
-		// 3. Generate the rules that use the duotone selector.
-		if ( isset( $metadata['duotone'] ) && ! empty( $declarations_duotone ) ) {
-			$selector_duotone = static::scope_selector( $metadata['selector'], $metadata['duotone'] );
-			$block_rules     .= static::to_ruleset( $selector_duotone, $declarations_duotone );
-		}*/
-
-
 	}
 
 }

From a4e5e0293befdcd0fd83a441ee1b877bb2718c4d Mon Sep 17 00:00:00 2001
From: Ben Dwyer <ben@scruffian.com>
Date: Thu, 21 Apr 2022 15:35:47 +0100
Subject: [PATCH 5/5] linting fixes

---
 .../wordpress-6.1/class-wp-theme-json-6-1.php | 22 ++++++++++++++-----
 .../get-global-styles-and-settings.php        |  4 ++--
 lib/compat/wordpress-6.1/script-loader.php    |  5 +++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php b/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php
index 5def1984eb6e26..3a53117593d1eb 100644
--- a/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php
+++ b/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php
@@ -43,10 +43,10 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 			}
 		}
 
-		$blocks_metadata = static::get_blocks_metadata();
-		$separate_block_assets = wp_should_load_separate_core_block_assets();
+		$blocks_metadata            = static::get_blocks_metadata();
+		$separate_block_assets      = wp_should_load_separate_core_block_assets();
 		$style_nodes_without_blocks = static::get_style_nodes( $this->theme_json, $blocks_metadata, $separate_block_assets );
-		$setting_nodes   = static::get_setting_nodes( $this->theme_json, $blocks_metadata );
+		$setting_nodes              = static::get_setting_nodes( $this->theme_json, $blocks_metadata );
 
 		$stylesheet = '';
 
@@ -123,13 +123,25 @@ protected static function get_style_nodes( $theme_json, $selectors = array(), $e
 		return $nodes;
 	}
 
+	/**
+	 * A public helper to get the block nodes from a theme.json file.
+	 *
+	 * @return array The block nodes in theme.json.
+	 */
 	public function get_block_nodes() {
 		return static::get_block_nodes_private( $this->theme_json );
 	}
 
+	/**
+	 * An internal method to get the block nodes from a theme.json file.
+	 *
+	 * @param array $theme_json The theme.json converted to an array.
+	 *
+	 * @return array The block nodes in theme.json.
+	 */
 	private static function get_block_nodes_private( $theme_json ) {
 		$selectors = static::get_blocks_metadata();
-		$nodes = array();
+		$nodes     = array();
 		if ( ! isset( $theme_json['styles'] ) ) {
 			return $nodes;
 		}
@@ -182,7 +194,7 @@ public function get_styles_for_block( $block_metadata ) {
 		$selector     = $block_metadata['selector'];
 		$settings     = _wp_array_get( $this->theme_json, array( 'settings' ) );
 		$declarations = static::compute_style_properties( $node, $settings );
-		$block_rules = static::to_ruleset( $selector, $declarations );
+		$block_rules  = static::to_ruleset( $selector, $declarations );
 		return $block_rules;
 	}
 }
diff --git a/lib/compat/wordpress-6.1/get-global-styles-and-settings.php b/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
index 679064c231f2e4..c15fb46c8f66d5 100644
--- a/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
+++ b/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
@@ -93,9 +93,9 @@ function wp_add_global_styles_for_blocks() {
 	$block_nodes = $tree->get_block_nodes();
 
 	foreach ( $block_nodes as $metadata ) {
-		$block_css = $tree->get_styles_for_block( $metadata );
+		$block_css  = $tree->get_styles_for_block( $metadata );
 		$block_name = str_replace( 'core/', '', $metadata['name'] );
-		wp_add_inline_style( "wp-block-" . $block_name, $block_css );
+		wp_add_inline_style( 'wp-block-' . $block_name, $block_css );
 	}
 
 }
diff --git a/lib/compat/wordpress-6.1/script-loader.php b/lib/compat/wordpress-6.1/script-loader.php
index 36add7e913e44d..82548cf7f2d48f 100644
--- a/lib/compat/wordpress-6.1/script-loader.php
+++ b/lib/compat/wordpress-6.1/script-loader.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Load global styles assets in the front-end.
+ *
+ * @package gutenberg
+ */
 
 /**
  * Enqueues the global styles defined via theme.json.