@vercel/fs-detectors 5.15.1 → 5.15.2

package/dist/services/resolve.js

@@ -160,6 +160,84 @@ function isReservedServiceRoutePrefix(routePrefix) {
   const normalized = (0, import_routing_utils.normalizeRoutePrefix)(routePrefix);
   return normalized === import_utils.INTERNAL_SERVICE_PREFIX || normalized.startsWith(`${import_utils.INTERNAL_SERVICE_PREFIX}/`);
 }
+function resolveServiceRoutingConfig(name, config) {
+  const hasLegacyRoutePrefix = typeof config.routePrefix === "string";
+  const hasLegacySubdomain = typeof config.subdomain === "string";
+  if (config.mount === void 0) {
+    return {
+      routing: {
+        routePrefix: config.routePrefix,
+        subdomain: config.subdomain,
+        routePrefixConfigured: hasLegacyRoutePrefix
+      }
+    };
+  }
+  if (hasLegacyRoutePrefix || hasLegacySubdomain) {
+    return {
+      error: {
+        code: "CONFLICTING_MOUNT_CONFIG",
+        message: `Service "${name}" cannot mix "mount" with "routePrefix" or "subdomain". Use only one routing configuration style.`,
+        serviceName: name
+      }
+    };
+  }
+  if (typeof config.mount === "string") {
+    return {
+      routing: {
+        routePrefix: config.mount,
+        routePrefixConfigured: true
+      }
+    };
+  }
+  if (!config.mount || typeof config.mount !== "object" || Array.isArray(config.mount)) {
+    return {
+      error: {
+        code: "INVALID_MOUNT",
+        message: `Service "${name}" has invalid "mount" config. Use a string path such as "/api" or an object like { path: "/api", subdomain: "api" }.`,
+        serviceName: name
+      }
+    };
+  }
+  const hasInvalidMountKeys = Object.keys(config.mount).some(
+    (key) => key !== "path" && key !== "subdomain"
+  );
+  if (hasInvalidMountKeys) {
+    return {
+      error: {
+        code: "INVALID_MOUNT",
+        message: `Service "${name}" has invalid "mount" config. Only "path" and "subdomain" are supported.`,
+        serviceName: name
+      }
+    };
+  }
+  const mountPath = config.mount.path;
+  const mountSubdomain = config.mount.subdomain;
+  if (mountPath !== void 0 && typeof mountPath !== "string" || mountSubdomain !== void 0 && typeof mountSubdomain !== "string") {
+    return {
+      error: {
+        code: "INVALID_MOUNT",
+        message: `Service "${name}" has invalid "mount" config. "path" and "subdomain" must be strings when provided.`,
+        serviceName: name
+      }
+    };
+  }
+  if (typeof mountPath !== "string" && typeof mountSubdomain !== "string") {
+    return {
+      error: {
+        code: "INVALID_MOUNT",
+        message: `Service "${name}" has invalid "mount" config. Specify at least one of "mount.path" or "mount.subdomain".`,
+        serviceName: name
+      }
+    };
+  }
+  return {
+    routing: {
+      routePrefix: mountPath,
+      subdomain: mountSubdomain,
+      routePrefixConfigured: typeof mountPath === "string"
+    }
+  };
+}
 function validateServiceConfig(name, config) {
   if (!SERVICE_NAME_REGEX.test(name)) {
     return {
@@ -176,40 +254,46 @@ function validateServiceConfig(name, config) {
     };
   }
   const serviceType = config.type || "web";
-  const hasRoutePrefix = typeof config.routePrefix === "string";
-  const hasSubdomain = typeof config.subdomain === "string";
-  if (hasSubdomain && !DNS_LABEL_RE.test(config.subdomain)) {
+  const routingResult = resolveServiceRoutingConfig(name, config);
+  if (routingResult.error) {
+    return routingResult.error;
+  }
+  const configuredRoutePrefix = routingResult.routing?.routePrefix;
+  const configuredSubdomain = routingResult.routing?.subdomain;
+  const hasRoutePrefix = typeof configuredRoutePrefix === "string";
+  const hasSubdomain = typeof configuredSubdomain === "string";
+  if (hasSubdomain && !DNS_LABEL_RE.test(configuredSubdomain)) {
     return {
       code: "INVALID_SUBDOMAIN",
-      message: `Web service "${name}" has invalid subdomain "${config.subdomain}". Use a single DNS label such as "api".`,
+      message: `Web service "${name}" has invalid subdomain "${configuredSubdomain}". 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 at least one of "routePrefix" or "subdomain".`,
+      message: `Web service "${name}" must specify at least one of "mount", "routePrefix", or "subdomain".`,
       serviceName: name
     };
   }
-  if (serviceType === "web" && config.routePrefix && isReservedServiceRoutePrefix(config.routePrefix)) {
+  if (serviceType === "web" && configuredRoutePrefix && isReservedServiceRoutePrefix(configuredRoutePrefix)) {
     return {
       code: "RESERVED_ROUTE_PREFIX",
-      message: `Web service "${name}" cannot use routePrefix "${config.routePrefix}". The "${import_utils.INTERNAL_SERVICE_PREFIX}" prefix is reserved for internal services routing.`,
+      message: `Web service "${name}" cannot use routePrefix "${configuredRoutePrefix}". The "${import_utils.INTERNAL_SERVICE_PREFIX}" prefix is reserved for internal services routing.`,
       serviceName: name
     };
   }
-  if ((serviceType === "worker" || serviceType === "cron") && config.routePrefix) {
+  if ((serviceType === "worker" || serviceType === "cron") && configuredRoutePrefix) {
     return {
       code: "INVALID_ROUTE_PREFIX",
-      message: `${serviceType === "worker" ? "Worker" : "Cron"} service "${name}" cannot have "routePrefix". Only web services should specify "routePrefix".`,
+      message: `${serviceType === "worker" ? "Worker" : "Cron"} service "${name}" cannot have "routePrefix" or "mount". Only web services should specify path-based routing.`,
       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.`,
+      message: `${serviceType === "worker" ? "Worker" : "Cron"} service "${name}" cannot have "subdomain" or "mount.subdomain". Only web services should specify subdomain routing.`,
       serviceName: name
     };
   }
@@ -301,6 +385,13 @@ async function resolveConfiguredService(options) {
   const type = config.type || "web";
   const rawEntrypoint = config.entrypoint;
   const moduleAttrParsed = typeof rawEntrypoint === "string" && type === "cron" ? parsePyModuleAttrEntrypoint(rawEntrypoint) : null;
+  const routingResult = resolveServiceRoutingConfig(name, config);
+  if (routingResult.error) {
+    throw new Error(routingResult.error.message);
+  }
+  const configuredRoutePrefix = routingResult.routing?.routePrefix;
+  const configuredSubdomain = routingResult.routing?.subdomain;
+  const routePrefixWasConfigured = routingResult.routing?.routePrefixConfigured ?? false;
   let resolvedEntrypointPath = resolvedEntrypoint;
   if (!resolvedEntrypointPath && typeof rawEntrypoint === "string") {
     const entrypointToResolve = moduleAttrParsed ? moduleAttrParsed.filePath : rawEntrypoint;
@@ -370,10 +461,10 @@ async function resolveConfiguredService(options) {
     }
     builderSrc = resolvedEntrypointFile;
   }
-  const normalizedSubdomain = type === "web" && typeof config.subdomain === "string" ? config.subdomain.toLowerCase() : void 0;
+  const normalizedSubdomain = type === "web" && typeof configuredSubdomain === "string" ? configuredSubdomain.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 routePrefix = type === "web" && (configuredRoutePrefix || defaultRoutePrefix) ? (configuredRoutePrefix || defaultRoutePrefix).startsWith("/") ? configuredRoutePrefix || defaultRoutePrefix : `/${configuredRoutePrefix || defaultRoutePrefix}` : void 0;
+  const resolvedRoutePrefixSource = type === "web" && typeof routePrefix === "string" ? routePrefixWasConfigured ? routePrefixSource : "generated" : void 0;
   const isRoot = workspace === ".";
   if (!isRoot) {
     builderSrc = import_path.posix.join(workspace, builderSrc);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "5.15.1",
+  "version": "5.15.2",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,10 +20,10 @@
     "minimatch": "3.1.2",
     "semver": "6.3.1",
     "smol-toml": "1.5.2",
-    "@vercel/build-utils": "13.14.1",
-    "@vercel/error-utils": "2.0.3",
     "@vercel/frameworks": "3.24.0",
-    "@vercel/routing-utils": "6.1.1"
+    "@vercel/build-utils": "13.14.2",
+    "@vercel/routing-utils": "6.1.1",
+    "@vercel/error-utils": "2.0.3"
   },
   "devDependencies": {
     "@types/glob": "7.2.0",