From 98aac2b6398dca6244396a9efd218dd2db5f1f21 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9my=20Lal?= Date: Mon, 3 Jun 2024 13:36:41 +0200 Subject: [PATCH] add acorn, walk to shared builtins Last-Update: 2022-09-28 Forwarded: https://github.com/nodejs/node/pull/44376 Gbp-Pq: Topic build Gbp-Pq: Name more_shareable_builtins.patch --- configure.py | 4 +++- node.gyp | 3 --- src/node_builtins.cc | 13 +++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/configure.py b/configure.py index 11c0df455..7f272f234 100755 --- a/configure.py +++ b/configure.py @@ -59,7 +59,9 @@ icu_versions = json.loads((tools_path / 'icu' / 'icu_versions.json').read_text(e shareable_builtins = {'cjs_module_lexer/lexer': 'deps/cjs-module-lexer/lexer.js', 'cjs_module_lexer/dist/lexer': 'deps/cjs-module-lexer/dist/lexer.js', - 'undici/undici': 'deps/undici/undici.js' + 'undici/undici': 'deps/undici/undici.js', + 'acorn': 'deps/acorn/acorn/dist/acorn.js', + 'acorn_walk': 'deps/acorn/acorn-walk/dist/walk.js' } # create option groups diff --git a/node.gyp b/node.gyp index 5abbad6c6..d69693f33 100644 --- a/node.gyp +++ b/node.gyp @@ -51,9 +51,6 @@ 'deps/v8/tools/tickprocessor.mjs', 'deps/v8/tools/sourcemap.mjs', 'deps/v8/tools/tickprocessor-driver.mjs', - 'deps/acorn/acorn/dist/acorn.js', - 'deps/acorn/acorn-walk/dist/walk.js', - 'deps/minimatch/index.js', '<@(node_builtin_shareable_builtins)', ], 'node_sources': [ diff --git a/src/node_builtins.cc b/src/node_builtins.cc index bbb63df78..ae121d02e 100644 --- a/src/node_builtins.cc +++ b/src/node_builtins.cc @@ -51,6 +51,19 @@ BuiltinLoader::BuiltinLoader() AddExternalizedBuiltin("internal/deps/undici/undici", STRINGIFY(NODE_SHARED_BUILTIN_UNDICI_UNDICI_PATH)); #endif // NODE_SHARED_BUILTIN_UNDICI_UNDICI_PATH + +#ifdef NODE_SHARED_BUILTIN_ACORN_PATH + AddExternalizedBuiltin( + "internal/deps/acorn/acorn/dist/acorn", + STRINGIFY(NODE_SHARED_BUILTIN_ACORN_PATH)); +#endif // NODE_SHARED_BUILTIN_ACORN_PATH + +#ifdef NODE_SHARED_BUILTIN_ACORN_WALK_PATH + AddExternalizedBuiltin( + "internal/deps/acorn/acorn-walk/dist/walk", + STRINGIFY(NODE_SHARED_BUILTIN_ACORN_WALK_PATH)); +#endif // NODE_SHARED_BUILTIN_ACORN_WALK_PATH + } bool BuiltinLoader::Exists(const char* id) { -- 2.30.2