@vercel/static-build 2.8.34 → 2.8.36

package/dist/index.js

@@ -19753,6 +19753,7 @@ var require_types2 = __commonJS({
     var types_exports = {};
     __export2(types_exports, {
       ENTRYPOINT_EXTENSIONS: () => ENTRYPOINT_EXTENSIONS,
+      ROUTE_OWNING_BUILDERS: () => ROUTE_OWNING_BUILDERS,
       RUNTIME_BUILDERS: () => RUNTIME_BUILDERS,
       STATIC_BUILDERS: () => STATIC_BUILDERS
     });
@@ -19780,6 +19781,10 @@ var require_types2 = __commonJS({
       "@vercel/static-build",
       "@vercel/static"
     ]);
+    var ROUTE_OWNING_BUILDERS = /* @__PURE__ */ new Set([
+      "@vercel/next",
+      "@vercel/backends"
+    ]);
   }
 });
 
@@ -19808,6 +19813,7 @@ var require_utils4 = __commonJS({
     __export2(utils_exports, {
       getBuilderForRuntime: () => getBuilderForRuntime,
       inferServiceRuntime: () => inferServiceRuntime,
+      isRouteOwningBuilder: () => isRouteOwningBuilder2,
       isStaticBuild: () => isStaticBuild2,
       readVercelConfig: () => readVercelConfig
     });
@@ -19824,6 +19830,9 @@ var require_utils4 = __commonJS({
     function isStaticBuild2(service) {
       return import_types.STATIC_BUILDERS.has(service.builder.use);
     }
+    function isRouteOwningBuilder2(service) {
+      return import_types.ROUTE_OWNING_BUILDERS.has(service.builder.use);
+    }
     function inferServiceRuntime(config) {
       if (config.runtime && config.runtime in import_types.RUNTIME_BUILDERS) {
         return config.runtime;
@@ -19916,6 +19925,13 @@ var require_resolve = __commonJS({
     var import_frameworks2 = __toESM2(require_frameworks());
     var frameworksBySlug = new Map(import_frameworks2.default.map((f) => [f.slug, f]));
     var SERVICE_NAME_REGEX = /^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$/;
+    function normalizeRoutePrefix(routePrefix) {
+      let normalized = routePrefix.startsWith("/") ? routePrefix : `/${routePrefix}`;
+      if (normalized !== "/" && normalized.endsWith("/")) {
+        normalized = normalized.slice(0, -1);
+      }
+      return normalized || "/";
+    }
     function validateServiceConfig(name, config) {
       if (!SERVICE_NAME_REGEX.test(name)) {
         return {
@@ -20018,10 +20034,10 @@ var require_resolve = __commonJS({
       }
       const routePrefix = type === "web" && config.routePrefix ? config.routePrefix.startsWith("/") ? config.routePrefix : `/${config.routePrefix}` : void 0;
       const isRoot = workspace === ".";
-      if (!isRoot && !builderSrc.startsWith(workspace + "/")) {
+      if (!isRoot) {
         builderSrc = import_path7.posix.join(workspace, builderSrc);
       }
-      const builderConfig = {};
+      const builderConfig = { zeroConfig: true };
       if (config.memory)
         builderConfig.memory = config.memory;
       if (config.maxDuration)
@@ -20036,6 +20052,9 @@ var require_resolve = __commonJS({
         const stripped = routePrefix.startsWith("/") ? routePrefix.slice(1) : routePrefix;
         builderConfig.routePrefix = stripped || ".";
       }
+      if (workspace && workspace !== ".") {
+        builderConfig.workspace = workspace;
+      }
       if (config.framework) {
         builderConfig.framework = config.framework;
       }
@@ -20063,6 +20082,7 @@ var require_resolve = __commonJS({
     function resolveAllConfiguredServices(services) {
       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);
@@ -20071,6 +20091,21 @@ var require_resolve = __commonJS({
           continue;
         }
         const service = resolveConfiguredService(name, serviceConfig);
+        if (service.type === "web" && typeof service.routePrefix === "string") {
+          const normalizedRoutePrefix = normalizeRoutePrefix(service.routePrefix);
+          const existingServiceName = webServicesByRoutePrefix.get(
+            normalizedRoutePrefix
+          );
+          if (existingServiceName) {
+            errors.push({
+              code: "DUPLICATE_ROUTE_PREFIX",
+              message: `Web services "${existingServiceName}" and "${name}" cannot share routePrefix "${normalizedRoutePrefix}".`,
+              serviceName: name
+            });
+            continue;
+          }
+          webServicesByRoutePrefix.set(normalizedRoutePrefix, name);
+        }
         resolved.push(service);
       }
       return { services: resolved, errors };
@@ -20587,6 +20622,7 @@ var require_detect_services = __commonJS({
       generateServicesRoutes: () => generateServicesRoutes2
     });
     module2.exports = __toCommonJS2(detect_services_exports);
+    var import_types = require_types2();
     var import_utils = require_utils4();
     var import_resolve = require_resolve();
     var import_auto_detect = require_auto_detect();
@@ -20650,12 +20686,26 @@ var require_detect_services = __commonJS({
       const defaults = [];
       const crons = [];
       const workers = [];
+      const entrypointExtensions = Object.keys(import_types.ENTRYPOINT_EXTENSIONS).sort(
+        (a, b) => b.length - a.length
+      );
+      const stripEntrypointExtension = (entrypoint) => {
+        for (const ext of entrypointExtensions) {
+          if (entrypoint.endsWith(ext)) {
+            return entrypoint.slice(0, -ext.length);
+          }
+        }
+        return entrypoint;
+      };
       const sortedWebServices = services.filter(
         (s) => s.type === "web" && typeof s.routePrefix === "string"
       ).sort((a, b) => b.routePrefix.length - a.routePrefix.length);
       for (const service of sortedWebServices) {
         const { routePrefix } = service;
         const normalizedPrefix = routePrefix.slice(1);
+        if ((0, import_utils.isRouteOwningBuilder)(service)) {
+          continue;
+        }
         if ((0, import_utils.isStaticBuild)(service)) {
           if (routePrefix === "/") {
             defaults.push({ handle: "filesystem" });
@@ -20666,9 +20716,10 @@ var require_detect_services = __commonJS({
               dest: `/${normalizedPrefix}/index.html`
             });
           }
-        } else {
+        } else if (service.runtime) {
           const builderSrc = service.builder.src || routePrefix;
-          const functionPath = builderSrc.startsWith("/") ? builderSrc : `/${builderSrc}`;
+          const extensionless = stripEntrypointExtension(builderSrc);
+          const functionPath = extensionless.startsWith("/") ? extensionless : `/${extensionless}`;
           if (routePrefix === "/") {
             defaults.push({ src: "^/(.*)$", dest: functionPath, check: true });
           } else {
@@ -20678,6 +20729,8 @@ var require_detect_services = __commonJS({
               check: true
             });
           }
+        } else {
+          continue;
         }
       }
       return { rewrites, defaults, crons, workers };
@@ -21511,7 +21564,7 @@ var require_detect_builders = __commonJS({
           }
         }
       }
-      if (frontendBuilder && ((0, import_is_official_runtime.isOfficialRuntime)("express", frontendBuilder.use) || (0, import_is_official_runtime.isOfficialRuntime)("hono", frontendBuilder.use))) {
+      if (frontendBuilder && ((0, import_is_official_runtime.isOfficialRuntime)("express", frontendBuilder.use) || (0, import_is_official_runtime.isOfficialRuntime)("hono", frontendBuilder.use) || (0, import_is_official_runtime.isOfficialRuntime)("backends", frontendBuilder.use))) {
         const validFilenames = [
           "app",
           "index",
@@ -29257,6 +29310,7 @@ var require_dist4 = __commonJS({
       getWorkspacePackagePaths: () => import_get_workspace_package_paths.getWorkspacePackagePaths,
       getWorkspaces: () => import_get_workspaces.getWorkspaces,
       isOfficialRuntime: () => import_is_official_runtime.isOfficialRuntime,
+      isRouteOwningBuilder: () => import_utils.isRouteOwningBuilder,
       isStaticBuild: () => import_utils.isStaticBuild,
       isStaticRuntime: () => import_is_official_runtime.isStaticRuntime,
       monorepoManagers: () => import_monorepo_managers.monorepoManagers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.8.34",
+  "version": "2.8.36",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -15,7 +15,7 @@
   "dependencies": {
     "ts-morph": "12.0.0",
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/gatsby-plugin-vercel-builder": "2.0.132",
+    "@vercel/gatsby-plugin-vercel-builder": "2.0.134",
     "@vercel/static-config": "3.1.2"
   },
   "devDependencies": {
@@ -38,11 +38,11 @@
     "rc9": "1.2.0",
     "semver": "7.5.2",
     "tree-kill": "1.2.2",
-    "@vercel/build-utils": "13.3.3",
+    "@vercel/build-utils": "13.3.5",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/fs-detectors": "5.8.3",
-    "@vercel/routing-utils": "5.3.2",
-    "@vercel/frameworks": "3.17.1"
+    "@vercel/frameworks": "3.17.1",
+    "@vercel/fs-detectors": "5.8.5",
+    "@vercel/routing-utils": "5.3.2"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",