@vercel/build-utils 10.0.0 → 10.0.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @vercel/build-utils
 
+## 10.0.1
+
+### Patch Changes
+
+- [build-utils] Move `runNpmInstallSema` closer to where it's used ([#13061](https://github.com/vercel/vercel/pull/13061))
+
+- [build-utils] extract getInstallCommandForPackageManager to module scope ([#13058](https://github.com/vercel/vercel/pull/13058))
+
+- [build-utils] remove redundant sema release ([#13059](https://github.com/vercel/vercel/pull/13059))
+
+- Revert support pnpm 10 ([#13064](https://github.com/vercel/vercel/pull/13064))
+
 ## 10.0.0
 
 ### Major Changes

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

@@ -67,7 +67,6 @@ var import_node_version = require("./node-version");
 var import_read_config_file = require("./read-config-file");
 var import_clone_env = require("../clone-env");
 var import_json5 = __toESM(require("json5"));
-const runNpmInstallSema = new import_async_sema.default(1);
 const NO_OVERRIDE = {
   detectedLockfile: void 0,
   detectedPackageManager: void 0,
@@ -423,38 +422,38 @@ async function walkParentDirsMulti({
 function isSet(v) {
   return v?.constructor?.name === "Set";
 }
+function getInstallCommandForPackageManager(packageManager, args) {
+  switch (packageManager) {
+    case "npm":
+      return {
+        prettyCommand: "npm install",
+        commandArguments: args.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: args.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", ...args]
+      };
+    case "yarn":
+      return {
+        prettyCommand: "yarn install",
+        commandArguments: ["install", ...args]
+      };
+  }
+}
 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) {
@@ -462,6 +461,7 @@ async function runInstallCommand({
   }
   await spawnAsync(packageManager, commandArguments, opts);
 }
+const runNpmInstallSema = new import_async_sema.default(1);
 async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion) {
   if (meta?.isDev) {
     (0, import_debug.default)("Skipping dependency installation because dev mode is enabled");
@@ -482,7 +482,6 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       (0, import_debug.default)(
         `Skipping dependency installation because no package.json was found for ${destPath}`
       );
-      runNpmInstallSema.release();
       return false;
     }
     if (meta && packageJsonPath && args.length === 0) {
@@ -595,10 +594,8 @@ function detectPnpmVersion(lockfileVersion) {
       return "pnpm 7";
     case (lockfileVersion === 6 || lockfileVersion === 6.1):
       return "pnpm 8";
-    case lockfileVersion === 7:
+    case (lockfileVersion === 7 || lockfileVersion === 9):
       return "pnpm 9";
-    case lockfileVersion === 9:
-      return "pnpm 10";
     default:
       return "not found";
   }
@@ -612,8 +609,6 @@ 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;
@@ -755,13 +750,6 @@ 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

@@ -23080,7 +23080,6 @@ function cloneEnv(...envs) {
 
 // src/fs/run-user-scripts.ts
 var import_json5 = __toESM(require_lib5());
-var runNpmInstallSema = new import_async_sema4.default(1);
 var NO_OVERRIDE = {
   detectedLockfile: void 0,
   detectedPackageManager: void 0,
@@ -23436,38 +23435,38 @@ async function walkParentDirsMulti({
 function isSet(v) {
   return v?.constructor?.name === "Set";
 }
+function getInstallCommandForPackageManager(packageManager, args) {
+  switch (packageManager) {
+    case "npm":
+      return {
+        prettyCommand: "npm install",
+        commandArguments: args.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: args.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", ...args]
+      };
+    case "yarn":
+      return {
+        prettyCommand: "yarn install",
+        commandArguments: ["install", ...args]
+      };
+  }
+}
 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) {
@@ -23475,6 +23474,7 @@ async function runInstallCommand({
   }
   await spawnAsync(packageManager, commandArguments, opts);
 }
+var runNpmInstallSema = new import_async_sema4.default(1);
 async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion) {
   if (meta?.isDev) {
     debug("Skipping dependency installation because dev mode is enabled");
@@ -23495,7 +23495,6 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       debug(
         `Skipping dependency installation because no package.json was found for ${destPath}`
       );
-      runNpmInstallSema.release();
       return false;
     }
     if (meta && packageJsonPath && args.length === 0) {
@@ -23608,10 +23607,8 @@ function detectPnpmVersion(lockfileVersion) {
       return "pnpm 7";
     case (lockfileVersion === 6 || lockfileVersion === 6.1):
       return "pnpm 8";
-    case lockfileVersion === 7:
+    case (lockfileVersion === 7 || lockfileVersion === 9):
       return "pnpm 9";
-    case lockfileVersion === 9:
-      return "pnpm 10";
     default:
       return "not found";
   }
@@ -23625,8 +23622,6 @@ 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;
@@ -23768,13 +23763,6 @@ 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": "10.0.0",
+  "version": "10.0.1",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",