Update @wordpress packages

package.json

@@ -82,53 +82,53 @@
 		"@wordpress/api-fetch": "5.2.6",
 		"@wordpress/autop": "3.2.3",
 		"@wordpress/blob": "3.2.2",
-		"@wordpress/block-directory": "3.0.19",
-		"@wordpress/block-editor": "8.0.12",
-		"@wordpress/block-library": "6.0.17",
+		"@wordpress/block-directory": "3.0.20",
+		"@wordpress/block-editor": "8.0.13",
+		"@wordpress/block-library": "6.0.18",
 		"@wordpress/block-serialization-default-parser": "4.2.3",
 		"@wordpress/blocks": "11.1.5",
-		"@wordpress/components": "19.1.6",
+		"@wordpress/components": "19.2.0",
 		"@wordpress/compose": "5.0.7",
 		"@wordpress/core-data": "4.0.9",
-		"@wordpress/customize-widgets": "2.0.19",
+		"@wordpress/customize-widgets": "2.0.20",
 		"@wordpress/data": "6.1.5",
 		"@wordpress/data-controls": "2.2.8",
 		"@wordpress/date": "4.2.3",
 		"@wordpress/deprecated": "3.2.3",
 		"@wordpress/dom": "3.2.7",
 		"@wordpress/dom-ready": "3.2.3",
-		"@wordpress/edit-post": "5.0.19",
-		"@wordpress/edit-site": "3.0.19",
-		"@wordpress/edit-widgets": "3.1.14",
-		"@wordpress/editor": "12.0.15",
+		"@wordpress/edit-post": "5.0.20",
+		"@wordpress/edit-site": "3.0.20",
+		"@wordpress/edit-widgets": "3.1.15",
+		"@wordpress/editor": "12.0.16",
 		"@wordpress/element": "4.0.4",
 		"@wordpress/escape-html": "2.2.3",
-		"@wordpress/format-library": "3.0.18",
+		"@wordpress/format-library": "3.0.19",
 		"@wordpress/hooks": "3.2.2",
 		"@wordpress/html-entities": "3.2.3",
 		"@wordpress/i18n": "4.2.4",
 		"@wordpress/icons": "6.1.1",
-		"@wordpress/interface": "4.1.14",
+		"@wordpress/interface": "4.1.15",
 		"@wordpress/is-shallow-equal": "4.2.1",
 		"@wordpress/keyboard-shortcuts": "3.0.7",
 		"@wordpress/keycodes": "3.2.4",
-		"@wordpress/list-reusable-blocks": "3.0.16",
+		"@wordpress/list-reusable-blocks": "3.0.17",
 		"@wordpress/media-utils": "3.0.5",
 		"@wordpress/notices": "3.2.8",
-		"@wordpress/nux": "5.0.16",
+		"@wordpress/nux": "5.0.17",
 		"@wordpress/plugins": "4.0.7",
 		"@wordpress/primitives": "3.0.4",
 		"@wordpress/priority-queue": "2.2.3",
 		"@wordpress/redux-routine": "4.2.2",
-		"@wordpress/reusable-blocks": "3.0.18",
+		"@wordpress/reusable-blocks": "3.0.19",
 		"@wordpress/rich-text": "5.0.7",
-		"@wordpress/server-side-render": "3.0.16",
+		"@wordpress/server-side-render": "3.0.17",
 		"@wordpress/shortcode": "3.2.3",
 		"@wordpress/token-list": "2.2.2",
 		"@wordpress/url": "3.3.1",
 		"@wordpress/viewport": "4.0.7",
 		"@wordpress/warning": "2.2.2",
-		"@wordpress/widgets": "2.0.18",
+		"@wordpress/widgets": "2.0.19",
 		"@wordpress/wordcount": "3.2.3",
 		"backbone": "1.4.0",
 		"clipboard": "2.0.8",

src/wp-includes/block-supports/layout.php

@@ -39,9 +39,10 @@ function wp_register_layout_support( $block_type ) {
  * @param array  $layout                Layout object. The one that is passed has already checked
  *                                      the existence of default block layout.
  * @param bool   $has_block_gap_support Whether the theme has support for the block gap.
+ * @param string $gap_value             The block gap value to apply.
  * @return string CSS style.
  */
-function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false ) {
+function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false, $gap_value = null ) {
 	$layout_type = isset( $layout['type'] ) ? $layout['type'] : 'default';
 
 	$style = '';
@@ -72,8 +73,9 @@ function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false
 		$style .= "$selector .alignleft { float: left; margin-right: 2em; }";
 		$style .= "$selector .alignright { float: right; margin-left: 2em; }";
 		if ( $has_block_gap_support ) {
-			$style .= "$selector > * { margin-top: 0; margin-bottom: 0; }";
-			$style .= "$selector > * + * { margin-top: var( --wp--style--block-gap ); margin-bottom: 0; }";
+			$gap_style = $gap_value ? $gap_value : 'var( --wp--style--block-gap )';
+			$style    .= "$selector > * { margin-top: 0; margin-bottom: 0; }";
+			$style    .= "$selector > * + * { margin-top: $gap_style;  margin-bottom: 0; }";
 		}
 	} elseif ( 'flex' === $layout_type ) {
 		$layout_orientation = isset( $layout['orientation'] ) ? $layout['orientation'] : 'horizontal';
@@ -96,7 +98,8 @@ function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false
 		$style  = "$selector {";
 		$style .= 'display: flex;';
 		if ( $has_block_gap_support ) {
-			$style .= 'gap: var( --wp--style--block-gap, 0.5em );';
+			$gap_style = $gap_value ? $gap_value : 'var( --wp--style--block-gap, 0.5em )';
+			$style    .= "gap: $gap_style;";
 		} else {
 			$style .= 'gap: 0.5em;';
 		}
@@ -156,8 +159,13 @@ function wp_render_layout_support_flag( $block_content, $block ) {
 		$used_layout = $default_layout;
 	}
 
-	$id    = uniqid();
-	$style = wp_get_layout_style( ".wp-container-$id", $used_layout, $has_block_gap_support );
+	$id        = uniqid();
+	$gap_value = _wp_array_get( $block, array( 'attrs', 'style', 'spacing', 'blockGap' ) );
+	// Skip if gap value contains unsupported characters.
+	// Regex for CSS value borrowed from `safecss_filter_attr`, and used here
+	// because we only want to match against the value, not the CSS attribute.
+	$gap_value = preg_match( '%[\\\(&=}]|/\*%', $gap_value ) ? null : $gap_value;
+	$style     = wp_get_layout_style( ".wp-container-$id", $used_layout, $has_block_gap_support, $gap_value );
 	// This assumes the hook only applies to blocks with a single wrapper.
 	// I think this is a reasonable limitation for that particular hook.
 	$content = preg_replace(

src/wp-includes/block-supports/spacing.php

@@ -95,59 +95,6 @@ function wp_skip_spacing_serialization( $block_type ) {
 		$spacing_support['__experimentalSkipSerialization'];
 }
 
-/**
- * Renders the spacing gap support to the block wrapper, to ensure
- * that the CSS variable is rendered in all environments.
- *
- * @since 5.9.0
- * @access private
- *
- * @param string $block_content Rendered block content.
- * @param array  $block         Block object.
- * @return string Filtered block content.
- */
-function wp_render_spacing_gap_support( $block_content, $block ) {
-	$block_type      = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
-	$has_gap_support = block_has_support( $block_type, array( 'spacing', 'blockGap' ), false );
-	if ( ! $has_gap_support || ! isset( $block['attrs']['style']['spacing']['blockGap'] ) ) {
-		return $block_content;
-	}
-
-	$gap_value = $block['attrs']['style']['spacing']['blockGap'];
-
-	// Skip if gap value contains unsupported characters.
-	// Regex for CSS value borrowed from `safecss_filter_attr`, and used here
-	// because we only want to match against the value, not the CSS attribute.
-	if ( preg_match( '%[\\\(&=}]|/\*%', $gap_value ) ) {
-		return $block_content;
-	}
-
-	$style = sprintf(
-		'--wp--style--block-gap: %s',
-		esc_attr( $gap_value )
-	);
-
-	// Attempt to update an existing style attribute on the wrapper element.
-	$injected_style = preg_replace(
-		'/^([^>.]+?)(' . preg_quote( 'style="', '/' ) . ')(?=.+?>)/',
-		'$1$2' . $style . '; ',
-		$block_content,
-		1
-	);
-
-	// If there is no existing style attribute, add one to the wrapper element.
-	if ( $injected_style === $block_content ) {
-		$injected_style = preg_replace(
-			'/<([a-zA-Z0-9]+)([ >])/',
-			'<$1 style="' . $style . '"$2',
-			$block_content,
-			1
-		);
-	};
-
-	return $injected_style;
-}
-
 // Register the block support.
 WP_Block_Supports::get_instance()->register(
 	'spacing',
@@ -156,5 +103,3 @@ function wp_render_spacing_gap_support( $block_content, $block ) {
 		'apply'              => 'wp_apply_spacing_support',
 	)
 );
-
-add_filter( 'render_block', 'wp_render_spacing_gap_support', 10, 2 );

src/wp-includes/blocks/columns/block.json

@@ -23,11 +23,10 @@
 			"link": true
 		},
 		"spacing": {
-			"blockGap": true,
 			"margin": [ "top", "bottom" ],
 			"padding": true,
 			"__experimentalDefaultControls": {
-				"blockGap": true
+				"padding": true
 			}
 		}
 	},

src/wp-includes/blocks/navigation/block.json

@@ -98,17 +98,7 @@
 			}
 		},
 		"spacing": {
-			"blockGap": true,
-			"units": [
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			],
-			"__experimentalDefaultControls": {
-				"blockGap": true
-			}
+			"units": [ "px", "em", "rem", "vh", "vw" ]
 		},
 		"__experimentalLayout": {
 			"allowSwitching": false,

src/wp-includes/blocks/post-content.php

@@ -36,11 +36,16 @@ function render_block_core_post_content( $attributes, $content, $block ) {
 
 	$seen_ids[ $post_id ] = true;
 
+	// Check is needed for backward compatibility with third-party plugins
+	// that might rely on the `in_the_loop` check; calling `the_post` sets it to true.
 	if ( ! in_the_loop() && have_posts() ) {
 		the_post();
 	}
 
-	$content = get_the_content( null, false, $post_id );
+	// When inside the main loop, we want to use queried object
+	// so that `the_preview` for the current post can apply.
+	// We force this behavior by omitting the third argument (post ID) from the `get_the_content`.
+	$content = get_the_content( null, false );
 	/** This filter is documented in wp-includes/post-template.php */
 	$content = apply_filters( 'the_content', str_replace( ']]>', ']]>', $content ) );
 	unset( $seen_ids[ $post_id ] );

src/wp-includes/blocks/post-excerpt.php

@@ -18,7 +18,7 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$excerpt = get_the_excerpt( $block->context['postId'] );
+	$excerpt = get_the_excerpt();
 
 	if ( empty( $excerpt ) ) {
 		return '';

src/wp-includes/blocks/post-title.php

@@ -20,7 +20,7 @@ function render_block_core_post_title( $attributes, $content, $block ) {
 	}
 
 	$post_ID = $block->context['postId'];
-	$title   = get_the_title( $post_ID );
+	$title   = get_the_title();
 
 	if ( ! $title ) {
 		return '';

src/wp-includes/blocks/site-logo.php

@@ -76,6 +76,23 @@ function register_block_core_site_logo_setting() {
 
 add_action( 'rest_api_init', 'register_block_core_site_logo_setting', 10 );
 
+/**
+ * Register a core site setting for a site icon
+ */
+function register_block_core_site_icon_setting() {
+	register_setting(
+		'general',
+		'site_icon',
+		array(
+			'show_in_rest' => true,
+			'type'         => 'integer',
+			'description'  => __( 'Site icon.' ),
+		)
+	);
+}
+
+add_action( 'rest_api_init', 'register_block_core_site_icon_setting', 10 );
+
 /**
  * Registers the `core/site-logo` block on the server.
  */

src/wp-includes/blocks/site-logo/block.json

@@ -16,12 +16,16 @@
 		"linkTarget": {
 			"type": "string",
 			"default": "_self"
+		},
+		"shouldSyncIcon": {
+			"type": "boolean"
 		}
 	},
 	"example": {
 		"viewportWidth": 500,
 		"attributes": {
-			"width": 350
+			"width": 350,
+			"className": "block-editor-block-types-list__site-logo-example"
 		}
 	},
 	"supports": {

src/wp-includes/class-wp-theme-json.php

@@ -317,7 +317,7 @@ class WP_Theme_JSON {
 		'spacing'    => array(
 			'margin'   => null,
 			'padding'  => null,
-			'blockGap' => null,
+			'blockGap' => 'top',
 		),
 		'typography' => array(
 			'fontFamily'     => null,
@@ -472,17 +472,28 @@ private static function sanitize( $input, $valid_block_names, $valid_element_nam
 
 		$output = array_intersect_key( $input, array_flip( self::VALID_TOP_LEVEL_KEYS ) );
 
+		// Some styles are only meant to be available at the top-level (e.g.: blockGap),
+		// hence, the schema for blocks & elements should not have them.
+		$styles_non_top_level = self::VALID_STYLES;
+		foreach ( array_keys( $styles_non_top_level ) as $section ) {
+			foreach ( array_keys( $styles_non_top_level[ $section ] ) as $prop ) {
+				if ( 'top' === $styles_non_top_level[ $section ][ $prop ] ) {
+					unset( $styles_non_top_level[ $section ][ $prop ] );
+				}
+			}
+		}
+
 		// Build the schema based on valid block & element names.
 		$schema                 = array();
 		$schema_styles_elements = array();
 		foreach ( $valid_element_names as $element ) {
-			$schema_styles_elements[ $element ] = self::VALID_STYLES;
+			$schema_styles_elements[ $element ] = $styles_non_top_level;
 		}
 		$schema_styles_blocks   = array();
 		$schema_settings_blocks = array();
 		foreach ( $valid_block_names as $block ) {
 			$schema_settings_blocks[ $block ]           = self::VALID_SETTINGS;
-			$schema_styles_blocks[ $block ]             = self::VALID_STYLES;
+			$schema_styles_blocks[ $block ]             = $styles_non_top_level;
 			$schema_styles_blocks[ $block ]['elements'] = $schema_styles_elements;
 		}
 		$schema['styles']             = self::VALID_STYLES;

src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php

@@ -781,7 +781,7 @@ public function get_item_schema() {
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'required'    => true,
 					'minLength'   => 1,
-					'pattern'     => '[a-zA-Z_\-]+',
+					'pattern'     => '[a-zA-Z0-9_\-]+',
 				),
 				'theme'          => array(
 					'description' => __( 'Theme identifier for the template.' ),