@vercel/build-utils 9.0.0 → 9.0.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vercel/build-utils
 
+## 9.0.1
+
+### Patch Changes
+
+- Revert build utils refactor ([#12818](https://github.com/vercel/vercel/pull/12818))
+
 ## 9.0.0
 
 ### Major Changes

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

@@ -37,11 +37,6 @@ export interface ScanParentDirsResult {
      * `undefined` if not a Turborepo project.
      */
     turboSupportsCorepackHome?: boolean;
-    /**
-     * Name of the lockfile (`yarn.lock`, `package-lock.json`, ...) detected
-     * or `undefined` if no lockfile was detected.
-     */
-    detectedLockfile?: string;
 }
 export interface TraverseUpDirectoriesProps {
     /**
@@ -102,7 +97,7 @@ export declare function runNpmInstall(destPath: string, args?: string[], spawnOp
  * Prepares the input environment based on the used package manager and lockfile
  * versions.
  */
-export declare function getEnvForPackageManager({ cliType, lockfileVersion, packageJsonPackageManager, nodeVersion, env, packageJsonEngines, turboSupportsCorepackHome, detectedLockfile, }: {
+export declare function getEnvForPackageManager({ cliType, lockfileVersion, packageJsonPackageManager, nodeVersion, env, packageJsonEngines, turboSupportsCorepackHome, }: {
     cliType: CliType;
     lockfileVersion: number | undefined;
     packageJsonPackageManager?: string | undefined;
@@ -112,7 +107,6 @@ export declare function getEnvForPackageManager({ cliType, lockfileVersion, pack
     };
     packageJsonEngines?: PackageJson.Engines;
     turboSupportsCorepackHome?: boolean | undefined;
-    detectedLockfile: string | undefined;
 }): {
     [x: string]: string | undefined;
 };
@@ -120,14 +114,13 @@ export declare function getEnvForPackageManager({ cliType, lockfileVersion, pack
  * Helper to get the binary paths that link to the used package manager.
  * Note: Make sure it doesn't contain any `console.log` calls.
  */
-export declare function getPathOverrideForPackageManager({ cliType, lockfileVersion, corepackPackageManager, corepackEnabled, packageJsonEngines, detectedLockfile, }: {
+export declare function getPathOverrideForPackageManager({ cliType, lockfileVersion, corepackPackageManager, corepackEnabled, packageJsonEngines, }: {
     cliType: CliType;
     lockfileVersion: number | undefined;
     corepackPackageManager: string | undefined;
     nodeVersion: NodeVersion | undefined;
     corepackEnabled?: boolean;
     packageJsonEngines?: PackageJson.Engines;
-    detectedLockfile?: string;
 }): {
     /**
      * Which lockfile was detected.
@@ -143,24 +136,24 @@ export declare function getPathOverrideForPackageManager({ cliType, lockfileVers
      */
     path: string | undefined;
 };
-export declare function detectPackageManager(cliType: CliType, lockfileVersion: number | undefined, detectedLockfile: string | undefined): {
+export declare function detectPackageManager(cliType: CliType, lockfileVersion: number | undefined): {
     path: string;
-    detectedLockfile: string | undefined;
+    detectedLockfile: string;
     detectedPackageManager: string;
     pnpmVersionRange: string;
 } | {
     path: undefined;
-    detectedLockfile: string | undefined;
+    detectedLockfile: string;
     detectedPackageManager: string;
     pnpmVersionRange: string;
 } | {
     path: string;
-    detectedLockfile: string | undefined;
+    detectedLockfile: string;
     detectedPackageManager: string;
     pnpmVersionRange?: undefined;
 } | {
     path: undefined;
-    detectedLockfile: string | undefined;
+    detectedLockfile: string;
     detectedPackageManager: string;
     pnpmVersionRange?: undefined;
 } | undefined;
@@ -169,14 +162,13 @@ export declare function detectPackageManager(cliType: CliType, lockfileVersion:
  * Note: Make sure it doesn't contain any `console.log` calls.
  * @deprecated use `getEnvForPackageManager` instead
  */
-export declare function getPathForPackageManager({ cliType, lockfileVersion, nodeVersion, env, detectedLockfile, }: {
+export declare function getPathForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }: {
     cliType: CliType;
     lockfileVersion: number | undefined;
     nodeVersion: NodeVersion | undefined;
     env: {
         [x: string]: string | undefined;
     };
-    detectedLockfile: string;
 }): {
     /**
      * Which lockfile was detected.

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

@@ -280,6 +280,7 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   if (bunLock && hasYarnLock) {
     cliType = "bun";
     lockfilePath = bunLockPath;
+    lockfileVersion = bunLockTextPath ? 1 : 0;
   } else if (hasYarnLock) {
     cliType = "yarn";
     lockfilePath = yarnLockPath;
@@ -294,6 +295,7 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   } else if (bunLock) {
     cliType = "bun";
     lockfilePath = bunLockPath;
+    lockfileVersion = bunLockTextPath ? 1 : 0;
   } else {
     cliType = detectPackageManagerNameWithoutLockfile(
       packageJsonPackageManager,
@@ -308,8 +310,7 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     lockfilePath,
     lockfileVersion,
     packageJsonPath,
-    turboSupportsCorepackHome,
-    detectedLockfile: lockfilePath ? import_path.default.basename(lockfilePath) : void 0
+    turboSupportsCorepackHome
   };
 }
 async function checkTurboSupportsCorepack(turboVersionRange, rootDir) {
@@ -435,8 +436,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       packageJson,
       lockfileVersion,
       packageJsonPackageManager,
-      turboSupportsCorepackHome,
-      detectedLockfile
+      turboSupportsCorepackHome
     } = await scanParentDirs(destPath, true);
     if (!packageJsonPath) {
       (0, import_debug.default)(
@@ -470,8 +470,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       nodeVersion,
       env,
       packageJsonEngines: packageJson?.engines,
-      turboSupportsCorepackHome,
-      detectedLockfile
+      turboSupportsCorepackHome
     });
     let commandArgs;
     const isPotentiallyBrokenNpm = cliType === "npm" && (nodeVersion?.major === 16 || opts.env.PATH?.includes("/node16/bin-npm7")) && !args.includes("--legacy-peer-deps") && spawnOpts?.env?.ENABLE_EXPERIMENTAL_COREPACK !== "1";
@@ -525,22 +524,24 @@ function getEnvForPackageManager({
   nodeVersion,
   env,
   packageJsonEngines,
-  turboSupportsCorepackHome,
-  detectedLockfile
+  turboSupportsCorepackHome
 }) {
   const corepackEnabled = usingCorepack(
     env,
     packageJsonPackageManager,
     turboSupportsCorepackHome
   );
-  const { detectedPackageManager, path: newPath } = getPathOverrideForPackageManager({
+  const {
+    detectedLockfile,
+    detectedPackageManager,
+    path: newPath
+  } = getPathOverrideForPackageManager({
     cliType,
     lockfileVersion,
     corepackPackageManager: packageJsonPackageManager,
     nodeVersion,
     corepackEnabled,
-    packageJsonEngines,
-    detectedLockfile
+    packageJsonEngines
   });
   if (corepackEnabled) {
     (0, import_debug.default)(
@@ -624,14 +625,9 @@ function getPathOverrideForPackageManager({
   lockfileVersion,
   corepackPackageManager,
   corepackEnabled = true,
-  packageJsonEngines,
-  detectedLockfile
+  packageJsonEngines
 }) {
-  const detectedPackageManger = detectPackageManager(
-    cliType,
-    lockfileVersion,
-    detectedLockfile
-  );
+  const detectedPackageManger = detectPackageManager(cliType, lockfileVersion);
   if (!corepackPackageManager || !corepackEnabled) {
     if (cliType === "pnpm" && packageJsonEngines?.pnpm) {
       checkEnginesPnpmAgainstDetected(
@@ -722,7 +718,7 @@ function validateVersionSpecifier(version) {
     packageVersion
   };
 }
-function detectPackageManager(cliType, lockfileVersion, detectedLockfile) {
+function detectPackageManager(cliType, lockfileVersion) {
   switch (cliType) {
     case "npm":
       return void 0;
@@ -731,21 +727,21 @@ function detectPackageManager(cliType, lockfileVersion, detectedLockfile) {
         case "pnpm 7":
           return {
             path: "/pnpm7/node_modules/.bin",
-            detectedLockfile,
+            detectedLockfile: "pnpm-lock.yaml",
             detectedPackageManager: "pnpm@7.x",
             pnpmVersionRange: "7.x"
           };
         case "pnpm 8":
           return {
             path: "/pnpm8/node_modules/.bin",
-            detectedLockfile,
+            detectedLockfile: "pnpm-lock.yaml",
             detectedPackageManager: "pnpm@8.x",
             pnpmVersionRange: "8.x"
           };
         case "pnpm 9":
           return {
             path: "/pnpm9/node_modules/.bin",
-            detectedLockfile,
+            detectedLockfile: "pnpm-lock.yaml",
             detectedPackageManager: "pnpm@9.x",
             pnpmVersionRange: "9.x"
           };
@@ -753,7 +749,7 @@ function detectPackageManager(cliType, lockfileVersion, detectedLockfile) {
           return {
             // undefined because pnpm@6 is the current default in the build container
             path: void 0,
-            detectedLockfile,
+            detectedLockfile: "pnpm-lock.yaml",
             detectedPackageManager: "pnpm@6.x",
             pnpmVersionRange: "6.x"
           };
@@ -763,13 +759,13 @@ function detectPackageManager(cliType, lockfileVersion, detectedLockfile) {
     case "bun":
       return {
         path: "/bun1",
-        detectedLockfile,
+        detectedLockfile: lockfileVersion === 0 ? "bun.lockb" : "bun.lock",
         detectedPackageManager: "bun@1.x"
       };
     case "yarn":
       return {
         path: void 0,
-        detectedLockfile,
+        detectedLockfile: "yarn.lock",
         detectedPackageManager: "yarn"
       };
   }
@@ -778,16 +774,14 @@ function getPathForPackageManager({
   cliType,
   lockfileVersion,
   nodeVersion,
-  env,
-  detectedLockfile
+  env
 }) {
   const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === "1";
   let overrides = getPathOverrideForPackageManager({
     cliType,
     lockfileVersion,
     corepackPackageManager: void 0,
-    nodeVersion,
-    detectedLockfile
+    nodeVersion
   });
   if (corepackEnabled) {
     overrides = NO_OVERRIDE;
@@ -822,8 +816,7 @@ async function runCustomInstallCommand({
     lockfileVersion,
     packageJson,
     packageJsonPackageManager,
-    turboSupportsCorepackHome,
-    detectedLockfile
+    turboSupportsCorepackHome
   } = await scanParentDirs(destPath, true);
   const env = getEnvForPackageManager({
     cliType,
@@ -832,8 +825,7 @@ async function runCustomInstallCommand({
     nodeVersion,
     env: spawnOpts?.env || {},
     packageJsonEngines: packageJson?.engines,
-    turboSupportsCorepackHome,
-    detectedLockfile
+    turboSupportsCorepackHome
   });
   (0, import_debug.default)(`Running with $PATH:`, env?.PATH || "");
   await execCommand(installCommand, {
@@ -849,8 +841,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
     cliType,
     lockfileVersion,
     packageJsonPackageManager,
-    turboSupportsCorepackHome,
-    detectedLockfile
+    turboSupportsCorepackHome
   } = await scanParentDirs(destPath, true);
   const scriptName = getScriptName(
     packageJson,
@@ -870,8 +861,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
       nodeVersion: void 0,
       env: (0, import_clone_env.cloneEnv)(process.env, spawnOpts?.env),
       packageJsonEngines: packageJson?.engines,
-      turboSupportsCorepackHome,
-      detectedLockfile
+      turboSupportsCorepackHome
     })
   };
   if (cliType === "npm") {

package/dist/index.js

@@ -23240,6 +23240,7 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   if (bunLock && hasYarnLock) {
     cliType = "bun";
     lockfilePath = bunLockPath;
+    lockfileVersion = bunLockTextPath ? 1 : 0;
   } else if (hasYarnLock) {
     cliType = "yarn";
     lockfilePath = yarnLockPath;
@@ -23254,6 +23255,7 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   } else if (bunLock) {
     cliType = "bun";
     lockfilePath = bunLockPath;
+    lockfileVersion = bunLockTextPath ? 1 : 0;
   } else {
     cliType = detectPackageManagerNameWithoutLockfile(
       packageJsonPackageManager,
@@ -23268,8 +23270,7 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     lockfilePath,
     lockfileVersion,
     packageJsonPath,
-    turboSupportsCorepackHome,
-    detectedLockfile: lockfilePath ? import_path5.default.basename(lockfilePath) : void 0
+    turboSupportsCorepackHome
   };
 }
 async function checkTurboSupportsCorepack(turboVersionRange, rootDir) {
@@ -23395,8 +23396,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       packageJson,
       lockfileVersion,
       packageJsonPackageManager,
-      turboSupportsCorepackHome,
-      detectedLockfile
+      turboSupportsCorepackHome
     } = await scanParentDirs(destPath, true);
     if (!packageJsonPath) {
       debug(
@@ -23430,8 +23430,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       nodeVersion,
       env,
       packageJsonEngines: packageJson?.engines,
-      turboSupportsCorepackHome,
-      detectedLockfile
+      turboSupportsCorepackHome
     });
     let commandArgs;
     const isPotentiallyBrokenNpm = cliType === "npm" && (nodeVersion?.major === 16 || opts.env.PATH?.includes("/node16/bin-npm7")) && !args.includes("--legacy-peer-deps") && spawnOpts?.env?.ENABLE_EXPERIMENTAL_COREPACK !== "1";
@@ -23485,22 +23484,24 @@ function getEnvForPackageManager({
   nodeVersion,
   env,
   packageJsonEngines,
-  turboSupportsCorepackHome,
-  detectedLockfile
+  turboSupportsCorepackHome
 }) {
   const corepackEnabled = usingCorepack(
     env,
     packageJsonPackageManager,
     turboSupportsCorepackHome
   );
-  const { detectedPackageManager, path: newPath } = getPathOverrideForPackageManager({
+  const {
+    detectedLockfile,
+    detectedPackageManager,
+    path: newPath
+  } = getPathOverrideForPackageManager({
     cliType,
     lockfileVersion,
     corepackPackageManager: packageJsonPackageManager,
     nodeVersion,
     corepackEnabled,
-    packageJsonEngines,
-    detectedLockfile
+    packageJsonEngines
   });
   if (corepackEnabled) {
     debug(
@@ -23584,14 +23585,9 @@ function getPathOverrideForPackageManager({
   lockfileVersion,
   corepackPackageManager,
   corepackEnabled = true,
-  packageJsonEngines,
-  detectedLockfile
+  packageJsonEngines
 }) {
-  const detectedPackageManger = detectPackageManager(
-    cliType,
-    lockfileVersion,
-    detectedLockfile
-  );
+  const detectedPackageManger = detectPackageManager(cliType, lockfileVersion);
   if (!corepackPackageManager || !corepackEnabled) {
     if (cliType === "pnpm" && packageJsonEngines?.pnpm) {
       checkEnginesPnpmAgainstDetected(
@@ -23682,7 +23678,7 @@ function validateVersionSpecifier(version) {
     packageVersion
   };
 }
-function detectPackageManager(cliType, lockfileVersion, detectedLockfile) {
+function detectPackageManager(cliType, lockfileVersion) {
   switch (cliType) {
     case "npm":
       return void 0;
@@ -23691,21 +23687,21 @@ function detectPackageManager(cliType, lockfileVersion, detectedLockfile) {
         case "pnpm 7":
           return {
             path: "/pnpm7/node_modules/.bin",
-            detectedLockfile,
+            detectedLockfile: "pnpm-lock.yaml",
             detectedPackageManager: "pnpm@7.x",
             pnpmVersionRange: "7.x"
           };
         case "pnpm 8":
           return {
             path: "/pnpm8/node_modules/.bin",
-            detectedLockfile,
+            detectedLockfile: "pnpm-lock.yaml",
             detectedPackageManager: "pnpm@8.x",
             pnpmVersionRange: "8.x"
           };
         case "pnpm 9":
           return {
             path: "/pnpm9/node_modules/.bin",
-            detectedLockfile,
+            detectedLockfile: "pnpm-lock.yaml",
             detectedPackageManager: "pnpm@9.x",
             pnpmVersionRange: "9.x"
           };
@@ -23713,7 +23709,7 @@ function detectPackageManager(cliType, lockfileVersion, detectedLockfile) {
           return {
             // undefined because pnpm@6 is the current default in the build container
             path: void 0,
-            detectedLockfile,
+            detectedLockfile: "pnpm-lock.yaml",
             detectedPackageManager: "pnpm@6.x",
             pnpmVersionRange: "6.x"
           };
@@ -23723,13 +23719,13 @@ function detectPackageManager(cliType, lockfileVersion, detectedLockfile) {
     case "bun":
       return {
         path: "/bun1",
-        detectedLockfile,
+        detectedLockfile: lockfileVersion === 0 ? "bun.lockb" : "bun.lock",
         detectedPackageManager: "bun@1.x"
       };
     case "yarn":
       return {
         path: void 0,
-        detectedLockfile,
+        detectedLockfile: "yarn.lock",
         detectedPackageManager: "yarn"
       };
   }
@@ -23738,16 +23734,14 @@ function getPathForPackageManager({
   cliType,
   lockfileVersion,
   nodeVersion,
-  env,
-  detectedLockfile
+  env
 }) {
   const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === "1";
   let overrides = getPathOverrideForPackageManager({
     cliType,
     lockfileVersion,
     corepackPackageManager: void 0,
-    nodeVersion,
-    detectedLockfile
+    nodeVersion
   });
   if (corepackEnabled) {
     overrides = NO_OVERRIDE;
@@ -23782,8 +23776,7 @@ async function runCustomInstallCommand({
     lockfileVersion,
     packageJson,
     packageJsonPackageManager,
-    turboSupportsCorepackHome,
-    detectedLockfile
+    turboSupportsCorepackHome
   } = await scanParentDirs(destPath, true);
   const env = getEnvForPackageManager({
     cliType,
@@ -23792,8 +23785,7 @@ async function runCustomInstallCommand({
     nodeVersion,
     env: spawnOpts?.env || {},
     packageJsonEngines: packageJson?.engines,
-    turboSupportsCorepackHome,
-    detectedLockfile
+    turboSupportsCorepackHome
   });
   debug(`Running with $PATH:`, env?.PATH || "");
   await execCommand(installCommand, {
@@ -23809,8 +23801,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
     cliType,
     lockfileVersion,
     packageJsonPackageManager,
-    turboSupportsCorepackHome,
-    detectedLockfile
+    turboSupportsCorepackHome
   } = await scanParentDirs(destPath, true);
   const scriptName = getScriptName(
     packageJson,
@@ -23830,8 +23821,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
       nodeVersion: void 0,
       env: cloneEnv(process.env, spawnOpts?.env),
       packageJsonEngines: packageJson?.engines,
-      turboSupportsCorepackHome,
-      detectedLockfile
+      turboSupportsCorepackHome
     })
   };
   if (cliType === "npm") {

package/package.json

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