Update @wordpress packages

package.json

@@ -27,7 +27,7 @@
 		"@wordpress/babel-preset-default": "6.4.1",
 		"@wordpress/custom-templated-path-webpack-plugin": "2.1.0",
 		"@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
-		"@wordpress/e2e-test-utils": "5.4.9",
+		"@wordpress/e2e-test-utils": "5.4.10",
 		"@wordpress/library-export-default-webpack-plugin": "2.2.0",
 		"@wordpress/scripts": "19.2.2",
 		"autoprefixer": "^9.8.8",
@@ -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.14",
-		"@wordpress/block-editor": "8.0.8",
-		"@wordpress/block-library": "6.0.12",
+		"@wordpress/block-directory": "3.0.17",
+		"@wordpress/block-editor": "8.0.11",
+		"@wordpress/block-library": "6.0.15",
 		"@wordpress/block-serialization-default-parser": "4.2.3",
 		"@wordpress/blocks": "11.1.4",
-		"@wordpress/components": "19.1.2",
+		"@wordpress/components": "19.1.5",
 		"@wordpress/compose": "5.0.6",
 		"@wordpress/core-data": "4.0.8",
-		"@wordpress/customize-widgets": "2.0.14",
+		"@wordpress/customize-widgets": "2.0.17",
 		"@wordpress/data": "6.1.4",
 		"@wordpress/data-controls": "2.2.7",
 		"@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.14",
-		"@wordpress/edit-site": "3.0.14",
-		"@wordpress/edit-widgets": "3.1.9",
-		"@wordpress/editor": "12.0.11",
+		"@wordpress/edit-post": "5.0.17",
+		"@wordpress/edit-site": "3.0.17",
+		"@wordpress/edit-widgets": "3.1.12",
+		"@wordpress/editor": "12.0.14",
 		"@wordpress/element": "4.0.4",
 		"@wordpress/escape-html": "2.2.3",
-		"@wordpress/format-library": "3.0.14",
+		"@wordpress/format-library": "3.0.17",
 		"@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.10",
+		"@wordpress/interface": "4.1.13",
 		"@wordpress/is-shallow-equal": "4.2.1",
 		"@wordpress/keyboard-shortcuts": "3.0.6",
 		"@wordpress/keycodes": "3.2.4",
-		"@wordpress/list-reusable-blocks": "3.0.12",
+		"@wordpress/list-reusable-blocks": "3.0.15",
 		"@wordpress/media-utils": "3.0.5",
 		"@wordpress/notices": "3.2.7",
-		"@wordpress/nux": "5.0.12",
+		"@wordpress/nux": "5.0.15",
 		"@wordpress/plugins": "4.0.6",
 		"@wordpress/primitives": "3.0.4",
 		"@wordpress/priority-queue": "2.2.3",
 		"@wordpress/redux-routine": "4.2.2",
-		"@wordpress/reusable-blocks": "3.0.14",
+		"@wordpress/reusable-blocks": "3.0.17",
 		"@wordpress/rich-text": "5.0.6",
-		"@wordpress/server-side-render": "3.0.12",
+		"@wordpress/server-side-render": "3.0.15",
 		"@wordpress/shortcode": "3.2.3",
 		"@wordpress/token-list": "2.2.2",
 		"@wordpress/url": "3.3.1",
 		"@wordpress/viewport": "4.0.6",
 		"@wordpress/warning": "2.2.2",
-		"@wordpress/widgets": "2.0.14",
+		"@wordpress/widgets": "2.0.17",
 		"@wordpress/wordcount": "3.2.3",
 		"backbone": "1.4.0",
 		"clipboard": "2.0.8",

src/wp-admin/site-editor.php

@@ -23,6 +23,8 @@
 	wp_die( __( 'The theme you are currently using is not compatible with Full Site Editing.' ) );
 }
 
+// Used in the HTML title tag.
+$title       = __( 'Editor (beta)' );
 $parent_file = 'themes.php';
 
 // Flag that we're loading the block editor.
@@ -56,74 +58,45 @@ static function( $classes ) {
 $editor_settings      = get_block_editor_settings( $custom_settings, $block_editor_context );
 
 if ( isset( $_GET['postType'] ) && ! isset( $_GET['postId'] ) ) {
-
 	$post_type = get_post_type_object( $_GET['postType'] );
-
 	if ( ! $post_type ) {
 		wp_die( __( 'Invalid post type.' ) );
 	}
+}
 
-	// Used in the HTML title tag.
-	$title = $post_type->labels->name;
-
-	$preload_paths = array(
-		'/',
-		'/wp/v2/types/' . $post_type->name . '?context=edit',
-		'/wp/v2/types?context=edit',
-		add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( $post_type->name ) ),
-	);
-
-	block_editor_rest_api_preload( $preload_paths, $block_editor_context );
-
-	wp_add_inline_script(
-		'wp-edit-site',
-		sprintf(
-			'wp.domReady( function() {
-				wp.editSite.initializeList( "site-editor", "%s", %s );
-			} );',
-			$post_type->name,
-			wp_json_encode( $editor_settings )
-		)
-	);
-
-} else {
-
-	// Used in the HTML title tag.
-	$title = __( 'Editor (beta)' );
-
-	$active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
-	$active_theme            = wp_get_theme()->get_stylesheet();
-	$preload_paths           = array(
-		array( rest_get_route_for_post_type_items( 'attachment' ), 'OPTIONS' ),
-		'/',
-		'/wp/v2/types?context=edit',
-		'/wp/v2/taxonomies?context=edit',
-		add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'page' ) ),
-		add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'post' ) ),
-		add_query_arg( 'context', 'edit', rest_get_route_for_taxonomy_items( 'category' ) ),
-		add_query_arg( 'context', 'edit', rest_get_route_for_taxonomy_items( 'post_tag' ) ),
-		add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'wp_template' ) ),
-		add_query_arg( 'context', 'edit', rest_get_route_for_post_type_items( 'wp_template_part' ) ),
-		'/wp/v2/settings',
-		'/wp/v2/themes?context=edit&status=active',
-		'/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
-		'/wp/v2/global-styles/' . $active_global_styles_id,
-		'/wp/v2/themes/' . $active_theme . '/global-styles',
-	);
-
-	block_editor_rest_api_preload( $preload_paths, $block_editor_context );
+$active_global_styles_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
+$active_theme            = wp_get_theme()->get_stylesheet();
+$preload_paths           = array(
+	array( '/wp/v2/media', 'OPTIONS' ),
+	'/',
+	'/wp/v2/types?context=edit',
+	'/wp/v2/types/wp_template?context=edit',
+	'/wp/v2/types/wp_template-part?context=edit',
+	'/wp/v2/taxonomies?context=edit',
+	'/wp/v2/pages?context=edit',
+	'/wp/v2/categories?context=edit',
+	'/wp/v2/posts?context=edit',
+	'/wp/v2/tags?context=edit',
+	'/wp/v2/templates?context=edit&per_page=-1',
+	'/wp/v2/template-parts?context=edit&per_page=-1',
+	'/wp/v2/settings',
+	'/wp/v2/themes?context=edit&status=active',
+	'/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
+	'/wp/v2/global-styles/' . $active_global_styles_id,
+	'/wp/v2/global-styles/themes/' . $active_theme,
+);
 
-	wp_add_inline_script(
-		'wp-edit-site',
-		sprintf(
-			'wp.domReady( function() {
-				wp.editSite.initializeEditor( "site-editor", %s );
-			} );',
-			wp_json_encode( $editor_settings )
-		)
-	);
+block_editor_rest_api_preload( $preload_paths, $block_editor_context );
 
-}
+wp_add_inline_script(
+	'wp-edit-site',
+	sprintf(
+		'wp.domReady( function() {
+			wp.editSite.initializeEditor( "site-editor", %s );
+		} );',
+		wp_json_encode( $editor_settings )
+	)
+);
 
 // Preload server-registered block schemas.
 wp_add_inline_script(

src/wp-includes/block-editor.php

@@ -311,7 +311,6 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
 		array(
 			'css'                     => 'variables',
 			'__unstableType'          => 'presets',
-			'__experimentalNoWrapper' => true,
 		),
 		array(
 			'css'            => 'presets',

src/wp-includes/block-template-utils.php

@@ -41,7 +41,7 @@ function get_block_theme_folders( $theme_stylesheet = null ) {
 	$root_dir   = get_theme_root( $theme_name );
 	$theme_dir  = "$root_dir/$theme_name";
 
-	if ( is_readable( $theme_dir . '/block-templates/index.html' ) ) {
+	if ( file_exists( $theme_dir . '/block-templates' ) || file_exists( $theme_dir . '/block-template-parts' ) ) {
 		return array(
 			'wp_template'      => 'block-templates',
 			'wp_template_part' => 'block-template-parts',

src/wp-includes/blocks/gallery.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Server-side rendering of the `core/gallery` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Handles backwards compatibility for Gallery Blocks,
+ * whose images feature a `data-id` attribute.
+ *
+ * Now that the Gallery Block contains inner Image Blocks,
+ * we add a custom `data-id` attribute before rendering the gallery
+ * so that the Image Block can pick it up in its render_callback.
+ *
+ * @param array $parsed_block The block being rendered.
+ * @return array The migrated block object.
+ */
+function block_core_gallery_data_id_backcompatibility( $parsed_block ) {
+	if ( 'core/gallery' === $parsed_block['blockName'] ) {
+		foreach ( $parsed_block['innerBlocks'] as $key => $inner_block ) {
+			if ( 'core/image' === $inner_block['blockName'] ) {
+				if ( ! isset( $parsed_block['innerBlocks'][ $key ]['attrs']['data-id'] ) && isset( $inner_block['attrs']['id'] ) ) {
+					$parsed_block['innerBlocks'][ $key ]['attrs']['data-id'] = esc_attr( $inner_block['attrs']['id'] );
+				}
+			}
+		}
+	}
+
+	return $parsed_block;
+}
+
+add_filter( 'render_block_data', 'block_core_gallery_data_id_backcompatibility' );
+
+/**
+ * Registers the `core/gallery` block on server.
+ * This render callback needs to be here
+ * so that the gallery styles are loaded in block-based themes.
+ */
+function register_block_core_gallery() {
+	register_block_type_from_metadata(
+		__DIR__ . '/gallery',
+		array(
+			'render_callback' => function ( $attributes, $content ) {
+				return $content;
+			},
+		)
+	);
+}
+
+add_action( 'init', 'register_block_core_gallery', 20 );

src/wp-includes/blocks/image.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Server-side rendering of the `core/image` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Renders the `core/image` block on the server,
+ * adding a data-id attribute to the element if core/gallery has added on pre-render.
+ *
+ * @param  array $attributes The block attributes.
+ * @param  array $content    The block content.
+ * @return string Returns the block content with the data-id attribute added.
+ */
+function render_block_core_image( $attributes, $content ) {
+	if ( isset( $attributes['data-id'] ) ) {
+		// Add the data-id="$id" attribute to the img element
+		// to provide backwards compatibility for the Gallery Block,
+		// which now wraps Image Blocks within innerBlocks.
+		// The data-id attribute is added in a core/gallery `render_block_data` hook.
+		$data_id_attribute = 'data-id="' . esc_attr( $attributes['data-id'] ) . '"';
+		if ( ! strpos( $content, $data_id_attribute ) ) {
+			$content = str_replace( '<img', '<img ' . $data_id_attribute . ' ', $content );
+		}
+	}
+	return $content;
+}
+
+
+/**
+ * Registers the `core/image` block on server.
+ */
+function register_block_core_image() {
+	register_block_type_from_metadata(
+		__DIR__ . '/image',
+		array(
+			'render_callback' => 'render_block_core_image',
+		)
+	);
+}
+add_action( 'init', 'register_block_core_image' );

src/wp-includes/blocks/index.php

@@ -11,6 +11,8 @@
 require ABSPATH . WPINC . '/blocks/calendar.php';
 require ABSPATH . WPINC . '/blocks/categories.php';
 require ABSPATH . WPINC . '/blocks/file.php';
+require ABSPATH . WPINC . '/blocks/gallery.php';
+require ABSPATH . WPINC . '/blocks/image.php';
 require ABSPATH . WPINC . '/blocks/latest-comments.php';
 require ABSPATH . WPINC . '/blocks/latest-posts.php';
 require ABSPATH . WPINC . '/blocks/legacy-widget.php';
@@ -64,11 +66,9 @@ function register_core_block_types_from_metadata() {
 		'cover',
 		'embed',
 		'freeform',
-		'gallery',
 		'group',
 		'heading',
 		'html',
-		'image',
 		'list',
 		'media-text',
 		'missing',

src/wp-includes/blocks/navigation-submenu.php

@@ -188,6 +188,12 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 		);
 	}
 
+	$aria_label = sprintf(
+		/* translators: Accessibility text. %s: Parent page title. */
+		__( '%s submenu' ),
+		$label
+	);
+
 	$html = '<li ' . $wrapper_attributes . '>';
 
 	// If Submenus open on hover, we render an anchor tag with attributes.
@@ -226,11 +232,11 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 		if ( $show_submenu_indicators ) {
 			// The submenu icon is rendered in a button here
 			// so that there's a clickable elment to open the submenu.
-			$html .= '<button aria-label="' . $label . ' ' . __( 'submenu', 'gutenberg' ) . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">' . block_core_navigation_submenu_render_submenu_icon() . '</button>';
+			$html .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">' . block_core_navigation_submenu_render_submenu_icon() . '</button>';
 		}
 	} else {
 		// If menus open on click, we render the parent as a button.
-		$html .= '<button aria-label="' . $label . ' ' . __( 'submenu', 'gutenberg' ) . '" class="wp-block-navigation-item__content wp-block-navigation-submenu__toggle" aria-expanded="false">';
+		$html .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation-item__content wp-block-navigation-submenu__toggle" aria-expanded="false">';
 
 		// Wrap title with span to isolate it from submenu icon.
 		$html .= '<span class="wp-block-navigation-item__label">';

src/wp-includes/blocks/navigation/view.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '133b84f32422a9ad94c4533f85fa4e87');
+<?php return array('dependencies' => array(), 'version' => '34d9f07c7910e83c264c6c4406619c5e');

src/wp-includes/blocks/navigation/view.min.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'f3cbbfbf9b9c434c39d6f77037d5267c');
+<?php return array('dependencies' => array(), 'version' => 'd5ab04a497b4f1465f1f0060b6b71ae3');

src/wp-includes/blocks/page-list.php

@@ -173,20 +173,25 @@ function block_core_page_list_render_nested_page_list( $open_submenus_on_click,
 			}
 		}
 
-		$title = wp_kses( $page['title'], wp_kses_allowed_html( 'post' ) );
+		$title      = wp_kses( $page['title'], wp_kses_allowed_html( 'post' ) );
+		$aria_label = sprintf(
+			/* translators: Accessibility text. %s: Parent page title. */
+			__( '%s submenu' ),
+			$title
+		);
 
 		$markup .= '<li class="wp-block-pages-list__item' . $css_class . '"' . $style_attribute . '>';
 
 		if ( isset( $page['children'] ) && $is_navigation_child && $open_submenus_on_click ) {
-			$markup .= '<button aria-label="' . $title . ' ' . __( 'submenu', 'gutenberg' ) . '" class="' . $navigation_child_content_class . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . $title . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>' .
+			$markup .= '<button aria-label="' . $aria_label . '" class="' . $navigation_child_content_class . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . $title . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>' .
 			'</button>';
 		} else {
 			$markup .= '<a class="wp-block-pages-list__item__link' . $navigation_child_content_class . '" href="' . esc_url( $page['link'] ) . '"' . $aria_current . '>' . $title . '</a>';
 		}
 
 		if ( isset( $page['children'] ) ) {
 			if ( $is_navigation_child && $show_submenu_icons && ! $open_submenus_on_click ) {
-				$markup .= '<button aria-label="' . $title . ' ' . __( 'submenu', 'gutenberg' ) . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">';
+				$markup .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">';
 				$markup .= '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>';
 				$markup .= '</button>';
 			}