@vercel/static-build 2.9.0 → 2.9.2

package/dist/index.js

@@ -10386,7 +10386,6 @@ var require_frameworks = __commonJS({
       {
         name: "Django",
         slug: "django",
-        experimental: true,
         logo: "https://api-frameworks.vercel.sh/framework-logos/django.svg",
         tagline: "Django is a high-level Python web framework that encourages rapid development and clean, pragmatic design. ",
         description: "A Django project served via the Python Runtime.",
@@ -12007,7 +12006,6 @@ var require_frameworks = __commonJS({
       {
         name: "Python",
         slug: "python",
-        experimental: true,
         runtimeFramework: true,
         logo: "https://api-frameworks.vercel.sh/framework-logos/python.svg",
         tagline: "Python is a programming language that lets you work quickly and integrate systems more effectively.",
@@ -12202,7 +12200,6 @@ var require_frameworks = __commonJS({
       {
         name: "Go",
         slug: "go",
-        experimental: true,
         runtimeFramework: true,
         logo: "https://api-frameworks.vercel.sh/framework-logos/go.svg",
         tagline: "An open-source programming language supported by Google.",
@@ -22386,7 +22383,7 @@ var require_types3 = __commonJS({
     });
     module2.exports = __toCommonJS2(types_exports);
     var RUNTIME_BUILDERS = {
-      node: "@vercel/node",
+      node: "@vercel/backends",
       python: "@vercel/python",
       go: "@vercel/go",
       rust: "@vercel/rust",
@@ -22452,6 +22449,7 @@ var require_utils4 = __commonJS({
     var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
     var utils_exports = {};
     __export2(utils_exports, {
+      INTERNAL_QUEUES_PREFIX: () => INTERNAL_QUEUES_PREFIX,
       INTERNAL_SERVICE_PREFIX: () => INTERNAL_SERVICE_PREFIX2,
       filterFrameworksByRuntime: () => filterFrameworksByRuntime,
       getBuilderForRuntime: () => getBuilderForRuntime,
@@ -22463,6 +22461,7 @@ var require_utils4 = __commonJS({
       hasFile: () => hasFile,
       inferRuntimeFromFramework: () => inferRuntimeFromFramework,
       inferServiceRuntime: () => inferServiceRuntime,
+      isFrontendFramework: () => isFrontendFramework,
       isRouteOwningBuilder: () => isRouteOwningBuilder2,
       isStaticBuild: () => isStaticBuild2,
       readVercelConfig: () => readVercelConfig
@@ -22478,6 +22477,7 @@ var require_utils4 = __commonJS({
       }
     }
     var INTERNAL_SERVICE_PREFIX2 = "/_svc";
+    var INTERNAL_QUEUES_PREFIX = "/_svc/_queues";
     function getInternalServiceFunctionPath2(serviceName) {
       return `${INTERNAL_SERVICE_PREFIX2}/${serviceName}/index`;
     }
@@ -22527,6 +22527,12 @@ var require_utils4 = __commonJS({
       }
       return void 0;
     }
+    function isFrontendFramework(framework) {
+      if (!framework) {
+        return false;
+      }
+      return !inferRuntimeFromFramework(framework);
+    }
     function filterFrameworksByRuntime(frameworks2, runtime) {
       if (!runtime) {
         return [...frameworks2];
@@ -22837,11 +22843,9 @@ var require_detect_framework = __commonJS({
 var require_resolve = __commonJS({
   "../fs-detectors/dist/services/resolve.js"(exports2, module2) {
     "use strict";
-    var __create2 = Object.create;
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
     var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __getProtoOf2 = Object.getPrototypeOf;
     var __hasOwnProp2 = Object.prototype.hasOwnProperty;
     var __export2 = (target, all) => {
       for (var name in all)
@@ -22855,14 +22859,6 @@ var require_resolve = __commonJS({
       }
       return to;
     };
-    var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
-      // 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 ? __defProp2(target, "default", { value: mod, enumerable: true }) : target,
-      mod
-    ));
     var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
     var resolve_exports = {};
     __export2(resolve_exports, {
@@ -22875,10 +22871,11 @@ var require_resolve = __commonJS({
     var import_path7 = require("path");
     var import_types = require_types3();
     var import_utils = require_utils4();
-    var import_frameworks2 = __toESM2(require_frameworks());
+    var import_frameworks2 = require_frameworks();
     var import_detect_framework = require_detect_framework();
     var import_routing_utils = require_dist6();
-    var frameworksBySlug = new Map(import_frameworks2.default.map((f) => [f.slug, f]));
+    var import_build_utils5 = require("@vercel/build-utils");
+    var frameworksBySlug = new Map(import_frameworks2.frameworkList.map((f) => [f.slug, f]));
     var PYTHON_MODULE_ATTR_RE = /^([A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*)*):([A-Za-z_][\w]*)$/;
     function parsePyModuleAttrEntrypoint(entrypoint) {
       const match = PYTHON_MODULE_ATTR_RE.exec(entrypoint);
@@ -22979,7 +22976,7 @@ var require_resolve = __commonJS({
       runtime
     }) {
       const serviceFs = workspace === "." ? fs5 : fs5.chdir(workspace);
-      const frameworkCandidates = (0, import_utils.filterFrameworksByRuntime)(import_frameworks2.default, runtime);
+      const frameworkCandidates = (0, import_utils.filterFrameworksByRuntime)(import_frameworks2.frameworkList, runtime);
       const frameworks2 = await (0, import_detect_framework.detectFrameworks)({
         fs: serviceFs,
         frameworkList: frameworkCandidates
@@ -23111,6 +23108,7 @@ var require_resolve = __commonJS({
     function validateServiceEntrypoint(name, config, resolvedEntrypoint) {
       if (!resolvedEntrypoint.isDirectory && !config.builder && !config.runtime && !config.framework) {
         const runtime = (0, import_utils.inferServiceRuntime)({
+          ...config,
           entrypoint: resolvedEntrypoint.normalized
         });
         if (!runtime) {
@@ -23181,15 +23179,28 @@ var require_resolve = __commonJS({
       const consumer = type === "worker" ? config.consumer || "default" : config.consumer;
       let builderUse;
       let builderSrc;
-      if (config.framework) {
-        const framework = frameworksBySlug.get(config.framework);
-        builderUse = framework?.useRuntime?.use || "@vercel/static-build";
-        builderSrc = resolvedEntrypointFile || framework?.useRuntime?.src || "package.json";
-      } else if (config.builder) {
+      const frameworkDefinition = config.framework ? frameworksBySlug.get(config.framework) : void 0;
+      if (config.builder) {
         builderUse = config.builder;
-        builderSrc = resolvedEntrypointFile;
+        builderSrc = resolvedEntrypointFile || frameworkDefinition?.useRuntime?.src || "package.json";
+      } else if (config.framework) {
+        if (type === "web" && (0, import_build_utils5.isNodeBackendFramework)(config.framework)) {
+          builderUse = "@vercel/backends";
+        } else {
+          builderUse = frameworkDefinition?.useRuntime?.use || "@vercel/static-build";
+        }
+        builderSrc = resolvedEntrypointFile || frameworkDefinition?.useRuntime?.src || "package.json";
       } else {
-        builderUse = (0, import_utils.getBuilderForRuntime)(inferredRuntime);
+        if (!inferredRuntime) {
+          throw new Error(
+            `Could not infer runtime for service "${name}" and no builder or framework were provided.`
+          );
+        }
+        if (inferredRuntime === "node") {
+          builderUse = type === "web" ? "@vercel/backends" : "@vercel/node";
+        } else {
+          builderUse = (0, import_utils.getBuilderForRuntime)(inferredRuntime);
+        }
         builderSrc = resolvedEntrypointFile;
       }
       const normalizedSubdomain = type === "web" && typeof config.subdomain === "string" ? config.subdomain.toLowerCase() : void 0;
@@ -23201,6 +23212,9 @@ var require_resolve = __commonJS({
         builderSrc = import_path7.posix.join(workspace, builderSrc);
       }
       const builderConfig = { zeroConfig: true };
+      if (builderUse === "@vercel/backends") {
+        builderConfig.serviceName = name;
+      }
       if (config.memory)
         builderConfig.memory = config.memory;
       if (config.maxDuration)
@@ -23289,10 +23303,14 @@ var require_resolve = __commonJS({
         let resolvedConfig = serviceConfig;
         if (!serviceConfig.framework && resolvedEntrypoint) {
           if (resolvedEntrypoint.isDirectory) {
+            const inferredRuntime = (0, import_utils.inferServiceRuntime)({
+              ...serviceConfig
+            });
             const workspace = resolvedEntrypoint.normalized;
             const { framework, error } = await detectFrameworkFromWorkspace({
               fs: fs5,
               workspace,
+              runtime: inferredRuntime,
               serviceName: name
             });
             if (error) {
@@ -23329,7 +23347,7 @@ var require_resolve = __commonJS({
                 serviceName: name,
                 runtime: inferredRuntime
               });
-              if (detection.framework) {
+              if (!detection.error && detection.framework) {
                 resolvedConfig = {
                   ...resolvedConfig,
                   framework: detection.framework
@@ -23371,11 +23389,9 @@ var require_resolve = __commonJS({
 var require_auto_detect = __commonJS({
   "../fs-detectors/dist/services/auto-detect.js"(exports2, module2) {
     "use strict";
-    var __create2 = Object.create;
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
     var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __getProtoOf2 = Object.getPrototypeOf;
     var __hasOwnProp2 = Object.prototype.hasOwnProperty;
     var __export2 = (target, all) => {
       for (var name in all)
@@ -23389,14 +23405,6 @@ var require_auto_detect = __commonJS({
       }
       return to;
     };
-    var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
-      // 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 ? __defProp2(target, "default", { value: mod, enumerable: true }) : target,
-      mod
-    ));
     var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
     var auto_detect_exports = {};
     __export2(auto_detect_exports, {
@@ -23404,20 +23412,20 @@ var require_auto_detect = __commonJS({
     });
     module2.exports = __toCommonJS2(auto_detect_exports);
     var import_detect_framework = require_detect_framework();
-    var import_frameworks2 = __toESM2(require_frameworks());
+    var import_frameworks2 = require_frameworks();
     var FRONTEND_DIR = "frontend";
     var APPS_WEB_DIR = "apps/web";
     var BACKEND_DIR = "backend";
     var SERVICES_DIR = "services";
     var FRONTEND_LOCATIONS = [FRONTEND_DIR, APPS_WEB_DIR];
-    var DETECTION_FRAMEWORKS = import_frameworks2.default.filter(
+    var DETECTION_FRAMEWORKS = import_frameworks2.frameworkList.filter(
       (framework) => !framework.experimental || framework.runtimeFramework
     );
     async function autoDetectServices2(options) {
       const { fs: fs5 } = options;
       const rootFrameworks = await (0, import_detect_framework.detectFrameworks)({
         fs: fs5,
-        frameworkList: import_frameworks2.default
+        frameworkList: import_frameworks2.frameworkList
       });
       if (rootFrameworks.length > 1) {
         const frameworkNames = rootFrameworks.map((f) => f.name).join(", ");
@@ -23442,7 +23450,7 @@ var require_auto_detect = __commonJS({
         const frontendFs = fs5.chdir(frontendLocation);
         const frontendFrameworks = await (0, import_detect_framework.detectFrameworks)({
           fs: frontendFs,
-          frameworkList: import_frameworks2.default
+          frameworkList: import_frameworks2.frameworkList
         });
         if (frontendFrameworks.length > 1) {
           const frameworkNames = frontendFrameworks.map((f) => f.name).join(", ");
@@ -23482,13 +23490,22 @@ var require_auto_detect = __commonJS({
       };
       const backendResult = await detectBackendServices(fs5);
       if (backendResult.error) {
-        return { services: null, errors: [backendResult.error] };
+        return {
+          services: null,
+          errors: [backendResult.error]
+        };
       }
       if (Object.keys(backendResult.services).length === 0) {
-        return { services: null, errors: [] };
+        return {
+          services: null,
+          errors: []
+        };
       }
       Object.assign(services, backendResult.services);
-      return { services, errors: [] };
+      return {
+        services,
+        errors: []
+      };
     }
     async function detectServicesFrontendSubdir(fs5, frontendFramework, frontendLocation) {
       const services = {};
@@ -23500,7 +23517,10 @@ var require_auto_detect = __commonJS({
       };
       const backendResult = await detectBackendServices(fs5);
       if (backendResult.error) {
-        return { services: null, errors: [backendResult.error] };
+        return {
+          services: null,
+          errors: [backendResult.error]
+        };
       }
       if (Object.keys(backendResult.services).length === 0) {
         return {
@@ -23514,7 +23534,10 @@ var require_auto_detect = __commonJS({
         };
       }
       Object.assign(services, backendResult.services);
-      return { services, errors: [] };
+      return {
+        services,
+        errors: []
+      };
     }
     async function detectBackendServices(fs5) {
       const services = {};
@@ -23639,43 +23662,68 @@ var require_detect_services = __commonJS({
       { type: "host", value: { suf: ".vercel.app" } },
       { type: "host", value: { suf: ".vercel.dev" } }
     ];
+    function emptyRoutes() {
+      return {
+        hostRewrites: [],
+        rewrites: [],
+        defaults: [],
+        crons: [],
+        workers: []
+      };
+    }
+    function withResolvedResult(resolved, inferred = null) {
+      return {
+        services: resolved.services,
+        source: resolved.source,
+        routes: resolved.routes,
+        errors: resolved.errors,
+        warnings: resolved.warnings,
+        resolved,
+        inferred
+      };
+    }
+    function toInferredLayoutConfig(services) {
+      const inferredConfig = {};
+      for (const [name, service] of Object.entries(services)) {
+        const serviceConfig = {};
+        if (typeof service.entrypoint === "string") {
+          serviceConfig.entrypoint = service.entrypoint;
+        }
+        if (typeof service.routePrefix === "string") {
+          serviceConfig.routePrefix = service.routePrefix;
+        }
+        if ((0, import_utils.isFrontendFramework)(service.framework)) {
+          serviceConfig.framework = service.framework;
+        }
+        inferredConfig[name] = serviceConfig;
+      }
+      return inferredConfig;
+    }
     async function detectServices2(options) {
       const { fs: fs5, workPath } = options;
       const scopedFs = workPath ? fs5.chdir(workPath) : fs5;
       const { config: vercelConfig, error: configError } = await (0, import_utils.readVercelConfig)(scopedFs);
       if (configError) {
-        return {
+        return withResolvedResult({
           services: [],
           source: "configured",
-          routes: {
-            hostRewrites: [],
-            rewrites: [],
-            defaults: [],
-            crons: [],
-            workers: []
-          },
+          routes: emptyRoutes(),
           errors: [configError],
           warnings: []
-        };
+        });
       }
       const configuredServices = vercelConfig?.experimentalServices;
       const hasConfiguredServices = configuredServices && Object.keys(configuredServices).length > 0;
       if (!hasConfiguredServices) {
         const autoResult = await (0, import_auto_detect.autoDetectServices)({ fs: scopedFs });
         if (autoResult.errors.length > 0) {
-          return {
+          return withResolvedResult({
             services: [],
             source: "auto-detected",
-            routes: {
-              hostRewrites: [],
-              rewrites: [],
-              defaults: [],
-              crons: [],
-              workers: []
-            },
+            routes: emptyRoutes(),
             errors: autoResult.errors,
             warnings: []
-          };
+          });
         }
         if (autoResult.services) {
           const result2 = await (0, import_resolve.resolveAllConfiguredServices)(
@@ -23684,24 +23732,28 @@ var require_detect_services = __commonJS({
             "generated"
           );
           const routes2 = generateServicesRoutes2(result2.services);
-          return {
+          const resolved = {
             services: result2.services,
             source: "auto-detected",
             routes: routes2,
             errors: result2.errors,
             warnings: []
           };
+          const rootWebFrameworkServices = result2.services.filter(
+            (service) => service.type === "web" && service.routePrefix === "/" && typeof service.framework === "string"
+          );
+          const inferred = result2.errors.length === 0 && rootWebFrameworkServices.length === 1 && result2.services.length > 1 ? {
+            source: "layout",
+            config: toInferredLayoutConfig(autoResult.services),
+            services: result2.services,
+            warnings: []
+          } : null;
+          return withResolvedResult(resolved, inferred);
         }
-        return {
+        return withResolvedResult({
           services: [],
           source: "auto-detected",
-          routes: {
-            hostRewrites: [],
-            rewrites: [],
-            defaults: [],
-            crons: [],
-            workers: []
-          },
+          routes: emptyRoutes(),
           errors: [
             {
               code: "NO_SERVICES_CONFIGURED",
@@ -23709,7 +23761,7 @@ var require_detect_services = __commonJS({
             }
           ],
           warnings: []
-        };
+        });
       }
       const result = await (0, import_resolve.resolveAllConfiguredServices)(
         configuredServices,
@@ -23717,13 +23769,13 @@ var require_detect_services = __commonJS({
         "configured"
       );
       const routes = generateServicesRoutes2(result.services);
-      return {
+      return withResolvedResult({
         services: result.services,
         source: "configured",
         routes,
         errors: result.errors,
         warnings: []
-      };
+      });
     }
     function generateServicesRoutes2(services) {
       const hostRewrites = [];
@@ -23735,6 +23787,7 @@ var require_detect_services = __commonJS({
         (s) => s.type === "web" && typeof s.routePrefix === "string"
       ).sort((a, b) => b.routePrefix.length - a.routePrefix.length);
       const allWebPrefixes = getWebRoutePrefixes(sortedWebServices);
+      const explicitHostPrefixGuard = getExplicitHostPrefixNegativeLookahead(allWebPrefixes);
       for (const service of sortedWebServices) {
         const { routePrefix } = service;
         const normalizedPrefix = routePrefix.slice(1);
@@ -23742,7 +23795,6 @@ var require_detect_services = __commonJS({
         const hostCondition = getHostCondition(service);
         if (hostCondition && routePrefix !== "/") {
           const normalizedRoutePrefix = (0, import_routing_utils.normalizeRoutePrefix)(routePrefix);
-          const escapedPrefix = escapeRegex(normalizedRoutePrefix.slice(1));
           hostRewrites.push({
             src: "^/$",
             dest: normalizedRoutePrefix,
@@ -23751,7 +23803,9 @@ var require_detect_services = __commonJS({
             check: true
           });
           hostRewrites.push({
-            src: `^/(?!${escapedPrefix}(?:/|$))(.*)$`,
+            // Preserve explicit service prefixes so canonical paths like /_/api
+            // keep routing to their target service even on another service's host.
+            src: `^/${explicitHostPrefixGuard}(.*)$`,
             dest: `${normalizedRoutePrefix}/$1`,
             has: hostCondition,
             missing: PREVIEW_DOMAIN_MISSING,
@@ -23795,7 +23849,6 @@ var require_detect_services = __commonJS({
               check: true
             });
           }
-        } else {
         }
       }
       const workerServices = services.filter((s) => s.type === "worker");
@@ -23842,6 +23895,16 @@ var require_detect_services = __commonJS({
       }
       return Array.from(unique);
     }
+    function getExplicitHostPrefixNegativeLookahead(routePrefixes) {
+      const explicitPrefixes = routePrefixes.map(import_routing_utils.normalizeRoutePrefix).filter((prefix) => prefix !== "/").sort((a, b) => b.length - a.length).map((prefix) => escapeRegex(prefix.slice(1)));
+      if (explicitPrefixes.length === 0) {
+        return "";
+      }
+      if (explicitPrefixes.length === 1) {
+        return `(?!${explicitPrefixes[0]}(?:/|$))`;
+      }
+      return `(?!(?:${explicitPrefixes.join("|")})(?:/|$))`;
+    }
     function getHostCondition(service) {
       if (service.type !== "web") {
         return void 0;
@@ -24202,7 +24265,7 @@ var require_detect_builders = __commonJS({
     var import_minimatch = __toESM2(require_minimatch());
     var import_semver2 = require_semver3();
     var import_path7 = require("path");
-    var import_frameworks2 = __toESM2(require_frameworks());
+    var import_frameworks2 = require_frameworks();
     var import_is_official_runtime = require_is_official_runtime();
     var import_build_utils5 = require("@vercel/build-utils");
     var import_get_services_builders = require_get_services_builders();
@@ -24210,7 +24273,7 @@ var require_detect_builders = __commonJS({
     var REGEX_VERCEL_PLATFORM_FILES = `api/**,package.json,${REGEX_MIDDLEWARE_FILES}`;
     var REGEX_NON_VERCEL_PLATFORM_FILES2 = `!{${REGEX_VERCEL_PLATFORM_FILES}}`;
     var slugToFramework = new Map(
-      import_frameworks2.default.map((f) => [f.slug, f])
+      import_frameworks2.frameworkList.map((f) => [f.slug, f])
     );
     function sortFiles(fileA, fileB) {
       return fileA.localeCompare(fileB);
@@ -24241,9 +24304,10 @@ var require_detect_builders = __commonJS({
       return publicBuilder ? publicBuilder.src.replace("/**/*", "") : null;
     }
     async function detectBuilders2(files, pkg, options = {}) {
-      const { projectSettings = {} } = options;
+      const { experimentalServices: services, projectSettings = {} } = options;
       const { framework } = projectSettings;
-      if (framework === "services") {
+      const hasServicesConfig = services != null && typeof services === "object";
+      if (hasServicesConfig || framework === "services") {
         return (0, import_get_services_builders.getServicesBuilders)({
           workPath: options.workPath
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.9.0",
+  "version": "2.9.2",
   "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.1.2",
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/gatsby-plugin-vercel-builder": "2.1.0",
     "@vercel/static-config": "3.2.0"
   },
   "devDependencies": {
@@ -38,10 +38,10 @@
     "rc9": "1.2.0",
     "semver": "7.5.2",
     "tree-kill": "1.2.2",
-    "@vercel/build-utils": "13.8.0",
-    "@vercel/frameworks": "3.20.0",
+    "@vercel/build-utils": "13.8.2",
+    "@vercel/frameworks": "3.21.1",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/fs-detectors": "5.10.0",
+    "@vercel/fs-detectors": "5.11.2",
     "@vercel/routing-utils": "6.0.2"
   },
   "scripts": {