Merge pull request #1027 from nodejs/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

README.md

@@ -410,6 +410,8 @@ For information about the governance of the Node.js project, see
   **Filip Skokan** <<[email protected]>> (he/him)
 * [pimterry](https://github.com/pimterry) -
   **Tim Perry** <<[email protected]>> (he/him)
+* [pmarchini](https://github.com/pmarchini)
+  **Pietro Marchini** <<[email protected]>> (he/him)
 * [Qard](https://github.com/Qard) -
   **Stephen Belanger** <<[email protected]>> (he/him)
 * [RafaelGSS](https://github.com/RafaelGSS) -

benchmark/esm/detect-esm-syntax.js

@@ -4,34 +4,33 @@
 // We use the TypeScript fixture because it's a very large CommonJS file with no ESM syntax: the worst case.
 const common = require('../common.js');
 const tmpdir = require('../../test/common/tmpdir.js');
-const fixtures = require('../../test/common/fixtures.js');
-const scriptPath = fixtures.path('snapshot', 'typescript.js');
 const fs = require('node:fs');
 
 const bench = common.createBenchmark(main, {
-  type: ['with-module-syntax-detection', 'without-module-syntax-detection'],
+  type: ['with-package-json', 'without-package-json'],
   n: [1e4],
-}, {
-  flags: ['--experimental-detect-module'],
 });
 
-const benchmarkDirectory = tmpdir.fileURL('benchmark-detect-esm-syntax');
-const ambiguousURL = new URL('./typescript.js', benchmarkDirectory);
-const explicitURL = new URL('./typescript.cjs', benchmarkDirectory);
-
 async function main({ n, type }) {
   tmpdir.refresh();
+  fs.mkdirSync(tmpdir.resolve('bench'));
 
-  fs.mkdirSync(benchmarkDirectory, { recursive: true });
-  fs.cpSync(scriptPath, ambiguousURL);
-  fs.cpSync(scriptPath, explicitURL);
-
-  bench.start();
-
+  let loader = '';
+  const modules = [];
   for (let i = 0; i < n; i++) {
-    const url = type === 'with-module-syntax-detection' ? ambiguousURL : explicitURL;
-    await import(url);
+    const url = tmpdir.fileURL('bench', `mod${i}.js`);
+    fs.writeFileSync(url, `const foo${i} = ${i};\nexport { foo${i} };\n`);
+    loader += `import { foo${i} } from './mod${i}.js';\n`;
+    modules.push(url);
   }
+  const loaderURL = tmpdir.fileURL('bench', 'load.js');
+  fs.writeFileSync(loaderURL, loader);
 
+  if (type === 'with-package-json') {
+    fs.writeFileSync(tmpdir.resolve('bench', 'package.json'), '{ "type": "module" }');
+  }
+
+  bench.start();
+  await import(loaderURL);
   bench.end(n);
 }

doc/abi_version_registry.json

@@ -1,5 +1,6 @@
 {
   "NODE_MODULE_VERSION": [
+    { "modules": 132,"runtime": "electron", "variant": "electron",             "versions": "34" },
     { "modules": 131,"runtime": "node",     "variant": "v8_12.9",              "versions": "23.0.0-pre" },
     { "modules": 130,"runtime": "electron", "variant": "electron",             "versions": "33" },
     { "modules": 129,"runtime": "node",     "variant": "v8_12.8",              "versions": "23.0.0-pre" },