@vercel/fs-detectors 7.10.2 → 7.11.0

package/dist/detect-builders.js

@@ -233,6 +233,7 @@ var require_framework = __commonJS({
       DETECTION_FRAMEWORKS: () => DETECTION_FRAMEWORKS,
       filterFrameworksByRuntime: () => filterFrameworksByRuntime,
       frameworksBySlug: () => frameworksBySlug,
+      getRuntimeFramework: () => getRuntimeFramework,
       inferBuilderRuntimeFromFramework: () => inferBuilderRuntimeFromFramework2,
       inferRuntimeFromFramework: () => inferRuntimeFromFramework,
       inferServerRuntimeFromFramework: () => inferServerRuntimeFromFramework,
@@ -303,6 +304,11 @@ var require_framework = __commonJS({
         return [...frameworks];
       return frameworks.filter((f) => inferRuntimeFromFramework(f.slug) === runtime);
     }
+    function getRuntimeFramework(runtime) {
+      if (!runtime)
+        return void 0;
+      return frameworksBySlug.get(runtime)?.runtimeFramework ? runtime : void 0;
+    }
   }
 });
 
@@ -483,10 +489,10 @@ async function detectBuilders(files, pkg, options = {}) {
       usedFunctions.add(key);
   };
   const absolutePathCache = /* @__PURE__ */ new Map();
-  const proxyFile = options.proxy ? parseProxyEntrypoint(options.proxy.entrypoint).file : null;
+  const proxy = resolveProxy(files, options);
   const reservedFunctionFiles = options.reservedFunctionFiles ?? [];
   const claimedFiles = /* @__PURE__ */ new Set([
-    ...proxyFile !== null ? [proxyFile] : [],
+    ...proxy?.source === "vercel-config" ? [proxy.file] : [],
     ...reservedFunctionFiles
   ]);
   const hasReservedFunctions = reservedFunctionFiles.length > 0;
@@ -497,13 +503,7 @@ async function detectBuilders(files, pkg, options = {}) {
     rustStaticOutput ? void 0 : frameworkConfig?.ignoreRuntimes
   );
   const withTag = options.tag ? `@${options.tag}` : "";
-  const apiMatches = getApiMatches().filter(
-    (b) => (
-      // Root-level middleware is enabled, unless `disableRootMiddleware: true`
-      b.config?.middleware && !frameworkConfig?.disableRootMiddleware || // "api" dir runtimes are enabled, unless opted-out via `ignoreRuntimes`
-      !ignoreRuntimes.has(b.use)
-    )
-  ).map((b) => {
+  const apiMatches = getApiMatches().filter((b) => !ignoreRuntimes.has(b.use)).map((b) => {
     b.use = `${b.use}${withTag}`;
     return b;
   });
@@ -519,8 +519,8 @@ async function detectBuilders(files, pkg, options = {}) {
     if (claimedFiles.has(fileName)) {
       continue;
     }
-    const apiBuilder = await maybeGetApiBuilder(fileName, apiMatches, options);
-    if (apiBuilder) {
+    const functionBuilder = proxy?.source === "file-convention" && fileName === proxy.file ? proxy.builder : await maybeGetApiBuilder(fileName, apiMatches, options);
+    if (functionBuilder) {
       const { routeError, apiRoute, isDynamic } = getApiRoute(
         fileName,
         apiSortedFiles,
@@ -544,8 +544,8 @@ async function detectBuilders(files, pkg, options = {}) {
           dynamicRoutes.push(apiRoute);
         }
       }
-      addToUsedFunctions(apiBuilder);
-      apiBuilders.push(apiBuilder);
+      addToUsedFunctions(functionBuilder);
+      apiBuilders.push(functionBuilder);
       continue;
     }
     if (!hasUsedOutputDirectory && fileName.startsWith(`${usedOutputDirectory}/`)) {
@@ -561,14 +561,9 @@ async function detectBuilders(files, pkg, options = {}) {
       fallbackEntrypoint = fileName;
     }
   }
-  if (options.proxy) {
-    const proxyBuilder = getProxyBuilder(
-      options.proxy,
-      options.tag,
-      options.functions
-    );
-    addToUsedFunctions(proxyBuilder);
-    apiBuilders.unshift(proxyBuilder);
+  if (proxy?.source === "vercel-config") {
+    addToUsedFunctions(proxy.builder);
+    apiBuilders.unshift(proxy.builder);
   }
   const rustStaticPrebuilt = rustStaticOutput && !pkg && !buildCommand;
   if (!makeFrontendStatic && !rustStaticPrebuilt && (hasBuildScript(pkg) || buildCommand || framework)) {
@@ -713,11 +708,7 @@ async function detectBuilders(files, pkg, options = {}) {
   };
 }
 async function maybeGetApiBuilder(fileName, apiMatches, options) {
-  const middleware = !options.proxy && (fileName === "middleware.js" || fileName === "middleware.ts");
-  if (middleware && options.projectSettings?.framework === "nextjs") {
-    return null;
-  }
-  if (!(fileName.startsWith("api/") || middleware)) {
+  if (!fileName.startsWith("api/")) {
     return null;
   }
   if (fileName.includes("/.")) {
@@ -755,10 +746,15 @@ async function maybeGetApiBuilder(fileName, apiMatches, options) {
   if (!use) {
     return null;
   }
+  const builder = {
+    use,
+    src: fileName,
+    config: getFunctionConfig(fnPattern, func, options)
+  };
+  return builder;
+}
+function getFunctionConfig(fnPattern, func, options) {
   const config = { zeroConfig: true };
-  if (middleware) {
-    config.middleware = true;
-  }
   if (fnPattern && func) {
     config.functions = { [fnPattern]: func };
     if (func.includeFiles) {
@@ -771,12 +767,7 @@ async function maybeGetApiBuilder(fileName, apiMatches, options) {
   if (options.bunVersion) {
     config.bunVersion = options.bunVersion;
   }
-  const builder = {
-    use,
-    src: fileName,
-    config
-  };
-  return builder;
+  return config;
 }
 function getFunction(fileName, { functions = {} }) {
   const keys = Object.keys(functions);
@@ -794,6 +785,44 @@ function parseProxyEntrypoint(entrypoint) {
   }
   return { file: entrypoint };
 }
+var ROOT_PROXY_FILES = ["middleware.js", "middleware.ts"];
+function resolveProxy(files, options) {
+  const { proxy } = options;
+  if (proxy) {
+    return {
+      source: "vercel-config",
+      entrypoint: proxy.entrypoint,
+      file: parseProxyEntrypoint(proxy.entrypoint).file,
+      builder: getProxyBuilder(proxy, options.tag, options.functions)
+    };
+  }
+  const framework = options.projectSettings?.framework;
+  if (framework === "nextjs" || import_framework.frameworksBySlug.get(framework || "")?.disableRootMiddleware) {
+    return null;
+  }
+  const reserved = new Set(options.reservedFunctionFiles ?? []);
+  const file = ROOT_PROXY_FILES.find(
+    (f) => files.includes(f) && !reserved.has(f)
+  );
+  if (!file) {
+    return null;
+  }
+  const { fnPattern, func } = getFunction(file, options);
+  const withTag = options.tag ? `@${options.tag}` : "";
+  return {
+    source: "file-convention",
+    entrypoint: null,
+    file,
+    builder: {
+      use: func?.runtime || `@vercel/node${withTag}`,
+      src: file,
+      config: {
+        ...getFunctionConfig(fnPattern, func, options),
+        middleware: true
+      }
+    }
+  };
+}
 function getProxyBuilder(proxy, tag, functions = {}) {
   const { file, variable } = parseProxyEntrypoint(proxy.entrypoint);
   const isPython = (0, import_path.extname)(file) === ".py";
@@ -825,11 +854,6 @@ function getProxyBuilder(proxy, tag, functions = {}) {
 function getApiMatches() {
   const config = { zeroConfig: true };
   return [
-    {
-      src: REGEX_MIDDLEWARE_FILES,
-      use: `@vercel/node`,
-      config: { ...config, middleware: true }
-    },
     { src: "api/**/*.+(js|mjs|ts|tsx)", use: `@vercel/node`, config },
     { src: "api/**/!(*_test).go", use: `@vercel/go`, config },
     { src: "api/**/*.py", use: `@vercel/python`, config },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "7.10.2",
+  "version": "7.11.0",
   "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": "15.0.2",
     "@vercel/error-utils": "2.2.1",
-    "@vercel/python-analysis": "0.15.2",
     "@vercel/frameworks": "3.35.0",
-    "@vercel/build-utils": "15.0.1",
+    "@vercel/python-analysis": "0.15.2",
     "@vercel/routing-utils": "6.6.0"
   },
   "devDependencies": {
@@ -33,7 +33,7 @@
     "@types/node": "20.11.0",
     "@types/semver": "7.3.10",
     "vitest": "4.1.10",
-    "@vercel-internals/runtimes": "1.2.2"
+    "@vercel-internals/runtimes": "1.2.3"
   },
   "scripts": {
     "build": "node build.mjs",