Changeset 61415 for trunk/src/wp-includes/script-loader.php

Timestamp:

12/29/2025 11:32:17 AM (3 months ago)

Author:

jonsurrell

Message:

Scripts: Remove non-HTML5 script support.

Remove the following behaviors that are obsolete in HTML5:

• CDATA wrappers around SCRIPT tag contents.
• Conversion of boolean attributes to strings (attribute async="async" becomes async).

HTML5 was released in 2008 and data suggests virtually all WordPress sites are served as HTML5. See #59883 for more details.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10660.

Props jonsurrell, westonruter, azaozz, soyebsalar01, dmsnell.
Fixes #64442. See #59883.

File:

• trunk/src/wp-includes/script-loader.php (modified) (4 diffs)

trunk/src/wp-includes/script-loader.php

@@ -2211 +2211 @@
         if ( ! empty( $wp_scripts->print_code ) ) {
             echo "\n<script>\n";
-            echo "/* <![CDATA[ */\n"; // Not needed in HTML 5.
             echo $wp_scripts->print_code;
             echo sprintf( "\n//# sourceURL=%s\n", rawurlencode( 'js-inline-concat-' . $concat ) );
-            echo "/* ]]> */\n";
             echo "</script>\n";
         }
@@ -2872 +2870 @@
  */
 function wp_sanitize_script_attributes( $attributes ) {
-    $html5_script_support = is_admin() || current_theme_supports( 'html5', 'script' );
-    $attributes_string    = '';
+    $attributes_string = '';
 
     /*
@@ -2882 +2879 @@
         if ( is_bool( $attribute_value ) ) {
             if ( $attribute_value ) {
-                $attributes_string .= $html5_script_support ? ' ' . esc_attr( $attribute_name ) : sprintf( ' %1$s="%2$s"', esc_attr( $attribute_name ), esc_attr( $attribute_name ) );
+                $attributes_string .= ' ' . esc_attr( $attribute_name );
             }
         } else {
@@ -2945 +2942 @@
  */
 function wp_get_inline_script_tag( $data, $attributes = array() ) {
-    /*
-     * XHTML extracts the contents of the SCRIPT element and then the XML parser
-     * decodes character references and other syntax elements. This can lead to
-     * misinterpretation of the script contents or invalid XHTML documents.
-     *
-     * Wrapping the contents in a CDATA section instructs the XML parser not to
-     * transform the contents of the SCRIPT element before passing them to the
-     * JavaScript engine.
-     *
-     * Example:
-     *
-     *     <script>console.log('&hellip;');</script>
-     *
-     *     In an HTML document this would print "&hellip;" to the console,
-     *     but in an XHTML document it would print "…" to the console.
-     *
-     *     <script>console.log('An image is <img> in HTML');</script>
-     *
-     *     In an HTML document this would print "An image is <img> in HTML",
-     *     but it's an invalid XHTML document because it interprets the `<img>`
-     *     as an empty tag missing its closing `/`.
-     *
-     * @see https://www.w3.org/TR/xhtml1/#h-4.8
-     */
-    if (
-        ( ! current_theme_supports( 'html5', 'script' ) && ! is_admin() )
-        && (
-            ! isset( $attributes['type'] ) ||
-            'module' === $attributes['type'] ||
-            str_contains( $attributes['type'], 'javascript' ) ||
-            str_contains( $attributes['type'], 'ecmascript' ) ||
-            str_contains( $attributes['type'], 'jscript' ) ||
-            str_contains( $attributes['type'], 'livescript' )
-        )
-    ) {
-        /*
-         * If the string `]]>` exists within the JavaScript it would break
-         * out of any wrapping CDATA section added here, so to start, it's
-         * necessary to escape that sequence which requires splitting the
-         * content into two CDATA sections wherever it's found.
-         *
-         * Note: it's only necessary to escape the closing `]]>` because
-         * an additional `<![CDATA[` leaves the contents unchanged.
-         */
-        $data = str_replace( ']]>', ']]]]><![CDATA[>', $data );
-
-        // Wrap the entire escaped script inside a CDATA section.
-        $data = sprintf( "/* <![CDATA[ */\n%s\n/* ]]> */", $data );
-    }
-
     $data = "\n" . trim( $data, "\n\r " ) . "\n";