@vercel/fs-detectors 6.11.1 → 6.11.3

package/dist/services/resolve-v2.js

@@ -30,7 +30,14 @@ var import_types = require("./types");
 var import_resolve = require("./resolve");
 var import_utils = require("./utils");
 const frameworksBySlug = new Map(import_frameworks.frameworkList.map((f) => [f.slug, f]));
-const SERVICE_NAME_REGEX = /^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$/;
+const MAX_SERVICE_NAME_LENGTH = 64;
+const SERVICE_NAME_REGEX = /^[a-z]([a-z_-]*[a-z])?$/;
+function isValidServiceName(name) {
+  return name.length <= MAX_SERVICE_NAME_LENGTH && SERVICE_NAME_REGEX.test(name);
+}
+function getInvalidServiceNameMessage(name) {
+  return `Service name "${name}" is invalid. Names must be 1-${MAX_SERVICE_NAME_LENGTH} characters, start and end with a lowercase letter, and contain only lowercase letters, hyphens, and underscores.`;
+}
 const CONTAINER_ENTRYPOINT_CANDIDATES = [
   "Dockerfile.vercel",
   "Containerfile.vercel",
@@ -122,10 +129,10 @@ async function resolveContainerServiceV2(name, config, normalizedRoot, serviceFs
   };
 }
 function validateServiceConfigV2(name, config) {
-  if (!SERVICE_NAME_REGEX.test(name)) {
+  if (!isValidServiceName(name)) {
     return {
       code: "INVALID_SERVICE_NAME",
-      message: `Service name "${name}" is invalid. Names must start with a letter, end with an alphanumeric character, and contain only alphanumeric characters, hyphens, and underscores.`,
+      message: getInvalidServiceNameMessage(name),
       serviceName: name
     };
   }
@@ -182,14 +189,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 +220,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 +239,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 +255,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 +273,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 +303,9 @@ async function resolveConfiguredServiceV2(name, config, fs) {
   if (framework) {
     builderConfig.framework = framework;
   }
+  if (config.outputDirectory) {
+    builderConfig.outputDirectory = config.outputDirectory;
+  }
   if (!isRoot) {
     builderConfig.workspace = normalizedRoot;
   }
@@ -339,6 +368,14 @@ async function resolveAllConfiguredServicesV2(services, fs) {
   const serviceNames = new Set(Object.keys(services));
   for (const service of resolved) {
     for (const binding of service.bindings ?? []) {
+      if (!isValidServiceName(binding.service)) {
+        errors.push({
+          code: "INVALID_SERVICE_BINDING_NAME",
+          message: `Service "${service.name}" declares an invalid binding service name "${binding.service}". ${getInvalidServiceNameMessage(binding.service)}`,
+          serviceName: service.name
+        });
+        continue;
+      }
       if (!serviceNames.has(binding.service)) {
         errors.push({
           code: "UNKNOWN_SERVICE_BINDING",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "6.11.1",
+  "version": "6.11.3",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,9 +20,9 @@
     "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/frameworks": "3.30.1",
+    "@vercel/error-utils": "2.2.0",
+    "@vercel/frameworks": "3.30.2",
     "@vercel/routing-utils": "6.4.0"
   },
   "devDependencies": {