@vercel/fs-detectors 6.7.8 → 6.8.1

package/dist/detect-builders.d.ts

@@ -1,5 +1,5 @@
 import type { Route } from '@vercel/routing-utils';
-import type { PackageJson, Builder, BuilderFunctions, ExperimentalServices, ProjectSettings, Service, ExperimentalServicesV2 } from '@vercel/build-utils';
+import type { PackageJson, Builder, BuilderFunctions, ExperimentalServices, ExperimentalServicesV2, ProjectSettings, Service } from '@vercel/build-utils';
 /**
  * Pattern for finding all supported middleware files.
  */

package/dist/detect-builders.js

@@ -93,21 +93,27 @@ function detectOutputDirectory(builders) {
 }
 async function detectBuilders(files, pkg, options = {}) {
   const {
-    experimentalServices,
+    experimentalServices: experimentalServicesV1,
     experimentalServicesV2,
     projectSettings = {}
   } = options;
   const { framework } = projectSettings;
-  const configuredServices = experimentalServices ?? experimentalServicesV2;
-  const configuredServicesType = experimentalServices ? "experimentalServices" : "experimentalServicesV2";
+  const configuredServices = experimentalServicesV2 ?? experimentalServicesV1;
+  const configuredServicesType = experimentalServicesV2 ? "experimentalServicesV2" : "experimentalServices";
   const hasServicesConfig = configuredServices != null && typeof configuredServices === "object";
   if (hasServicesConfig || framework === "services") {
-    return (0, import_get_services_builders.getServicesBuilders)({
+    const result = await (0, import_get_services_builders.getServicesBuilders)({
       workPath: options.workPath,
       configuredServices,
       configuredServicesType,
       projectFramework: framework
     });
+    if (configuredServices != null) {
+      result.warnings.push(
+        ...(0, import_get_services_builders.warnIgnoredDirectories)(files, configuredServices)
+      );
+    }
+    return result;
   }
   const errors = [];
   const warnings = [];
@@ -490,10 +496,11 @@ function validateFunctions({ functions = {} }) {
         message: "Function must contain at least one property."
       };
     }
-    if (func.maxDuration !== void 0 && func.maxDuration !== "max" && (func.maxDuration < 1 || func.maxDuration > 900 || !Number.isInteger(func.maxDuration))) {
+    const maxDurationLimit = (0, import_build_utils.getMaxDurationLimit)();
+    if (func.maxDuration !== void 0 && func.maxDuration !== "max" && (func.maxDuration < 1 || maxDurationLimit !== void 0 && func.maxDuration > maxDurationLimit || !Number.isInteger(func.maxDuration))) {
       return {
         code: "invalid_function_duration",
-        message: 'Functions must have a maxDuration between 1 and 900, or "max".'
+        message: maxDurationLimit !== void 0 ? `Functions must have a maxDuration between 1 and ${maxDurationLimit}, or "max".` : 'Functions must have a positive integer maxDuration, or "max".'
       };
     }
     if (func.memory !== void 0 && (func.memory < 128 || func.memory > 10240)) {

package/dist/services/detect-services.js

@@ -92,7 +92,7 @@ async function detectServices(options) {
     workPath,
     detectEntrypoint,
     configuredServices: providedConfiguredServices,
-    configuredServicesType
+    configuredServicesType: providedConfiguredServicesType
   } = options;
   const scopedFs = workPath ? fs.chdir(workPath) : fs;
   const { config: vercelConfig, error: configError } = await (0, import_utils.readVercelConfig)(scopedFs);
@@ -107,7 +107,7 @@ async function detectServices(options) {
     });
   }
   const hasProvidedConfiguredServices = providedConfiguredServices && Object.keys(providedConfiguredServices).length > 0;
-  const experimentalServicesV2 = hasProvidedConfiguredServices && configuredServicesType === "experimentalServicesV2" ? providedConfiguredServices : hasProvidedConfiguredServices ? void 0 : vercelConfig?.experimentalServicesV2;
+  const experimentalServicesV2 = hasProvidedConfiguredServices && providedConfiguredServicesType === "experimentalServicesV2" ? providedConfiguredServices : hasProvidedConfiguredServices ? void 0 : vercelConfig?.experimentalServicesV2;
   if (experimentalServicesV2 && Object.keys(experimentalServicesV2).length > 0) {
     const result2 = await (0, import_resolve_v2.resolveAllConfiguredServicesV2)(
       experimentalServicesV2,
@@ -124,9 +124,9 @@ async function detectServices(options) {
       warnings: []
     });
   }
-  const configuredServices = hasProvidedConfiguredServices ? providedConfiguredServices : vercelConfig?.experimentalServices;
-  const hasConfiguredServices = configuredServices && Object.keys(configuredServices).length > 0;
-  if (!hasConfiguredServices) {
+  const experimentalServicesV1 = hasProvidedConfiguredServices ? providedConfiguredServices : vercelConfig?.experimentalServices;
+  const hasExperimentalServicesV1 = experimentalServicesV1 && Object.keys(experimentalServicesV1).length > 0;
+  if (!hasExperimentalServicesV1) {
     const detectors = [
       { detect: import_detect_railway.detectRailwayServices, source: "railway" },
       { detect: import_detect_render.detectRenderServices, source: "render" },
@@ -154,7 +154,7 @@ async function detectServices(options) {
     });
   }
   const result = await (0, import_resolve.resolveAllConfiguredServices)(
-    configuredServices,
+    experimentalServicesV1,
     scopedFs,
     "configured"
   );

package/dist/services/get-services-builders.d.ts

@@ -33,3 +33,7 @@ export interface ServicesBuildersResult {
  * the shape expected by `detectBuilders` when `framework === 'services'`.
  */
 export declare function getServicesBuilders(options: GetServicesBuildersOptions): Promise<ServicesBuildersResult>;
+/**
+ * Returns warnings for ignored directories that are not covered by services
+ */
+export declare function warnIgnoredDirectories(files: string[], configuredServices: ConfiguredServices): ErrorResponse[];

package/dist/services/get-services-builders.js

@@ -18,7 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var get_services_builders_exports = {};
 __export(get_services_builders_exports, {
-  getServicesBuilders: () => getServicesBuilders
+  getServicesBuilders: () => getServicesBuilders,
+  warnIgnoredDirectories: () => warnIgnoredDirectories
 });
 module.exports = __toCommonJS(get_services_builders_exports);
 var import_detect_services = require("./detect-services");
@@ -134,7 +135,25 @@ async function getServicesBuilders(options) {
     useImplicitEnvInjection: result.useImplicitEnvInjection
   };
 }
+function warnIgnoredDirectories(files, configuredServices) {
+  const warnings = [];
+  if (files.some((f) => f.startsWith("api/"))) {
+    const serviceCoversApi = Object.values(configuredServices).some((service) => {
+      const root = service.root ?? ".";
+      const entrypoint = service.entrypoint ?? "";
+      return root === "api" || root.startsWith("api/") || root === "." && entrypoint.startsWith("api/");
+    });
+    if (!serviceCoversApi) {
+      warnings.push({
+        code: "api_dir_ignored",
+        message: "The `api/` directory will not be built because `experimentalServices` is configured. To serve these files, declare them as a service in your `vercel.json`."
+      });
+    }
+  }
+  return warnings;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getServicesBuilders
+  getServicesBuilders,
+  warnIgnoredDirectories
 });

package/dist/services/types.d.ts

@@ -1,5 +1,5 @@
 import type { Route } from '@vercel/routing-utils';
-import type { DetectEntrypointFn, EnvVar, EnvVars, ExperimentalServiceConfig, ExperimentalServiceGroups, ExperimentalServices, ExperimentalServiceV2Config, ExperimentalServicesV2, ExperimentalServiceV2Binding, ExperimentalService, ExperimentalServiceV2, ServiceRuntime, ServiceType, ServiceRefEnvVar, Service, Builder } from '@vercel/build-utils';
+import type { DetectEntrypointFn, EnvVar, EnvVars, ExperimentalServiceConfig, ExperimentalServiceV2Config, ExperimentalServiceGroups, ExperimentalServices, ExperimentalServicesV2, ExperimentalServiceV2Binding, ExperimentalService, ExperimentalServiceV2, ServiceRuntime, ServiceType, ServiceRefEnvVar, Service, Builder } from '@vercel/build-utils';
 import type { DetectorFilesystem } from '../detectors/filesystem';
 export type { DetectEntrypointFn, EnvVar, EnvVars, ExperimentalServiceConfig, ExperimentalServiceGroups, ExperimentalServices, ExperimentalServiceV2Config, ExperimentalServicesV2, ExperimentalServiceV2Binding, ExperimentalService, ExperimentalServiceV2, ServiceRuntime, ServiceType, ServiceRefEnvVar, Service, Builder, };
 /**
@@ -62,7 +62,7 @@ export interface InferredServicesResult {
 export interface DetectServicesResult extends ResolvedServicesResult {
     /**
      * Source of service definitions:
-     * - `configured`: loaded from explicit project configuration (`vercel.json#experimentalServices`)
+     * - `configured`: loaded from explicit project configuration (`vercel.json#experimentalServices` or `vercel.json#experimentalServicesV2`)
      * - `auto-detected`: inferred from project structure
      */
     resolved: ResolvedServicesResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "6.7.8",
+  "version": "6.8.1",
   "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/frameworks": "3.27.0",
-    "@vercel/build-utils": "13.27.1",
-    "@vercel/error-utils": "2.2.0",
-    "@vercel/routing-utils": "6.2.0"
+    "@vercel/build-utils": "13.28.0",
+    "@vercel/frameworks": "3.28.0",
+    "@vercel/routing-utils": "6.2.0",
+    "@vercel/error-utils": "2.2.0"
   },
   "devDependencies": {
     "@types/glob": "7.2.0",