@vercel/static-build 2.9.25 → 2.9.27

package/dist/index.js

@@ -8955,9 +8955,10 @@ var require_frameworks = __commonJS({
         website: "https://tanstack.com/start",
         supersedes: ["ionic-react", "vite"],
         detectors: {
-          every: [
-            { matchPackage: "@tanstack/router-plugin" },
-            { matchPackage: "nitro" }
+          every: [{ matchPackage: "@tanstack/router-plugin" }],
+          some: [
+            { matchPackage: "@tanstack/react-start" },
+            { matchPackage: "@tanstack/solid-start" }
           ]
         },
         settings: {
@@ -22856,7 +22857,7 @@ 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_]*_$/;
+    var ENV_VAR_NAME_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
     var ENTRYPOINT_REQUIRED_RUNTIMES = /* @__PURE__ */ new Set([
       "node",
       "python",
@@ -23235,14 +23236,46 @@ var require_resolve = __commonJS({
           };
         }
       }
-      if (config.envPrefix !== void 0) {
-        if (!ENV_PREFIX_RE.test(config.envPrefix)) {
+      if (config.env !== void 0) {
+        if (typeof config.env !== "object" || Array.isArray(config.env)) {
           return {
-            code: "INVALID_ENV_PREFIX",
-            message: `Service "${name}" has invalid envPrefix "${config.envPrefix}". Must start with an uppercase letter, contain only uppercase letters, digits, and underscores, and end with "_" (e.g., "MY_SERVICE_").`,
+            code: "INVALID_ENV_VARS",
+            message: `Service "${name}" has invalid "env". Must be an object keyed by environment variable name.`,
             serviceName: name
           };
         }
+        for (const [envVarName, envVar] of Object.entries(config.env)) {
+          if (!ENV_VAR_NAME_RE.test(envVarName)) {
+            return {
+              code: "INVALID_ENV_VAR_NAME",
+              message: `Service "${name}" has invalid env key "${envVarName}". Must match /^[A-Za-z_][A-Za-z0-9_]*$/.`,
+              serviceName: name
+            };
+          }
+          if (!envVar || typeof envVar !== "object" || Array.isArray(envVar)) {
+            return {
+              code: "INVALID_ENV_VAR",
+              message: `Service "${name}" has invalid env["${envVarName}"]. Must be an object with a "type" discriminator.`,
+              serviceName: name
+            };
+          }
+          const envVarType = envVar.type;
+          if (envVarType !== "service-ref") {
+            return {
+              code: "INVALID_ENV_VAR_TYPE",
+              message: `Service "${name}" env["${envVarName}"] has unknown type "${envVarType}".`,
+              serviceName: name
+            };
+          }
+          const refService = envVar.service;
+          if (typeof refService !== "string" || refService.length === 0) {
+            return {
+              code: "INVALID_ENV_VAR_REF",
+              message: `Service "${name}" env["${envVarName}"] must specify "service" as a non-empty string.`,
+              serviceName: name
+            };
+          }
+        }
       }
       if (config.runtime && !(config.runtime in import_types.RUNTIME_BUILDERS)) {
         return {
@@ -23463,10 +23496,11 @@ var require_resolve = __commonJS({
         runtime,
         buildCommand: config.buildCommand,
         installCommand: config.installCommand,
+        preDeployCommand: config.preDeployCommand,
         schedule: config.schedule,
         handlerFunction: moduleAttrParsed?.attrName,
         topics,
-        envPrefix: config.envPrefix
+        env: config.env
       };
     }
     async function resolveAllConfiguredServices(services, fs5, routePrefixSource = "configured", options = {}) {
@@ -23614,8 +23648,49 @@ var require_resolve = __commonJS({
         }
         resolved.push(service);
       }
+      const servicesByName = new Map(resolved.map((s) => [s.name, s]));
+      for (const service of resolved) {
+        if (!service.env)
+          continue;
+        validateEnvRefs(
+          service.env,
+          `Service "${service.name}" env`,
+          servicesByName,
+          errors,
+          service.name
+        );
+      }
+      if (options.rootEnv) {
+        validateEnvRefs(options.rootEnv, "env", servicesByName, errors);
+        for (const service of resolved) {
+          service.env = { ...options.rootEnv, ...service.env ?? {} };
+        }
+      }
       return { services: resolved, errors };
     }
+    function validateEnvRefs(env, pathPrefix, servicesByName, errors, serviceName) {
+      for (const [envVarName, envVar] of Object.entries(env)) {
+        if (envVar.type !== "service-ref")
+          continue;
+        const refName = envVar.service;
+        const target = servicesByName.get(refName);
+        if (!target) {
+          errors.push({
+            code: "UNKNOWN_SERVICE_REF",
+            message: `${pathPrefix}["${envVarName}"] references unknown service "${refName}".`,
+            ...serviceName ? { serviceName } : {}
+          });
+          continue;
+        }
+        if (target.type !== "web") {
+          errors.push({
+            code: "INVALID_SERVICE_REF_TYPE",
+            message: `${pathPrefix}["${envVarName}"] references service "${refName}" which is a ${target.type} service and has no URL. Only web services can be referenced.`,
+            ...serviceName ? { serviceName } : {}
+          });
+        }
+      }
+    }
   }
 });
 
@@ -23994,12 +24069,12 @@ var require_detect_railway = __commonJS({
         if (cf.dirPath !== ".") {
           serviceConfig.entrypoint = cf.dirPath;
         }
-        const buildCommand = combineBuildCommand(
-          cf.config.build?.buildCommand,
-          cf.config.deploy?.preDeployCommand
-        );
-        if (buildCommand) {
-          serviceConfig.buildCommand = buildCommand;
+        if (cf.config.build?.buildCommand) {
+          serviceConfig.buildCommand = cf.config.build.buildCommand;
+        }
+        const railwayPreDeploy = cf.config.deploy?.preDeployCommand;
+        if (railwayPreDeploy) {
+          serviceConfig.preDeployCommand = Array.isArray(railwayPreDeploy) ? railwayPreDeploy.join(" && ") : railwayPreDeploy;
         }
         services[serviceName] = serviceConfig;
       }
@@ -24096,16 +24171,6 @@ var require_detect_railway = __commonJS({
       const segments = dirPath.split("/");
       return segments[segments.length - 1];
     }
-    function combineBuildCommand(buildCommand, preDeployCommand) {
-      const preDeploy = Array.isArray(preDeployCommand) ? preDeployCommand.join(" && ") : preDeployCommand;
-      if (preDeploy && buildCommand) {
-        return `${buildCommand} && ${preDeploy}`;
-      } else if (preDeploy) {
-        return preDeploy;
-      } else {
-        return buildCommand;
-      }
-    }
     function assignRoutePrefixes(services) {
       const warnings = [];
       const names = Object.keys(services);
@@ -24181,10 +24246,17 @@ var require_detect_services = __commonJS({
         workers: []
       };
     }
+    function isEnvVars(env) {
+      if (!env)
+        return false;
+      const first = Object.values(env)[0];
+      return typeof first === "object" && first !== null;
+    }
     function withResolvedResult(resolved, inferred = null) {
       return {
         services: resolved.services,
         source: resolved.source,
+        useImplicitEnvInjection: resolved.useImplicitEnvInjection,
         routes: resolved.routes,
         errors: resolved.errors,
         warnings: resolved.warnings,
@@ -24220,6 +24292,7 @@ var require_detect_services = __commonJS({
         return withResolvedResult({
           services: [],
           source: "configured",
+          useImplicitEnvInjection: true,
           routes: emptyRoutes(),
           errors: [configError],
           warnings: []
@@ -24234,6 +24307,7 @@ var require_detect_services = __commonJS({
           return withResolvedResult({
             services: [],
             source: "auto-detected",
+            useImplicitEnvInjection: true,
             routes: emptyRoutes(),
             errors: railwayResult.errors,
             warnings: railwayResult.warnings
@@ -24255,6 +24329,7 @@ var require_detect_services = __commonJS({
             {
               services: [],
               source: "auto-detected",
+              useImplicitEnvInjection: true,
               routes: emptyRoutes(),
               errors: result2.errors,
               warnings: railwayResult.warnings
@@ -24273,6 +24348,7 @@ var require_detect_services = __commonJS({
           const resolved = {
             services: result2.services,
             source: "auto-detected",
+            useImplicitEnvInjection: true,
             routes: routes2,
             errors: result2.errors,
             warnings: []
@@ -24291,6 +24367,7 @@ var require_detect_services = __commonJS({
           return withResolvedResult({
             services: [],
             source: "auto-detected",
+            useImplicitEnvInjection: true,
             routes: emptyRoutes(),
             errors: autoResult.errors,
             warnings: []
@@ -24299,6 +24376,7 @@ var require_detect_services = __commonJS({
         return withResolvedResult({
           services: [],
           source: "auto-detected",
+          useImplicitEnvInjection: true,
           routes: emptyRoutes(),
           errors: [
             {
@@ -24316,13 +24394,17 @@ var require_detect_services = __commonJS({
         {
           requireFileEntrypointForBackendRuntimes: Boolean(
             hasNonEmptyPublicServicesConfig
-          )
+          ),
+          rootEnv: isEnvVars(vercelConfig?.env) ? vercelConfig?.env : void 0
         }
       );
       const routes = generateServicesRoutes2(result.services);
       return withResolvedResult({
         services: result.services,
         source: "configured",
+        // GA `services` opts into explicit `env`; experimentalServices keeps
+        // the legacy `{NAME}_URL` injection.
+        useImplicitEnvInjection: !hasNonEmptyPublicServicesConfig,
         routes,
         errors: result.errors,
         warnings: []
@@ -24772,7 +24854,8 @@ var require_get_services_builders = __commonJS({
           ...result.routes.crons
         ] : null,
         errorRoutes: [],
-        services: result.services
+        services: result.services,
+        useImplicitEnvInjection: result.useImplicitEnvInjection
       };
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.9.25",
+  "version": "2.9.27",
   "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-builder": "2.2.3",
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/static-config": "3.3.0"
+    "@vercel/static-config": "3.3.0",
+    "@vercel/gatsby-plugin-vercel-builder": "2.2.5"
   },
   "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.23.0",
     "@vercel/error-utils": "2.1.0",
-    "@vercel/frameworks": "3.26.0",
-    "@vercel/fs-detectors": "6.2.2",
-    "@vercel/routing-utils": "6.2.0"
+    "@vercel/frameworks": "3.26.1",
+    "@vercel/build-utils": "13.25.0",
+    "@vercel/routing-utils": "6.2.0",
+    "@vercel/fs-detectors": "6.4.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",