@node-core/utils 5.5.0 → 5.5.1

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/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/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/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.5.1",
   "description": "Utilities for Node.js core collaborators",
   "type": "module",
   "engines": {