@vercel/static-build 2.9.24 → 2.9.25

package/dist/index.js

@@ -9297,6 +9297,40 @@ var require_frameworks = __commonJS({
           }
         ]
       },
+      {
+        name: "Ash",
+        slug: "ash",
+        logo: "https://api-frameworks.vercel.sh/framework-logos/ash.svg",
+        darkModeLogo: "https://api-frameworks.vercel.sh/framework-logos/ash-dark.svg",
+        tagline: "A filesystem-first framework for durable backend agents on Vercel.",
+        description: "An Ash app: agents authored as a directory of files, compiled and served on Vercel.",
+        detectors: {
+          every: [
+            {
+              path: "package.json",
+              matchContent: '"(dev)?(d|D)ependencies":\\s*{[^}]*"experimental-ash":\\s*".+?"[^}]*}'
+            }
+          ]
+        },
+        settings: {
+          installCommand: {
+            placeholder: "`pnpm install`, `yarn install`, or `npm install`"
+          },
+          buildCommand: {
+            value: "ash build",
+            placeholder: "`npm run build` or `ash build`"
+          },
+          devCommand: {
+            value: "ash dev",
+            placeholder: "ash dev"
+          },
+          outputDirectory: {
+            value: ".output"
+          }
+        },
+        getOutputDirName: async () => ".output",
+        experimental: true
+      },
       {
         name: "Sanity (v3)",
         slug: "sanity-v3",
@@ -22366,9 +22400,11 @@ var require_utils4 = __commonJS({
       inferRuntimeFromFramework: () => inferRuntimeFromFramework,
       inferServiceRuntime: () => inferServiceRuntime,
       isFrontendFramework: () => isFrontendFramework,
+      isPublicServicesEnabled: () => isPublicServicesEnabled,
       isRouteOwningBuilder: () => isRouteOwningBuilder2,
       isStaticBuild: () => isStaticBuild2,
-      readVercelConfig: () => readVercelConfig
+      readVercelConfig: () => readVercelConfig,
+      validateServicesConfigGate: () => validateServicesConfigGate
     });
     module2.exports = __toCommonJS2(utils_exports);
     var import_framework_helpers = require("@vercel/build-utils/dist/framework-helpers");
@@ -22381,6 +22417,18 @@ var require_utils4 = __commonJS({
         return false;
       }
     }
+    function isPublicServicesEnabled() {
+      return process.env.VERCEL_USE_SERVICES === "1" || process.env.VERCEL_USE_SERVICES?.toLowerCase() === "true";
+    }
+    function validateServicesConfigGate(config) {
+      if (config?.services !== void 0 && !isPublicServicesEnabled()) {
+        return {
+          code: "INVALID_VERCEL_CONFIG",
+          message: "Invalid vercel.json - should NOT have additional property `services`. Please remove it."
+        };
+      }
+      return null;
+    }
     var INTERNAL_QUEUES_PREFIX = "/_svc/_queues";
     function normalizeInternalServiceEntrypoint(entrypoint) {
       const normalized = entrypoint.replace(/\\/g, "/").replace(/^\/+/, "").replace(/\.[^/.]+$/, "");
@@ -22465,6 +22513,10 @@ var require_utils4 = __commonJS({
         try {
           const content = await fs5.readFile("vercel.json");
           const config = JSON.parse(content.toString());
+          const gateError = validateServicesConfigGate(config);
+          if (gateError) {
+            return { config: null, error: gateError };
+          }
           return { config, error: null };
         } catch {
           return {
@@ -22482,6 +22534,10 @@ var require_utils4 = __commonJS({
           const { parse: tomlParse } = await Promise.resolve().then(() => (init_dist(), dist_exports));
           const content = await fs5.readFile("vercel.toml");
           const config = tomlParse(content.toString());
+          const gateError = validateServicesConfigGate(config);
+          if (gateError) {
+            return { config: null, error: gateError };
+          }
           return { config, error: null };
         } catch {
           return {
@@ -22801,6 +22857,11 @@ var require_resolve = __commonJS({
     var SERVICE_NAME_REGEX = /^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$/;
     var DNS_LABEL_RE = /^(?!-)[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/i;
     var ENV_PREFIX_RE = /^[A-Z][A-Z0-9_]*_$/;
+    var ENTRYPOINT_REQUIRED_RUNTIMES = /* @__PURE__ */ new Set([
+      "node",
+      "python",
+      "go"
+    ]);
     async function getServiceFs(fs5, serviceName, root) {
       if (!root) {
         return { fs: fs5 };
@@ -22832,6 +22893,38 @@ var require_resolve = __commonJS({
       const normalized = import_path7.posix.normalize(entrypoint);
       return normalized === "" ? "." : normalized;
     }
+    function getEffectiveServiceTrigger(config) {
+      if (config.type === "cron") {
+        return "schedule";
+      }
+      if (config.type === "worker") {
+        return "queue";
+      }
+      if (config.type !== "job") {
+        return void 0;
+      }
+      return config.trigger;
+    }
+    function getEntrypointRequiredRuntime(config) {
+      if (config.runtime && config.runtime in import_types.RUNTIME_BUILDERS) {
+        return config.runtime;
+      }
+      return (0, import_utils.inferRuntimeFromFramework)(config.framework);
+    }
+    function validateBackendFileEntrypoint(name, config, resolvedEntrypoint, options) {
+      if (!options.requireFileEntrypointForBackendRuntimes || !resolvedEntrypoint?.isDirectory) {
+        return null;
+      }
+      const runtime = getEntrypointRequiredRuntime(config);
+      if (!runtime || !ENTRYPOINT_REQUIRED_RUNTIMES.has(runtime)) {
+        return null;
+      }
+      return {
+        code: "INVALID_ENTRYPOINT",
+        message: `Service "${name}" must specify a file "entrypoint" when using "${config.runtime ? "runtime" : "framework"}" "${config.runtime || config.framework}".`,
+        serviceName: name
+      };
+    }
     async function resolveEntrypointPath({
       fs: fs5,
       serviceName,
@@ -22926,7 +23019,7 @@ var require_resolve = __commonJS({
         return {
           error: {
             code: "MULTIPLE_FRAMEWORKS_SERVICE",
-            message: `Multiple frameworks detected in ${workspace === "." ? "project root" : `${workspace}/`}: ${frameworkNames}. Specify "framework" explicitly in experimentalServices.`,
+            message: `Multiple frameworks detected in ${workspace === "." ? "project root" : `${workspace}/`}: ${frameworkNames}. Specify "framework" explicitly in services.`,
             serviceName
           }
         };
@@ -23020,7 +23113,7 @@ var require_resolve = __commonJS({
         }
       };
     }
-    function validateServiceConfig(name, config) {
+    function validateServiceConfig(name, config, options = {}) {
       if (!SERVICE_NAME_REGEX.test(name)) {
         return {
           code: "INVALID_SERVICE_NAME",
@@ -23036,13 +23129,15 @@ var require_resolve = __commonJS({
         };
       }
       const serviceType = config.type || "web";
-      const isJobService = serviceType === "job" || serviceType === "cron";
-      const isScheduleJobService = (0, import_build_utils5.isScheduleTriggeredService)({
+      const effectiveTrigger = getEffectiveServiceTrigger(config);
+      const effectiveService = {
         type: serviceType,
-        trigger: config.trigger
-      });
-      const isQueueJobService = serviceType === "job" && config.trigger === "queue";
-      const isWorkflowService = serviceType === "job" && config.trigger === "workflow";
+        trigger: effectiveTrigger
+      };
+      const isJobService = serviceType === "job" || serviceType === "cron";
+      const isScheduleJobService = (0, import_build_utils5.isScheduleTriggeredService)(effectiveService);
+      const isQueueJobService = serviceType === "job" && (0, import_build_utils5.isQueueTriggeredService)(effectiveService);
+      const isWorkflowService = serviceType === "job" && effectiveTrigger === "workflow";
       const isNonWebService = serviceType === "worker" || isJobService;
       const serviceTypeLabel = isJobService ? "Job" : serviceType === "worker" ? "Worker" : "Web";
       const routingResult = resolveServiceRoutingConfig(name, config);
@@ -23088,17 +23183,17 @@ var require_resolve = __commonJS({
           serviceName: name
         };
       }
-      if (serviceType === "job" && config.trigger === void 0) {
+      if (serviceType === "job" && effectiveTrigger === void 0) {
         return {
           code: "MISSING_JOB_TRIGGER",
           message: `Job service "${name}" is missing required "trigger" field.`,
           serviceName: name
         };
       }
-      if (serviceType === "job" && config.trigger && !import_build_utils5.JOB_TRIGGERS.includes(config.trigger)) {
+      if (serviceType === "job" && effectiveTrigger && !import_build_utils5.JOB_TRIGGERS.includes(effectiveTrigger)) {
         return {
           code: "INVALID_JOB_TRIGGER",
-          message: `Job service "${name}" has invalid trigger "${config.trigger}". Expected ${import_build_utils5.JOB_TRIGGERS.map((t) => `"${t}"`).join(", ")}.`,
+          message: `Job service "${name}" has invalid trigger "${effectiveTrigger}". Expected ${import_build_utils5.JOB_TRIGGERS.map((t) => `"${t}"`).join(", ")}.`,
           serviceName: name
         };
       }
@@ -23176,6 +23271,7 @@ var require_resolve = __commonJS({
       const hasFramework = Boolean(config.framework);
       const hasBuilderOrRuntime = Boolean(config.builder || config.runtime);
       const hasEntrypoint = Boolean(config.entrypoint);
+      const entrypointRequiredRuntime = getEntrypointRequiredRuntime(config);
       if (!hasFramework && !hasBuilderOrRuntime && !hasEntrypoint) {
         return {
           code: "MISSING_SERVICE_CONFIG",
@@ -23183,6 +23279,13 @@ var require_resolve = __commonJS({
           serviceName: name
         };
       }
+      if (options.requireFileEntrypointForBackendRuntimes && !hasEntrypoint && entrypointRequiredRuntime && ENTRYPOINT_REQUIRED_RUNTIMES.has(entrypointRequiredRuntime)) {
+        return {
+          code: "MISSING_ENTRYPOINT",
+          message: `Service "${name}" must specify "entrypoint" when using "${config.runtime ? "runtime" : "framework"}" "${config.runtime || config.framework}".`,
+          serviceName: name
+        };
+      }
       if (hasBuilderOrRuntime && !hasFramework && !hasEntrypoint) {
         return {
           code: "MISSING_ENTRYPOINT",
@@ -23220,7 +23323,7 @@ var require_resolve = __commonJS({
         routePrefixSource = "configured"
       } = options;
       const type = config.type || "web";
-      const trigger = type === "cron" ? "schedule" : type === "job" ? config.trigger : void 0;
+      const trigger = getEffectiveServiceTrigger(config);
       const rawEntrypoint = config.entrypoint;
       const moduleAttrParsed = typeof rawEntrypoint === "string" ? parsePyModuleAttrEntrypoint(rawEntrypoint) : null;
       const routingResult = resolveServiceRoutingConfig(name, config);
@@ -23366,13 +23469,13 @@ var require_resolve = __commonJS({
         envPrefix: config.envPrefix
       };
     }
-    async function resolveAllConfiguredServices(services, fs5, routePrefixSource = "configured") {
+    async function resolveAllConfiguredServices(services, fs5, routePrefixSource = "configured", options = {}) {
       const resolved = [];
       const errors = [];
       const webServicesByRoutePrefix = /* @__PURE__ */ new Map();
       for (const name of Object.keys(services)) {
         const serviceConfig = services[name];
-        const validationError = validateServiceConfig(name, serviceConfig);
+        const validationError = validateServiceConfig(name, serviceConfig, options);
         if (validationError) {
           errors.push(validationError);
           continue;
@@ -23410,6 +23513,16 @@ var require_resolve = __commonJS({
             continue;
           }
         }
+        const explicitBackendEntrypointError = validateBackendFileEntrypoint(
+          name,
+          serviceConfig,
+          resolvedEntrypoint,
+          options
+        );
+        if (explicitBackendEntrypointError) {
+          errors.push(explicitBackendEntrypointError);
+          continue;
+        }
         let resolvedConfig = serviceConfig;
         if (!serviceConfig.framework && resolvedEntrypoint) {
           if (resolvedEntrypoint.isDirectory) {
@@ -23466,6 +23579,16 @@ var require_resolve = __commonJS({
             }
           }
         }
+        const backendEntrypointError = validateBackendFileEntrypoint(
+          name,
+          resolvedConfig,
+          resolvedEntrypoint,
+          options
+        );
+        if (backendEntrypointError) {
+          errors.push(backendEntrypointError);
+          continue;
+        }
         const service = await resolveConfiguredService({
           name,
           config: resolvedConfig,
@@ -23545,7 +23668,7 @@ var require_auto_detect = __commonJS({
           errors: [
             {
               code: "MULTIPLE_FRAMEWORKS_ROOT",
-              message: `Multiple frameworks detected at root: ${frameworkNames}. Use explicit experimentalServices config.`
+              message: `Multiple frameworks detected at root: ${frameworkNames}. Use explicit services config.`
             }
           ]
         };
@@ -23570,7 +23693,7 @@ var require_auto_detect = __commonJS({
             errors: [
               {
                 code: "MULTIPLE_FRAMEWORKS_SERVICE",
-                message: `Multiple frameworks detected in ${frontendLocation}/: ${frameworkNames}. Use explicit experimentalServices config.`
+                message: `Multiple frameworks detected in ${frontendLocation}/: ${frameworkNames}. Use explicit services config.`
               }
             ]
           };
@@ -23588,7 +23711,7 @@ var require_auto_detect = __commonJS({
         errors: [
           {
             code: "NO_SERVICES_CONFIGURED",
-            message: "No services detected. Configure experimentalServices in vercel.json or ensure a framework exists at project root, frontend/, or apps/web/."
+            message: "No services detected. Configure services in vercel.json or ensure a framework exists at project root, frontend/, or apps/web/."
           }
         ]
       };
@@ -23669,7 +23792,7 @@ var require_auto_detect = __commonJS({
             services: {},
             error: {
               code: "SERVICE_NAME_CONFLICT",
-              message: `Service name conflict: "${serviceName}" exists in both ${BACKEND_DIR}/ and ${SERVICES_DIR}/${serviceName}/. Rename one of the directories or use explicit experimentalServices config.`,
+              message: `Service name conflict: "${serviceName}" exists in both ${BACKEND_DIR}/ and ${SERVICES_DIR}/${serviceName}/. Rename one of the directories or use explicit services config.`,
               serviceName
             }
           };
@@ -23718,7 +23841,7 @@ var require_auto_detect = __commonJS({
         return {
           error: {
             code: "MULTIPLE_FRAMEWORKS_SERVICE",
-            message: `Multiple frameworks detected in ${dirPath}/: ${frameworkNames}. Use explicit experimentalServices config.`,
+            message: `Multiple frameworks detected in ${dirPath}/: ${frameworkNames}. Use explicit services config.`,
             serviceName
           }
         };
@@ -23852,7 +23975,7 @@ var require_detect_railway = __commonJS({
         if (frameworks2.length === 0) {
           warnings.push({
             code: "SERVICE_SKIPPED",
-            message: `Skipped service in ${dirLabel}/: no framework detected. Configure it manually in experimentalServices.`
+            message: `Skipped service in ${dirLabel}/: no framework detected. Configure it manually in services.`
           });
           continue;
         }
@@ -23860,7 +23983,7 @@ var require_detect_railway = __commonJS({
           const names = frameworks2.map((f) => f.name).join(", ");
           errors.push({
             code: "MULTIPLE_FRAMEWORKS_SERVICE",
-            message: `Multiple frameworks detected in ${dirLabel}/: ${names}. Use explicit experimentalServices config.`,
+            message: `Multiple frameworks detected in ${dirLabel}/: ${names}. Use explicit services config.`,
             serviceName
           });
           continue;
@@ -24102,7 +24225,8 @@ var require_detect_services = __commonJS({
           warnings: []
         });
       }
-      const configuredServices = vercelConfig?.experimentalServices;
+      const hasNonEmptyPublicServicesConfig = vercelConfig?.services && Object.keys(vercelConfig.services).length > 0;
+      const configuredServices = hasNonEmptyPublicServicesConfig ? vercelConfig.services : vercelConfig?.experimentalServices;
       const hasConfiguredServices = configuredServices && Object.keys(configuredServices).length > 0;
       if (!hasConfiguredServices) {
         const railwayResult = await (0, import_detect_railway.detectRailwayServices)({ fs: scopedFs });
@@ -24179,7 +24303,7 @@ var require_detect_services = __commonJS({
           errors: [
             {
               code: "NO_SERVICES_CONFIGURED",
-              message: "No services configured. Add `experimentalServices` to vercel.json."
+              message: "No services configured. Add `services` to vercel.json."
             }
           ],
           warnings: []
@@ -24188,7 +24312,12 @@ var require_detect_services = __commonJS({
       const result = await (0, import_resolve.resolveAllConfiguredServices)(
         configuredServices,
         scopedFs,
-        "configured"
+        "configured",
+        {
+          requireFileEntrypointForBackendRuntimes: Boolean(
+            hasNonEmptyPublicServicesConfig
+          )
+        }
       );
       const routes = generateServicesRoutes2(result.services);
       return withResolvedResult({
@@ -24616,7 +24745,7 @@ var require_get_services_builders = __commonJS({
           errors: [
             {
               code: "NO_SERVICES_CONFIGURED",
-              message: "No services configured. Add `experimentalServices` to vercel.json."
+              message: "No services configured. Add `services` to vercel.json."
             }
           ],
           warnings: warningResponses,
@@ -24746,13 +24875,14 @@ var require_detect_builders = __commonJS({
       return publicBuilder ? publicBuilder.src.replace("/**/*", "") : null;
     }
     async function detectBuilders2(files, pkg, options = {}) {
-      const { experimentalServices: services, projectSettings = {} } = options;
+      const { services, experimentalServices, projectSettings = {} } = options;
       const { framework } = projectSettings;
-      const hasServicesConfig = services != null && typeof services === "object";
+      const configuredServices = services ?? experimentalServices;
+      const hasServicesConfig = configuredServices != null && typeof configuredServices === "object";
       if (hasServicesConfig || framework === "services") {
         return (0, import_get_services_builders.getServicesBuilders)({
           workPath: options.workPath,
-          configuredServices: services,
+          configuredServices,
           projectFramework: framework
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.9.24",
+  "version": "2.9.25",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -14,8 +14,8 @@
   },
   "dependencies": {
     "ts-morph": "12.0.0",
+    "@vercel/gatsby-plugin-vercel-builder": "2.2.3",
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/gatsby-plugin-vercel-builder": "2.2.2",
     "@vercel/static-config": "3.3.0"
   },
   "devDependencies": {
@@ -37,10 +37,10 @@
     "semver": "7.5.2",
     "tree-kill": "1.2.2",
     "vitest": "2.0.3",
-    "@vercel/build-utils": "13.22.1",
+    "@vercel/build-utils": "13.23.0",
     "@vercel/error-utils": "2.1.0",
-    "@vercel/frameworks": "3.25.1",
-    "@vercel/fs-detectors": "6.2.1",
+    "@vercel/frameworks": "3.26.0",
+    "@vercel/fs-detectors": "6.2.2",
     "@vercel/routing-utils": "6.2.0"
   },
   "scripts": {