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 f189ba2bf09fc248b3c1ce3c3535b939a4160ad2..a3126e891bb5ac18579eddcd73c98367029543ec 100755 (executable)
--- 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 67909bdeb8909389c5a8277ba0cfde0e818ec9a0..76516526fc35df34d47f25db85796f67f1beef00 100644 (file)
--- 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 bbb63df7899d4b9bf80e13eee78453352dd5c75b..ae121d02edb6b10fe8e184308031e6dd058b58a8 100644 (file)
--- 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) {