[Boost] Fix styles around CSS and JS concatenate options (#35150)

* Fix JS and CSS minify styles * Cleanup * changelog * version bump boost, as required by monorepo tooling --------- Co-authored-by: Mark George <[email protected]>
Automattic · Jan 22, 2024 · 0b37082 · 0b37082
1 parent b8e9e8b
commit 0b37082
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 9 deletions.
diff --git a/projects/plugins/boost/app/assets/src/js/features/minify-meta/minify-meta.module.scss b/projects/plugins/boost/app/assets/src/js/features/minify-meta/minify-meta.module.scss
@@ -1,5 +1,17 @@
 @import "../../../css/main/variables.scss";
 
+.minify-meta {
+	align-items: flex-start;
+	display: flex;
+	flex-direction: row;
+	font-size: 14px;
+	line-height: 22px;
+}
+
+.summary {
+	flex-grow: 1;
+}
+
 .manage-excludes {
 	display: flex;
 	flex-direction: column;

diff --git a/projects/plugins/boost/app/assets/src/js/features/minify-meta/minify-meta.tsx b/projects/plugins/boost/app/assets/src/js/features/minify-meta/minify-meta.tsx
@@ -21,7 +21,7 @@ const MetaComponent = ( { inputLabel, buttonText, placeholder, datasyncKey }: Pr
 	const htmlId = `jb-minify-meta-${ datasyncKey }`;
 
 	return (
-		<div className="jb-critical-css__meta">
+		<div className={ styles[ 'minify-meta' ] }>
 			{ isEditing ? (
 				<div className={ styles[ 'manage-excludes' ] }>
 					<label htmlFor={ htmlId }>{ inputLabel }</label>
@@ -43,7 +43,7 @@ const MetaComponent = ( { inputLabel, buttonText, placeholder, datasyncKey }: Pr
 				</div>
 			) : (
 				<>
-					<div className="summary">
+					<div className={ styles.summary }>
 						{ values.length > 0 && (
 							<div className="successes">
 								{ sprintf(

diff --git a/projects/plugins/boost/app/assets/src/js/lib/stores/minify.ts b/projects/plugins/boost/app/assets/src/js/lib/stores/minify.ts
@@ -19,5 +19,5 @@ export const useMetaQuery = ( key: MinifyMetaKeys ) => {
 		mutate( text.split( ',' ).map( item => item.trim() ) );
 	}
 
-	return [ data, updateValues ] as const;
+	return [ data || [], updateValues ] as const;
 };
diff --git a/projects/plugins/boost/changelog/fix-minify-styles b/projects/plugins/boost/changelog/fix-minify-styles
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Fixed broken styling around css and js minify
+
+
diff --git a/projects/plugins/boost/composer.json b/projects/plugins/boost/composer.json
@@ -3,7 +3,7 @@
 	"description": "Boost your WordPress site's performance, from the creators of Jetpack",
 	"type": "library",
 	"license": "GPL-2.0-or-later",
-	"version": "3.0.0-beta",
+	"version": "3.0.1-alpha",
 	"authors": [
 		{
 			"name": "Automattic, Inc.",
@@ -73,7 +73,7 @@
 		"platform": {
 			"ext-intl": "0.0.0"
 		},
-		"autoloader-suffix": "b1e77e6231d50e7663f84529b6a3dfda_jetpack_boostⓥ3_0_0_beta",
+		"autoloader-suffix": "b1e77e6231d50e7663f84529b6a3dfda_jetpack_boostⓥ3_0_1_alpha",
 		"allow-plugins": {
 			"roots/wordpress-core-installer": true,
 			"automattic/jetpack-autoloader": true,

diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
diff --git a/projects/plugins/boost/jetpack-boost.php b/projects/plugins/boost/jetpack-boost.php
@@ -9,7 +9,7 @@
  * Plugin Name:       Jetpack Boost
  * Plugin URI:        https://jetpack.com/boost
  * Description:       Boost your WordPress site's performance, from the creators of Jetpack
- * Version: 3.0.0-beta
+ * Version: 3.0.1-alpha
  * Author:            Automattic - Jetpack Site Speed team
  * Author URI:        https://jetpack.com/boost/
  * License:           GPL-2.0+
@@ -29,7 +29,7 @@
 	die;
 }
 
-define( 'JETPACK_BOOST_VERSION', '3.0.0-beta' );
+define( 'JETPACK_BOOST_VERSION', '3.0.1-alpha' );
 define( 'JETPACK_BOOST_SLUG', 'jetpack-boost' );
 
 if ( ! defined( 'JETPACK_BOOST_CLIENT_NAME' ) ) {

diff --git a/projects/plugins/boost/package.json b/projects/plugins/boost/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-boost",
-	"version": "3.0.0-beta",
+	"version": "3.0.1-alpha",
 	"description": "Boost your WordPress site's performance, from the creators of Jetpack",
 	"directories": {
 		"test": "tests"