Ticket #44339: 44339.2.diff

package-lock.json

@@ -3503 +3503 @@
                 "fsevents": {
                         "version": "1.1.3",
                         "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
-                        "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+                        "integrity": "sha1-EfgjGPX+e7LNIpZaEI6TBiCCFtg=",
                         "dev": true,
                         "optional": true,
                         "requires": {
@@ -10696 +10696 @@
                         "optional": true
                 },
                 "twemoji": {
-                        "version": "2.5.1",
-                        "resolved": "https://registry.npmjs.org/twemoji/-/twemoji-2.5.1.tgz",
-                        "integrity": "sha1-KWZHxhY8fwR0WIccKuviXqj/6DQ="
+                        "version": "11.0.0",
+                        "resolved": "https://registry.npmjs.org/twemoji/-/twemoji-11.0.0.tgz",
+                        "integrity": "sha1-fuxX0Sv9H//o1efwXaC2QipgeQ8="
                 },
                 "type-is": {
                         "version": "1.6.16",

package.json

@@ -53 +53 @@
                 "jquery-hoverintent": "1.8.3",
                 "jquery-ui": "github:jquery/jquery-ui#1.11.4",
                 "masonry-layout": "3.3.2",
-                "twemoji": "2.5.1",
+                "twemoji": "11.0.0",
                 "underscore": "1.8.3"
         }
 }

src/js/_enqueues/lib/emoji-loader.js

@@ -95 +95 @@
                                 return ! isIdentical;
                         case 'emoji':
                                 /*
-                                 * Emoji allows people of all gender levitate and so does WordPress.
+                                 * She's the hero Emoji deserves, but not the one it needs right now.
                                  *
-                                 * To test for support, try to render a new emoji (woman in business suit levitating),
+                                 * To test for support, try to render a new emoji (female superhero),
                                  * then compare it to how it would look if the browser doesn't render it correctly
-                                 * (person in business suit levitating + female sign).
+                                 * (superhero + female sign) .
                                  */
                                 isIdentical = emojiSetsRenderIdentically(
-                                        [55357, 56692, 8205, 9792, 65039],
-                                        [55357, 56692, 8203, 9792, 65039]
+                                        [55358, 56760, 8205, 9792, 65039],
+                                        [55358, 56760, 8203, 9792, 65039]
                                 );
+
                                 return ! isIdentical;
                 }
 

src/wp-includes/formatting.php

@@ -5388 +5388 @@
                  *
                  * @param string The emoji base URL for png images.
                  */
-                'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.4/72x72/' ),
+                'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/11/72x72/' ),
 
                 /**
                  * Filters the extension of the emoji png files.
@@ -5406 +5406 @@
                  *
                  * @param string The emoji base URL for svg images.
                  */
-                'svgUrl'  => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.4/svg/' ),
+                'svgUrl'  => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/11/svg/' ),
 
                 /**
                  * Filters the extension of the emoji SVG files.

src/wp-includes/general-template.php

@@ -2937 +2937 @@
          * 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/2.4/svg/' );
+        $hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/11/svg/' );
 
         foreach ( $hints as $relation_type => $urls ) {
                 $unique_urls = array();

tests/phpunit/tests/formatting/Emoji.php

@@ -6 +6 @@
  */
 class Tests_Formatting_Emoji extends WP_UnitTestCase {
 
-        private $png_cdn = 'https://s.w.org/images/core/emoji/2.4/72x72/';
-        private $svn_cdn = 'https://s.w.org/images/core/emoji/2.4/svg/';
+        private $png_cdn = 'https://s.w.org/images/core/emoji/11/72x72/';
+        private $svn_cdn = 'https://s.w.org/images/core/emoji/11/svg/';
 
         /**
          * @ticket 36525