@vercel/static-build 2.8.46 → 2.9.0

package/dist/index.js

@@ -22890,6 +22890,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_path7.posix.normalize(entrypoint);
       return normalized === "" ? "." : normalized;
@@ -23020,10 +23021,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
         };
       }
@@ -23041,6 +23051,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",
@@ -23175,7 +23192,10 @@ var require_resolve = __commonJS({
         builderUse = (0, import_utils.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_path7.posix.join(workspace, builderSrc);
@@ -23211,7 +23231,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,
@@ -23614,6 +23635,10 @@ var require_detect_services = __commonJS({
     var import_utils = require_utils4();
     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 detectServices2(options) {
       const { fs: fs5, workPath } = options;
       const scopedFs = workPath ? fs5.chdir(workPath) : fs5;
@@ -23622,7 +23647,13 @@ var require_detect_services = __commonJS({
         return {
           services: [],
           source: "configured",
-          routes: { rewrites: [], defaults: [], crons: [], workers: [] },
+          routes: {
+            hostRewrites: [],
+            rewrites: [],
+            defaults: [],
+            crons: [],
+            workers: []
+          },
           errors: [configError],
           warnings: []
         };
@@ -23635,7 +23666,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: []
           };
@@ -23658,7 +23695,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",
@@ -23683,6 +23726,7 @@ var require_detect_services = __commonJS({
       };
     }
     function generateServicesRoutes2(services) {
+      const hostRewrites = [];
       const rewrites = [];
       const defaults = [];
       const crons = [];
@@ -23695,6 +23739,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_utils.isRouteOwningBuilder)(service)) {
           continue;
         }
@@ -23764,7 +23827,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, "\\$&");
@@ -23779,6 +23842,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;
+    }
   }
 });
 
@@ -24019,6 +24091,7 @@ var require_get_services_builders = __commonJS({
             }
           ],
           warnings: [],
+          hostRewriteRoutes: null,
           defaultRoutes: null,
           redirectRoutes: null,
           rewriteRoutes: null,
@@ -24039,6 +24112,7 @@ var require_get_services_builders = __commonJS({
             message: e.message
           })),
           warnings: warningResponses,
+          hostRewriteRoutes: null,
           defaultRoutes: null,
           redirectRoutes: null,
           rewriteRoutes: null,
@@ -24055,6 +24129,7 @@ var require_get_services_builders = __commonJS({
             }
           ],
           warnings: warningResponses,
+          hostRewriteRoutes: null,
           defaultRoutes: null,
           redirectRoutes: null,
           rewriteRoutes: null,
@@ -24066,6 +24141,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 ? [
@@ -24545,10 +24621,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)) {
@@ -32590,7 +32666,7 @@ function parseFunctionConfig(data) {
   if (typeof data.memory === "number") {
     config.memory = data.memory;
   }
-  if (typeof data.maxDuration === "number") {
+  if (typeof data.maxDuration === "number" || data.maxDuration === "max") {
     config.maxDuration = data.maxDuration;
   }
   if (typeof data.runtime === "string" && typeof data.handler === "string") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.8.46",
+  "version": "2.9.0",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -15,8 +15,8 @@
   "dependencies": {
     "ts-morph": "12.0.0",
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/gatsby-plugin-vercel-builder": "2.0.144",
-    "@vercel/static-config": "3.1.2"
+    "@vercel/gatsby-plugin-vercel-builder": "2.1.0",
+    "@vercel/static-config": "3.2.0"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
@@ -38,11 +38,11 @@
     "rc9": "1.2.0",
     "semver": "7.5.2",
     "tree-kill": "1.2.2",
-    "@vercel/build-utils": "13.7.0",
-    "@vercel/error-utils": "2.0.3",
+    "@vercel/build-utils": "13.8.0",
     "@vercel/frameworks": "3.20.0",
-    "@vercel/routing-utils": "6.0.2",
-    "@vercel/fs-detectors": "5.9.0"
+    "@vercel/error-utils": "2.0.3",
+    "@vercel/fs-detectors": "5.10.0",
+    "@vercel/routing-utils": "6.0.2"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",