<!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>[47416] trunk: Scripts: Use core-js url as polyfill for window.URL.</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/47416">47416</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/47416","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jorgefilipecosta</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-03-03 16:53:32 +0000 (Tue, 03 Mar 2020)</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'>Scripts: Use core-js url as polyfill for window.URL.
URL polyfill from the polyfill-library library is not spec-conformant, in a way which negatively impacts its usability for pending revisions to the block editor. Specifically, there were revisions to the implementation of the wp-url script to detect URL validity by relying on thrown errors from the URL constructor, but this specific behavior is not implemented in this version of the polyfill.
There was another issue in <a href="https://core.trac.wordpress.org/changeset/47238">r47238</a>, which is that the test used to check whether the polyfill should be included is not accurate. This commit uses a different check and fixes the issue.
Props aduth.
Fixes: <a href="https://core.trac.wordpress.org/ticket/49360">#49360</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="#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="#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 2020-03-03 12:20:35 UTC (rev 47415)
+++ trunk/package-lock.json 2020-03-03 16:53:32 UTC (rev 47416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5862,6 +5862,11 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "core-js-url-browser": {
+ "version": "3.6.4",
+ "resolved": "https://registry.npmjs.org/core-js-url-browser/-/core-js-url-browser-3.6.4.tgz",
+ "integrity": "sha512-VCMkPikOVp5JXftTj0E3gPZNKa0exQX837KxyPcnMAKvImWG8+RbXwEHEGMjiNz+9Vl2YgutkVYOpq7iaSOt/Q=="
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> "core-util-is": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "1.0.2",
</span><span class="cx" style="display: block; padding: 0 10px"> "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.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 2020-03-03 12:20:35 UTC (rev 47415)
+++ trunk/package.json 2020-03-03 16:53:32 UTC (rev 47416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,6 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "@wordpress/wordcount": "2.7.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "backbone": "1.4.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "clipboard": "2.0.4",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "core-js-url-browser": "3.6.4",
</ins><span class="cx" style="display: block; padding: 0 10px"> "element-closest": "^2.0.2",
</span><span class="cx" style="display: block; padding: 0 10px"> "formdata-polyfill": "3.0.13",
</span><span class="cx" style="display: block; padding: 0 10px"> "hoverintent": "2.2.1",
</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 2020-03-03 12:20:35 UTC (rev 47415)
+++ trunk/src/wp-includes/script-loader.php 2020-03-03 16:53:32 UTC (rev 47416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-fetch' => '3.0.0',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-formdata' => '3.0.12',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-node-contains' => '3.42.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-polyfill-url' => '3.42.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-polyfill-url' => '3.6.4',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-dom-rect' => '3.42.0',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-element-closest' => '2.0.2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill' => '7.4.4',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,8 +126,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '\'fetch\' in window' => 'wp-polyfill-fetch',
</span><span class="cx" style="display: block; padding: 0 10px"> 'document.contains' => 'wp-polyfill-node-contains',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'window.URL' => 'wp-polyfill-url',
</del><span class="cx" style="display: block; padding: 0 10px"> 'window.DOMRect' => 'wp-polyfill-dom-rect',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'window.URL && window.URL.prototype && window.URLSearchParams' => 'wp-polyfill-url',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'window.FormData && window.FormData.prototype.keys' => 'wp-polyfill-formdata',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Element.prototype.matches && Element.prototype.closest' => 'wp-polyfill-element-closest',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</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 2020-03-03 12:20:35 UTC (rev 47415)
+++ trunk/tests/phpunit/tests/dependencies/scripts.php 2020-03-03 16:53:32 UTC (rev 47416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,7 +717,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='http://example.com'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/vendor/wp-polyfill.min.js'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript'>\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected .= "( 'fetch' in window ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-fetch.min.js\"></scr' + 'ipt>' );( document.contains ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-node-contains.min.js\"></scr' + 'ipt>' );( window.URL ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-url.min.js\"></scr' + 'ipt>' );( window.DOMRect ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-dom-rect.min.js\"></scr' + 'ipt>' );( window.FormData && window.FormData.prototype.keys ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-formdata.min.js\"></scr' + 'ipt
>' );( Element.prototype.matches && Element.prototype.closest ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-element-closest.min.js\"></scr' + 'ipt>' );\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected .= "( 'fetch' in window ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-fetch.min.js\"></scr' + 'ipt>' );( document.contains ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-node-contains.min.js\"></scr' + 'ipt>' );( window.DOMRect ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-dom-rect.min.js\"></scr' + 'ipt>' );( window.URL && window.URL.prototype && window.URLSearchParams ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-url.min.js\"></scr' + 'ipt>' );( window.FormData && window.FormData.prototype.keys ) || document.write( '<script src=\"http://example.org/wp-includes/js/d
ist/vendor/wp-polyfill-formdata.min.js\"></scr' + 'ipt>' );( Element.prototype.matches && Element.prototype.closest ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-element-closest.min.js\"></scr' + 'ipt>' );\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected .= "</script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/dom-ready.min.js'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/a11y.min.js'></script>\n";
</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 2020-03-03 12:20:35 UTC (rev 47415)
+++ trunk/tools/webpack/packages.js 2020-03-03 16:53:32 UTC (rev 47416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-fetch.js': 'whatwg-fetch/dist/fetch.umd.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-element-closest.js': 'element-closest/element-closest.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-node-contains.js': 'polyfill-library/polyfills/Node/prototype/contains/polyfill.js',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-polyfill-url.js': 'polyfill-library/polyfills/URL/polyfill.js',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-polyfill-url.js': 'core-js-url-browser/url.js',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-dom-rect.js': 'polyfill-library/polyfills/DOMRect/polyfill.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-formdata.js': 'formdata-polyfill/FormData.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'moment.js': 'moment/moment.js',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,6 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'lodash.min.js': 'lodash/lodash.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill.min.js': '@babel/polyfill/dist/polyfill.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-formdata.min.js': 'formdata-polyfill/formdata.min.js',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp-polyfill-url.min.js': 'core-js-url-browser/url.min.js',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'moment.min.js': 'moment/min/moment.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'react.min.js': 'react/umd/react.production.min.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'react-dom.min.js': 'react-dom/umd/react-dom.production.min.js',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +99,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-fetch.min.js': 'whatwg-fetch/dist/fetch.umd.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-element-closest.min.js': 'element-closest/element-closest.js',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-node-contains.min.js': 'polyfill-library/polyfills/Node/prototype/contains/polyfill.js',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-polyfill-url.min.js': 'polyfill-library/polyfills/URL/polyfill.js',
</del><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill-dom-rect.min.js': 'polyfill-library/polyfills/DOMRect/polyfill.js',
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>