@vercel/static-build 2.11.9 → 2.11.11

package/dist/index.js

@@ -22994,7 +22994,7 @@ var require_utils4 = __commonJS({
           };
         }
       }
-      const hasVercelToml = process.env.VERCEL_TOML_CONFIG_ENABLED === "1" && await fs5.hasPath("vercel.toml");
+      const hasVercelToml = await fs5.hasPath("vercel.toml");
       if (hasVercelToml) {
         try {
           const { parse: tomlParse } = await Promise.resolve().then(() => (init_dist(), dist_exports));
@@ -29298,7 +29298,9 @@ var require_detect_builders = __commonJS({
       detectApiExtensions: () => detectApiExtensions2,
       detectBuilders: () => detectBuilders2,
       detectOutputDirectory: () => detectOutputDirectory2,
-      sortFiles: () => sortFiles
+      getProxyBuilder: () => getProxyBuilder2,
+      sortFiles: () => sortFiles,
+      validateProxyConfig: () => validateProxyConfig2
     });
     module2.exports = __toCommonJS2(detect_builders_exports);
     var import_minimatch = __toESM2(require_minimatch());
@@ -29309,7 +29311,7 @@ var require_detect_builders = __commonJS({
     var import_build_utils5 = require("@vercel/build-utils");
     var import_get_services_builders = require_get_services_builders();
     var REGEX_MIDDLEWARE_FILES = "middleware.[jt]s";
-    var REGEX_VERCEL_PLATFORM_FILES = [
+    var VERCEL_PLATFORM_FILES = [
       "api/**",
       "node_modules/**",
       REGEX_MIDDLEWARE_FILES,
@@ -29321,8 +29323,18 @@ var require_detect_builders = __commonJS({
       "bun.lockb",
       ".gitignore",
       "README.md"
-    ].join(",");
-    var REGEX_NON_VERCEL_PLATFORM_FILES2 = `!{${REGEX_VERCEL_PLATFORM_FILES}}`;
+    ];
+    var REGEX_VERCEL_PLATFORM_FILES = VERCEL_PLATFORM_FILES.join(",");
+    function escapeMinimatchPath(path6) {
+      return path6.replace(/([\\,*?[\]{}()!+@])/g, "\\$1");
+    }
+    function getStaticFilesPattern(additionalExclusions = []) {
+      return `!{${[
+        ...VERCEL_PLATFORM_FILES,
+        ...additionalExclusions.map(escapeMinimatchPath)
+      ].join(",")}}`;
+    }
+    var REGEX_NON_VERCEL_PLATFORM_FILES2 = getStaticFilesPattern();
     var slugToFramework = new Map(
       import_frameworks2.frameworkList.map((f) => [f.slug, f])
     );
@@ -29378,6 +29390,18 @@ var require_detect_builders = __commonJS({
         };
       }
       const { framework } = projectSettings;
+      const proxyError = validateProxy(options, files, framework);
+      if (proxyError) {
+        return {
+          builders: null,
+          errors: [proxyError],
+          warnings: [],
+          defaultRoutes: null,
+          redirectRoutes: null,
+          rewriteRoutes: null,
+          errorRoutes: null
+        };
+      }
       const servicesConfig = services ?? experimentalServicesV2;
       const configuredServices = servicesConfig ?? experimentalServicesV1;
       const configuredServicesType = servicesConfig ? services ? "services" : "experimentalServicesV2" : "experimentalServices";
@@ -29394,6 +29418,12 @@ var require_detect_builders = __commonJS({
             ...(0, import_get_services_builders.warnIgnoredDirectories)(files, configuredServices)
           );
         }
+        if (!result.errors && options.proxy) {
+          result.builders = [
+            getProxyBuilder2(options.proxy, options.tag, options.functions),
+            ...result.builders ?? []
+          ];
+        }
         return result;
       }
       const errors = [];
@@ -29444,6 +29474,9 @@ var require_detect_builders = __commonJS({
       const apiRoutes = [];
       const dynamicRoutes = [];
       for (const fileName of sortedFiles) {
+        if (fileName === options.proxy?.entrypoint) {
+          continue;
+        }
         const apiBuilder = await maybeGetApiBuilder(fileName, apiMatches, options);
         if (apiBuilder) {
           const { routeError, apiRoute, isDynamic } = getApiRoute(
@@ -29486,6 +29519,15 @@ var require_detect_builders = __commonJS({
           fallbackEntrypoint = fileName;
         }
       }
+      if (options.proxy) {
+        const proxyBuilder = getProxyBuilder2(
+          options.proxy,
+          options.tag,
+          options.functions
+        );
+        addToUsedFunctions(proxyBuilder);
+        apiBuilders.unshift(proxyBuilder);
+      }
       if (!makeFrontendStatic && (hasBuildScript(pkg) || buildCommand || framework)) {
         frontendBuilder = detectFrontBuilder(
           pkg,
@@ -29519,13 +29561,31 @@ var require_detect_builders = __commonJS({
         } else if (apiBuilders.length && hasNoneApiFiles) {
           frontendBuilder = {
             use: "@vercel/static",
-            src: REGEX_NON_VERCEL_PLATFORM_FILES2,
+            src: getStaticFilesPattern(
+              options.proxy ? [options.proxy.entrypoint] : []
+            ),
             config: {
               zeroConfig: true
             }
           };
         }
       }
+      if (options.proxy && frontendBuilder && (0, import_is_official_runtime.isOfficialRuntime)("next", frontendBuilder.use)) {
+        return {
+          builders: null,
+          errors: [
+            {
+              code: "proxy_framework_conflict",
+              message: "The `proxy` property cannot be used with Next.js because the framework builds its own routing middleware."
+            }
+          ],
+          warnings,
+          defaultRoutes: null,
+          redirectRoutes: null,
+          rewriteRoutes: null,
+          errorRoutes: null
+        };
+      }
       const unusedFunctionError = checkUnusedFunctions(
         frontendBuilder,
         usedFunctions,
@@ -29592,7 +29652,7 @@ var require_detect_builders = __commonJS({
       };
     }
     async function maybeGetApiBuilder(fileName, apiMatches, options) {
-      const middleware = fileName === "middleware.js" || fileName === "middleware.ts";
+      const middleware = !options.proxy && (fileName === "middleware.js" || fileName === "middleware.ts");
       if (middleware && options.projectSettings?.framework === "nextjs") {
         return null;
       }
@@ -29665,6 +29725,30 @@ var require_detect_builders = __commonJS({
       const func = keys.find((key) => key === fileName || (0, import_minimatch.default)(fileName, key));
       return func ? { fnPattern: func, func: functions[func] } : { fnPattern: null, func: null };
     }
+    function getProxyBuilder2(proxy, tag, functions = {}) {
+      const { fnPattern, func } = getFunction(proxy.entrypoint, { functions });
+      const runtime = func?.runtime;
+      const config = {
+        zeroConfig: true,
+        middleware: true,
+        ...!runtime ? { middlewareRuntime: "nodejs" } : {},
+        ...proxy.matcher ? { middlewareMatcher: proxy.matcher } : {}
+      };
+      if (fnPattern && func) {
+        config.functions = { [fnPattern]: func };
+        if (func.includeFiles) {
+          config.includeFiles = func.includeFiles;
+        }
+        if (func.excludeFiles) {
+          config.excludeFiles = func.excludeFiles;
+        }
+      }
+      return {
+        src: proxy.entrypoint,
+        use: runtime || `@vercel/node${tag ? `@${tag}` : ""}`,
+        config
+      };
+    }
     function getApiMatches() {
       const config = { zeroConfig: true };
       return [
@@ -29680,6 +29764,63 @@ var require_detect_builders = __commonJS({
         { src: "api/**/*.rs", use: `@vercel/rust`, config }
       ];
     }
+    function validateProxyConfig2(proxy) {
+      if (typeof proxy !== "object" || typeof proxy.entrypoint !== "string" || !proxy.entrypoint) {
+        return {
+          code: "invalid_proxy",
+          message: "The `proxy` property must contain an `entrypoint` string that references a `.js` or `.ts` file."
+        };
+      }
+      const entrypoint = proxy.entrypoint;
+      const segments = entrypoint.split("/");
+      if (entrypoint.startsWith("/") || entrypoint.includes("\\") || segments.includes(".") || segments.includes("..") || /[?#\u0000-\u001f]/.test(entrypoint)) {
+        return {
+          code: "invalid_proxy_entrypoint",
+          message: "The `proxy.entrypoint` path must be relative to the project root and cannot contain traversal, query, fragment, or control characters."
+        };
+      }
+      if (!/\.(?:js|ts)$/.test(entrypoint) || entrypoint.endsWith(".d.ts")) {
+        return {
+          code: "invalid_proxy_entrypoint",
+          message: "The `proxy.entrypoint` path must end in `.js` or `.ts` and reference an executable file."
+        };
+      }
+      if (proxy.matcher !== void 0) {
+        const matchers = Array.isArray(proxy.matcher) ? proxy.matcher : [proxy.matcher];
+        if (matchers.length === 0 || matchers.some(
+          (matcher) => typeof matcher !== "string" || !matcher.startsWith("/")
+        )) {
+          return {
+            code: "invalid_proxy_matcher",
+            message: "The `proxy.matcher` value must be a path matcher starting with `/`, or an array of path matchers starting with `/`."
+          };
+        }
+      }
+      return null;
+    }
+    function validateProxy(options, files, framework) {
+      const { proxy } = options;
+      if (!proxy) {
+        return null;
+      }
+      const configError = validateProxyConfig2(proxy);
+      if (configError) {
+        return configError;
+      }
+      if (!files.includes(proxy.entrypoint)) {
+        return {
+          code: "proxy_entrypoint_not_found",
+          message: `The proxy entrypoint \`${proxy.entrypoint}\` does not exist. Set \`proxy.entrypoint\` to an existing \`.js\` or \`.ts\` file.`
+        };
+      }
+      if (framework === "nextjs" || framework === "astro") {
+        return {
+          code: "proxy_framework_conflict",
+          message: `The \`proxy\` property cannot be used with ${framework === "nextjs" ? "Next.js" : "Astro"} because the framework builds its own routing middleware.`
+        };
+      }
+      return null;
+    }
     function hasBuildScript(pkg) {
       const { scripts = {} } = pkg || {};
       return Boolean(scripts && scripts["build"]);
@@ -34714,6 +34855,7 @@ var require_dist8 = __commonJS({
       getInternalServiceWorkerPath: () => import_utils.getInternalServiceWorkerPath,
       getInternalServiceWorkerPathPrefix: () => import_utils.getInternalServiceWorkerPathPrefix,
       getProjectPaths: () => import_get_project_paths.getProjectPaths,
+      getProxyBuilder: () => import_detect_builders.getProxyBuilder,
       getServicesBuilders: () => import_get_services_builders.getServicesBuilders,
       getWorkspacePackagePaths: () => import_get_workspace_package_paths.getWorkspacePackagePaths,
       getWorkspaces: () => import_get_workspaces.getWorkspaces,
@@ -34727,6 +34869,7 @@ var require_dist8 = __commonJS({
       packageManagers: () => import_package_managers.packageManagers,
       resolveAllConfiguredServicesV2: () => import_resolve_v2.resolveAllConfiguredServicesV2,
       resolveConfiguredServiceV2: () => import_resolve_v2.resolveConfiguredServiceV2,
+      validateProxyConfig: () => import_detect_builders.validateProxyConfig,
       validateServiceConfigV2: () => import_resolve_v2.validateServiceConfigV2,
       workspaceManagers: () => import_workspace_managers.workspaceManagers
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.11.9",
+  "version": "2.11.11",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -14,9 +14,9 @@
   },
   "dependencies": {
     "ts-morph": "12.0.0",
-    "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
+    "@vercel/gatsby-plugin-vercel-builder": "2.2.31",
     "@vercel/static-config": "3.4.0",
-    "@vercel/gatsby-plugin-vercel-builder": "2.2.29"
+    "@vercel/gatsby-plugin-vercel-analytics": "1.0.11"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
@@ -37,11 +37,11 @@
     "semver": "7.5.2",
     "tree-kill": "1.2.2",
     "vitest": "2.0.3",
-    "@vercel/build-utils": "13.35.0",
+    "@vercel/frameworks": "3.30.7",
+    "@vercel/build-utils": "13.36.1",
     "@vercel/error-utils": "2.2.0",
-    "@vercel/fs-detectors": "6.13.3",
-    "@vercel/routing-utils": "6.4.0",
-    "@vercel/frameworks": "3.30.7"
+    "@vercel/fs-detectors": "6.14.1",
+    "@vercel/routing-utils": "6.4.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",