@vercel/fs-detectors 5.10.3 → 5.11.1

package/dist/detect-builders.js

@@ -41,7 +41,7 @@ module.exports = __toCommonJS(detect_builders_exports);
 var import_minimatch = __toESM(require("minimatch"));
 var import_semver = require("semver");
 var import_path = require("path");
-var import_frameworks = __toESM(require("@vercel/frameworks"));
+var import_frameworks = require("@vercel/frameworks");
 var import_is_official_runtime = require("./is-official-runtime");
 var import_build_utils = require("@vercel/build-utils");
 var import_get_services_builders = require("./services/get-services-builders");
@@ -49,7 +49,7 @@ const REGEX_MIDDLEWARE_FILES = "middleware.[jt]s";
 const REGEX_VERCEL_PLATFORM_FILES = `api/**,package.json,${REGEX_MIDDLEWARE_FILES}`;
 const REGEX_NON_VERCEL_PLATFORM_FILES = `!{${REGEX_VERCEL_PLATFORM_FILES}}`;
 const slugToFramework = new Map(
-  import_frameworks.default.map((f) => [f.slug, f])
+  import_frameworks.frameworkList.map((f) => [f.slug, f])
 );
 function sortFiles(fileA, fileB) {
   return fileA.localeCompare(fileB);

package/dist/services/auto-detect.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var auto_detect_exports = {};
 __export(auto_detect_exports, {
@@ -32,20 +22,20 @@ __export(auto_detect_exports, {
 });
 module.exports = __toCommonJS(auto_detect_exports);
 var import_detect_framework = require("../detect-framework");
-var import_frameworks = __toESM(require("@vercel/frameworks"));
+var import_frameworks = require("@vercel/frameworks");
 const FRONTEND_DIR = "frontend";
 const APPS_WEB_DIR = "apps/web";
 const BACKEND_DIR = "backend";
 const SERVICES_DIR = "services";
 const FRONTEND_LOCATIONS = [FRONTEND_DIR, APPS_WEB_DIR];
-const DETECTION_FRAMEWORKS = import_frameworks.default.filter(
+const DETECTION_FRAMEWORKS = import_frameworks.frameworkList.filter(
   (framework) => !framework.experimental || framework.runtimeFramework
 );
 async function autoDetectServices(options) {
   const { fs } = options;
   const rootFrameworks = await (0, import_detect_framework.detectFrameworks)({
     fs,
-    frameworkList: import_frameworks.default
+    frameworkList: import_frameworks.frameworkList
   });
   if (rootFrameworks.length > 1) {
     const frameworkNames = rootFrameworks.map((f) => f.name).join(", ");
@@ -70,7 +60,7 @@ async function autoDetectServices(options) {
     const frontendFs = fs.chdir(frontendLocation);
     const frontendFrameworks = await (0, import_detect_framework.detectFrameworks)({
       fs: frontendFs,
-      frameworkList: import_frameworks.default
+      frameworkList: import_frameworks.frameworkList
     });
     if (frontendFrameworks.length > 1) {
       const frameworkNames = frontendFrameworks.map((f) => f.name).join(", ");

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/resolve.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var resolve_exports = {};
 __export(resolve_exports, {
@@ -37,10 +27,11 @@ module.exports = __toCommonJS(resolve_exports);
 var import_path = require("path");
 var import_types = require("./types");
 var import_utils = require("./utils");
-var import_frameworks = __toESM(require("@vercel/frameworks"));
+var import_frameworks = require("@vercel/frameworks");
 var import_detect_framework = require("../detect-framework");
 var import_routing_utils = require("@vercel/routing-utils");
-const frameworksBySlug = new Map(import_frameworks.default.map((f) => [f.slug, f]));
+var import_build_utils = require("@vercel/build-utils");
+const frameworksBySlug = new Map(import_frameworks.frameworkList.map((f) => [f.slug, f]));
 const PYTHON_MODULE_ATTR_RE = /^([A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*)*):([A-Za-z_][\w]*)$/;
 function parsePyModuleAttrEntrypoint(entrypoint) {
   const match = PYTHON_MODULE_ATTR_RE.exec(entrypoint);
@@ -141,7 +132,7 @@ async function detectFrameworkFromWorkspace({
   runtime
 }) {
   const serviceFs = workspace === "." ? fs : fs.chdir(workspace);
-  const frameworkCandidates = (0, import_utils.filterFrameworksByRuntime)(import_frameworks.default, runtime);
+  const frameworkCandidates = (0, import_utils.filterFrameworksByRuntime)(import_frameworks.frameworkList, runtime);
   const frameworks = await (0, import_detect_framework.detectFrameworks)({
     fs: serviceFs,
     frameworkList: frameworkCandidates
@@ -273,6 +264,7 @@ function validateServiceConfig(name, config) {
 function validateServiceEntrypoint(name, config, resolvedEntrypoint) {
   if (!resolvedEntrypoint.isDirectory && !config.builder && !config.runtime && !config.framework) {
     const runtime = (0, import_utils.inferServiceRuntime)({
+      ...config,
       entrypoint: resolvedEntrypoint.normalized
     });
     if (!runtime) {
@@ -343,15 +335,28 @@ async function resolveConfiguredService(options) {
   const consumer = type === "worker" ? config.consumer || "default" : config.consumer;
   let builderUse;
   let builderSrc;
-  if (config.framework) {
-    const framework = frameworksBySlug.get(config.framework);
-    builderUse = framework?.useRuntime?.use || "@vercel/static-build";
-    builderSrc = resolvedEntrypointFile || framework?.useRuntime?.src || "package.json";
-  } else if (config.builder) {
+  const frameworkDefinition = config.framework ? frameworksBySlug.get(config.framework) : void 0;
+  if (config.builder) {
     builderUse = config.builder;
-    builderSrc = resolvedEntrypointFile;
+    builderSrc = resolvedEntrypointFile || frameworkDefinition?.useRuntime?.src || "package.json";
+  } else if (config.framework) {
+    if (type === "web" && (0, import_build_utils.isNodeBackendFramework)(config.framework)) {
+      builderUse = "@vercel/backends";
+    } else {
+      builderUse = frameworkDefinition?.useRuntime?.use || "@vercel/static-build";
+    }
+    builderSrc = resolvedEntrypointFile || frameworkDefinition?.useRuntime?.src || "package.json";
   } else {
-    builderUse = (0, import_utils.getBuilderForRuntime)(inferredRuntime);
+    if (!inferredRuntime) {
+      throw new Error(
+        `Could not infer runtime for service "${name}" and no builder or framework were provided.`
+      );
+    }
+    if (inferredRuntime === "node") {
+      builderUse = type === "web" ? "@vercel/backends" : "@vercel/node";
+    } else {
+      builderUse = (0, import_utils.getBuilderForRuntime)(inferredRuntime);
+    }
     builderSrc = resolvedEntrypointFile;
   }
   const normalizedSubdomain = type === "web" && typeof config.subdomain === "string" ? config.subdomain.toLowerCase() : void 0;
@@ -363,6 +368,9 @@ async function resolveConfiguredService(options) {
     builderSrc = import_path.posix.join(workspace, builderSrc);
   }
   const builderConfig = { zeroConfig: true };
+  if (builderUse === "@vercel/backends") {
+    builderConfig.serviceName = name;
+  }
   if (config.memory)
     builderConfig.memory = config.memory;
   if (config.maxDuration)
@@ -451,10 +459,14 @@ async function resolveAllConfiguredServices(services, fs, routePrefixSource = "c
     let resolvedConfig = serviceConfig;
     if (!serviceConfig.framework && resolvedEntrypoint) {
       if (resolvedEntrypoint.isDirectory) {
+        const inferredRuntime = (0, import_utils.inferServiceRuntime)({
+          ...serviceConfig
+        });
         const workspace = resolvedEntrypoint.normalized;
         const { framework, error } = await detectFrameworkFromWorkspace({
           fs,
           workspace,
+          runtime: inferredRuntime,
           serviceName: name
         });
         if (error) {
@@ -491,7 +503,7 @@ async function resolveAllConfiguredServices(services, fs, routePrefixSource = "c
             serviceName: name,
             runtime: inferredRuntime
           });
-          if (detection.framework) {
+          if (!detection.error && detection.framework) {
             resolvedConfig = {
               ...resolvedConfig,
               framework: detection.framework

package/dist/services/types.js

@@ -26,7 +26,7 @@ __export(types_exports, {
 });
 module.exports = __toCommonJS(types_exports);
 const RUNTIME_BUILDERS = {
-  node: "@vercel/node",
+  node: "@vercel/backends",
   python: "@vercel/python",
   go: "@vercel/go",
   rust: "@vercel/rust",

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.1",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -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",