Merge branch 'trunk' into update-stylelint-dependency

.eslintrc.js

@@ -336,6 +336,7 @@ module.exports = {
 						'SelectControl',
 						'TextControl',
 						'ToggleGroupControl',
+						'UnitControl',
 					].map( ( componentName ) => ( {
 						// Falsy `__next40pxDefaultSize` without a non-default `size` prop.
 						selector: `JSXOpeningElement[name.name="${ componentName }"]:not(:has(JSXAttribute[name.name="__next40pxDefaultSize"][value.expression.value!=false])):not(:has(JSXAttribute[name.name="size"][value.value!="default"]))`,
@@ -351,7 +352,7 @@ module.exports = {
 							'FormFileUpload should have the `__next40pxDefaultSize` prop to opt-in to the new default size.',
 					},
 					// Temporary rules until all existing components have the `__next40pxDefaultSize` prop.
-					...[ 'Button', 'UnitControl' ].map( ( componentName ) => ( {
+					...[ 'Button' ].map( ( componentName ) => ( {
 						// Not strict. Allows pre-existing __next40pxDefaultSize={ false } usage until they are all manually updated.
 						selector: `JSXOpeningElement[name.name="${ componentName }"]:not(:has(JSXAttribute[name.name="__next40pxDefaultSize"])):not(:has(JSXAttribute[name.name="size"]))`,
 						message:

.github/workflows/bundle-size.yml

@@ -52,5 +52,5 @@ jobs:
             - uses: preactjs/compressed-size-action@f780fd104362cfce9e118f9198df2ee37d12946c # v2.6.0
               with:
                   repo-token: '${{ secrets.GITHUB_TOKEN }}'
-                  pattern: '{build/**/*.min.js,build/**/*.css}'
+                  pattern: '{build/**/*.min.js,build/**/*.css,build-module/**/*.min.js}'
                   clean-script: 'distclean'

backport-changelog/6.7/7258.md

@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7258
+
+* https://github.com/WordPress/gutenberg/pull/64570

bin/build-plugin-zip.sh

@@ -98,6 +98,7 @@ zip -r gutenberg.zip \
 	packages/block-serialization-default-parser/*.php \
 	post-content.php \
 	$build_files \
+	build-module \
 	readme.txt \
 	changelog.txt \
 	README.md

docs/manifest.json

@@ -1697,6 +1697,12 @@
 		"markdown_source": "../packages/eslint-plugin/README.md",
 		"parent": "packages"
 	},
+	{
+		"title": "@wordpress/fields",
+		"slug": "packages-fields",
+		"markdown_source": "../packages/fields/README.md",
+		"parent": "packages"
+	},
 	{
 		"title": "@wordpress/format-library",
 		"slug": "packages-format-library",

docs/reference-guides/block-api/block-context.md

@@ -141,7 +141,7 @@ export default function Edit( props ) {
 	return (
 		<div>
 			<TextControl
-				label={ __( 'Record ID:' ) }
+				label={ __( 'Record ID' ) }
 				value={ recordId }
 				onChange={ ( val ) =>
 					setAttributes( { recordId: Number( val ) } )

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.5
  * Requires PHP: 7.2
- * Version: 19.1.0
+ * Version: 19.2.0
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *

lib/compat/wordpress-6.6/rest-api.php

@@ -88,76 +88,116 @@ function gutenberg_register_global_styles_revisions_endpoints() {
 
 add_action( 'rest_api_init', 'gutenberg_register_global_styles_revisions_endpoints' );
 
-if ( ! function_exists( 'gutenberg_register_wp_rest_themes_stylesheet_directory_uri_field' ) ) {
-	/**
-	 * Adds `stylesheet_uri` fields to WP_REST_Themes_Controller class.
-	 */
-	function gutenberg_register_wp_rest_themes_stylesheet_directory_uri_field() {
-		register_rest_field(
-			'theme',
-			'stylesheet_uri',
-			array(
-				'get_callback' => function ( $item ) {
-					if ( ! empty( $item['stylesheet'] ) ) {
-						$theme         = wp_get_theme( $item['stylesheet'] );
-						$current_theme = wp_get_theme();
-						if ( $theme->get_stylesheet() === $current_theme->get_stylesheet() ) {
-							return get_stylesheet_directory_uri();
-						} else {
-							return $theme->get_stylesheet_directory_uri();
-						}
+/**
+ * Adds `stylesheet_uri` fields to WP_REST_Themes_Controller class.
+ */
+function gutenberg_register_wp_rest_themes_stylesheet_directory_uri_field() {
+	register_rest_field(
+		'theme',
+		'stylesheet_uri',
+		array(
+			'get_callback' => function ( $item ) {
+				if ( ! empty( $item['stylesheet'] ) ) {
+					$theme         = wp_get_theme( $item['stylesheet'] );
+					$current_theme = wp_get_theme();
+					if ( $theme->get_stylesheet() === $current_theme->get_stylesheet() ) {
+						return get_stylesheet_directory_uri();
+					} else {
+						return $theme->get_stylesheet_directory_uri();
 					}
+				}
 
-					return null;
-				},
-				'schema'       => array(
-					'type'        => 'string',
-					'description' => __( 'The uri for the theme\'s stylesheet directory.', 'gutenberg' ),
-					'format'      => 'uri',
-					'readonly'    => true,
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			)
-		);
-	}
+				return null;
+			},
+			'schema'       => array(
+				'type'        => 'string',
+				'description' => __( 'The uri for the theme\'s stylesheet directory.', 'gutenberg' ),
+				'format'      => 'uri',
+				'readonly'    => true,
+				'context'     => array( 'view', 'edit', 'embed' ),
+			),
+		)
+	);
 }
 add_action( 'rest_api_init', 'gutenberg_register_wp_rest_themes_stylesheet_directory_uri_field' );
 
-if ( ! function_exists( 'gutenberg_register_wp_rest_themes_template_directory_uri_field' ) ) {
-	/**
-	 * Adds `template_uri` fields to WP_REST_Themes_Controller class.
-	 */
-	function gutenberg_register_wp_rest_themes_template_directory_uri_field() {
-		register_rest_field(
-			'theme',
-			'template_uri',
-			array(
-				'get_callback' => function ( $item ) {
-					if ( ! empty( $item['stylesheet'] ) ) {
-						$theme         = wp_get_theme( $item['stylesheet'] );
-						$current_theme = wp_get_theme();
-						if ( $theme->get_stylesheet() === $current_theme->get_stylesheet() ) {
-							return get_template_directory_uri();
-						} else {
-							return $theme->get_template_directory_uri();
-						}
+/**
+ * Adds `template_uri` fields to WP_REST_Themes_Controller class.
+ */
+function gutenberg_register_wp_rest_themes_template_directory_uri_field() {
+	register_rest_field(
+		'theme',
+		'template_uri',
+		array(
+			'get_callback' => function ( $item ) {
+				if ( ! empty( $item['stylesheet'] ) ) {
+					$theme         = wp_get_theme( $item['stylesheet'] );
+					$current_theme = wp_get_theme();
+					if ( $theme->get_stylesheet() === $current_theme->get_stylesheet() ) {
+						return get_template_directory_uri();
+					} else {
+						return $theme->get_template_directory_uri();
 					}
+				}
 
-					return null;
-				},
-				'schema'       => array(
-					'type'        => 'string',
-					'description' => __( 'The uri for the theme\'s template directory. If this is a child theme, this refers to the parent theme, otherwise this is the same as the theme\'s stylesheet directory.', 'gutenberg' ),
-					'format'      => 'uri',
-					'readonly'    => true,
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-			)
-		);
-	}
+				return null;
+			},
+			'schema'       => array(
+				'type'        => 'string',
+				'description' => __( 'The uri for the theme\'s template directory. If this is a child theme, this refers to the parent theme, otherwise this is the same as the theme\'s stylesheet directory.', 'gutenberg' ),
+				'format'      => 'uri',
+				'readonly'    => true,
+				'context'     => array( 'view', 'edit', 'embed' ),
+			),
+		)
+	);
 }
 add_action( 'rest_api_init', 'gutenberg_register_wp_rest_themes_template_directory_uri_field' );
 
+/**
+ * Adds `template` and `template_lock` fields to WP_REST_Post_Types_Controller class.
+ */
+function gutenberg_register_wp_rest_post_types_controller_fields() {
+	register_rest_field(
+		'type',
+		'template',
+		array(
+			'get_callback' => function ( $item ) {
+				$post_type = get_post_type_object( $item['slug'] );
+				if ( ! empty( $post_type ) ) {
+					return $post_type->template ?? array();
+				}
+			},
+			'schema'       => array(
+				'type'        => 'array',
+				'description' => __( 'The block template associated with the post type.', 'gutenberg' ),
+				'readonly'    => true,
+				'context'     => array( 'view', 'edit', 'embed' ),
+			),
+		)
+	);
+	register_rest_field(
+		'type',
+		'template_lock',
+		array(
+			'get_callback' => function ( $item ) {
+				$post_type = get_post_type_object( $item['slug'] );
+				if ( ! empty( $post_type ) ) {
+					return ! empty( $post_type->template_lock ) ? $post_type->template_lock : false;
+				}
+			},
+			'schema'       => array(
+				'type'        => array( 'string', 'boolean' ),
+				'enum'        => array( 'all', 'insert', 'contentOnly', false ),
+				'description' => __( 'The template_lock associated with the post type, or false if none.', 'gutenberg' ),
+				'readonly'    => true,
+				'context'     => array( 'view', 'edit', 'embed' ),
+			),
+		)
+	);
+}
+add_action( 'rest_api_init', 'gutenberg_register_wp_rest_post_types_controller_fields' );
+
 /**
  * Preload theme and global styles paths to avoid flash of variation styles in post editor.
  *

lib/compat/wordpress-6.7/block-bindings.php

@@ -38,3 +38,18 @@ function gutenberg_add_server_block_bindings_sources_to_editor_settings( $editor
 }
 
 add_filter( 'block_editor_settings_all', 'gutenberg_add_server_block_bindings_sources_to_editor_settings', 10 );
+
+/**
+ * Initialize `canUpdateBlockBindings` editor setting if it doesn't exist. By default, it is `true` only for admin users.
+ *
+ * @param array $settings The block editor settings from the `block_editor_settings_all` filter.
+ * @return array The editor settings including `canUpdateBlockBindings`.
+ */
+function gutenberg_add_can_update_block_bindings_editor_setting( $editor_settings ) {
+	if ( empty( $editor_settings['canUpdateBlockBindings'] ) ) {
+		$editor_settings['canUpdateBlockBindings'] = current_user_can( 'manage_options' );
+	}
+	return $editor_settings;
+}
+
+add_filter( 'block_editor_settings_all', 'gutenberg_add_can_update_block_bindings_editor_setting', 10 );

lib/compat/wordpress-6.7/block-templates.php

@@ -10,7 +10,6 @@
 	 * Register a template.
 	 *
 	 * @param string       $template_name  Template name in the form of `plugin_uri//template_name`.
-	 * @param array|string $args           Object type or array of object types with which the taxonomy should be associated.
 	 * @param array|string $args           {
 	 *     @type string        $title                 Optional. Title of the template as it will be shown in the Site Editor
 	 *                                                and other UI elements.
@@ -33,7 +32,8 @@ function wp_register_block_template( $template_name, $args = array() ) {
 	 * Unregister a template.
 	 *
 	 * @param string $template_name Template name in the form of `plugin_uri//template_name`.
-	 * @return true|WP_Error True on success, WP_Error on failure or if the template doesn't exist.
+	 * @return WP_Block_Template|WP_Error The unregistered template object on success, WP_Error object on failure or if
+	 *                                    the template doesn't exist.
 	 */
 	function wp_unregister_block_template( $template_name ) {
 		return WP_Block_Templates_Registry::get_instance()->unregister( $template_name );

lib/compat/wordpress-6.7/class-wp-block-templates-registry.php

@@ -36,7 +36,7 @@ final class WP_Block_Templates_Registry {
 		 *
 		 * @param string $template_name Template name including namespace.
 		 * @param array  $args          Optional. Array of template arguments.
-		 * @return WP_Block_Template|WP_Error The registered template on success, or false on failure.
+		 * @return WP_Block_Template|WP_Error The registered template on success, or WP_Error on failure.
 		 */
 		public function register( $template_name, $args = array() ) {
 
@@ -100,7 +100,7 @@ public function register( $template_name, $args = array() ) {
 		 *
 		 * @since 6.7.0
 		 *
-		 * @return WP_Block_Template[]|false Associative array of `$template_name => $template` pairs.
+		 * @return WP_Block_Template[] Associative array of `$template_name => $template` pairs.
 		 */
 		public function get_all_registered() {
 			return $this->registered_templates;
@@ -112,7 +112,7 @@ public function get_all_registered() {
 		 * @since 6.7.0
 		 *
 		 * @param string $template_name Template name including namespace.
-		 * @return WP_Block_Template|null|false The registered template, or null if it is not registered.
+		 * @return WP_Block_Template|null The registered template, or null if it is not registered.
 		 */
 		public function get_registered( $template_name ) {
 			if ( ! $this->is_registered( $template_name ) ) {
@@ -216,7 +216,7 @@ public function is_registered( $template_name ) {
 		 * @since 6.7.0
 		 *
 		 * @param string $template_name Template name including namespace.
-		 * @return WP_Block_Template|false The unregistered template on success, or false on failure.
+		 * @return WP_Block_Template|WP_Error The unregistered template on success, or WP_Error on failure.
 		 */
 		public function unregister( $template_name ) {
 			if ( ! $this->is_registered( $template_name ) ) {

lib/experimental/blocks.php

@@ -78,45 +78,42 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
 	}
 }
 
-/*
+/**
+ * Registers a new block style for one or more block types.
+ *
  * WP_Block_Styles_Registry was marked as `final` in core so it cannot be
  * updated via Gutenberg to allow registration of a style across multiple
  * block types as well as with an optional style object. This function will
  * support the desired functionality until the styles registry can be updated
  * in core.
+ *
+ * @param string|array $block_name       Block type name including namespace or array of namespaced block type names.
+ * @param array        $style_properties Array containing the properties of the style name, label,
+ *                                       style_handle (name of the stylesheet to be enqueued),
+ *                                       inline_style (string containing the CSS to be added),
+ *                                       style_data (theme.json-like object to generate CSS from).
+ *
+ * @return bool True if all block styles were registered with success and false otherwise.
  */
-if ( ! function_exists( 'gutenberg_register_block_style' ) ) {
-	/**
-	 * Registers a new block style for one or more block types.
-	 *
-	 * @param string|array $block_name       Block type name including namespace or array of namespaced block type names.
-	 * @param array        $style_properties Array containing the properties of the style name, label,
-	 *                                       style_handle (name of the stylesheet to be enqueued),
-	 *                                       inline_style (string containing the CSS to be added),
-	 *                                       style_data (theme.json-like object to generate CSS from).
-	 *
-	 * @return bool True if all block styles were registered with success and false otherwise.
-	 */
-	function gutenberg_register_block_style( $block_name, $style_properties ) {
-		if ( ! is_string( $block_name ) && ! is_array( $block_name ) ) {
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'Block name must be a string or array.', 'gutenberg' ),
-				'6.6.0'
-			);
+function gutenberg_register_block_style( $block_name, $style_properties ) {
+	if ( ! is_string( $block_name ) && ! is_array( $block_name ) ) {
+		_doing_it_wrong(
+			__METHOD__,
+			__( 'Block name must be a string or array.', 'gutenberg' ),
+			'6.6.0'
+		);
 
-			return false;
-		}
+		return false;
+	}
 
-		$block_names = is_string( $block_name ) ? array( $block_name ) : $block_name;
-		$result      = true;
+	$block_names = is_string( $block_name ) ? array( $block_name ) : $block_name;
+	$result      = true;
 
-		foreach ( $block_names as $name ) {
-			if ( ! WP_Block_Styles_Registry::get_instance()->register( $name, $style_properties ) ) {
-				$result = false;
-			}
+	foreach ( $block_names as $name ) {
+		if ( ! WP_Block_Styles_Registry::get_instance()->register( $name, $style_properties ) ) {
+			$result = false;
 		}
-
-		return $result;
 	}
+
+	return $result;
 }