@node-core/utils 5.5.0 → 5.6.0

package/bin/ncu-ci.js

@@ -77,12 +77,13 @@ const args = yargs(hideBin(process.argv))
         })
         .option('stats', {
           default: false,
+          type: 'boolean',
           describe: 'Aggregate the results'
         })
         .option('cache', {
           default: false,
-          describe: 'Cache the responses from Jenkins in .ncu/cache/ under' +
-                    ' the node-core-utils installation directory'
+          type: 'boolean',
+          describe: 'Cache the responses from Jenkins in $tmpdir/ncu/cache for testing'
         })
         .option('limit', {
           default: 99,
@@ -199,13 +200,14 @@ const args = yargs(hideBin(process.argv))
     builder: (yargs) => {
       yargs
         .option('stats', {
+          type: 'boolean',
           default: false,
           describe: 'Aggregate the results'
         })
         .option('cache', {
+          type: 'boolean',
           default: false,
-          describe: 'Cache the responses from Jenkins in .ncu/cache/ under' +
-                    ' the node-core-utils installation directory'
+          describe: 'Cache the responses from Jenkins in $tmpdir/ncu/cache for testing'
         })
         .option('limit', {
           default: 15,

package/components/git/release.js

@@ -17,6 +17,10 @@ const releaseOptions = {
     describe: 'Promote new release of Node.js',
     type: 'boolean'
   },
+  releaseDate: {
+    describe: 'Default relase date when --prepare is used. It must be YYYY-MM-DD',
+    type: 'string'
+  },
   security: {
     describe: 'Demarcate the new security release as a security release',
     type: 'boolean'
@@ -32,6 +36,11 @@ const releaseOptions = {
   startLTS: {
     describe: 'Mark the release as the transition from Current to LTS',
     type: 'boolean'
+  },
+  yes: {
+    type: 'boolean',
+    default: false,
+    describe: 'Skip all prompts and run non-interactively'
   }
 };
 
@@ -66,6 +75,10 @@ function release(state, argv) {
   const cli = new CLI(logStream);
   const dir = process.cwd();
 
+  if (argv.yes) {
+    cli.setAssumeYes();
+  }
+
   return runPromise(main(state, argv, cli, dir)).catch((err) => {
     if (cli.spinner.enabled) {
       cli.spinner.fail();

package/components/git/v8.js

@@ -22,6 +22,7 @@ export function builder(yargs) {
           default: 'lkgr'
         });
         yargs.option('version-bump', {
+          type: 'boolean',
           describe: 'Bump the NODE_MODULE_VERSION constant',
           default: true
         });
@@ -39,10 +40,12 @@ export function builder(yargs) {
       builder: (yargs) => {
         yargs
           .option('bump', {
+            type: 'boolean',
             describe: 'Bump V8 embedder version number or patch version',
             default: true
           })
           .option('squash', {
+            type: 'boolean',
             describe:
                 'If multiple commits are backported, squash them into one',
             default: false
@@ -62,8 +65,8 @@ export function builder(yargs) {
       describe: 'Directory of an existing V8 clone'
     })
     .option('verbose', {
+      type: 'boolean',
       describe: 'Enable verbose output',
-      boolean: true,
       default: false
     });
 }

package/lib/cache.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
+import os from 'node:os';
 
 import { writeJson, readJson, writeFile, readFile } from './file.js';
 
@@ -8,17 +8,15 @@ function isAsync(fn) {
   return fn[Symbol.toStringTag] === 'AsyncFunction';
 }
 
-const parentDir = fileURLToPath(new URL('..', import.meta.url));
-
 export default class Cache {
   constructor(dir) {
-    this.dir = dir || this.computeCacheDir(parentDir);
+    this.dir = dir || this.computeCacheDir(os.tmpdir());
     this.originals = {};
     this.disabled = true;
   }
 
   computeCacheDir(base) {
-    return path.join(base, '.ncu', 'cache');
+    return path.join(base, 'ncu', 'cache');
   }
 
   disable() {

package/lib/cli.js

@@ -1,6 +1,6 @@
 import ora from 'ora';
 import chalk from 'chalk';
-import inquirer from 'inquirer';
+import * as inquirer from '@inquirer/prompts';
 
 import { warning, error, info, success } from './figures.js';
 
@@ -81,12 +81,10 @@ export default class CLI {
       return defaultAnswer;
     }
 
-    const { answer } = await inquirer.prompt([{
-      type: questionType,
-      name: 'answer',
+    const answer = await inquirer[questionType]({
       message: question,
       default: defaultAnswer
-    }]);
+    });
 
     if (isSpinning) {
       this.spinner.start(spinningMessage);

package/lib/github/tree.js

@@ -35,7 +35,16 @@ export default class GitHubTree {
       branch,
       path
     });
-    return data.repository.ref.target.history.nodes[0].oid;
+
+    const targetHistoryNodes = data.repository.ref.target.history.nodes;
+    if (!targetHistoryNodes.length) {
+      this.cli.stopSpinner(
+        `Cannot find commit for "${path}". Please check the path name.`,
+        this.cli.SPINNER_STATUS.FAILED
+      );
+      throw new Error(`Cannot find commit for "${path}"`);
+    }
+    return targetHistoryNodes[0].oid;
   }
 
   /**

package/lib/pr_checker.js

@@ -29,7 +29,6 @@ const GITHUB_SUCCESS_CONCLUSIONS = ['SUCCESS', 'NEUTRAL', 'SKIPPED'];
 const FAST_TRACK_RE = /^Fast-track has been requested by @(.+?)\. Please 👍 to approve\.$/;
 const FAST_TRACK_MIN_APPROVALS = 2;
 const GIT_CONFIG_GUIDE_URL = 'https://github.com/nodejs/node/blob/99b1ada/doc/guides/contributing/pull-requests.md#step-1-fork';
-const IGNORED_CHECK_SLUGS = ['dependabot', 'codecov'];
 
 // eslint-disable-next-line no-extend-native
 Array.prototype.findLastIndex ??= function findLastIndex(fn) {
@@ -374,9 +373,10 @@ export default class PRChecker {
 
     // GitHub new Check API
     for (const { status, conclusion, app } of checkSuites.nodes) {
-      if (app && IGNORED_CHECK_SLUGS.includes(app.slug)) {
-        // Ignore Dependabot and Codecov check suites.
-        // They are expected to show up sometimes and never complete.
+      if (app.slug !== 'github-actions') {
+        // Ignore all non-github check suites, such as Dependabot and Codecov.
+        // They are expected to show up on PRs whose head branch is not on a
+        // fork and never complete.
         continue;
       }
 

package/lib/prepare_release.js

@@ -25,6 +25,7 @@ export default class ReleasePreparation extends Session {
     this.isLTS = false;
     this.isLTSTransition = argv.startLTS;
     this.runBranchDiff = !argv.skipBranchDiff;
+    this.defaultReleaseDate = argv.releaseDate ?? new Date().toISOString().slice(0, 10);
     this.ltsCodename = '';
     this.date = '';
     this.filterLabels = argv.filterLabel && argv.filterLabel.split(',');
@@ -241,9 +242,8 @@ export default class ReleasePreparation extends Session {
     cli.stopSpinner('Updated REPLACEME items in docs');
 
     // Fetch date to use in release commit & changelogs.
-    const todayDate = new Date().toISOString().split('T')[0];
     this.date = await cli.prompt('Enter release date in YYYY-MM-DD format:',
-      { questionType: 'input', defaultAnswer: todayDate });
+      { questionType: 'input', defaultAnswer: this.defaultReleaseDate });
 
     cli.startSpinner('Updating CHANGELOG.md');
     await this.updateMainChangelog();
@@ -253,9 +253,6 @@ export default class ReleasePreparation extends Session {
     await this.updateMajorChangelog();
     cli.stopSpinner(`Updated CHANGELOG_V${versionComponents.major}.md`);
 
-    await cli.prompt('Finished editing the changelogs?',
-      { defaultAnswer: false });
-
     // Create release commit.
     const shouldCreateReleaseCommit = await cli.prompt(
       'Create release commit?');
@@ -272,9 +269,7 @@ export default class ReleasePreparation extends Session {
       cli.warn(`Please manually edit commit ${lastCommitSha} by running ` +
       '`git commit --amend` before proceeding.');
 
-      await cli.prompt(
-        'Finished editing the release commit?',
-        { defaultAnswer: false });
+      await cli.prompt('Finished editing the release commit?');
     }
 
     cli.separator();
@@ -625,8 +620,7 @@ export default class ReleasePreparation extends Session {
     ]);
 
     cli.log(`${messageTitle}\n\n${messageBody.join('')}`);
-    const useMessage = await cli.prompt(
-      'Continue with this commit message?', { defaultAnswer: false });
+    const useMessage = await cli.prompt('Continue with this commit message?');
     return useMessage;
   }
 

package/lib/request.js

@@ -158,7 +158,13 @@ export default class Request {
         Accept: 'application/json'
       }
     };
-    return this.json(url, options);
+    const data = await this.json(url, options);
+    if (data?.errors) {
+      throw new Error(
+        `Request to fetch triaged reports failed with: ${JSON.stringify(data.errors)}`
+      );
+    }
+    return data;
   }
 
   async getPrograms() {

package/lib/update-v8/backport.js

@@ -3,7 +3,7 @@ import {
   promises as fs
 } from 'node:fs';
 
-import inquirer from 'inquirer';
+import { confirm } from '@inquirer/prompts';
 import { ListrEnquirerPromptAdapter } from '@listr2/prompt-adapter-enquirer';
 
 import { shortSha } from '../utils.js';
@@ -12,14 +12,12 @@ import { getCurrentV8Version } from './common.js';
 
 export async function checkOptions(options) {
   if (options.sha.length > 1 && options.squash) {
-    const { wantSquash } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'wantSquash',
+    const wantSquash = await confirm({
       message: 'Squashing commits should be avoided if possible, because it ' +
         'can make git bisection difficult. Only squash commits if they would ' +
         'break the build when applied individually. Are you sure?',
       default: false
-    }]);
+    });
 
     if (!wantSquash) {
       return true;

package/lib/update-v8/minorUpdate.js

@@ -1,4 +1,3 @@
-import { spawn } from 'node:child_process';
 import path from 'node:path';
 import { promises as fs } from 'node:fs';
 
@@ -61,30 +60,22 @@ function doMinorUpdate() {
 }
 
 async function applyPatch(ctx, latestStr) {
-  const diff = spawn(
+  const diff = await forceRunAsync(
     'git',
     ['format-patch', '--stdout', `${ctx.currentVersion}...${latestStr}`],
-    { cwd: ctx.v8Dir, stdio: ['ignore', 'pipe', 'ignore'] }
+    { captureStdout: true, ignoreFailure: false, spawnArgs: { cwd: ctx.v8Dir } }
   );
   try {
     await forceRunAsync('git', ['apply', '--directory', 'deps/v8'], {
+      input: diff,
       ignoreFailure: false,
-      spawnArgs: {
-        cwd: ctx.nodeDir,
-        stdio: [diff.stdout, 'ignore', 'ignore']
-      }
+      spawnArgs: { cwd: ctx.nodeDir }
     });
   } catch (e) {
     const file = path.join(ctx.nodeDir, `${latestStr}.diff`);
     await fs.writeFile(file, diff);
     throw new Error(`Could not apply patch.\n${e}\nDiff was stored in ${file}`);
   }
-  if (diff.exitCode !== 0) {
-    const err = new Error(`git format-patch failed: ${diff.exitCode}`);
-    err.code = diff.exitCode;
-    err.messageOnly = true;
-    throw err;
-  }
 }
 
 function filterAndSortTags(tags) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@node-core/utils",
-  "version": "5.5.0",
+  "version": "5.6.0",
   "description": "Utilities for Node.js core collaborators",
   "type": "module",
   "engines": {
@@ -34,36 +34,36 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@listr2/prompt-adapter-enquirer": "^2.0.10",
+    "@inquirer/prompts": "^6.0.1",
+    "@listr2/prompt-adapter-enquirer": "^2.0.11",
     "@node-core/caritat": "^1.6.0",
     "@pkgjs/nv": "^0.2.2",
-    "branch-diff": "^3.0.4",
+    "branch-diff": "^3.1.1",
     "chalk": "^5.3.0",
     "changelog-maker": "^4.1.1",
-    "cheerio": "^1.0.0-rc.12",
+    "cheerio": "^1.0.0",
     "clipboardy": "^4.0.0",
-    "core-validate-commit": "^4.0.0",
+    "core-validate-commit": "^4.1.0",
     "figures": "^6.1.0",
-    "ghauth": "^6.0.5",
-    "inquirer": "^9.3.2",
+    "ghauth": "^6.0.7",
     "js-yaml": "^4.1.0",
-    "listr2": "^8.2.3",
+    "listr2": "^8.2.4",
     "lodash": "^4.17.21",
-    "log-symbols": "^6.0.0",
-    "ora": "^8.0.1",
-    "replace-in-file": "^8.0.2",
-    "undici": "^6.19.2",
+    "log-symbols": "^7.0.0",
+    "ora": "^8.1.0",
+    "replace-in-file": "^8.2.0",
+    "undici": "^6.19.8",
     "which": "^4.0.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@reporters/github": "^1.7.0",
+    "@reporters/github": "^1.7.1",
     "c8": "^10.1.2",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.4.0",
-    "sinon": "^18.0.0"
+    "eslint-plugin-promise": "^6.6.0",
+    "sinon": "^19.0.2"
   }
 }