<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[58952] trunk: Script Loader: Remove `importmap` polyfill.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/58952">58952</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/58952","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-08-29 06:04:02 +0000 (Thu, 29 Aug 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Script Loader: Remove `importmap` polyfill.
The polyfill was added in <a href="https://core.trac.wordpress.org/changeset/57492">[57492]</a>, but all browsers supported by WordPress already support import maps.
This not only disables the polyfill, but completely removes it as it was only added recently and there is no usage outside of core.
Props swissspidy, desrosj, luisherranz, gziolo.
Fixes <a href="https://core.trac.wordpress.org/ticket/60970">#60970</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkpackagelockjson">trunk/package-lock.json</a></li>
<li><a href="#trunkpackagejson">trunk/package.json</a></li>
<li><a href="#trunksrcwpincludesclasswpscriptmodulesphp">trunk/src/wp-includes/class-wp-script-modules.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunktestsphpunittestsdependenciesscriptsphp">trunk/tests/phpunit/tests/dependencies/scripts.php</a></li>
<li><a href="#trunktestsphpunittestsscriptmoduleswpScriptModulesphp">trunk/tests/phpunit/tests/script-modules/wpScriptModules.php</a></li>
<li><a href="#trunktoolswebpackpackagesjs">trunk/tools/webpack/packages.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkpackagelockjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/package-lock.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/package-lock.json 2024-08-29 05:39:22 UTC (rev 58951)
+++ trunk/package-lock.json 2024-08-29 06:04:02 UTC (rev 58952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "clipboard": "2.0.11",
</span><span class="cx" style="display: block; padding: 0 10px"> "core-js-url-browser": "3.6.4",
</span><span class="cx" style="display: block; padding: 0 10px"> "element-closest": "^3.0.2",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "es-module-shims": "1.8.2",
</del><span class="cx" style="display: block; padding: 0 10px"> "formdata-polyfill": "4.0.10",
</span><span class="cx" style="display: block; padding: 0 10px"> "hoverintent": "2.2.1",
</span><span class="cx" style="display: block; padding: 0 10px"> "imagesloaded": "5.0.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14115,11 +14114,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "node_modules/es-module-shims": {
- "version": "1.8.2",
- "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.8.2.tgz",
- "integrity": "sha512-7vIYVzpOhXtpc3Yn03itB+GSgVZFW7oL4kdydA+iL+IEi7HiSLBUxM05QFw4SxTl6e++pMpGqZPo2+vdNs3TbA=="
- },
</del><span class="cx" style="display: block; padding: 0 10px"> "node_modules/es-object-atoms": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "1.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44753,11 +44747,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "es-module-shims": {
- "version": "1.8.2",
- "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.8.2.tgz",
- "integrity": "sha512-7vIYVzpOhXtpc3Yn03itB+GSgVZFW7oL4kdydA+iL+IEi7HiSLBUxM05QFw4SxTl6e++pMpGqZPo2+vdNs3TbA=="
- },
</del><span class="cx" style="display: block; padding: 0 10px"> "es-object-atoms": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "1.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
</span></span></pre></div>
<a id="trunkpackagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/package.json 2024-08-29 05:39:22 UTC (rev 58951)
+++ trunk/package.json 2024-08-29 06:04:02 UTC (rev 58952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "clipboard": "2.0.11",
</span><span class="cx" style="display: block; padding: 0 10px"> "core-js-url-browser": "3.6.4",
</span><span class="cx" style="display: block; padding: 0 10px"> "element-closest": "^3.0.2",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "es-module-shims": "1.8.2",
</del><span class="cx" style="display: block; padding: 0 10px"> "formdata-polyfill": "4.0.10",
</span><span class="cx" style="display: block; padding: 0 10px"> "hoverintent": "2.2.1",
</span><span class="cx" style="display: block; padding: 0 10px"> "imagesloaded": "5.0.0",
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpscriptmodulesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-script-modules.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-script-modules.php 2024-08-29 05:39:22 UTC (rev 58951)
+++ trunk/src/wp-includes/class-wp-script-modules.php 2024-08-29 06:04:02 UTC (rev 58952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,20 +236,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function print_import_map() {
</span><span class="cx" style="display: block; padding: 0 10px"> $import_map = $this->get_import_map();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $import_map['imports'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_scripts;
- if ( isset( $wp_scripts ) ) {
- wp_print_inline_script_tag(
- wp_get_script_polyfill(
- $wp_scripts,
- array(
- 'HTMLScriptElement.supports && HTMLScriptElement.supports("importmap")' => 'wp-polyfill-importmap',
- )
- ),
- array(
- 'id' => 'wp-load-polyfill-importmap',
- )
- );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> wp_print_inline_script_tag(
</span><span class="cx" style="display: block; padding: 0 10px"> wp_json_encode( $import_map, JSON_HEX_TAG | JSON_HEX_AMP ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2024-08-29 05:39:22 UTC (rev 58951)
+++ trunk/src/wp-includes/script-loader.php 2024-08-29 06:04:02 UTC (rev 58952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'lodash',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-fetch',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-formdata',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-polyfill-importmap',
</del><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-node-contains',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-url',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-dom-rect',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +121,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-object-fit' => '2.3.5',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-inert' => '3.1.2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill' => '3.15.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-polyfill-importmap' => '1.8.2',
</del><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $vendor_scripts as $handle => $dependencies ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsdependenciesscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/dependencies/scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/scripts.php 2024-08-29 05:39:22 UTC (rev 58951)
+++ trunk/tests/phpunit/tests/dependencies/scripts.php 2024-08-29 06:04:02 UTC (rev 58952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3117,9 +3117,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_get_script_polyfill() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $script_name = 'wp-polyfill-importmap';
- $test_script = 'HTMLScriptElement.supports && HTMLScriptElement.supports("importmap")';
- $script_url = 'https://example.com/wp-polyfill-importmap.js';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $script_name = 'tmp-polyfill-foo';
+ $test_script = 'HTMLScriptElement.supports && HTMLScriptElement.supports("foo")';
+ $script_url = 'https://example.com/polyfill-foo.js';
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( $script_name, $script_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $polyfill = wp_get_script_polyfill(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3133,7 +3133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '( ' . $test_script . ' ) || document.write( \'<script src="' . $script_url . '"></scr\' + \'ipt>\' );';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $expected, $polyfill );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, $polyfill );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsscriptmoduleswpScriptModulesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/script-modules/wpScriptModules.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/script-modules/wpScriptModules.php 2024-08-29 05:39:22 UTC (rev 58951)
+++ trunk/tests/phpunit/tests/script-modules/wpScriptModules.php 2024-08-29 06:04:02 UTC (rev 58952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,39 +701,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 60348
- *
- * @covers ::print_import_map_polyfill()
- */
- public function test_wp_print_import_map_has_no_polyfill_when_no_modules_registered() {
- $import_map_polyfill = get_echo( array( $this->script_modules, 'print_import_map' ) );
-
- $this->assertSame( '', $import_map_polyfill );
- }
-
- /**
- * @ticket 60348
- *
- * @covers ::print_import_map_polyfill()
- */
- public function test_wp_print_import_map_has_polyfill_when_modules_registered() {
- $script_name = 'wp-polyfill-importmap';
- wp_register_script( $script_name, '/wp-polyfill-importmap.js' );
-
- $this->script_modules->enqueue( 'foo', '/foo.js', array( 'dep' ), '1.0' );
- $this->script_modules->register( 'dep', '/dep.js' );
- $import_map_polyfill = get_echo( array( $this->script_modules, 'print_import_map' ) );
-
- wp_deregister_script( $script_name );
-
- $p = new WP_HTML_Tag_Processor( $import_map_polyfill );
- $p->next_tag( array( 'tag' => 'SCRIPT' ) );
- $id = $p->get_attribute( 'id' );
-
- $this->assertSame( 'wp-load-polyfill-importmap', $id );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 61510
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_print_script_module_data_prints_enqueued_module_data() {
</span></span></pre></div>
<a id="trunktoolswebpackpackagesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tools/webpack/packages.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tools/webpack/packages.js 2024-08-29 05:39:22 UTC (rev 58951)
+++ trunk/tools/webpack/packages.js 2024-08-29 06:04:02 UTC (rev 58952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-object-fit.js':
</span><span class="cx" style="display: block; padding: 0 10px"> 'objectFitPolyfill/src/objectFitPolyfill.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-inert.js': 'wicg-inert/dist/inert.js',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-polyfill-importmap.js': 'es-module-shims/dist/es-module-shims.wasm.js',
</del><span class="cx" style="display: block; padding: 0 10px"> 'moment.js': 'moment/moment.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'regenerator-runtime.js': 'regenerator-runtime/runtime.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'react.js': 'react/umd/react.development.js',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +121,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'polyfill-library/polyfills/__dist/Node.prototype.contains/raw.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-dom-rect.min.js':
</span><span class="cx" style="display: block; padding: 0 10px"> 'polyfill-library/polyfills/__dist/DOMRect/raw.js',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-polyfill-importmap.min.js': 'es-module-shims/dist/es-module-shims.wasm.js',
</del><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const phpFiles = {
</span></span></pre>
</div>
</div>
</body>
</html>