Skip to content

Commit efd0b5a

Browse files
GeoffreyBoothclaude
authored andcommitted
deps: load amaro from dist/internal.js
amaro 1.3.0 turned dist/index.js into a thin wrapper that requires ./internal.js, where the implementation now lives. Register and require internal.js as the built-in instead of index.js, which would otherwise fail to resolve its sibling. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> PR-URL: #66144 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
1 parent 51ce159 commit efd0b5a

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎configure.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
# builtins may be removed later if they have been disabled by options
6161
shareable_builtins = {'undici/undici': 'deps/undici/undici.js',
62-
'amaro/dist/index': 'deps/amaro/dist/index.js'
62+
'amaro/dist/internal': 'deps/amaro/dist/internal.js'
6363
}
6464

6565
# create option groups
@@ -3000,7 +3000,7 @@ def make_bin_override():
30003000

30013001
# remove builtins that have been disabled
30023002
if options.without_amaro:
3003-
del shareable_builtins['amaro/dist/index']
3003+
del shareable_builtins['amaro/dist/internal']
30043004

30053005
# configure shareable builtins
30063006
output['variables']['node_builtin_shareable_builtins'] = []

‎lib/internal/modules/typescript.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const {
3434
*/
3535
const loadTypeScriptParser = getLazy(() => {
3636
assertTypeScript();
37-
const amaro = require('internal/deps/amaro/dist/index');
37+
const amaro = require('internal/deps/amaro/dist/internal');
3838
return amaro.transformSync;
3939
});
4040

‎node.gni‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ declare_args() {
1818
# the list between configure.py and GN configurations.
1919
node_builtin_shareable_builtins = [
2020
"deps/undici/undici.js",
21-
"deps/amaro/dist/index.js",
21+
"deps/amaro/dist/internal.js",
2222
]
2323
}
2424

‎test/parallel/test-process-versions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const expected_keys = [
2929

3030

3131
const hasUndici = process.config.variables.node_builtin_shareable_builtins.includes('deps/undici/undici.js');
32-
const hasAmaro = process.config.variables.node_builtin_shareable_builtins.includes('deps/amaro/dist/index.js');
32+
const hasAmaro = process.config.variables.node_builtin_shareable_builtins.includes('deps/amaro/dist/internal.js');
3333
const hasLief = process.config.variables.node_use_lief;
3434

3535
if (process.config.variables.node_use_amaro) {

0 commit comments

Comments
 (0)