@vercel/build-utils 13.3.5 → 13.4.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @vercel/build-utils
 
+## 13.4.0
+
+### Minor Changes
+
+- [services] synchronize dependencies in dev mode for JS/TS and Python services ([#14987](https://github.com/vercel/vercel/pull/14987))
+
+- [services] inject service URLs into web services as local paths ([#15024](https://github.com/vercel/vercel/pull/15024))
+
+### Patch Changes
+
+- Add new expirementalTrigger format for queues v2beta ([#14970](https://github.com/vercel/vercel/pull/14970))
+
+- Updated dependencies [[`a960cf23a42ff1a570c808ee9567670c24422f98`](https://github.com/vercel/vercel/commit/a960cf23a42ff1a570c808ee9567670c24422f98)]:
+  - @vercel/python-analysis@0.4.1
+
 ## 13.3.5
 
 ### Patch Changes

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

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { SpawnOptions } from 'child_process';
 import { Meta, PackageJson, NodeVersion, Config, BunVersion } from '../types';
 export type CliType = 'yarn' | 'npm' | 'pnpm' | 'bun' | 'vlt';
@@ -73,6 +74,26 @@ export interface SpawnOptionsExtended extends SpawnOptions {
      * the error code, stdout and stderr.
      */
     ignoreNon0Exit?: boolean;
+    /**
+     * Writable stream to pipe stdout to (e.g., for prefixing output in multi-service mode).
+     * When provided, stdio is automatically set to 'pipe'.
+     */
+    outputStream?: NodeJS.WritableStream;
+    /**
+     * Writable stream to pipe stderr to (e.g., for prefixing output in multi-service mode).
+     * When provided, stdio is automatically set to 'pipe'.
+     */
+    errorStream?: NodeJS.WritableStream;
+}
+export interface NpmInstallOutput {
+    /**
+     * Writable stream for stdout (e.g., for prefixing output in multi-service mode)
+     */
+    stdout?: NodeJS.WritableStream;
+    /**
+     * Writable stream for stderr (e.g., for prefixing output in multi-service mode)
+     */
+    stderr?: NodeJS.WritableStream;
 }
 export declare function spawnAsync(command: string, args: string[], opts?: SpawnOptionsExtended): Promise<void>;
 export declare function spawnCommand(command: string, options?: SpawnOptions): import("child_process").ChildProcess;
@@ -111,7 +132,7 @@ export declare function walkParentDirs({ base, start, filename, }: WalkParentDir
  * across multiple builds in the same Node process (e.g., in unit tests).
  */
 export declare function resetCustomInstallCommandSet(): void;
-export declare function runNpmInstall(destPath: string, args?: string[], spawnOpts?: SpawnOptions, meta?: Meta, projectCreatedAt?: number): Promise<boolean>;
+export declare function runNpmInstall(destPath: string, args?: string[], spawnOpts?: SpawnOptions, meta?: Meta, projectCreatedAt?: number, output?: NpmInstallOutput): Promise<boolean>;
 /**
  * Prepares the input environment based on the used package manager and lockfile
  * versions.

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

@@ -79,9 +79,21 @@ const NO_OVERRIDE = {
 function spawnAsync(command, args, opts = {}) {
   return new Promise((resolve, reject) => {
     const stderrLogs = [];
-    opts = { stdio: "inherit", ...opts };
+    const hasCustomStreams = opts.outputStream || opts.errorStream;
+    if (hasCustomStreams) {
+      opts = { ...opts, stdio: ["inherit", "pipe", "pipe"] };
+    } else {
+      opts = { stdio: "inherit", ...opts };
+    }
     const child = (0, import_cross_spawn.default)(command, args, opts);
-    if (opts.stdio === "pipe" && child.stderr) {
+    if (hasCustomStreams) {
+      if (child.stdout && opts.outputStream) {
+        child.stdout.pipe(opts.outputStream);
+      }
+      if (child.stderr && opts.errorStream) {
+        child.stderr.pipe(opts.errorStream);
+      }
+    } else if (opts.stdio === "pipe" && child.stderr) {
       child.stderr.on("data", (data) => stderrLogs.push(data));
     }
     child.on("error", reject);
@@ -93,7 +105,7 @@ function spawnAsync(command, args, opts = {}) {
       reject(
         new import_errors.NowBuildError({
           code: `BUILD_UTILS_SPAWN_${code || signal}`,
-          message: opts.stdio === "inherit" ? `${cmd} exited with ${code || signal}` : stderrLogs.map((line) => line.toString()).join("")
+          message: opts.stdio === "inherit" || hasCustomStreams ? `${cmd} exited with ${code || signal}` : stderrLogs.map((line) => line.toString()).join("")
         })
       );
     });
@@ -518,13 +530,16 @@ function getInstallCommandForPackageManager(packageManager, args) {
 async function runInstallCommand({
   packageManager,
   args,
-  opts
+  opts,
+  output
 }) {
   const { commandArguments, prettyCommand } = getInstallCommandForPackageManager(packageManager, args);
   opts.prettyCommand = prettyCommand;
   if (process.env.NPM_ONLY_PRODUCTION) {
     commandArguments.push("--production");
   }
+  opts.outputStream = output?.stdout;
+  opts.errorStream = output?.stderr;
   await spawnAsync(packageManager, commandArguments, opts);
 }
 function initializeSet(set) {
@@ -544,7 +559,7 @@ let customInstallCommandSet;
 function resetCustomInstallCommandSet() {
   customInstallCommandSet = void 0;
 }
-async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreatedAt) {
+async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreatedAt, output) {
   if (meta?.isDev) {
     (0, import_debug.default)("Skipping dependency installation because dev mode is enabled");
     return false;
@@ -596,7 +611,11 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
       }
     }
     const installTime = Date.now();
-    console.log("Installing dependencies...");
+    if (output?.stdout) {
+      output.stdout.write("Installing dependencies...\n");
+    } else {
+      console.log("Installing dependencies...");
+    }
     (0, import_debug.default)(`Installing to ${destPath}`);
     const opts = { cwd: destPath, ...spawnOpts };
     const env = (0, import_clone_env.cloneEnv)(opts.env || process.env);
@@ -619,7 +638,8 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
     await runInstallCommand({
       packageManager: cliType,
       args,
-      opts
+      opts,
+      output
     });
     (0, import_debug.default)(`Install complete [${Date.now() - installTime}ms]`);
     return true;

package/dist/get-service-url-env-vars.d.ts

@@ -11,6 +11,7 @@ export interface GetServiceUrlEnvVarsOptions {
     frameworkList: readonly FrameworkInfo[];
     currentEnv?: Envs;
     deploymentUrl?: string;
+    origin?: string;
 }
 /**
  * Generate environment variables for service URLs.

package/dist/get-service-url-env-vars.js

@@ -24,12 +24,15 @@ module.exports = __toCommonJS(get_service_url_env_vars_exports);
 function serviceNameToEnvVar(name) {
   return `${name.replace(/-/g, "_").toUpperCase()}_URL`;
 }
-function computeServiceUrl(deploymentUrl, routePrefix) {
+function computeServiceUrl(baseUrl, routePrefix, isOrigin) {
+  if (!isOrigin) {
+    baseUrl = `https://${baseUrl}`;
+  }
   if (routePrefix === "/") {
-    return `https://${deploymentUrl}`;
+    return baseUrl;
   }
   const normalizedPrefix = routePrefix.startsWith("/") ? routePrefix.slice(1) : routePrefix;
-  return `https://${deploymentUrl}/${normalizedPrefix}`;
+  return `${baseUrl}/${normalizedPrefix}`;
 }
 function getFrameworkEnvPrefix(frameworkSlug, frameworkList) {
   if (!frameworkSlug)
@@ -40,8 +43,15 @@ function getFrameworkEnvPrefix(frameworkSlug, frameworkList) {
   return framework?.envPrefix;
 }
 function getServiceUrlEnvVars(options) {
-  const { services, frameworkList, currentEnv = {}, deploymentUrl } = options;
-  if (!deploymentUrl || !services || services.length === 0) {
+  const {
+    services,
+    frameworkList,
+    currentEnv = {},
+    deploymentUrl,
+    origin
+  } = options;
+  const baseUrl = origin || deploymentUrl;
+  if (!baseUrl || !services || services.length === 0) {
     return {};
   }
   const envVars = {};
@@ -57,7 +67,11 @@ function getServiceUrlEnvVars(options) {
       continue;
     }
     const baseEnvVarName = serviceNameToEnvVar(service.name);
-    const absoluteUrl = computeServiceUrl(deploymentUrl, service.routePrefix);
+    const absoluteUrl = computeServiceUrl(
+      baseUrl,
+      service.routePrefix,
+      !!origin
+    );
     if (!(baseEnvVarName in currentEnv)) {
       envVars[baseEnvVarName] = absoluteUrl;
     }

package/dist/index.d.ts

@@ -1,14 +1,14 @@
 import FileBlob from './file-blob';
 import FileFsRef from './file-fs-ref';
 import FileRef from './file-ref';
-import { Lambda, createLambda, getLambdaOptionsFromFunction } from './lambda';
+import { Lambda, createLambda, getLambdaOptionsFromFunction, sanitizeConsumerName } from './lambda';
 import { NodejsLambda } from './nodejs-lambda';
 import { Prerender } from './prerender';
 import download, { downloadFile, DownloadedFiles, isSymbolicLink, isDirectory } from './fs/download';
 import getWriteableDirectory from './fs/get-writable-directory';
 import glob, { GlobOptions } from './fs/glob';
 import rename from './fs/rename';
-import { spawnAsync, execCommand, spawnCommand, walkParentDirs, getScriptName, installDependencies, runPackageJsonScript, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, resetCustomInstallCommandSet, getEnvForPackageManager, getNodeVersion, getPathForPackageManager, detectPackageManager, getSpawnOptions, getNodeBinPath, getNodeBinPaths, scanParentDirs, findPackageJson, traverseUpDirectories, PipInstallResult } from './fs/run-user-scripts';
+import { spawnAsync, execCommand, spawnCommand, walkParentDirs, getScriptName, installDependencies, runPackageJsonScript, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, resetCustomInstallCommandSet, getEnvForPackageManager, getNodeVersion, getPathForPackageManager, detectPackageManager, getSpawnOptions, getNodeBinPath, getNodeBinPaths, scanParentDirs, findPackageJson, traverseUpDirectories, PipInstallResult, NpmInstallOutput } from './fs/run-user-scripts';
 import { getLatestNodeVersion, getDiscontinuedNodeVersions, getSupportedNodeVersion, isBunVersion, getSupportedBunVersion } from './fs/node-version';
 import streamToBuffer, { streamToBufferChunks } from './fs/stream-to-buffer';
 import debug from './debug';
@@ -19,7 +19,7 @@ import { getServiceUrlEnvVars } from './get-service-url-env-vars';
 import { cloneEnv } from './clone-env';
 import { hardLinkDir } from './hard-link-dir';
 import { validateNpmrc } from './validate-npmrc';
-export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, downloadFile, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, getNodeBinPaths, getSupportedNodeVersion, isBunVersion, getSupportedBunVersion, detectPackageManager, runNpmInstall, runBundleInstall, runPipInstall, PipInstallResult, runShellScript, runCustomInstallCommand, resetCustomInstallCommandSet, getEnvForPackageManager, getNodeVersion, getPathForPackageManager, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, getPrefixedEnvVars, getServiceUrlEnvVars, streamToBuffer, streamToBufferChunks, debug, isSymbolicLink, isDirectory, getLambdaOptionsFromFunction, scanParentDirs, findPackageJson, getIgnoreFilter, cloneEnv, hardLinkDir, traverseUpDirectories, validateNpmrc, };
+export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, downloadFile, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, getNodeBinPaths, getSupportedNodeVersion, isBunVersion, getSupportedBunVersion, detectPackageManager, runNpmInstall, NpmInstallOutput, runBundleInstall, runPipInstall, PipInstallResult, runShellScript, runCustomInstallCommand, resetCustomInstallCommandSet, getEnvForPackageManager, getNodeVersion, getPathForPackageManager, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, getPrefixedEnvVars, getServiceUrlEnvVars, streamToBuffer, streamToBufferChunks, debug, isSymbolicLink, isDirectory, getLambdaOptionsFromFunction, sanitizeConsumerName, scanParentDirs, findPackageJson, getIgnoreFilter, cloneEnv, hardLinkDir, traverseUpDirectories, validateNpmrc, };
 export { EdgeFunction } from './edge-function';
 export { readConfigFile, getPackageJson } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';

package/dist/index.js

@@ -21892,6 +21892,7 @@ __export(src_exports, {
   runPackageJsonScript: () => runPackageJsonScript,
   runPipInstall: () => runPipInstall,
   runShellScript: () => runShellScript,
+  sanitizeConsumerName: () => sanitizeConsumerName,
   scanParentDirs: () => scanParentDirs,
   shouldServe: () => shouldServe,
   shouldUseExperimentalBackends: () => shouldUseExperimentalBackends,
@@ -22398,6 +22399,23 @@ async function download(files, basePath, meta) {
 }
 
 // src/lambda.ts
+function sanitizeConsumerName(functionPath) {
+  let result = "";
+  for (const char of functionPath) {
+    if (char === "_") {
+      result += "__";
+    } else if (char === "/") {
+      result += "_S";
+    } else if (char === ".") {
+      result += "_D";
+    } else if (/[A-Za-z0-9-]/.test(char)) {
+      result += char;
+    } else {
+      result += "_" + char.charCodeAt(0).toString(16).toUpperCase().padStart(2, "0");
+    }
+  }
+  return result;
+}
 function getDefaultLambdaArchitecture(architecture) {
   if (architecture) {
     return architecture;
@@ -22519,8 +22537,8 @@ var Lambda = class {
           `${prefix} is not an object`
         );
         (0, import_assert4.default)(
-          trigger.type === "queue/v1beta",
-          `${prefix}.type must be "queue/v1beta"`
+          trigger.type === "queue/v1beta" || trigger.type === "queue/v2beta",
+          `${prefix}.type must be "queue/v1beta" or "queue/v2beta"`
         );
         (0, import_assert4.default)(
           typeof trigger.topic === "string",
@@ -22535,6 +22553,12 @@ var Lambda = class {
           trigger.consumer.length > 0,
           `${prefix}.consumer cannot be empty`
         );
+        if (trigger.type === "queue/v2beta") {
+          (0, import_assert4.default)(
+            experimentalTriggers.length === 1,
+            '"experimentalTriggers" can only have one item for queue/v2beta'
+          );
+        }
         if (trigger.maxDeliveries !== void 0) {
           (0, import_assert4.default)(
             typeof trigger.maxDeliveries === "number",
@@ -22675,12 +22699,23 @@ async function getLambdaOptionsFromFunction({
   if (config?.functions) {
     for (const [pattern, fn] of Object.entries(config.functions)) {
       if (sourceFile === pattern || (0, import_minimatch.default)(sourceFile, pattern)) {
+        const experimentalTriggers = fn.experimentalTriggers?.map(
+          (trigger) => {
+            if (trigger.type === "queue/v2beta") {
+              return {
+                ...trigger,
+                consumer: sanitizeConsumerName(pattern)
+              };
+            }
+            return trigger;
+          }
+        );
         return {
           architecture: fn.architecture,
           memory: fn.memory,
           maxDuration: fn.maxDuration,
           regions: fn.regions,
-          experimentalTriggers: fn.experimentalTriggers,
+          experimentalTriggers,
           supportsCancellation: fn.supportsCancellation
         };
       }
@@ -23247,9 +23282,21 @@ var NO_OVERRIDE = {
 function spawnAsync(command, args, opts = {}) {
   return new Promise((resolve, reject) => {
     const stderrLogs = [];
-    opts = { stdio: "inherit", ...opts };
+    const hasCustomStreams = opts.outputStream || opts.errorStream;
+    if (hasCustomStreams) {
+      opts = { ...opts, stdio: ["inherit", "pipe", "pipe"] };
+    } else {
+      opts = { stdio: "inherit", ...opts };
+    }
     const child = (0, import_cross_spawn.default)(command, args, opts);
-    if (opts.stdio === "pipe" && child.stderr) {
+    if (hasCustomStreams) {
+      if (child.stdout && opts.outputStream) {
+        child.stdout.pipe(opts.outputStream);
+      }
+      if (child.stderr && opts.errorStream) {
+        child.stderr.pipe(opts.errorStream);
+      }
+    } else if (opts.stdio === "pipe" && child.stderr) {
       child.stderr.on("data", (data) => stderrLogs.push(data));
     }
     child.on("error", reject);
@@ -23261,7 +23308,7 @@ function spawnAsync(command, args, opts = {}) {
       reject(
         new NowBuildError({
           code: `BUILD_UTILS_SPAWN_${code || signal}`,
-          message: opts.stdio === "inherit" ? `${cmd} exited with ${code || signal}` : stderrLogs.map((line) => line.toString()).join("")
+          message: opts.stdio === "inherit" || hasCustomStreams ? `${cmd} exited with ${code || signal}` : stderrLogs.map((line) => line.toString()).join("")
         })
       );
     });
@@ -23686,13 +23733,16 @@ function getInstallCommandForPackageManager(packageManager, args) {
 async function runInstallCommand({
   packageManager,
   args,
-  opts
+  opts,
+  output
 }) {
   const { commandArguments, prettyCommand } = getInstallCommandForPackageManager(packageManager, args);
   opts.prettyCommand = prettyCommand;
   if (process.env.NPM_ONLY_PRODUCTION) {
     commandArguments.push("--production");
   }
+  opts.outputStream = output?.stdout;
+  opts.errorStream = output?.stderr;
   await spawnAsync(packageManager, commandArguments, opts);
 }
 function initializeSet(set) {
@@ -23712,7 +23762,7 @@ var customInstallCommandSet;
 function resetCustomInstallCommandSet() {
   customInstallCommandSet = void 0;
 }
-async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreatedAt) {
+async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreatedAt, output) {
   if (meta?.isDev) {
     debug("Skipping dependency installation because dev mode is enabled");
     return false;
@@ -23764,7 +23814,11 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
       }
     }
     const installTime = Date.now();
-    console.log("Installing dependencies...");
+    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);
@@ -23787,7 +23841,8 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, projectCreate
     await runInstallCommand({
       packageManager: cliType,
       args,
-      opts
+      opts,
+      output
     });
     debug(`Install complete [${Date.now() - installTime}ms]`);
     return true;
@@ -24364,12 +24419,15 @@ function getPrefixedEnvVars({
 function serviceNameToEnvVar(name) {
   return `${name.replace(/-/g, "_").toUpperCase()}_URL`;
 }
-function computeServiceUrl(deploymentUrl, routePrefix) {
+function computeServiceUrl(baseUrl, routePrefix, isOrigin) {
+  if (!isOrigin) {
+    baseUrl = `https://${baseUrl}`;
+  }
   if (routePrefix === "/") {
-    return `https://${deploymentUrl}`;
+    return baseUrl;
   }
   const normalizedPrefix = routePrefix.startsWith("/") ? routePrefix.slice(1) : routePrefix;
-  return `https://${deploymentUrl}/${normalizedPrefix}`;
+  return `${baseUrl}/${normalizedPrefix}`;
 }
 function getFrameworkEnvPrefix(frameworkSlug, frameworkList) {
   if (!frameworkSlug)
@@ -24380,8 +24438,15 @@ function getFrameworkEnvPrefix(frameworkSlug, frameworkList) {
   return framework?.envPrefix;
 }
 function getServiceUrlEnvVars(options) {
-  const { services, frameworkList, currentEnv = {}, deploymentUrl } = options;
-  if (!deploymentUrl || !services || services.length === 0) {
+  const {
+    services,
+    frameworkList,
+    currentEnv = {},
+    deploymentUrl,
+    origin
+  } = options;
+  const baseUrl = origin || deploymentUrl;
+  if (!baseUrl || !services || services.length === 0) {
     return {};
   }
   const envVars = {};
@@ -24397,7 +24462,11 @@ function getServiceUrlEnvVars(options) {
       continue;
     }
     const baseEnvVarName = serviceNameToEnvVar(service.name);
-    const absoluteUrl = computeServiceUrl(deploymentUrl, service.routePrefix);
+    const absoluteUrl = computeServiceUrl(
+      baseUrl,
+      service.routePrefix,
+      !!origin
+    );
     if (!(baseEnvVarName in currentEnv)) {
       envVars[baseEnvVarName] = absoluteUrl;
     }
@@ -24567,7 +24636,7 @@ function hasProp(obj, key) {
 }
 
 // src/schemas.ts
-var triggerEventSchema = {
+var triggerEventSchemaV1 = {
   type: "object",
   properties: {
     type: {
@@ -24602,6 +24671,40 @@ var triggerEventSchema = {
   required: ["type", "topic", "consumer"],
   additionalProperties: false
 };
+var triggerEventSchemaV2 = {
+  type: "object",
+  properties: {
+    type: {
+      type: "string",
+      const: "queue/v2beta"
+    },
+    topic: {
+      type: "string",
+      minLength: 1
+    },
+    maxDeliveries: {
+      type: "number",
+      minimum: 1
+    },
+    retryAfterSeconds: {
+      type: "number",
+      exclusiveMinimum: 0
+    },
+    initialDelaySeconds: {
+      type: "number",
+      minimum: 0
+    },
+    maxConcurrency: {
+      type: "number",
+      minimum: 1
+    }
+  },
+  required: ["type", "topic"],
+  additionalProperties: false
+};
+var triggerEventSchema = {
+  oneOf: [triggerEventSchemaV1, triggerEventSchemaV2]
+};
 var functionsSchema = {
   type: "object",
   minProperties: 1,
@@ -25078,6 +25181,7 @@ async function isPythonEntrypoint(file) {
   runPackageJsonScript,
   runPipInstall,
   runShellScript,
+  sanitizeConsumerName,
   scanParentDirs,
   shouldServe,
   shouldUseExperimentalBackends,

package/dist/lambda.d.ts

@@ -1,6 +1,23 @@
 /// <reference types="node" />
-import type { Config, Env, Files, FunctionFramework, TriggerEvent } from './types';
-export type { TriggerEvent };
+import type { Config, Env, Files, FunctionFramework, TriggerEvent, TriggerEventInput } from './types';
+export type { TriggerEvent, TriggerEventInput };
+/**
+ * Encodes a function path into a valid consumer name using mnemonic escapes.
+ * For queue/v2beta triggers, the consumer name is derived from the function path.
+ * This encoding is collision-free (bijective/reversible).
+ *
+ * Encoding scheme:
+ * - `_` → `__` (escape character itself)
+ * - `/` → `_S` (slash)
+ * - `.` → `_D` (dot)
+ * - Other invalid chars → `_XX` (hex code)
+ *
+ * @example
+ * sanitizeConsumerName('api/test.js') // => 'api_Stest_Djs'
+ * sanitizeConsumerName('api/users/handler.ts') // => 'api_Susers_Shandler_Dts'
+ * sanitizeConsumerName('my_func.ts') // => 'my__func_Dts'
+ */
+export declare function sanitizeConsumerName(functionPath: string): string;
 export type LambdaOptions = LambdaOptionsWithFiles | LambdaOptionsWithZipBuffer;
 export type LambdaExecutableRuntimeLanguages = 'rust' | 'go';
 export type LambdaArchitecture = 'x86_64' | 'arm64';

package/dist/lambda.js

@@ -31,7 +31,8 @@ __export(lambda_exports, {
   Lambda: () => Lambda,
   createLambda: () => createLambda,
   createZip: () => createZip,
-  getLambdaOptionsFromFunction: () => getLambdaOptionsFromFunction
+  getLambdaOptionsFromFunction: () => getLambdaOptionsFromFunction,
+  sanitizeConsumerName: () => sanitizeConsumerName
 });
 module.exports = __toCommonJS(lambda_exports);
 var import_assert = __toESM(require("assert"));
@@ -41,6 +42,23 @@ var import_minimatch = __toESM(require("minimatch"));
 var import_fs_extra = require("fs-extra");
 var import_download = require("./fs/download");
 var import_stream_to_buffer = __toESM(require("./fs/stream-to-buffer"));
+function sanitizeConsumerName(functionPath) {
+  let result = "";
+  for (const char of functionPath) {
+    if (char === "_") {
+      result += "__";
+    } else if (char === "/") {
+      result += "_S";
+    } else if (char === ".") {
+      result += "_D";
+    } else if (/[A-Za-z0-9-]/.test(char)) {
+      result += char;
+    } else {
+      result += "_" + char.charCodeAt(0).toString(16).toUpperCase().padStart(2, "0");
+    }
+  }
+  return result;
+}
 function getDefaultLambdaArchitecture(architecture) {
   if (architecture) {
     return architecture;
@@ -162,8 +180,8 @@ class Lambda {
           `${prefix} is not an object`
         );
         (0, import_assert.default)(
-          trigger.type === "queue/v1beta",
-          `${prefix}.type must be "queue/v1beta"`
+          trigger.type === "queue/v1beta" || trigger.type === "queue/v2beta",
+          `${prefix}.type must be "queue/v1beta" or "queue/v2beta"`
         );
         (0, import_assert.default)(
           typeof trigger.topic === "string",
@@ -178,6 +196,12 @@ class Lambda {
           trigger.consumer.length > 0,
           `${prefix}.consumer cannot be empty`
         );
+        if (trigger.type === "queue/v2beta") {
+          (0, import_assert.default)(
+            experimentalTriggers.length === 1,
+            '"experimentalTriggers" can only have one item for queue/v2beta'
+          );
+        }
         if (trigger.maxDeliveries !== void 0) {
           (0, import_assert.default)(
             typeof trigger.maxDeliveries === "number",
@@ -318,12 +342,23 @@ async function getLambdaOptionsFromFunction({
   if (config?.functions) {
     for (const [pattern, fn] of Object.entries(config.functions)) {
       if (sourceFile === pattern || (0, import_minimatch.default)(sourceFile, pattern)) {
+        const experimentalTriggers = fn.experimentalTriggers?.map(
+          (trigger) => {
+            if (trigger.type === "queue/v2beta") {
+              return {
+                ...trigger,
+                consumer: sanitizeConsumerName(pattern)
+              };
+            }
+            return trigger;
+          }
+        );
         return {
           architecture: fn.architecture,
           memory: fn.memory,
           maxDuration: fn.maxDuration,
           regions: fn.regions,
-          experimentalTriggers: fn.experimentalTriggers,
+          experimentalTriggers,
           supportsCancellation: fn.supportsCancellation
         };
       }
@@ -336,5 +371,6 @@ async function getLambdaOptionsFromFunction({
   Lambda,
   createLambda,
   createZip,
-  getLambdaOptionsFromFunction
+  getLambdaOptionsFromFunction,
+  sanitizeConsumerName
 });

package/dist/schemas.d.ts

@@ -42,39 +42,37 @@ export declare const functionsSchema: {
                 experimentalTriggers: {
                     type: string;
                     items: {
-                        type: string;
-                        properties: {
-                            type: {
-                                type: string;
-                                const: string;
-                            };
-                            topic: {
-                                type: string;
-                                minLength: number;
-                            };
-                            consumer: {
-                                type: string;
-                                minLength: number;
-                            };
-                            maxDeliveries: {
-                                type: string;
-                                minimum: number;
-                            };
-                            retryAfterSeconds: {
-                                type: string;
-                                exclusiveMinimum: number;
-                            };
-                            initialDelaySeconds: {
-                                type: string;
-                                minimum: number;
-                            };
-                            maxConcurrency: {
-                                type: string;
-                                minimum: number;
+                        oneOf: {
+                            type: string;
+                            properties: {
+                                type: {
+                                    type: string;
+                                    const: string;
+                                };
+                                topic: {
+                                    type: string;
+                                    minLength: number;
+                                };
+                                maxDeliveries: {
+                                    type: string;
+                                    minimum: number;
+                                };
+                                retryAfterSeconds: {
+                                    type: string;
+                                    exclusiveMinimum: number;
+                                };
+                                initialDelaySeconds: {
+                                    type: string;
+                                    minimum: number;
+                                };
+                                maxConcurrency: {
+                                    type: string;
+                                    minimum: number;
+                                };
                             };
-                        };
-                        required: string[];
-                        additionalProperties: boolean;
+                            required: string[];
+                            additionalProperties: boolean;
+                        }[];
                     };
                 };
                 supportsCancellation: {

package/dist/schemas.js

@@ -22,7 +22,7 @@ __export(schemas_exports, {
   functionsSchema: () => functionsSchema
 });
 module.exports = __toCommonJS(schemas_exports);
-const triggerEventSchema = {
+const triggerEventSchemaV1 = {
   type: "object",
   properties: {
     type: {
@@ -57,6 +57,40 @@ const triggerEventSchema = {
   required: ["type", "topic", "consumer"],
   additionalProperties: false
 };
+const triggerEventSchemaV2 = {
+  type: "object",
+  properties: {
+    type: {
+      type: "string",
+      const: "queue/v2beta"
+    },
+    topic: {
+      type: "string",
+      minLength: 1
+    },
+    maxDeliveries: {
+      type: "number",
+      minimum: 1
+    },
+    retryAfterSeconds: {
+      type: "number",
+      exclusiveMinimum: 0
+    },
+    initialDelaySeconds: {
+      type: "number",
+      minimum: 0
+    },
+    maxConcurrency: {
+      type: "number",
+      minimum: 1
+    }
+  },
+  required: ["type", "topic"],
+  additionalProperties: false
+};
+const triggerEventSchema = {
+  oneOf: [triggerEventSchemaV1, triggerEventSchemaV2]
+};
 const functionsSchema = {
   type: "object",
   minProperties: 1,

package/dist/types.d.ts

@@ -358,7 +358,7 @@ export interface BuilderFunctions {
         runtime?: string;
         includeFiles?: string;
         excludeFiles?: string;
-        experimentalTriggers?: TriggerEvent[];
+        experimentalTriggers?: TriggerEventInput[];
         supportsCancellation?: boolean;
     };
 }
@@ -559,17 +559,9 @@ export interface Chain {
      */
     headers: Record<string, string>;
 }
-/**
- * Queue trigger event for Vercel's queue system.
- * Handles "queue/v1beta" events with queue-specific configuration.
- */
-export interface TriggerEvent {
-    /** Event type - must be "queue/v1beta" (REQUIRED) */
-    type: 'queue/v1beta';
+interface TriggerEventBase {
     /** Name of the queue topic to consume from (REQUIRED) */
     topic: string;
-    /** Name of the consumer group for this trigger (REQUIRED) */
-    consumer: string;
     /**
      * Maximum number of delivery attempts for message processing (OPTIONAL)
      * This represents the total number of times a message can be delivered,
@@ -595,6 +587,40 @@ export interface TriggerEvent {
      */
     maxConcurrency?: number;
 }
+/**
+ * Queue trigger input event for v1beta (from vercel.json config).
+ * Requires explicit consumer name.
+ */
+export interface TriggerEventInputV1 extends TriggerEventBase {
+    /** Event type - must be "queue/v1beta" (REQUIRED) */
+    type: 'queue/v1beta';
+    /** Name of the consumer group for this trigger (REQUIRED) */
+    consumer: string;
+}
+/**
+ * Queue trigger input event for v2beta (from vercel.json config).
+ * Consumer name is implicitly derived from the function path.
+ * Only one trigger per function is allowed.
+ */
+export interface TriggerEventInputV2 extends TriggerEventBase {
+    /** Event type - must be "queue/v2beta" (REQUIRED) */
+    type: 'queue/v2beta';
+}
+/**
+ * Queue trigger input event from vercel.json config.
+ * v1beta requires explicit consumer, v2beta derives consumer from function path.
+ */
+export type TriggerEventInput = TriggerEventInputV1 | TriggerEventInputV2;
+/**
+ * Processed queue trigger event for Lambda.
+ * Consumer is always present (explicitly provided for v1beta, derived for v2beta).
+ */
+export interface TriggerEvent extends TriggerEventBase {
+    /** Event type */
+    type: 'queue/v1beta' | 'queue/v2beta';
+    /** Name of the consumer group for this trigger (always present in processed output) */
+    consumer: string;
+}
 export type ServiceRuntime = 'node' | 'python' | 'go' | 'rust' | 'ruby';
 export type ServiceType = 'web' | 'cron' | 'worker';
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "13.3.5",
+  "version": "13.4.0",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -11,7 +11,7 @@
     "directory": "packages/now-build-utils"
   },
   "dependencies": {
-    "@vercel/python-analysis": "0.4.0"
+    "@vercel/python-analysis": "0.4.1"
   },
   "devDependencies": {
     "@iarna/toml": "2.2.3",
@@ -50,8 +50,8 @@
     "yazl": "2.5.1",
     "vitest": "2.0.1",
     "json5": "2.2.3",
-    "@vercel/error-utils": "2.0.3",
-    "@vercel/routing-utils": "5.3.2"
+    "@vercel/routing-utils": "5.3.2",
+    "@vercel/error-utils": "2.0.3"
   },
   "scripts": {
     "build": "node build.mjs",