@vercel/fs-detectors 7.3.0 → 7.4.0

package/dist/detect-builders.js

@@ -46,6 +46,8 @@ var import_minimatch = __toESM(require("minimatch"));
 var import_semver = require("semver");
 var import_path = require("path");
 var import_frameworks = require("@vercel/frameworks");
+var import_framework = require("./services/runtimes/framework");
+var import_constants = require("./services/runtimes/constants");
 var import_is_official_runtime = require("./is-official-runtime");
 var import_build_utils = require("@vercel/build-utils");
 var import_python = require("./python");
@@ -75,9 +77,6 @@ function getStaticFilesPattern(additionalExclusions = []) {
   ].join(",")}}`;
 }
 const REGEX_NON_VERCEL_PLATFORM_FILES = getStaticFilesPattern();
-const slugToFramework = new Map(
-  import_frameworks.frameworkList.map((f) => [f.slug, f])
-);
 const builderToFrameworks = (() => {
   const map = /* @__PURE__ */ new Map();
   for (const f of import_frameworks.frameworkList) {
@@ -162,7 +161,7 @@ async function detectBuilders(files, pkg, options = {}) {
   };
   const absolutePathCache = /* @__PURE__ */ new Map();
   const { buildCommand, outputDirectory } = projectSettings;
-  const frameworkConfig = slugToFramework.get(framework || "");
+  const frameworkConfig = import_framework.frameworksBySlug.get(framework || "");
   const rustStaticOutput = isRustStaticOutput(framework, projectSettings);
   const ignoreRuntimes = new Set(
     rustStaticOutput ? void 0 : frameworkConfig?.ignoreRuntimes
@@ -533,6 +532,14 @@ function validateProxy(options, files, framework) {
       message: `The \`proxy\` property cannot be used with ${framework === "nextjs" ? "Next.js" : "Astro"} because the framework builds its own routing middleware.`
     };
   }
+  const appRuntime = (0, import_framework.inferBuilderRuntimeFromFramework)(framework);
+  const proxyRuntime = import_constants.ENTRYPOINT_EXTENSIONS[(0, import_path.extname)(proxy.entrypoint)];
+  if (appRuntime !== void 0 && proxyRuntime !== void 0 && appRuntime !== proxyRuntime) {
+    return {
+      code: "proxy_runtime_mismatch",
+      message: `The proxy entrypoint \`${proxy.entrypoint}\` uses the ${proxyRuntime} runtime, but the app uses the ${appRuntime} runtime. The proxy and app must use the same runtime.`
+    };
+  }
   return null;
 }
 function hasBuildScript(pkg) {
@@ -587,7 +594,7 @@ function detectFrontBuilder(pkg, files, usedFunctions, fallbackEntrypoint, optio
       }
     });
   }
-  const f = slugToFramework.get(framework || "");
+  const f = import_framework.frameworksBySlug.get(framework || "");
   if (f && f.useRuntime && !isRustStaticOutput(framework, projectSettings)) {
     const buildpackRuntime = (0, import_buildpack_runtimes.toBuildpackRuntime)(framework);
     if (buildpackRuntime && (import_buildpack_runtimes.BUILDPACK_PROJECT_MARKERS.get(buildpackRuntime) ?? []).some(
@@ -906,7 +913,7 @@ function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders,
   const framework = frontendBuilder?.config?.framework || "";
   const isGatsby = framework === "gatsby";
   const isNextjs = framework === "nextjs" || (0, import_is_official_runtime.isOfficialRuntime)("next", frontendBuilder?.use);
-  const ignoreRuntimes = slugToFramework.get(framework)?.ignoreRuntimes;
+  const ignoreRuntimes = import_framework.frameworksBySlug.get(framework)?.ignoreRuntimes;
   if (apiRoutes && apiRoutes.length > 0) {
     if (options.featHandleMiss) {
       const extSet = detectApiExtensions(apiBuilders);

package/dist/services/runtimes/constants.d.ts

@@ -2,6 +2,10 @@ import type { ServiceRuntime } from '@vercel/build-utils';
 export declare const RUNTIME_BUILDERS: Record<ServiceRuntime, string>;
 export declare const RUNTIME_MANIFESTS: Partial<Record<ServiceRuntime, string[]>>;
 export declare const ENTRYPOINT_EXTENSIONS: Record<string, ServiceRuntime>;
+/**
+ * The inverse of RUNTIME_BUILDERS. Maps each builder to its runtime.
+ */
+export declare const BUILDER_RUNTIMES: Record<string, ServiceRuntime>;
 /**
  * Builders that produce static output (SPAs, static sites) with no runtime.
  */

package/dist/services/runtimes/constants.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var constants_exports = {};
 __export(constants_exports, {
+  BUILDER_RUNTIMES: () => BUILDER_RUNTIMES,
   CONTAINER_ENTRYPOINT_CANDIDATES: () => CONTAINER_ENTRYPOINT_CANDIDATES,
   ENTRYPOINT_EXTENSIONS: () => ENTRYPOINT_EXTENSIONS,
   ROUTE_OWNING_BUILDERS: () => ROUTE_OWNING_BUILDERS,
@@ -60,6 +61,12 @@ const ENTRYPOINT_EXTENSIONS = {
   ".rb": "ruby",
   ".ru": "ruby"
 };
+const BUILDER_RUNTIMES = Object.fromEntries(
+  Object.entries(RUNTIME_BUILDERS).map(([runtime, builder]) => [
+    builder,
+    runtime
+  ])
+);
 const STATIC_BUILDERS = /* @__PURE__ */ new Set([
   "@vercel/static-build",
   "@vercel/static"
@@ -76,6 +83,7 @@ const CONTAINER_ENTRYPOINT_CANDIDATES = [
 ];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  BUILDER_RUNTIMES,
   CONTAINER_ENTRYPOINT_CANDIDATES,
   ENTRYPOINT_EXTENSIONS,
   ROUTE_OWNING_BUILDERS,

package/dist/services/runtimes/framework.d.ts

@@ -1,5 +1,6 @@
 import type { ServiceRuntime } from '@vercel/build-utils';
 import type { Framework } from '@vercel/frameworks';
+export declare const frameworksBySlug: Map<string, Framework>;
 /**
  * Framework list filtered to entries eligible for auto-detection.
  * Includes non-experimental frameworks and runtime frameworks (Python, Node, etc.)
@@ -15,6 +16,12 @@ export declare const DETECTION_FRAMEWORKS: Framework[];
  * - `express` → `node`
  */
 export declare function inferRuntimeFromFramework(framework: string | null | undefined): ServiceRuntime | undefined;
+/**
+ * Infer the runtime used by a framework's builder.
+ *
+ * A builder may not necessarily produce a function with a runtime, e.g. @vercel/static-build.
+ */
+export declare function inferBuilderRuntimeFromFramework(framework: string | null | undefined): ServiceRuntime | undefined;
 /**
  * Returns true if the framework is a client-only frontend (no server runtime).
  */

package/dist/services/runtimes/framework.js

@@ -20,6 +20,8 @@ var framework_exports = {};
 __export(framework_exports, {
   DETECTION_FRAMEWORKS: () => DETECTION_FRAMEWORKS,
   filterFrameworksByRuntime: () => filterFrameworksByRuntime,
+  frameworksBySlug: () => frameworksBySlug,
+  inferBuilderRuntimeFromFramework: () => inferBuilderRuntimeFromFramework,
   inferRuntimeFromFramework: () => inferRuntimeFromFramework,
   isBFFFramework: () => isBFFFramework,
   isFrontendFramework: () => isFrontendFramework
@@ -28,6 +30,9 @@ module.exports = __toCommonJS(framework_exports);
 var import_build_utils = require("@vercel/build-utils");
 var import_frameworks = require("@vercel/frameworks");
 var import_constants = require("./constants");
+const frameworksBySlug = new Map(
+  import_frameworks.frameworkList.flatMap((f) => typeof f.slug === "string" ? [[f.slug, f]] : [])
+);
 const DETECTION_FRAMEWORKS = import_frameworks.frameworkList.filter(
   (framework) => !framework.experimental || framework.runtimeFramework
 );
@@ -42,6 +47,25 @@ function inferRuntimeFromFramework(framework) {
     return "node";
   return void 0;
 }
+const STATIC_BUILDER_RUNTIMES = {
+  hugo: "go",
+  jekyll: "ruby",
+  middleman: "ruby",
+  zola: "rust"
+};
+function inferBuilderRuntimeFromFramework(framework) {
+  if (!framework || framework === "container" || framework === "services")
+    return void 0;
+  const f = frameworksBySlug.get(framework);
+  const declaredBuilder = f?.useRuntime?.use;
+  if (declaredBuilder)
+    return import_constants.BUILDER_RUNTIMES[declaredBuilder];
+  const detectorItems = [
+    ...f?.detectors?.every ?? [],
+    ...f?.detectors?.some ?? []
+  ];
+  return STATIC_BUILDER_RUNTIMES[framework] ?? (detectorItems.some((d) => d.matchPackage !== void 0) ? "node" : void 0);
+}
 function isFrontendFramework(framework) {
   return !!framework && !inferRuntimeFromFramework(framework);
 }
@@ -64,6 +88,8 @@ function filterFrameworksByRuntime(frameworks, runtime) {
 0 && (module.exports = {
   DETECTION_FRAMEWORKS,
   filterFrameworksByRuntime,
+  frameworksBySlug,
+  inferBuilderRuntimeFromFramework,
   inferRuntimeFromFramework,
   isBFFFramework,
   isFrontendFramework

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,11 +20,11 @@
     "minimatch": "3.1.2",
     "semver": "6.3.1",
     "smol-toml": "1.5.2",
-    "@vercel/frameworks": "3.34.0",
     "@vercel/error-utils": "2.2.1",
+    "@vercel/build-utils": "14.10.1",
     "@vercel/python-analysis": "0.14.0",
     "@vercel/routing-utils": "6.6.0",
-    "@vercel/build-utils": "14.10.1"
+    "@vercel/frameworks": "3.34.0"
   },
   "devDependencies": {
     "@types/glob": "7.2.0",