@vercel/build-utils 4.2.0 → 4.2.1

package/dist/fs/run-user-scripts.d.ts

@@ -44,6 +44,12 @@ export interface SpawnOptionsExtended extends SpawnOptions {
      * Pretty formatted command that is being spawned for logging purposes.
      */
     prettyCommand?: string;
+    /**
+     * Returns instead of throwing an error when the process exits with a
+     * non-0 exit code. When relevant, the returned object will include
+     * the error code, stdout and stderr.
+     */
+    ignoreNon0Exit?: boolean;
 }
 export declare function spawnAsync(command: string, args: string[], opts?: SpawnOptionsExtended): Promise<void>;
 export declare function execAsync(command: string, args: string[], opts?: SpawnOptionsExtended): Promise<{
@@ -53,9 +59,9 @@ export declare function execAsync(command: string, args: string[], opts?: SpawnO
 }>;
 export declare function spawnCommand(command: string, options?: SpawnOptions): import("child_process").ChildProcess;
 export declare function execCommand(command: string, options?: SpawnOptions): Promise<boolean>;
-export declare function getNodeBinPath({ cwd }: {
+export declare function getNodeBinPath({ cwd, }: {
     cwd: string;
-}): Promise<string>;
+}): Promise<string | undefined>;
 export declare function runShellScript(fsPath: string, args?: string[], spawnOpts?: SpawnOptions): Promise<boolean>;
 export declare function getSpawnOptions(meta: Meta, nodeVersion: NodeVersion): SpawnOptions;
 export declare function getNodeVersion(destPath: string, _nodeVersion?: string, config?: Config, meta?: Meta): Promise<NodeVersion>;

package/dist/fs/run-user-scripts.js

@@ -27,7 +27,7 @@ function spawnAsync(command, args, opts = {}) {
         }
         child.on('error', reject);
         child.on('close', (code, signal) => {
-            if (code === 0) {
+            if (code === 0 || opts.ignoreNon0Exit) {
                 return resolve();
             }
             const cmd = opts.prettyCommand
@@ -57,20 +57,20 @@ function execAsync(command, args, opts = {}) {
         });
         child.on('error', reject);
         child.on('close', (code, signal) => {
-            if (code !== 0) {
-                const cmd = opts.prettyCommand
-                    ? `Command "${opts.prettyCommand}"`
-                    : 'Command';
-                return reject(new errors_1.NowBuildError({
-                    code: `BUILD_UTILS_EXEC_${code || signal}`,
-                    message: `${cmd} exited with ${code || signal}`,
-                }));
+            if (code === 0 || opts.ignoreNon0Exit) {
+                return resolve({
+                    code,
+                    stdout: Buffer.concat(stdoutList).toString(),
+                    stderr: Buffer.concat(stderrList).toString(),
+                });
             }
-            return resolve({
-                code,
-                stdout: Buffer.concat(stdoutList).toString(),
-                stderr: Buffer.concat(stderrList).toString(),
-            });
+            const cmd = opts.prettyCommand
+                ? `Command "${opts.prettyCommand}"`
+                : 'Command';
+            return reject(new errors_1.NowBuildError({
+                code: `BUILD_UTILS_EXEC_${code || signal}`,
+                message: `${cmd} exited with ${code || signal}`,
+            }));
         });
     });
 }
@@ -94,9 +94,22 @@ async function execCommand(command, options = {}) {
     return true;
 }
 exports.execCommand = execCommand;
-async function getNodeBinPath({ cwd }) {
-    const { stdout } = await execAsync('npm', ['bin'], { cwd });
-    return stdout.trim();
+async function getNodeBinPath({ cwd, }) {
+    const { code, stdout, stderr } = await execAsync('npm', ['bin'], {
+        cwd,
+        prettyCommand: 'npm bin',
+        // in some rare cases, we saw `npm bin` exit with a non-0 code, but still
+        // output the right bin path, so we ignore the exit code
+        ignoreNon0Exit: true,
+    });
+    const nodeBinPath = stdout.trim();
+    if (path_1.default.isAbsolute(nodeBinPath)) {
+        return nodeBinPath;
+    }
+    throw new errors_1.NowBuildError({
+        code: `BUILD_UTILS_GET_NODE_BIN_PATH`,
+        message: `Running \`npm bin\` failed to return a valid bin path (code=${code}, stdout=${stdout}, stderr=${stderr})`,
+    });
 }
 exports.getNodeBinPath = getNodeBinPath;
 async function chmodPlusX(fsPath) {

package/dist/index.js

@@ -35855,7 +35855,7 @@ function spawnAsync(command, args, opts = {}) {
         }
         child.on('error', reject);
         child.on('close', (code, signal) => {
-            if (code === 0) {
+            if (code === 0 || opts.ignoreNon0Exit) {
                 return resolve();
             }
             const cmd = opts.prettyCommand
@@ -35885,20 +35885,20 @@ function execAsync(command, args, opts = {}) {
         });
         child.on('error', reject);
         child.on('close', (code, signal) => {
-            if (code !== 0) {
-                const cmd = opts.prettyCommand
-                    ? `Command "${opts.prettyCommand}"`
-                    : 'Command';
-                return reject(new errors_1.NowBuildError({
-                    code: `BUILD_UTILS_EXEC_${code || signal}`,
-                    message: `${cmd} exited with ${code || signal}`,
-                }));
+            if (code === 0 || opts.ignoreNon0Exit) {
+                return resolve({
+                    code,
+                    stdout: Buffer.concat(stdoutList).toString(),
+                    stderr: Buffer.concat(stderrList).toString(),
+                });
             }
-            return resolve({
-                code,
-                stdout: Buffer.concat(stdoutList).toString(),
-                stderr: Buffer.concat(stderrList).toString(),
-            });
+            const cmd = opts.prettyCommand
+                ? `Command "${opts.prettyCommand}"`
+                : 'Command';
+            return reject(new errors_1.NowBuildError({
+                code: `BUILD_UTILS_EXEC_${code || signal}`,
+                message: `${cmd} exited with ${code || signal}`,
+            }));
         });
     });
 }
@@ -35922,9 +35922,22 @@ async function execCommand(command, options = {}) {
     return true;
 }
 exports.execCommand = execCommand;
-async function getNodeBinPath({ cwd }) {
-    const { stdout } = await execAsync('npm', ['bin'], { cwd });
-    return stdout.trim();
+async function getNodeBinPath({ cwd, }) {
+    const { code, stdout, stderr } = await execAsync('npm', ['bin'], {
+        cwd,
+        prettyCommand: 'npm bin',
+        // in some rare cases, we saw `npm bin` exit with a non-0 code, but still
+        // output the right bin path, so we ignore the exit code
+        ignoreNon0Exit: true,
+    });
+    const nodeBinPath = stdout.trim();
+    if (path_1.default.isAbsolute(nodeBinPath)) {
+        return nodeBinPath;
+    }
+    throw new errors_1.NowBuildError({
+        code: `BUILD_UTILS_GET_NODE_BIN_PATH`,
+        message: `Running \`npm bin\` failed to return a valid bin path (code=${code}, stdout=${stdout}, stderr=${stderr})`,
+    });
 }
 exports.getNodeBinPath = getNodeBinPath;
 async function chmodPlusX(fsPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -50,5 +50,5 @@
     "typescript": "4.3.4",
     "yazl": "2.5.1"
   },
-  "gitHead": "eed39913e1394477b224c38efe29429b17eeada6"
+  "gitHead": "547e88228e180e883e5f07ab815a16960767bbf5"
 }