vercel 50.29.0 → 50.31.1

package/dist/chunks/{chunk-XCJJHUSH.js → chunk-2MDXGVZV.js}

@@ -6,7 +6,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   require_lib
-} from "./chunk-D6EWLYB6.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   packageName
 } from "./chunk-ZLCMHY2G.js";

package/dist/chunks/{chunk-5QC74A5F.js → chunk-43L4BNYM.js}

@@ -6,7 +6,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   getEnvTargetPlaceholder
-} from "./chunk-D6EWLYB6.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   packageName,
   yesOption

package/dist/chunks/{chunk-D6EWLYB6.js → chunk-4MTNDNUR.js}

@@ -10,7 +10,7 @@ import {
 } from "./chunk-XB2KZC2B.js";
 import {
   stamp_default
-} from "./chunk-CO5D46AG.js";
+} from "./chunk-SOTR4CXR.js";
 import {
   require_pluralize
 } from "./chunk-7EHTK7LP.js";
@@ -10316,7 +10316,6 @@ var require_frameworks = __commonJS({
       {
         name: "Django",
         slug: "django",
-        experimental: true,
         logo: "https://api-frameworks.vercel.sh/framework-logos/django.svg",
         tagline: "Django is a high-level Python web framework that encourages rapid development and clean, pragmatic design. ",
         description: "A Django project served via the Python Runtime.",
@@ -11937,7 +11936,6 @@ var require_frameworks = __commonJS({
       {
         name: "Python",
         slug: "python",
-        experimental: true,
         runtimeFramework: true,
         logo: "https://api-frameworks.vercel.sh/framework-logos/python.svg",
         tagline: "Python is a programming language that lets you work quickly and integrate systems more effectively.",
@@ -17344,6 +17342,7 @@ var require_resolve = __commonJS({
       };
     }
     var SERVICE_NAME_REGEX = /^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$/;
+    var DNS_LABEL_RE = /^(?!-)[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/i;
     function normalizeServiceEntrypoint(entrypoint) {
       const normalized = import_path11.posix.normalize(entrypoint);
       return normalized === "" ? "." : normalized;
@@ -17474,10 +17473,19 @@ var require_resolve = __commonJS({
         };
       }
       const serviceType = config.type || "web";
-      if (serviceType === "web" && !config.routePrefix) {
+      const hasRoutePrefix = typeof config.routePrefix === "string";
+      const hasSubdomain = typeof config.subdomain === "string";
+      if (hasSubdomain && !DNS_LABEL_RE.test(config.subdomain)) {
+        return {
+          code: "INVALID_SUBDOMAIN",
+          message: `Web service "${name}" has invalid subdomain "${config.subdomain}". Use a single DNS label such as "api".`,
+          serviceName: name
+        };
+      }
+      if (serviceType === "web" && !hasRoutePrefix && !hasSubdomain) {
         return {
           code: "MISSING_ROUTE_PREFIX",
-          message: `Web service "${name}" must specify "routePrefix".`,
+          message: `Web service "${name}" must specify at least one of "routePrefix" or "subdomain".`,
           serviceName: name
         };
       }
@@ -17495,6 +17503,13 @@ var require_resolve = __commonJS({
           serviceName: name
         };
       }
+      if ((serviceType === "worker" || serviceType === "cron") && hasSubdomain) {
+        return {
+          code: "INVALID_HOST_ROUTING_CONFIG",
+          message: `${serviceType === "worker" ? "Worker" : "Cron"} service "${name}" cannot have "subdomain". Only web services should specify subdomain routing.`,
+          serviceName: name
+        };
+      }
       if (serviceType === "cron" && !config.schedule) {
         return {
           code: "MISSING_CRON_SCHEDULE",
@@ -17629,7 +17644,10 @@ var require_resolve = __commonJS({
         builderUse = (0, import_utils4.getBuilderForRuntime)(inferredRuntime);
         builderSrc = resolvedEntrypointFile;
       }
-      const routePrefix = type === "web" && config.routePrefix ? config.routePrefix.startsWith("/") ? config.routePrefix : `/${config.routePrefix}` : void 0;
+      const normalizedSubdomain = type === "web" && typeof config.subdomain === "string" ? config.subdomain.toLowerCase() : void 0;
+      const defaultRoutePrefix = type === "web" && normalizedSubdomain ? `/_/${name}` : void 0;
+      const routePrefix = type === "web" && (config.routePrefix || defaultRoutePrefix) ? (config.routePrefix || defaultRoutePrefix).startsWith("/") ? config.routePrefix || defaultRoutePrefix : `/${config.routePrefix || defaultRoutePrefix}` : void 0;
+      const resolvedRoutePrefixSource = type === "web" && typeof routePrefix === "string" ? config.routePrefix ? routePrefixSource : "generated" : void 0;
       const isRoot = workspace === ".";
       if (!isRoot) {
         builderSrc = import_path11.posix.join(workspace, builderSrc);
@@ -17665,7 +17683,8 @@ var require_resolve = __commonJS({
         workspace,
         entrypoint: resolvedEntrypointFile,
         routePrefix,
-        routePrefixSource: type === "web" && typeof routePrefix === "string" ? routePrefixSource : void 0,
+        routePrefixSource: resolvedRoutePrefixSource,
+        subdomain: normalizedSubdomain,
         framework: config.framework,
         builder: {
           src: builderSrc,
@@ -18068,6 +18087,10 @@ var require_detect_services = __commonJS({
     var import_utils4 = require_utils3();
     var import_resolve = require_resolve();
     var import_auto_detect = require_auto_detect();
+    var PREVIEW_DOMAIN_MISSING = [
+      { type: "host", value: { suf: ".vercel.app" } },
+      { type: "host", value: { suf: ".vercel.dev" } }
+    ];
     async function detectServices3(options) {
       const { fs: fs5, workPath } = options;
       const scopedFs = workPath ? fs5.chdir(workPath) : fs5;
@@ -18076,7 +18099,13 @@ var require_detect_services = __commonJS({
         return {
           services: [],
           source: "configured",
-          routes: { rewrites: [], defaults: [], crons: [], workers: [] },
+          routes: {
+            hostRewrites: [],
+            rewrites: [],
+            defaults: [],
+            crons: [],
+            workers: []
+          },
           errors: [configError],
           warnings: []
         };
@@ -18089,7 +18118,13 @@ var require_detect_services = __commonJS({
           return {
             services: [],
             source: "auto-detected",
-            routes: { rewrites: [], defaults: [], crons: [], workers: [] },
+            routes: {
+              hostRewrites: [],
+              rewrites: [],
+              defaults: [],
+              crons: [],
+              workers: []
+            },
             errors: autoResult.errors,
             warnings: []
           };
@@ -18112,7 +18147,13 @@ var require_detect_services = __commonJS({
         return {
           services: [],
           source: "auto-detected",
-          routes: { rewrites: [], defaults: [], crons: [], workers: [] },
+          routes: {
+            hostRewrites: [],
+            rewrites: [],
+            defaults: [],
+            crons: [],
+            workers: []
+          },
           errors: [
             {
               code: "NO_SERVICES_CONFIGURED",
@@ -18137,6 +18178,7 @@ var require_detect_services = __commonJS({
       };
     }
     function generateServicesRoutes2(services) {
+      const hostRewrites = [];
       const rewrites = [];
       const defaults = [];
       const crons = [];
@@ -18149,6 +18191,25 @@ var require_detect_services = __commonJS({
         const { routePrefix } = service;
         const normalizedPrefix = routePrefix.slice(1);
         const ownershipGuard = (0, import_routing_utils.getOwnershipGuard)(routePrefix, allWebPrefixes);
+        const hostCondition = getHostCondition(service);
+        if (hostCondition && routePrefix !== "/") {
+          const normalizedRoutePrefix = (0, import_routing_utils.normalizeRoutePrefix)(routePrefix);
+          const escapedPrefix = escapeRegex(normalizedRoutePrefix.slice(1));
+          hostRewrites.push({
+            src: "^/$",
+            dest: normalizedRoutePrefix,
+            has: hostCondition,
+            missing: PREVIEW_DOMAIN_MISSING,
+            check: true
+          });
+          hostRewrites.push({
+            src: `^/(?!${escapedPrefix}(?:/|$))(.*)$`,
+            dest: `${normalizedRoutePrefix}/$1`,
+            has: hostCondition,
+            missing: PREVIEW_DOMAIN_MISSING,
+            check: true
+          });
+        }
         if ((0, import_utils4.isRouteOwningBuilder)(service)) {
           continue;
         }
@@ -18218,7 +18279,7 @@ var require_detect_services = __commonJS({
           check: true
         });
       }
-      return { rewrites, defaults, crons, workers };
+      return { hostRewrites, rewrites, defaults, crons, workers };
     }
     function escapeRegex(str) {
       return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -18233,6 +18294,15 @@ var require_detect_services = __commonJS({
       }
       return Array.from(unique);
     }
+    function getHostCondition(service) {
+      if (service.type !== "web") {
+        return void 0;
+      }
+      if (typeof service.subdomain === "string" && service.subdomain.length > 0) {
+        return [{ type: "host", value: { pre: `${service.subdomain}.` } }];
+      }
+      return void 0;
+    }
   }
 });
 
@@ -18473,6 +18543,7 @@ var require_get_services_builders = __commonJS({
             }
           ],
           warnings: [],
+          hostRewriteRoutes: null,
           defaultRoutes: null,
           redirectRoutes: null,
           rewriteRoutes: null,
@@ -18493,6 +18564,7 @@ var require_get_services_builders = __commonJS({
             message: e.message
           })),
           warnings: warningResponses,
+          hostRewriteRoutes: null,
           defaultRoutes: null,
           redirectRoutes: null,
           rewriteRoutes: null,
@@ -18509,6 +18581,7 @@ var require_get_services_builders = __commonJS({
             }
           ],
           warnings: warningResponses,
+          hostRewriteRoutes: null,
           defaultRoutes: null,
           redirectRoutes: null,
           rewriteRoutes: null,
@@ -18520,6 +18593,7 @@ var require_get_services_builders = __commonJS({
         builders: builders.length > 0 ? builders : null,
         errors: null,
         warnings: warningResponses,
+        hostRewriteRoutes: result.routes.hostRewrites.length > 0 ? result.routes.hostRewrites : null,
         defaultRoutes: result.routes.defaults.length > 0 ? result.routes.defaults : null,
         redirectRoutes: [],
         rewriteRoutes: result.routes.rewrites.length > 0 || result.routes.workers.length > 0 || result.routes.crons.length > 0 ? [
@@ -18999,10 +19073,10 @@ var require_detect_builders = __commonJS({
             message: "Function must contain at least one property."
           };
         }
-        if (func.maxDuration !== void 0 && (func.maxDuration < 1 || func.maxDuration > 900 || !Number.isInteger(func.maxDuration))) {
+        if (func.maxDuration !== void 0 && func.maxDuration !== "max" && (func.maxDuration < 1 || func.maxDuration > 900 || !Number.isInteger(func.maxDuration))) {
           return {
             code: "invalid_function_duration",
-            message: "Functions must have a duration between 1 and 900."
+            message: 'Functions must have a maxDuration between 1 and 900, or "max".'
           };
         }
         if (func.memory !== void 0 && (func.memory < 128 || func.memory > 10240)) {
@@ -37125,27 +37199,23 @@ function findChanges(oldEnv, newEnv) {
     } else if (oldEnv[key] !== newEnv[key]) {
       changed.push(key);
     }
-    delete oldEnv[key];
   }
-  const removed = Object.keys(oldEnv);
   return {
     added,
-    changed,
-    removed
+    changed
   };
 }
 function buildDeltaString(oldEnv, newEnv) {
-  const { added, changed, removed } = findChanges(oldEnv, newEnv);
+  const { added, changed } = findChanges(oldEnv, newEnv);
   let deltaString = "";
-  deltaString += import_chalk5.default.green(addDeltaSection("+", changed, true));
+  deltaString += import_chalk5.default.yellow(addDeltaSection("M", changed));
   deltaString += import_chalk5.default.green(addDeltaSection("+", added));
-  deltaString += import_chalk5.default.red(addDeltaSection("-", removed));
   return deltaString ? import_chalk5.default.gray("Changes:\n") + deltaString + "\n" : deltaString;
 }
-function addDeltaSection(prefix, arr, changed = false) {
+function addDeltaSection(prefix, arr) {
   if (arr.length === 0)
     return "";
-  return arr.sort().map((item) => `${prefix} ${item}${changed ? " (Updated)" : ""}`).join("\n") + "\n";
+  return arr.sort().map((item) => `${prefix} ${item}`).join("\n") + "\n";
 }
 
 // src/commands/env/pull.ts
@@ -37512,33 +37582,26 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
   const fullPath = resolve2(cwd, filename);
   const head = tryReadHeadSync(fullPath, Buffer.byteLength(CONTENTS_PREFIX));
   const exists = typeof head !== "undefined";
+  const requiresConfirmation = exists && head !== CONTENTS_PREFIX && !skipConfirmation && !client.nonInteractive;
   if (head === CONTENTS_PREFIX) {
     output_manager_default.log(`Overwriting existing ${import_chalk7.default.bold(filename)} file`);
-  } else if (exists && !skipConfirmation) {
-    if (client.nonInteractive) {
-      outputActionRequired(client, {
-        status: "action_required",
-        reason: "env_file_exists",
-        message: `File ${param(filename)} already exists and was not created by Vercel CLI. Use --yes to overwrite or specify a different filename.`,
-        next: [
-          {
-            command: getCommandNamePlain(`env pull ${filename} --yes`),
-            when: "Overwrite this file"
-          },
-          {
-            command: getCommandNamePlain("env pull <filename>"),
-            when: "Use a different filename"
-          }
-        ]
-      });
-    }
-    if (!await client.input.confirm(
-      `Found existing file ${param(filename)}. Do you want to overwrite?`,
-      false
-    )) {
-      output_manager_default.log("Canceled");
-      return;
-    }
+  } else if (exists && !skipConfirmation && client.nonInteractive) {
+    outputActionRequired(client, {
+      status: "action_required",
+      reason: "env_file_exists",
+      message: `File ${param(filename)} already exists and was not created by Vercel CLI. Use --yes to apply the downloaded changes or specify a different filename.`,
+      next: [
+        {
+          command: getCommandNamePlain(`env pull ${filename} --yes`),
+          when: "Apply the downloaded changes to this file"
+        },
+        {
+          command: getCommandNamePlain("env pull <filename>"),
+          when: "Use a different filename"
+        }
+      ]
+    });
+    return;
   }
   const projectSlugLink = formatProject(link.org.slug, link.project.name);
   const downloadMessage = gitBranch ? `Downloading \`${import_chalk7.default.cyan(
@@ -37557,20 +37620,34 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
   })).env;
   let deltaString = "";
   let oldEnv;
+  const downloadedEnv = getDownloadedEnv(records);
   if (exists) {
     oldEnv = await createEnvObject(fullPath);
     if (oldEnv) {
-      const newEnv = (0, import_json_parse_better_errors.default)(JSON.stringify(records).replace(/\\"/g, ""));
-      deltaString = buildDeltaString(oldEnv, newEnv);
+      deltaString = buildDeltaString(oldEnv, {
+        ...oldEnv,
+        ...downloadedEnv
+      });
     }
   }
-  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_extra4.outputFile)(fullPath, contents, "utf8");
+  const envToWrite = oldEnv ? {
+    ...oldEnv,
+    ...downloadedEnv
+  } : downloadedEnv;
   if (deltaString) {
     output_manager_default.print("\n" + deltaString);
   } else if (oldEnv && exists) {
     output_manager_default.log("No changes found.");
   }
+  if (requiresConfirmation && deltaString !== "" && !await client.input.confirm(
+    `Apply these changes to ${param(filename)}?`,
+    false
+  )) {
+    output_manager_default.log("Canceled");
+    return;
+  }
+  const contents = CONTENTS_PREFIX + Object.keys(envToWrite).sort().map((key) => `${key}="${escapeValue(envToWrite[key])}"`).join("\n") + "\n";
+  await (0, import_fs_extra4.outputFile)(fullPath, contents, "utf8");
   let isGitIgnoreUpdated = false;
   if (filename === ".env.local") {
     const rootPath = link.repoRoot ?? cwd;
@@ -37587,6 +37664,17 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
 function escapeValue(value) {
   return value ? value.replace(new RegExp("\n", "g"), "\\n").replace(new RegExp("\r", "g"), "\\r") : "";
 }
+function getDownloadedEnv(records) {
+  return (0, import_json_parse_better_errors.default)(
+    JSON.stringify(
+      Object.fromEntries(
+        Object.entries(records).filter(
+          ([key]) => !VARIABLES_TO_IGNORE.includes(key)
+        )
+      )
+    ).replace(/\\"/g, "")
+  );
+}
 
 // src/util/projects/find-project-root.ts
 var import_chalk8 = __toESM(require_source(), 1);

package/dist/chunks/{chunk-E6ZQVOZ6.js → chunk-4QETQOUQ.js}

@@ -9,10 +9,10 @@ import {
 } from "./chunk-IB5L4LKZ.js";
 import {
   require_dist as require_dist2
-} from "./chunk-Q7PNQO77.js";
+} from "./chunk-XGUZYJXE.js";
 import {
   require_execa
-} from "./chunk-YHX5HRA5.js";
+} from "./chunk-CUUJWNAY.js";
 import {
   VERCEL_DIR,
   readJSONFile,
@@ -21,7 +21,7 @@ import {
   require_dist2 as require_dist4,
   require_lib,
   require_minimatch2 as require_minimatch
-} from "./chunk-D6EWLYB6.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   require_pluralize
 } from "./chunk-7EHTK7LP.js";
@@ -11060,6 +11060,11 @@ var serviceConfigSchema = {
       minLength: 1,
       maxLength: 512
     },
+    subdomain: {
+      type: "string",
+      minLength: 1,
+      maxLength: 63
+    },
     framework: {
       type: "string",
       minLength: 1,
@@ -11091,9 +11096,10 @@ var serviceConfigSchema = {
       maximum: 10240
     },
     maxDuration: {
-      type: "integer",
-      minimum: 1,
-      maximum: 900
+      oneOf: [
+        { type: "integer", minimum: 1, maximum: 900 },
+        { type: "string", enum: ["max"] }
+      ]
     },
     includeFiles: {
       oneOf: [