Boost: Make sure source provider URLs are unique

projects/plugins/boost/app/assets/src/js/features/critical-css/lib/critical-css-errors.ts

@@ -62,12 +62,15 @@ export function getPrimaryErrorSet( cssState: CriticalCssState ): ErrorSet | und
 		return undefined;
 	}
 
-	const primaryProviders = [ 'core_front_page', 'core_posts_page' ];
+	const isImportantProvider = ( provider: Provider ) => {
+		return provider.key.includes( 'cornerstone' ) || provider.key === 'core_front_page';
+	};
 
-	for ( const key of primaryProviders ) {
-		const provider = providersWithErrors.find( p => p.key === key );
-		if ( provider && provider.errors ) {
-			return getPrimaryGroupedError( provider.errors );
+	for ( const provider of providersWithErrors ) {
+		if ( isImportantProvider( provider ) ) {
+			if ( provider.errors ) {
+				return getPrimaryGroupedError( provider.errors );
+			}
 		}
 	}
 

projects/plugins/boost/app/lib/Cornerstone_Pages.php

@@ -14,7 +14,7 @@ class Cornerstone_Pages implements Has_Setup {
 	public function setup() {
 		$this->register_ds_stores();
 
-		add_filter( 'jetpack_boost_critical_css_providers', array( $this, 'remove_ccss_front_page_provider' ), 10, 2 );
+		add_filter( 'jetpack_boost_critical_css_providers', array( $this, 'remove_core_posts_page' ), 10, 2 );
 		add_filter( 'display_post_states', array( $this, 'add_display_post_states' ), 10, 2 );
 		add_action( 'init', array( $this, 'set_default_pages' ), 0 );
 	}
@@ -32,16 +32,32 @@ private function register_ds_stores() {
 		jetpack_boost_register_readonly_option( 'cornerstone_pages_properties', array( $this, 'get_properties' ) );
 	}
 
-	public function remove_ccss_front_page_provider( $providers ) {
+	/**
+	 * Remove the core posts page provider from the list of
+	 * Cornerstone Pages only if there's no static front page,
+	 * but there's a posts page set.
+	 *
+	 * @param array $providers The list of providers.
+	 *
+	 * @return array
+	 */
+	public function remove_core_posts_page( $providers ) {
 		$filtered_providers = array();
-
-		foreach ( $providers as $provider ) {
-			if ( $provider['key'] !== 'core_front_page' ) {
-				$filtered_providers[] = $provider;
+		$front_page         = (int) get_option( 'page_on_front' );
+		$posts_page         = (int) get_option( 'page_for_posts' );
+
+		// Only filter out core_posts_page if there's no static front page but there is a posts page
+		if ( ! $front_page && $posts_page ) {
+			foreach ( $providers as $provider ) {
+				if ( $provider['key'] !== 'core_posts_page' ) {
+					$filtered_providers[] = $provider;
+				}
 			}
+
+			return $filtered_providers;
 		}
 
-		return $filtered_providers;
+		return $providers;
 	}
 
 	private function default_pages() {
@@ -55,8 +71,9 @@ private function default_pages() {
 
 		$homepage = array( '' );
 
-		$urls = array_unique( array_merge( $homepage, $woocommerce_pages, $yoast_cornerstone_pages ) );
+		$urls = array_merge( $homepage, $woocommerce_pages, $yoast_cornerstone_pages );
 		$urls = array_map( 'untrailingslashit', $urls );
+		$urls = array_unique( $urls );
 
 		return array_slice( $urls, 0, $max_pages );
 	}

projects/plugins/boost/app/lib/critical-css/source-providers/Source_Providers.php

@@ -114,24 +114,51 @@ public function get_current_critical_css_key() {
 		return $this->current_critical_css_key;
 	}
 
+	/**
+	 * Get a flat array of URLs for a provider.
+	 *
+	 * @param string $provider The provider class name.
+	 * @param array  $context_posts The context posts.
+	 *
+	 * @return array
+	 */
+	public function get_provider_urls_flat( $provider, $context_posts = array() ) {
+		$urls      = $provider::get_critical_source_urls( $context_posts );
+		$flat_urls = array();
+		foreach ( $urls as $url ) {
+			$flat_urls = array_merge( $flat_urls, $url );
+		}
+		return $flat_urls;
+	}
+
+	/**
+	 * Get the URLs of the important providers.
+	 * Important providers are the ones Boost checks against
+	 * if critical css generation fails
+	 *
+	 * @param array $context_posts The context posts.
+	 *
+	 * @return array
+	 */
+	public function get_important_provider_urls( $context_posts = array() ) {
+		$important_provider_urls = array();
+
+		$wp_core_provider_urls     = $this->get_provider_urls_flat( WP_Core_Provider::class, $context_posts );
+		$cornerstone_provider_urls = $this->get_provider_urls_flat( Cornerstone_Provider::class, $context_posts );
+		$important_provider_urls   = array_merge( $wp_core_provider_urls, $cornerstone_provider_urls );
+
+		return array_values( array_unique( $important_provider_urls ) );
+	}
+
 	/**
 	 * Get providers sources.
 	 *
 	 * @return array
 	 */
 	public function get_provider_sources( $context_posts = array() ) {
-		$sources                        = array();
-		$flat_core_and_cornerstone_urls = array();
-
-		$wp_core_provider_urls = WP_Core_Provider::get_critical_source_urls( $context_posts );
-		foreach ( $wp_core_provider_urls as $urls ) {
-			$flat_core_and_cornerstone_urls = array_merge( $flat_core_and_cornerstone_urls, $urls );
-		}
-		$cornerstone_provider_urls = Cornerstone_Provider::get_critical_source_urls( $context_posts );
-		foreach ( $cornerstone_provider_urls as $urls ) {
-			$flat_core_and_cornerstone_urls = array_merge( $flat_core_and_cornerstone_urls, $urls );
-		}
-		$flat_core_and_cornerstone_urls = array_values( array_unique( $flat_core_and_cornerstone_urls ) );
+		$sources                   = array();
+		$important_provider_urls   = $this->get_important_provider_urls( $context_posts );
+		$cornerstone_provider_urls = $this->get_provider_urls_flat( Cornerstone_Provider::class, $context_posts );
 
 		foreach ( $this->get_providers() as $provider ) {
 			$provider_name = $provider::get_provider_name();
@@ -146,7 +173,12 @@ public function get_provider_sources( $context_posts = array() ) {
 				// This removes core and cornerstone URLs from the list of URLs,
 				// so they don't belong to two separate groups.
 				if ( ! in_array( $provider, array( WP_Core_Provider::class, Cornerstone_Provider::class ), true ) ) {
-					$urls = array_values( array_diff( $urls, $flat_core_and_cornerstone_urls ) );
+					$urls = array_values( array_diff( $urls, $important_provider_urls ) );
+				}
+
+				// Remove WP Core URLs if they are in the Cornerstone URLs list.
+				if ( WP_Core_Provider::class === $provider ) {
+					$urls = array_values( array_diff( $urls, $cornerstone_provider_urls ) );
 				}
 
 				if ( empty( $urls ) ) {

projects/plugins/boost/app/lib/critical-css/source-providers/providers/WP_Core_Provider.php

@@ -30,13 +30,6 @@ public static function get_critical_source_urls( $context_posts = array() ) {
 		$front_page = (int) get_option( 'page_on_front' );
 		$posts_page = (int) get_option( 'page_for_posts' );
 
-		if ( ! empty( $front_page ) && empty( $context_posts ) ) {
-			$permalink = get_permalink( $front_page );
-			if ( ! empty( $permalink ) ) {
-				$urls['front_page'] = array( $permalink );
-			}
-		}
-
 		$context_post_types = wp_list_pluck( $context_posts, 'post_type' );
 		$context_post_ids   = wp_list_pluck( $context_posts, 'ID' );
 

projects/plugins/boost/changelog/update-dedpulicate-source-provider-urls

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Critical CSS: Make sure URLs used for generation are unique.