Merge branch 'main' into yargs-18

Author: aduh95

eslint.config.js

@@ -18,11 +18,12 @@ export default [
       'coverage/',
       'node_modules/',
       'lib/wpt/templates/',
+      'test/fixtures/release/*.js', // Copied from the nodejs/node repo
     ],
   },
   {
     languageOptions: {
-      globals: globals.node,
+      globals: globals.nodeBuiltin,
       sourceType: 'module',
       ecmaVersion: 'latest',
     },
@@ -42,5 +43,22 @@ export default [
       'n/no-process-exit': 'off',
       'n/no-unsupported-features/node-builtins': 'off',
     },
+    settings: {
+      'import/resolver': {
+        node: {
+          pathFilter(pkg, path, relativePath) {
+            const pkgExport = relativePath
+              ? pkg.exports?.[`./${relativePath}`]
+              : pkg.exports?.['.'];
+            return pkgExport?.import?.default ??
+                   pkgExport?.import ??
+                   pkgExport?.[0]?.import ??
+                   pkgExport?.default ??
+                   pkgExport ??
+                   (relativePath || pkg.main);
+          },
+        },
+      },
+    },
   },
 ];

lib/promote_release.js

@@ -1,5 +1,7 @@
 import path from 'node:path';
 import fs from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { pipeline } from 'node:stream/promises';
 import semver from 'semver';
 import * as gst from 'git-secure-tag';
 
@@ -196,31 +198,44 @@ export default class ReleasePromotion extends Session {
 
   async verifyTagSignature(version) {
     const { cli } = this;
-    const verifyTagPattern = /gpg:[^\n]+\ngpg:\s+using \w+ key ([^\n]+)\ngpg:\s+issuer "([^"]+)"\ngpg:\s+Good signature from (?:"[^"]+"(?: \[ultimate\])?\ngpg:\s+aka )*"([^<]+) <\2>"/;
-    const [verifyTagOutput, haystack] = await Promise.all([forceRunAsync(
-      'git', ['--no-pager',
-        'verify-tag',
-        `v${version}`
-      ], { ignoreFailure: false, captureStderr: true }), fs.readFile('README.md')]);
-    const match = verifyTagPattern.exec(verifyTagOutput);
-    if (match == null) {
-      cli.warn('git was not able to verify the tag:');
-      cli.info(verifyTagOutput);
-    } else {
-      const [, keyID, email, name] = match;
-      const needle = `* **${name}** <<${email}>>\n  ${'`'}${keyID}${'`'}`;
-      if (haystack.includes(needle)) {
-        return;
+
+    cli.startSpinner('Downloading active releasers keyring from nodejs/release-keys...');
+    const [keyRingStream, [GNUPGHOME, keyRingFd]] = await Promise.all([
+      fetch('https://github.com/nodejs/release-keys/raw/HEAD/gpg-only-active-keys/pubring.kbx'),
+      fs.mkdtemp(path.join(tmpdir(), 'ncu-'))
+        .then(async d => [d, await fs.open(path.join(d, 'pubring.kbx'), 'w')]),
+    ]);
+    if (!keyRingStream.ok) throw new Error('Failed to download keyring', { cause: keyRingStream });
+    await pipeline(keyRingStream.body, keyRingFd.createWriteStream());
+    cli.stopSpinner('Active releasers keyring stored in temp directory');
+
+    try {
+      await forceRunAsync(
+        'git', ['--no-pager',
+          'verify-tag',
+          `v${version}`
+        ], {
+          ignoreFailure: false,
+          spawnArgs: { env: { ...process.env, GNUPGHOME } },
+        });
+      cli.ok('git tag signature verified');
+    } catch (cause) {
+      cli.error('git was not able to verify the tag');
+      cli.warn('This means that either the tag was signed with the wrong key,');
+      cli.warn('or that nodejs/release-keys contains outdated information.');
+      cli.warn('The release should not proceed.');
+      if (!await cli.prompt('Do you want to proceed anyway?', { defaultAnswer: false })) {
+        if (await cli.prompt('Do you want to delete the local tag?')) {
+          await forceRunAsync('git', ['tag', '-d', `v${version}`]);
+        } else {
+          cli.info(`Run 'git tag -d v${version}' to remove the local tag.`);
+        }
+        throw new Error('Aborted', { cause });
       }
-      cli.warn('Tag was signed with an undocumented identity/key pair!');
-      cli.info('Expected to find the following entry in the README:');
-      cli.info(needle);
-      cli.info('If you are using a subkey, it might be OK.');
-    }
-    cli.info(`If that doesn't sound right, consider removing the tag (git tag -d v${version
-             }), check your local config, and start the process over.`);
-    if (!await cli.prompt('Do you want to proceed anyway?', { defaultAnswer: false })) {
-      throw new Error('Aborted');
+    } finally {
+      cli.startSpinner('Cleaning up temp files');
+      await fs.rm(GNUPGHOME, { force: true, recursive: true });
+      cli.stopSpinner('Temp files removed');
     }
   }
 

lib/verbosity.js

@@ -18,6 +18,9 @@ export function setVerbosityFromEnv() {
   if (Object.keys(VERBOSITY).includes(env)) {
     verbosity = VERBOSITY[env];
   }
+  if (!isDebugVerbosity()) {
+    Error.stackTraceLimit = 0;
+  }
 };
 
 export function debuglog(...args) {

lib/voting_session.js

@@ -10,7 +10,6 @@ import {
   getEditor, isGhAvailable
 } from './utils.js';
 
-// eslint-disable-next-line import/no-unresolved
 import voteUsingGit from '@node-core/caritat/voteUsingGit';
 import * as yaml from 'js-yaml';
 

test/fixtures/release/expected-test-process-release.js

@@ -1,6 +1,5 @@
 'use strict';
 
-// eslint-disable-next-line n/no-missing-require
 require('../common');
 
 const assert = require('assert');

test/fixtures/release/original-test-process-release.js

@@ -1,6 +1,5 @@
 'use strict';
 
-// eslint-disable-next-line n/no-missing-require
 require('../common');
 
 const assert = require('assert');

test/unit/ci_start.test.js

@@ -1,8 +1,7 @@
-/* eslint-disable import/no-named-as-default-member */
 import { describe, it, before, afterEach } from 'node:test';
 import assert from 'assert';
 
-import sinon from 'sinon';
+import * as sinon from 'sinon';
 import { FormData } from 'undici';
 
 import {

test/unit/pr_checker.test.js

@@ -1,8 +1,7 @@
-/* eslint-disable import/no-named-as-default-member */
 import { describe, it, before, after, afterEach } from 'node:test';
 import assert from 'node:assert';
 
-import sinon from 'sinon';
+import * as sinon from 'sinon';
 
 import PRData from '../../lib/pr_data.js';
 import PRChecker from '../../lib/pr_checker.js';

test/unit/pr_data.test.js

@@ -1,8 +1,7 @@
-/* eslint-disable import/no-named-as-default-member */
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
 
-import sinon from 'sinon';
+import * as sinon from 'sinon';
 
 import PRData from '../../lib/pr_data.js';
 

test/unit/team_info.test.js

@@ -1,8 +1,7 @@
-/* eslint-disable import/no-named-as-default-member */
 import { describe, it, before, after } from 'node:test';
 import assert from 'node:assert';
 
-import sinon from 'sinon';
+import * as sinon from 'sinon';
 
 import TestCLI from '../fixtures/test_cli.js';
 import TeamInfo from '../../lib/team_info.js';