@vercel/build-utils 5.0.4 → 5.0.7

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

@@ -189,62 +189,44 @@ async function getNodeVersion(destPath, _nodeVersion, config = {}, meta = {}) {
 exports.getNodeVersion = getNodeVersion;
 async function scanParentDirs(destPath, readPackageJson = false) {
     assert_1.default(path_1.default.isAbsolute(destPath));
-    let cliType = 'yarn';
-    let packageJson;
-    let packageJsonPath;
-    let currentDestPath = destPath;
+    const pkgJsonPath = await walkParentDirs({
+        base: '/',
+        start: destPath,
+        filename: 'package.json',
+    });
+    const packageJson = readPackageJson && pkgJsonPath
+        ? JSON.parse(await fs_extra_1.default.readFile(pkgJsonPath, 'utf8'))
+        : undefined;
+    const [yarnLockPath, npmLockPath, pnpmLockPath] = await walkParentDirsMulti({
+        base: '/',
+        start: destPath,
+        filenames: ['yarn.lock', 'package-lock.json', 'pnpm-lock.yaml'],
+    });
     let lockfileVersion;
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
-        packageJsonPath = path_1.default.join(currentDestPath, 'package.json');
-        // eslint-disable-next-line no-await-in-loop
-        if (await fs_extra_1.default.pathExists(packageJsonPath)) {
-            // Only read the contents of the *first* `package.json` file found,
-            // since that's the one related to this installation.
-            if (readPackageJson && !packageJson) {
-                // eslint-disable-next-line no-await-in-loop
-                packageJson = JSON.parse(await fs_extra_1.default.readFile(packageJsonPath, 'utf8'));
-            }
-            // eslint-disable-next-line no-await-in-loop
-            const [packageLockJson, hasYarnLock, pnpmLockYaml] = await Promise.all([
-                fs_extra_1.default
-                    .readJson(path_1.default.join(currentDestPath, 'package-lock.json'))
-                    .catch(error => {
-                    // If the file doesn't exist, fail gracefully otherwise error
-                    if (error.code === 'ENOENT') {
-                        return null;
-                    }
-                    throw error;
-                }),
-                fs_extra_1.default.pathExists(path_1.default.join(currentDestPath, 'yarn.lock')),
-                read_config_file_1.readConfigFile(path_1.default.join(currentDestPath, 'pnpm-lock.yaml')),
-            ]);
-            // Priority order is Yarn > pnpm > npm
-            // - find highest priority lock file and use that
-            if (hasYarnLock) {
-                cliType = 'yarn';
-            }
-            else if (pnpmLockYaml) {
-                cliType = 'pnpm';
-                // just ensure that it is read as a number and not a string
-                lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
-            }
-            else if (packageLockJson) {
-                cliType = 'npm';
-                lockfileVersion = packageLockJson.lockfileVersion;
-            }
-            // Only stop iterating if a lockfile was found, because it's possible
-            // that the lockfile is in a higher path than where the `package.json`
-            // file was found.
-            if (packageLockJson || hasYarnLock || pnpmLockYaml) {
-                break;
-            }
-        }
-        const newDestPath = path_1.default.dirname(currentDestPath);
-        if (currentDestPath === newDestPath)
-            break;
-        currentDestPath = newDestPath;
+    let cliType = 'yarn';
+    const [hasYarnLock, packageLockJson, pnpmLockYaml] = await Promise.all([
+        Boolean(yarnLockPath),
+        npmLockPath
+            ? read_config_file_1.readConfigFile(npmLockPath)
+            : null,
+        pnpmLockPath
+            ? read_config_file_1.readConfigFile(pnpmLockPath)
+            : null,
+    ]);
+    // Priority order is Yarn > pnpm > npm
+    if (hasYarnLock) {
+        cliType = 'yarn';
     }
+    else if (pnpmLockYaml) {
+        cliType = 'pnpm';
+        // just ensure that it is read as a number and not a string
+        lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
+    }
+    else if (packageLockJson) {
+        cliType = 'npm';
+        lockfileVersion = packageLockJson.lockfileVersion;
+    }
+    const packageJsonPath = pkgJsonPath || undefined;
     return { cliType, packageJson, lockfileVersion, packageJsonPath };
 }
 exports.scanParentDirs = scanParentDirs;
@@ -259,10 +241,31 @@ async function walkParentDirs({ base, start, filename, }) {
             return fullPath;
         }
         parent = path_1.default.dirname(current);
+        if (parent === current) {
+            // Reached root directory of the filesystem
+            break;
+        }
     }
     return null;
 }
 exports.walkParentDirs = walkParentDirs;
+async function walkParentDirsMulti({ base, start, filenames, }) {
+    let parent = '';
+    for (let current = start; base.length <= current.length; current = parent) {
+        const fullPaths = filenames.map(f => path_1.default.join(current, f));
+        const existResults = await Promise.all(fullPaths.map(f => fs_extra_1.default.pathExists(f)));
+        const foundOneOrMore = existResults.some(b => b);
+        if (foundOneOrMore) {
+            return fullPaths.map((f, i) => (existResults[i] ? f : undefined));
+        }
+        parent = path_1.default.dirname(current);
+        if (parent === current) {
+            // Reached root directory of the filesystem
+            break;
+        }
+    }
+    return [];
+}
 function isSet(v) {
     return v?.constructor?.name === 'Set';
 }

package/dist/index.js

@@ -30999,62 +30999,44 @@ async function getNodeVersion(destPath, _nodeVersion, config = {}, meta = {}) {
 exports.getNodeVersion = getNodeVersion;
 async function scanParentDirs(destPath, readPackageJson = false) {
     assert_1.default(path_1.default.isAbsolute(destPath));
-    let cliType = 'yarn';
-    let packageJson;
-    let packageJsonPath;
-    let currentDestPath = destPath;
+    const pkgJsonPath = await walkParentDirs({
+        base: '/',
+        start: destPath,
+        filename: 'package.json',
+    });
+    const packageJson = readPackageJson && pkgJsonPath
+        ? JSON.parse(await fs_extra_1.default.readFile(pkgJsonPath, 'utf8'))
+        : undefined;
+    const [yarnLockPath, npmLockPath, pnpmLockPath] = await walkParentDirsMulti({
+        base: '/',
+        start: destPath,
+        filenames: ['yarn.lock', 'package-lock.json', 'pnpm-lock.yaml'],
+    });
     let lockfileVersion;
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
-        packageJsonPath = path_1.default.join(currentDestPath, 'package.json');
-        // eslint-disable-next-line no-await-in-loop
-        if (await fs_extra_1.default.pathExists(packageJsonPath)) {
-            // Only read the contents of the *first* `package.json` file found,
-            // since that's the one related to this installation.
-            if (readPackageJson && !packageJson) {
-                // eslint-disable-next-line no-await-in-loop
-                packageJson = JSON.parse(await fs_extra_1.default.readFile(packageJsonPath, 'utf8'));
-            }
-            // eslint-disable-next-line no-await-in-loop
-            const [packageLockJson, hasYarnLock, pnpmLockYaml] = await Promise.all([
-                fs_extra_1.default
-                    .readJson(path_1.default.join(currentDestPath, 'package-lock.json'))
-                    .catch(error => {
-                    // If the file doesn't exist, fail gracefully otherwise error
-                    if (error.code === 'ENOENT') {
-                        return null;
-                    }
-                    throw error;
-                }),
-                fs_extra_1.default.pathExists(path_1.default.join(currentDestPath, 'yarn.lock')),
-                read_config_file_1.readConfigFile(path_1.default.join(currentDestPath, 'pnpm-lock.yaml')),
-            ]);
-            // Priority order is Yarn > pnpm > npm
-            // - find highest priority lock file and use that
-            if (hasYarnLock) {
-                cliType = 'yarn';
-            }
-            else if (pnpmLockYaml) {
-                cliType = 'pnpm';
-                // just ensure that it is read as a number and not a string
-                lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
-            }
-            else if (packageLockJson) {
-                cliType = 'npm';
-                lockfileVersion = packageLockJson.lockfileVersion;
-            }
-            // Only stop iterating if a lockfile was found, because it's possible
-            // that the lockfile is in a higher path than where the `package.json`
-            // file was found.
-            if (packageLockJson || hasYarnLock || pnpmLockYaml) {
-                break;
-            }
-        }
-        const newDestPath = path_1.default.dirname(currentDestPath);
-        if (currentDestPath === newDestPath)
-            break;
-        currentDestPath = newDestPath;
-    }
+    let cliType = 'yarn';
+    const [hasYarnLock, packageLockJson, pnpmLockYaml] = await Promise.all([
+        Boolean(yarnLockPath),
+        npmLockPath
+            ? read_config_file_1.readConfigFile(npmLockPath)
+            : null,
+        pnpmLockPath
+            ? read_config_file_1.readConfigFile(pnpmLockPath)
+            : null,
+    ]);
+    // Priority order is Yarn > pnpm > npm
+    if (hasYarnLock) {
+        cliType = 'yarn';
+    }
+    else if (pnpmLockYaml) {
+        cliType = 'pnpm';
+        // just ensure that it is read as a number and not a string
+        lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
+    }
+    else if (packageLockJson) {
+        cliType = 'npm';
+        lockfileVersion = packageLockJson.lockfileVersion;
+    }
+    const packageJsonPath = pkgJsonPath || undefined;
     return { cliType, packageJson, lockfileVersion, packageJsonPath };
 }
 exports.scanParentDirs = scanParentDirs;
@@ -31069,10 +31051,31 @@ async function walkParentDirs({ base, start, filename, }) {
             return fullPath;
         }
         parent = path_1.default.dirname(current);
+        if (parent === current) {
+            // Reached root directory of the filesystem
+            break;
+        }
     }
     return null;
 }
 exports.walkParentDirs = walkParentDirs;
+async function walkParentDirsMulti({ base, start, filenames, }) {
+    let parent = '';
+    for (let current = start; base.length <= current.length; current = parent) {
+        const fullPaths = filenames.map(f => path_1.default.join(current, f));
+        const existResults = await Promise.all(fullPaths.map(f => fs_extra_1.default.pathExists(f)));
+        const foundOneOrMore = existResults.some(b => b);
+        if (foundOneOrMore) {
+            return fullPaths.map((f, i) => (existResults[i] ? f : undefined));
+        }
+        parent = path_1.default.dirname(current);
+        if (parent === current) {
+            // Reached root directory of the filesystem
+            break;
+        }
+    }
+    return [];
+}
 function isSet(v) {
     return v?.constructor?.name === 'Set';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "5.0.4",
+  "version": "5.0.7",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -35,7 +35,6 @@
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
     "async-sema": "2.1.4",
-    "boxen": "4.2.0",
     "cross-spawn": "6.0.5",
     "end-of-stream": "1.4.1",
     "fs-extra": "10.0.0",
@@ -49,5 +48,5 @@
     "typescript": "4.3.4",
     "yazl": "2.5.1"
   },
-  "gitHead": "3d3774ee7e3d344b3292d2166d485bdf41a68d4c"
+  "gitHead": "e8c7db59cf2746422f1f7e14cc6b7f901c243d50"
 }