@vercel/fs-detectors 5.7.21 → 5.7.22

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export { detectBuilders, detectOutputDirectory, detectApiDirectory, detectApiExtensions, type Options as DetectBuildersOptions, } from './detect-builders';
 export { detectServices, generateServicesRoutes, } from './services/detect-services';
+export { isStaticBuild } from './services/utils';
 export { getServicesBuilders } from './services/get-services-builders';
 export type { DetectServicesOptions, DetectServicesResult, ResolvedService, ServicesRoutes, ServiceDetectionError, } from './services/types';
 export { detectFileSystemAPI } from './detect-file-system-api';

package/dist/index.js

@@ -43,6 +43,7 @@ __export(src_exports, {
   getWorkspacePackagePaths: () => import_get_workspace_package_paths.getWorkspacePackagePaths,
   getWorkspaces: () => import_get_workspaces.getWorkspaces,
   isOfficialRuntime: () => import_is_official_runtime.isOfficialRuntime,
+  isStaticBuild: () => import_utils.isStaticBuild,
   isStaticRuntime: () => import_is_official_runtime.isStaticRuntime,
   monorepoManagers: () => import_monorepo_managers.monorepoManagers,
   packageManagers: () => import_package_managers.packageManagers,
@@ -51,6 +52,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_detect_builders = require("./detect-builders");
 var import_detect_services = require("./services/detect-services");
+var import_utils = require("./services/utils");
 var import_get_services_builders = require("./services/get-services-builders");
 var import_detect_file_system_api = require("./detect-file-system-api");
 var import_detect_framework = require("./detect-framework");
@@ -92,6 +94,7 @@ var import_detect_instrumentation = require("./detect-instrumentation");
   getWorkspacePackagePaths,
   getWorkspaces,
   isOfficialRuntime,
+  isStaticBuild,
   isStaticRuntime,
   monorepoManagers,
   packageManagers,

package/dist/services/detect-services.d.ts

@@ -9,11 +9,12 @@ export declare function detectServices(options: DetectServicesOptions): Promise<
 /**
  * Generate routing rules for services.
  *
- * Web services: Routes are ordered by prefix length (longest first) to ensure
- * more specific routes match before broader ones. For example, `/api/users`
- * must be checked before `/api`, which must be checked before the catch-all `/`.
+ * Routes are ordered by prefix length (longest first) to ensure more specific
+ * routes match before broader ones. For example, `/api/users` must be checked
+ * before `/api`, which must be checked before the catch-all `/`.
  *
- * Cron/Worker services: TODO
- * Use internal routes under `/_svc/crons` and `/_svc/workers`
+ * - Static/SPA services: SPA fallback routes to index.html
+ * - Serverless services: Rewrite to the function entrypoint
+ * - Cron/Worker services: TODO - internal routes under `/_svc/`
  */
 export declare function generateServicesRoutes(services: ResolvedService[]): ServicesRoutes;

package/dist/services/detect-services.js

@@ -65,33 +65,34 @@ function generateServicesRoutes(services) {
   const defaults = [];
   const crons = [];
   const workers = [];
-  const webServices = services.filter(
+  const sortedWebServices = services.filter(
     (s) => s.type === "web" && typeof s.routePrefix === "string"
-  );
-  const sortedWebServices = [...webServices].sort((a, b) => {
-    if (a.routePrefix === "/")
-      return 1;
-    if (b.routePrefix === "/")
-      return -1;
-    return b.routePrefix.length - a.routePrefix.length;
-  });
+  ).sort((a, b) => b.routePrefix.length - a.routePrefix.length);
   for (const service of sortedWebServices) {
-    const { routePrefix, builder } = service;
-    const builderSrc = builder.src || routePrefix;
-    const functionPath = builderSrc.startsWith("/") ? builderSrc : `/${builderSrc}`;
-    if (routePrefix === "/") {
-      defaults.push({
-        src: "^/(.*)$",
-        dest: functionPath,
-        check: true
-      });
+    const { routePrefix } = service;
+    const normalizedPrefix = routePrefix.slice(1);
+    if ((0, import_utils.isStaticBuild)(service)) {
+      if (routePrefix === "/") {
+        defaults.push({ handle: "filesystem" });
+        defaults.push({ src: "/(.*)", dest: "/index.html" });
+      } else {
+        rewrites.push({
+          src: `^/${normalizedPrefix}(?:/.*)?$`,
+          dest: `/${normalizedPrefix}/index.html`
+        });
+      }
     } else {
-      const normalizedPrefix = routePrefix.startsWith("/") ? routePrefix.slice(1) : routePrefix;
-      rewrites.push({
-        src: `^/${normalizedPrefix}(?:/.*)?$`,
-        dest: functionPath,
-        check: true
-      });
+      const builderSrc = service.builder.src || routePrefix;
+      const functionPath = builderSrc.startsWith("/") ? builderSrc : `/${builderSrc}`;
+      if (routePrefix === "/") {
+        defaults.push({ src: "^/(.*)$", dest: functionPath, check: true });
+      } else {
+        rewrites.push({
+          src: `^/${normalizedPrefix}(?:/.*)?$`,
+          dest: functionPath,
+          check: true
+        });
+      }
     }
   }
   return { rewrites, defaults, crons, workers };

package/dist/services/resolve.js

@@ -131,7 +131,7 @@ function resolveConfiguredService(name, config, group) {
     builderUse = (0, import_utils.getBuilderForRuntime)(inferredRuntime);
     builderSrc = config.entrypoint;
   }
-  const routePrefix = type === "web" ? config.routePrefix : void 0;
+  const routePrefix = type === "web" && config.routePrefix ? config.routePrefix.startsWith("/") ? config.routePrefix : `/${config.routePrefix}` : void 0;
   const isRoot = workspace === ".";
   if (!isRoot && !builderSrc.startsWith(workspace + "/")) {
     builderSrc = import_path.posix.join(workspace, builderSrc);
@@ -147,6 +147,13 @@ function resolveConfiguredService(name, config, group) {
     builderConfig.excludeFiles = config.excludeFiles;
   const isStaticBuild = import_types.STATIC_BUILDERS.has(builderUse);
   const runtime = isStaticBuild ? void 0 : inferredRuntime;
+  if (routePrefix) {
+    const stripped = routePrefix.startsWith("/") ? routePrefix.slice(1) : routePrefix;
+    builderConfig.routePrefix = stripped || ".";
+  }
+  if (config.framework) {
+    builderConfig.framework = config.framework;
+  }
   return {
     name,
     type,

package/dist/services/utils.d.ts

@@ -1,6 +1,7 @@
 import type { DetectorFilesystem } from '../detectors/filesystem';
-import type { ServiceRuntime, ExperimentalServices, ServiceDetectionError } from './types';
+import type { ServiceRuntime, ExperimentalServices, ServiceDetectionError, ResolvedService } from './types';
 export declare function getBuilderForRuntime(runtime: ServiceRuntime): string;
+export declare function isStaticBuild(service: ResolvedService): boolean;
 /**
  * Infer runtime from available service configuration.
  *

package/dist/services/utils.js

@@ -20,6 +20,7 @@ var utils_exports = {};
 __export(utils_exports, {
   getBuilderForRuntime: () => getBuilderForRuntime,
   inferServiceRuntime: () => inferServiceRuntime,
+  isStaticBuild: () => isStaticBuild,
   readVercelConfig: () => readVercelConfig
 });
 module.exports = __toCommonJS(utils_exports);
@@ -32,6 +33,9 @@ function getBuilderForRuntime(runtime) {
   }
   return builder;
 }
+function isStaticBuild(service) {
+  return import_types.STATIC_BUILDERS.has(service.builder.use);
+}
 function inferServiceRuntime(config) {
   if (config.runtime && config.runtime in import_types.RUNTIME_BUILDERS) {
     return config.runtime;
@@ -81,5 +85,6 @@ async function readVercelConfig(fs) {
 0 && (module.exports = {
   getBuilderForRuntime,
   inferServiceRuntime,
+  isStaticBuild,
   readVercelConfig
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "5.7.21",
+  "version": "5.7.22",
   "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",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/frameworks": "3.16.1",
-    "@vercel/routing-utils": "5.3.2"
+    "@vercel/routing-utils": "5.3.2",
+    "@vercel/frameworks": "3.16.1"
   },
   "devDependencies": {
     "@types/glob": "7.2.0",