@vercel/fs-detectors 6.1.0 → 6.2.0

package/dist/detect-builders.d.ts

@@ -41,6 +41,7 @@ export declare function detectBuilders(files: string[], pkg?: PackageJson | unde
     warnings: ErrorResponse[];
     hostRewriteRoutes?: Route[] | null;
     defaultRoutes: Route[] | null;
+    fallbackRoutes?: Route[] | null;
     redirectRoutes: Route[] | null;
     rewriteRoutes: Route[] | null;
     errorRoutes: Route[] | null;

package/dist/detect-builders.js

@@ -97,7 +97,9 @@ async function detectBuilders(files, pkg, options = {}) {
   const hasServicesConfig = services != null && typeof services === "object";
   if (hasServicesConfig || framework === "services") {
     return (0, import_get_services_builders.getServicesBuilders)({
-      workPath: options.workPath
+      workPath: options.workPath,
+      configuredServices: services,
+      projectFramework: framework
     });
   }
   const errors = [];

package/dist/get-project-paths.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var get_project_paths_exports = {};
 __export(get_project_paths_exports, {
@@ -32,7 +22,7 @@ __export(get_project_paths_exports, {
 });
 module.exports = __toCommonJS(get_project_paths_exports);
 var import_detect_framework = require("./detect-framework");
-var import_frameworks = __toESM(require("@vercel/frameworks"));
+var import_frameworks = require("@vercel/frameworks");
 const MAX_DEPTH_TRAVERSE = 3;
 const getProjectPaths = async ({
   fs,
@@ -49,7 +39,7 @@ const getProjectPaths = async ({
   }
   const framework = await (0, import_detect_framework.detectFramework)({
     fs: fs.chdir(topPath),
-    frameworkList: import_frameworks.default
+    frameworkList: import_frameworks.frameworkList
   });
   if (framework !== null)
     allPaths.push(topPath);

package/dist/services/detect-services.js

@@ -37,6 +37,7 @@ function emptyRoutes() {
     hostRewrites: [],
     rewrites: [],
     defaults: [],
+    fallbacks: [],
     crons: [],
     workers: []
   };
@@ -186,6 +187,7 @@ function generateServicesRoutes(services) {
   const hostRewrites = [];
   const rewrites = [];
   const defaults = [];
+  const fallbacks = [];
   const crons = [];
   const workers = [];
   const sortedWebServices = services.filter(
@@ -222,13 +224,12 @@ function generateServicesRoutes(services) {
     }
     if ((0, import_utils.isStaticBuild)(service)) {
       if (routePrefix === "/") {
-        defaults.push({ handle: "filesystem" });
-        defaults.push({
+        fallbacks.push({
           src: (0, import_routing_utils.scopeRouteSourceToOwnership)("/(.*)", ownershipGuard),
           dest: "/index.html"
         });
       } else {
-        rewrites.push({
+        fallbacks.push({
           src: (0, import_routing_utils.scopeRouteSourceToOwnership)(
             `^/${normalizedPrefix}(?:/.*)?$`,
             ownershipGuard
@@ -266,7 +267,7 @@ function generateServicesRoutes(services) {
       check: true
     });
   }
-  return { hostRewrites, rewrites, defaults, crons, workers };
+  return { hostRewrites, rewrites, defaults, fallbacks, crons, workers };
 }
 function escapeRegex(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");

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

@@ -1,5 +1,5 @@
 import type { Route } from '@vercel/routing-utils';
-import type { Builder } from '@vercel/build-utils';
+import type { Builder, ExperimentalServices } from '@vercel/build-utils';
 import type { ResolvedService } from './types';
 export interface ErrorResponse {
     code: string;
@@ -9,6 +9,8 @@ export interface ErrorResponse {
 }
 export interface GetServicesBuildersOptions {
     workPath?: string;
+    configuredServices?: ExperimentalServices;
+    projectFramework?: string | null;
 }
 export interface ServicesBuildersResult {
     builders: Builder[] | null;
@@ -16,6 +18,7 @@ export interface ServicesBuildersResult {
     warnings: ErrorResponse[];
     hostRewriteRoutes: Route[] | null;
     defaultRoutes: Route[] | null;
+    fallbackRoutes: Route[] | null;
     redirectRoutes: Route[] | null;
     rewriteRoutes: Route[] | null;
     errorRoutes: Route[] | null;

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

@@ -23,8 +23,31 @@ __export(get_services_builders_exports, {
 module.exports = __toCommonJS(get_services_builders_exports);
 var import_detect_services = require("./detect-services");
 var import_local_file_system_detector = require("../detectors/local-file-system-detector");
+function isExperimentalServicesAutoDetectionEnabled() {
+  const env = process.env.VERCEL_USE_EXPERIMENTAL_SERVICES;
+  return env === "1" || env?.toLowerCase() === "true";
+}
 async function getServicesBuilders(options) {
-  const { workPath } = options;
+  const { workPath, configuredServices, projectFramework } = options;
+  const hasServiceDefinitions = configuredServices != null && Object.keys(configuredServices).length > 0;
+  if (projectFramework === "services" && !hasServiceDefinitions && !isExperimentalServicesAutoDetectionEnabled()) {
+    return {
+      builders: null,
+      errors: [
+        {
+          code: "MISSING_EXPERIMENTAL_SERVICES",
+          message: 'Project framework is set to "services", but no services are declared. Add `experimentalServices` to vercel.json with at least one service, or change the project framework setting.'
+        }
+      ],
+      warnings: [],
+      hostRewriteRoutes: null,
+      defaultRoutes: null,
+      fallbackRoutes: null,
+      redirectRoutes: null,
+      rewriteRoutes: null,
+      errorRoutes: null
+    };
+  }
   if (!workPath) {
     return {
       builders: null,
@@ -37,6 +60,7 @@ async function getServicesBuilders(options) {
       warnings: [],
       hostRewriteRoutes: null,
       defaultRoutes: null,
+      fallbackRoutes: null,
       redirectRoutes: null,
       rewriteRoutes: null,
       errorRoutes: null
@@ -58,6 +82,7 @@ async function getServicesBuilders(options) {
       warnings: warningResponses,
       hostRewriteRoutes: null,
       defaultRoutes: null,
+      fallbackRoutes: null,
       redirectRoutes: null,
       rewriteRoutes: null,
       errorRoutes: null
@@ -75,6 +100,7 @@ async function getServicesBuilders(options) {
       warnings: warningResponses,
       hostRewriteRoutes: null,
       defaultRoutes: null,
+      fallbackRoutes: null,
       redirectRoutes: null,
       rewriteRoutes: null,
       errorRoutes: null
@@ -87,6 +113,7 @@ async function getServicesBuilders(options) {
     warnings: warningResponses,
     hostRewriteRoutes: result.routes.hostRewrites.length > 0 ? result.routes.hostRewrites : null,
     defaultRoutes: result.routes.defaults.length > 0 ? result.routes.defaults : null,
+    fallbackRoutes: result.routes.fallbacks.length > 0 ? result.routes.fallbacks : null,
     redirectRoutes: [],
     rewriteRoutes: result.routes.rewrites.length > 0 || result.routes.workers.length > 0 || result.routes.crons.length > 0 ? [
       ...result.routes.rewrites,

package/dist/services/resolve.js

@@ -282,7 +282,10 @@ function validateServiceConfig(name, config) {
   }
   const serviceType = config.type || "web";
   const isJobService = serviceType === "job" || serviceType === "cron";
-  const isScheduleJobService = serviceType === "cron" || serviceType === "job" && config.trigger === "schedule";
+  const isScheduleJobService = (0, import_build_utils.isScheduleTriggeredService)({
+    type: serviceType,
+    trigger: config.trigger
+  });
   const isQueueJobService = serviceType === "job" && config.trigger === "queue";
   const isWorkflowService = serviceType === "job" && config.trigger === "workflow";
   const isNonWebService = serviceType === "worker" || isJobService;
@@ -527,7 +530,8 @@ async function resolveConfiguredService(options) {
     builderUse = config.builder;
     builderSrc = resolvedEntrypointFile || frameworkDefinition?.useRuntime?.src || "package.json";
   } else if (config.framework) {
-    if (type === "web" && (0, import_build_utils2.isNodeBackendFramework)(config.framework)) {
+    const isCronService = (0, import_build_utils.isScheduleTriggeredService)({ type, trigger });
+    if ((0, import_build_utils2.isNodeBackendFramework)(config.framework) && (type === "web" || isCronService)) {
       builderUse = "@vercel/backends";
     } else {
       builderUse = frameworkDefinition?.useRuntime?.use || "@vercel/static-build";
@@ -540,7 +544,8 @@ async function resolveConfiguredService(options) {
       );
     }
     if (inferredRuntime === "node") {
-      builderUse = type === "web" ? "@vercel/backends" : "@vercel/node";
+      const isCronService = (0, import_build_utils.isScheduleTriggeredService)({ type, trigger });
+      builderUse = type === "web" || isCronService ? "@vercel/backends" : "@vercel/node";
     } else {
       builderUse = (0, import_utils.getBuilderForRuntime)(inferredRuntime);
     }

package/dist/services/types.d.ts

@@ -21,6 +21,8 @@ export interface ServicesRoutes {
     rewrites: Route[];
     /** Default routes (catch-all for root web service) */
     defaults: Route[];
+    /** SPA fallback routes for static web services */
+    fallbacks: Route[];
     /**
      * Internal routes for schedule-triggered job services.
      * These route `/_svc/{serviceName}/crons/{entry}/{handler}` to the scheduled job function.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,25 +20,27 @@
     "minimatch": "3.1.2",
     "semver": "6.3.1",
     "smol-toml": "1.5.2",
-    "@vercel/build-utils": "13.21.0",
     "@vercel/error-utils": "2.1.0",
-    "@vercel/frameworks": "3.25.0",
+    "@vercel/build-utils": "13.22.0",
+    "@vercel/frameworks": "3.25.1",
     "@vercel/routing-utils": "6.2.0"
   },
   "devDependencies": {
     "@types/glob": "7.2.0",
-    "@types/jest": "27.5.1",
     "@types/js-yaml": "4.0.5",
     "@types/minimatch": "3.0.5",
     "@types/node": "20.11.0",
     "@types/semver": "7.3.10",
-    "jest-junit": "16.0.0"
+    "vitest": "2.0.3"
   },
   "scripts": {
     "build": "node ../../utils/build.mjs",
-    "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
+    "test": "vitest run --config ../../vitest.config.mts",
     "test-unit": "pnpm test test/unit.*test.*",
     "test-e2e": "pnpm test test/integration.test.ts",
-    "type-check": "tsc --noEmit"
+    "type-check": "tsc --noEmit",
+    "vitest-run": "vitest -c ../../vitest.config.mts",
+    "vitest-unit": "glob --absolute 'test/unit.*test.*'",
+    "vitest-e2e": "glob --absolute 'test/integration.test.ts'"
   }
 }