From 0b370829e702031b5a7a164fcb83e8c5c00e0e33 Mon Sep 17 00:00:00 2001 From: thingalon Date: Mon, 22 Jan 2024 18:46:22 +1100 Subject: [PATCH] [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 --- .../js/features/minify-meta/minify-meta.module.scss | 12 ++++++++++++ .../src/js/features/minify-meta/minify-meta.tsx | 4 ++-- .../boost/app/assets/src/js/lib/stores/minify.ts | 2 +- projects/plugins/boost/changelog/fix-minify-styles | 5 +++++ projects/plugins/boost/composer.json | 4 ++-- projects/plugins/boost/composer.lock | 2 +- projects/plugins/boost/jetpack-boost.php | 4 ++-- projects/plugins/boost/package.json | 2 +- 8 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 projects/plugins/boost/changelog/fix-minify-styles 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 index d7b8031c96ec4..7bb12b5ff51f2 100644 --- 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 index 79f62ef16fe48..4d4720232f1cb 100644 --- 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 ( -
+
{ isEditing ? (
@@ -43,7 +43,7 @@ const MetaComponent = ( { inputLabel, buttonText, placeholder, datasyncKey }: Pr
) : ( <> -
+
{ values.length > 0 && (
{ 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 index 5cf9c2879f36e..7462d713640d1 100644 --- 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 new file mode 100644 index 0000000000000..1362fad89db3e --- /dev/null +++ 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 index dc835302c29c7..8ccc0a219824d 100644 --- 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 index 1b2061645e54b..8302ea6f5ea07 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fd241c30e6f21482ba888653acd84365", + "content-hash": "e4889bcb1b5b1386867dab62ac643c89", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", diff --git a/projects/plugins/boost/jetpack-boost.php b/projects/plugins/boost/jetpack-boost.php index 62def9b64ecfe..0fdf3df2c501e 100644 --- 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 index 7948a4f7b4519..c6e393f1de76a 100644 --- 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"