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

diff --git a/configure.py b/configure.py
index 4638f04b6ae622f8d11804087eee32c601210ff6..823a2363d0384af8e82b202e846590f4e7f817a6 100755 (executable)
--- a/configure.py
+++ b/configure.py
@@ -60,7 +60,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 08cb3f38e8f8360e85c41476128d91818a1f035f..ea98652cdcb303603ac70f7a2ab297b414ca1440 100644 (file)
--- a/node.gyp
+++ b/node.gyp
@@ -52,9 +52,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_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',

diff --git a/src/node_builtins.cc b/src/node_builtins.cc
index 30b08ece2a75f0f28031ad2df7ef9153165d884b..d3ad5be86af42631be8a8fad924d4d4250d14392 100644 (file)
--- a/src/node_builtins.cc
+++ b/src/node_builtins.cc
@@ -52,6 +52,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) {