Changeset 52325

Timestamp:

12/06/2021 10:12:28 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Remove the replace:emoji-banner-text Grunt task.

The task was previously used to ensure that /*! This file is auto-generated */ comment is not included on front end as part of the inline emoji detection script.

As the wp-emoji-loader.js script is now included via file_get_contents() and wp_print_inline_script_tag() instead of grunt-include to simplify the logic, the task does not find anything to replace and is no longer necessary.

Additionally, include a line break before the wp-emoji-loader.js script content for better line wrapping.

Follow-up to [48096], [50651], [52132].

See #44632, #44306, #53363.

Location:

trunk

Files:

• Gruntfile.js (modified) (2 diffs)
• src/wp-includes/formatting.php (modified) (1 diff)

trunk/Gruntfile.js

@@ -1094 +1094 @@
                                 ]
                         },
-                        'emoji-banner-text': {
-                                options: {
-                                        patterns: [
-                                                {
-                                                        match: new RegExp( '\\s*' + BANNER_TEXT.replace( /[\/\*\!]/g, '\\$&' ) ),
-                                                        replacement: ''
-                                                }
-                                        ]
-                                },
-                                files: [
-                                        {
-                                                expand: true,
-                                                flatten: true,
-                                                src: [
-                                                        BUILD_DIR + 'wp-includes/formatting.php'
-                                                ],
-                                                dest: BUILD_DIR + 'wp-includes/'
-                                        }
-                                ]
-                        },
                         'source-maps': {
                                 options: {
@@ -1584 +1564 @@
                                 'build:js',
                                 'build:css',
-                                'replace:emoji-banner-text',
                                 'replace:source-maps',
                                 'verify:build'

trunk/src/wp-includes/formatting.php

@@ -5788 +5788 @@
 
         wp_print_inline_script_tag(
-                sprintf( 'window._wpemojiSettings = %s;', wp_json_encode( $settings ) ) .
+                sprintf( 'window._wpemojiSettings = %s;', wp_json_encode( $settings ) ) . "\n" .
                         file_get_contents( sprintf( ABSPATH . WPINC . '/js/wp-emoji-loader' . wp_scripts_get_suffix() . '.js' ) )
         );