@vercel/build-utils 8.7.0 → 8.8.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @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

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/index.js

@@ -24798,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,
@@ -24807,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,
@@ -24828,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;
@@ -24843,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,
@@ -25310,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":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "8.7.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"
   }