Boost: Update CSS minification library (#40956)

Automattic · Jan 14, 2025 · e9d9bc9 · e9d9bc9
1 parent 9b21c70
commit e9d9bc9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 74 deletions.
diff --git a/projects/plugins/boost/.gitattributes b/projects/plugins/boost/.gitattributes
@@ -13,7 +13,6 @@ vendor/automattic/**                            production-include
 vendor/composer/**                              production-include
 vendor/jetpack-autoloader/**                    production-include
 vendor/tedivm/**                                production-include
-vendor/tubalmartin/**                           production-include
 vendor/matthiasmullie/**                        production-include
 vendor/wikimedia/aho-corasick/**                production-include
 

diff --git a/projects/plugins/boost/app/lib/class-minify.php b/projects/plugins/boost/app/lib/class-minify.php
@@ -9,19 +9,14 @@
 
 namespace Automattic\Jetpack_Boost\Lib;
 
+use MatthiasMullie\Minify\CSS as CSSMinifier;
 use MatthiasMullie\Minify\JS as JSMinifier;
-use tubalmartin\CssMin\Minifier as CSSMinifier;
 
 /**
  * Class Minify
  */
 class Minify {
 
-	/**
-	 * @var CSSMinifier - Holds the CssMin\Minifier instance, for reuse on subsequent calls.
-	 */
-	private static $css_minifier;
-
 	/**
 	 * Strips whitespace from JavaScript scripts.
 	 *
@@ -44,10 +39,13 @@ public static function js( $js ) {
 	 * Minifies the supplied CSS code, returning its minified form.
 	 */
 	public static function css( $css ) {
-		if ( ! self::$css_minifier ) {
-			self::$css_minifier = new CSSMinifier();
+		try {
+			$minifier     = new CSSMinifier( $css );
+			$minified_css = $minifier->minify();
+		} catch ( \Exception $e ) {
+			return $css;
 		}
 
-		return self::$css_minifier->run( $css );
+		return $minified_css;
 	}
 }
diff --git a/projects/plugins/boost/changelog/update-boost-minify-css-library b/projects/plugins/boost/changelog/update-boost-minify-css-library
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Concatenate CSS: Fixed cases where minification might cause a file to load slower.
diff --git a/projects/plugins/boost/composer.json b/projects/plugins/boost/composer.json
@@ -30,8 +30,7 @@
 		"automattic/jetpack-status": "@dev",
 		"automattic/jetpack-sync": "@dev",
 		"automattic/jetpack-wp-js-data-sync": "@dev",
-		"matthiasmullie/minify": "^1.3",
-		"tubalmartin/cssmin": "^4.1"
+		"matthiasmullie/minify": "^1.3"
 	},
 	"require-dev": {
 		"automattic/jetpack-changelogger": "@dev",

diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
diff --git a/projects/plugins/boost/serve-minified-content.php b/projects/plugins/boost/serve-minified-content.php
@@ -3,10 +3,14 @@
 if ( ! defined( 'JETPACK_BOOST_CONCAT_USE_WP' ) ) {
 	define( 'JETPACK_BOOST_CONCAT_USE_WP', false );
 
-	// Load CSSmin.
-	require_once __DIR__ . '/vendor/tubalmartin/cssmin/src/Colors.php';
-	require_once __DIR__ . '/vendor/tubalmartin/cssmin/src/Utils.php';
-	require_once __DIR__ . '/vendor/tubalmartin/cssmin/src/Minifier.php';
+	// Load minification library.
+	require_once __DIR__ . '/vendor/matthiasmullie/minify/src/Exception.php';
+	require_once __DIR__ . '/vendor/matthiasmullie/minify/src/Minify.php';
+	require_once __DIR__ . '/vendor/matthiasmullie/minify/src/CSS.php';
+	require_once __DIR__ . '/vendor/matthiasmullie/minify/src/JS.php';
+	require_once __DIR__ . '/vendor/matthiasmullie/minify/src/Exceptions/BasicException.php';
+	require_once __DIR__ . '/vendor/matthiasmullie/minify/src/Exceptions/FileImportException.php';
+	require_once __DIR__ . '/vendor/matthiasmullie/minify/src/Exceptions/IOException.php';
 }
 
 // Load minify library code.