url: drop ICU requirement for parsing hostnames

PR-URL: #47339 Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Apr 5, 2023 · ead4079 · ead4079
1 parent 3867641
commit ead4079
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 68 deletions.
diff --git a/deps/ada/ada.gyp b/deps/ada/ada.gyp
@@ -11,23 +11,7 @@
       'direct_dependent_settings': {
         'include_dirs': ['.'],
       },
-      'sources': [ '<@(ada_sources)' ],
-      'conditions': [
-        ['v8_enable_i18n_support==0', {
-          'defines': ['ADA_HAS_ICU=0'],
-        }],
-        ['v8_enable_i18n_support==1', {
-          'dependencies': [
-            '<(icu_gyp_path):icui18n',
-            '<(icu_gyp_path):icuuc',
-          ],
-        }],
-        ['OS=="win" and v8_enable_i18n_support==1', {
-          'dependencies': [
-            '<(icu_gyp_path):icudata',
-          ],
-        }],
-      ]
+      'sources': [ '<@(ada_sources)' ]
     },
   ]
 }
diff --git a/doc/api/url.md b/doc/api/url.md
@@ -129,6 +129,13 @@ return `true`.
 
 #### `new URL(input[, base])`
 
+<!--
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/47339
+    description: ICU requirement is removed.
+-->
+
 * `input` {string} The absolute or relative input URL to parse. If `input`
   is relative, then `base` is required. If `input` is absolute, the `base`
   is ignored. If `input` is not a string, it is [converted to a string][] first.
@@ -172,9 +179,6 @@ const myURL = new URL('https://測試');
 // https://xn--g6w251d/
 ```
 
-This feature is only available if the `node` executable was compiled with
-[ICU][] enabled. If not, the domain names are passed through unchanged.
-
 In cases where it is not known in advance if `input` is an absolute URL
 and a `base` is provided, it is advised to validate that the `origin` of
 the `URL` object is what is expected.
@@ -1029,6 +1033,10 @@ for (const [name, value] of params) {
 added:
   - v7.4.0
   - v6.13.0
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/47339
+    description: ICU requirement is removed.
 -->
 
 * `domain` {string}
@@ -1039,9 +1047,6 @@ invalid domain, the empty string is returned.
 
 It performs the inverse operation to [`url.domainToUnicode()`][].
 
-This feature is only available if the `node` executable was compiled with
-[ICU][] enabled. If not, the domain names are passed through unchanged.
-
 ```mjs
 import url from 'node:url';
 
@@ -1070,6 +1075,10 @@ console.log(url.domainToASCII('xn--iñvalid.com'));
 added:
   - v7.4.0
   - v6.13.0
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/47339
+    description: ICU requirement is removed.
 -->
 
 * `domain` {string}
@@ -1080,9 +1089,6 @@ domain, the empty string is returned.
 
 It performs the inverse operation to [`url.domainToASCII()`][].
 
-This feature is only available if the `node` executable was compiled with
-[ICU][] enabled. If not, the domain names are passed through unchanged.
-
 ```mjs
 import url from 'node:url';
 
@@ -1727,7 +1733,6 @@ console.log(myURL.origin);
 // Prints https://xn--1xa.example.com
 ```
 
-[ICU]: intl.md#options-for-building-nodejs
 [Punycode]: https://tools.ietf.org/html/rfc5891#section-4.4
 [WHATWG URL]: #the-whatwg-url-api
 [WHATWG URL Standard]: https://url.spec.whatwg.org/

diff --git a/lib/internal/idna.js b/lib/internal/idna.js
@@ -1,9 +1,4 @@
 'use strict';
 
-if (internalBinding('config').hasIntl) {
-  const { toASCII, toUnicode } = internalBinding('icu');
-  module.exports = { toASCII, toUnicode };
-} else {
-  const { domainToASCII, domainToUnicode } = require('internal/url');
-  module.exports = { toASCII: domainToASCII, toUnicode: domainToUnicode };
-}
+const { domainToASCII, domainToUnicode } = require('internal/url');
+module.exports = { toASCII: domainToASCII, toUnicode: domainToUnicode };
diff --git a/test/benchmark/test-benchmark-url.js b/test/benchmark/test-benchmark-url.js
@@ -1,18 +1,6 @@
 'use strict';
 
-const common = require('../common');
-
-// TODO(@anonrig): Remove this check when Ada removes ICU requirement.
-if (!common.hasIntl) {
-  // A handful of the benchmarks fail when ICU is not included.
-  // ICU is responsible for ignoring certain inputs from the hostname
-  // and without it, it is not possible to validate the correctness of the input.
-  // DomainToASCII method in Unicode specification states which characters are
-  // ignored and/or remapped. Doing this outside of the scope of DomainToASCII,
-  // would be a violation of the WHATWG URL specification.
-  // Please look into: https://unicode.org/reports/tr46/#ProcessingStepMap
-  common.skip('missing Intl');
-}
+require('../common');
 
 const runBenchmark = require('../common/benchmark');
 

diff --git a/test/wpt/status/url.json b/test/wpt/status/url.json
@@ -1,13 +1,8 @@
 {
-  "toascii.window.js": {
-    "requires": ["small-icu"]
-  },
   "percent-encoding.window.js": {
-    "requires": ["small-icu"],
     "skip": "TODO: port from .window.js"
   },
   "historical.any.js": {
-    "requires": ["small-icu"],
     "fail": {
       "note": "We are faking location with a URL object for the sake of the testharness and it has searchParams.",
       "expected": [
@@ -17,26 +12,10 @@
       ]
     }
   },
-  "urlencoded-parser.any.js": {
-    "requires": ["small-icu"]
-  },
-  "url-constructor.any.js": {
-    "requires": ["small-icu"]
-  },
-  "url-origin.any.js": {
-    "requires": ["small-icu"]
-  },
-  "url-setters.any.js": {
-    "requires": ["small-icu"]
-  },
   "url-setters-a-area.window.js": {
     "skip": "already tested in url-setters.any.js"
   },
-  "IdnaTestV2.window.js": {
-    "requires": ["small-icu"]
-  },
   "javascript-urls.window.js": {
-    "required": ["small-icu"],
     "skip": "requires document.body reference"
   }
 }