@vercel/build-utils 14.2.0 → 14.3.0

package/dist/index.js

@@ -2024,11 +2024,11 @@ var require_stream_readable = __commonJS({
 var require_stream_transform = __commonJS({
   "../../node_modules/.pnpm/readable-stream@2.3.8/node_modules/readable-stream/lib/_stream_transform.js"(exports, module2) {
     "use strict";
-    module2.exports = Transform;
+    module2.exports = Transform2;
     var Duplex = require_stream_duplex();
     var util = Object.create(require_util());
     util.inherits = require_inherits();
-    util.inherits(Transform, Duplex);
+    util.inherits(Transform2, Duplex);
     function afterTransform(er, data) {
       var ts = this._transformState;
       ts.transforming = false;
@@ -2047,9 +2047,9 @@ var require_stream_transform = __commonJS({
         this._read(rs.highWaterMark);
       }
     }
-    function Transform(options) {
-      if (!(this instanceof Transform))
-        return new Transform(options);
+    function Transform2(options) {
+      if (!(this instanceof Transform2))
+        return new Transform2(options);
       Duplex.call(this, options);
       this._transformState = {
         afterTransform: afterTransform.bind(this),
@@ -2079,14 +2079,14 @@ var require_stream_transform = __commonJS({
         done(this, null, null);
       }
     }
-    Transform.prototype.push = function(chunk, encoding) {
+    Transform2.prototype.push = function(chunk, encoding) {
       this._transformState.needTransform = false;
       return Duplex.prototype.push.call(this, chunk, encoding);
     };
-    Transform.prototype._transform = function(chunk, encoding, cb) {
+    Transform2.prototype._transform = function(chunk, encoding, cb) {
       throw new Error("_transform() is not implemented");
     };
-    Transform.prototype._write = function(chunk, encoding, cb) {
+    Transform2.prototype._write = function(chunk, encoding, cb) {
       var ts = this._transformState;
       ts.writecb = cb;
       ts.writechunk = chunk;
@@ -2097,7 +2097,7 @@ var require_stream_transform = __commonJS({
           this._read(rs.highWaterMark);
       }
     };
-    Transform.prototype._read = function(n) {
+    Transform2.prototype._read = function(n) {
       var ts = this._transformState;
       if (ts.writechunk !== null && ts.writecb && !ts.transforming) {
         ts.transforming = true;
@@ -2106,7 +2106,7 @@ var require_stream_transform = __commonJS({
         ts.needTransform = true;
       }
     };
-    Transform.prototype._destroy = function(err, cb) {
+    Transform2.prototype._destroy = function(err, cb) {
       var _this2 = this;
       Duplex.prototype._destroy.call(this, err, function(err2) {
         cb(err2);
@@ -2132,14 +2132,14 @@ var require_stream_passthrough = __commonJS({
   "../../node_modules/.pnpm/readable-stream@2.3.8/node_modules/readable-stream/lib/_stream_passthrough.js"(exports, module2) {
     "use strict";
     module2.exports = PassThrough;
-    var Transform = require_stream_transform();
+    var Transform2 = require_stream_transform();
     var util = Object.create(require_util());
     util.inherits = require_inherits();
-    util.inherits(PassThrough, Transform);
+    util.inherits(PassThrough, Transform2);
     function PassThrough(options) {
       if (!(this instanceof PassThrough))
         return new PassThrough(options);
-      Transform.call(this, options);
+      Transform2.call(this, options);
     }
     PassThrough.prototype._transform = function(chunk, encoding, cb) {
       cb(null, chunk);
@@ -6016,7 +6016,7 @@ var require_buffer_crc32 = __commonJS({
 var require_yazl = __commonJS({
   "../../node_modules/.pnpm/yazl@2.5.1/node_modules/yazl/index.js"(exports) {
     var fs11 = require("fs");
-    var Transform = require("stream").Transform;
+    var Transform2 = require("stream").Transform;
     var PassThrough = require("stream").PassThrough;
     var zlib = require("zlib");
     var util = require("util");
@@ -6540,18 +6540,18 @@ var require_yazl = __commonJS({
       buffer.writeUInt32LE(low, offset);
       buffer.writeUInt32LE(high, offset + 4);
     }
-    util.inherits(ByteCounter, Transform);
+    util.inherits(ByteCounter, Transform2);
     function ByteCounter(options) {
-      Transform.call(this, options);
+      Transform2.call(this, options);
       this.byteCount = 0;
     }
     ByteCounter.prototype._transform = function(chunk, encoding, cb) {
       this.byteCount += chunk.length;
       cb(null, chunk);
     };
-    util.inherits(Crc32Watcher, Transform);
+    util.inherits(Crc32Watcher, Transform2);
     function Crc32Watcher(options) {
-      Transform.call(this, options);
+      Transform2.call(this, options);
       this.crc32 = 0;
     }
     Crc32Watcher.prototype._transform = function(chunk, encoding, cb) {
@@ -34375,6 +34375,8 @@ __export(src_exports, {
   getInternalServiceCronPath: () => getInternalServiceCronPath,
   getInternalServiceCronPathPrefix: () => getInternalServiceCronPathPrefix,
   getInternalServiceFunctionPath: () => getInternalServiceFunctionPath,
+  getInternalServiceWorkerPath: () => getInternalServiceWorkerPath,
+  getInternalServiceWorkerPathPrefix: () => getInternalServiceWorkerPathPrefix,
   getLambdaByOutputPath: () => getLambdaByOutputPath,
   getLambdaEnvironment: () => getLambdaEnvironment,
   getLambdaOptionsFromFunction: () => getLambdaOptionsFromFunction,
@@ -35660,6 +35662,7 @@ var import_path6 = __toESM(require("path"));
 var import_async_sema4 = __toESM(require_async_sema());
 var import_cross_spawn = __toESM(require_cross_spawn());
 var import_semver2 = __toESM(require_semver2());
+var import_stream2 = require("stream");
 var import_util6 = require("util");
 
 // src/fs/node-version.ts
@@ -36953,7 +36956,8 @@ async function scanParentDirs(destPath, readPackageJson2 = false, base = "/") {
       bunLockBinPath,
       vltLockPath
     ],
-    packageJsonPackageManager
+    packageJsonPackageManager,
+    packageJsonDevEngines
   } = await walkParentDirsMulti({
     base,
     start: destPath,
@@ -37020,6 +37024,7 @@ async function scanParentDirs(destPath, readPackageJson2 = false, base = "/") {
     cliType,
     packageJson,
     packageJsonPackageManager,
+    packageJsonDevEngines,
     lockfilePath,
     lockfileVersion,
     packageJsonPath,
@@ -37135,6 +37140,7 @@ async function walkParentDirsMulti({
   filenames
 }) {
   let packageManager;
+  let devEngines;
   for (const dir of traverseUpDirectories({ start, base })) {
     const fullPaths = filenames.map((f) => import_path6.default.join(dir, f));
     const existResults = await Promise.all(
@@ -37146,14 +37152,22 @@ async function walkParentDirsMulti({
     if (packageJson?.packageManager) {
       packageManager = packageJson.packageManager;
     }
+    if (packageJson?.devEngines) {
+      devEngines = packageJson.devEngines;
+    }
     if (foundOneOrMore) {
       return {
         paths: fullPaths.map((f, i) => existResults[i] ? f : void 0),
-        packageJsonPackageManager: packageManager
+        packageJsonPackageManager: packageManager,
+        packageJsonDevEngines: devEngines
       };
     }
   }
-  return { paths: [], packageJsonPackageManager: packageManager };
+  return {
+    paths: [],
+    packageJsonPackageManager: packageManager,
+    packageJsonDevEngines: devEngines
+  };
 }
 function isSet(v) {
   return v?.constructor?.name === "Set";
@@ -37190,6 +37204,29 @@ function getInstallCommandForPackageManager(packageManager, args) {
       };
   }
 }
+function stripPnpmVersionFooter(line) {
+  return line.replace(/ using pnpm v\d+\.\d+\.\d+(?=\r?$)/, "");
+}
+function createPnpmOutputFilter(destination) {
+  let incompleteLine = "";
+  return new import_stream2.Transform({
+    transform(chunk, _encoding, callback) {
+      const lines = `${incompleteLine}${chunk.toString()}`.split("\n");
+      incompleteLine = lines.pop() ?? "";
+      for (const line of lines) {
+        destination.write(`${stripPnpmVersionFooter(line)}
+`);
+      }
+      callback();
+    },
+    flush(callback) {
+      if (incompleteLine) {
+        destination.write(stripPnpmVersionFooter(incompleteLine));
+      }
+      callback();
+    }
+  });
+}
 async function runInstallCommand({
   packageManager,
   args,
@@ -37201,8 +37238,9 @@ async function runInstallCommand({
   if (process.env.NPM_ONLY_PRODUCTION) {
     commandArguments.push("--production");
   }
-  opts.outputStream = output?.stdout;
-  opts.errorStream = output?.stderr;
+  const shouldFilterPnpmOutput = packageManager === "pnpm";
+  opts.outputStream = shouldFilterPnpmOutput ? createPnpmOutputFilter(output?.stdout ?? process.stdout) : output?.stdout;
+  opts.errorStream = shouldFilterPnpmOutput ? output?.stderr ?? process.stderr : output?.stderr;
   await spawnAsync(packageManager, commandArguments, opts);
 }
 function initializeSet(set) {
@@ -37246,6 +37284,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
       packageJson,
       lockfileVersion,
       packageJsonPackageManager,
+      packageJsonDevEngines,
       turboSupportsCorepackHome
     } = await scanParentDirs(destPath, true);
     if (!packageJsonPath) {
@@ -37284,12 +37323,6 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
       }
     }
     const installTime = Date.now();
-    if (output?.stdout) {
-      output.stdout.write("Installing dependencies...\n");
-    } else {
-      console.log("Installing dependencies...");
-    }
-    debug(`Installing to ${destPath}`);
     const opts = { cwd: destPath, ...spawnOpts };
     const env = cloneEnv(opts.env || process.env);
     delete env.NODE_ENV;
@@ -37297,11 +37330,26 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
       cliType,
       lockfileVersion,
       packageJsonPackageManager,
+      packageJsonDevEngines,
       env,
       packageJsonEngines: packageJson?.engines,
       turboSupportsCorepackHome,
       projectCreatedAt
     });
+    const packageManager = getPackageManagerDisplayName({
+      cliType,
+      lockfileVersion,
+      packageJsonPackageManager,
+      env: opts.env
+    });
+    const installMessage = `Installing dependencies with ${packageManager}`;
+    if (output?.stdout) {
+      output.stdout.write(`${installMessage}
+`);
+    } else {
+      console.log(installMessage);
+    }
+    debug(`Installing to ${destPath}`);
     const maySeeDynamicRequireYarnBug = process.env?.ENABLE_EXPERIMENTAL_COREPACK && packageJson?.packageManager?.startsWith("yarn") && packageJson?.type === "module";
     if (maySeeDynamicRequireYarnBug) {
       console.warn(
@@ -37320,10 +37368,42 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
     runNpmInstallSema.release();
   }
 }
+function getPackageManagerDisplayName({
+  cliType,
+  lockfileVersion,
+  packageJsonPackageManager,
+  env
+}) {
+  const versionResult = import_cross_spawn.default.sync(cliType, ["--version"], {
+    env,
+    encoding: "utf8"
+  });
+  const version = versionResult.status === 0 ? versionResult.stdout.trim() : "";
+  if (version) {
+    return `${cliType} ${version}`;
+  }
+  if (packageJsonPackageManager && env.ENABLE_EXPERIMENTAL_COREPACK) {
+    return packageJsonPackageManager.replace("@", " ");
+  }
+  if (cliType === "pnpm") {
+    const selectedPath = env.PATH?.split(import_path6.default.delimiter).find(
+      (segment) => /^\/pnpm\d+\/node_modules\/\.bin$/.test(segment)
+    );
+    const major = selectedPath?.match(/^\/pnpm(\d+)\//)?.[1];
+    if (major) {
+      return `pnpm ${major}`;
+    }
+  }
+  if (cliType === "yarn") {
+    return detectYarnVersion(lockfileVersion).replace("@", " ").replace(/\.x$/, "");
+  }
+  return cliType;
+}
 function getEnvForPackageManager({
   cliType,
   lockfileVersion,
   packageJsonPackageManager,
+  packageJsonDevEngines,
   nodeVersion,
   env,
   packageJsonEngines,
@@ -37343,6 +37423,7 @@ function getEnvForPackageManager({
     cliType,
     lockfileVersion,
     corepackPackageManager: packageJsonPackageManager,
+    packageJsonDevEngines,
     corepackEnabled,
     nodeVersion,
     packageJsonEngines,
@@ -37376,28 +37457,6 @@ function getEnvForPackageManager({
   if (pathsToPrepend.length > 0) {
     const oldPath = env.PATH + "";
     newEnv.PATH = `${pathsToPrepend.join(import_path6.default.delimiter)}${oldPath ? import_path6.default.delimiter : ""}${oldPath}`;
-    if (newPath && pathsToPrepend.includes(newPath) && detectedLockfile && detectedPackageManager) {
-      const detectedV9PnpmLockfile = detectedLockfile === "pnpm-lock.yaml" && lockfileVersion === 9;
-      const pnpm10UsingPackageJsonPackageManager = detectedPackageManager === "pnpm@10.x" && packageJsonPackageManager;
-      if (pnpm10UsingPackageJsonPackageManager) {
-        const versionString = cliType === "pnpm" ? `version ${lockfileVersion} ` : "";
-        console.log(
-          `Detected \`${detectedLockfile}\` ${versionString}generated by ${detectedPackageManager} with package.json#packageManager ${packageJsonPackageManager}`
-        );
-      } else if (detectedV9PnpmLockfile) {
-        const otherVersion = detectedPackageManager === "pnpm@10.x" ? `pnpm@9.x` : `pnpm@10.x`;
-        console.log(
-          `Detected \`${detectedLockfile}\` ${lockfileVersion} which may be generated by pnpm@9.x or pnpm@10.x
-Using ${detectedPackageManager} based on project creation date
-To use ${otherVersion}, manually opt in using corepack (https://vercel.com/docs/deployments/configure-a-build#corepack)`
-        );
-      } else {
-        const versionString = cliType === "pnpm" ? `version ${lockfileVersion} ` : "";
-        console.log(
-          `Detected \`${detectedLockfile}\` ${versionString}generated by ${detectedPackageManager}`
-        );
-      }
-    }
   }
   if (cliType === "yarn" && !env.YARN_NODE_LINKER) {
     newEnv.YARN_NODE_LINKER = "node-modules";
@@ -37405,7 +37464,29 @@ To use ${otherVersion}, manually opt in using corepack (https://vercel.com/docs/
   return newEnv;
 }
 var PNPM_10_PREFERRED_AT = /* @__PURE__ */ new Date("2025-02-27T20:00:00Z");
-function detectPnpmVersion(lockfileVersion, projectCreatedAt) {
+var PNPM_11_PREFERRED_AT = /* @__PURE__ */ new Date("2026-08-19T20:00:00Z");
+var INSTALLED_PNPM_MAJORS = [11, 10, 9, 8, 7, 6];
+function pnpmPathOverride(major) {
+  return {
+    path: `/pnpm${major}/node_modules/.bin`,
+    detectedLockfile: "pnpm-lock.yaml",
+    detectedPackageManager: `pnpm@${major}.x`,
+    pnpmVersionRange: `${major}.x`
+  };
+}
+function isPnpmMajorAvailable(major) {
+  if (major <= 10) {
+    return true;
+  }
+  return import_fs_extra7.default.existsSync(`/pnpm${major}`);
+}
+function nodeSupportsPnpm11Default(nodeVersion) {
+  if (!nodeVersion || isBunVersion(nodeVersion)) {
+    return true;
+  }
+  return nodeVersion.major >= 22;
+}
+function detectPnpmVersion(lockfileVersion, projectCreatedAt, nodeVersion) {
   switch (true) {
     case lockfileVersion === void 0:
       return "not found";
@@ -37418,8 +37499,13 @@ function detectPnpmVersion(lockfileVersion, projectCreatedAt) {
     case lockfileVersion === 7:
       return "pnpm 9";
     case lockfileVersion === 9: {
-      const projectPrefersPnpm10 = projectCreatedAt && projectCreatedAt >= PNPM_10_PREFERRED_AT.getTime();
-      return projectPrefersPnpm10 ? "pnpm 10" : "pnpm 9";
+      if (projectCreatedAt && projectCreatedAt >= PNPM_11_PREFERRED_AT.getTime() && nodeSupportsPnpm11Default(nodeVersion) && isPnpmMajorAvailable(11)) {
+        return "pnpm 11";
+      }
+      if (projectCreatedAt && projectCreatedAt >= PNPM_10_PREFERRED_AT.getTime()) {
+        return "pnpm 10";
+      }
+      return "pnpm 9";
     }
     default:
       return "not found";
@@ -37449,6 +37535,7 @@ function validLockfileForPackageManager(cliType, lockfileVersion, packageManager
       return true;
     case "pnpm":
       switch (packageManagerMajorVersion) {
+        case 11:
         case 10:
           return lockfileVersion === 9;
         case 9:
@@ -37467,10 +37554,75 @@ function validLockfileForPackageManager(cliType, lockfileVersion, packageManager
       }
   }
 }
+function lockfileCompatibleWithPnpm(lockfileVersion, packageManagerVersion) {
+  if (lockfileVersion === void 0) {
+    return true;
+  }
+  return validLockfileForPackageManager(
+    "pnpm",
+    lockfileVersion,
+    packageManagerVersion
+  );
+}
+function highestInstalledPnpmMajor(versionRange, lockfileVersion) {
+  if (!(0, import_semver2.validRange)(versionRange)) {
+    return void 0;
+  }
+  for (const major of INSTALLED_PNPM_MAJORS) {
+    if (!isPnpmMajorAvailable(major)) {
+      continue;
+    }
+    if (!(0, import_semver2.intersects)(`${major}.x`, versionRange)) {
+      continue;
+    }
+    const versionForLockfile = (0, import_semver2.parse)(major === 9 ? "9.0.1" : `${major}.0.0`);
+    if (!versionForLockfile || !lockfileCompatibleWithPnpm(lockfileVersion, versionForLockfile)) {
+      continue;
+    }
+    return major;
+  }
+  return void 0;
+}
+function resolveDevEnginesPnpmRange(devEngines) {
+  if (!devEngines?.packageManager) {
+    return void 0;
+  }
+  const entries = Array.isArray(devEngines.packageManager) ? devEngines.packageManager : [devEngines.packageManager];
+  const pnpm = entries.find((entry) => entry.name === "pnpm" && entry.version);
+  return pnpm?.version;
+}
+function resolveCompatiblePnpmPin({
+  cliType,
+  lockfileVersion,
+  packageJsonDevEngines,
+  corepackPackageManager
+}) {
+  if (cliType !== "pnpm") {
+    return void 0;
+  }
+  const devEnginesRange = resolveDevEnginesPnpmRange(packageJsonDevEngines);
+  if (devEnginesRange) {
+    const major = highestInstalledPnpmMajor(devEnginesRange, lockfileVersion);
+    if (major !== void 0) {
+      return { override: pnpmPathOverride(major), source: "devEngines" };
+    }
+  }
+  const parsed = validateVersionSpecifier(corepackPackageManager);
+  if (parsed?.packageName === "pnpm") {
+    if (lockfileCompatibleWithPnpm(lockfileVersion, parsed.packageVersion) && isPnpmMajorAvailable(parsed.packageVersion.major)) {
+      return {
+        override: pnpmPathOverride(parsed.packageVersion.major),
+        source: "packageManager"
+      };
+    }
+  }
+  return void 0;
+}
 function getPathOverrideForPackageManager({
   cliType,
   lockfileVersion,
   corepackPackageManager,
+  packageJsonDevEngines,
   corepackEnabled = true,
   nodeVersion,
   packageJsonEngines,
@@ -37479,7 +37631,8 @@ function getPathOverrideForPackageManager({
   const detectedPackageManger = detectPackageManager(
     cliType,
     lockfileVersion,
-    projectCreatedAt
+    projectCreatedAt,
+    nodeVersion
   );
   const usingCorepack2 = corepackPackageManager && corepackEnabled;
   if (usingCorepack2) {
@@ -37491,14 +37644,20 @@ function getPathOverrideForPackageManager({
     );
     return NO_OVERRIDE;
   }
+  const pin = resolveCompatiblePnpmPin({
+    cliType,
+    lockfileVersion,
+    packageJsonDevEngines,
+    corepackPackageManager
+  });
+  let selected = pin?.override ?? detectedPackageManger;
   if (cliType === "pnpm" && packageJsonEngines?.pnpm) {
-    const usingDetected = detectedPackageManger?.pnpmVersionRange !== "10.x" || !corepackPackageManager;
-    if (usingDetected) {
-      checkEnginesPnpmAgainstDetected(
-        packageJsonEngines.pnpm,
-        detectedPackageManger
-      );
-    }
+    selected = applyEnginesPnpm({
+      enginesPnpm: packageJsonEngines.pnpm,
+      selected,
+      usedPin: Boolean(pin),
+      lockfileVersion
+    });
   }
   if (cliType === "bun" && detectedPackageManger && nodeVersion && isBunVersion(nodeVersion)) {
     const minor = nodeVersion.minor;
@@ -37508,20 +37667,53 @@ function getPathOverrideForPackageManager({
       detectedPackageManager: `bun@${nodeVersion.range}`
     };
   }
-  return detectedPackageManger ?? NO_OVERRIDE;
+  return selected ?? NO_OVERRIDE;
 }
-function checkEnginesPnpmAgainstDetected(enginesPnpm, detectedPackageManger) {
-  if (detectedPackageManger?.pnpmVersionRange && (0, import_semver2.validRange)(detectedPackageManger.pnpmVersionRange) && (0, import_semver2.validRange)(enginesPnpm)) {
-    if (!(0, import_semver2.intersects)(detectedPackageManger.pnpmVersionRange, enginesPnpm)) {
-      throw new Error(
-        `Detected pnpm "${detectedPackageManger.pnpmVersionRange}" is not compatible with the engines.pnpm "${enginesPnpm}" in your package.json. Either enable corepack with a valid package.json#packageManager value (https://vercel.com/docs/deployments/configure-a-build#corepack) or remove your package.json#engines.pnpm.`
-      );
+function applyEnginesPnpm({
+  enginesPnpm,
+  selected,
+  usedPin,
+  lockfileVersion
+}) {
+  const selectedRange = selected && "pnpmVersionRange" in selected ? selected.pnpmVersionRange : void 0;
+  if (selectedRange && (0, import_semver2.validRange)(selectedRange) && (0, import_semver2.validRange)(enginesPnpm)) {
+    if ((0, import_semver2.intersects)(selectedRange, enginesPnpm)) {
+      if (!usedPin) {
+        warnEnginesPnpmWithoutPin();
+      }
+      return selected;
+    }
+    if (!usedPin) {
+      const major = highestInstalledPnpmMajor(enginesPnpm, lockfileVersion);
+      if (major !== void 0) {
+        return pnpmPathOverride(major);
+      }
+      if (shouldDeferPnpm11UntilImageHasBinary(enginesPnpm, lockfileVersion)) {
+        warnEnginesPnpmWithoutPin();
+        return selected;
+      }
     }
+    throw new Error(
+      `Detected pnpm "${selectedRange}" is not compatible with the engines.pnpm "${enginesPnpm}" in your package.json. Set package.json#packageManager or package.json#devEngines.packageManager to a compatible pnpm version, or remove package.json#engines.pnpm.`
+    );
   }
+  if (!usedPin) {
+    warnEnginesPnpmWithoutPin();
+  }
+  return selected;
+}
+function warnEnginesPnpmWithoutPin() {
   console.warn(
     `Using package.json#engines.pnpm without corepack and package.json#packageManager could lead to failed builds with ERR_PNPM_UNSUPPORTED_ENGINE. Learn more: https://vercel.com/docs/errors/error-list#pnpm-engine-unsupported`
   );
 }
+function shouldDeferPnpm11UntilImageHasBinary(enginesPnpm, lockfileVersion) {
+  if (isPnpmMajorAvailable(11) || !(0, import_semver2.intersects)("11.x", enginesPnpm)) {
+    return false;
+  }
+  const pnpm11 = (0, import_semver2.parse)("11.0.0");
+  return Boolean(pnpm11 && lockfileCompatibleWithPnpm(lockfileVersion, pnpm11));
+}
 function validateCorepackPackageManager(cliType, lockfileVersion, corepackPackageManager, enginesPnpmVersionRange) {
   const validatedCorepackPackageManager = validateVersionSpecifier(
     corepackPackageManager
@@ -37583,50 +37775,33 @@ function validateVersionSpecifier(version) {
     packageVersion
   };
 }
-function detectPackageManager(cliType, lockfileVersion, projectCreatedAt) {
+function detectPackageManager(cliType, lockfileVersion, projectCreatedAt, nodeVersion) {
   switch (cliType) {
     case "npm":
       return void 0;
-    case "pnpm":
-      switch (detectPnpmVersion(lockfileVersion, projectCreatedAt)) {
+    case "pnpm": {
+      const detected = detectPnpmVersion(
+        lockfileVersion,
+        projectCreatedAt,
+        nodeVersion
+      );
+      switch (detected) {
+        case "pnpm 6":
+          return pnpmPathOverride(6);
         case "pnpm 7":
-          return {
-            path: "/pnpm7/node_modules/.bin",
-            detectedLockfile: "pnpm-lock.yaml",
-            detectedPackageManager: "pnpm@7.x",
-            pnpmVersionRange: "7.x"
-          };
+          return pnpmPathOverride(7);
         case "pnpm 8":
-          return {
-            path: "/pnpm8/node_modules/.bin",
-            detectedLockfile: "pnpm-lock.yaml",
-            detectedPackageManager: "pnpm@8.x",
-            pnpmVersionRange: "8.x"
-          };
+          return pnpmPathOverride(8);
         case "pnpm 9":
-          return {
-            path: "/pnpm9/node_modules/.bin",
-            detectedLockfile: "pnpm-lock.yaml",
-            detectedPackageManager: "pnpm@9.x",
-            pnpmVersionRange: "9.x"
-          };
+          return pnpmPathOverride(9);
         case "pnpm 10":
-          return {
-            path: "/pnpm10/node_modules/.bin",
-            detectedLockfile: "pnpm-lock.yaml",
-            detectedPackageManager: "pnpm@10.x",
-            pnpmVersionRange: "10.x"
-          };
-        case "pnpm 6":
-          return {
-            path: "/pnpm6/node_modules/.bin",
-            detectedLockfile: "pnpm-lock.yaml",
-            detectedPackageManager: "pnpm@6.x",
-            pnpmVersionRange: "6.x"
-          };
+          return pnpmPathOverride(10);
+        case "pnpm 11":
+          return pnpmPathOverride(11);
         default:
           return void 0;
       }
+    }
     case "bun":
       return {
         path: "/bun1",
@@ -37703,6 +37878,7 @@ async function runCustomInstallCommand({
     packageJson,
     packageJsonPath,
     packageJsonPackageManager,
+    packageJsonDevEngines,
     turboSupportsCorepackHome
   } = await scanParentDirs(destPath, true);
   if (installCompletedCovers(packageJsonPath)) {
@@ -37716,6 +37892,7 @@ async function runCustomInstallCommand({
     cliType,
     lockfileVersion,
     packageJsonPackageManager,
+    packageJsonDevEngines,
     env: spawnOpts?.env || {},
     packageJsonEngines: packageJson?.engines,
     turboSupportsCorepackHome,
@@ -37736,6 +37913,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts, projectCre
     cliType,
     lockfileVersion,
     packageJsonPackageManager,
+    packageJsonDevEngines,
     turboSupportsCorepackHome
   } = await scanParentDirs(destPath, true);
   const scriptName = getScriptName(
@@ -37753,6 +37931,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts, projectCre
       cliType,
       lockfileVersion,
       packageJsonPackageManager,
+      packageJsonDevEngines,
       env: cloneEnv(process.env, spawnOpts?.env),
       packageJsonEngines: packageJson?.engines,
       turboSupportsCorepackHome,
@@ -39690,6 +39869,13 @@ function getInternalServiceCronPath(serviceName, entrypoint, handler = "cron") {
   const normalizedEntrypoint = normalizeInternalServiceEntrypoint(entrypoint);
   return `${getInternalServiceCronPathPrefix(serviceName)}/${normalizedEntrypoint}/${handler}`;
 }
+function getInternalServiceWorkerPathPrefix(serviceName) {
+  return `${INTERNAL_SERVICE_PREFIX}/${serviceName}/workers`;
+}
+function getInternalServiceWorkerPath(serviceName, entrypoint, handler = "worker") {
+  const normalizedEntrypoint = normalizeInternalServiceEntrypoint(entrypoint);
+  return `${getInternalServiceWorkerPathPrefix(serviceName)}/${normalizedEntrypoint}/${handler}`;
+}
 
 // src/process-serverless/get-encrypted-env-file.ts
 function getEncryptedEnv(envFilename, envContent) {
@@ -39999,11 +40185,11 @@ function getAndVerifyOutputLambdasOrEdgeFuncs(buildResponse) {
 }
 
 // src/collect-build-result/stream-with-extended-payload.ts
-var import_stream2 = require("stream");
+var import_stream3 = require("stream");
 function streamWithExtendedPayload(stream, data) {
   return data ? new MultipartContentStream(stream, data) : stream;
 }
-var MultipartContentStream = class extends import_stream2.Readable {
+var MultipartContentStream = class extends import_stream3.Readable {
   constructor(stream, data) {
     super();
     stream.on("error", (err) => {
@@ -40780,6 +40966,8 @@ function getExtendedPayload({
   getInternalServiceCronPath,
   getInternalServiceCronPathPrefix,
   getInternalServiceFunctionPath,
+  getInternalServiceWorkerPath,
+  getInternalServiceWorkerPathPrefix,
   getLambdaByOutputPath,
   getLambdaEnvironment,
   getLambdaOptionsFromFunction,