@vercel/fs-detectors 7.8.1 → 7.9.0

package/dist/buildpack-runtimes.d.ts

@@ -7,8 +7,12 @@ import type { ServiceRuntime } from '@vercel/build-utils';
  *
  * Routing is per runtime on purpose: the platform decides which buildpack to
  * run from the language markers, and the buildpack classifies the application
- * (for example Rails versus a plain Rack app) from its resolved bundle. There
- * are no framework-level presets for buildpack runtimes.
+ * from its sources. There are no framework-level presets for buildpack
+ * runtimes.
+ *
+ * Only whole-project and service builds route here. `api/**` function files
+ * keep their Lambda runtime: they never reach the framework or service
+ * routing that selects a buildpack.
  */
 export declare const BUILDPACK_PROJECT_MARKERS: ReadonlyMap<ServiceRuntime, readonly string[]>;
 export declare function isBuildpackRuntimeEnabled(runtime: string): boolean;
@@ -21,3 +25,8 @@ export declare function toBuildpackRuntime(runtime: string | null | undefined):
  * runtime keeps building projects that lack the marker.
  */
 export declare function hasBuildpackProjectMarker(runtime: ServiceRuntime, hasFile: (name: string) => Promise<boolean> | boolean): Promise<boolean>;
+/**
+ * The package a Go source file declares in its package clause, skipping the
+ * comments and build constraints that may precede it.
+ */
+export declare function getGoPackageName(source: string): string | undefined;

package/dist/buildpack-runtimes.js

@@ -19,12 +19,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var buildpack_runtimes_exports = {};
 __export(buildpack_runtimes_exports, {
   BUILDPACK_PROJECT_MARKERS: () => BUILDPACK_PROJECT_MARKERS,
+  getGoPackageName: () => getGoPackageName,
   hasBuildpackProjectMarker: () => hasBuildpackProjectMarker,
   isBuildpackRuntimeEnabled: () => isBuildpackRuntimeEnabled,
   toBuildpackRuntime: () => toBuildpackRuntime
 });
 module.exports = __toCommonJS(buildpack_runtimes_exports);
-const BUILDPACK_PROJECT_MARKERS = /* @__PURE__ */ new Map([["ruby", ["Gemfile"]]]);
+const BUILDPACK_PROJECT_MARKERS = /* @__PURE__ */ new Map([
+  ["ruby", ["Gemfile"]],
+  ["go", ["go.mod"]],
+  ["rust", ["Cargo.toml"]]
+]);
 function isBuildpackRuntimeEnabled(runtime) {
   return process.env[`VERCEL_EXPERIMENTAL_BUILDPACK_${runtime.toUpperCase()}`] === "1";
 }
@@ -42,9 +47,30 @@ async function hasBuildpackProjectMarker(runtime, hasFile) {
   }
   return false;
 }
+function getGoPackageName(source) {
+  let rest = source.replace(/^\uFEFF/, "");
+  for (; ; ) {
+    rest = rest.trimStart();
+    if (rest.startsWith("//")) {
+      const newline = rest.indexOf("\n");
+      if (newline === -1)
+        return void 0;
+      rest = rest.slice(newline + 1);
+    } else if (rest.startsWith("/*")) {
+      const end = rest.indexOf("*/", 2);
+      if (end === -1)
+        return void 0;
+      rest = rest.slice(end + 2);
+    } else {
+      break;
+    }
+  }
+  return /^package\s+([\p{L}_][\p{L}\p{N}_]*)/u.exec(rest)?.[1];
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BUILDPACK_PROJECT_MARKERS,
+  getGoPackageName,
   hasBuildpackProjectMarker,
   isBuildpackRuntimeEnabled,
   toBuildpackRuntime

package/dist/detect-builders.js

@@ -345,7 +345,11 @@ async function isPythonEntrypoint(fsPath) {
 }
 
 // src/buildpack-runtimes.ts
-var BUILDPACK_PROJECT_MARKERS = /* @__PURE__ */ new Map([["ruby", ["Gemfile"]]]);
+var BUILDPACK_PROJECT_MARKERS = /* @__PURE__ */ new Map([
+  ["ruby", ["Gemfile"]],
+  ["go", ["go.mod"]],
+  ["rust", ["Cargo.toml"]]
+]);
 function isBuildpackRuntimeEnabled(runtime) {
   return process.env[`VERCEL_EXPERIMENTAL_BUILDPACK_${runtime.toUpperCase()}`] === "1";
 }
@@ -637,7 +641,7 @@ async function detectBuilders(files, pkg, options = {}) {
     builders.push(...apiBuilders);
   }
   if (frontendBuilder) {
-    if (isOfficialRuntime("express", frontendBuilder?.use) || isOfficialRuntime("hono", frontendBuilder?.use) || isOfficialRuntime("python", frontendBuilder?.use) || isOfficialRuntime("go", frontendBuilder?.use) || isOfficialRuntime("backends", frontendBuilder?.use)) {
+    if (isOfficialRuntime("express", frontendBuilder?.use) || isOfficialRuntime("hono", frontendBuilder?.use) || isOfficialRuntime("python", frontendBuilder?.use) || isOfficialRuntime("go", frontendBuilder?.use) || isOfficialRuntime("container", frontendBuilder?.use) && (frontendBuilder.config?.buildpack === "go" || frontendBuilder.config?.buildpack === "rust") || isOfficialRuntime("backends", frontendBuilder?.use)) {
       builders.push({
         src: "public/**/*",
         use: "@vercel/static",

package/dist/services/resolve-v2.js

@@ -50,6 +50,14 @@ async function detectContainerEntrypoint(serviceFs) {
   }
   return void 0;
 }
+async function isGoMainPackage(serviceFs, entrypoint) {
+  try {
+    const source = await serviceFs.readFile(entrypoint);
+    return (0, import_buildpack_runtimes.getGoPackageName)(source.toString("utf8")) === "main";
+  } catch {
+    return false;
+  }
+}
 function normalizeContainerCommand(command) {
   if (command === void 0) {
     return void 0;
@@ -248,7 +256,10 @@ async function resolveConfiguredServiceV2(name, config, fs) {
       }
     };
   }
-  const buildpackRuntime = flaggedBuildpackRuntime && (!entrypointFile || flaggedBuildpackRuntime === "ruby" && entrypointFile === "config.ru") && !(0, import_framework.isFrontendFramework)(framework) && await (0, import_buildpack_runtimes.hasBuildpackProjectMarker)(
+  const buildpackRuntime = flaggedBuildpackRuntime && (!entrypointFile || // The Ruby buildpack discovers config.ru at the service root itself.
+  flaggedBuildpackRuntime === "ruby" && entrypointFile === "config.ru" || // A Go `package main` entrypoint is a standalone server the buildpack
+  // builds from the entrypoint's package.
+  flaggedBuildpackRuntime === "go" && await isGoMainPackage(serviceFs, entrypointFile)) && !(0, import_framework.isFrontendFramework)(framework) && await (0, import_buildpack_runtimes.hasBuildpackProjectMarker)(
     flaggedBuildpackRuntime,
     (marker) => (0, import_utils.hasFile)(serviceFs, marker)
   ) ? flaggedBuildpackRuntime : void 0;
@@ -314,6 +325,10 @@ async function resolveConfiguredServiceV2(name, config, fs) {
   }
   if (buildpackRuntime) {
     builderConfig.buildpack = buildpackRuntime;
+    const goEntrypoint = buildpackRuntime === "go" && normalizedEntrypoint ? (0, import_entrypoint.stripTrailingSlash)(normalizedEntrypoint) : void 0;
+    if (goEntrypoint && goEntrypoint !== ".") {
+      builderConfig.buildpackEntrypoint = goEntrypoint;
+    }
   }
   if (config.outputDirectory) {
     builderConfig.outputDirectory = config.outputDirectory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "7.8.1",
+  "version": "7.9.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/build-utils": "14.14.0",
+    "@vercel/build-utils": "14.15.0",
     "@vercel/error-utils": "2.2.1",
-    "@vercel/routing-utils": "6.6.0",
+    "@vercel/frameworks": "3.35.0",
     "@vercel/python-analysis": "0.14.0",
-    "@vercel/frameworks": "3.35.0"
+    "@vercel/routing-utils": "6.6.0"
   },
   "devDependencies": {
     "@types/glob": "7.2.0",
@@ -33,7 +33,7 @@
     "@types/node": "20.11.0",
     "@types/semver": "7.3.10",
     "vitest": "4.1.10",
-    "@vercel-internals/runtimes": "1.1.7"
+    "@vercel-internals/runtimes": "1.1.8"
   },
   "scripts": {
     "build": "node build.mjs",