@vercel/build-utils 9.3.0 → 10.0.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @vercel/build-utils
 
+## 10.0.0
+
+### Major Changes
+
+- Detect v9 pnpm lockfiles as pnpm 10 generated ([#12852](https://github.com/vercel/vercel/pull/12852))
+
+## 9.3.1
+
+### Patch Changes
+
+- [build-utils] extract install command specific logic into helper ([#13049](https://github.com/vercel/vercel/pull/13049))
+
+- [build-utils] remove dead node 16 check ([#13047](https://github.com/vercel/vercel/pull/13047))
+
 ## 9.3.0
 
 ### Minor Changes

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

@@ -423,6 +423,45 @@ async function walkParentDirsMulti({
 function isSet(v) {
   return v?.constructor?.name === "Set";
 }
+async function runInstallCommand({
+  packageManager,
+  args,
+  opts
+}) {
+  const getInstallCommandForPackageManager = (packageManager2, args2) => {
+    switch (packageManager2) {
+      case "npm":
+        return {
+          prettyCommand: "npm install",
+          commandArguments: args2.filter((a) => a !== "--prefer-offline").concat(["install", "--no-audit", "--unsafe-perm"])
+        };
+      case "pnpm":
+        return {
+          prettyCommand: "pnpm install",
+          // PNPM's install command is similar to NPM's but without the audit nonsense
+          // @see options https://pnpm.io/cli/install
+          commandArguments: args2.filter((a) => a !== "--prefer-offline").concat(["install", "--unsafe-perm"])
+        };
+      case "bun":
+        return {
+          prettyCommand: "bun install",
+          // @see options https://bun.sh/docs/cli/install
+          commandArguments: ["install", ...args2]
+        };
+      case "yarn":
+        return {
+          prettyCommand: "yarn install",
+          commandArguments: ["install", ...args2]
+        };
+    }
+  };
+  const { commandArguments, prettyCommand } = getInstallCommandForPackageManager(packageManager, args);
+  opts.prettyCommand = prettyCommand;
+  if (process.env.NPM_ONLY_PRODUCTION) {
+    commandArguments.push("--production");
+  }
+  await spawnAsync(packageManager, commandArguments, opts);
+}
 async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion) {
   if (meta?.isDev) {
     (0, import_debug.default)("Skipping dependency installation because dev mode is enabled");
@@ -473,45 +512,11 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       packageJsonEngines: packageJson?.engines,
       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";
-    if (cliType === "npm") {
-      opts.prettyCommand = "npm install";
-      commandArgs = args.filter((a) => a !== "--prefer-offline").concat(["install", "--no-audit", "--unsafe-perm"]);
-      if (isPotentiallyBrokenNpm && spawnOpts?.env?.VERCEL_NPM_LEGACY_PEER_DEPS === "1") {
-        commandArgs.push("--legacy-peer-deps");
-      }
-    } else if (cliType === "pnpm") {
-      opts.prettyCommand = "pnpm install";
-      commandArgs = args.filter((a) => a !== "--prefer-offline").concat(["install", "--unsafe-perm"]);
-    } else if (cliType === "bun") {
-      opts.prettyCommand = "bun install";
-      commandArgs = ["install", ...args];
-    } else {
-      opts.prettyCommand = "yarn install";
-      commandArgs = ["install", ...args];
-    }
-    if (process.env.NPM_ONLY_PRODUCTION) {
-      commandArgs.push("--production");
-    }
-    try {
-      await spawnAsync(cliType, commandArgs, opts);
-    } catch (err) {
-      const potentialErrorPath = import_path.default.join(
-        process.env.HOME || "/",
-        ".npm",
-        "eresolve-report.txt"
-      );
-      if (isPotentiallyBrokenNpm && !commandArgs.includes("--legacy-peer-deps") && import_fs_extra.default.existsSync(potentialErrorPath)) {
-        console.warn(
-          'Warning: Retrying "Install Command" with `--legacy-peer-deps` which may accept a potentially broken dependency and slow install time.'
-        );
-        commandArgs.push("--legacy-peer-deps");
-        await spawnAsync(cliType, commandArgs, opts);
-      } else {
-        throw err;
-      }
-    }
+    await runInstallCommand({
+      packageManager: cliType,
+      args,
+      opts
+    });
     (0, import_debug.default)(`Install complete [${Date.now() - installTime}ms]`);
     return true;
   } finally {
@@ -590,8 +595,10 @@ function detectPnpmVersion(lockfileVersion) {
       return "pnpm 7";
     case (lockfileVersion === 6 || lockfileVersion === 6.1):
       return "pnpm 8";
-    case (lockfileVersion === 7 || lockfileVersion === 9):
+    case lockfileVersion === 7:
       return "pnpm 9";
+    case lockfileVersion === 9:
+      return "pnpm 10";
     default:
       return "not found";
   }
@@ -605,6 +612,8 @@ function validLockfileForPackageManager(cliType, lockfileVersion, packageManager
       return true;
     case "pnpm":
       switch (packageManagerMajorVersion) {
+        case 10:
+          return lockfileVersion === 9;
         case 9:
           if ("9.0.0" === packageManagerVersion.version && lockfileVersion === 6) {
             return false;
@@ -746,6 +755,13 @@ function detectPackageManager(cliType, lockfileVersion) {
             detectedPackageManager: "pnpm@9.x",
             pnpmVersionRange: "9.x"
           };
+        case "pnpm 10":
+          return {
+            path: "/pnpm10/node_modules/.bin",
+            detectedLockfile: "pnpm-lock.yaml",
+            detectedPackageManager: "pnpm@10.x",
+            pnpmVersionRange: "10.x"
+          };
         case "pnpm 6":
           return {
             // undefined because pnpm@6 is the current default in the build container

package/dist/index.js

@@ -23436,6 +23436,45 @@ async function walkParentDirsMulti({
 function isSet(v) {
   return v?.constructor?.name === "Set";
 }
+async function runInstallCommand({
+  packageManager,
+  args,
+  opts
+}) {
+  const getInstallCommandForPackageManager = (packageManager2, args2) => {
+    switch (packageManager2) {
+      case "npm":
+        return {
+          prettyCommand: "npm install",
+          commandArguments: args2.filter((a) => a !== "--prefer-offline").concat(["install", "--no-audit", "--unsafe-perm"])
+        };
+      case "pnpm":
+        return {
+          prettyCommand: "pnpm install",
+          // PNPM's install command is similar to NPM's but without the audit nonsense
+          // @see options https://pnpm.io/cli/install
+          commandArguments: args2.filter((a) => a !== "--prefer-offline").concat(["install", "--unsafe-perm"])
+        };
+      case "bun":
+        return {
+          prettyCommand: "bun install",
+          // @see options https://bun.sh/docs/cli/install
+          commandArguments: ["install", ...args2]
+        };
+      case "yarn":
+        return {
+          prettyCommand: "yarn install",
+          commandArguments: ["install", ...args2]
+        };
+    }
+  };
+  const { commandArguments, prettyCommand } = getInstallCommandForPackageManager(packageManager, args);
+  opts.prettyCommand = prettyCommand;
+  if (process.env.NPM_ONLY_PRODUCTION) {
+    commandArguments.push("--production");
+  }
+  await spawnAsync(packageManager, commandArguments, opts);
+}
 async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion) {
   if (meta?.isDev) {
     debug("Skipping dependency installation because dev mode is enabled");
@@ -23486,45 +23525,11 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       packageJsonEngines: packageJson?.engines,
       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";
-    if (cliType === "npm") {
-      opts.prettyCommand = "npm install";
-      commandArgs = args.filter((a) => a !== "--prefer-offline").concat(["install", "--no-audit", "--unsafe-perm"]);
-      if (isPotentiallyBrokenNpm && spawnOpts?.env?.VERCEL_NPM_LEGACY_PEER_DEPS === "1") {
-        commandArgs.push("--legacy-peer-deps");
-      }
-    } else if (cliType === "pnpm") {
-      opts.prettyCommand = "pnpm install";
-      commandArgs = args.filter((a) => a !== "--prefer-offline").concat(["install", "--unsafe-perm"]);
-    } else if (cliType === "bun") {
-      opts.prettyCommand = "bun install";
-      commandArgs = ["install", ...args];
-    } else {
-      opts.prettyCommand = "yarn install";
-      commandArgs = ["install", ...args];
-    }
-    if (process.env.NPM_ONLY_PRODUCTION) {
-      commandArgs.push("--production");
-    }
-    try {
-      await spawnAsync(cliType, commandArgs, opts);
-    } catch (err) {
-      const potentialErrorPath = import_path5.default.join(
-        process.env.HOME || "/",
-        ".npm",
-        "eresolve-report.txt"
-      );
-      if (isPotentiallyBrokenNpm && !commandArgs.includes("--legacy-peer-deps") && import_fs_extra7.default.existsSync(potentialErrorPath)) {
-        console.warn(
-          'Warning: Retrying "Install Command" with `--legacy-peer-deps` which may accept a potentially broken dependency and slow install time.'
-        );
-        commandArgs.push("--legacy-peer-deps");
-        await spawnAsync(cliType, commandArgs, opts);
-      } else {
-        throw err;
-      }
-    }
+    await runInstallCommand({
+      packageManager: cliType,
+      args,
+      opts
+    });
     debug(`Install complete [${Date.now() - installTime}ms]`);
     return true;
   } finally {
@@ -23603,8 +23608,10 @@ function detectPnpmVersion(lockfileVersion) {
       return "pnpm 7";
     case (lockfileVersion === 6 || lockfileVersion === 6.1):
       return "pnpm 8";
-    case (lockfileVersion === 7 || lockfileVersion === 9):
+    case lockfileVersion === 7:
       return "pnpm 9";
+    case lockfileVersion === 9:
+      return "pnpm 10";
     default:
       return "not found";
   }
@@ -23618,6 +23625,8 @@ function validLockfileForPackageManager(cliType, lockfileVersion, packageManager
       return true;
     case "pnpm":
       switch (packageManagerMajorVersion) {
+        case 10:
+          return lockfileVersion === 9;
         case 9:
           if ("9.0.0" === packageManagerVersion.version && lockfileVersion === 6) {
             return false;
@@ -23759,6 +23768,13 @@ function detectPackageManager(cliType, lockfileVersion) {
             detectedPackageManager: "pnpm@9.x",
             pnpmVersionRange: "9.x"
           };
+        case "pnpm 10":
+          return {
+            path: "/pnpm10/node_modules/.bin",
+            detectedLockfile: "pnpm-lock.yaml",
+            detectedPackageManager: "pnpm@10.x",
+            pnpmVersionRange: "10.x"
+          };
         case "pnpm 6":
           return {
             // undefined because pnpm@6 is the current default in the build container

package/package.json

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