Script Loader: Prefetch assets for the next admin screen

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-includes/class-wp-admin-bar.php

@@ -70,6 +70,7 @@ public function initialize() {
 		add_action( 'wp_head', $header_callback );
 
 		wp_enqueue_script( 'admin-bar' );
+		// Prefetched from the login screen by wp_prefetch_admin_assets(), which needs updating if this changes.
 		wp_enqueue_style( 'admin-bar' );
 
 		/**

src/wp-includes/class-wp-dependencies.php

@@ -316,7 +316,7 @@ public function add_data( $handle, $key, $value ) {
 		}
 		if ( 'conditional' === $key && '_required-conditional-dependency_' !== $value ) {
 			_deprecated_argument(
-				'WP_Dependencies->add_data()',
+				'WP_Dependencies::add_data()',
 				'6.9.0',
 				__( 'IE conditional comments are ignored by all supported browsers.' )
 			);

src/wp-includes/class-wp-editor.php

@@ -913,7 +913,10 @@ public static function enqueue_default_editor() {
 
 		self::enqueue_scripts( true );
 
-		// Also add wp-includes/css/editor.css.
+		/*
+		 * Also add wp-includes/css/editor.css. It is prefetched for the block editor by
+		 * wp_prefetch_admin_assets(), which needs updating if this changes.
+		 */
 		wp_enqueue_style( 'editor-buttons' );
 
 		if ( is_admin() ) {

src/wp-includes/class-wp-scripts.php

@@ -415,39 +415,7 @@ public function do_item( $handle, $group = false ) {
 			return true;
 		}
 
-		if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && str_starts_with( $src, $this->content_url ) ) ) {
-			$src = $this->base_url . $src;
-		}
-
-		$ver_to_add = '';
-		if ( empty( $obj->ver ) && null !== $obj->ver && is_string( $this->default_version ) ) {
-			$ver_to_add = $this->default_version;
-		} elseif ( is_scalar( $obj->ver ) ) {
-			$ver_to_add = (string) $obj->ver;
-		}
-
-		$added_args = (string) ( $this->args[ $handle ] ?? '' );
-
-		if ( '' !== $ver_to_add || '' !== $added_args ) {
-			$fragment = strstr( $src, '#' );
-			if ( false !== $fragment ) {
-				$src = substr( $src, 0, -strlen( $fragment ) );
-			}
-
-			if ( '' !== $ver_to_add ) {
-				$src .= ( str_contains( $src, '?' ) ? '&' : '?' ) . 'ver=' . rawurlencode( $ver_to_add );
-			}
-			if ( '' !== $added_args ) {
-				$src .= ( str_contains( $src, '?' ) ? '&' : '?' ) . $added_args;
-			}
-
-			if ( false !== $fragment ) {
-				$src .= $fragment;
-			}
-		}
-
-		/** This filter is documented in wp-includes/class-wp-scripts.php */
-		$src = esc_url_raw( apply_filters( 'script_loader_src', $src, $handle ) );
+		$src = esc_url_raw( $this->get_src( $handle ) );
 
 		if ( ! $src ) {
 			return true;
@@ -506,6 +474,69 @@ public function do_item( $handle, $group = false ) {
 		return true;
 	}
 
+	/**
+	 * Gets the URL a registered script is loaded from.
+	 *
+	 * This is the URL printed in the script's `src` attribute, including the version query
+	 * argument and any arguments added to the handle, after the {@see 'script_loader_src'} filter.
+	 * Like {@see WP_Script_Modules::get_src()}, it is neither sanitized nor escaped, so a caller
+	 * can pass it through esc_url_raw(), as WP_Scripts::do_item() does, or esc_url(), once.
+	 *
+	 * @since 7.2.0
+	 *
+	 * @param string $handle Script handle.
+	 * @return string Script URL, or an empty string when the script is not registered, has no
+	 *                source of its own because it only aliases other scripts, or was filtered away.
+	 */
+	public function get_src( string $handle ): string {
+		if ( ! isset( $this->registered[ $handle ] ) ) {
+			return '';
+		}
+
+		$obj = $this->registered[ $handle ];
+		$src = $obj->src;
+
+		if ( ! $src || ! is_string( $src ) ) {
+			return '';
+		}
+
+		if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && str_starts_with( $src, $this->content_url ) ) ) {
+			$src = $this->base_url . $src;
+		}
+
+		$ver_to_add = '';
+		if ( empty( $obj->ver ) && null !== $obj->ver && is_string( $this->default_version ) ) {
+			$ver_to_add = $this->default_version;
+		} elseif ( is_scalar( $obj->ver ) ) {
+			$ver_to_add = (string) $obj->ver;
+		}
+
+		$added_args = (string) ( $this->args[ $handle ] ?? '' );
+
+		if ( '' !== $ver_to_add || '' !== $added_args ) {
+			$fragment = strstr( $src, '#' );
+			if ( false !== $fragment ) {
+				$src = substr( $src, 0, -strlen( $fragment ) );
+			}
+
+			if ( '' !== $ver_to_add ) {
+				$src .= ( str_contains( $src, '?' ) ? '&' : '?' ) . 'ver=' . rawurlencode( $ver_to_add );
+			}
+			if ( '' !== $added_args ) {
+				$src .= ( str_contains( $src, '?' ) ? '&' : '?' ) . $added_args;
+			}
+
+			if ( false !== $fragment ) {
+				$src .= $fragment;
+			}
+		}
+
+		/** This filter is documented in wp-includes/class-wp-scripts.php */
+		$src = apply_filters( 'script_loader_src', $src, $handle );
+
+		return is_string( $src ) ? $src : '';
+	}
+
 	/**
 	 * Adds extra code to a registered script.
 	 *

src/wp-includes/class-wp-styles.php

@@ -224,15 +224,11 @@ public function do_item( $handle, $group = false ) {
 		 */
 		$tag = apply_filters( 'style_loader_tag', $tag, $handle, $href, $media );
 
-		if ( 'rtl' === $this->text_direction && isset( $obj->extra['rtl'] ) && $obj->extra['rtl'] ) {
-			if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
-				$suffix   = $obj->extra['suffix'] ?? '';
-				$rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $src, $ver, "$handle-rtl" ) );
-			} else {
-				$rtl_href = $this->_css_href( $obj->extra['rtl'], $ver, "$handle-rtl" );
-			}
+		$rtl_src = $this->get_rtl_src( $handle );
 
-			$rtl_tag = sprintf(
+		if ( null !== $rtl_src ) {
+			$rtl_href = esc_url( $rtl_src );
+			$rtl_tag  = sprintf(
 				"<link rel='%s' id='%s-rtl-css'%s href='%s' media='%s' />\n",
 				$rel,
 				esc_attr( $handle ),
@@ -264,6 +260,53 @@ public function do_item( $handle, $group = false ) {
 		return true;
 	}
 
+	/**
+	 * Gets the URL of the right-to-left stylesheet for a registered style.
+	 *
+	 * On a right-to-left locale, a style registered with `rtl` data is served by a separate
+	 * stylesheet, which either replaces its left-to-right one (when the data is `'replace'`)
+	 * or loads alongside it.
+	 *
+	 * Like {@see WP_Styles::get_src()}, the URL is neither sanitized nor escaped, so a caller can
+	 * pass it through esc_url() to print it, or esc_url_raw() otherwise, once.
+	 *
+	 * @since 7.2.0
+	 *
+	 * @param string $handle The style's registered handle.
+	 * @return string|null URL of the right-to-left stylesheet, after the {@see 'style_loader_src'}
+	 *                     filter. Null when the text direction is not right-to-left, or the style is
+	 *                     not registered, has no source of its own, or has no right-to-left variant.
+	 */
+	public function get_rtl_src( string $handle ): ?string {
+		if ( 'rtl' !== $this->text_direction || ! isset( $this->registered[ $handle ] ) ) {
+			return null;
+		}
+
+		$obj = $this->registered[ $handle ];
+
+		if ( ! $obj->src || ! isset( $obj->extra['rtl'] ) || ! $obj->extra['rtl'] ) {
+			return null;
+		}
+
+		/*
+		 * The version and the handle's added arguments are those of the left-to-right stylesheet,
+		 * appended the same way, while the filter is passed the handle with `-rtl` appended, as it
+		 * always has been.
+		 */
+		if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
+			$suffix = isset( $obj->extra['suffix'] ) && is_string( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
+
+			return str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->build_src( $obj->src, $obj->ver, $handle, "$handle-rtl" ) );
+		}
+
+		// Any other value is the URL of the right-to-left stylesheet itself.
+		if ( ! is_string( $obj->extra['rtl'] ) ) {
+			return null;
+		}
+
+		return $this->build_src( $obj->extra['rtl'], $obj->ver, $handle, "$handle-rtl" );
+	}
+
 	/**
 	 * Adds extra CSS styles to a registered stylesheet.
 	 *
@@ -401,9 +444,66 @@ public function all_deps( $handles, $recursion = false, $group = false ) {
 	 * @param string            $src    The source of the enqueued style.
 	 * @param string|false|null $ver    The version of the enqueued style.
 	 * @param string            $handle The style's registered handle.
-	 * @return string Style's fully-qualified URL.
+	 * @return string Style's fully-qualified URL, escaped for use in an HTML attribute.
 	 */
 	public function _css_href( $src, $ver, $handle ) {
+		return esc_url( $this->build_src( $src, $ver, (string) $handle ) );
+	}
+
+	/**
+	 * Gets the URL a registered style is loaded from.
+	 *
+	 * This is the URL printed in the stylesheet's `href` attribute, including the version query
+	 * argument and any arguments added to the handle, after the {@see 'style_loader_src'} filter.
+	 * Unlike {@see WP_Styles::_css_href()}, it is neither sanitized nor escaped, so a caller can
+	 * pass it through esc_url() to print it, or esc_url_raw() otherwise, once. This is the same as
+	 * {@see WP_Script_Modules::get_src()}.
+	 *
+	 * @since 7.2.0
+	 *
+	 * @param string $handle The style's registered handle.
+	 * @return string Style URL, or an empty string when the style is not registered, has no
+	 *                source of its own because it only aliases other styles, or was filtered away.
+	 */
+	public function get_src( string $handle ): string {
+		if ( ! isset( $this->registered[ $handle ] ) ) {
+			return '';
+		}
+
+		$obj = $this->registered[ $handle ];
+
+		/*
+		 * An alias, with no source of its own, has no URL. A source of `true`, like that of `colors`,
+		 * gets past this, since its URL comes from the 'style_loader_src' filter in build_src(), as
+		 * it does when WP_Styles::do_item() prints the stylesheet.
+		 */
+		if ( ! $obj->src ) {
+			return '';
+		}
+
+		return $this->build_src( $obj->src, $obj->ver, $handle );
+	}
+
+	/**
+	 * Builds a style's fully-qualified URL and passes it through the 'style_loader_src' filter.
+	 *
+	 * The result is not escaped, so callers can escape it for where it is used.
+	 *
+	 * @since 7.2.0
+	 *
+	 * @param string|true       $src    The source of the style, or true for one whose URL comes
+	 *                                  from the {@see 'style_loader_src'} filter.
+	 * @param string|false|null $ver           The version of the style.
+	 * @param string            $handle        The style's registered handle, whose added arguments
+	 *                                         are appended.
+	 * @param string|null       $filter_handle Optional. The handle passed to the
+	 *                                         {@see 'style_loader_src'} filter, such as
+	 *                                         `{$handle}-rtl` for a right-to-left stylesheet.
+	 *                                         Default `$handle`.
+	 * @return string The filtered URL, or an empty string when the filter returns anything other
+	 *                than a string.
+	 */
+	private function build_src( $src, $ver, string $handle, ?string $filter_handle = null ): string {
 		if ( ! is_bool( $src ) && ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && str_starts_with( $src, $this->content_url ) ) ) {
 			$src = $this->base_url . $src;
 		}
@@ -443,8 +543,9 @@ public function _css_href( $src, $ver, $handle ) {
 		 * @param string $src    The source URL of the enqueued style.
 		 * @param string $handle The style's registered handle.
 		 */
-		$src = apply_filters( 'style_loader_src', $src, $handle );
-		return esc_url( $src );
+		$src = apply_filters( 'style_loader_src', $src, $filter_handle ?? $handle );
+
+		return is_string( $src ) ? $src : '';
 	}
 
 	/**

src/wp-includes/default-filters.php

@@ -398,6 +398,7 @@
 add_action( 'login_head', 'print_admin_styles', 9 );
 add_action( 'login_head', 'wp_site_icon', 99 );
 add_action( 'login_footer', 'wp_print_footer_scripts', 20 );
+add_action( 'login_footer', 'wp_prefetch_admin_assets', 21 ); // By the footer, the login screen has enqueued everything it loads, so those are skipped.
 add_action( 'login_init', 'send_frame_options_header', 10, 0 );
 add_action( 'login_init', 'wp_admin_headers' );
 

src/wp-includes/functions.php

@@ -7664,6 +7664,7 @@ function wp_auth_check_load() {
 	 * @param WP_Screen $screen The current screen object.
 	 */
 	if ( apply_filters( 'wp_auth_check_load', $show, $screen ) ) {
+		// Prefetched from the login screen by wp_prefetch_admin_assets(), which needs updating if this changes.
 		wp_enqueue_style( 'wp-auth-check' );
 		wp_enqueue_script( 'wp-auth-check' );
 

src/wp-includes/media.php

@@ -5305,11 +5305,13 @@ function wp_enqueue_media( $args = array() ) {
 	wp_localize_script( 'media-views', '_wpMediaViewsL10n', $strings );
 
 	wp_enqueue_script( 'media-audiovideo' );
+	// Prefetched for the block editor by wp_prefetch_admin_assets(), which needs updating if this changes.
 	wp_enqueue_style( 'media-views' );
 	if ( is_admin() ) {
 		wp_enqueue_script( 'mce-view' );
 		wp_enqueue_script( 'image-edit' );
 	}
+	// Prefetched for the block editor by wp_prefetch_admin_assets(), which needs updating if this changes.
 	wp_enqueue_style( 'imgareaselect' );
 	wp_plupload_default_settings();