Changeset 38100

Timestamp:

07/19/2016 02:34:42 AM (9 years ago)

Author:

peterwilsoncc

Message:

Script Loader: Limit resource hinting to enqueued assets.

Externally hosted script and style dependencies trigger dns-prefetch hinting only when enqueued. This removed a bug in which hinting was added on registration.

Renames the function wp_resource_hints_scripts_styles to wp_dependencies_unique_hosts as the function provides the hosts, not the hinting.

Props swissspidy.
Fixes #37385.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (2 diffs)
• tests/phpunit/tests/general/resourceHints.php (modified) (1 diff)

trunk/src/wp-includes/general-template.php

@@ -2800 +2800 @@
 function wp_resource_hints() {
     $hints = array(
-        'dns-prefetch' => wp_resource_hints_scripts_styles(),
+        'dns-prefetch' => wp_dependencies_unique_hosts(),
         'preconnect'   => array( 's.w.org' ),
         'prefetch'     => array(),
@@ -2852 +2852 @@
 
 /**
- * Adds dns-prefetch for all scripts and styles enqueued from external hosts.
+ * Returns a list of unique hosts of all enqueued scripts and styles.
  *
  * @since 4.6.0
- */
-function wp_resource_hints_scripts_styles() {
+ *
+ * @return array A list of unique hosts of enqueued scripts and styles.
+ */
+function wp_dependencies_unique_hosts() {
     global $wp_scripts, $wp_styles;
 
     $unique_hosts = array();
 
-    if ( is_object( $wp_scripts ) && ! empty( $wp_scripts->registered ) ) {
-        foreach ( $wp_scripts->registered as $registered_script ) {
-            $parsed = wp_parse_url( $registered_script->src );
-
-            if ( ! empty( $parsed['host'] ) && ! in_array( $parsed['host'], $unique_hosts ) && $parsed['host'] !== $_SERVER['SERVER_NAME'] ) {
-                $unique_hosts[] = $parsed['host'];
-            }
-        }
-    }
-
-    if ( is_object( $wp_styles ) && ! empty( $wp_styles->registered ) ) {
-        foreach ( $wp_styles->registered as $registered_style ) {
-            $parsed = wp_parse_url( $registered_style->src );
-
-            if ( ! empty( $parsed['host'] ) && ! in_array( $parsed['host'], $unique_hosts ) && $parsed['host'] !== $_SERVER['SERVER_NAME'] ) {
-                $unique_hosts[] = $parsed['host'];
+    foreach ( array( $wp_scripts, $wp_styles ) as $dependencies ) {
+        if ( $dependencies instanceof WP_Dependencies && ! empty( $dependencies->queue ) ) {
+            foreach ( $dependencies->queue as $handle ) {
+                /* @var _WP_Dependency $dependency */
+                $dependency = $dependencies->registered[ $handle ];
+                $parsed     = wp_parse_url( $dependency->src );
+
+                if ( ! empty( $parsed['host'] ) && ! in_array( $parsed['host'], $unique_hosts ) && $parsed['host'] !== $_SERVER['SERVER_NAME'] ) {
+                    $unique_hosts[] = $parsed['host'];
+                }
             }
         }

trunk/tests/phpunit/tests/general/resourceHints.php

@@ -151 +151 @@
     }
 
+    function test_dns_prefetch_scripts_does_not_included_registered_only() {
+        $expected = "<link rel='preconnect' href='http://s.w.org'>\n";
+        $unexpected = "<link rel='dns-prefetch' href='//wordpress.org'>\n";
+
+        wp_register_script( 'jquery-elsewhere', 'https://wordpress.org/wp-includes/js/jquery/jquery.js' );
+
+        $actual = get_echo( 'wp_resource_hints' );
+
+        wp_deregister_script( 'jquery-elsewhere' );
+
+        $this->assertEquals( $expected, $actual );
+        $this->assertNotContains( $unexpected, $actual );
+    }
 }