vercel 54.15.1 → 54.16.0

package/dist/chunks/{chunk-MABHXDYV.js → chunk-INFYZRHS.js}

@@ -8,7 +8,7 @@ import {
   TelemetryClient,
   require_dist as require_dist2,
   require_graceful_fs
-} from "./chunk-HIYWSGI7.js";
+} from "./chunk-Q77ALSXR.js";
 import {
   buildCommandWithYes,
   getPreservedArgsForEnvPull,
@@ -8006,7 +8006,7 @@ var require_jsonfile = __commonJS({
       }
       return obj;
     }
-    var readFile6 = universalify.fromPromise(_readFile);
+    var readFile7 = universalify.fromPromise(_readFile);
     function readFileSync(file, options = {}) {
       if (typeof options === "string") {
         options = { encoding: options };
@@ -8038,7 +8038,7 @@ var require_jsonfile = __commonJS({
       return fs5.writeFileSync(file, str, options);
     }
     module.exports = {
-      readFile: readFile6,
+      readFile: readFile7,
       readFileSync,
       writeFile: writeFile5,
       writeFileSync
@@ -13734,10 +13734,10 @@ var require_read_config_file = __commonJS({
     var import_smol_toml3 = __require("smol-toml");
     var import_fs4 = __require("fs");
     var import_error_utils5 = require_dist();
-    var { readFile: readFile6 } = import_fs4.promises;
+    var { readFile: readFile7 } = import_fs4.promises;
     async function readFileOrNull(file) {
       try {
-        const data = await readFile6(file);
+        const data = await readFile7(file);
         return data;
       } catch (error) {
         if (!(0, import_error_utils5.isErrnoException)(error)) {
@@ -13824,7 +13824,7 @@ var require_frameworks = __commonJS({
     var import_fs4 = __require("fs");
     var import_read_config_file = require_read_config_file();
     __reExport(frameworks_exports, require_types(), module.exports);
-    var { readdir, readFile: readFile6, unlink: unlink2 } = import_fs4.promises;
+    var { readdir, readFile: readFile7, unlink: unlink2 } = import_fs4.promises;
     var frameworks = [
       {
         name: "Blitz.js (Legacy)",
@@ -13952,7 +13952,7 @@ var require_frameworks = __commonJS({
               "public",
               "__now_routes_g4t5bY.json"
             );
-            const content = await readFile6(nowRoutesPath, "utf8");
+            const content = await readFile7(nowRoutesPath, "utf8");
             const nowRoutes = JSON.parse(content);
             try {
               await unlink2(nowRoutesPath);
@@ -22955,7 +22955,8 @@ var require_types3 = __commonJS({
       python: "@vercel/python",
       go: "@vercel/go",
       rust: "@vercel/rust",
-      ruby: "@vercel/ruby"
+      ruby: "@vercel/ruby",
+      container: "@vercel/container"
     };
     var RUNTIME_MANIFESTS = {
       node: ["package.json"],
@@ -23522,6 +23523,12 @@ var require_resolve2 = __commonJS({
       "python",
       "go"
     ]);
+    function isContainerRuntime(config) {
+      return config.runtime === "container";
+    }
+    function normalizeContainerCommand(command) {
+      return Array.isArray(command) ? command : [command];
+    }
     async function getServiceFs(fs5, serviceName, root) {
       if (!root) {
         return { fs: fs5 };
@@ -23607,6 +23614,10 @@ var require_resolve2 = __commonJS({
         }
       };
     }
+    function isDockerfileEntrypoint(entrypoint) {
+      const base = import_path12.posix.basename(entrypoint).toLowerCase();
+      return base === "dockerfile" || base === "containerfile" || base.endsWith(".dockerfile");
+    }
     function toWorkspaceRelativeEntrypoint(entrypoint, workspace) {
       const normalizedEntrypoint = import_path12.posix.normalize(entrypoint);
       if (workspace === ".") {
@@ -23985,6 +23996,13 @@ var require_resolve2 = __commonJS({
           serviceName: name
         };
       }
+      if (config.command !== void 0 && !isContainerRuntime(config)) {
+        return {
+          code: "INVALID_COMMAND",
+          message: `Service "${name}" can only specify "command" when using runtime "container".`,
+          serviceName: name
+        };
+      }
       return null;
     }
     function validateServiceEntrypoint(name, config, resolvedEntrypoint) {
@@ -24025,8 +24043,11 @@ var require_resolve2 = __commonJS({
       const configuredRoutePrefix = routingResult.routing?.routePrefix;
       const configuredSubdomain = routingResult.routing?.subdomain;
       const routePrefixWasConfigured = routingResult.routing?.routePrefixConfigured ?? false;
+      const containerEntrypoint = isContainerRuntime(config) && typeof rawEntrypoint === "string" ? rawEntrypoint : void 0;
+      const containerDockerfile = containerEntrypoint && isDockerfileEntrypoint(containerEntrypoint) ? import_path12.posix.normalize(containerEntrypoint) : void 0;
+      const containerImage = containerEntrypoint && !containerDockerfile ? containerEntrypoint : void 0;
       let resolvedEntrypointPath = resolvedEntrypoint;
-      if (!resolvedEntrypointPath && typeof rawEntrypoint === "string") {
+      if (!containerEntrypoint && !resolvedEntrypointPath && typeof rawEntrypoint === "string") {
         const entrypointToResolve = moduleAttrParsed ? moduleAttrParsed.filePath : rawEntrypoint;
         const resolved = await resolveEntrypointPath({
           fs: serviceFs,
@@ -24035,7 +24056,7 @@ var require_resolve2 = __commonJS({
         });
         resolvedEntrypointPath = resolved.entrypoint;
       }
-      if (typeof rawEntrypoint === "string" && !resolvedEntrypointPath) {
+      if (!containerEntrypoint && typeof rawEntrypoint === "string" && !resolvedEntrypointPath) {
         throw new Error(
           `Failed to resolve entrypoint "${rawEntrypoint}" for service "${name}".`
         );
@@ -24099,7 +24120,7 @@ var require_resolve2 = __commonJS({
         } else {
           builderUse = (0, import_utils4.getBuilderForRuntime)(inferredRuntime);
         }
-        builderSrc = resolvedEntrypointFile;
+        builderSrc = inferredRuntime === "container" && typeof containerEntrypoint === "string" ? containerEntrypoint : resolvedEntrypointFile;
       }
       const normalizedSubdomain = type === "web" && typeof configuredSubdomain === "string" ? configuredSubdomain.toLowerCase() : void 0;
       const defaultRoutePrefix = type === "web" && normalizedSubdomain ? `/_/${name}` : void 0;
@@ -24133,6 +24154,12 @@ var require_resolve2 = __commonJS({
       if (config.framework) {
         builderConfig.framework = config.framework;
       }
+      if (containerImage) {
+        builderConfig.handler = containerImage;
+      }
+      if (config.command !== void 0) {
+        builderConfig.command = normalizeContainerCommand(config.command);
+      }
       if (moduleAttrParsed) {
         builderConfig.handlerFunction = moduleAttrParsed.attrName;
       }
@@ -24143,7 +24170,7 @@ var require_resolve2 = __commonJS({
         trigger,
         group,
         workspace,
-        entrypoint: resolvedEntrypointFile,
+        entrypoint: containerImage ?? containerDockerfile ?? resolvedEntrypointFile,
         routePrefix,
         routePrefixSource: resolvedRoutePrefixSource,
         subdomain: normalizedSubdomain,
@@ -24182,7 +24209,7 @@ var require_resolve2 = __commonJS({
         }
         const serviceFs = serviceFsResult.fs;
         let resolvedEntrypoint;
-        if (typeof serviceConfig.entrypoint === "string") {
+        if (typeof serviceConfig.entrypoint === "string" && !isContainerRuntime(serviceConfig)) {
           const moduleAttr = parsePyModuleAttrEntrypoint(serviceConfig.entrypoint);
           const entrypointToResolve = moduleAttr?.filePath ?? serviceConfig.entrypoint;
           const resolvedPath = await resolveEntrypointPath({
@@ -24379,6 +24406,67 @@ var require_resolve_v2 = __commonJS({
     var import_utils4 = require_utils3();
     var frameworksBySlug = new Map(import_frameworks2.frameworkList.map((f) => [f.slug, f]));
     var SERVICE_NAME_REGEX = /^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$/;
+    function isDockerfileEntrypoint(entrypoint) {
+      const base = import_path12.posix.basename(entrypoint).toLowerCase();
+      return base === "dockerfile" || base === "containerfile" || base.endsWith(".dockerfile");
+    }
+    function normalizeContainerCommand(command) {
+      if (command === void 0) {
+        return void 0;
+      }
+      return Array.isArray(command) ? command : [command];
+    }
+    function resolveContainerServiceV2(name, config, normalizedRoot) {
+      const isRoot = normalizedRoot === ".";
+      const entrypoint = config.entrypoint;
+      const dockerfile = typeof entrypoint === "string" && isDockerfileEntrypoint(entrypoint) ? import_path12.posix.normalize(entrypoint) : void 0;
+      const image = typeof entrypoint === "string" && !dockerfile ? entrypoint : void 0;
+      if (!dockerfile && !image) {
+        return {
+          error: {
+            code: "MISSING_SERVICE_CONFIG",
+            message: `Container service "${name}" must specify an "entrypoint": a Dockerfile path to build, or a prebuilt OCI image reference.`,
+            serviceName: name
+          }
+        };
+      }
+      const localSrc = dockerfile ?? image ?? "Dockerfile";
+      const builderSrc = isRoot ? localSrc : import_path12.posix.join(normalizedRoot, localSrc);
+      const builderConfig = { zeroConfig: true };
+      if (!isRoot) {
+        builderConfig.workspace = normalizedRoot;
+      }
+      if (image) {
+        builderConfig.handler = image;
+      }
+      const command = normalizeContainerCommand(config.command);
+      if (command) {
+        builderConfig.command = command;
+      }
+      return {
+        service: {
+          schema: "experimentalServicesV2",
+          name,
+          root: normalizedRoot,
+          runtime: "container",
+          entrypoint: image ?? dockerfile,
+          command,
+          builder: {
+            src: builderSrc,
+            use: "@vercel/container",
+            config: builderConfig
+          },
+          bindings: config.bindings,
+          functions: config.functions,
+          headers: config.headers,
+          redirects: config.redirects,
+          rewrites: config.rewrites,
+          routes: config.routes,
+          cleanUrls: config.cleanUrls,
+          trailingSlash: config.trailingSlash
+        }
+      };
+    }
     function validateServiceConfigV22(name, config) {
       if (!SERVICE_NAME_REGEX.test(name)) {
         return {
@@ -24440,7 +24528,8 @@ var require_resolve_v2 = __commonJS({
           };
         }
       }
-      if (!config.framework && !config.entrypoint) {
+      const isContainer = config.runtime === "container";
+      if (!config.framework && !config.entrypoint && !isContainer) {
         return {
           code: "MISSING_SERVICE_CONFIG",
           message: `Service "${name}" must specify "framework" or "entrypoint".`,
@@ -24451,6 +24540,10 @@ var require_resolve_v2 = __commonJS({
     }
     async function resolveConfiguredServiceV22(name, config, fs5) {
       const normalizedRoot = (0, import_utils4.stripTrailingSlash)(import_path12.posix.normalize(config.root));
+      const isContainer = config.runtime === "container" || typeof config.entrypoint === "string" && isDockerfileEntrypoint(config.entrypoint);
+      if (isContainer) {
+        return resolveContainerServiceV2(name, config, normalizedRoot);
+      }
       const serviceFsResult = normalizedRoot === "." ? { fs: fs5 } : await (0, import_resolve.getServiceFs)(fs5, name, normalizedRoot);
       if (serviceFsResult.error) {
         return { error: serviceFsResult.error };
@@ -28577,8 +28670,23 @@ var require_detect_services = __commonJS({
           warnings: []
         });
       }
+      if (vercelConfig?.services != null && vercelConfig.experimentalServicesV2 != null) {
+        return withResolvedResult({
+          services: [],
+          source: "configured",
+          useImplicitEnvInjection: false,
+          routes: emptyRoutes(),
+          errors: [
+            {
+              code: "SERVICES_AND_EXPERIMENTAL_SERVICES_V2",
+              message: "The `services` property cannot be used in conjunction with its deprecated alias `experimentalServicesV2`. Please use only `services`."
+            }
+          ],
+          warnings: []
+        });
+      }
       const hasProvidedConfiguredServices = providedConfiguredServices && Object.keys(providedConfiguredServices).length > 0;
-      const experimentalServicesV2 = hasProvidedConfiguredServices && providedConfiguredServicesType === "experimentalServicesV2" ? providedConfiguredServices : hasProvidedConfiguredServices ? void 0 : vercelConfig?.experimentalServicesV2;
+      const experimentalServicesV2 = hasProvidedConfiguredServices && (providedConfiguredServicesType === "services" || providedConfiguredServicesType === "experimentalServicesV2") ? providedConfiguredServices : hasProvidedConfiguredServices ? void 0 : vercelConfig?.services ?? vercelConfig?.experimentalServicesV2;
       if (experimentalServicesV2 && Object.keys(experimentalServicesV2).length > 0) {
         const result2 = await (0, import_resolve_v2.resolveAllConfiguredServicesV2)(
           experimentalServicesV2,
@@ -28757,11 +28865,12 @@ var require_detect_services = __commonJS({
           }
         } else if (service.runtime) {
           const functionPath = (0, import_utils4.getInternalServiceFunctionPath)(service.name);
+          const check2 = service.runtime === "container" ? void 0 : true;
           if (routePrefix === "/") {
             defaults.push({
               src: (0, import_routing_utils2.scopeRouteSourceToOwnership)("^/(.*)$", ownershipGuard),
               dest: functionPath,
-              check: true
+              ...check2 ? { check: check2 } : {}
             });
           } else {
             rewrites.push({
@@ -28770,7 +28879,7 @@ var require_detect_services = __commonJS({
                 ownershipGuard
               ),
               dest: functionPath,
-              check: true
+              ...check2 ? { check: check2 } : {}
             });
           }
         }
@@ -29278,12 +29387,30 @@ var require_detect_builders = __commonJS({
     async function detectBuilders2(files, pkg, options = {}) {
       const {
         experimentalServices: experimentalServicesV1,
+        services,
         experimentalServicesV2,
         projectSettings = {}
       } = options;
+      if (services != null && experimentalServicesV2 != null) {
+        return {
+          builders: null,
+          errors: [
+            {
+              code: "SERVICES_AND_EXPERIMENTAL_SERVICES_V2",
+              message: "The `services` option cannot be used in conjunction with its deprecated alias `experimentalServicesV2`. Please use only `services`."
+            }
+          ],
+          warnings: [],
+          defaultRoutes: null,
+          redirectRoutes: null,
+          rewriteRoutes: null,
+          errorRoutes: null
+        };
+      }
       const { framework } = projectSettings;
-      const configuredServices = experimentalServicesV2 ?? experimentalServicesV1;
-      const configuredServicesType = experimentalServicesV2 ? "experimentalServicesV2" : "experimentalServices";
+      const servicesConfig = services ?? experimentalServicesV2;
+      const configuredServices = servicesConfig ?? experimentalServicesV1;
+      const configuredServicesType = servicesConfig ? services ? "services" : "experimentalServicesV2" : "experimentalServices";
       const hasServicesConfig = configuredServices != null && typeof configuredServices === "object";
       if (hasServicesConfig || framework === "services") {
         const result = await (0, import_get_services_builders.getServicesBuilders)({
@@ -36527,7 +36654,7 @@ var require_jsonfile3 = __commonJS({
     } catch (_) {
       _fs = __require("fs");
     }
-    function readFile6(file, options, callback) {
+    function readFile7(file, options, callback) {
       if (callback == null) {
         callback = options;
         options = {};
@@ -36626,7 +36753,7 @@ var require_jsonfile3 = __commonJS({
       return content;
     }
     var jsonfile = {
-      readFile: readFile6,
+      readFile: readFile7,
       readFileSync,
       writeFile: writeFile5,
       writeFileSync
@@ -37606,7 +37733,7 @@ var require_package = __commonJS({
   "../client/package.json"(exports, module) {
     module.exports = {
       name: "@vercel/client",
-      version: "17.5.18",
+      version: "17.6.0",
       main: "dist/index.js",
       typings: "dist/index.d.ts",
       homepage: "https://vercel.com",
@@ -52696,7 +52823,7 @@ var require_dist7 = __commonJS({
 
 // src/util/compile-vercel-config.ts
 var import_dotenv = __toESM(require_main(), 1);
-import { mkdir, readFile as readFile5, writeFile as writeFile4, unlink, access } from "fs/promises";
+import { mkdir, readFile as readFile6, writeFile as writeFile4, unlink, access } from "fs/promises";
 import { join as join10, basename as basename3 } from "path";
 import { fork } from "child_process";
 import { parse as tomlParse2 } from "smol-toml";
@@ -55497,6 +55624,41 @@ function addDeltaSection(prefix, arr, changed = false) {
   return arr.sort().map((item) => `  ${prefix} ${item}${changed ? " (Updated)" : ""}`).join("\n") + "\n";
 }
 
+// src/util/env/constants.ts
+var VERCEL_OIDC_TOKEN = "VERCEL_OIDC_TOKEN";
+
+// src/util/env/update-oidc-token-contents.ts
+var CONTENTS_HEADER = "# Created by Vercel CLI";
+function updateOidcTokenContents(existing, token) {
+  const assignment = `${VERCEL_OIDC_TOKEN}="${escapeValue(token)}"`;
+  const oidcAssignment = new RegExp(
+    `^(\\uFEFF?)[\\t ]*(?:export[\\t ]+)?${VERCEL_OIDC_TOKEN}[\\t ]*=[^\\r\\n]*(\\r\\n|\\n|\\r|$)`,
+    "gm"
+  );
+  let tokenWritten = false;
+  const withoutDuplicates = existing.replace(
+    oidcAssignment,
+    (_match, byteOrderMark, lineEnding2) => {
+      if (token !== void 0 && !tokenWritten) {
+        tokenWritten = true;
+        return `${byteOrderMark}${assignment}${lineEnding2}`;
+      }
+      return byteOrderMark;
+    }
+  );
+  if (token === void 0 || tokenWritten) {
+    return withoutDuplicates;
+  }
+  const lineEnding = withoutDuplicates.match(/\r\n|\n|\r/)?.[0] ?? "\n";
+  const hasTrailingLineEnding = /(?:\r\n|\n|\r)$/.test(withoutDuplicates);
+  const hasTrailingBlankLine = /(?:\r\n|\n|\r){2}$/.test(withoutDuplicates);
+  const separator = withoutDuplicates.length === 0 || hasTrailingBlankLine ? "" : hasTrailingLineEnding ? lineEnding : `${lineEnding}${lineEnding}`;
+  return `${withoutDuplicates}${separator}${CONTENTS_HEADER}${lineEnding}${assignment}${lineEnding}`;
+}
+function escapeValue(value) {
+  return value ? value.replace(/\n/g, "\\n").replace(/\r/g, "\\r") : "";
+}
+
 // src/commands/env/pull.ts
 var import_error_utils2 = __toESM(require_dist(), 1);
 var import_json_parse_better_errors = __toESM(require_json_parse_better_errors(), 1);
@@ -55565,9 +55727,9 @@ var EnvPullTelemetryClient = class extends TelemetryClient {
 };
 
 // src/util/env/env-target.ts
-var import_constants = __toESM(require_dist2(), 1);
+var import_constants2 = __toESM(require_dist2(), 1);
 var import_title = __toESM(require_lib(), 1);
-var envTargetChoices = import_constants.PROJECT_ENV_TARGET.map((t) => ({
+var envTargetChoices = import_constants2.PROJECT_ENV_TARGET.map((t) => ({
   name: (0, import_title.default)(t),
   value: t
 }));
@@ -56411,7 +56573,7 @@ var VARIABLES_TO_IGNORE = [
   "VERCEL_SPEED_INSIGHTS_ID",
   "VERCEL_WEB_ANALYTICS_ID"
 ];
-async function pull(client, argv, source = "vercel-cli:env:pull") {
+async function pull(client, argv, source = "vercel-cli:env:pull", options = {}) {
   const telemetryClient = new EnvPullTelemetryClient({
     opts: {
       store: client.telemetryEventStore
@@ -56492,17 +56654,18 @@ async function pull(client, argv, source = "vercel-cli:env:pull") {
     gitBranch,
     client.cwd,
     source,
-    deploymentId
+    deploymentId,
+    options
   );
   return 0;
 }
-async function envPullCommandLogic(client, filename, skipConfirmation, environment, link, gitBranch, cwd, source, deploymentId) {
+async function envPullCommandLogic(client, filename, skipConfirmation, environment, link, gitBranch, cwd, source, deploymentId, { oidcTokenOnly = false } = {}) {
   const fullPath = resolve3(cwd, filename);
   const head = tryReadHeadSync(fullPath, Buffer.byteLength(CONTENTS_PREFIX));
   const exists = typeof head !== "undefined";
-  if (head === CONTENTS_PREFIX) {
+  if (head === CONTENTS_PREFIX && !oidcTokenOnly) {
     output_manager_default.log(`Overwriting existing ${import_chalk12.default.bold(filename)} file`);
-  } else if (exists && !skipConfirmation) {
+  } else if (exists && !skipConfirmation && !oidcTokenOnly) {
     if (client.nonInteractive) {
       outputActionRequired(client, {
         status: "action_required",
@@ -56529,7 +56692,9 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
     }
   }
   const projectSlugLink = formatProject(link.org.slug, link.project.name);
-  const downloadMessage = gitBranch ? `Downloading \`${import_chalk12.default.cyan(
+  const downloadMessage = oidcTokenOnly ? `Downloading a fresh \`${import_chalk12.default.cyan(
+    VERCEL_OIDC_TOKEN
+  )}\` for ${projectSlugLink}` : gitBranch ? `Downloading \`${import_chalk12.default.cyan(
     environment
   )}\` environment variables for ${projectSlugLink} and any overrides for branch ${import_chalk12.default.cyan(
     gitBranch
@@ -56546,26 +56711,48 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
   const records = deploymentId ? pullResult.buildEnv : pullResult.env;
   let deltaString = "";
   let oldEnv;
-  if (exists) {
+  if (exists && !oidcTokenOnly) {
     oldEnv = await createEnvObject(fullPath);
     if (oldEnv) {
       const newEnv = (0, import_json_parse_better_errors.default)(JSON.stringify(records).replace(/\\"/g, ""));
       deltaString = buildDeltaString(oldEnv, newEnv);
     }
   }
-  const contents = CONTENTS_PREFIX + Object.keys(records).sort().filter((key) => !VARIABLES_TO_IGNORE.includes(key)).map((key) => `${key}="${escapeValue(records[key])}"`).join("\n") + "\n";
-  await (0, import_fs_extra5.outputFile)(fullPath, contents, "utf8");
+  let contents;
+  let fileChanged = true;
+  if (oidcTokenOnly) {
+    const existingContents = exists ? await (0, import_fs_extra5.readFile)(fullPath, "utf8") : "";
+    contents = updateOidcTokenContents(
+      existingContents,
+      records[VERCEL_OIDC_TOKEN] || void 0
+    );
+    fileChanged = contents !== existingContents;
+  } else {
+    contents = CONTENTS_PREFIX + Object.keys(records).sort().filter((key) => !VARIABLES_TO_IGNORE.includes(key)).map((key) => `${key}="${escapeValue2(records[key])}"`).join("\n") + "\n";
+  }
+  if (fileChanged) {
+    await (0, import_fs_extra5.outputFile)(fullPath, contents, "utf8");
+  }
   if (deltaString) {
     output_manager_default.print("\n" + deltaString);
   } else if (oldEnv && exists) {
     output_manager_default.log("No changes found.");
   }
   let isGitIgnoreUpdated = false;
-  if (filename === ".env.local") {
+  const fileExistsAfterPull = exists || contents.length > 0;
+  if (filename === ".env.local" && fileExistsAfterPull) {
     const rootPath = link.repoRoot ?? cwd;
     isGitIgnoreUpdated = await addToGitIgnore(rootPath, ".env*");
   }
+  if (!fileChanged && !isGitIgnoreUpdated) {
+    output_manager_default.stopSpinner();
+    return;
+  }
   output_manager_default.print("\n");
+  if (!fileChanged) {
+    printAlignedLabel("Updated", `.gitignore for ${filename}`, { gutter: "\u2713" });
+    return;
+  }
   printAlignedLabel(
     exists ? "Updated" : "Created",
     `${filename} file${isGitIgnoreUpdated ? " and added it to .gitignore" : ""}`,
@@ -56620,7 +56807,7 @@ function getAcrValuesFromWWWAuthenticate(header) {
   );
   return match?.[1]?.replace(/\\(.)/g, "$1") ?? match?.[2];
 }
-function escapeValue(value) {
+function escapeValue2(value) {
   return value ? value.replace(new RegExp("\n", "g"), "\\n").replace(new RegExp("\r", "g"), "\\r") : "";
 }
 
@@ -56632,7 +56819,7 @@ import { join as join8, dirname } from "path";
 
 // src/util/projects/detect-services.ts
 var import_fs_detectors2 = __toESM(require_dist6(), 1);
-import { readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
+import { readFile as readFile4, writeFile as writeFile2 } from "fs/promises";
 import { basename as basename2, join as join7 } from "path";
 import { parse as tomlParse, stringify as tomlStringify } from "smol-toml";
 
@@ -56950,6 +57137,16 @@ var getExperimentalServicesCommonProperties = () => ({
     minLength: 1,
     maxLength: 2048
   },
+  command: {
+    oneOf: [
+      { type: "string", minLength: 1, maxLength: 2048 },
+      {
+        type: "array",
+        minItems: 1,
+        items: { type: "string", minLength: 1, maxLength: 2048 }
+      }
+    ]
+  },
   memory: {
     type: "integer",
     minimum: 128,
@@ -57112,17 +57309,17 @@ var experimentalServiceGroupsSchema = {
     }
   }
 };
-var experimentalServicesV2PathSchema = {
+var servicesPathSchema = {
   type: "string",
   minLength: 1,
   maxLength: 512
 };
-var experimentalServicesV2CommandSchema = {
+var servicesCommandSchema = {
   type: "string",
   minLength: 1,
   maxLength: 2048
 };
-var experimentalServicesV2BindingSchema = {
+var servicesBindingSchema = {
   type: "object",
   additionalProperties: false,
   required: ["type", "service", "format", "env"],
@@ -57141,17 +57338,17 @@ var experimentalServicesV2BindingSchema = {
     }
   }
 };
-var experimentalServicesV2BindingsSchema = {
+var servicesBindingsSchema = {
   type: "array",
   maxItems: 100,
-  items: experimentalServicesV2BindingSchema
+  items: servicesBindingSchema
 };
-var getExperimentalServicesV2ServiceConfigSchema = () => ({
+var getServicesServiceConfigSchema = () => ({
   type: "object",
   additionalProperties: false,
   required: ["root"],
   properties: {
-    root: experimentalServicesV2PathSchema,
+    root: servicesPathSchema,
     framework: {
       type: "string",
       minLength: 1,
@@ -57162,13 +57359,16 @@ var getExperimentalServicesV2ServiceConfigSchema = () => ({
       minLength: 1,
       maxLength: 256
     },
-    entrypoint: experimentalServicesV2PathSchema,
-    installCommand: experimentalServicesV2CommandSchema,
-    buildCommand: experimentalServicesV2CommandSchema,
-    devCommand: experimentalServicesV2CommandSchema,
-    ignoreCommand: experimentalServicesV2CommandSchema,
-    outputDirectory: experimentalServicesV2PathSchema,
-    bindings: experimentalServicesV2BindingsSchema,
+    entrypoint: servicesPathSchema,
+    command: {
+      oneOf: [{ type: "string" }, { type: "array", items: { type: "string" } }]
+    },
+    installCommand: servicesCommandSchema,
+    buildCommand: servicesCommandSchema,
+    devCommand: servicesCommandSchema,
+    ignoreCommand: servicesCommandSchema,
+    outputDirectory: servicesPathSchema,
+    bindings: servicesBindingsSchema,
     functions: getFunctionsSchema(),
     headers: import_routing_utils.headersSchema,
     redirects: import_routing_utils.redirectsSchema,
@@ -57178,13 +57378,13 @@ var getExperimentalServicesV2ServiceConfigSchema = () => ({
     trailingSlash: import_routing_utils.trailingSlashSchema
   }
 });
-var getExperimentalServicesV2Schema = () => ({
+var getServicesSchema = () => ({
   type: "object",
   propertyNames: {
     pattern: "^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$",
     maxLength: 64
   },
-  additionalProperties: getExperimentalServicesV2ServiceConfigSchema()
+  additionalProperties: getServicesServiceConfigSchema()
 });
 function buildVercelConfigSchema() {
   return {
@@ -57206,7 +57406,8 @@ function buildVercelConfigSchema() {
       bunVersion: { type: "string" },
       experimentalServices: getExperimentalServicesSchema(),
       experimentalServiceGroups: experimentalServiceGroupsSchema,
-      experimentalServicesV2: getExperimentalServicesV2Schema()
+      services: getServicesSchema(),
+      experimentalServicesV2: getServicesSchema()
     }
   };
 }
@@ -57258,20 +57459,30 @@ function validateConfig(config) {
       message: "The `experimentalServiceGroups` property requires `experimentalServices` to be defined. Service groups reference services by name."
     });
   }
-  const hasExperimentalServicesV2 = Boolean(config.experimentalServicesV2);
-  if (hasExperimentalServicesV2 && hasExperimentalServices) {
+  const hasServices = config.services != null;
+  const hasExperimentalServicesV2 = config.experimentalServicesV2 != null;
+  if (hasServices && hasExperimentalServicesV2) {
+    return new NowBuildError({
+      code: "SERVICES_AND_EXPERIMENTAL_SERVICES_V2",
+      message: "The `services` property cannot be used in conjunction with its deprecated alias `experimentalServicesV2`. Please use only `services`."
+    });
+  }
+  const servicesConfig = config.services ?? config.experimentalServicesV2;
+  const servicesConfigKey = hasServices ? "services" : "experimentalServicesV2";
+  const servicesErrorCodePrefix = hasServices ? "SERVICES" : "EXPERIMENTAL_SERVICES_V2";
+  if (servicesConfig && hasExperimentalServices) {
     return new NowBuildError({
-      code: "EXPERIMENTAL_SERVICES_V2_AND_EXPERIMENTAL_SERVICES",
-      message: "The `experimentalServicesV2` property cannot be used in conjunction with the `experimentalServices` property. Please use only one services configuration."
+      code: `${servicesErrorCodePrefix}_AND_EXPERIMENTAL_SERVICES`,
+      message: `The \`${servicesConfigKey}\` property cannot be used in conjunction with the \`experimentalServices\` property. Please use only one services configuration.`
     });
   }
-  if (hasExperimentalServicesV2 && config.builds) {
+  if (servicesConfig && config.builds) {
     return new NowBuildError({
-      code: "EXPERIMENTAL_SERVICES_V2_AND_BUILDS",
-      message: "The `experimentalServicesV2` property cannot be used in conjunction with the `builds` property. Please remove one of them."
+      code: `${servicesErrorCodePrefix}_AND_BUILDS`,
+      message: `The \`${servicesConfigKey}\` property cannot be used in conjunction with the \`builds\` property. Please remove one of them.`
     });
   }
-  if (hasExperimentalServicesV2) {
+  if (servicesConfig) {
     const ambiguousTopLevel = [];
     if (config.functions != null) {
       ambiguousTopLevel.push("functions");
@@ -57298,21 +57509,19 @@ function validateConfig(config) {
       const count = ambiguousTopLevel.length;
       const fields = ambiguousTopLevel.map((field) => `\`${field}\``).join(", ");
       return new NowBuildError({
-        code: "EXPERIMENTAL_SERVICES_V2_AND_TOP_LEVEL_BUILD_SETTINGS",
-        message: `The top-level ${count > 1 ? "properties" : "property"} ${fields} cannot be used with \`experimentalServicesV2\` because the owning service is ambiguous. Move ${count > 1 ? "them" : "it"} under the relevant service in \`experimentalServicesV2\`.`
+        code: `${servicesErrorCodePrefix}_AND_TOP_LEVEL_BUILD_SETTINGS`,
+        message: `The top-level ${count > 1 ? "properties" : "property"} ${fields} cannot be used with \`${servicesConfigKey}\` because the owning service is ambiguous. Move ${count > 1 ? "them" : "it"} under the relevant service in \`${servicesConfigKey}\`.`
       });
     }
   }
-  if (config.experimentalServicesV2) {
-    const serviceNames = new Set(Object.keys(config.experimentalServicesV2));
-    for (const [serviceName, serviceConfig] of Object.entries(
-      config.experimentalServicesV2
-    )) {
+  if (servicesConfig) {
+    const serviceNames = new Set(Object.keys(servicesConfig));
+    for (const [serviceName, serviceConfig] of Object.entries(servicesConfig)) {
       for (const binding of serviceConfig.bindings ?? []) {
         if (!serviceNames.has(binding.service)) {
           return new NowBuildError({
-            code: "EXPERIMENTAL_SERVICES_V2_BINDING_UNKNOWN_SERVICE",
-            message: `Service "${serviceName}" declares a binding to unknown service "${binding.service}". Add "${binding.service}" to \`experimentalServicesV2\` or fix the binding.`
+            code: `${servicesErrorCodePrefix}_BINDING_UNKNOWN_SERVICE`,
+            message: `Service "${serviceName}" declares a binding to unknown service "${binding.service}". Add "${binding.service}" to \`${servicesConfigKey}\` or fix the binding.`
           });
         }
       }
@@ -57368,7 +57577,7 @@ async function hasExperimentalServicesConfig(cwd) {
     );
     if (!config || config instanceof Error)
       return false;
-    return config.experimentalServices != null && typeof config.experimentalServices === "object" || config.experimentalServicesV2 != null && typeof config.experimentalServicesV2 === "object";
+    return config.experimentalServices != null && typeof config.experimentalServices === "object" || config.services != null && typeof config.services === "object" || config.experimentalServicesV2 != null && typeof config.experimentalServicesV2 === "object";
   } catch {
     return false;
   }
@@ -57446,7 +57655,7 @@ async function prepareTomlServicesConfigWrite(configPath, config) {
   const patchKeys = Object.keys(patch);
   let existingContent;
   try {
-    existingContent = await readFile3(configPath, "utf8");
+    existingContent = await readFile4(configPath, "utf8");
   } catch {
     existingContent = "";
   }
@@ -57521,7 +57730,7 @@ async function resolveProjectCwd(cwd) {
 }
 
 // src/util/projects/link.ts
-var readFile4 = promisify(fs4.readFile);
+var readFile5 = promisify(fs4.readFile);
 var writeFile3 = promisify(fs4.writeFile);
 var VERCEL_DIR = ".vercel";
 var VERCEL_DIR_FALLBACK = ".now";
@@ -57639,7 +57848,7 @@ async function getProjectLinkFromRepoLink(client, path, projectName, projectName
 }
 async function getLinkFromDir(dir) {
   try {
-    const json = await readFile4(join9(dir, VERCEL_DIR_PROJECT), "utf8");
+    const json = await readFile5(join9(dir, VERCEL_DIR_PROJECT), "utf8");
     const ajv2 = new import_ajv2.default();
     const link = JSON.parse(json);
     if (!ajv2.validate(linkSchema, link)) {
@@ -58046,7 +58255,7 @@ async function compileVercelConfig(workPath) {
   }
   if (hasVercelToml) {
     try {
-      const tomlContent = await readFile5(vercelTomlPath, "utf8");
+      const tomlContent = await readFile6(vercelTomlPath, "utf8");
       const config = tomlParse2(tomlContent);
       const normalizedConfig = normalizeConfig(config);
       await mkdir(vercelDir, { recursive: true });
@@ -58271,6 +58480,7 @@ export {
   pullEnvRecords,
   parseEnv,
   createEnvObject,
+  VERCEL_OIDC_TOKEN,
   require_json_parse_better_errors,
   formatProject,
   STANDARD_ENVIRONMENTS,