Changeset 53904

Timestamp:

08/18/2022 08:43:19 AM (2 years ago)

Author:

audrasjb

Message:

Script Loader: Remove default DNS prefetch entry for s.w.org.

A default DNS prefetch entry for s.w.org was previously included to save a few ms in case an emoji is used that is not supported by the browser. It appears this use case doesn't justify a prefetch to s.w.org on every WordPress website.

This changesets removes emoji_svg_url prefetch from wp_resource_hints(). It also updates unit tests in Tests_General_wpResourceHints by removing test_should_have_defaults_on_frontend() entirely and removing s.w.org prefetch from expected output of ten other test functions.

Plugin authors can use the wp_resource_hints filter if they need to re-add the DNS prefetch entry for s.w.org.

Follow-up to [37920], [38122].

Props joelhardi, superpoincare, jhabdas, garrett-eclipse, sabernhardt, SergeyBiryukov.
Fixes #40426.
See #37387.

Location:

trunk

Files:

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

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

@@ -3318 +3318 @@
     );
 
-    /*
-     * Add DNS prefetch for the Emoji CDN.
-     * The path is removed in the foreach loop below.
-     */
-    /** This filter is documented in wp-includes/formatting.php */
-    $hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/13.0.0/svg/' );
-
     foreach ( $hints as $relation_type => $urls ) {
         $unique_urls = array();

trunk/tests/phpunit/tests/general/wpResourceHints.php

@@ -31 +31 @@
     }
 
-    public function test_should_have_defaults_on_frontend() {
-        $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n";
-
-        $this->expectOutputString( $expected );
-
-        wp_resource_hints();
-    }
-
     public function test_dns_prefetching() {
-        $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
-                    "<link rel='dns-prefetch' href='//wordpress.org' />\n" .
+        $expected = "<link rel='dns-prefetch' href='//wordpress.org' />\n" .
                     "<link rel='dns-prefetch' href='//google.com' />\n" .
                     "<link rel='dns-prefetch' href='//make.wordpress.org' />\n";
@@ -71 +62 @@
      */
     public function test_preconnect() {
-        $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
-                    "<link rel='preconnect' href='//wordpress.org' />\n" .
+        $expected = "<link rel='preconnect' href='//wordpress.org' />\n" .
                     "<link rel='preconnect' href='https://make.wordpress.org' />\n" .
                     "<link rel='preconnect' href='http://google.com' />\n" .
@@ -99 +89 @@
 
     public function test_prerender() {
-        $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
-                    "<link rel='prerender' href='https://make.wordpress.org/great-again' />\n" .
+        $expected = "<link rel='prerender' href='https://make.wordpress.org/great-again' />\n" .
                     "<link rel='prerender' href='http://jobs.wordpress.net' />\n" .
                     "<link rel='prerender' href='//core.trac.wordpress.org' />\n";
@@ -125 +114 @@
 
     public function test_parse_url_dns_prefetch() {
-        $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
-                    "<link rel='dns-prefetch' href='//make.wordpress.org' />\n";
+        $expected = "<link rel='dns-prefetch' href='//make.wordpress.org' />\n";
 
         add_filter( 'wp_resource_hints', array( $this, 'add_dns_prefetch_long_urls' ), 10, 2 );
@@ -146 +134 @@
 
     public function test_dns_prefetch_styles() {
-        $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com' />\n" .
-                    "<link rel='dns-prefetch' href='//s.w.org' />\n";
+        $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com' />\n";
 
         $args = array(
@@ -165 +152 @@
 
     public function test_dns_prefetch_scripts() {
-        $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com' />\n" .
-                    "<link rel='dns-prefetch' href='//s.w.org' />\n";
+        $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com' />\n";
 
         $args = array(
@@ -186 +172 @@
      */
     public function test_dns_prefetch_scripts_does_not_include_registered_only() {
-        $expected   = "<link rel='dns-prefetch' href='//s.w.org' />\n";
+        $expected   = '';
         $unexpected = "<link rel='dns-prefetch' href='//wordpress.org' />\n";
 
@@ -203 +189 @@
      */
     public function test_deregistered_scripts_are_ignored() {
-        $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n";
+        $expected = '';
 
         wp_enqueue_script( 'test-script', 'http://example.org/script.js' );
@@ -216 +202 @@
      */
     public function test_malformed_urls() {
-        $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n";
+        $expected = '';
 
         // Errant colon.
@@ -251 +237 @@
      */
     public function test_custom_attributes() {
-        $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
-                    "<link rel='preconnect' href='https://make.wordpress.org' />\n" .
+        $expected = "<link rel='preconnect' href='https://make.wordpress.org' />\n" .
                     "<link crossorigin as='image' pr='0.5' href='https://example.com/foo.jpeg' rel='prefetch' />\n" .
                     "<link crossorigin='use-credentials' as='style' href='https://example.com/foo.css' rel='prefetch' />\n" .