@vercel/build-utils 8.6.0 → 8.8.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @vercel/build-utils
 
+## 8.8.0
+
+### Minor Changes
+
+- Add bun detection using bun.lock ([#12740](https://github.com/vercel/vercel/pull/12740))
+
+## 8.7.0
+
+### Minor Changes
+
+- Support splitting archive deployments in parts. ([#12671](https://github.com/vercel/vercel/pull/12671))
+
 ## 8.6.0
 
 ### Minor Changes

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

@@ -239,7 +239,13 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   });
   const packageJson = readPackageJson && pkgJsonPath ? JSON.parse(await import_fs_extra.default.readFile(pkgJsonPath, "utf8")) : void 0;
   const {
-    paths: [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath],
+    paths: [
+      yarnLockPath,
+      npmLockPath,
+      pnpmLockPath,
+      bunLockTextPath,
+      bunLockBinPath
+    ],
     packageJsonPackageManager
   } = await walkParentDirsMulti({
     base,
@@ -248,17 +254,19 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
       "yarn.lock",
       "package-lock.json",
       "pnpm-lock.yaml",
+      "bun.lock",
       "bun.lockb"
     ]
   });
   let lockfilePath;
   let lockfileVersion;
   let cliType;
-  const [hasYarnLock, packageLockJson, pnpmLockYaml, bunLockBin] = await Promise.all([
+  const bunLockPath = bunLockTextPath ?? bunLockBinPath;
+  const [hasYarnLock, packageLockJson, pnpmLockYaml, bunLock] = await Promise.all([
     Boolean(yarnLockPath),
     npmLockPath ? (0, import_read_config_file.readConfigFile)(npmLockPath) : null,
     pnpmLockPath ? (0, import_read_config_file.readConfigFile)(pnpmLockPath) : null,
-    bunLockPath ? import_fs_extra.default.readFile(bunLockPath, "utf8") : null
+    bunLockPath ? import_fs_extra.default.readFile(bunLockPath) : null
   ]);
   const rootProjectInfo = readPackageJson ? await readProjectRootInfo({
     base,
@@ -269,10 +277,10 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     turboVersionRange,
     rootProjectInfo?.rootDir
   ) : void 0;
-  if (bunLockBin && hasYarnLock) {
+  if (bunLock && hasYarnLock) {
     cliType = "bun";
     lockfilePath = bunLockPath;
-    lockfileVersion = 0;
+    lockfileVersion = bunLockTextPath ? 1 : 0;
   } else if (hasYarnLock) {
     cliType = "yarn";
     lockfilePath = yarnLockPath;
@@ -284,10 +292,10 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     cliType = "npm";
     lockfilePath = npmLockPath;
     lockfileVersion = packageLockJson.lockfileVersion;
-  } else if (bunLockBin) {
+  } else if (bunLock) {
     cliType = "bun";
     lockfilePath = bunLockPath;
-    lockfileVersion = 0;
+    lockfileVersion = bunLockTextPath ? 1 : 0;
   } else {
     cliType = detectPackageManagerNameWithoutLockfile(
       packageJsonPackageManager,
@@ -751,7 +759,7 @@ function detectPackageManager(cliType, lockfileVersion) {
     case "bun":
       return {
         path: "/bun1",
-        detectedLockfile: "bun.lockb",
+        detectedLockfile: lockfileVersion === 0 ? "bun.lockb" : "bun.lock",
         detectedPackageManager: "bun@1.x"
       };
     case "yarn":

package/dist/fs/stream-to-buffer.d.ts

@@ -1,2 +1,3 @@
 /// <reference types="node" />
 export default function streamToBuffer(stream: NodeJS.ReadableStream): Promise<Buffer>;
+export declare function streamToBufferChunks(stream: NodeJS.ReadableStream, chunkSize?: number): Promise<Buffer[]>;

package/dist/fs/stream-to-buffer.js

@@ -28,7 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var stream_to_buffer_exports = {};
 __export(stream_to_buffer_exports, {
-  default: () => streamToBuffer
+  default: () => streamToBuffer,
+  streamToBufferChunks: () => streamToBufferChunks
 });
 module.exports = __toCommonJS(stream_to_buffer_exports);
 var import_end_of_stream = __toESM(require("end-of-stream"));
@@ -54,3 +55,33 @@ function streamToBuffer(stream) {
     });
   });
 }
+const MB = 1024 * 1024;
+async function streamToBufferChunks(stream, chunkSize = 100 * MB) {
+  const chunks = [];
+  let currentChunk = [];
+  let currentSize = 0;
+  for await (const chunk of stream) {
+    const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+    let offset = 0;
+    while (offset < buffer.length) {
+      const remainingSpace = chunkSize - currentSize;
+      const sliceSize = Math.min(remainingSpace, buffer.length - offset);
+      currentChunk.push(buffer.slice(offset, offset + sliceSize));
+      currentSize += sliceSize;
+      offset += sliceSize;
+      if (currentSize >= chunkSize) {
+        chunks.push(Buffer.concat(currentChunk));
+        currentChunk = [];
+        currentSize = 0;
+      }
+    }
+  }
+  if (currentChunk.length > 0) {
+    chunks.push(Buffer.concat(currentChunk));
+  }
+  return chunks;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  streamToBufferChunks
+});

package/dist/index.d.ts

@@ -10,7 +10,7 @@ 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, getPathForPackageManager, getSpawnOptions, getNodeBinPath, getNodeBinPaths, scanParentDirs, traverseUpDirectories } from './fs/run-user-scripts';
 import { getLatestNodeVersion, getDiscontinuedNodeVersions, getSupportedNodeVersion } from './fs/node-version';
-import streamToBuffer from './fs/stream-to-buffer';
+import streamToBuffer, { streamToBufferChunks } from './fs/stream-to-buffer';
 import debug from './debug';
 import getIgnoreFilter from './get-ignore-filter';
 import { getPlatformEnv } from './get-platform-env';
@@ -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, getNodeBinPaths, getSupportedNodeVersion, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getPathForPackageManager, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, getPrefixedEnvVars, streamToBuffer, debug, isSymbolicLink, isDirectory, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, cloneEnv, hardLinkDir, traverseUpDirectories, 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, getSupportedNodeVersion, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getPathForPackageManager, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, getPrefixedEnvVars, streamToBuffer, streamToBufferChunks, 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

@@ -23499,6 +23499,7 @@ __export(src_exports, {
   spawnAsync: () => spawnAsync,
   spawnCommand: () => spawnCommand,
   streamToBuffer: () => streamToBuffer,
+  streamToBufferChunks: () => streamToBufferChunks,
   traverseUpDirectories: () => traverseUpDirectories,
   validateNpmrc: () => validateNpmrc,
   walkParentDirs: () => walkParentDirs
@@ -23872,6 +23873,32 @@ function streamToBuffer(stream) {
     });
   });
 }
+var MB = 1024 * 1024;
+async function streamToBufferChunks(stream, chunkSize = 100 * MB) {
+  const chunks = [];
+  let currentChunk = [];
+  let currentSize = 0;
+  for await (const chunk of stream) {
+    const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+    let offset = 0;
+    while (offset < buffer.length) {
+      const remainingSpace = chunkSize - currentSize;
+      const sliceSize = Math.min(remainingSpace, buffer.length - offset);
+      currentChunk.push(buffer.slice(offset, offset + sliceSize));
+      currentSize += sliceSize;
+      offset += sliceSize;
+      if (currentSize >= chunkSize) {
+        chunks.push(Buffer.concat(currentChunk));
+        currentChunk = [];
+        currentSize = 0;
+      }
+    }
+  }
+  if (currentChunk.length > 0) {
+    chunks.push(Buffer.concat(currentChunk));
+  }
+  return chunks;
+}
 
 // src/fs/download.ts
 var S_IFDIR = 16384;
@@ -24771,7 +24798,13 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   });
   const packageJson = readPackageJson && pkgJsonPath ? JSON.parse(await import_fs_extra7.default.readFile(pkgJsonPath, "utf8")) : void 0;
   const {
-    paths: [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath],
+    paths: [
+      yarnLockPath,
+      npmLockPath,
+      pnpmLockPath,
+      bunLockTextPath,
+      bunLockBinPath
+    ],
     packageJsonPackageManager
   } = await walkParentDirsMulti({
     base,
@@ -24780,17 +24813,19 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
       "yarn.lock",
       "package-lock.json",
       "pnpm-lock.yaml",
+      "bun.lock",
       "bun.lockb"
     ]
   });
   let lockfilePath;
   let lockfileVersion;
   let cliType;
-  const [hasYarnLock, packageLockJson, pnpmLockYaml, bunLockBin] = await Promise.all([
+  const bunLockPath = bunLockTextPath ?? bunLockBinPath;
+  const [hasYarnLock, packageLockJson, pnpmLockYaml, bunLock] = await Promise.all([
     Boolean(yarnLockPath),
     npmLockPath ? readConfigFile(npmLockPath) : null,
     pnpmLockPath ? readConfigFile(pnpmLockPath) : null,
-    bunLockPath ? import_fs_extra7.default.readFile(bunLockPath, "utf8") : null
+    bunLockPath ? import_fs_extra7.default.readFile(bunLockPath) : null
   ]);
   const rootProjectInfo = readPackageJson ? await readProjectRootInfo({
     base,
@@ -24801,10 +24836,10 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     turboVersionRange,
     rootProjectInfo?.rootDir
   ) : void 0;
-  if (bunLockBin && hasYarnLock) {
+  if (bunLock && hasYarnLock) {
     cliType = "bun";
     lockfilePath = bunLockPath;
-    lockfileVersion = 0;
+    lockfileVersion = bunLockTextPath ? 1 : 0;
   } else if (hasYarnLock) {
     cliType = "yarn";
     lockfilePath = yarnLockPath;
@@ -24816,10 +24851,10 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     cliType = "npm";
     lockfilePath = npmLockPath;
     lockfileVersion = packageLockJson.lockfileVersion;
-  } else if (bunLockBin) {
+  } else if (bunLock) {
     cliType = "bun";
     lockfilePath = bunLockPath;
-    lockfileVersion = 0;
+    lockfileVersion = bunLockTextPath ? 1 : 0;
   } else {
     cliType = detectPackageManagerNameWithoutLockfile(
       packageJsonPackageManager,
@@ -25283,7 +25318,7 @@ function detectPackageManager(cliType, lockfileVersion) {
     case "bun":
       return {
         path: "/bun1",
-        detectedLockfile: "bun.lockb",
+        detectedLockfile: lockfileVersion === 0 ? "bun.lockb" : "bun.lock",
         detectedPackageManager: "bun@1.x"
       };
     case "yarn":
@@ -25812,6 +25847,7 @@ async function getInstalledPackageVersion(packageName, path7) {
   spawnAsync,
   spawnCommand,
   streamToBuffer,
+  streamToBufferChunks,
   traverseUpDirectories,
   validateNpmrc,
   walkParentDirs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "8.6.0",
+  "version": "8.8.0",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -53,7 +53,7 @@
     "build": "node build.mjs",
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail --runInBand",
     "vitest-run": "vitest -c ../../vitest.config.mts",
-    "vitest-unit": "glob --absolute 'test/unit.*.test.ts'",
+    "vitest-unit": "glob --absolute 'test/unit.*test.ts'",
     "vitest-e2e": "glob --absolute 'test/integration-*.test.ts'",
     "type-check": "tsc --noEmit"
   }