@vercel/build-utils 8.7.0 → 9.0.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @vercel/build-utils
 
+## 9.0.0
+
+### Major Changes
+
+- Change getPathOverrideForPackageManager() to use detectedLockfile argument ([#12813](https://github.com/vercel/vercel/pull/12813))
+
+### Patch Changes
+
+- Refactor build-util usage to reuse detected lockfile ([#12813](https://github.com/vercel/vercel/pull/12813))
+
+- add support for `images.qualities` ([#12813](https://github.com/vercel/vercel/pull/12813))
+
+## 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.d.ts

@@ -37,6 +37,11 @@ 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 {
     /**
@@ -97,7 +102,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, }: {
+export declare function getEnvForPackageManager({ cliType, lockfileVersion, packageJsonPackageManager, nodeVersion, env, packageJsonEngines, turboSupportsCorepackHome, detectedLockfile, }: {
     cliType: CliType;
     lockfileVersion: number | undefined;
     packageJsonPackageManager?: string | undefined;
@@ -107,6 +112,7 @@ export declare function getEnvForPackageManager({ cliType, lockfileVersion, pack
     };
     packageJsonEngines?: PackageJson.Engines;
     turboSupportsCorepackHome?: boolean | undefined;
+    detectedLockfile: string | undefined;
 }): {
     [x: string]: string | undefined;
 };
@@ -114,13 +120,14 @@ 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, }: {
+export declare function getPathOverrideForPackageManager({ cliType, lockfileVersion, corepackPackageManager, corepackEnabled, packageJsonEngines, detectedLockfile, }: {
     cliType: CliType;
     lockfileVersion: number | undefined;
     corepackPackageManager: string | undefined;
     nodeVersion: NodeVersion | undefined;
     corepackEnabled?: boolean;
     packageJsonEngines?: PackageJson.Engines;
+    detectedLockfile?: string;
 }): {
     /**
      * Which lockfile was detected.
@@ -136,24 +143,24 @@ export declare function getPathOverrideForPackageManager({ cliType, lockfileVers
      */
     path: string | undefined;
 };
-export declare function detectPackageManager(cliType: CliType, lockfileVersion: number | undefined): {
+export declare function detectPackageManager(cliType: CliType, lockfileVersion: number | undefined, detectedLockfile: string | undefined): {
     path: string;
-    detectedLockfile: string;
+    detectedLockfile: string | undefined;
     detectedPackageManager: string;
     pnpmVersionRange: string;
 } | {
     path: undefined;
-    detectedLockfile: string;
+    detectedLockfile: string | undefined;
     detectedPackageManager: string;
     pnpmVersionRange: string;
 } | {
     path: string;
-    detectedLockfile: string;
+    detectedLockfile: string | undefined;
     detectedPackageManager: string;
     pnpmVersionRange?: undefined;
 } | {
     path: undefined;
-    detectedLockfile: string;
+    detectedLockfile: string | undefined;
     detectedPackageManager: string;
     pnpmVersionRange?: undefined;
 } | undefined;
@@ -162,13 +169,14 @@ 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, }: {
+export declare function getPathForPackageManager({ cliType, lockfileVersion, nodeVersion, env, detectedLockfile, }: {
     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

@@ -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,9 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     turboVersionRange,
     rootProjectInfo?.rootDir
   ) : void 0;
-  if (bunLockBin && hasYarnLock) {
+  if (bunLock && hasYarnLock) {
     cliType = "bun";
     lockfilePath = bunLockPath;
-    lockfileVersion = 0;
   } else if (hasYarnLock) {
     cliType = "yarn";
     lockfilePath = yarnLockPath;
@@ -284,10 +291,9 @@ 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;
   } else {
     cliType = detectPackageManagerNameWithoutLockfile(
       packageJsonPackageManager,
@@ -302,7 +308,8 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     lockfilePath,
     lockfileVersion,
     packageJsonPath,
-    turboSupportsCorepackHome
+    turboSupportsCorepackHome,
+    detectedLockfile: lockfilePath ? import_path.default.basename(lockfilePath) : void 0
   };
 }
 async function checkTurboSupportsCorepack(turboVersionRange, rootDir) {
@@ -428,7 +435,8 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       packageJson,
       lockfileVersion,
       packageJsonPackageManager,
-      turboSupportsCorepackHome
+      turboSupportsCorepackHome,
+      detectedLockfile
     } = await scanParentDirs(destPath, true);
     if (!packageJsonPath) {
       (0, import_debug.default)(
@@ -462,7 +470,8 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       nodeVersion,
       env,
       packageJsonEngines: packageJson?.engines,
-      turboSupportsCorepackHome
+      turboSupportsCorepackHome,
+      detectedLockfile
     });
     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";
@@ -516,24 +525,22 @@ function getEnvForPackageManager({
   nodeVersion,
   env,
   packageJsonEngines,
-  turboSupportsCorepackHome
+  turboSupportsCorepackHome,
+  detectedLockfile
 }) {
   const corepackEnabled = usingCorepack(
     env,
     packageJsonPackageManager,
     turboSupportsCorepackHome
   );
-  const {
-    detectedLockfile,
-    detectedPackageManager,
-    path: newPath
-  } = getPathOverrideForPackageManager({
+  const { detectedPackageManager, path: newPath } = getPathOverrideForPackageManager({
     cliType,
     lockfileVersion,
     corepackPackageManager: packageJsonPackageManager,
     nodeVersion,
     corepackEnabled,
-    packageJsonEngines
+    packageJsonEngines,
+    detectedLockfile
   });
   if (corepackEnabled) {
     (0, import_debug.default)(
@@ -617,9 +624,14 @@ function getPathOverrideForPackageManager({
   lockfileVersion,
   corepackPackageManager,
   corepackEnabled = true,
-  packageJsonEngines
+  packageJsonEngines,
+  detectedLockfile
 }) {
-  const detectedPackageManger = detectPackageManager(cliType, lockfileVersion);
+  const detectedPackageManger = detectPackageManager(
+    cliType,
+    lockfileVersion,
+    detectedLockfile
+  );
   if (!corepackPackageManager || !corepackEnabled) {
     if (cliType === "pnpm" && packageJsonEngines?.pnpm) {
       checkEnginesPnpmAgainstDetected(
@@ -710,7 +722,7 @@ function validateVersionSpecifier(version) {
     packageVersion
   };
 }
-function detectPackageManager(cliType, lockfileVersion) {
+function detectPackageManager(cliType, lockfileVersion, detectedLockfile) {
   switch (cliType) {
     case "npm":
       return void 0;
@@ -719,21 +731,21 @@ function detectPackageManager(cliType, lockfileVersion) {
         case "pnpm 7":
           return {
             path: "/pnpm7/node_modules/.bin",
-            detectedLockfile: "pnpm-lock.yaml",
+            detectedLockfile,
             detectedPackageManager: "pnpm@7.x",
             pnpmVersionRange: "7.x"
           };
         case "pnpm 8":
           return {
             path: "/pnpm8/node_modules/.bin",
-            detectedLockfile: "pnpm-lock.yaml",
+            detectedLockfile,
             detectedPackageManager: "pnpm@8.x",
             pnpmVersionRange: "8.x"
           };
         case "pnpm 9":
           return {
             path: "/pnpm9/node_modules/.bin",
-            detectedLockfile: "pnpm-lock.yaml",
+            detectedLockfile,
             detectedPackageManager: "pnpm@9.x",
             pnpmVersionRange: "9.x"
           };
@@ -741,7 +753,7 @@ function detectPackageManager(cliType, lockfileVersion) {
           return {
             // undefined because pnpm@6 is the current default in the build container
             path: void 0,
-            detectedLockfile: "pnpm-lock.yaml",
+            detectedLockfile,
             detectedPackageManager: "pnpm@6.x",
             pnpmVersionRange: "6.x"
           };
@@ -751,13 +763,13 @@ function detectPackageManager(cliType, lockfileVersion) {
     case "bun":
       return {
         path: "/bun1",
-        detectedLockfile: "bun.lockb",
+        detectedLockfile,
         detectedPackageManager: "bun@1.x"
       };
     case "yarn":
       return {
         path: void 0,
-        detectedLockfile: "yarn.lock",
+        detectedLockfile,
         detectedPackageManager: "yarn"
       };
   }
@@ -766,14 +778,16 @@ function getPathForPackageManager({
   cliType,
   lockfileVersion,
   nodeVersion,
-  env
+  env,
+  detectedLockfile
 }) {
   const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === "1";
   let overrides = getPathOverrideForPackageManager({
     cliType,
     lockfileVersion,
     corepackPackageManager: void 0,
-    nodeVersion
+    nodeVersion,
+    detectedLockfile
   });
   if (corepackEnabled) {
     overrides = NO_OVERRIDE;
@@ -808,7 +822,8 @@ async function runCustomInstallCommand({
     lockfileVersion,
     packageJson,
     packageJsonPackageManager,
-    turboSupportsCorepackHome
+    turboSupportsCorepackHome,
+    detectedLockfile
   } = await scanParentDirs(destPath, true);
   const env = getEnvForPackageManager({
     cliType,
@@ -817,7 +832,8 @@ async function runCustomInstallCommand({
     nodeVersion,
     env: spawnOpts?.env || {},
     packageJsonEngines: packageJson?.engines,
-    turboSupportsCorepackHome
+    turboSupportsCorepackHome,
+    detectedLockfile
   });
   (0, import_debug.default)(`Running with $PATH:`, env?.PATH || "");
   await execCommand(installCommand, {
@@ -833,7 +849,8 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
     cliType,
     lockfileVersion,
     packageJsonPackageManager,
-    turboSupportsCorepackHome
+    turboSupportsCorepackHome,
+    detectedLockfile
   } = await scanParentDirs(destPath, true);
   const scriptName = getScriptName(
     packageJson,
@@ -853,7 +870,8 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
       nodeVersion: void 0,
       env: (0, import_clone_env.cloneEnv)(process.env, spawnOpts?.env),
       packageJsonEngines: packageJson?.engines,
-      turboSupportsCorepackHome
+      turboSupportsCorepackHome,
+      detectedLockfile
     })
   };
   if (cliType === "npm") {