Merge branch 'trunk' of personal.github.com:WordPress/gutenberg into …

…update/gallery-block-image-link-control
WordPress · Jul 25, 2024 · a321288 · a321288
2 parents f3e8341 + 3dfdfef
commit a321288
Show file tree

Hide file tree

Showing 209 changed files with 1,095 additions and 304 deletions.
diff --git a/backport-changelog/6.6/7088.md b/backport-changelog/6.6/7088.md
@@ -0,0 +1,4 @@
+https://github.com/WordPress/wordpress-develop/pull/7088
+
+* https://github.com/WordPress/gutenberg/pull/63918
+
diff --git a/changelog.txt b/changelog.txt
diff --git a/docs/reference-guides/data/data-core-block-editor.md b/docs/reference-guides/data/data-core-block-editor.md
@@ -412,7 +412,7 @@ Returns all blocks that match a blockName. Results include nested blocks.
 _Parameters_
 
 -   _state_ `Object`: Global application state.
--   _blockName_ `?string`: Optional block name, if not specified, returns an empty array.
+-   _blockName_ `string[]`: Block name(s) for which clientIds are to be returned.
 
 _Returns_
 

diff --git a/gutenberg.php b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
  * Requires at least: 6.4
  * Requires PHP: 7.2
- * Version: 18.8.0
+ * Version: 18.9.0-rc.1
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *

diff --git a/lib/block-supports/block-style-variations.php b/lib/block-supports/block-style-variations.php
@@ -191,7 +191,7 @@ function gutenberg_render_block_style_variation_support_styles( $parsed_block )
 		return $parsed_block;
 	}
 
-	wp_register_style( 'block-style-variation-styles', false, array( 'global-styles', 'wp-block-library' ) );
+	wp_register_style( 'block-style-variation-styles', false, array( 'wp-block-library', 'global-styles' ) );
 	wp_add_inline_style( 'block-style-variation-styles', $variation_styles );
 
 	/*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		https://github.com/WordPress/wordpress-develop/pull/7088

		* https://github.com/WordPress/gutenberg/pull/63918