@vercel/build-utils 6.7.5 → 6.8.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @vercel/build-utils
 
+## 6.8.1
+
+### Patch Changes
+
+- Revert "[build-utils] Allow file-ref sema to be controlled through env flag" ([#10167](https://github.com/vercel/vercel/pull/10167))
+
+## 6.8.0
+
+### Minor Changes
+
+- Add `getNodeBinPaths()` and `traverseUpDirectories()` functions ([#10150](https://github.com/vercel/vercel/pull/10150))
+
 ## 6.7.5
 
 ### Patch Changes

package/dist/file-fs-ref.js

@@ -8,8 +8,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const multistream_1 = __importDefault(require("multistream"));
 const path_1 = __importDefault(require("path"));
 const async_sema_1 = __importDefault(require("async-sema"));
-const DEFAULT_SEMA = 20;
-const semaToPreventEMFILE = new async_sema_1.default(parseInt(process.env.VERCEL_INTERNAL_FILE_FS_REF_SEMA || String(DEFAULT_SEMA), 10) || DEFAULT_SEMA);
+const semaToPreventEMFILE = new async_sema_1.default(20);
 class FileFsRef {
     constructor({ mode = 0o100644, contentType, fsPath }) {
         (0, assert_1.default)(typeof mode === 'number');

package/dist/file-ref.js

@@ -8,8 +8,7 @@ const node_fetch_1 = __importDefault(require("node-fetch"));
 const multistream_1 = __importDefault(require("multistream"));
 const async_retry_1 = __importDefault(require("async-retry"));
 const async_sema_1 = __importDefault(require("async-sema"));
-const DEFAULT_SEMA = 5;
-const semaToDownloadFromS3 = new async_sema_1.default(parseInt(process.env.VERCEL_INTERNAL_FILE_REF_SEMA || String(DEFAULT_SEMA), 10) || DEFAULT_SEMA);
+const semaToDownloadFromS3 = new async_sema_1.default(5);
 class BailableError extends Error {
     constructor(...args) {
         super(...args);

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

@@ -27,22 +27,28 @@ export interface ScanParentDirsResult {
      */
     lockfileVersion?: number;
 }
-export interface WalkParentDirsProps {
+export interface TraverseUpDirectoriesProps {
     /**
-     * The highest directory, typically the workPath root of the project.
-     * If this directory is reached and it doesn't contain the file, null is returned.
+     * The directory to start iterating from, typically the same directory of the entrypoint.
      */
-    base: string;
+    start: string;
     /**
-     * The directory to start searching, typically the same directory of the entrypoint.
-     * If this directory doesn't contain the file, the parent is checked, etc.
+     * The highest directory, typically the workPath root of the project.
      */
-    start: string;
+    base?: string;
+}
+export interface WalkParentDirsProps extends Required<TraverseUpDirectoriesProps> {
     /**
      * The name of the file to search for, typically `package.json` or `Gemfile`.
      */
     filename: string;
 }
+export interface WalkParentDirsMultiProps extends Required<TraverseUpDirectoriesProps> {
+    /**
+     * The name of the file to search for, typically `package.json` or `Gemfile`.
+     */
+    filenames: string[];
+}
 export interface SpawnOptionsExtended extends SpawnOptions {
     /**
      * Pretty formatted command that is being spawned for logging purposes.
@@ -58,9 +64,14 @@ export interface SpawnOptionsExtended extends SpawnOptions {
 export declare function spawnAsync(command: string, args: string[], opts?: SpawnOptionsExtended): Promise<void>;
 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 traverseUpDirectories({ start, base, }: TraverseUpDirectoriesProps): Generator<string, void, unknown>;
+/**
+ * @deprecated Use `getNodeBinPaths()` instead.
+ */
 export declare function getNodeBinPath({ cwd, }: {
     cwd: string;
 }): Promise<string>;
+export declare function getNodeBinPaths({ start, base, }: TraverseUpDirectoriesProps): string[];
 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, nodeVersionFallback?: string | undefined, config?: Config, meta?: Meta): Promise<NodeVersion>;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installDependencies = exports.getScriptName = exports.runPipInstall = exports.runBundleInstall = exports.runPackageJsonScript = exports.runCustomInstallCommand = exports.getEnvForPackageManager = exports.runNpmInstall = exports.walkParentDirs = exports.scanParentDirs = exports.getNodeVersion = exports.getSpawnOptions = exports.runShellScript = exports.getNodeBinPath = exports.execCommand = exports.spawnCommand = exports.spawnAsync = void 0;
+exports.installDependencies = exports.getScriptName = exports.runPipInstall = exports.runBundleInstall = exports.runPackageJsonScript = exports.runCustomInstallCommand = exports.getEnvForPackageManager = exports.runNpmInstall = exports.walkParentDirs = exports.scanParentDirs = exports.getNodeVersion = exports.getSpawnOptions = exports.runShellScript = exports.getNodeBinPaths = exports.getNodeBinPath = exports.traverseUpDirectories = exports.execCommand = exports.spawnCommand = exports.spawnAsync = void 0;
 const assert_1 = __importDefault(require("assert"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
@@ -63,12 +63,32 @@ async function execCommand(command, options = {}) {
     return true;
 }
 exports.execCommand = execCommand;
+function* traverseUpDirectories({ start, base, }) {
+    let current = path_1.default.normalize(start);
+    const normalizedRoot = base ? path_1.default.normalize(base) : undefined;
+    while (current) {
+        yield current;
+        if (current === normalizedRoot)
+            break;
+        // Go up one directory
+        const next = path_1.default.join(current, '..');
+        current = next === current ? undefined : next;
+    }
+}
+exports.traverseUpDirectories = traverseUpDirectories;
+/**
+ * @deprecated Use `getNodeBinPaths()` instead.
+ */
 async function getNodeBinPath({ cwd, }) {
     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;
+function getNodeBinPaths({ start, base, }) {
+    return Array.from(traverseUpDirectories({ start, base })).map(dir => path_1.default.join(dir, 'node_modules/.bin'));
+}
+exports.getNodeBinPaths = getNodeBinPaths;
 async function chmodPlusX(fsPath) {
     const s = await fs_extra_1.default.stat(fsPath);
     const newMode = s.mode | 64 | 8 | 1; // eslint-disable-line no-bitwise
@@ -194,36 +214,24 @@ exports.scanParentDirs = scanParentDirs;
 async function walkParentDirs({ base, start, filename, }) {
     (0, assert_1.default)(path_1.default.isAbsolute(base), 'Expected "base" to be absolute path');
     (0, assert_1.default)(path_1.default.isAbsolute(start), 'Expected "start" to be absolute path');
-    let parent = '';
-    for (let current = start; base.length <= current.length; current = parent) {
-        const fullPath = path_1.default.join(current, filename);
+    for (const dir of traverseUpDirectories({ start, base })) {
+        const fullPath = path_1.default.join(dir, filename);
         // eslint-disable-next-line no-await-in-loop
         if (await fs_extra_1.default.pathExists(fullPath)) {
             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));
+    for (const dir of traverseUpDirectories({ start, base })) {
+        const fullPaths = filenames.map(f => path_1.default.join(dir, 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 [];
 }

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import download, { downloadFile, DownloadedFiles, isSymbolicLink, isDirectory }
 import getWriteableDirectory from './fs/get-writable-directory';
 import glob, { GlobOptions } from './fs/glob';
 import rename from './fs/rename';
-import { spawnAsync, execCommand, spawnCommand, walkParentDirs, getScriptName, installDependencies, runPackageJsonScript, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getSpawnOptions, getNodeBinPath, scanParentDirs } from './fs/run-user-scripts';
+import { spawnAsync, execCommand, spawnCommand, walkParentDirs, getScriptName, installDependencies, runPackageJsonScript, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getSpawnOptions, getNodeBinPath, getNodeBinPaths, scanParentDirs, traverseUpDirectories } from './fs/run-user-scripts';
 import { getLatestNodeVersion, getDiscontinuedNodeVersions } from './fs/node-version';
 import streamToBuffer from './fs/stream-to-buffer';
 import debug from './debug';
@@ -18,7 +18,7 @@ import { getPrefixedEnvVars } from './get-prefixed-env-vars';
 import { cloneEnv } from './clone-env';
 import { hardLinkDir } from './hard-link-dir';
 import { validateNpmrc } from './validate-npmrc';
-export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, downloadFile, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, getPrefixedEnvVars, streamToBuffer, debug, isSymbolicLink, isDirectory, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, cloneEnv, hardLinkDir, validateNpmrc, };
+export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, downloadFile, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, getNodeBinPaths, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, getPrefixedEnvVars, streamToBuffer, debug, isSymbolicLink, isDirectory, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, cloneEnv, hardLinkDir, traverseUpDirectories, validateNpmrc, };
 export { EdgeFunction } from './edge-function';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';

package/dist/index.js

@@ -28355,8 +28355,7 @@ const fs_extra_1 = __importDefault(__webpack_require__(6365));
 const multistream_1 = __importDefault(__webpack_require__(4106));
 const path_1 = __importDefault(__webpack_require__(5622));
 const async_sema_1 = __importDefault(__webpack_require__(2219));
-const DEFAULT_SEMA = 20;
-const semaToPreventEMFILE = new async_sema_1.default(parseInt(process.env.VERCEL_INTERNAL_FILE_FS_REF_SEMA || String(DEFAULT_SEMA), 10) || DEFAULT_SEMA);
+const semaToPreventEMFILE = new async_sema_1.default(20);
 class FileFsRef {
     constructor({ mode = 0o100644, contentType, fsPath }) {
         (0, assert_1.default)(typeof mode === 'number');
@@ -28434,8 +28433,7 @@ const node_fetch_1 = __importDefault(__webpack_require__(1596));
 const multistream_1 = __importDefault(__webpack_require__(4106));
 const async_retry_1 = __importDefault(__webpack_require__(1635));
 const async_sema_1 = __importDefault(__webpack_require__(2219));
-const DEFAULT_SEMA = 5;
-const semaToDownloadFromS3 = new async_sema_1.default(parseInt(process.env.VERCEL_INTERNAL_FILE_REF_SEMA || String(DEFAULT_SEMA), 10) || DEFAULT_SEMA);
+const semaToDownloadFromS3 = new async_sema_1.default(5);
 class BailableError extends Error {
     constructor(...args) {
         super(...args);
@@ -28956,7 +28954,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.installDependencies = exports.getScriptName = exports.runPipInstall = exports.runBundleInstall = exports.runPackageJsonScript = exports.runCustomInstallCommand = exports.getEnvForPackageManager = exports.runNpmInstall = exports.walkParentDirs = exports.scanParentDirs = exports.getNodeVersion = exports.getSpawnOptions = exports.runShellScript = exports.getNodeBinPath = exports.execCommand = exports.spawnCommand = exports.spawnAsync = void 0;
+exports.installDependencies = exports.getScriptName = exports.runPipInstall = exports.runBundleInstall = exports.runPackageJsonScript = exports.runCustomInstallCommand = exports.getEnvForPackageManager = exports.runNpmInstall = exports.walkParentDirs = exports.scanParentDirs = exports.getNodeVersion = exports.getSpawnOptions = exports.runShellScript = exports.getNodeBinPaths = exports.getNodeBinPath = exports.traverseUpDirectories = exports.execCommand = exports.spawnCommand = exports.spawnAsync = void 0;
 const assert_1 = __importDefault(__webpack_require__(2357));
 const fs_extra_1 = __importDefault(__webpack_require__(6365));
 const path_1 = __importDefault(__webpack_require__(5622));
@@ -29016,12 +29014,32 @@ async function execCommand(command, options = {}) {
     return true;
 }
 exports.execCommand = execCommand;
+function* traverseUpDirectories({ start, base, }) {
+    let current = path_1.default.normalize(start);
+    const normalizedRoot = base ? path_1.default.normalize(base) : undefined;
+    while (current) {
+        yield current;
+        if (current === normalizedRoot)
+            break;
+        // Go up one directory
+        const next = path_1.default.join(current, '..');
+        current = next === current ? undefined : next;
+    }
+}
+exports.traverseUpDirectories = traverseUpDirectories;
+/**
+ * @deprecated Use `getNodeBinPaths()` instead.
+ */
 async function getNodeBinPath({ cwd, }) {
     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;
+function getNodeBinPaths({ start, base, }) {
+    return Array.from(traverseUpDirectories({ start, base })).map(dir => path_1.default.join(dir, 'node_modules/.bin'));
+}
+exports.getNodeBinPaths = getNodeBinPaths;
 async function chmodPlusX(fsPath) {
     const s = await fs_extra_1.default.stat(fsPath);
     const newMode = s.mode | 64 | 8 | 1; // eslint-disable-line no-bitwise
@@ -29147,36 +29165,24 @@ exports.scanParentDirs = scanParentDirs;
 async function walkParentDirs({ base, start, filename, }) {
     (0, assert_1.default)(path_1.default.isAbsolute(base), 'Expected "base" to be absolute path');
     (0, assert_1.default)(path_1.default.isAbsolute(start), 'Expected "start" to be absolute path');
-    let parent = '';
-    for (let current = start; base.length <= current.length; current = parent) {
-        const fullPath = path_1.default.join(current, filename);
+    for (const dir of traverseUpDirectories({ start, base })) {
+        const fullPath = path_1.default.join(dir, filename);
         // eslint-disable-next-line no-await-in-loop
         if (await fs_extra_1.default.pathExists(fullPath)) {
             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));
+    for (const dir of traverseUpDirectories({ start, base })) {
+        const fullPaths = filenames.map(f => path_1.default.join(dir, 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 [];
 }
@@ -29717,7 +29723,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.normalizePath = exports.readConfigFile = exports.EdgeFunction = exports.validateNpmrc = exports.hardLinkDir = exports.cloneEnv = exports.getIgnoreFilter = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isDirectory = exports.isSymbolicLink = exports.debug = exports.streamToBuffer = exports.getPrefixedEnvVars = exports.getPlatformEnv = exports.getSpawnOptions = exports.getDiscontinuedNodeVersions = exports.getLatestNodeVersion = exports.getNodeVersion = exports.getEnvForPackageManager = exports.runCustomInstallCommand = exports.runShellScript = exports.runPipInstall = exports.runBundleInstall = exports.runNpmInstall = exports.getNodeBinPath = exports.walkParentDirs = exports.spawnCommand = exports.execCommand = exports.runPackageJsonScript = exports.installDependencies = exports.getScriptName = exports.spawnAsync = exports.rename = exports.glob = exports.getWriteableDirectory = exports.downloadFile = exports.download = exports.Prerender = exports.createLambda = exports.NodejsLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
+exports.normalizePath = exports.readConfigFile = exports.EdgeFunction = exports.validateNpmrc = exports.traverseUpDirectories = exports.hardLinkDir = exports.cloneEnv = exports.getIgnoreFilter = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isDirectory = exports.isSymbolicLink = exports.debug = exports.streamToBuffer = exports.getPrefixedEnvVars = exports.getPlatformEnv = exports.getSpawnOptions = exports.getDiscontinuedNodeVersions = exports.getLatestNodeVersion = exports.getNodeVersion = exports.getEnvForPackageManager = exports.runCustomInstallCommand = exports.runShellScript = exports.runPipInstall = exports.runBundleInstall = exports.runNpmInstall = exports.getNodeBinPaths = exports.getNodeBinPath = exports.walkParentDirs = exports.spawnCommand = exports.execCommand = exports.runPackageJsonScript = exports.installDependencies = exports.getScriptName = exports.spawnAsync = exports.rename = exports.glob = exports.getWriteableDirectory = exports.downloadFile = exports.download = exports.Prerender = exports.createLambda = exports.NodejsLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
 const file_blob_1 = __importDefault(__webpack_require__(8361));
 exports.FileBlob = file_blob_1.default;
 const file_fs_ref_1 = __importDefault(__webpack_require__(6274));
@@ -29760,7 +29766,9 @@ Object.defineProperty(exports, "getEnvForPackageManager", ({ enumerable: true, g
 Object.defineProperty(exports, "getNodeVersion", ({ enumerable: true, get: function () { return run_user_scripts_1.getNodeVersion; } }));
 Object.defineProperty(exports, "getSpawnOptions", ({ enumerable: true, get: function () { return run_user_scripts_1.getSpawnOptions; } }));
 Object.defineProperty(exports, "getNodeBinPath", ({ enumerable: true, get: function () { return run_user_scripts_1.getNodeBinPath; } }));
+Object.defineProperty(exports, "getNodeBinPaths", ({ enumerable: true, get: function () { return run_user_scripts_1.getNodeBinPaths; } }));
 Object.defineProperty(exports, "scanParentDirs", ({ enumerable: true, get: function () { return run_user_scripts_1.scanParentDirs; } }));
+Object.defineProperty(exports, "traverseUpDirectories", ({ enumerable: true, get: function () { return run_user_scripts_1.traverseUpDirectories; } }));
 const node_version_1 = __webpack_require__(8262);
 Object.defineProperty(exports, "getLatestNodeVersion", ({ enumerable: true, get: function () { return node_version_1.getLatestNodeVersion; } }));
 Object.defineProperty(exports, "getDiscontinuedNodeVersions", ({ enumerable: true, get: function () { return node_version_1.getDiscontinuedNodeVersions; } }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "6.7.5",
+  "version": "6.8.1",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",