vercel 54.7.1 → 54.8.0

package/dist/chunks/{chunk-GIJMTTDG.js → chunk-KFVMKDQD.js}

@@ -8,13 +8,13 @@ import {
   TelemetryClient,
   require_dist as require_dist2,
   require_graceful_fs
-} from "./chunk-4CIXZOP4.js";
+} from "./chunk-DPXUXH7G.js";
 import {
   buildCommandWithYes,
   getPreservedArgsForEnvPull,
   outputActionRequired,
   outputAgentError
-} from "./chunk-7OUZIPHA.js";
+} from "./chunk-NHGCQRK5.js";
 import {
   require_ms,
   stamp_default
@@ -34,7 +34,7 @@ import {
   require_string_width,
   require_strip_ansi,
   yesOption
-} from "./chunk-XQUJUKTN.js";
+} from "./chunk-6IQZVQV6.js";
 import {
   APIError,
   CantParseJSONFile,
@@ -49,7 +49,7 @@ import {
   isAPIError,
   packageName,
   require_lib
-} from "./chunk-IDFKAJW3.js";
+} from "./chunk-LN6B7ZI3.js";
 import {
   pkg_default
 } from "./chunk-P4QNYOFB.js";
@@ -63,7 +63,7 @@ import {
   require_cli_spinners,
   require_dist,
   require_escape_string_regexp
-} from "./chunk-ZQKJVHXY.js";
+} from "./chunk-Z5SBJH6L.js";
 import {
   require_ansi_styles,
   require_source,
@@ -16011,19 +16011,17 @@ var require_frameworks = __commonJS({
         experimental: true
       },
       {
-        name: "Sanity (v3)",
-        slug: "sanity-v3",
-        demo: "https://sanity-studio-template.vercel.app",
+        name: "Sanity",
+        slug: "sanity",
+        demo: "https://template-studio-clean.sanity.dev",
         logo: "https://api-frameworks.vercel.sh/framework-logos/sanity.svg",
-        tagline: "The structured content platform.",
+        darkModeLogo: "https://api-frameworks.vercel.sh/framework-logos/sanity-dark.svg",
+        tagline: "The back-end built for AI content operations. Power web, mobile, and agentic applications at scale.",
         description: "A Sanity Studio",
         website: "https://www.sanity.io",
         envPrefix: "SANITY_STUDIO_",
         detectors: {
           some: [
-            {
-              path: "sanity.json"
-            },
             {
               path: "sanity.config.js"
             },
@@ -16039,8 +16037,7 @@ var require_frameworks = __commonJS({
           ],
           every: [
             {
-              path: "package.json",
-              matchContent: '"(dev)?(d|D)ependencies":\\s*{[^}]*"sanity":\\s*"\\^?3\\..*"[^}]*}'
+              matchPackage: "sanity"
             }
           ]
         },
@@ -16059,6 +16056,7 @@ var require_frameworks = __commonJS({
             value: "dist"
           }
         },
+        dependency: "sanity",
         getOutputDirName: async () => "dist",
         defaultRoutes: [
           {
@@ -16071,10 +16069,10 @@ var require_frameworks = __commonJS({
         ]
       },
       {
-        name: "Sanity",
-        slug: "sanity",
+        name: "Sanity (v2)",
+        slug: "sanity-v2",
         demo: "https://sanity-studio-template.vercel.app",
-        logo: "https://api-frameworks.vercel.sh/framework-logos/sanity.svg",
+        logo: "https://api-frameworks.vercel.sh/framework-logos/sanity-v2.svg",
         tagline: "The structured content platform.",
         description: "A Sanity Studio",
         website: "https://www.sanity.io",
@@ -16083,18 +16081,12 @@ var require_frameworks = __commonJS({
           some: [
             {
               path: "sanity.json"
-            },
-            {
-              path: "sanity.config.js"
-            },
-            {
-              path: "sanity.config.jsx"
-            },
-            {
-              path: "sanity.config.ts"
-            },
+            }
+          ],
+          every: [
             {
-              path: "sanity.config.tsx"
+              path: "package.json",
+              matchContent: '"(dev)?(d|D)ependencies":\\s*{[^}]*"@sanity/cli":\\s*"\\^?2\\..*"[^}]*}'
             }
           ]
         },
@@ -22687,11 +22679,9 @@ var require_utils3 = __commonJS({
       inferRuntimeFromFramework: () => inferRuntimeFromFramework,
       inferServiceRuntime: () => inferServiceRuntime,
       isFrontendFramework: () => isFrontendFramework,
-      isPublicServicesEnabled: () => isPublicServicesEnabled2,
       isRouteOwningBuilder: () => isRouteOwningBuilder2,
       isStaticBuild: () => isStaticBuild2,
-      readVercelConfig: () => readVercelConfig,
-      validateServicesConfigGate: () => validateServicesConfigGate
+      readVercelConfig: () => readVercelConfig
     });
     module.exports = __toCommonJS2(utils_exports);
     var import_framework_helpers = __require("@vercel/build-utils/dist/framework-helpers");
@@ -22708,18 +22698,6 @@ var require_utils3 = __commonJS({
         return false;
       }
     }
-    function isPublicServicesEnabled2() {
-      return process.env.VERCEL_USE_SERVICES === "1" || process.env.VERCEL_USE_SERVICES?.toLowerCase() === "true";
-    }
-    function validateServicesConfigGate(config) {
-      if (config?.services !== void 0 && !isPublicServicesEnabled2()) {
-        return {
-          code: "INVALID_VERCEL_CONFIG",
-          message: "Invalid vercel.json - should NOT have additional property `services`. Please remove it."
-        };
-      }
-      return null;
-    }
     var INTERNAL_QUEUES_PREFIX = "/_svc/_queues";
     function normalizeInternalServiceEntrypoint(entrypoint) {
       const normalized = entrypoint.replace(/\\/g, "/").replace(/^\/+/, "").replace(/\.[^/.]+$/, "");
@@ -22804,10 +22782,6 @@ var require_utils3 = __commonJS({
         try {
           const content = await fs5.readFile("vercel.json");
           const config = JSON.parse(content.toString());
-          const gateError = validateServicesConfigGate(config);
-          if (gateError) {
-            return { config: null, error: gateError };
-          }
           return { config, error: null };
         } catch {
           return {
@@ -22825,10 +22799,6 @@ var require_utils3 = __commonJS({
           const { parse: tomlParse3 } = await import("smol-toml");
           const content = await fs5.readFile("vercel.toml");
           const config = tomlParse3(content.toString());
-          const gateError = validateServicesConfigGate(config);
-          if (gateError) {
-            return { config: null, error: gateError };
-          }
           return { config, error: null };
         } catch {
           return {
@@ -24101,8 +24071,8 @@ var require_auto_detect = __commonJS({
         warnings: [],
         errors: [
           {
-            code: "NO_SERVICES_CONFIGURED",
-            message: "No services detected. Configure services in vercel.json or ensure a framework exists at project root, frontend/, or apps/web/."
+            code: "NO_EXPERIMENTAL_SERVICES_CONFIGURED",
+            message: "No services detected. Configure `experimentalServices` in vercel.json or ensure a framework exists at project root, frontend/, or apps/web/."
           }
         ]
       };
@@ -27963,8 +27933,7 @@ var require_detect_services = __commonJS({
         fs: fs5,
         workPath,
         detectEntrypoint,
-        configuredServices: providedConfiguredServices,
-        configuredServicesType
+        configuredServices: providedConfiguredServices
       } = options;
       const scopedFs = workPath ? fs5.chdir(workPath) : fs5;
       const { config: vercelConfig, error: configError } = await (0, import_utils4.readVercelConfig)(scopedFs);
@@ -27979,8 +27948,7 @@ var require_detect_services = __commonJS({
         });
       }
       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 configuredServices = hasProvidedConfiguredServices ? providedConfiguredServices : vercelConfig?.experimentalServices;
       const hasConfiguredServices = configuredServices && Object.keys(configuredServices).length > 0;
       if (!hasConfiguredServices) {
         const detectors = [
@@ -28002,8 +27970,8 @@ var require_detect_services = __commonJS({
           routes: emptyRoutes(),
           errors: [
             {
-              code: "NO_SERVICES_CONFIGURED",
-              message: "No services configured. Add `services` to vercel.json."
+              code: "NO_EXPERIMENTAL_SERVICES_CONFIGURED",
+              message: "No services configured. Add `experimentalServices` to vercel.json."
             }
           ],
           warnings: []
@@ -28012,20 +27980,14 @@ var require_detect_services = __commonJS({
       const result = await (0, import_resolve.resolveAllConfiguredServices)(
         configuredServices,
         scopedFs,
-        "configured",
-        {
-          requireFileEntrypointForBackendRuntimes: Boolean(
-            hasNonEmptyPublicServicesConfig
-          )
-        }
+        "configured"
       );
       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,
+        // experimentalServices uses the legacy `{NAME}_URL` injection.
+        useImplicitEnvInjection: true,
         routes,
         errors: result.errors,
         warnings: []
@@ -28516,8 +28478,8 @@ var require_get_services_builders = __commonJS({
           builders: null,
           errors: [
             {
-              code: "NO_SERVICES_CONFIGURED",
-              message: "No services configured. Add `services` to vercel.json."
+              code: "NO_EXPERIMENTAL_SERVICES_CONFIGURED",
+              message: "No services configured. Add `experimentalServices` to vercel.json."
             }
           ],
           warnings: warningResponses,
@@ -28648,10 +28610,10 @@ var require_detect_builders = __commonJS({
       return publicBuilder ? publicBuilder.src.replace("/**/*", "") : null;
     }
     async function detectBuilders2(files, pkg, options = {}) {
-      const { services, experimentalServices, projectSettings = {} } = options;
+      const { experimentalServices, projectSettings = {} } = options;
       const { framework } = projectSettings;
-      const configuredServices = services ?? experimentalServices;
-      const configuredServicesType = services != null ? "services" : "experimentalServices";
+      const configuredServices = experimentalServices;
+      const configuredServicesType = "experimentalServices";
       const hasServicesConfig = configuredServices != null && typeof configuredServices === "object";
       if (hasServicesConfig || framework === "services") {
         return (0, import_get_services_builders.getServicesBuilders)({
@@ -36958,7 +36920,7 @@ var require_package = __commonJS({
   "../client/package.json"(exports, module) {
     module.exports = {
       name: "@vercel/client",
-      version: "17.5.7",
+      version: "17.5.8",
       main: "dist/index.js",
       typings: "dist/index.d.ts",
       homepage: "https://vercel.com",
@@ -50427,7 +50389,7 @@ async function fetchUser(client) {
     if (client.authConfig.userId !== res.user.id) {
       client.updateAuthConfig({ userId: res.user.id });
       try {
-        client.writeToAuthConfigFile();
+        client.persistAuthConfig();
       } catch {
         output_manager_default.debug("Failed to persist cached userId to auth config.");
       }
@@ -50442,7 +50404,7 @@ async function fetchUser(client) {
       if (client.authConfig.userId) {
         client.updateAuthConfig({ userId: void 0 });
         try {
-          client.writeToAuthConfigFile();
+          client.persistAuthConfig();
         } catch {
           output_manager_default.debug("Failed to persist cached userId to auth config.");
         }
@@ -54549,7 +54511,7 @@ async function login(client, telemetry) {
   if (isInitialLogin) {
     await updateCurrentTeamAfterLogin(client);
   }
-  client.writeToAuthConfigFile();
+  client.persistAuthConfig();
   client.writeToConfigFile();
   output_manager_default.debug(`Saved credentials in "${humanizePath(client.getGlobalPathConfig())}"`);
   output_manager_default.print(`
@@ -54792,7 +54754,7 @@ async function pullEnvRecordsForEnvPull(client, pullId, source, options) {
       userId: void 0,
       expiresAt: Math.floor(Date.now() / 1e3) + tokens.expires_in
     });
-    client.writeToAuthConfigFile();
+    client.persistAuthConfig();
     output_manager_default.spinner("Downloading");
     return await pullEnvRecords(client, pullId, source, options);
   }
@@ -55029,34 +54991,13 @@ var experimentalServicesMountSchema = {
     }
   ]
 };
-var servicesMountSchema = {
-  oneOf: [
-    {
-      type: "string",
-      minLength: 1,
-      maxLength: 512
-    },
-    {
-      type: "object",
-      additionalProperties: false,
-      required: ["path"],
-      properties: {
-        path: {
-          type: "string",
-          minLength: 1,
-          maxLength: 512
-        }
-      }
-    }
-  ]
-};
-var staticServiceScheduleSchema = {
+var staticExperimentalServiceScheduleSchema = {
   type: "string",
   minLength: 9,
   maxLength: 256,
   not: { const: "<dynamic>" }
 };
-var serviceScheduleSchema = {
+var experimentalServiceScheduleSchema = {
   oneOf: [
     {
       type: "string",
@@ -55066,11 +55007,11 @@ var serviceScheduleSchema = {
     {
       type: "array",
       minItems: 1,
-      items: staticServiceScheduleSchema
+      items: staticExperimentalServiceScheduleSchema
     }
   ]
 };
-var serviceQueueTopicSchema = {
+var experimentalServiceQueueTopicSchema = {
   type: "object",
   additionalProperties: false,
   required: ["topic"],
@@ -55092,7 +55033,7 @@ var serviceQueueTopicSchema = {
     }
   }
 };
-var serviceTopicsSchema = {
+var experimentalServiceTopicsSchema = {
   oneOf: [
     {
       type: "array",
@@ -55106,7 +55047,7 @@ var serviceTopicsSchema = {
     {
       type: "array",
       minItems: 1,
-      items: serviceQueueTopicSchema
+      items: experimentalServiceQueueTopicSchema
     }
   ]
 };
@@ -55114,25 +55055,6 @@ var envVarNamesSchema = {
   pattern: "^[A-Za-z_][A-Za-z0-9_]*$",
   maxLength: 256
 };
-var envVarSchema = {
-  type: "object",
-  additionalProperties: false,
-  required: ["type", "service"],
-  properties: {
-    type: { const: "service-ref" },
-    service: {
-      type: "string",
-      minLength: 1,
-      maxLength: 64,
-      pattern: "^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$"
-    }
-  }
-};
-var envVarRecordSchema = {
-  type: "object",
-  additionalProperties: envVarSchema,
-  propertyNames: envVarNamesSchema
-};
 var experimentalServicesCommonProperties = {
   entrypoint: {
     type: "string",
@@ -55222,23 +55144,6 @@ var experimentalServicesRoutableProperties = {
     maxLength: 63
   }
 };
-var servicesCommonProperties = {
-  entrypoint: experimentalServicesCommonProperties.entrypoint,
-  root: experimentalServicesCommonProperties.root,
-  framework: experimentalServicesCommonProperties.framework,
-  runtime: experimentalServicesCommonProperties.runtime,
-  buildCommand: experimentalServicesCommonProperties.buildCommand,
-  preDeployCommand: experimentalServicesCommonProperties.preDeployCommand,
-  memory: experimentalServicesCommonProperties.memory,
-  maxDuration: experimentalServicesCommonProperties.maxDuration,
-  includeFiles: experimentalServicesCommonProperties.includeFiles,
-  excludeFiles: experimentalServicesCommonProperties.excludeFiles,
-  env: envVarRecordSchema
-};
-var servicesRoutableProperties = {
-  mount: servicesMountSchema
-};
-var servicesRequiredProperties = ["type", "root"];
 var experimentalServicesServiceConfigSchema = {
   oneOf: [
     {
@@ -55264,7 +55169,7 @@ var experimentalServicesServiceConfigSchema = {
         trigger: {
           const: "schedule"
         },
-        schedule: serviceScheduleSchema
+        schedule: experimentalServiceScheduleSchema
       }
     },
     {
@@ -55279,7 +55184,7 @@ var experimentalServicesServiceConfigSchema = {
         trigger: {
           const: "queue"
         },
-        topics: serviceTopicsSchema,
+        topics: experimentalServiceTopicsSchema,
         consumer: {
           type: "string",
           minLength: 1,
@@ -55335,79 +55240,11 @@ var experimentalServicesServiceConfigSchema = {
         type: {
           const: "cron"
         },
-        schedule: serviceScheduleSchema
-      }
-    }
-  ]
-};
-var servicesServiceConfigSchema = {
-  oneOf: [
-    {
-      type: "object",
-      additionalProperties: false,
-      required: servicesRequiredProperties,
-      properties: {
-        ...servicesCommonProperties,
-        ...servicesRoutableProperties,
-        type: {
-          enum: ["web"]
-        }
-      }
-    },
-    {
-      type: "object",
-      additionalProperties: false,
-      required: [...servicesRequiredProperties, "trigger", "schedule"],
-      properties: {
-        ...servicesCommonProperties,
-        type: {
-          const: "job"
-        },
-        trigger: {
-          const: "schedule"
-        },
-        schedule: serviceScheduleSchema
-      }
-    },
-    {
-      type: "object",
-      additionalProperties: false,
-      required: [...servicesRequiredProperties, "trigger", "topics"],
-      properties: {
-        ...servicesCommonProperties,
-        type: {
-          const: "job"
-        },
-        trigger: {
-          const: "queue"
-        },
-        topics: serviceTopicsSchema
-      }
-    },
-    {
-      type: "object",
-      additionalProperties: false,
-      required: [...servicesRequiredProperties, "trigger", "entrypoint"],
-      properties: {
-        ...servicesCommonProperties,
-        type: {
-          const: "job"
-        },
-        trigger: {
-          const: "workflow"
-        }
+        schedule: experimentalServiceScheduleSchema
       }
     }
   ]
 };
-var servicesSchema = {
-  type: "object",
-  propertyNames: {
-    pattern: "^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$",
-    maxLength: 64
-  },
-  additionalProperties: servicesServiceConfigSchema
-};
 var experimentalServicesSchema = {
   type: "object",
   propertyNames: {
@@ -55431,6 +55268,80 @@ var experimentalServiceGroupsSchema = {
     }
   }
 };
+var experimentalServicesV2PathSchema = {
+  type: "string",
+  minLength: 1,
+  maxLength: 512
+};
+var experimentalServicesV2CommandSchema = {
+  type: "string",
+  minLength: 1,
+  maxLength: 2048
+};
+var experimentalServicesV2BindingSchema = {
+  type: "object",
+  additionalProperties: false,
+  required: ["type", "service", "format", "env"],
+  properties: {
+    type: { const: "service" },
+    service: {
+      type: "string",
+      minLength: 1,
+      maxLength: 64,
+      pattern: "^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$"
+    },
+    format: { const: "url" },
+    env: {
+      type: "string",
+      ...envVarNamesSchema
+    }
+  }
+};
+var experimentalServicesV2BindingsSchema = {
+  type: "array",
+  maxItems: 100,
+  items: experimentalServicesV2BindingSchema
+};
+var experimentalServicesV2ServiceConfigSchema = {
+  type: "object",
+  additionalProperties: false,
+  required: ["root"],
+  properties: {
+    root: experimentalServicesV2PathSchema,
+    framework: {
+      type: "string",
+      minLength: 1,
+      maxLength: 256
+    },
+    runtime: {
+      type: "string",
+      minLength: 1,
+      maxLength: 256
+    },
+    entrypoint: experimentalServicesV2PathSchema,
+    installCommand: experimentalServicesV2CommandSchema,
+    buildCommand: experimentalServicesV2CommandSchema,
+    devCommand: experimentalServicesV2CommandSchema,
+    ignoreCommand: experimentalServicesV2CommandSchema,
+    outputDirectory: experimentalServicesV2PathSchema,
+    bindings: experimentalServicesV2BindingsSchema,
+    functions: functionsSchema,
+    headers: import_routing_utils.headersSchema,
+    redirects: import_routing_utils.redirectsSchema,
+    rewrites: import_routing_utils.rewritesSchema,
+    routes: import_routing_utils.routesSchema,
+    cleanUrls: import_routing_utils.cleanUrlsSchema,
+    trailingSlash: import_routing_utils.trailingSlashSchema
+  }
+};
+var experimentalServicesV2Schema = {
+  type: "object",
+  propertyNames: {
+    pattern: "^[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$",
+    maxLength: 64
+  },
+  additionalProperties: experimentalServicesV2ServiceConfigSchema
+};
 var vercelConfigSchema = {
   type: "object",
   // These are not all possibilities because `vc dev`
@@ -55448,26 +55359,14 @@ var vercelConfigSchema = {
     images: imagesSchema,
     crons: cronsSchema,
     bunVersion: { type: "string" },
-    services: servicesSchema,
     experimentalServices: experimentalServicesSchema,
-    experimentalServiceGroups: experimentalServiceGroupsSchema
+    experimentalServiceGroups: experimentalServiceGroupsSchema,
+    experimentalServicesV2: experimentalServicesV2Schema
   }
 };
 var ajv = new import_ajv.default();
 var validate = ajv.compile(vercelConfigSchema);
-function isPublicServicesEnabled() {
-  return process.env.VERCEL_USE_SERVICES === "1" || process.env.VERCEL_USE_SERVICES?.toLowerCase() === "true";
-}
 function validateConfig(config) {
-  if (Object.prototype.hasOwnProperty.call(config, "services") && !isPublicServicesEnabled()) {
-    const fileName = config[import_client.fileNameSymbol] || "vercel.json";
-    const niceError = getPrettyError({
-      dataPath: "",
-      params: { additionalProperty: "services" }
-    });
-    niceError.message = `Invalid ${fileName} - ${niceError.message}`;
-    return niceError;
-  }
   if (!validate(config)) {
     if (validate.errors && validate.errors[0]) {
       const error = validate.errors[0];
@@ -55484,24 +55383,17 @@ function validateConfig(config) {
       link: "https://vercel.link/functions-and-builds"
     });
   }
-  const hasServices = Boolean(config.services);
   const hasExperimentalServices = Boolean(config.experimentalServices);
-  if (hasServices && hasExperimentalServices) {
+  if (hasExperimentalServices && config.builds) {
     return new NowBuildError({
-      code: "SERVICES_AND_EXPERIMENTAL_SERVICES",
-      message: "The `services` property cannot be used in conjunction with the `experimentalServices` property. Please remove one of them."
+      code: "EXPERIMENTAL_SERVICES_AND_BUILDS",
+      message: "The `experimentalServices` property cannot be used in conjunction with the `builds` property. Please remove one of them."
     });
   }
-  if ((hasServices || hasExperimentalServices) && config.builds) {
+  if (hasExperimentalServices && config.functions) {
     return new NowBuildError({
-      code: "SERVICES_AND_BUILDS",
-      message: "The `services` property cannot be used in conjunction with the `builds` property. Please remove one of them."
-    });
-  }
-  if ((hasServices || hasExperimentalServices) && config.functions) {
-    return new NowBuildError({
-      code: "SERVICES_AND_FUNCTIONS",
-      message: "The `services` property cannot be used in conjunction with the `functions` property. Please remove one of them."
+      code: "EXPERIMENTAL_SERVICES_AND_FUNCTIONS",
+      message: "The `experimentalServices` property cannot be used in conjunction with the `functions` property. Please remove one of them."
     });
   }
   if (config.experimentalServiceGroups && !config.experimentalServices) {
@@ -55510,6 +55402,66 @@ function validateConfig(config) {
       message: "The `experimentalServiceGroups` property requires `experimentalServices` to be defined. Service groups reference services by name."
     });
   }
+  const hasExperimentalServicesV2 = Boolean(config.experimentalServicesV2);
+  if (hasExperimentalServicesV2 && hasExperimentalServices) {
+    return new NowBuildError({
+      code: "EXPERIMENTAL_SERVICES_V2_AND_EXPERIMENTAL_SERVICES",
+      message: "The `experimentalServicesV2` property cannot be used in conjunction with the `experimentalServices` property. Please use only one services configuration."
+    });
+  }
+  if (hasExperimentalServicesV2 && config.builds) {
+    return new NowBuildError({
+      code: "EXPERIMENTAL_SERVICES_V2_AND_BUILDS",
+      message: "The `experimentalServicesV2` property cannot be used in conjunction with the `builds` property. Please remove one of them."
+    });
+  }
+  if (hasExperimentalServicesV2) {
+    const ambiguousTopLevel = [];
+    if (config.functions != null) {
+      ambiguousTopLevel.push("functions");
+    }
+    if (config.installCommand != null) {
+      ambiguousTopLevel.push("installCommand");
+    }
+    if (config.buildCommand != null) {
+      ambiguousTopLevel.push("buildCommand");
+    }
+    if (config.devCommand != null) {
+      ambiguousTopLevel.push("devCommand");
+    }
+    if (config.ignoreCommand != null) {
+      ambiguousTopLevel.push("ignoreCommand");
+    }
+    if (config.outputDirectory != null) {
+      ambiguousTopLevel.push("outputDirectory");
+    }
+    if (config.framework != null) {
+      ambiguousTopLevel.push("framework");
+    }
+    if (ambiguousTopLevel.length > 0) {
+      const count = ambiguousTopLevel.length;
+      const fields = ambiguousTopLevel.map((field) => `\`${field}\``).join(", ");
+      return new NowBuildError({
+        code: "EXPERIMENTAL_SERVICES_V2_AND_TOP_LEVEL_BUILD_SETTINGS",
+        message: `The top-level ${count > 1 ? "properties" : "property"} ${fields} cannot be used with \`experimentalServicesV2\` because the owning service is ambiguous. Move ${count > 1 ? "them" : "it"} under the relevant service in \`experimentalServicesV2\`.`
+      });
+    }
+  }
+  if (config.experimentalServicesV2) {
+    const serviceNames = new Set(Object.keys(config.experimentalServicesV2));
+    for (const [serviceName, serviceConfig] of Object.entries(
+      config.experimentalServicesV2
+    )) {
+      for (const binding of serviceConfig.bindings ?? []) {
+        if (!serviceNames.has(binding.service)) {
+          return new NowBuildError({
+            code: "EXPERIMENTAL_SERVICES_V2_BINDING_UNKNOWN_SERVICE",
+            message: `Service "${serviceName}" declares a binding to unknown service "${binding.service}". Add "${binding.service}" to \`experimentalServicesV2\` or fix the binding.`
+          });
+        }
+      }
+    }
+  }
   return null;
 }
 
@@ -55560,7 +55512,7 @@ async function hasExperimentalServicesConfig(cwd) {
     );
     if (!config || config instanceof Error)
       return false;
-    return config.services != null && typeof config.services === "object" || config.experimentalServices != null && typeof config.experimentalServices === "object";
+    return config.experimentalServices != null && typeof config.experimentalServices === "object";
   } catch {
     return false;
   }
@@ -55576,7 +55528,7 @@ async function tryDetectServices(cwd) {
     detectEntrypoint: createDetectEntrypoint(cwd)
   });
   const hasNoServicesError = result.errors.some(
-    (e) => e.code === "NO_SERVICES_CONFIGURED"
+    (e) => e.code === "NO_EXPERIMENTAL_SERVICES_CONFIGURED"
   );
   if (hasNoServicesError) {
     return null;
@@ -55659,9 +55611,9 @@ async function prepareTomlServicesConfigWrite(configPath, config) {
 }
 function getServicesConfigWriteBlockerFromError(error) {
   switch (error?.code) {
-    case "SERVICES_AND_BUILDS":
+    case "EXPERIMENTAL_SERVICES_AND_BUILDS":
       return "builds";
-    case "SERVICES_AND_FUNCTIONS":
+    case "EXPERIMENTAL_SERVICES_AND_FUNCTIONS":
       return "functions";
     default:
       return null;