From 27f2e18b43f8efa9d33f1d39184a1eed29fde822 Mon Sep 17 00:00:00 2001 From: Jeff Ong Date: Mon, 9 May 2022 09:21:20 -0400 Subject: [PATCH 1/3] Fix theme styles dependency load. --- lib/compat/wordpress-6.0/client-assets.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/compat/wordpress-6.0/client-assets.php b/lib/compat/wordpress-6.0/client-assets.php index 77f0593dc8778f..32859ef796d5e6 100644 --- a/lib/compat/wordpress-6.0/client-assets.php +++ b/lib/compat/wordpress-6.0/client-assets.php @@ -45,10 +45,13 @@ function gutenberg_resolve_assets() { $style_handles = array( 'wp-block-editor', 'wp-block-library', - 'wp-block-library-theme', - 'wp-edit-blocks', + 'wp-edit-blocks' ); + if ( current_theme_supports( 'wp-block-styles' ) ) { + $style_handles[] = 'wp-block-styles'; + } + if ( 'widgets.php' === $pagenow || 'customize.php' === $pagenow ) { $style_handles[] = 'wp-widgets'; $style_handles[] = 'wp-edit-widgets'; From 51d674f74d5ee4c6e97aabd2dbc6951511fdf1ce Mon Sep 17 00:00:00 2001 From: Jeff Ong Date: Mon, 9 May 2022 09:30:55 -0400 Subject: [PATCH 2/3] Use preferrend handle. --- lib/compat/wordpress-6.0/client-assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compat/wordpress-6.0/client-assets.php b/lib/compat/wordpress-6.0/client-assets.php index 32859ef796d5e6..993cea46e49a3b 100644 --- a/lib/compat/wordpress-6.0/client-assets.php +++ b/lib/compat/wordpress-6.0/client-assets.php @@ -49,7 +49,7 @@ function gutenberg_resolve_assets() { ); if ( current_theme_supports( 'wp-block-styles' ) ) { - $style_handles[] = 'wp-block-styles'; + $style_handles[] = 'wp-block-library-theme'; } if ( 'widgets.php' === $pagenow || 'customize.php' === $pagenow ) { From 742d632f8b6e9ed345c44e072ca1a73da37856f5 Mon Sep 17 00:00:00 2001 From: Jeff Ong Date: Mon, 9 May 2022 09:48:15 -0400 Subject: [PATCH 3/3] Fix linting bug. --- lib/compat/wordpress-6.0/client-assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compat/wordpress-6.0/client-assets.php b/lib/compat/wordpress-6.0/client-assets.php index 993cea46e49a3b..0c5697817a94a8 100644 --- a/lib/compat/wordpress-6.0/client-assets.php +++ b/lib/compat/wordpress-6.0/client-assets.php @@ -45,7 +45,7 @@ function gutenberg_resolve_assets() { $style_handles = array( 'wp-block-editor', 'wp-block-library', - 'wp-edit-blocks' + 'wp-edit-blocks', ); if ( current_theme_supports( 'wp-block-styles' ) ) {