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 91283ca577f580dbf1e0c4e2dbf851a9ceaa38ed..a2c62c09331891d371c7caf8bef69a1b4dcf5f57 100755 (executable)
--- a/configure.py
+++ b/configure.py
@@ -61,6 +61,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',
+                     'acorn': 'deps/acorn/acorn/dist/acorn.js',
+                     'acorn_walk': 'deps/acorn/acorn-walk/dist/walk.js',
+                     'minimatch': 'deps/minimatch/index.js',
                      'amaro/dist/index': 'deps/amaro/dist/index.js'
 }
 

diff --git a/node.gyp b/node.gyp
index 0e0071b508f605bb9b7722f8304814dc176d907e..7af6604b0157468777cc038216edacb2cf9296db 100644 (file)
--- a/node.gyp
+++ b/node.gyp
@@ -56,9 +56,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 b83aa87c969fb4e71cb202816713af869bb76283..7c6b7463ddaaff275a6ced385405325b9e02c0fd 100644 (file)
--- a/src/node_builtins.cc
+++ b/src/node_builtins.cc
@@ -52,6 +52,24 @@ BuiltinLoader::BuiltinLoader()
                          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
+
 #if HAVE_AMARO
 #ifdef NODE_SHARED_BUILTIN_AMARO_DIST_INDEX_PATH
   AddExternalizedBuiltin("internal/deps/amaro/dist/index",