[v18.x] Revert "url: drop ICU requirement for parsing hostnames"

deps/ada/ada.gyp

@@ -1,7 +1,6 @@
 {
   'variables': {
     'v8_enable_i18n_support%': 1,
-    'ada_sources': [ 'ada.cpp' ],
   },
   'targets': [
     {
@@ -11,7 +10,23 @@
       'direct_dependent_settings': {
         'include_dirs': ['.'],
       },
-      'sources': [ '<@(ada_sources)' ]
+      'sources': ['ada.cpp'],
+      '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',
+          ],
+        }],
+      ]
     },
   ]
 }

doc/api/url.md

@@ -134,6 +134,9 @@
   - version: v18.17.0
     pr-url: https://github.com/nodejs/node/pull/47339
     description: ICU requirement is removed.
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/48869
+    description: ICU requirement is back.
 -->
 
 * `input` {string} The absolute or relative input URL to parse. If `input`
@@ -179,6 +182,9 @@
 // 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.
@@ -1037,7 +1043,10 @@
   - version: v18.17.0
     pr-url: https://github.com/nodejs/node/pull/47339
     description: ICU requirement is removed.
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/48869
+    description: ICU requirement is back.
 -->
 
 * `domain` {string}
 * Returns: {string}
@@ -1047,6 +1056,9 @@
 
 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';
 
@@ -1079,7 +1091,10 @@
   - version: v18.17.0
     pr-url: https://github.com/nodejs/node/pull/47339
     description: ICU requirement is removed.
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/48869
+    description: ICU requirement is back.
 -->
 
 * `domain` {string}
 * Returns: {string}
@@ -1089,6 +1104,9 @@
 
 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';
 
@@ -1731,6 +1749,7 @@
 // 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/

lib/internal/idna.js

@@ -1,4 +1,9 @@
 'use strict';
 
-const { domainToASCII, domainToUnicode } = require('internal/url');
-module.exports = { toASCII: domainToASCII, toUnicode: domainToUnicode };
+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 };
+}

test/benchmark/test-benchmark-url.js

@@ -1,6 +1,18 @@
 'use strict';
 
-require('../common');
+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');
+}
 
 const runBenchmark = require('../common/benchmark');
 

test/wpt/status/url.json

@@ -1,19 +1,40 @@
 {
+  "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": {
       "expected": [
         "URL: no structured serialize/deserialize support",
         "URLSearchParams: no structured serialize/deserialize support"
       ]
     }
   },
+  "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"
   }
 }