@vercel/static-build 2.11.0 → 2.11.2

package/dist/index.js

@@ -21767,7 +21767,8 @@ var require_types3 = __commonJS({
       python: "@vercel/python",
       go: "@vercel/go",
       rust: "@vercel/rust",
-      ruby: "@vercel/ruby"
+      ruby: "@vercel/ruby",
+      container: "@vercel/container"
     };
     var RUNTIME_MANIFESTS = {
       node: ["package.json"],
@@ -23253,6 +23254,12 @@ var require_resolve = __commonJS({
       "python",
       "go"
     ]);
+    function isContainerRuntime(config) {
+      return config.runtime === "container";
+    }
+    function normalizeContainerCommand(command) {
+      return Array.isArray(command) ? command : [command];
+    }
     async function getServiceFs(fs5, serviceName, root) {
       if (!root) {
         return { fs: fs5 };
@@ -23338,6 +23345,10 @@ var require_resolve = __commonJS({
         }
       };
     }
+    function isDockerfileEntrypoint(entrypoint) {
+      const base = import_path7.posix.basename(entrypoint).toLowerCase();
+      return base === "dockerfile" || base === "containerfile" || base.endsWith(".dockerfile");
+    }
     function toWorkspaceRelativeEntrypoint(entrypoint, workspace) {
       const normalizedEntrypoint = import_path7.posix.normalize(entrypoint);
       if (workspace === ".") {
@@ -23716,6 +23727,13 @@ var require_resolve = __commonJS({
           serviceName: name
         };
       }
+      if (config.command !== void 0 && !isContainerRuntime(config)) {
+        return {
+          code: "INVALID_COMMAND",
+          message: `Service "${name}" can only specify "command" when using runtime "container".`,
+          serviceName: name
+        };
+      }
       return null;
     }
     function validateServiceEntrypoint(name, config, resolvedEntrypoint) {
@@ -23756,8 +23774,11 @@ var require_resolve = __commonJS({
       const configuredRoutePrefix = routingResult.routing?.routePrefix;
       const configuredSubdomain = routingResult.routing?.subdomain;
       const routePrefixWasConfigured = routingResult.routing?.routePrefixConfigured ?? false;
+      const containerEntrypoint = isContainerRuntime(config) && typeof rawEntrypoint === "string" ? rawEntrypoint : void 0;
+      const containerDockerfile = containerEntrypoint && isDockerfileEntrypoint(containerEntrypoint) ? import_path7.posix.normalize(containerEntrypoint) : void 0;
+      const containerImage = containerEntrypoint && !containerDockerfile ? containerEntrypoint : void 0;
       let resolvedEntrypointPath = resolvedEntrypoint;
-      if (!resolvedEntrypointPath && typeof rawEntrypoint === "string") {
+      if (!containerEntrypoint && !resolvedEntrypointPath && typeof rawEntrypoint === "string") {
         const entrypointToResolve = moduleAttrParsed ? moduleAttrParsed.filePath : rawEntrypoint;
         const resolved = await resolveEntrypointPath({
           fs: serviceFs,
@@ -23766,7 +23787,7 @@ var require_resolve = __commonJS({
         });
         resolvedEntrypointPath = resolved.entrypoint;
       }
-      if (typeof rawEntrypoint === "string" && !resolvedEntrypointPath) {
+      if (!containerEntrypoint && typeof rawEntrypoint === "string" && !resolvedEntrypointPath) {
         throw new Error(
           `Failed to resolve entrypoint "${rawEntrypoint}" for service "${name}".`
         );
@@ -23830,7 +23851,7 @@ var require_resolve = __commonJS({
         } else {
           builderUse = (0, import_utils.getBuilderForRuntime)(inferredRuntime);
         }
-        builderSrc = resolvedEntrypointFile;
+        builderSrc = inferredRuntime === "container" && typeof containerEntrypoint === "string" ? containerEntrypoint : resolvedEntrypointFile;
       }
       const normalizedSubdomain = type === "web" && typeof configuredSubdomain === "string" ? configuredSubdomain.toLowerCase() : void 0;
       const defaultRoutePrefix = type === "web" && normalizedSubdomain ? `/_/${name}` : void 0;
@@ -23864,6 +23885,12 @@ var require_resolve = __commonJS({
       if (config.framework) {
         builderConfig.framework = config.framework;
       }
+      if (containerImage) {
+        builderConfig.handler = containerImage;
+      }
+      if (config.command !== void 0) {
+        builderConfig.command = normalizeContainerCommand(config.command);
+      }
       if (moduleAttrParsed) {
         builderConfig.handlerFunction = moduleAttrParsed.attrName;
       }
@@ -23874,7 +23901,7 @@ var require_resolve = __commonJS({
         trigger,
         group,
         workspace,
-        entrypoint: resolvedEntrypointFile,
+        entrypoint: containerImage ?? containerDockerfile ?? resolvedEntrypointFile,
         routePrefix,
         routePrefixSource: resolvedRoutePrefixSource,
         subdomain: normalizedSubdomain,
@@ -23913,7 +23940,7 @@ var require_resolve = __commonJS({
         }
         const serviceFs = serviceFsResult.fs;
         let resolvedEntrypoint;
-        if (typeof serviceConfig.entrypoint === "string") {
+        if (typeof serviceConfig.entrypoint === "string" && !isContainerRuntime(serviceConfig)) {
           const moduleAttr = parsePyModuleAttrEntrypoint(serviceConfig.entrypoint);
           const entrypointToResolve = moduleAttr?.filePath ?? serviceConfig.entrypoint;
           const resolvedPath = await resolveEntrypointPath({
@@ -24110,6 +24137,67 @@ var require_resolve_v2 = __commonJS({
     var import_utils = require_utils4();
     var frameworksBySlug = new Map(import_frameworks2.frameworkList.map((f) => [f.slug, f]));
     var SERVICE_NAME_REGEX = /^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$/;
+    function isDockerfileEntrypoint(entrypoint) {
+      const base = import_path7.posix.basename(entrypoint).toLowerCase();
+      return base === "dockerfile" || base === "containerfile" || base.endsWith(".dockerfile");
+    }
+    function normalizeContainerCommand(command) {
+      if (command === void 0) {
+        return void 0;
+      }
+      return Array.isArray(command) ? command : [command];
+    }
+    function resolveContainerServiceV2(name, config, normalizedRoot) {
+      const isRoot = normalizedRoot === ".";
+      const entrypoint = config.entrypoint;
+      const dockerfile = typeof entrypoint === "string" && isDockerfileEntrypoint(entrypoint) ? import_path7.posix.normalize(entrypoint) : void 0;
+      const image = typeof entrypoint === "string" && !dockerfile ? entrypoint : void 0;
+      if (!dockerfile && !image) {
+        return {
+          error: {
+            code: "MISSING_SERVICE_CONFIG",
+            message: `Container service "${name}" must specify an "entrypoint": a Dockerfile path to build, or a prebuilt OCI image reference.`,
+            serviceName: name
+          }
+        };
+      }
+      const localSrc = dockerfile ?? image ?? "Dockerfile";
+      const builderSrc = isRoot ? localSrc : import_path7.posix.join(normalizedRoot, localSrc);
+      const builderConfig = { zeroConfig: true };
+      if (!isRoot) {
+        builderConfig.workspace = normalizedRoot;
+      }
+      if (image) {
+        builderConfig.handler = image;
+      }
+      const command = normalizeContainerCommand(config.command);
+      if (command) {
+        builderConfig.command = command;
+      }
+      return {
+        service: {
+          schema: "experimentalServicesV2",
+          name,
+          root: normalizedRoot,
+          runtime: "container",
+          entrypoint: image ?? dockerfile,
+          command,
+          builder: {
+            src: builderSrc,
+            use: "@vercel/container",
+            config: builderConfig
+          },
+          bindings: config.bindings,
+          functions: config.functions,
+          headers: config.headers,
+          redirects: config.redirects,
+          rewrites: config.rewrites,
+          routes: config.routes,
+          cleanUrls: config.cleanUrls,
+          trailingSlash: config.trailingSlash
+        }
+      };
+    }
     function validateServiceConfigV22(name, config) {
       if (!SERVICE_NAME_REGEX.test(name)) {
         return {
@@ -24171,7 +24259,8 @@ var require_resolve_v2 = __commonJS({
           };
         }
       }
-      if (!config.framework && !config.entrypoint) {
+      const isContainer = config.runtime === "container";
+      if (!config.framework && !config.entrypoint && !isContainer) {
         return {
           code: "MISSING_SERVICE_CONFIG",
           message: `Service "${name}" must specify "framework" or "entrypoint".`,
@@ -24182,6 +24271,10 @@ var require_resolve_v2 = __commonJS({
     }
     async function resolveConfiguredServiceV22(name, config, fs5) {
       const normalizedRoot = (0, import_utils.stripTrailingSlash)(import_path7.posix.normalize(config.root));
+      const isContainer = config.runtime === "container" || typeof config.entrypoint === "string" && isDockerfileEntrypoint(config.entrypoint);
+      if (isContainer) {
+        return resolveContainerServiceV2(name, config, normalizedRoot);
+      }
       const serviceFsResult = normalizedRoot === "." ? { fs: fs5 } : await (0, import_resolve.getServiceFs)(fs5, name, normalizedRoot);
       if (serviceFsResult.error) {
         return { error: serviceFsResult.error };
@@ -28308,8 +28401,23 @@ var require_detect_services = __commonJS({
           warnings: []
         });
       }
+      if (vercelConfig?.services != null && vercelConfig.experimentalServicesV2 != null) {
+        return withResolvedResult({
+          services: [],
+          source: "configured",
+          useImplicitEnvInjection: false,
+          routes: emptyRoutes(),
+          errors: [
+            {
+              code: "SERVICES_AND_EXPERIMENTAL_SERVICES_V2",
+              message: "The `services` property cannot be used in conjunction with its deprecated alias `experimentalServicesV2`. Please use only `services`."
+            }
+          ],
+          warnings: []
+        });
+      }
       const hasProvidedConfiguredServices = providedConfiguredServices && Object.keys(providedConfiguredServices).length > 0;
-      const experimentalServicesV2 = hasProvidedConfiguredServices && providedConfiguredServicesType === "experimentalServicesV2" ? providedConfiguredServices : hasProvidedConfiguredServices ? void 0 : vercelConfig?.experimentalServicesV2;
+      const experimentalServicesV2 = hasProvidedConfiguredServices && (providedConfiguredServicesType === "services" || providedConfiguredServicesType === "experimentalServicesV2") ? providedConfiguredServices : hasProvidedConfiguredServices ? void 0 : vercelConfig?.services ?? vercelConfig?.experimentalServicesV2;
       if (experimentalServicesV2 && Object.keys(experimentalServicesV2).length > 0) {
         const result2 = await (0, import_resolve_v2.resolveAllConfiguredServicesV2)(
           experimentalServicesV2,
@@ -28488,11 +28596,12 @@ var require_detect_services = __commonJS({
           }
         } else if (service.runtime) {
           const functionPath = (0, import_utils.getInternalServiceFunctionPath)(service.name);
+          const check = service.runtime === "container" ? void 0 : true;
           if (routePrefix === "/") {
             defaults.push({
               src: (0, import_routing_utils.scopeRouteSourceToOwnership)("^/(.*)$", ownershipGuard),
               dest: functionPath,
-              check: true
+              ...check ? { check } : {}
             });
           } else {
             rewrites.push({
@@ -28501,7 +28610,7 @@ var require_detect_services = __commonJS({
                 ownershipGuard
               ),
               dest: functionPath,
-              check: true
+              ...check ? { check } : {}
             });
           }
         }
@@ -29009,12 +29118,30 @@ var require_detect_builders = __commonJS({
     async function detectBuilders2(files, pkg, options = {}) {
       const {
         experimentalServices: experimentalServicesV1,
+        services,
         experimentalServicesV2,
         projectSettings = {}
       } = options;
+      if (services != null && experimentalServicesV2 != null) {
+        return {
+          builders: null,
+          errors: [
+            {
+              code: "SERVICES_AND_EXPERIMENTAL_SERVICES_V2",
+              message: "The `services` option cannot be used in conjunction with its deprecated alias `experimentalServicesV2`. Please use only `services`."
+            }
+          ],
+          warnings: [],
+          defaultRoutes: null,
+          redirectRoutes: null,
+          rewriteRoutes: null,
+          errorRoutes: null
+        };
+      }
       const { framework } = projectSettings;
-      const configuredServices = experimentalServicesV2 ?? experimentalServicesV1;
-      const configuredServicesType = experimentalServicesV2 ? "experimentalServicesV2" : "experimentalServices";
+      const servicesConfig = services ?? experimentalServicesV2;
+      const configuredServices = servicesConfig ?? experimentalServicesV1;
+      const configuredServicesType = servicesConfig ? services ? "services" : "experimentalServicesV2" : "experimentalServices";
       const hasServicesConfig = configuredServices != null && typeof configuredServices === "object";
       if (hasServicesConfig || framework === "services") {
         const result = await (0, import_get_services_builders.getServicesBuilders)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.11.0",
+  "version": "2.11.2",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -15,8 +15,8 @@
   "dependencies": {
     "ts-morph": "12.0.0",
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/gatsby-plugin-vercel-builder": "2.2.20",
-    "@vercel/static-config": "3.4.0"
+    "@vercel/static-config": "3.4.0",
+    "@vercel/gatsby-plugin-vercel-builder": "2.2.22"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
@@ -39,8 +39,8 @@
     "vitest": "2.0.3",
     "@vercel/frameworks": "3.29.1",
     "@vercel/error-utils": "2.2.0",
-    "@vercel/build-utils": "13.31.0",
-    "@vercel/fs-detectors": "6.9.2",
+    "@vercel/build-utils": "13.32.0",
+    "@vercel/fs-detectors": "6.10.0",
     "@vercel/routing-utils": "6.3.1"
   },
   "scripts": {