@vercel/static-build 2.9.32 → 2.9.34

package/dist/index.js

@@ -23694,23 +23694,12 @@ var require_resolve = __commonJS({
       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 ?? {} };
-        }
+        validateEnvRefs(service.env, service.name, servicesByName, errors);
       }
       return { services: resolved, errors };
     }
-    function validateEnvRefs(env, pathPrefix, servicesByName, errors, serviceName) {
+    function validateEnvRefs(env, serviceName, servicesByName, errors) {
+      const pathPrefix = `Service "${serviceName}" env`;
       for (const [envVarName, envVar] of Object.entries(env)) {
         if (envVar.type !== "service-ref")
           continue;
@@ -23720,7 +23709,7 @@ var require_resolve = __commonJS({
           errors.push({
             code: "UNKNOWN_SERVICE_REF",
             message: `${pathPrefix}["${envVarName}"] references unknown service "${refName}".`,
-            ...serviceName ? { serviceName } : {}
+            serviceName
           });
           continue;
         }
@@ -23728,7 +23717,7 @@ var require_resolve = __commonJS({
           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 } : {}
+            serviceName
           });
         }
       }
@@ -27645,12 +27634,6 @@ 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,
@@ -27693,7 +27676,13 @@ var require_detect_services = __commonJS({
       return inferredConfig;
     }
     async function detectServices2(options) {
-      const { fs: fs5, workPath, detectEntrypoint } = options;
+      const {
+        fs: fs5,
+        workPath,
+        detectEntrypoint,
+        configuredServices: providedConfiguredServices,
+        configuredServicesType
+      } = options;
       const scopedFs = workPath ? fs5.chdir(workPath) : fs5;
       const { config: vercelConfig, error: configError } = await (0, import_utils.readVercelConfig)(scopedFs);
       if (configError) {
@@ -27706,8 +27695,9 @@ var require_detect_services = __commonJS({
           warnings: []
         });
       }
-      const hasNonEmptyPublicServicesConfig = vercelConfig?.services && Object.keys(vercelConfig.services).length > 0;
-      const configuredServices = hasNonEmptyPublicServicesConfig ? vercelConfig.services : vercelConfig?.experimentalServices;
+      const hasProvidedConfiguredServices = providedConfiguredServices && Object.keys(providedConfiguredServices).length > 0;
+      const hasNonEmptyPublicServicesConfig = hasProvidedConfiguredServices && configuredServicesType === "services" || !hasProvidedConfiguredServices && vercelConfig?.services && Object.keys(vercelConfig.services).length > 0;
+      const configuredServices = hasProvidedConfiguredServices ? providedConfiguredServices : hasNonEmptyPublicServicesConfig ? vercelConfig?.services : vercelConfig?.experimentalServices;
       const hasConfiguredServices = configuredServices && Object.keys(configuredServices).length > 0;
       if (!hasConfiguredServices) {
         const detectors = [
@@ -27743,8 +27733,7 @@ var require_detect_services = __commonJS({
         {
           requireFileEntrypointForBackendRuntimes: Boolean(
             hasNonEmptyPublicServicesConfig
-          ),
-          rootEnv: isEnvVars(vercelConfig?.env) ? vercelConfig?.env : void 0
+          )
         }
       );
       const routes = generateServicesRoutes2(result.services);
@@ -28170,7 +28159,12 @@ var require_get_services_builders = __commonJS({
       return env === "1" || env?.toLowerCase() === "true";
     }
     async function getServicesBuilders2(options) {
-      const { workPath, configuredServices, projectFramework } = options;
+      const {
+        workPath,
+        configuredServices,
+        configuredServicesType,
+        projectFramework
+      } = options;
       const hasServiceDefinitions = configuredServices != null && Object.keys(configuredServices).length > 0;
       if (projectFramework === "services" && !hasServiceDefinitions && !isExperimentalServicesAutoDetectionEnabled()) {
         return {
@@ -28209,7 +28203,11 @@ var require_get_services_builders = __commonJS({
         };
       }
       const fs5 = new import_local_file_system_detector.LocalFileSystemDetector(workPath);
-      const result = await (0, import_detect_services.detectServices)({ fs: fs5 });
+      const result = await (0, import_detect_services.detectServices)({
+        fs: fs5,
+        configuredServices,
+        configuredServicesType
+      });
       const warningResponses = result.warnings.map((w) => ({
         code: w.code,
         message: w.message
@@ -28370,11 +28368,13 @@ var require_detect_builders = __commonJS({
       const { services, experimentalServices, projectSettings = {} } = options;
       const { framework } = projectSettings;
       const configuredServices = services ?? experimentalServices;
+      const configuredServicesType = services != null ? "services" : "experimentalServices";
       const hasServicesConfig = configuredServices != null && typeof configuredServices === "object";
       if (hasServicesConfig || framework === "services") {
         return (0, import_get_services_builders.getServicesBuilders)({
           workPath: options.workPath,
           configuredServices,
+          configuredServicesType,
           projectFramework: framework
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.9.32",
+  "version": "2.9.34",
   "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/static-config": "3.4.0",
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/gatsby-plugin-vercel-builder": "2.2.9"
+    "@vercel/gatsby-plugin-vercel-builder": "2.2.11",
+    "@vercel/static-config": "3.4.0"
   },
   "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.26.3",
+    "@vercel/build-utils": "13.26.5",
     "@vercel/error-utils": "2.1.0",
+    "@vercel/fs-detectors": "6.7.5",
     "@vercel/frameworks": "3.26.1",
-    "@vercel/routing-utils": "6.2.0",
-    "@vercel/fs-detectors": "6.7.2"
+    "@vercel/routing-utils": "6.2.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",