url: drop ICU requirement for parsing hostnames

PR-URL: https://github.com/nodejs/node/pull/47339
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Yagiz Nizipli 2023-03-31 09:04:03 -04:00 committed by Rich Trott
parent 3867641c14
commit ead407915e
5 changed files with 19 additions and 68 deletions

18
deps/ada/ada.gyp vendored
View file

@ -11,23 +11,7 @@
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': ['.'], 'include_dirs': ['.'],
}, },
'sources': [ '<@(ada_sources)' ], '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',
],
}],
]
}, },
] ]
} }

View file

@ -129,6 +129,13 @@ return `true`.
#### `new URL(input[, base])` #### `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` * `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 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. 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/ // 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 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 and a `base` is provided, it is advised to validate that the `origin` of
the `URL` object is what is expected. the `URL` object is what is expected.
@ -1029,6 +1033,10 @@ for (const [name, value] of params) {
added: added:
- v7.4.0 - v7.4.0
- v6.13.0 - v6.13.0
changes:
- version: REPLACEME
pr-url: https://github.com/nodejs/node/pull/47339
description: ICU requirement is removed.
--> -->
* `domain` {string} * `domain` {string}
@ -1039,9 +1047,6 @@ invalid domain, the empty string is returned.
It performs the inverse operation to [`url.domainToUnicode()`][]. 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 ```mjs
import url from 'node:url'; import url from 'node:url';
@ -1070,6 +1075,10 @@ console.log(url.domainToASCII('xn--iñvalid.com'));
added: added:
- v7.4.0 - v7.4.0
- v6.13.0 - v6.13.0
changes:
- version: REPLACEME
pr-url: https://github.com/nodejs/node/pull/47339
description: ICU requirement is removed.
--> -->
* `domain` {string} * `domain` {string}
@ -1080,9 +1089,6 @@ domain, the empty string is returned.
It performs the inverse operation to [`url.domainToASCII()`][]. 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 ```mjs
import url from 'node:url'; import url from 'node:url';
@ -1727,7 +1733,6 @@ console.log(myURL.origin);
// Prints https://xn--1xa.example.com // Prints https://xn--1xa.example.com
``` ```
[ICU]: intl.md#options-for-building-nodejs
[Punycode]: https://tools.ietf.org/html/rfc5891#section-4.4 [Punycode]: https://tools.ietf.org/html/rfc5891#section-4.4
[WHATWG URL]: #the-whatwg-url-api [WHATWG URL]: #the-whatwg-url-api
[WHATWG URL Standard]: https://url.spec.whatwg.org/ [WHATWG URL Standard]: https://url.spec.whatwg.org/

View file

@ -1,9 +1,4 @@
'use strict'; 'use strict';
if (internalBinding('config').hasIntl) { const { domainToASCII, domainToUnicode } = require('internal/url');
const { toASCII, toUnicode } = internalBinding('icu'); module.exports = { toASCII: domainToASCII, toUnicode: domainToUnicode };
module.exports = { toASCII, toUnicode };
} else {
const { domainToASCII, domainToUnicode } = require('internal/url');
module.exports = { toASCII: domainToASCII, toUnicode: domainToUnicode };
}

View file

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

View file

@ -1,13 +1,8 @@
{ {
"toascii.window.js": {
"requires": ["small-icu"]
},
"percent-encoding.window.js": { "percent-encoding.window.js": {
"requires": ["small-icu"],
"skip": "TODO: port from .window.js" "skip": "TODO: port from .window.js"
}, },
"historical.any.js": { "historical.any.js": {
"requires": ["small-icu"],
"fail": { "fail": {
"note": "We are faking location with a URL object for the sake of the testharness and it has searchParams.", "note": "We are faking location with a URL object for the sake of the testharness and it has searchParams.",
"expected": [ "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": { "url-setters-a-area.window.js": {
"skip": "already tested in url-setters.any.js" "skip": "already tested in url-setters.any.js"
}, },
"IdnaTestV2.window.js": {
"requires": ["small-icu"]
},
"javascript-urls.window.js": { "javascript-urls.window.js": {
"required": ["small-icu"],
"skip": "requires document.body reference" "skip": "requires document.body reference"
} }
} }