@vercel/fs-detectors 5.8.5 → 5.8.6

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { detectBuilders, detectOutputDirectory, detectApiDirectory, detectApiExt
 export { detectServices, generateServicesRoutes, } from './services/detect-services';
 export { autoDetectServices } from './services/auto-detect';
 export type { AutoDetectOptions, AutoDetectResult, } from './services/auto-detect';
-export { isStaticBuild, isRouteOwningBuilder } from './services/utils';
+export { isStaticBuild, isRouteOwningBuilder, INTERNAL_SERVICE_PREFIX, getInternalServiceFunctionPath, } from './services/utils';
 export { getServicesBuilders } from './services/get-services-builders';
 export type { DetectServicesOptions, DetectServicesResult, ResolvedService, Service, ServicesRoutes, ServiceDetectionError, } from './services/types';
 export { detectFileSystemAPI } from './detect-file-system-api';

package/dist/index.js

@@ -22,6 +22,7 @@ __export(src_exports, {
   DetectorFilesystem: () => import_filesystem.DetectorFilesystem,
   GetWorkspaceOptions: () => import_get_workspaces.GetWorkspaceOptions,
   GetWorkspacePackagePathsOptions: () => import_get_workspace_package_paths.GetWorkspacePackagePathsOptions,
+  INTERNAL_SERVICE_PREFIX: () => import_utils.INTERNAL_SERVICE_PREFIX,
   LocalFileSystemDetector: () => import_local_file_system_detector.LocalFileSystemDetector,
   REGEX_NON_VERCEL_PLATFORM_FILES: () => import_detect_builders2.REGEX_NON_VERCEL_PLATFORM_FILES,
   Workspace: () => import_get_workspaces.Workspace,
@@ -39,6 +40,7 @@ __export(src_exports, {
   detectOutputDirectory: () => import_detect_builders.detectOutputDirectory,
   detectServices: () => import_detect_services.detectServices,
   generateServicesRoutes: () => import_detect_services.generateServicesRoutes,
+  getInternalServiceFunctionPath: () => import_utils.getInternalServiceFunctionPath,
   getProjectPaths: () => import_get_project_paths.getProjectPaths,
   getServicesBuilders: () => import_get_services_builders.getServicesBuilders,
   getWorkspacePackagePaths: () => import_get_workspace_package_paths.getWorkspacePackagePaths,
@@ -76,6 +78,7 @@ var import_detect_instrumentation = require("./detect-instrumentation");
   DetectorFilesystem,
   GetWorkspaceOptions,
   GetWorkspacePackagePathsOptions,
+  INTERNAL_SERVICE_PREFIX,
   LocalFileSystemDetector,
   REGEX_NON_VERCEL_PLATFORM_FILES,
   Workspace,
@@ -93,6 +96,7 @@ var import_detect_instrumentation = require("./detect-instrumentation");
   detectOutputDirectory,
   detectServices,
   generateServicesRoutes,
+  getInternalServiceFunctionPath,
   getProjectPaths,
   getServicesBuilders,
   getWorkspacePackagePaths,

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

@@ -1,4 +1,4 @@
-import type { DetectServicesOptions, DetectServicesResult, ResolvedService, ServicesRoutes } from './types';
+import { type DetectServicesOptions, type DetectServicesResult, type ResolvedService, type ServicesRoutes } from './types';
 /**
  * Detect and resolve services within a project.
  *
@@ -20,7 +20,8 @@ export declare function detectServices(options: DetectServicesOptions): Promise<
  *   SPA fallback routes to index.html under the service prefix.
  *
  * - **Runtime services** (`@vercel/python`, `@vercel/go`, `@vercel/ruby`, etc.):
- *   Prefix rewrites to the function entrypoint with `check: true`.
+ *   Prefix rewrites to an internal runtime destination (`/_svc/{name}/index`)
+ *   with `check: true`.
  *
  * Builders that provide their own routing (`@vercel/next`, `@vercel/backends`,
  * Build Output API builders, etc.) are not given synthetic routes here.

package/dist/services/detect-services.js

@@ -22,7 +22,7 @@ __export(detect_services_exports, {
   generateServicesRoutes: () => generateServicesRoutes
 });
 module.exports = __toCommonJS(detect_services_exports);
-var import_types = require("./types");
+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");
@@ -86,45 +86,47 @@ function generateServicesRoutes(services) {
   const defaults = [];
   const crons = [];
   const workers = [];
-  const entrypointExtensions = Object.keys(import_types.ENTRYPOINT_EXTENSIONS).sort(
-    (a, b) => b.length - a.length
-  );
-  const stripEntrypointExtension = (entrypoint) => {
-    for (const ext of entrypointExtensions) {
-      if (entrypoint.endsWith(ext)) {
-        return entrypoint.slice(0, -ext.length);
-      }
-    }
-    return entrypoint;
-  };
   const sortedWebServices = services.filter(
     (s) => s.type === "web" && typeof s.routePrefix === "string"
   ).sort((a, b) => b.routePrefix.length - a.routePrefix.length);
+  const allWebPrefixes = getWebRoutePrefixes(sortedWebServices);
   for (const service of sortedWebServices) {
     const { routePrefix } = service;
     const normalizedPrefix = routePrefix.slice(1);
+    const ownershipGuard = (0, import_routing_utils.getOwnershipGuard)(routePrefix, allWebPrefixes);
     if ((0, import_utils.isRouteOwningBuilder)(service)) {
       continue;
     }
     if ((0, import_utils.isStaticBuild)(service)) {
       if (routePrefix === "/") {
         defaults.push({ handle: "filesystem" });
-        defaults.push({ src: "/(.*)", dest: "/index.html" });
+        defaults.push({
+          src: (0, import_routing_utils.scopeRouteSourceToOwnership)("/(.*)", ownershipGuard),
+          dest: "/index.html"
+        });
       } else {
         rewrites.push({
-          src: `^/${normalizedPrefix}(?:/.*)?$`,
+          src: (0, import_routing_utils.scopeRouteSourceToOwnership)(
+            `^/${normalizedPrefix}(?:/.*)?$`,
+            ownershipGuard
+          ),
           dest: `/${normalizedPrefix}/index.html`
         });
       }
     } else if (service.runtime) {
-      const builderSrc = service.builder.src || routePrefix;
-      const extensionless = stripEntrypointExtension(builderSrc);
-      const functionPath = extensionless.startsWith("/") ? extensionless : `/${extensionless}`;
+      const functionPath = (0, import_utils.getInternalServiceFunctionPath)(service.name);
       if (routePrefix === "/") {
-        defaults.push({ src: "^/(.*)$", dest: functionPath, check: true });
+        defaults.push({
+          src: (0, import_routing_utils.scopeRouteSourceToOwnership)("^/(.*)$", ownershipGuard),
+          dest: functionPath,
+          check: true
+        });
       } else {
         rewrites.push({
-          src: `^/${normalizedPrefix}(?:/.*)?$`,
+          src: (0, import_routing_utils.scopeRouteSourceToOwnership)(
+            `^/${normalizedPrefix}(?:/.*)?$`,
+            ownershipGuard
+          ),
           dest: functionPath,
           check: true
         });
@@ -135,6 +137,16 @@ function generateServicesRoutes(services) {
   }
   return { rewrites, defaults, crons, workers };
 }
+function getWebRoutePrefixes(services) {
+  const unique = /* @__PURE__ */ new Set();
+  for (const service of services) {
+    if (service.type !== "web" || typeof service.routePrefix !== "string") {
+      continue;
+    }
+    unique.add((0, import_routing_utils.normalizeRoutePrefix)(service.routePrefix));
+  }
+  return Array.from(unique);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   detectServices,

package/dist/services/resolve.js

@@ -37,14 +37,12 @@ var import_path = require("path");
 var import_types = require("./types");
 var import_utils = require("./utils");
 var import_frameworks = __toESM(require("@vercel/frameworks"));
+var import_routing_utils = require("@vercel/routing-utils");
 const frameworksBySlug = new Map(import_frameworks.default.map((f) => [f.slug, f]));
 const SERVICE_NAME_REGEX = /^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$/;
-function normalizeRoutePrefix(routePrefix) {
-  let normalized = routePrefix.startsWith("/") ? routePrefix : `/${routePrefix}`;
-  if (normalized !== "/" && normalized.endsWith("/")) {
-    normalized = normalized.slice(0, -1);
-  }
-  return normalized || "/";
+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 validateServiceConfig(name, config) {
   if (!SERVICE_NAME_REGEX.test(name)) {
@@ -69,6 +67,13 @@ function validateServiceConfig(name, config) {
       serviceName: name
     };
   }
+  if (serviceType === "web" && config.routePrefix && isReservedServiceRoutePrefix(config.routePrefix)) {
+    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.`,
+      serviceName: name
+    };
+  }
   if ((serviceType === "worker" || serviceType === "cron") && config.routePrefix) {
     return {
       code: "INVALID_ROUTE_PREFIX",
@@ -206,7 +211,7 @@ function resolveAllConfiguredServices(services) {
     }
     const service = resolveConfiguredService(name, serviceConfig);
     if (service.type === "web" && typeof service.routePrefix === "string") {
-      const normalizedRoutePrefix = normalizeRoutePrefix(service.routePrefix);
+      const normalizedRoutePrefix = (0, import_routing_utils.normalizeRoutePrefix)(service.routePrefix);
       const existingServiceName = webServicesByRoutePrefix.get(
         normalizedRoutePrefix
       );

package/dist/services/utils.d.ts

@@ -1,5 +1,10 @@
 import type { DetectorFilesystem } from '../detectors/filesystem';
 import type { ServiceRuntime, ExperimentalServices, ServiceDetectionError, ResolvedService } from './types';
+/**
+ * Reserved internal namespace used by services routing/runtime plumbing.
+ */
+export declare const INTERNAL_SERVICE_PREFIX = "/_svc";
+export declare function getInternalServiceFunctionPath(serviceName: string): string;
 export declare function getBuilderForRuntime(runtime: ServiceRuntime): string;
 export declare function isStaticBuild(service: ResolvedService): boolean;
 /**

package/dist/services/utils.js

@@ -18,7 +18,9 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  INTERNAL_SERVICE_PREFIX: () => INTERNAL_SERVICE_PREFIX,
   getBuilderForRuntime: () => getBuilderForRuntime,
+  getInternalServiceFunctionPath: () => getInternalServiceFunctionPath,
   inferServiceRuntime: () => inferServiceRuntime,
   isRouteOwningBuilder: () => isRouteOwningBuilder,
   isStaticBuild: () => isStaticBuild,
@@ -27,6 +29,10 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_framework_helpers = require("@vercel/build-utils/dist/framework-helpers");
 var import_types = require("./types");
+const INTERNAL_SERVICE_PREFIX = "/_svc";
+function getInternalServiceFunctionPath(serviceName) {
+  return `${INTERNAL_SERVICE_PREFIX}/${serviceName}/index`;
+}
 function getBuilderForRuntime(runtime) {
   const builder = import_types.RUNTIME_BUILDERS[runtime];
   if (!builder) {
@@ -87,7 +93,9 @@ async function readVercelConfig(fs) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  INTERNAL_SERVICE_PREFIX,
   getBuilderForRuntime,
+  getInternalServiceFunctionPath,
   inferServiceRuntime,
   isRouteOwningBuilder,
   isStaticBuild,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "5.8.5",
+  "version": "5.8.6",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -19,7 +19,7 @@
     "json5": "2.2.2",
     "minimatch": "3.1.2",
     "semver": "6.3.1",
-    "@vercel/routing-utils": "5.3.2",
+    "@vercel/routing-utils": "5.3.3",
     "@vercel/frameworks": "3.17.1",
     "@vercel/error-utils": "2.0.3"
   },
@@ -32,7 +32,7 @@
     "@types/semver": "7.3.10",
     "jest-junit": "16.0.0",
     "typescript": "4.9.5",
-    "@vercel/build-utils": "13.3.5"
+    "@vercel/build-utils": "13.4.0"
   },
   "scripts": {
     "build": "node ../../utils/build.mjs",