Changeset 47416

Timestamp:

03/03/2020 04:53:32 PM (5 years ago)

Author:

jorgefilipecosta

Message:

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 r47238, 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: #49360.

Location:

trunk

Files:

• package-lock.json (modified) (1 diff)
• package.json (modified) (1 diff)
• src/wp-includes/script-loader.php (modified) (2 diffs)
• tests/phpunit/tests/dependencies/scripts.php (modified) (1 diff)
• tools/webpack/packages.js (modified) (3 diffs)

trunk/package-lock.json

@@ -5863 +5863 @@
             }
         },
+        "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=="
+        },
         "core-util-is": {
             "version": "1.0.2",

trunk/package.json

@@ -122 +122 @@
         "backbone": "1.4.0",
         "clipboard": "2.0.4",
+        "core-js-url-browser": "3.6.4",
         "element-closest": "^2.0.2",
         "formdata-polyfill": "3.0.13",

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

@@ -101 +101 @@
         'wp-polyfill-formdata'        => '3.0.12',
         'wp-polyfill-node-contains'   => '3.42.0',
-        'wp-polyfill-url'             => '3.42.0',
+        'wp-polyfill-url'             => '3.6.4',
         'wp-polyfill-dom-rect'        => '3.42.0',
         'wp-polyfill-element-closest' => '2.0.2',
@@ -127 +127 @@
                 '\'fetch\' in window' => 'wp-polyfill-fetch',
                 'document.contains'   => 'wp-polyfill-node-contains',
-                'window.URL'          => 'wp-polyfill-url',
                 'window.DOMRect'      => 'wp-polyfill-dom-rect',
+                'window.URL && window.URL.prototype && window.URLSearchParams' => 'wp-polyfill-url',
                 'window.FormData && window.FormData.prototype.keys' => 'wp-polyfill-formdata',
                 'Element.prototype.matches && Element.prototype.closest' => 'wp-polyfill-element-closest',

trunk/tests/phpunit/tests/dependencies/scripts.php

@@ -718 +718 @@
         $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/vendor/wp-polyfill.min.js'></script>\n";
         $expected .= "<script type='text/javascript'>\n";
-        $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";
+        $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/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";
         $expected .= "</script>\n";
         $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/dom-ready.min.js'></script>\n";

trunk/tools/webpack/packages.js

@@ -78 +78 @@
         'wp-polyfill-element-closest.js': 'element-closest/element-closest.js',
         'wp-polyfill-node-contains.js': 'polyfill-library/polyfills/Node/prototype/contains/polyfill.js',
-        'wp-polyfill-url.js': 'polyfill-library/polyfills/URL/polyfill.js',
+        'wp-polyfill-url.js': 'core-js-url-browser/url.js',
         'wp-polyfill-dom-rect.js': 'polyfill-library/polyfills/DOMRect/polyfill.js',
         'wp-polyfill-formdata.js': 'formdata-polyfill/FormData.js',
@@ -90 +90 @@
         'wp-polyfill.min.js': '@babel/polyfill/dist/polyfill.min.js',
         'wp-polyfill-formdata.min.js': 'formdata-polyfill/formdata.min.js',
+        'wp-polyfill-url.min.js': 'core-js-url-browser/url.min.js',
         'moment.min.js': 'moment/min/moment.min.js',
         'react.min.js': 'react/umd/react.production.min.js',
@@ -99 +100 @@
         'wp-polyfill-element-closest.min.js': 'element-closest/element-closest.js',
         'wp-polyfill-node-contains.min.js': 'polyfill-library/polyfills/Node/prototype/contains/polyfill.js',
-        'wp-polyfill-url.min.js': 'polyfill-library/polyfills/URL/polyfill.js',
         'wp-polyfill-dom-rect.min.js': 'polyfill-library/polyfills/DOMRect/polyfill.js',
     };