Boost: Prioritize cornerstone provider while serving critical CSS (#4…

…0021)
Automattic · Nov 4, 2024 · 72cd1b2 · 72cd1b2
1 parent 931e59a
commit 72cd1b2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/projects/plugins/boost/app/lib/critical-css/source-providers/Source_Providers.php b/projects/plugins/boost/app/lib/critical-css/source-providers/Source_Providers.php
@@ -38,12 +38,12 @@ class Source_Providers {
 	 * @var Provider[]
 	 */
 	protected $providers = array(
+		Cornerstone_Provider::class,
 		Post_ID_Provider::class,
 		WP_Core_Provider::class,
 		Singular_Post_Provider::class,
 		Archive_Provider::class,
 		Taxonomy_Provider::class,
-		Cornerstone_Provider::class,
 	);
 
 	public function get_providers() {
@@ -110,6 +110,10 @@ public function get_current_request_css() {
 		return $this->request_cached_css;
 	}
 
+	public function get_current_critical_css_key() {
+		return $this->current_critical_css_key;
+	}
+
 	/**
 	 * Get providers sources.
 	 *

diff --git a/...ts/plugins/boost/app/lib/critical-css/source-providers/providers/Cornerstone_Provider.php b/...ts/plugins/boost/app/lib/critical-css/source-providers/providers/Cornerstone_Provider.php
@@ -77,6 +77,12 @@ public static function get_keys() {
 	 * @inheritdoc
 	 */
 	public static function get_hash_for_url( $url ) {
+		// Remove the home_url from the beginning of the URL.
+		$home_url = home_url();
+		if ( stripos( $url, $home_url ) === 0 ) {
+			$url = substr( $url, strlen( $home_url ) );
+		}
+
 		$hash = hash( 'md5', $url );
 
 		return substr( $hash, 0, 8 );

diff --git a/projects/plugins/boost/app/modules/optimizations/cloud-css/Cloud_CSS.php b/projects/plugins/boost/app/modules/optimizations/cloud-css/Cloud_CSS.php
@@ -117,6 +117,10 @@ public function display_critical_css() {
 			return;
 		}
 
+		if ( defined( 'WP_DEBUG' ) && WP_DEBUG === true ) {
+			$critical_css = "/* Critical CSS Key: {$this->paths->get_current_critical_css_key()} */\n" . $critical_css;
+		}
+
 		$display = new Display_Critical_CSS( $critical_css );
 		add_action( 'wp_head', array( $display, 'display_critical_css' ), 0 );
 		add_filter( 'style_loader_tag', array( $display, 'asynchronize_stylesheets' ), 10, 4 );

diff --git a/projects/plugins/boost/app/modules/optimizations/critical-css/Critical_CSS.php b/projects/plugins/boost/app/modules/optimizations/critical-css/Critical_CSS.php
@@ -94,6 +94,10 @@ public function display_critical_css() {
 			return;
 		}
 
+		if ( defined( 'WP_DEBUG' ) && WP_DEBUG === true ) {
+			$critical_css = "/* Critical CSS Key: {$this->paths->get_current_critical_css_key()} */\n" . $critical_css;
+		}
+
 		$display = new Display_Critical_CSS( $critical_css );
 		add_action( 'wp_head', array( $display, 'display_critical_css' ), 0 );
 		add_filter( 'style_loader_tag', array( $display, 'asynchronize_stylesheets' ), 10, 4 );

diff --git a/projects/plugins/boost/changelog/fix-ccss-cornerstone-provider-priority b/projects/plugins/boost/changelog/fix-ccss-cornerstone-provider-priority
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Change to an unreleased feature
+
+