@vercel/fs-detectors 5.10.3 → 5.11.0

package/dist/services/detect-services.js

@@ -126,6 +126,7 @@ function generateServicesRoutes(services) {
     (s) => s.type === "web" && typeof s.routePrefix === "string"
   ).sort((a, b) => b.routePrefix.length - a.routePrefix.length);
   const allWebPrefixes = getWebRoutePrefixes(sortedWebServices);
+  const explicitHostPrefixGuard = getExplicitHostPrefixNegativeLookahead(allWebPrefixes);
   for (const service of sortedWebServices) {
     const { routePrefix } = service;
     const normalizedPrefix = routePrefix.slice(1);
@@ -133,7 +134,6 @@ function generateServicesRoutes(services) {
     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,
@@ -142,7 +142,9 @@ function generateServicesRoutes(services) {
         check: true
       });
       hostRewrites.push({
-        src: `^/(?!${escapedPrefix}(?:/|$))(.*)$`,
+        // Preserve explicit service prefixes so canonical paths like /_/api
+        // keep routing to their target service even on another service's host.
+        src: `^/${explicitHostPrefixGuard}(.*)$`,
         dest: `${normalizedRoutePrefix}/$1`,
         has: hostCondition,
         missing: PREVIEW_DOMAIN_MISSING,
@@ -233,6 +235,16 @@ function getWebRoutePrefixes(services) {
   }
   return Array.from(unique);
 }
+function getExplicitHostPrefixNegativeLookahead(routePrefixes) {
+  const explicitPrefixes = routePrefixes.map(import_routing_utils.normalizeRoutePrefix).filter((prefix) => prefix !== "/").sort((a, b) => b.length - a.length).map((prefix) => escapeRegex(prefix.slice(1)));
+  if (explicitPrefixes.length === 0) {
+    return "";
+  }
+  if (explicitPrefixes.length === 1) {
+    return `(?!${explicitPrefixes[0]}(?:/|$))`;
+  }
+  return `(?!(?:${explicitPrefixes.join("|")})(?:/|$))`;
+}
 function getHostCondition(service) {
   if (service.type !== "web") {
     return void 0;

package/dist/services/utils.d.ts

@@ -5,6 +5,10 @@ export declare function hasFile(fs: DetectorFilesystem, filePath: string): Promi
  * Reserved internal namespace used by services routing/runtime plumbing.
  */
 export declare const INTERNAL_SERVICE_PREFIX = "/_svc";
+/**
+ * Reserved internal namespace used by the dev queue proxy.
+ */
+export declare const INTERNAL_QUEUES_PREFIX = "/_svc/_queues";
 export declare function getInternalServiceFunctionPath(serviceName: string): string;
 export declare function getInternalServiceWorkerPathPrefix(serviceName: string): string;
 export declare function getInternalServiceCronPathPrefix(serviceName: string): string;

package/dist/services/utils.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  INTERNAL_QUEUES_PREFIX: () => INTERNAL_QUEUES_PREFIX,
   INTERNAL_SERVICE_PREFIX: () => INTERNAL_SERVICE_PREFIX,
   filterFrameworksByRuntime: () => filterFrameworksByRuntime,
   getBuilderForRuntime: () => getBuilderForRuntime,
@@ -44,6 +45,7 @@ async function hasFile(fs, filePath) {
   }
 }
 const INTERNAL_SERVICE_PREFIX = "/_svc";
+const INTERNAL_QUEUES_PREFIX = "/_svc/_queues";
 function getInternalServiceFunctionPath(serviceName) {
   return `${INTERNAL_SERVICE_PREFIX}/${serviceName}/index`;
 }
@@ -146,6 +148,7 @@ async function readVercelConfig(fs) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  INTERNAL_QUEUES_PREFIX,
   INTERNAL_SERVICE_PREFIX,
   filterFrameworksByRuntime,
   getBuilderForRuntime,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "5.10.3",
+  "version": "5.11.0",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,8 +20,8 @@
     "minimatch": "3.1.2",
     "semver": "6.3.1",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/frameworks": "3.21.1",
-    "@vercel/routing-utils": "6.0.2"
+    "@vercel/routing-utils": "6.0.2",
+    "@vercel/frameworks": "3.21.1"
   },
   "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.8.0"
+    "@vercel/build-utils": "13.8.1"
   },
   "scripts": {
     "build": "node ../../utils/build.mjs",