@vercel/fs-detectors 6.11.1 → 6.11.2

package/dist/services/resolve-v2.js

@@ -182,14 +182,6 @@ function validateServiceConfigV2(name, config) {
       };
     }
   }
-  const isContainer = config.runtime === "container";
-  if (!config.framework && !config.entrypoint && !isContainer) {
-    return {
-      code: "MISSING_SERVICE_CONFIG",
-      message: `Service "${name}" must specify "framework" or "entrypoint".`,
-      serviceName: name
-    };
-  }
   return null;
 }
 async function resolveConfiguredServiceV2(name, config, fs) {
@@ -221,14 +213,15 @@ async function resolveConfiguredServiceV2(name, config, fs) {
     entrypointIsDirectory = Boolean(resolved.entrypoint?.isDirectory);
   }
   const entrypointFile = entrypointIsDirectory || !normalizedEntrypoint ? void 0 : normalizedEntrypoint;
-  const inferredRuntime = (0, import_utils.inferServiceRuntime)({
+  let inferredRuntime = (0, import_utils.inferServiceRuntime)({
     runtime: config.runtime,
     framework: config.framework,
     entrypoint: entrypointFile
   });
   let framework = config.framework;
-  if (!framework && normalizedEntrypoint) {
-    const workspace = entrypointIsDirectory ? normalizedEntrypoint : import_path.posix.dirname(normalizedEntrypoint) || ".";
+  let detectedFramework = false;
+  if (!framework) {
+    const workspace = normalizedEntrypoint ? entrypointIsDirectory ? normalizedEntrypoint : import_path.posix.dirname(normalizedEntrypoint) || "." : ".";
     const detection = await (0, import_resolve.detectFrameworkFromWorkspace)({
       fs: serviceFs,
       workspace,
@@ -239,6 +232,12 @@ async function resolveConfiguredServiceV2(name, config, fs) {
       return { error: detection.error };
     }
     framework = detection.framework;
+    detectedFramework = Boolean(framework);
+    inferredRuntime = (0, import_utils.inferServiceRuntime)({
+      runtime: config.runtime,
+      framework,
+      entrypoint: entrypointFile
+    });
   }
   if (entrypointIsDirectory && !framework) {
     return {
@@ -249,6 +248,16 @@ async function resolveConfiguredServiceV2(name, config, fs) {
       }
     };
   }
+  const frameworkRuntime = (0, import_utils.inferRuntimeFromFramework)(framework);
+  if (detectedFramework && frameworkRuntime && !entrypointFile) {
+    return {
+      error: {
+        code: "MISSING_SERVICE_CONFIG",
+        message: `Service "${name}" detected framework "${framework}" in "${normalizedRoot}" and must specify an "entrypoint" for runtime "${frameworkRuntime}".`,
+        serviceName: name
+      }
+    };
+  }
   const frameworkDefinition = framework ? frameworksBySlug.get(framework) : void 0;
   let builderUse;
   let builderSrc;
@@ -257,16 +266,26 @@ async function resolveConfiguredServiceV2(name, config, fs) {
     builderSrc = entrypointFile || frameworkDefinition?.useRuntime?.src || "package.json";
   } else {
     if (!inferredRuntime) {
-      return {
-        error: {
-          code: "MISSING_SERVICE_CONFIG",
-          message: `Service "${name}" must specify "framework" or a runtime-resolvable "entrypoint".`,
-          serviceName: name
-        }
-      };
+      if (config.buildCommand) {
+        builderUse = "@vercel/static-build";
+        builderSrc = "package.json";
+      } else {
+        builderUse = "@vercel/static";
+        builderSrc = config.outputDirectory ? import_path.posix.join(config.outputDirectory, "**") : "**";
+      }
+    } else {
+      if (!entrypointFile) {
+        return {
+          error: {
+            code: "MISSING_SERVICE_CONFIG",
+            message: `Service "${name}" must specify an "entrypoint" for runtime "${inferredRuntime}".`,
+            serviceName: name
+          }
+        };
+      }
+      builderUse = inferredRuntime === "node" ? "@vercel/backends" : (0, import_utils.getBuilderForRuntime)(inferredRuntime);
+      builderSrc = entrypointFile;
     }
-    builderUse = inferredRuntime === "node" ? "@vercel/backends" : (0, import_utils.getBuilderForRuntime)(inferredRuntime);
-    builderSrc = entrypointFile;
   }
   const isRoot = normalizedRoot === ".";
   const projectRelativeSrc = isRoot ? builderSrc : import_path.posix.join(normalizedRoot, builderSrc);
@@ -277,6 +296,9 @@ async function resolveConfiguredServiceV2(name, config, fs) {
   if (framework) {
     builderConfig.framework = framework;
   }
+  if (config.outputDirectory) {
+    builderConfig.outputDirectory = config.outputDirectory;
+  }
   if (!isRoot) {
     builderConfig.workspace = normalizedRoot;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "6.11.1",
+  "version": "6.11.2",
   "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",
     "smol-toml": "1.5.2",
-    "@vercel/error-utils": "2.2.0",
     "@vercel/build-utils": "13.32.2",
+    "@vercel/error-utils": "2.2.0",
     "@vercel/frameworks": "3.30.1",
     "@vercel/routing-utils": "6.4.0"
   },