@vercel/static-build 2.9.13 → 2.9.15

package/dist/index.js

@@ -11012,6 +11012,105 @@ var require_frameworks = __commonJS({
           }
         ]
       },
+      {
+        name: "Axum",
+        slug: "axum",
+        experimental: true,
+        supersedes: ["rust"],
+        logo: "https://api-frameworks.vercel.sh/framework-logos/axum.svg",
+        tagline: "Ergonomic and modular web framework built with Tokio, Tower, and Hyper.",
+        description: "An Axum application deployed as a serverless function.",
+        website: "https://github.com/tokio-rs/axum",
+        useRuntime: { src: "src/main.rs", use: "@vercel/rust" },
+        ignoreRuntimes: ["@vercel/rust"],
+        detectors: {
+          every: [
+            {
+              path: "Cargo.toml",
+              matchContent: "axum\\s*="
+            },
+            {
+              path: "src/main.rs"
+            }
+          ]
+        },
+        settings: {
+          installCommand: {
+            placeholder: "None"
+          },
+          buildCommand: {
+            placeholder: "None",
+            value: null
+          },
+          devCommand: {
+            placeholder: "`cargo run`",
+            value: null
+          },
+          outputDirectory: {
+            value: "N/A"
+          }
+        },
+        getOutputDirName: async () => "public",
+        defaultRoutes: [
+          {
+            handle: "filesystem"
+          },
+          {
+            src: "/(.*)",
+            dest: "/src/main"
+          }
+        ]
+      },
+      {
+        name: "Actix Web",
+        slug: "actix-web",
+        experimental: true,
+        runtimeFramework: true,
+        supersedes: ["rust"],
+        logo: "https://api-frameworks.vercel.sh/framework-logos/actix-web.svg",
+        tagline: "A powerful, pragmatic, and extremely fast web framework for Rust.",
+        description: "An Actix Web application deployed as a serverless function.",
+        website: "https://actix.rs",
+        useRuntime: { src: "src/main.rs", use: "@vercel/rust" },
+        ignoreRuntimes: ["@vercel/rust"],
+        detectors: {
+          every: [
+            {
+              path: "Cargo.toml",
+              matchContent: "actix-web\\s*="
+            },
+            {
+              path: "src/main.rs"
+            }
+          ]
+        },
+        settings: {
+          installCommand: {
+            placeholder: "None"
+          },
+          buildCommand: {
+            placeholder: "None",
+            value: null
+          },
+          devCommand: {
+            placeholder: "`cargo run`",
+            value: null
+          },
+          outputDirectory: {
+            value: "N/A"
+          }
+        },
+        getOutputDirName: async () => "public",
+        defaultRoutes: [
+          {
+            handle: "filesystem"
+          },
+          {
+            src: "/(.*)",
+            dest: "/src/main"
+          }
+        ]
+      },
       {
         name: "Node",
         slug: "node",
@@ -22255,12 +22354,12 @@ var require_utils4 = __commonJS({
     var utils_exports = {};
     __export2(utils_exports, {
       INTERNAL_QUEUES_PREFIX: () => INTERNAL_QUEUES_PREFIX,
-      INTERNAL_SERVICE_PREFIX: () => INTERNAL_SERVICE_PREFIX2,
+      INTERNAL_SERVICE_PREFIX: () => import_build_utils5.INTERNAL_SERVICE_PREFIX,
       filterFrameworksByRuntime: () => filterFrameworksByRuntime,
       getBuilderForRuntime: () => getBuilderForRuntime,
-      getInternalServiceCronPath: () => getInternalServiceCronPath2,
-      getInternalServiceCronPathPrefix: () => getInternalServiceCronPathPrefix2,
-      getInternalServiceFunctionPath: () => getInternalServiceFunctionPath2,
+      getInternalServiceCronPath: () => import_build_utils5.getInternalServiceCronPath,
+      getInternalServiceCronPathPrefix: () => import_build_utils5.getInternalServiceCronPathPrefix,
+      getInternalServiceFunctionPath: () => import_build_utils5.getInternalServiceFunctionPath,
       getInternalServiceWorkerPath: () => getInternalServiceWorkerPath2,
       getInternalServiceWorkerPathPrefix: () => getInternalServiceWorkerPathPrefix2,
       hasFile: () => hasFile,
@@ -22273,6 +22372,7 @@ var require_utils4 = __commonJS({
     });
     module2.exports = __toCommonJS2(utils_exports);
     var import_framework_helpers = require("@vercel/build-utils/dist/framework-helpers");
+    var import_build_utils5 = require("@vercel/build-utils");
     var import_types = require_types3();
     async function hasFile(fs5, filePath) {
       try {
@@ -22281,29 +22381,18 @@ var require_utils4 = __commonJS({
         return false;
       }
     }
-    var INTERNAL_SERVICE_PREFIX2 = "/_svc";
     var INTERNAL_QUEUES_PREFIX = "/_svc/_queues";
-    function getInternalServiceFunctionPath2(serviceName) {
-      return `${INTERNAL_SERVICE_PREFIX2}/${serviceName}/index`;
-    }
     function normalizeInternalServiceEntrypoint(entrypoint) {
       const normalized = entrypoint.replace(/\\/g, "/").replace(/^\/+/, "").replace(/\.[^/.]+$/, "");
       return normalized || "index";
     }
     function getInternalServiceWorkerPathPrefix2(serviceName) {
-      return `${INTERNAL_SERVICE_PREFIX2}/${serviceName}/workers`;
-    }
-    function getInternalServiceCronPathPrefix2(serviceName) {
-      return `${INTERNAL_SERVICE_PREFIX2}/${serviceName}/crons`;
+      return `${import_build_utils5.INTERNAL_SERVICE_PREFIX}/${serviceName}/workers`;
     }
     function getInternalServiceWorkerPath2(serviceName, entrypoint, handler = "worker") {
       const normalizedEntrypoint = normalizeInternalServiceEntrypoint(entrypoint);
       return `${getInternalServiceWorkerPathPrefix2(serviceName)}/${normalizedEntrypoint}/${handler}`;
     }
-    function getInternalServiceCronPath2(serviceName, entrypoint, handler = "cron") {
-      const normalizedEntrypoint = normalizeInternalServiceEntrypoint(entrypoint);
-      return `${getInternalServiceCronPathPrefix2(serviceName)}/${normalizedEntrypoint}/${handler}`;
-    }
     function getBuilderForRuntime(runtime) {
       const builder = import_types.RUNTIME_BUILDERS[runtime];
       if (!builder) {
@@ -22712,6 +22801,33 @@ var require_resolve = __commonJS({
     var SERVICE_NAME_REGEX = /^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$/;
     var DNS_LABEL_RE = /^(?!-)[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/i;
     var ENV_PREFIX_RE = /^[A-Z][A-Z0-9_]*_$/;
+    async function getServiceFs(fs5, serviceName, root) {
+      if (!root) {
+        return { fs: fs5 };
+      }
+      const normalizedRoot = import_path7.posix.normalize(root);
+      if (!await fs5.hasPath(normalizedRoot)) {
+        return {
+          fs: fs5,
+          error: {
+            code: "ROOT_NOT_FOUND",
+            message: `Service "${serviceName}" has root "${root}" but that directory does not exist.`,
+            serviceName
+          }
+        };
+      }
+      if (await fs5.isFile(normalizedRoot)) {
+        return {
+          fs: fs5,
+          error: {
+            code: "ROOT_NOT_DIRECTORY",
+            message: `Service "${serviceName}" has root "${root}" but that path is a file, not a directory.`,
+            serviceName
+          }
+        };
+      }
+      return { fs: fs5.chdir(normalizedRoot) };
+    }
     function normalizeServiceEntrypoint(entrypoint) {
       const normalized = import_path7.posix.normalize(entrypoint);
       return normalized === "" ? "." : normalized;
@@ -22970,6 +23086,23 @@ var require_resolve = __commonJS({
           serviceName: name
         };
       }
+      if (config.root !== void 0) {
+        const normalizedRoot = import_path7.posix.normalize(config.root);
+        if (normalizedRoot.startsWith("/")) {
+          return {
+            code: "INVALID_ROOT",
+            message: `Service "${name}" has invalid "root" "${config.root}". Must be a relative path.`,
+            serviceName: name
+          };
+        }
+        if (normalizedRoot === ".." || normalizedRoot.startsWith("../")) {
+          return {
+            code: "INVALID_ROOT",
+            message: `Service "${name}" has invalid "root" "${config.root}". Must not escape the project root.`,
+            serviceName: name
+          };
+        }
+      }
       if (config.envPrefix !== void 0) {
         if (!ENV_PREFIX_RE.test(config.envPrefix)) {
           return {
@@ -23043,7 +23176,8 @@ var require_resolve = __commonJS({
       const {
         name,
         config,
-        fs: fs5,
+        serviceFs,
+        root,
         group,
         resolvedEntrypoint,
         routePrefixSource = "configured"
@@ -23062,7 +23196,7 @@ var require_resolve = __commonJS({
       if (!resolvedEntrypointPath && typeof rawEntrypoint === "string") {
         const entrypointToResolve = moduleAttrParsed ? moduleAttrParsed.filePath : rawEntrypoint;
         const resolved = await resolveEntrypointPath({
-          fs: fs5,
+          fs: serviceFs,
           serviceName: name,
           entrypoint: entrypointToResolve
         });
@@ -23085,7 +23219,7 @@ var require_resolve = __commonJS({
         workspace = normalizedEntrypoint;
       } else {
         const inferredWorkspace = await inferWorkspaceFromNearestManifest({
-          fs: fs5,
+          fs: serviceFs,
           entrypoint: resolvedEntrypointFile,
           runtime: inferredRuntime
         });
@@ -23099,6 +23233,12 @@ var require_resolve = __commonJS({
           }
         }
       }
+      if (root) {
+        const normalizedRoot = import_path7.posix.normalize(root);
+        if (normalizedRoot !== ".") {
+          workspace = workspace === "." ? normalizedRoot : import_path7.posix.join(normalizedRoot, workspace);
+        }
+      }
       const topics = type === "worker" ? (0, import_build_utils5.getWorkerTopics)(config) : config.topics;
       const consumer = type === "worker" ? config.consumer || "default" : config.consumer;
       let builderUse;
@@ -23198,12 +23338,19 @@ var require_resolve = __commonJS({
           errors.push(validationError);
           continue;
         }
+        const root = serviceConfig.root;
+        const serviceFsResult = await getServiceFs(fs5, name, root);
+        if (serviceFsResult.error) {
+          errors.push(serviceFsResult.error);
+          continue;
+        }
+        const serviceFs = serviceFsResult.fs;
         let resolvedEntrypoint;
         if (typeof serviceConfig.entrypoint === "string") {
           const moduleAttr = parsePyModuleAttrEntrypoint(serviceConfig.entrypoint);
           const entrypointToResolve = moduleAttr?.filePath ?? serviceConfig.entrypoint;
           const resolvedPath = await resolveEntrypointPath({
-            fs: fs5,
+            fs: serviceFs,
             serviceName: name,
             entrypoint: entrypointToResolve
           });
@@ -23232,7 +23379,7 @@ var require_resolve = __commonJS({
             });
             const workspace = resolvedEntrypoint.normalized;
             const { framework, error } = await detectFrameworkFromWorkspace({
-              fs: fs5,
+              fs: serviceFs,
               workspace,
               runtime: inferredRuntime,
               serviceName: name
@@ -23260,13 +23407,13 @@ var require_resolve = __commonJS({
             });
             if (inferredRuntime) {
               const inferredWorkspace = await inferWorkspaceFromNearestManifest({
-                fs: fs5,
+                fs: serviceFs,
                 entrypoint: resolvedEntrypoint.normalized,
                 runtime: inferredRuntime
               });
               const workspace = inferredWorkspace ?? import_path7.posix.dirname(resolvedEntrypoint.normalized);
               const detection = await detectFrameworkFromWorkspace({
-                fs: fs5,
+                fs: serviceFs,
                 workspace,
                 serviceName: name,
                 runtime: inferredRuntime
@@ -23283,7 +23430,8 @@ var require_resolve = __commonJS({
         const service = await resolveConfiguredService({
           name,
           config: resolvedConfig,
-          fs: fs5,
+          serviceFs,
+          root,
           resolvedEntrypoint,
           routePrefixSource
         });
@@ -24099,15 +24247,10 @@ var require_detect_services = __commonJS({
       }
       const cronServices = services.filter((s) => s.type === "cron");
       for (const service of cronServices) {
-        const cronEntrypoint = service.entrypoint || service.builder.src || "index";
-        const cronPath = (0, import_utils.getInternalServiceCronPath)(
-          service.name,
-          cronEntrypoint,
-          service.handlerFunction || "cron"
-        );
+        const cronPrefix = (0, import_utils.getInternalServiceCronPathPrefix)(service.name);
         const functionPath = (0, import_utils.getInternalServiceFunctionPath)(service.name);
         crons.push({
-          src: `^${escapeRegex(cronPath)}$`,
+          src: `^${escapeRegex(cronPrefix)}/.*$`,
           dest: functionPath,
           check: true
         });
@@ -24767,7 +24910,7 @@ var require_detect_builders = __commonJS({
         }
       }
       const nodeExtensions = [".js", ".mjs", ".ts", ".tsx"];
-      if (process.env.VERCEL_NODE_FILTER_ENTRYPOINTS === "1" && nodeExtensions.some((ext) => fileName.endsWith(ext)) && options.workPath) {
+      if (fileName.startsWith("api/") && process.env.VERCEL_NODE_FILTER_ENTRYPOINTS === "1" && nodeExtensions.some((ext) => fileName.endsWith(ext)) && options.workPath) {
         const fsPath = (0, import_path7.join)(options.workPath, fileName);
         const isEntrypoint = await (0, import_build_utils5.isNodeEntrypoint)({ fsPath });
         if (!isEntrypoint) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.9.13",
+  "version": "2.9.15",
   "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.1.13",
+    "@vercel/gatsby-plugin-vercel-builder": "2.1.15",
     "@vercel/static-config": "3.2.0"
   },
   "devDependencies": {
@@ -38,11 +38,11 @@
     "rc9": "1.2.0",
     "semver": "7.5.2",
     "tree-kill": "1.2.2",
-    "@vercel/build-utils": "13.15.0",
+    "@vercel/build-utils": "13.17.0",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/frameworks": "3.24.0",
-    "@vercel/routing-utils": "6.1.1",
-    "@vercel/fs-detectors": "5.16.0"
+    "@vercel/frameworks": "3.24.1",
+    "@vercel/fs-detectors": "5.18.0",
+    "@vercel/routing-utils": "6.1.1"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",