Merge branch 'trunk' into update/block-bindings-remove-experimental-flag

changelog.txt

@@ -1,5 +1,22 @@
 == Changelog ==
 
+= 17.5.1 =
+
+## Changelog
+
+### Bug Fixes
+
+- (Preferences)(hotfix)(17.5) Hotfix for missing preferences in the `core` scope([58031](https://github.com/WordPress/gutenberg/pull/58031))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@youknowriad @fullofcaffeine 
+
+
+
+
 = 17.5.0 =
 
 ## Changelog

docs/getting-started/fundamentals/block-wrapper.md

@@ -2,16 +2,16 @@
 
 Each block's markup is wrapped by a container HTML tag that needs to have the proper attributes to fully work in the Block Editor and to reflect the proper block's style settings when rendered in the Block Editor and the front end. As developers, we have full control over the block's markup, and WordPress provides the tools to add the attributes that need to exist on the wrapper to our block's markup.
 
-Ensuring proper attributes to the block wrapper is especially important when using custom styling or features like `supports`. 
+Ensuring proper attributes to the block wrapper is especially important when using custom styling or features like `supports`.
 
 <div class="callout callout-info">
 The use of <code>supports</code> generates a set of properties that need to be manually added to the wrapping element of the block so they're properly stored as part of the block data.
 </div>
 
 A block can have three sets of markup defined, each one of them with a specific target and purpose:
 
-- The one for the **Block Editor**, defined through a `edit` React component passed to [`registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/#registerblocktype) when registering the block in the client. 
-- The one used to **save the block in the DB**, defined through a `save` function passed to `registerBlockType` when registering the block in the client. 
+- The one for the **Block Editor**, defined through a `edit` React component passed to [`registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/#registerblocktype) when registering the block in the client.
+- The one used to **save the block in the DB**, defined through a `save` function passed to `registerBlockType` when registering the block in the client.
     - This markup will be returned to the front end on request if no dynamic render has been defined for the block.
 - The one used to **dynamically render the markup of the block** returned to the front end on request, defined through the `render_callback` on [`register_block_type`](https://developer.wordpress.org/reference/functions/register_block_type/) or the [`render`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#render) PHP file in `block.json`
     - If defined, this server-side generated markup will be returned to the front end, ignoring the markup stored in DB.
@@ -21,13 +21,13 @@ For the [`edit` React component and the `save` function](https://developer.wordp
 
 ## The Edit component's markup
 
-The [`useBlockProps()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/#useblockprops) hook available on the [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor) allows passing the required attributes for the Block Editor to the `edit` block's outer wrapper. 
+The [`useBlockProps()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/#useblockprops) hook available on the [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor) allows passing the required attributes for the Block Editor to the `edit` block's outer wrapper.
 
 Among other things, the `useBlockProps()` hook takes care of including in this wrapper:
-- An `id` for the block's markup 
-- Some accesibility and `data-` attributes
+- An `id` for the block's markup
+- Some accessibility and `data-` attributes
 - Classes and inline styles reflecting custom settings, which include by default:
-    - The `wp-block` class 
+    - The `wp-block` class
     - A class that contains the name of the block with its namespace
 
 For example, for the following piece of code of a block's registration in the client...
@@ -43,18 +43,18 @@ _(see the [code above](https://github.com/WordPress/block-development-examples/b
 
 ...the markup of the block in the Block Editor could look like this:
 ```html
-<p 
-    tabindex="0" 
-    id="block-4462939a-b918-44bb-9b7c-35a0db5ab8fe" 
-    role="document" 
-    aria-label="Block: Minimal Gutenberg Block ca6eda" 
-    data-block="4462939a-b918-44bb-9b7c-35a0db5ab8fe" 
-    data-type="block-development-examples/minimal-block-ca6eda" 
-    data-title="Minimal Gutenberg Block ca6eda" 
+<p
+    tabindex="0"
+    id="block-4462939a-b918-44bb-9b7c-35a0db5ab8fe"
+    role="document"
+    aria-label="Block: Minimal Gutenberg Block ca6eda"
+    data-block="4462939a-b918-44bb-9b7c-35a0db5ab8fe"
+    data-type="block-development-examples/minimal-block-ca6eda"
+    data-title="Minimal Gutenberg Block ca6eda"
     class="
-        block-editor-block-list__block 
-        wp-block 
-        is-selected 
+        block-editor-block-list__block
+        wp-block
+        is-selected
         wp-block-block-development-examples-minimal-block-ca6eda
     "
 >Hello World - Block Editor</p>
@@ -87,16 +87,16 @@ _(see the [code above](https://github.com/WordPress/block-development-examples/b
 <p class="wp-block-block-development-examples-minimal-block-ca6eda">Hello World – Frontend</p>
 ```
 
-Any additional classes and attributes for the `save` function of the block should be passed as an argument of `useBlockProps.save()` (see [example](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/stylesheets-79a4c3/src/save.js)). 
+Any additional classes and attributes for the `save` function of the block should be passed as an argument of `useBlockProps.save()` (see [example](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/stylesheets-79a4c3/src/save.js)).
 
 When you add `supports` for any feature, the proper classes get added to the object returned by the `useBlockProps.save()` hook.
 
 ```html
 <p class="
-    wp-block-block-development-examples-block-supports-6aa4dd 
-    has-accent-4-color 
-    has-contrast-background-color 
-    has-text-color 
+    wp-block-block-development-examples-block-supports-6aa4dd
+    has-accent-4-color
+    has-contrast-background-color
+    has-text-color
     has-background
 ">Hello World</p>
 ```
@@ -105,10 +105,10 @@ _(check the [example](https://github.com/WordPress/block-development-examples/tr
 
 ## The server-side render markup
 
-Any markup in the server-side render definition for the block can use the [`get_block_wrapper_attributes()`](https://developer.wordpress.org/reference/functions/get_block_wrapper_attributes/) function to generate the string of attributes required to reflect the block settings (see [example](https://github.com/WordPress/block-development-examples/blob/f68640f42d993f0866d1879f67c73910285ca114/plugins/block-dynamic-rendering-64756b/src/render.php#L11)). 
+Any markup in the server-side render definition for the block can use the [`get_block_wrapper_attributes()`](https://developer.wordpress.org/reference/functions/get_block_wrapper_attributes/) function to generate the string of attributes required to reflect the block settings (see [example](https://github.com/WordPress/block-development-examples/blob/f68640f42d993f0866d1879f67c73910285ca114/plugins/block-dynamic-rendering-64756b/src/render.php#L11)).
 
 ```php
 <p <?php echo get_block_wrapper_attributes(); ?>>
 	<?php esc_html_e( 'Block with Dynamic Rendering – hello!!!', 'block-development-examples' ); ?>
 </p>
-```
+```

docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md

@@ -208,13 +208,13 @@ export const withBookQueryControls = ( BlockEdit ) => ( props ) => {
 	// function to handle that.
 	return isMyBooksVariation( props ) ? (
 		<>
-			<BlockEdit { ...props } />
+			<BlockEdit key="edit" { ...props } />
 			<InspectorControls>
 				<BookAuthorSelector /> { /** Our custom component */ }
 			</InspectorControls>
 		</>
 	) : (
-		<BlockEdit { ...props } />
+		<BlockEdit key="edit" { ...props } />
 	);
 };
 

docs/reference-guides/core-blocks.md

@@ -42,7 +42,7 @@ Create and save content to reuse across your site. Update the pattern, and the c
 -	**Name:** core/block
 -	**Category:** reusable
 -	**Supports:** ~~customClassName~~, ~~html~~, ~~inserter~~, ~~renaming~~
--	**Attributes:** ref
+-	**Attributes:** overrides, ref
 
 ## Button
 

docs/reference-guides/filters/block-filters.md

@@ -19,11 +19,11 @@ _Example_:
 ```php
 <?php
 
-function filter_metadata_registration( $metadata ) {
+function wpdocs_filter_metadata_registration( $metadata ) {
 	$metadata['apiVersion'] = 1;
 	return $metadata;
 };
-add_filter( 'block_type_metadata', 'filter_metadata_registration' );
+add_filter( 'block_type_metadata', 'wpdocs_filter_metadata_registration' );
 
 register_block_type( __DIR__ );
 ```
@@ -40,11 +40,11 @@ The filter takes two params:
 _Example:_
 
 ```php
-function filter_metadata_registration( $settings, $metadata ) {
+function wpdocs_filter_metadata_registration( $settings, $metadata ) {
 	$settings['api_version'] = $metadata['apiVersion'] + 1;
 	return $settings;
 };
-add_filter( 'block_type_metadata_settings', 'filter_metadata_registration', 10, 2 );
+add_filter( 'block_type_metadata_settings', 'wpdocs_filter_metadata_registration', 10, 2 );
 
 register_block_type( __DIR__ );
 ```
@@ -189,7 +189,7 @@ const withMyPluginControls = createHigherOrderComponent( ( BlockEdit ) => {
 	return ( props ) => {
 		return (
 			<>
-				<BlockEdit { ...props } />
+				<BlockEdit key="edit" { ...props } />
 				<InspectorControls>
 					<PanelBody>My custom control</PanelBody>
 				</InspectorControls>
@@ -352,14 +352,14 @@ On the server, you can filter the list of blocks shown in the inserter using the
 <?php
 // my-plugin.php
 
-function filter_allowed_block_types_when_post_provided( $allowed_block_types, $editor_context ) {
+function wpdocs_filter_allowed_block_types_when_post_provided( $allowed_block_types, $editor_context ) {
 	if ( ! empty( $editor_context->post ) ) {
 		return array( 'core/paragraph', 'core/heading' );
 	}
 	return $allowed_block_types;
 }
 
-add_filter( 'allowed_block_types_all', 'filter_allowed_block_types_when_post_provided', 10, 2 );
+add_filter( 'allowed_block_types_all', 'wpdocs_filter_allowed_block_types_when_post_provided', 10, 2 );
 ```
 
 ## Managing block categories
@@ -374,7 +374,7 @@ It is possible to filter the list of default block categories using the `block_c
 <?php
 // my-plugin.php
 
-function filter_block_categories_when_post_provided( $block_categories, $editor_context ) {
+function wpdocs_filter_block_categories_when_post_provided( $block_categories, $editor_context ) {
 	if ( ! empty( $editor_context->post ) ) {
 		array_push(
 			$block_categories,
@@ -388,7 +388,7 @@ function filter_block_categories_when_post_provided( $block_categories, $editor_
 	return $block_categories;
 }
 
-add_filter( 'block_categories_all', 'filter_block_categories_when_post_provided', 10, 2 );
+add_filter( 'block_categories_all', 'wpdocs_filter_block_categories_when_post_provided', 10, 2 );
 ```
 
 ### `wp.blocks.updateCategory`

docs/reference-guides/filters/editor-filters.md

@@ -84,14 +84,14 @@ _Example:_
 <?php
 // my-plugin.php
 
-function filter_block_editor_settings_when_post_provided( $editor_settings, $editor_context ) {
+function wpdocs_filter_block_editor_settings_when_post_provided( $editor_settings, $editor_context ) {
 	if ( ! empty( $editor_context->post ) ) {
 		$editor_settings['maxUploadFileSize'] = 12345;
 	}
 	return $editor_settings;
 }
 
-add_filter( 'block_editor_settings_all', 'filter_block_editor_settings_when_post_provided', 10, 2 );
+add_filter( 'block_editor_settings_all', 'wpdocs_filter_block_editor_settings_when_post_provided', 10, 2 );
 ```
 
 #### `block_editor_rest_api_preload_paths`
@@ -104,14 +104,14 @@ _Example:_
 <?php
 // my-plugin.php
 
-function filter_block_editor_rest_api_preload_paths_when_post_provided( $preload_paths, $editor_context ) {
+function wpdocs_filter_block_editor_rest_api_preload_paths_when_post_provided( $preload_paths, $editor_context ) {
 	if ( ! empty( $editor_context->post ) ) {
 		array_push( $preload_paths, array( '/wp/v2/blocks', 'OPTIONS' ) );
 	}
 	return $preload_paths;
 }
 
-add_filter( 'block_editor_rest_api_preload_paths', 'filter_block_editor_rest_api_preload_paths_when_post_provided', 10, 2 );
+add_filter( 'block_editor_rest_api_preload_paths', 'wpdocs_filter_block_editor_rest_api_preload_paths_when_post_provided', 10, 2 );
 ```
 
 ### Available default editor settings

docs/reference-guides/filters/global-styles-filters.md

@@ -14,7 +14,7 @@ _Example:_
 This is how to pass a new color palette for the theme and disable the text color UI:
 
 ```php
-function filter_theme_json_theme( $theme_json ){
+function wpdocs_filter_theme_json_theme( $theme_json ){
 	$new_data = array(
 		'version'  => 2,
 		'settings' => array(
@@ -38,5 +38,5 @@ function filter_theme_json_theme( $theme_json ){
 
 	return $theme_json->update_with( $new_data );
 }
-add_filter( 'wp_theme_json_data_theme', 'filter_theme_json_theme' );
+add_filter( 'wp_theme_json_data_theme', 'wpdocs_filter_theme_json_theme' );
 ```

docs/reference-guides/filters/parser-filters.md

@@ -26,11 +26,11 @@ class EmptyParser {
   }
 }
 
-function my_plugin_select_empty_parser( $prev_parser_class ) {
+function wpdocs_select_empty_parser( $prev_parser_class ) {
     return 'EmptyParser';
 }
 
-add_filter( 'block_parser_class', 'my_plugin_select_empty_parser', 10, 1 );
+add_filter( 'block_parser_class', 'wpdocs_select_empty_parser', 10, 1 );
 ```
 
 > **Note**: At the present time it's not possible to replace the client-side parser.

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.3
  * Requires PHP: 7.0
- * Version: 17.5.0
+ * Version: 17.5.1
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *

lib/blocks.php

@@ -440,27 +440,6 @@ function gutenberg_legacy_wp_block_post_meta( $value, $object_id, $meta_key, $si
 add_filter( 'default_post_metadata', 'gutenberg_legacy_wp_block_post_meta', 10, 4 );
 
 
-/**
- * Registers the metadata block attribute for all block types.
- *
- * @param array $args Array of arguments for registering a block type.
- * @return array $args
- */
-function gutenberg_register_metadata_attribute( $args ) {
-	// Setup attributes if needed.
-	if ( ! isset( $args['attributes'] ) || ! is_array( $args['attributes'] ) ) {
-		$args['attributes'] = array();
-	}
-
-	if ( ! array_key_exists( 'metadata', $args['attributes'] ) ) {
-		$args['attributes']['metadata'] = array(
-			'type' => 'object',
-		);
-	}
-
-	return $args;
-}
-add_filter( 'register_block_type_args', 'gutenberg_register_metadata_attribute' );
 
 /**
  * Strips all HTML from the content of footnotes, and sanitizes the ID.

lib/class-wp-theme-json-gutenberg.php

@@ -1010,7 +1010,7 @@ protected static function get_blocks_metadata() {
 
 				if ( $duotone_support ) {
 					$root_selector    = wp_get_block_css_selector( $block_type );
-					$duotone_selector = WP_Theme_JSON_Gutenberg::scope_selector( $root_selector, $duotone_support );
+					$duotone_selector = static::scope_selector( $root_selector, $duotone_support );
 				}
 			}
 
@@ -1185,7 +1185,7 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 				$setting_nodes[ $root_settings_key ]['selector'] = $options['root_selector'];
 			}
 			if ( false !== $root_style_key ) {
-				$setting_nodes[ $root_style_key ]['selector'] = $options['root_selector'];
+				$style_nodes[ $root_style_key ]['selector'] = $options['root_selector'];
 			}
 		}
 

lib/compat/wordpress-6.5/block-patterns.php

@@ -49,7 +49,7 @@ function gutenberg_register_taxonomy_patterns() {
 			'singular_name'              => _x( 'Pattern Category', 'taxonomy singular name' ),
 			'add_new_item'               => __( 'Add New Category' ),
 			'add_or_remove_items'        => __( 'Add or remove pattern categories' ),
-			'back_to_items'              => __( '← Go to pattern categories' ),
+			'back_to_items'              => __( '← Go to Pattern Categories' ),
 			'choose_from_most_used'      => __( 'Choose from the most used pattern categories' ),
 			'edit_item'                  => __( 'Edit Pattern Category' ),
 			'item_link'                  => __( 'Pattern Category Link' ),