Script Loader: Fix script module fetchpriority calculation when dependent with higher priority is not enqueued.

westonruter · westonruter · commit 641cf5a12752 · 2025-12-22T20:20:33.000Z
Developed in WordPress/wordpress-develop#10651 Follow-up to [60931], [60704]. Props westonruter, jonsurrell, youknowriad. See #61734. Fixes #64429. Built from https://develop.svn.wordpress.org/trunk@61401 git-svn-id: http://core.svn.wordpress.org/trunk@60713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
diff --git a/wp-includes/class-wp-script-modules.php b/wp-includes/class-wp-script-modules.php
@@ -461,9 +461,9 @@ private function print_script_module( string $id ) {
 			'id'   => $id . '-js-module',
 		);
 
-		$script_module = $this->registered[ $id ];
-		$dependents    = $this->get_recursive_dependents( $id );
-		$fetchpriority = $this->get_highest_fetchpriority( array_merge( array( $id ), $dependents ) );
+		$script_module     = $this->registered[ $id ];
+		$queued_dependents = array_intersect( $this->queue, $this->get_recursive_dependents( $id ) );
+		$fetchpriority     = $this->get_highest_fetchpriority( array_merge( array( $id ), $queued_dependents ) );
 		if ( 'auto' !== $fetchpriority ) {
 			$attributes['fetchpriority'] = $fetchpriority;
 		}
diff --git a/wp-includes/class-wp-scripts.php b/wp-includes/class-wp-scripts.php
@@ -1092,7 +1092,7 @@ private function filter_eligible_strategies( $handle, $eligible_strategies = nul
 	 *
 	 * @since 6.9.0
 	 * @see self::filter_eligible_strategies()
-	 * @see WP_Script_Modules::get_highest_fetchpriority_with_dependents()
+	 * @see WP_Script_Modules::get_highest_fetchpriority()
 	 *
 	 * @param string                $handle         Script module ID.
 	 * @param array<string, true>   $checked        Optional. An array of already checked script handles, used to avoid recursive loops.
diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '7.0-alpha-61400';
+$wp_version = '7.0-alpha-61401';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

Original file line number	Diff line number	Diff line change
`@@ -1092,7 +1092,7 @@ private function filter_eligible_strategies( $handle, $eligible_strategies = nul`
`1092`	`1092`	`*`
`1093`	`1093`	`* @since 6.9.0`
`1094`	`1094`	`* @see self::filter_eligible_strategies()`
`1095`		`- * @see WP_Script_Modules::get_highest_fetchpriority_with_dependents()`
	`1095`	`+ * @see WP_Script_Modules::get_highest_fetchpriority()`
`1096`	`1096`	`*`
`1097`	`1097`	`* @param string $handle Script module ID.`
`1098`	`1098`	`* @param array<string, true> $checked Optional. An array of already checked script handles, used to avoid recursive loops.`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`* @global string $wp_version`
`18`	`18`	`*/`
`19`		`-$wp_version = '7.0-alpha-61400';`
	`19`	`+$wp_version = '7.0-alpha-61401';`
`20`	`20`
`21`	`21`	`/**`
`22`	`22`	`* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.`