vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 12:20:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Script Loader: Only emit CDATA wrapper comments in wp_get_inline_script_tag() for JavaScript.

Browse Source 
This avoids erroneously adding CDATA wrapper comments for non-JavaScript scripts, including those for JSON such as the `importmap` for script modules in #56313.

Props westonruter, flixos90, mukesh27, dmsnell.
See #56313.
Fixes #60320.


git-svn-id: https://develop.svn.wordpress.org/trunk@57341 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Weston Ruter
2024-01-23 17:54:25 +00:00
parent a21e447a14
commit 5139923579
2 changed files with 95 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/script-loader.php
+11 -1
View File
@@ -2879,7 +2879,17 @@ function wp_get_inline_script_tag( $javascript, $attributes = array() ) {
*
* @see https://www.w3.org/TR/xhtml1/#h-4.8
*/
if ( ! $is_html5 ) {
if (
! $is_html5 &&
(
! 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
tests/phpunit/tests/dependencies/wpInlineScriptTag.php
+84
View File
@@ -10,6 +10,20 @@
*/
class Tests_Functions_wpInlineScriptTag extends WP_UnitTestCase {
private $original_theme_features = array();
public function set_up() {
global $_wp_theme_features;
parent::set_up();
$this->original_theme_features = $_wp_theme_features;
}
public function tear_down() {
global $_wp_theme_features;
$_wp_theme_features = $this->original_theme_features;
parent::tear_down();
}
private $event_handler = <<<'JS'
document.addEventListener( 'DOMContentLoaded', function () {
document.getElementById( 'elementID' )
@@ -133,4 +147,74 @@ JS;
wp_get_inline_script_tag( "/* <![CDATA[ */ console.log( 'Hello World!' ); /* ]]> */" )
);
}
public function data_provider_to_test_cdata_wrapper_omitted_for_non_javascript_scripts() {
return array(
'no-type' => array(
'type' => null,
'data' => 'alert("hello")',
'expected_cdata' => true,
),
'js-type' => array(
'type' => 'text/javascript',
'data' => 'alert("hello")',
'expected_cdata' => true,
),
'js-alt-type' => array(
'type' => 'application/javascript',
'data' => 'alert("hello")',
'expected_cdata' => true,
),
'module' => array(
'type' => 'module',
'data' => 'alert("hello")',
'expected_cdata' => true,
),
'importmap' => array(
'type' => 'importmap',
'data' => '{"imports":{"bar":"http:\/\/localhost:10023\/bar.js?ver=6.5-alpha-57321"}}',
'expected_cdata' => false,
),
'html' => array(
'type' => 'text/html',
'data' => '<div>template code</div>',
'expected_cdata' => false,
),
'json' => array(
'type' => 'application/json',
'data' => '{}',
'expected_cdata' => false,
),
'ld' => array(
'type' => 'application/ld+json',
'data' => '{}',
'expected_cdata' => false,
),
'specrules' => array(
'type' => 'speculationrules',
'data' => '{}',
'expected_cdata' => false,
),
);
}
/**
* Tests that CDATA wrapper is not added for non-JavaScript scripts.
*
* @ticket 60320
*
* @dataProvider data_provider_to_test_cdata_wrapper_omitted_for_non_javascript_scripts
*/
public function test_cdata_wrapper_omitted_for_non_javascript_scripts( $type, $data, $expected_cdata ) {
remove_theme_support( 'html5' );
$attrs = array();
if ( $type ) {
$attrs['type'] = $type;
}
$script = wp_get_inline_script_tag( $data, $attrs );
$this->assertSame( $expected_cdata, str_contains( $script, '/* <![CDATA[ */' ) );
$this->assertSame( $expected_cdata, str_contains( $script, '/* ]]> */' ) );
$this->assertStringContainsString( $data, $script );
}
}