@vercel/fs-detectors 5.9.0 → 5.10.0

package/dist/detect-builders.d.ts

@@ -37,6 +37,7 @@ export declare function detectBuilders(files: string[], pkg?: PackageJson | unde
     builders: Builder[] | null;
     errors: ErrorResponse[] | null;
     warnings: ErrorResponse[];
+    hostRewriteRoutes?: Route[] | null;
     defaultRoutes: Route[] | null;
     redirectRoutes: Route[] | null;
     rewriteRoutes: Route[] | null;

package/dist/detect-builders.js

@@ -460,10 +460,10 @@ function validateFunctions({ functions = {} }) {
         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)) {

package/dist/services/detect-services.d.ts

@@ -1,8 +1,8 @@
-import { type DetectServicesOptions, type DetectServicesResult, type ResolvedService, type ServicesRoutes } from './types';
+import { type DetectServicesOptions, type DetectServicesResult, type Service, type ServicesRoutes } from './types';
 /**
  * Detect and resolve services within a project.
  *
- * Reads vercel.json and resolves `experimentalServices` into ResolvedService objects.
+ * Reads vercel.json and resolves `experimentalServices` into Service objects.
  * Returns an error if no services are configured.
  */
 export declare function detectServices(options: DetectServicesOptions): Promise<DetectServicesResult>;
@@ -34,4 +34,4 @@ export declare function detectServices(options: DetectServicesOptions): Promise<
  *   Internal cron callback routes under `/_svc/{serviceName}/crons/{entry}/{handler}`
  *   that rewrite to `/_svc/{serviceName}/index`.
  */
-export declare function generateServicesRoutes(services: ResolvedService[]): ServicesRoutes;
+export declare function generateServicesRoutes(services: Service[]): ServicesRoutes;

package/dist/services/detect-services.js

@@ -26,6 +26,10 @@ var import_routing_utils = require("@vercel/routing-utils");
 var import_utils = require("./utils");
 var import_resolve = require("./resolve");
 var import_auto_detect = require("./auto-detect");
+const PREVIEW_DOMAIN_MISSING = [
+  { type: "host", value: { suf: ".vercel.app" } },
+  { type: "host", value: { suf: ".vercel.dev" } }
+];
 async function detectServices(options) {
   const { fs, workPath } = options;
   const scopedFs = workPath ? fs.chdir(workPath) : fs;
@@ -34,7 +38,13 @@ async function detectServices(options) {
     return {
       services: [],
       source: "configured",
-      routes: { rewrites: [], defaults: [], crons: [], workers: [] },
+      routes: {
+        hostRewrites: [],
+        rewrites: [],
+        defaults: [],
+        crons: [],
+        workers: []
+      },
       errors: [configError],
       warnings: []
     };
@@ -47,7 +57,13 @@ async function detectServices(options) {
       return {
         services: [],
         source: "auto-detected",
-        routes: { rewrites: [], defaults: [], crons: [], workers: [] },
+        routes: {
+          hostRewrites: [],
+          rewrites: [],
+          defaults: [],
+          crons: [],
+          workers: []
+        },
         errors: autoResult.errors,
         warnings: []
       };
@@ -70,7 +86,13 @@ async function detectServices(options) {
     return {
       services: [],
       source: "auto-detected",
-      routes: { rewrites: [], defaults: [], crons: [], workers: [] },
+      routes: {
+        hostRewrites: [],
+        rewrites: [],
+        defaults: [],
+        crons: [],
+        workers: []
+      },
       errors: [
         {
           code: "NO_SERVICES_CONFIGURED",
@@ -95,6 +117,7 @@ async function detectServices(options) {
   };
 }
 function generateServicesRoutes(services) {
+  const hostRewrites = [];
   const rewrites = [];
   const defaults = [];
   const crons = [];
@@ -107,6 +130,25 @@ function generateServicesRoutes(services) {
     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;
     }
@@ -176,7 +218,7 @@ function generateServicesRoutes(services) {
       check: true
     });
   }
-  return { rewrites, defaults, crons, workers };
+  return { hostRewrites, rewrites, defaults, crons, workers };
 }
 function escapeRegex(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -191,6 +233,15 @@ function getWebRoutePrefixes(services) {
   }
   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;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   detectServices,

package/dist/services/get-services-builders.d.ts

@@ -14,6 +14,7 @@ export interface ServicesBuildersResult {
     builders: Builder[] | null;
     errors: ErrorResponse[] | null;
     warnings: ErrorResponse[];
+    hostRewriteRoutes: Route[] | null;
     defaultRoutes: Route[] | null;
     redirectRoutes: Route[] | null;
     rewriteRoutes: Route[] | null;

package/dist/services/get-services-builders.js

@@ -35,6 +35,7 @@ async function getServicesBuilders(options) {
         }
       ],
       warnings: [],
+      hostRewriteRoutes: null,
       defaultRoutes: null,
       redirectRoutes: null,
       rewriteRoutes: null,
@@ -55,6 +56,7 @@ async function getServicesBuilders(options) {
         message: e.message
       })),
       warnings: warningResponses,
+      hostRewriteRoutes: null,
       defaultRoutes: null,
       redirectRoutes: null,
       rewriteRoutes: null,
@@ -71,6 +73,7 @@ async function getServicesBuilders(options) {
         }
       ],
       warnings: warningResponses,
+      hostRewriteRoutes: null,
       defaultRoutes: null,
       redirectRoutes: null,
       rewriteRoutes: null,
@@ -82,6 +85,7 @@ async function getServicesBuilders(options) {
     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 ? [

package/dist/services/resolve.js

@@ -52,6 +52,7 @@ function parsePyModuleAttrEntrypoint(entrypoint) {
   };
 }
 const SERVICE_NAME_REGEX = /^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$/;
+const DNS_LABEL_RE = /^(?!-)[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/i;
 function normalizeServiceEntrypoint(entrypoint) {
   const normalized = import_path.posix.normalize(entrypoint);
   return normalized === "" ? "." : normalized;
@@ -182,10 +183,19 @@ function validateServiceConfig(name, config) {
     };
   }
   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
     };
   }
@@ -203,6 +213,13 @@ function validateServiceConfig(name, config) {
       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",
@@ -337,7 +354,10 @@ async function resolveConfiguredService(options) {
     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_path.posix.join(workspace, builderSrc);
@@ -373,7 +393,8 @@ async function resolveConfiguredService(options) {
     workspace,
     entrypoint: resolvedEntrypointFile,
     routePrefix,
-    routePrefixSource: type === "web" && typeof routePrefix === "string" ? routePrefixSource : void 0,
+    routePrefixSource: resolvedRoutePrefixSource,
+    subdomain: normalizedSubdomain,
     framework: config.framework,
     builder: {
       src: builderSrc,

package/dist/services/types.d.ts

@@ -15,6 +15,8 @@ export interface DetectServicesOptions {
     workPath?: string;
 }
 export interface ServicesRoutes {
+    /** Host-based rewrite routes for subdomain-mounted web services */
+    hostRewrites: Route[];
     /** Rewrite routes for non-root web services (prefix-based) */
     rewrites: Route[];
     /** Default routes (catch-all for root web service) */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "5.9.0",
+  "version": "5.10.0",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -19,9 +19,9 @@
     "json5": "2.2.2",
     "minimatch": "3.1.2",
     "semver": "6.3.1",
-    "@vercel/frameworks": "3.20.0",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/routing-utils": "6.0.2"
+    "@vercel/routing-utils": "6.0.2",
+    "@vercel/frameworks": "3.20.0"
   },
   "devDependencies": {
     "@types/glob": "7.2.0",
@@ -32,7 +32,7 @@
     "@types/semver": "7.3.10",
     "jest-junit": "16.0.0",
     "typescript": "4.9.5",
-    "@vercel/build-utils": "13.7.0"
+    "@vercel/build-utils": "13.8.0"
   },
   "scripts": {
     "build": "node ../../utils/build.mjs",