Merge branch 'trunk' into fix/66244-admin-post-title-html

Author: shail-mehta

Gruntfile.js

@@ -811,8 +811,8 @@ module.exports = function(grunt) {
 							// Strip the 'library/' prefix from filePath values so they
 							// resolve correctly relative to wp-includes/images/icon-library/.
 							.replace(
-								/'filePath' => 'library\//g,
-								'\'filePath\' => \''
+								/'filePath'(\s+)=> 'library\//g,
+								'\'filePath\'$1=> \''
 							);
 					}
 				},

package.json

@@ -7,7 +7,7 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"gutenberg": {
-		"sha": "5715a61334c4d29f21b67cf34b46061dc1b62502",
+		"sha": "954fe7f9e04631c41aec4552acd627a7203a2aad",
 		"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
 	},
 	"engines": {

src/js/_enqueues/admin/common.js

@@ -692,7 +692,7 @@ $('.contextual-help-tabs').on( 'click', 'a', function(e) {
 	$('.contextual-help-tabs .active').removeClass('active');
 	link.parent('li').addClass('active');
 
-	panel = $( link.attr('href') );
+	panel = $( document ).find( link.attr('href') );
 
 	// Panels.
 	$('.help-tab-content').not( panel ).removeClass('active').hide();

src/wp-admin/admin-header.php

@@ -95,6 +95,10 @@
 <title><?php echo esc_html( $admin_title ); ?></title>
 <?php
 
+/*
+ * The dependencies of `colors` and the `utils` script are prefetched from the login screen by
+ * wp_prefetch_admin_assets(), which needs updating if these change.
+ */
 wp_enqueue_style( 'colors' );
 wp_enqueue_script( 'utils' );
 wp_enqueue_script( 'svg-painter' );

src/wp-admin/admin.php

@@ -118,6 +118,10 @@
 $date_format = __( 'F j, Y' );
 $time_format = __( 'g:i a' );
 
+/*
+ * The `jquery` dependency of this script is prefetched from the login screen by
+ * wp_prefetch_admin_assets(), which needs updating if this changes.
+ */
 wp_enqueue_script( 'common' );
 
 /**

src/wp-admin/edit-form-blocks.php

@@ -342,6 +342,7 @@ static function ( $classes ) {
 /**
  * Styles
  */
+// Prefetched for the block editor by wp_prefetch_admin_assets(), which needs updating if this changes.
 wp_enqueue_style( 'wp-edit-post' );
 
 /**

src/wp-admin/includes/admin-filters.php

@@ -48,6 +48,7 @@
 add_action( 'admin_head', 'wp_admin_canonical_url' );
 add_action( 'admin_head', 'wp_site_icon' );
 add_action( 'admin_head', 'wp_admin_viewport_meta' );
+add_action( 'admin_head', 'wp_prefetch_admin_assets' );
 add_action( 'customize_controls_head', 'wp_admin_viewport_meta' );
 add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object' );
 

src/wp-admin/includes/class-wp-application-passwords-list-table.php

@@ -147,6 +147,8 @@ protected function column_default( $item, $column_name ) {
 	 * @since 5.6.0
 	 *
 	 * @param string $which The location of the bulk actions: Either 'top' or 'bottom'.
+	 *
+	 * @phpstan-param 'top'|'bottom' $which
 	 */
 	protected function display_tablenav( $which ) {
 		?>

src/wp-admin/includes/class-wp-list-table.php

@@ -30,6 +30,13 @@ class WP_List_Table {
 	 * @since 3.1.0
 	 *
 	 * @var array<string, mixed>
+	 * @phpstan-var array{
+	 *     plural: string,
+	 *     singular: string,
+	 *     ajax: bool,
+	 *     screen: string|WP_Screen|null,
+	 *     ...
+	 * }
 	 */
 	protected $_args;
 
@@ -146,6 +153,14 @@ class WP_List_Table {
 	 *                                           screen, or a `WP_Screen` instance. If left null, the current
 	 *                                           screen will be automatically set. Default null.
 	 * }
+	 *
+	 * @phpstan-param array{
+	 *     plural?: string,
+	 *     singular?: string,
+	 *     ajax?: bool,
+	 *     screen?: string|WP_Screen|null,
+	 *     ...
+	 * }|string $args
 	 */
 	public function __construct( $args = array() ) {
 		$args = wp_parse_args(
@@ -438,6 +453,10 @@ public function search_box( $text, $input_id ) {
 	 *     }
 	 * }
 	 * @return string[] An array of link markup. Keys match the `$link_data` input array.
+	 *
+	 * @phpstan-template TKey of array-key
+	 * @phpstan-param array<TKey, array{ url: string, label: string, current?: bool }>|string $link_data
+	 * @phpstan-return ($link_data is array ? array<TKey, string> : array{ 0: '' })
 	 */
 	protected function get_views_links( $link_data = array() ) {
 		if ( ! is_array( $link_data ) ) {
@@ -1030,6 +1049,8 @@ protected function get_items_per_page( $option, $default_value = 20 ) {
 	 * @since 3.1.0
 	 *
 	 * @param string $which The location of the pagination: Either 'top' or 'bottom'.
+	 *
+	 * @phpstan-param 'top'|'bottom' $which
 	 */
 	protected function pagination( $which ) {
 		if ( empty( $this->_pagination_args['total_items'] ) ) {
@@ -1665,6 +1686,8 @@ public function display() {
 	 * @since 3.1.0
 	 *
 	 * @return string[] Array of CSS classes for the table tag.
+	 *
+	 * @phpstan-return non-empty-list<string>
 	 */
 	protected function get_table_classes() {
 		$mode = get_user_setting( 'posts_list_mode', 'list' );
@@ -1680,6 +1703,8 @@ protected function get_table_classes() {
 	 * @since 3.1.0
 	 *
 	 * @param string $which The location of the navigation: Either 'top' or 'bottom'.
+	 *
+	 * @phpstan-param 'top'|'bottom' $which
 	 */
 	protected function display_tablenav( $which ) {
 		if ( 'bottom' === $which && ! $this->has_items() ) {

src/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -318,6 +318,8 @@ protected function get_bulk_actions() {
 	 * @global string $mode List table view mode.
 	 *
 	 * @param string $which The location of the pagination nav markup: Either 'top' or 'bottom'.
+	 *
+	 * @phpstan-param 'top'|'bottom' $which
 	 */
 	protected function pagination( $which ) {
 		global $mode;