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 0df90b176e9b5403efdb1393c0f2f37bb53dc6b2..2494bc8e5bc70be1dff0b1a3a46f67be261be869 100755 (executable)
--- a/configure.py
+++ b/configure.py
@@ -59,7 +59,10 @@ 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',
+                     'minimatch': 'deps/minimatch/index.js'
 }
 
 # create option groups

diff --git a/node.gyp b/node.gyp
index e88c7ded109ca4c5d9ab3a01738c19cafbf69b3b..d62f52091576c7e3a93ce3283054a7a49ab2218d 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_sources': [

diff --git a/src/node_builtins.cc b/src/node_builtins.cc
index 706ea4f5cb90525c8ea56f794320a733c45a193f..05573896a29032fbc87170948fd7eaffd64b898e 100644 (file)
--- a/src/node_builtins.cc
+++ b/src/node_builtins.cc
@@ -51,6 +51,25 @@ 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
+
+#ifdef NODE_SHARED_BUILTIN_MINIMATCH_PATH
+  AddExternalizedBuiltin(
+    "internal/deps/minimatch/index",
+    STRINGIFY(NODE_SHARED_BUILTIN_MINIMATCH_PATH));
+#endif  // NODE_SHARED_BUILTIN_MINIMATCH_PATH
+
 }
 
 bool BuiltinLoader::Exists(const char* id) {