@vercel/build-utils 5.4.0 → 5.4.1

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

@@ -8,8 +8,7 @@ export interface ScanParentDirsResult {
      */
     cliType: CliType;
     /**
-     * The file path of found `package.json` file, or `undefined` if none was
-     * found.
+     * The file path of found `package.json` file, or `undefined` if not found.
      */
     packageJsonPath?: string;
     /**
@@ -18,8 +17,13 @@ export interface ScanParentDirsResult {
      */
     packageJson?: PackageJson;
     /**
-     * The `lockfileVersion` number from the `package-lock.json` file,
-     * when present.
+     * The file path of the lockfile (`yarn.lock`, `package-lock.json`, or `pnpm-lock.yaml`)
+     * or `undefined` if not found.
+     */
+    lockfilePath?: string;
+    /**
+     * The `lockfileVersion` number from lockfile (`package-lock.json` or `pnpm-lock.yaml`),
+     * or `undefined` if not found.
      */
     lockfileVersion?: number;
 }

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

@@ -95,21 +95,9 @@ async function execCommand(command, options = {}) {
 }
 exports.execCommand = execCommand;
 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})`,
-    });
+    const { lockfilePath } = await scanParentDirs(cwd);
+    const dir = path_1.default.dirname(lockfilePath || cwd);
+    return path_1.default.join(dir, 'node_modules', '.bin');
 }
 exports.getNodeBinPath = getNodeBinPath;
 async function chmodPlusX(fsPath) {
@@ -202,6 +190,7 @@ async function scanParentDirs(destPath, readPackageJson = false) {
         start: destPath,
         filenames: ['yarn.lock', 'package-lock.json', 'pnpm-lock.yaml'],
     });
+    let lockfilePath;
     let lockfileVersion;
     let cliType = 'yarn';
     const [hasYarnLock, packageLockJson, pnpmLockYaml] = await Promise.all([
@@ -216,18 +205,26 @@ async function scanParentDirs(destPath, readPackageJson = false) {
     // Priority order is Yarn > pnpm > npm
     if (hasYarnLock) {
         cliType = 'yarn';
+        lockfilePath = yarnLockPath;
     }
     else if (pnpmLockYaml) {
         cliType = 'pnpm';
-        // just ensure that it is read as a number and not a string
+        lockfilePath = pnpmLockPath;
         lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
     }
     else if (packageLockJson) {
         cliType = 'npm';
+        lockfilePath = npmLockPath;
         lockfileVersion = packageLockJson.lockfileVersion;
     }
     const packageJsonPath = pkgJsonPath || undefined;
-    return { cliType, packageJson, lockfileVersion, packageJsonPath };
+    return {
+        cliType,
+        packageJson,
+        lockfilePath,
+        lockfileVersion,
+        packageJsonPath,
+    };
 }
 exports.scanParentDirs = scanParentDirs;
 async function walkParentDirs({ base, start, filename, }) {

package/dist/index.js

@@ -30927,21 +30927,9 @@ async function execCommand(command, options = {}) {
 }
 exports.execCommand = execCommand;
 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})`,
-    });
+    const { lockfilePath } = await scanParentDirs(cwd);
+    const dir = path_1.default.dirname(lockfilePath || cwd);
+    return path_1.default.join(dir, 'node_modules', '.bin');
 }
 exports.getNodeBinPath = getNodeBinPath;
 async function chmodPlusX(fsPath) {
@@ -31034,6 +31022,7 @@ async function scanParentDirs(destPath, readPackageJson = false) {
         start: destPath,
         filenames: ['yarn.lock', 'package-lock.json', 'pnpm-lock.yaml'],
     });
+    let lockfilePath;
     let lockfileVersion;
     let cliType = 'yarn';
     const [hasYarnLock, packageLockJson, pnpmLockYaml] = await Promise.all([
@@ -31048,18 +31037,26 @@ async function scanParentDirs(destPath, readPackageJson = false) {
     // Priority order is Yarn > pnpm > npm
     if (hasYarnLock) {
         cliType = 'yarn';
+        lockfilePath = yarnLockPath;
     }
     else if (pnpmLockYaml) {
         cliType = 'pnpm';
-        // just ensure that it is read as a number and not a string
+        lockfilePath = pnpmLockPath;
         lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
     }
     else if (packageLockJson) {
         cliType = 'npm';
+        lockfilePath = npmLockPath;
         lockfileVersion = packageLockJson.lockfileVersion;
     }
     const packageJsonPath = pkgJsonPath || undefined;
-    return { cliType, packageJson, lockfileVersion, packageJsonPath };
+    return {
+        cliType,
+        packageJson,
+        lockfilePath,
+        lockfileVersion,
+        packageJsonPath,
+    };
 }
 exports.scanParentDirs = scanParentDirs;
 async function walkParentDirs({ base, start, filename, }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "5.4.0",
+  "version": "5.4.1",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -47,5 +47,5 @@
     "typescript": "4.3.4",
     "yazl": "2.5.1"
   },
-  "gitHead": "e7e0a55b72bc73c26661f7b2a3caa0884a5d1764"
+  "gitHead": "2906d83eaeddc72f9d874981dbe6698e812f3ca3"
 }