build: add --without-amaro build flag

nodejs · nodejs-github-bot · Aug 2, 2024 · Jul 31, 2024 · Jul 31, 2024 · Jul 31, 2024
commit 92cc486d89d8c84c1341f5cb2325426cf8f2415d
diff --git a/configure.py b/configure.py
@@ -765,6 +765,12 @@
     default=None,
     help='build nghttp2 with DEBUGBUILD (default is false)')
 
+parser.add_argument('--without-amaro',
+    action='store_true',
+    dest='without_amaro',
+    default=None,
+    help='do not install the bundled Amaro (TypeScript utils)')
+
 parser.add_argument('--without-npm',
     action='store_true',
     dest='without_npm',
@@ -1378,6 +1384,7 @@ def configure_node(o):
   if options.dest_os == 'android':
     o['variables']['OS'] = 'android'
   o['variables']['node_prefix'] = options.prefix
+  o['variables']['node_install_amaro'] = b(not options.without_amaro)
   o['variables']['node_install_npm'] = b(not options.without_npm)
   o['variables']['node_install_corepack'] = b(not options.without_corepack)
   o['variables']['debug_node'] = b(options.debug_node)

diff --git a/node.gyp b/node.gyp
@@ -14,6 +14,7 @@
     'force_dynamic_crt%': 0,
     'ossfuzz' : 'false',
     'node_module_version%': '',
+    'node_install_amaro%': 'true',
     'node_shared_brotli%': 'false',
     'node_shared_zlib%': 'false',
     'node_shared_http_parser%': 'false',
@@ -56,7 +57,6 @@
       'deps/acorn/acorn/dist/acorn.js',
       'deps/acorn/acorn-walk/dist/walk.js',
       'deps/minimatch/index.js',
-      'deps/amaro/dist/index.js',
       '<@(node_builtin_shareable_builtins)',
     ],
     'node_sources': [
@@ -461,6 +461,14 @@
       }, {
         'use_openssl_def%': 0,
       }],
+      [ 'node_install_amaro=="true"', {
+          'defines': [
+            'HAVE_AMARO=1',
+          ],
+        'deps_files': [
+            'deps/amaro/dist/index.js',
+        ]
+      } ]
     ],
   },
 

diff --git a/src/node_metadata.cc b/src/node_metadata.cc
@@ -117,7 +117,10 @@ Metadata::Versions::Versions() {
   acorn = ACORN_VERSION;
   cjs_module_lexer = CJS_MODULE_LEXER_VERSION;
   uvwasi = UVWASI_VERSION_STRING;
+
+#if HAVE_AMARO
   amaro = AMARO_VERSION;
+#endif
 
 #if HAVE_OPENSSL
   openssl = GetOpenSSLVersion();

diff --git a/src/node_metadata.h b/src/node_metadata.h
@@ -27,6 +27,12 @@ namespace node {
 #define NODE_HAS_RELEASE_URLS
 #endif
 
+#ifndef HAVE_AMARO
+#define NODE_VERSIONS_KEY_AMARO(V)
+#else
+#define NODE_VERSIONS_KEY_AMARO(V) V(amaro)
+#endif
+
 #ifndef NODE_SHARED_BUILTIN_UNDICI_UNDICI_PATH
 #define NODE_VERSIONS_KEY_UNDICI(V) V(undici)
 #else
@@ -51,7 +57,7 @@ namespace node {
   V(sqlite)                                                                    \
   V(ada)                                                                       \
   V(nbytes)                                                                    \
-  V(amaro)                                                                     \
+  NODE_VERSIONS_KEY_AMARO(V)                                                   \
   NODE_VERSIONS_KEY_UNDICI(V)                                                  \
   V(cjs_module_lexer)
 

diff --git a/test/es-module/test-typescript-commonjs.mjs b/test/es-module/test-typescript-commonjs.mjs
@@ -1,8 +1,10 @@
-import { spawnPromisified } from '../common/index.mjs';
+import { skip, spawnPromisified } from '../common/index.mjs';
 import * as fixtures from '../common/fixtures.mjs';
 import { match, strictEqual } from 'node:assert';
 import { test } from 'node:test';
 
+if (!process.config.variables.node_install_amaro) skip('Requires Amaro')
+
 test('require a .ts file with explicit extension succeeds', async () => {
   const result = await spawnPromisified(process.execPath, [
     '--experimental-strip-types',

diff --git a/test/es-module/test-typescript-eval.mjs b/test/es-module/test-typescript-eval.mjs
@@ -1,7 +1,9 @@
-import { spawnPromisified } from '../common/index.mjs';
+import { skip, spawnPromisified } from '../common/index.mjs';
 import { match, strictEqual } from 'node:assert';
 import { test } from 'node:test';
 
+if (!process.config.variables.node_install_amaro) skip('Requires Amaro')
+
 test('eval TypeScript ESM syntax', async () => {
   const result = await spawnPromisified(process.execPath, [
     '--input-type=module',

diff --git a/test/es-module/test-typescript-module.mjs b/test/es-module/test-typescript-module.mjs
@@ -1,8 +1,10 @@
-import { spawnPromisified } from '../common/index.mjs';
+import { skip, spawnPromisified } from '../common/index.mjs';
 import * as fixtures from '../common/fixtures.mjs';
 import { match, strictEqual } from 'node:assert';
 import { test } from 'node:test';
 
+if (!process.config.variables.node_install_amaro) skip('Requires Amaro')
+
 test('expect failure of a .mts file with CommonJS syntax', async () => {
   const result = await spawnPromisified(process.execPath, [
     '--experimental-strip-types',

diff --git a/test/es-module/test-typescript.mjs b/test/es-module/test-typescript.mjs
@@ -1,8 +1,10 @@
-import { spawnPromisified } from '../common/index.mjs';
+import { skip, spawnPromisified } from '../common/index.mjs';
 import * as fixtures from '../common/fixtures.mjs';
 import { match, strictEqual } from 'node:assert';
 import { test } from 'node:test';
 
+if (!process.config.variables.node_install_amaro) skip('Requires Amaro')
+
 test('execute a TypeScript file', async () => {
   const result = await spawnPromisified(process.execPath, [
     '--experimental-strip-types',

diff --git a/test/parallel/test-process-versions.js b/test/parallel/test-process-versions.js
@@ -24,11 +24,13 @@ const expected_keys = [
   'ada',
   'cjs_module_lexer',
   'nbytes',
-  'amaro',
 ];
 
 const hasUndici = process.config.variables.node_builtin_shareable_builtins.includes('deps/undici/undici.js');
 
+if (process.config.variables.node_install_amaro){
+  expected_keys.push('amaro');
+}
 if (hasUndici) {
   expected_keys.push('undici');
 }