vercel 54.6.0 → 54.7.0

package/dist/commands/build/index.js

@@ -11,37 +11,34 @@ import {
   isLambda,
   staticFiles,
   writeBuildResult
-} from "../../chunks/chunk-XFSFHTAB.js";
+} from "../../chunks/chunk-DDORH57D.js";
 import {
   require_semver
 } from "../../chunks/chunk-IB5L4LKZ.js";
 import {
   pullCommandLogic
-} from "../../chunks/chunk-OLXE4TRH.js";
+} from "../../chunks/chunk-XC4VCXLN.js";
 import {
   pickOverrides,
   readProjectSettings
-} from "../../chunks/chunk-7O3VXZBW.js";
-import {
-  ua_default
-} from "../../chunks/chunk-76ZNZKIN.js";
+} from "../../chunks/chunk-K5ISROJF.js";
 import "../../chunks/chunk-N733ZD4W.js";
-import "../../chunks/chunk-BT4S267X.js";
+import "../../chunks/chunk-TSUZWPXS.js";
 import {
   printProjectNotFoundError
-} from "../../chunks/chunk-TPCECDGK.js";
+} from "../../chunks/chunk-FQ2EU7QM.js";
 import {
   AGENT_REASON,
   AGENT_STATUS
 } from "../../chunks/chunk-L6Q2EQPI.js";
-import "../../chunks/chunk-6PVIXIDG.js";
+import "../../chunks/chunk-6PSM4YC3.js";
 import {
   buildCommand
-} from "../../chunks/chunk-HXXKDZQ6.js";
-import "../../chunks/chunk-C7WFNC2H.js";
+} from "../../chunks/chunk-RKLHR2YE.js";
+import "../../chunks/chunk-TVXUA533.js";
 import {
   help
-} from "../../chunks/chunk-TTOZFGDX.js";
+} from "../../chunks/chunk-LOQRUMOE.js";
 import {
   DEFAULT_VERCEL_CONFIG_FILENAME,
   VERCEL_DIR,
@@ -61,26 +58,27 @@ import {
   require_main,
   require_minimatch,
   resolveProjectCwd,
+  ua_default,
   validateConfig
-} from "../../chunks/chunk-PKUYGVBJ.js";
+} from "../../chunks/chunk-QAHIBMRJ.js";
 import {
   TelemetryClient
 } from "../../chunks/chunk-4CIXZOP4.js";
 import {
   outputAgentError
-} from "../../chunks/chunk-ULXHXZCZ.js";
+} from "../../chunks/chunk-7OUZIPHA.js";
 import {
   stamp_default
 } from "../../chunks/chunk-CO5D46AG.js";
 import "../../chunks/chunk-N2T234LO.js";
-import "../../chunks/chunk-OM5Z2KO5.js";
+import "../../chunks/chunk-ZTHVV4KB.js";
 import {
   getFlagsSpecification,
   getGlobalFlagsOnlyFromArgs,
   parseArguments,
   printError,
   toEnumerableError
-} from "../../chunks/chunk-H33IJ7OP.js";
+} from "../../chunks/chunk-XQUJUKTN.js";
 import {
   CantParseJSONFile,
   cmd,
@@ -88,7 +86,7 @@ import {
   getCommandNamePlain,
   packageName,
   require_lib as require_lib2
-} from "../../chunks/chunk-UGXBNJMO.js";
+} from "../../chunks/chunk-IDFKAJW3.js";
 import {
   pkg_default
 } from "../../chunks/chunk-P4QNYOFB.js";
@@ -121,7 +119,7 @@ import {
   FileBlob,
   FileFsRef,
   getDiscontinuedNodeVersions,
-  getInstalledPackageVersion as getInstalledPackageVersion2,
+  getInstalledPackageVersion,
   getServiceUrlEnvVars,
   getExperimentalServiceUrlEnvVars,
   normalizePath,
@@ -427,7 +425,7 @@ function validatePackageManifest(data) {
 }
 
 // src/util/flags/build-embedding.ts
-import { getInstalledPackageVersion } from "@vercel/build-utils";
+import { isPackageInstalled } from "@vercel/build-utils";
 function isFlagsEmbedOption(input) {
   return input === "force-on" || input === "force-off";
 }
@@ -449,9 +447,9 @@ async function shouldEmbedFlagsDefinitions(cwd) {
   if (envHasSdkKey()) {
     return true;
   }
-  const vercelFlagsVersion = await getInstalledPackageVersion("@flags-sdk/vercel");
-  const vercelFlagsCoreVersion = await getInstalledPackageVersion("@vercel/flags-core");
-  if (vercelFlagsVersion || vercelFlagsCoreVersion) {
+  const hasVercelFlags = await isPackageInstalled("@flags-sdk/vercel", cwd);
+  const hasFlagsCore = await isPackageInstalled("@vercel/flags-core", cwd);
+  if (hasVercelFlags || hasFlagsCore) {
     return true;
   }
   return false;
@@ -463,6 +461,9 @@ function buildCommandWithGlobalFlags(baseSubcommand, argv) {
   const full = globalFlags.length ? `${baseSubcommand} ${globalFlags.join(" ")}` : baseSubcommand;
   return getCommandNamePlain(full);
 }
+function hasNonEmptyObject(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length > 0;
+}
 async function main(client) {
   const telemetryClient = new BuildTelemetryClient({
     opts: {
@@ -887,6 +888,10 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
   let zeroConfigRoutes = [];
   let zeroConfigFallbackRoutes = [];
   let detectedServices;
+  const hasExperimentalServicesConfiguredInVercelConfig = hasNonEmptyObject(
+    localConfig.experimentalServices
+  );
+  let detectedExperimentalServicesConfig;
   let isZeroConfig = false;
   if (builds.length > 0) {
     output_manager_default.warn(
@@ -951,7 +956,7 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
     zeroConfigFallbackRoutes = detectedBuilders.fallbackRoutes || [];
   }
   const builderSpecs = new Set(builds.map((b) => b.use));
-  const buildersWithPkgs = await span.child("vc.importBuilders").trace(() => importBuilders(builderSpecs, cwd, span));
+  let buildersWithPkgs = await span.child("vc.importBuilders").trace(() => importBuilders(builderSpecs, cwd, span));
   const filesMap = {};
   for (const path of files) {
     const fsPath = join2(workPath, path);
@@ -961,31 +966,44 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
   const buildStamp = stamp_default();
   await import_fs_extra2.default.mkdirp(outputDir);
   const ops = [];
-  const buildsJsonBuilds = new Map(
-    builds.map((build) => {
+  const buildsJsonBuilds = /* @__PURE__ */ new Map();
+  const ensureBuildersImported = async (buildsToImport) => {
+    const missingBuilderSpecs = new Set(
+      buildsToImport.map((build) => build.use).filter((builderSpec) => !buildersWithPkgs.has(builderSpec))
+    );
+    if (missingBuilderSpecs.size === 0)
+      return;
+    const importedBuilders = await span.child("vc.importBuilders").trace(() => importBuilders(missingBuilderSpecs, cwd, span));
+    buildersWithPkgs = new Map([
+      ...buildersWithPkgs.entries(),
+      ...importedBuilders.entries()
+    ]);
+  };
+  const addBuildsToBuildJson = async (buildsToAdd) => {
+    await ensureBuildersImported(buildsToAdd);
+    for (const build of buildsToAdd) {
+      if (buildsJsonBuilds.has(build))
+        continue;
       const builderWithPkg = buildersWithPkgs.get(build.use);
       if (!builderWithPkg) {
         throw new Error(`Failed to load Builder "${build.use}"`);
       }
       const { builder, pkg: builderPkg } = builderWithPkg;
-      return [
-        build,
-        {
-          require: builderPkg.name,
-          requirePath: builderWithPkg.path,
-          apiVersion: builder.version,
-          ...build
-        }
-      ];
-    })
-  );
-  buildsJson.builds = Array.from(buildsJsonBuilds.values());
-  await writeBuildJson(buildsJson, outputDir);
+      buildsJsonBuilds.set(build, {
+        require: builderPkg.name,
+        requirePath: builderWithPkg.path,
+        apiVersion: builder.version,
+        ...build
+      });
+    }
+    buildsJson.builds = Array.from(buildsJsonBuilds.values());
+    await writeBuildJson(buildsJson, outputDir);
+  };
   const meta = {
     skipDownload: true,
     cliVersion: pkg_default.version
   };
-  const sortedBuilders = sortBuilders(builds);
+  const executedBuilds = [];
   const buildResults = /* @__PURE__ */ new Map();
   const overrides = [];
   const repoRootPath = cwd;
@@ -994,397 +1012,521 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
   }
   const diagnostics = {};
   const packageManifests = [];
-  const hasDetectedServices = detectedServices !== void 0 && detectedServices.length > 0;
-  const hasQueueServices = hasDetectedServices && detectedServices.some(isQueueBackedService);
+  const getHasDetectedServices = () => detectedServices !== void 0 && detectedServices.length > 0;
+  const getHasQueueServices = () => getHasDetectedServices() && detectedServices.some(isQueueBackedService);
   const synthesizedServiceCrons = [];
   const serviceByBuilder = /* @__PURE__ */ new Map();
-  if (hasDetectedServices) {
+  if (getHasDetectedServices()) {
     for (const service of detectedServices) {
       serviceByBuilder.set(service.builder, service);
     }
   }
   const preDeployEntries = [];
-  for (const build of sortedBuilders) {
-    if (typeof build.src !== "string")
-      continue;
-    const builderWithPkg = buildersWithPkgs.get(build.use);
-    if (!builderWithPkg) {
-      throw new Error(`Failed to load Builder "${build.use}"`);
-    }
-    try {
-      const { builder, pkg: builderPkg } = builderWithPkg;
-      const service = hasDetectedServices ? serviceByBuilder.get(build) : void 0;
-      const stripServiceRoutePrefix = !!service?.routePrefix && service.routePrefix !== "/";
-      let buildWorkPath = workPath;
-      let buildEntrypoint = build.src;
-      let buildFiles = filesMap;
-      if (service && service.workspace !== ".") {
-        const wsPrefix = service.workspace + "/";
-        buildWorkPath = join2(workPath, service.workspace);
-        buildEntrypoint = build.src.startsWith(wsPrefix) ? build.src.slice(wsPrefix.length) : build.src;
-        buildFiles = {};
-        for (const [filePath, file] of Object.entries(filesMap)) {
-          if (filePath.startsWith(wsPrefix)) {
-            buildFiles[filePath.slice(wsPrefix.length)] = file;
+  const runBuilders = async (buildsToRun) => {
+    await addBuildsToBuildJson(buildsToRun);
+    for (const build of sortBuilders(buildsToRun)) {
+      if (typeof build.src !== "string")
+        continue;
+      const builderWithPkg = buildersWithPkgs.get(build.use);
+      if (!builderWithPkg) {
+        throw new Error(`Failed to load Builder "${build.use}"`);
+      }
+      try {
+        const { builder, pkg: builderPkg } = builderWithPkg;
+        const service = getHasDetectedServices() ? serviceByBuilder.get(build) : void 0;
+        const stripServiceRoutePrefix = !!service?.routePrefix && service.routePrefix !== "/";
+        let buildWorkPath = workPath;
+        let buildEntrypoint = build.src;
+        let buildFiles = filesMap;
+        if (service && service.workspace !== ".") {
+          const wsPrefix = service.workspace + "/";
+          buildWorkPath = join2(workPath, service.workspace);
+          buildEntrypoint = build.src.startsWith(wsPrefix) ? build.src.slice(wsPrefix.length) : build.src;
+          buildFiles = {};
+          for (const [filePath, file] of Object.entries(filesMap)) {
+            if (filePath.startsWith(wsPrefix)) {
+              buildFiles[filePath.slice(wsPrefix.length)] = file;
+            }
           }
+          output_manager_default.debug(
+            `Service "${service.name}": workspace-rooted build at "${buildWorkPath}", entrypoint "${buildEntrypoint}" (original: "${build.src}")`
+          );
         }
-        output_manager_default.debug(
-          `Service "${service.name}": workspace-rooted build at "${buildWorkPath}", entrypoint "${buildEntrypoint}" (original: "${build.src}")`
-        );
-      }
-      const settingsForEnv = service ? {
-        buildCommand: service.buildCommand ?? void 0,
-        installCommand: service.installCommand ?? void 0,
-        outputDirectory: projectSettings.outputDirectory ?? void 0,
-        nodeVersion: projectSettings.nodeVersion ?? void 0
-      } : projectSettings;
-      for (const key of [
-        "buildCommand",
-        "installCommand",
-        "outputDirectory",
-        "nodeVersion"
-      ]) {
-        const value = settingsForEnv[key];
-        const envKey = `VERCEL_PROJECT_SETTINGS_` + key.replace(/[A-Z]/g, (letter) => `_${letter}`).toUpperCase();
-        if (typeof value === "string") {
-          process.env[envKey] = value;
-          output_manager_default.debug(`Setting env ${envKey} to "${value}"`);
-        } else {
-          delete process.env[envKey];
+        const settingsForEnv = service ? {
+          buildCommand: service.buildCommand ?? void 0,
+          installCommand: service.installCommand ?? void 0,
+          outputDirectory: projectSettings.outputDirectory ?? void 0,
+          nodeVersion: projectSettings.nodeVersion ?? void 0
+        } : projectSettings;
+        for (const key of [
+          "buildCommand",
+          "installCommand",
+          "outputDirectory",
+          "nodeVersion"
+        ]) {
+          const value = settingsForEnv[key];
+          const envKey = `VERCEL_PROJECT_SETTINGS_` + key.replace(/[A-Z]/g, (letter) => `_${letter}`).toUpperCase();
+          if (typeof value === "string") {
+            process.env[envKey] = value;
+            output_manager_default.debug(`Setting env ${envKey} to "${value}"`);
+          } else {
+            delete process.env[envKey];
+          }
         }
-      }
-      const isFrontendBuilder = build.config && "framework" in build.config;
-      const builderFramework = build.config?.framework ?? projectSettings.framework;
-      let buildConfig;
-      if (isZeroConfig) {
-        if (service) {
-          buildConfig = {
-            ...build.config,
-            ...hasQueueServices ? { hasWorkerServices: true } : void 0,
-            // Override project-level settings with service-specific ones.
-            // The project-level framework is "services" which must NOT be
-            // propagated to individual builders.
-            projectSettings: {
-              ...projectSettings,
-              framework: service.framework ?? null,
-              buildCommand: service.buildCommand ?? null,
-              installCommand: service.installCommand ?? null
-            },
-            installCommand: service.installCommand ?? void 0,
-            buildCommand: service.buildCommand ?? void 0,
-            preDeployCommand: service.preDeployCommand ?? void 0,
-            framework: builderFramework,
-            nodeVersion: projectSettings.nodeVersion,
-            bunVersion: localConfig.bunVersion ?? void 0
-          };
+        const isFrontendBuilder = build.config && "framework" in build.config;
+        const builderFramework = build.config?.framework ?? projectSettings.framework;
+        let buildConfig;
+        if (isZeroConfig) {
+          if (service) {
+            buildConfig = {
+              ...build.config,
+              ...getHasQueueServices() ? { hasWorkerServices: true } : void 0,
+              // Override project-level settings with service-specific ones.
+              // The project-level framework is "services" which must NOT be
+              // propagated to individual builders.
+              projectSettings: {
+                ...projectSettings,
+                framework: service.framework ?? null,
+                buildCommand: service.buildCommand ?? null,
+                installCommand: service.installCommand ?? null
+              },
+              installCommand: service.installCommand ?? void 0,
+              buildCommand: service.buildCommand ?? void 0,
+              preDeployCommand: service.preDeployCommand ?? void 0,
+              framework: builderFramework,
+              nodeVersion: projectSettings.nodeVersion,
+              bunVersion: localConfig.bunVersion ?? void 0
+            };
+          } else {
+            buildConfig = {
+              outputDirectory: projectSettings.outputDirectory ?? void 0,
+              ...build.config,
+              projectSettings,
+              installCommand: projectSettings.installCommand ?? void 0,
+              devCommand: projectSettings.devCommand ?? void 0,
+              buildCommand: projectSettings.buildCommand ?? void 0,
+              framework: projectSettings.framework,
+              nodeVersion: projectSettings.nodeVersion,
+              bunVersion: localConfig.bunVersion ?? void 0
+            };
+          }
         } else {
           buildConfig = {
-            outputDirectory: projectSettings.outputDirectory ?? void 0,
-            ...build.config,
-            projectSettings,
-            installCommand: projectSettings.installCommand ?? void 0,
-            devCommand: projectSettings.devCommand ?? void 0,
-            buildCommand: projectSettings.buildCommand ?? void 0,
-            framework: projectSettings.framework,
-            nodeVersion: projectSettings.nodeVersion,
+            ...build.config || {},
             bunVersion: localConfig.bunVersion ?? void 0
           };
         }
-      } else {
-        buildConfig = {
-          ...build.config || {},
-          bunVersion: localConfig.bunVersion ?? void 0
-        };
-      }
-      const builderSpan = span.child("vc.builder", {
-        "builder.name": builderPkg.name,
-        "builder.version": builderPkg.version,
-        "builder.dynamicallyInstalled": String(
-          builderWithPkg.dynamicallyInstalled
-        )
-      });
-      const serviceRoutePrefix = build.config?.routePrefix;
-      const serviceWorkspace = build.config?.workspace;
-      const preDeployCmd = service?.preDeployCommand?.trim();
-      const preDeployEntry = preDeployCmd && service ? { service: service.name } : void 0;
-      if (preDeployEntry) {
-        preDeployEntries.push(preDeployEntry);
-      }
-      const buildOptions = {
-        files: buildFiles,
-        entrypoint: buildEntrypoint,
-        workPath: buildWorkPath,
-        repoRootPath,
-        config: buildConfig,
-        meta,
-        span: builderSpan,
-        ...preDeployCmd ? {
-          registerPreDeploy: (callback) => {
-            preDeployEntry.callback = callback;
-          }
-        } : void 0,
-        ...service ? {
-          service: {
-            name: service.name,
-            type: service.type,
-            trigger: service.trigger,
-            routePrefix: typeof serviceRoutePrefix === "string" ? serviceRoutePrefix : void 0,
-            workspace: typeof serviceWorkspace === "string" ? serviceWorkspace : void 0,
-            schedule: service.schedule
-          }
-        } : void 0
-      };
-      output_manager_default.debug(
-        `Building entrypoint "${build.src}" with "${builderPkg.name}"`
-      );
-      const restoreEnv = /* @__PURE__ */ new Map();
-      if (detectedServices && service?.env) {
-        const perServiceEnv = getServiceUrlEnvVars({
-          requestedEnv: service.env,
-          consumerService: service,
-          services: detectedServices,
-          frameworkList: import_frameworks2.frameworkList,
-          currentEnv: process.env,
-          deploymentUrl: process.env.VERCEL_URL
+        const builderSpan = span.child("vc.builder", {
+          "builder.name": builderPkg.name,
+          "builder.version": builderPkg.version,
+          "builder.dynamicallyInstalled": String(
+            builderWithPkg.dynamicallyInstalled
+          )
         });
-        for (const [key, value] of Object.entries(perServiceEnv)) {
-          if (key in process.env)
-            continue;
-          restoreEnv.set(key, process.env[key]);
-          process.env[key] = value;
-          output_manager_default.debug(`Injected service URL env var: ${key}=${value}`);
-        }
-      }
-      let buildResult;
-      let rawBuildResult;
-      try {
-        rawBuildResult = await builderSpan.trace(async () => builder.build(buildOptions));
-        if (builder.version === -1) {
-          const vx = rawBuildResult;
-          buildResult = vx.result;
-        } else {
-          buildResult = rawBuildResult;
+        const serviceRoutePrefix = build.config?.routePrefix;
+        const serviceWorkspace = build.config?.workspace;
+        const preDeployCmd = service?.preDeployCommand?.trim();
+        const preDeployEntry = preDeployCmd && service ? { service: service.name } : void 0;
+        if (preDeployEntry) {
+          preDeployEntries.push(preDeployEntry);
         }
-        if (!hasDetectedServices && buildConfig.zeroConfig && isFrontendBuilder && "output" in buildResult && !buildResult.routes) {
-          const framework2 = import_frameworks2.frameworkList.find(
-            (f) => f.slug === buildConfig.framework
-          );
-          if (framework2) {
-            const defaultRoutes = await getFrameworkRoutes(
-              framework2,
-              buildWorkPath
-            );
-            buildResult.routes = defaultRoutes;
+        const buildOptions = {
+          files: buildFiles,
+          entrypoint: buildEntrypoint,
+          workPath: buildWorkPath,
+          repoRootPath,
+          config: buildConfig,
+          meta,
+          span: builderSpan,
+          ...preDeployCmd ? {
+            registerPreDeploy: (callback) => {
+              preDeployEntry.callback = callback;
+            }
+          } : void 0,
+          ...service ? {
+            service: {
+              name: service.name,
+              type: service.type,
+              trigger: service.trigger,
+              routePrefix: typeof serviceRoutePrefix === "string" ? serviceRoutePrefix : void 0,
+              workspace: typeof serviceWorkspace === "string" ? serviceWorkspace : void 0,
+              schedule: service.schedule
+            }
+          } : void 0
+        };
+        output_manager_default.debug(
+          `Building entrypoint "${build.src}" with "${builderPkg.name}"`
+        );
+        const restoreEnv = /* @__PURE__ */ new Map();
+        if (detectedServices && service?.env) {
+          const perServiceEnv = getServiceUrlEnvVars({
+            requestedEnv: service.env,
+            consumerService: service,
+            services: detectedServices,
+            frameworkList: import_frameworks2.frameworkList,
+            currentEnv: process.env,
+            deploymentUrl: process.env.VERCEL_URL
+          });
+          for (const [key, value] of Object.entries(perServiceEnv)) {
+            if (key in process.env)
+              continue;
+            restoreEnv.set(key, process.env[key]);
+            process.env[key] = value;
+            output_manager_default.debug(`Injected service URL env var: ${key}=${value}`);
           }
         }
-      } finally {
-        for (const [key, prior] of restoreEnv) {
-          if (prior === void 0) {
-            delete process.env[key];
+        let buildResult;
+        let rawBuildResult;
+        try {
+          rawBuildResult = await builderSpan.trace(async () => builder.build(buildOptions));
+          if (builder.version === -1) {
+            const vx = rawBuildResult;
+            buildResult = vx.result;
           } else {
-            process.env[key] = prior;
+            buildResult = rawBuildResult;
           }
-        }
-        try {
-          const builderDiagnostics = await builderSpan.child("vc.builder.diagnostics").trace(async () => {
-            return await builder.diagnostics?.(buildOptions);
-          });
-          if (builderDiagnostics) {
-            const prefix = service && service.workspace !== "." ? service.workspace + "/" + builderPkg.name + "/" : "";
-            for (const [key, value] of Object.entries(builderDiagnostics)) {
-              const fullKey = prefix + key;
-              if (key.endsWith("package-manifest.json")) {
-                try {
-                  let data;
-                  if (value.type === "FileBlob") {
-                    data = value.data.toString();
-                  } else {
-                    data = await streamToString(value.toStream());
-                  }
-                  const packageManifest = JSON.parse(data);
-                  const validationError = validatePackageManifest(packageManifest);
-                  if (validationError) {
-                    output_manager_default.warn(
-                      `Invalid package-manifest.json from ${fullKey}: ${validationError}`
+          if (!getHasDetectedServices() && buildConfig.zeroConfig && isFrontendBuilder && "output" in buildResult && !buildResult.routes) {
+            const framework2 = import_frameworks2.frameworkList.find(
+              (f) => f.slug === buildConfig.framework
+            );
+            if (framework2) {
+              const defaultRoutes = await getFrameworkRoutes(
+                framework2,
+                buildWorkPath
+              );
+              buildResult.routes = defaultRoutes;
+            }
+          }
+        } finally {
+          for (const [key, prior] of restoreEnv) {
+            if (prior === void 0) {
+              delete process.env[key];
+            } else {
+              process.env[key] = prior;
+            }
+          }
+          try {
+            const builderDiagnostics = await builderSpan.child("vc.builder.diagnostics").trace(async () => {
+              return await builder.diagnostics?.(buildOptions);
+            });
+            if (builderDiagnostics) {
+              const prefix = service && service.workspace !== "." ? service.workspace + "/" + builderPkg.name + "/" : "";
+              for (const [key, value] of Object.entries(builderDiagnostics)) {
+                const fullKey = prefix + key;
+                if (key.endsWith("package-manifest.json")) {
+                  try {
+                    let data;
+                    if (value.type === "FileBlob") {
+                      data = value.data.toString();
+                    } else {
+                      data = await streamToString(value.toStream());
+                    }
+                    const packageManifest = JSON.parse(data);
+                    const validationError = validatePackageManifest(packageManifest);
+                    if (validationError) {
+                      output_manager_default.warn(
+                        `Invalid package-manifest.json from ${fullKey}: ${validationError}`
+                      );
+                    } else {
+                      const workspace = service && service.workspace !== "." ? service.workspace : ".";
+                      packageManifests.push({
+                        workspace,
+                        key: fullKey,
+                        manifest: packageManifest,
+                        service,
+                        builderUse: builderPkg.name
+                      });
+                    }
+                  } catch (e) {
+                    output_manager_default.debug(
+                      `Failed to parse ${fullKey}: ${e instanceof Error ? e.message : String(e)}`
                     );
-                  } else {
-                    const workspace = service && service.workspace !== "." ? service.workspace : ".";
-                    packageManifests.push({
-                      workspace,
-                      key: fullKey,
-                      manifest: packageManifest,
-                      service,
-                      builderUse: builderPkg.name
-                    });
                   }
-                } catch (e) {
-                  output_manager_default.debug(
-                    `Failed to parse ${fullKey}: ${e instanceof Error ? e.message : String(e)}`
-                  );
+                } else {
+                  diagnostics[fullKey] = value;
                 }
-              } else {
-                diagnostics[fullKey] = value;
               }
             }
+          } catch (error) {
+            output_manager_default.error("Collecting diagnostics failed");
+            output_manager_default.debug(error);
           }
-        } catch (error) {
-          output_manager_default.error("Collecting diagnostics failed");
-          output_manager_default.debug(error);
         }
-      }
-      if (buildResult && "output" in buildResult && "runtime" in buildResult.output && "type" in buildResult.output && buildResult.output.type === "Lambda") {
-        const lambdaRuntime = buildResult.output.runtime;
-        if (getDiscontinuedNodeVersions().some((o) => o.runtime === lambdaRuntime)) {
-          throw new NowBuildError2({
-            code: "NODEJS_DISCONTINUED_VERSION",
-            message: `The Runtime "${build.use}" is using "${lambdaRuntime}", which is discontinued. Please upgrade your Runtime to a more recent version or consult the author for more details.`,
-            link: "https://vercel.link/function-runtimes"
-          });
+        if (buildResult && "output" in buildResult && "runtime" in buildResult.output && "type" in buildResult.output && buildResult.output.type === "Lambda") {
+          const lambdaRuntime = buildResult.output.runtime;
+          if (getDiscontinuedNodeVersions().some((o) => o.runtime === lambdaRuntime)) {
+            throw new NowBuildError2({
+              code: "NODEJS_DISCONTINUED_VERSION",
+              message: `The Runtime "${build.use}" is using "${lambdaRuntime}", which is discontinued. Please upgrade your Runtime to a more recent version or consult the author for more details.`,
+              link: "https://vercel.link/function-runtimes"
+            });
+          }
         }
-      }
-      if ("output" in buildResult && buildResult.output && (isBackendBuilder(build) || build.use === "@vercel/python")) {
-        const routesJsonPath = join2(buildWorkPath, ".vercel", "routes.json");
-        if ((0, import_fs_extra2.existsSync)(routesJsonPath)) {
-          try {
-            const routesJson = await readJSONFile(routesJsonPath);
-            if (routesJson && typeof routesJson === "object" && "routes" in routesJson && Array.isArray(routesJson.routes)) {
-              const indexLambda = "index" in buildResult.output ? buildResult.output["index"] : void 0;
-              const convertedRoutes = [];
-              const convertedOutputs = indexLambda ? { index: indexLambda } : {};
-              for (const route of routesJson.routes) {
-                if (typeof route.source !== "string") {
-                  continue;
-                }
-                const { src } = (0, import_routing_utils2.sourceToRegex)(route.source);
-                const newRoute = {
-                  src,
-                  dest: route.source
-                };
-                if (route.methods) {
-                  newRoute.methods = route.methods;
-                }
-                if (route.source === "/") {
-                  continue;
+        if ("output" in buildResult && buildResult.output && (isBackendBuilder(build) || build.use === "@vercel/python")) {
+          const routesJsonPath = join2(buildWorkPath, ".vercel", "routes.json");
+          if ((0, import_fs_extra2.existsSync)(routesJsonPath)) {
+            try {
+              const routesJson = await readJSONFile(routesJsonPath);
+              if (routesJson && typeof routesJson === "object" && "routes" in routesJson && Array.isArray(routesJson.routes)) {
+                const indexLambda = "index" in buildResult.output ? buildResult.output["index"] : void 0;
+                const convertedRoutes = [];
+                const convertedOutputs = indexLambda ? { index: indexLambda } : {};
+                for (const route of routesJson.routes) {
+                  if (typeof route.source !== "string") {
+                    continue;
+                  }
+                  const { src } = (0, import_routing_utils2.sourceToRegex)(route.source);
+                  const newRoute = {
+                    src,
+                    dest: route.source
+                  };
+                  if (route.methods) {
+                    newRoute.methods = route.methods;
+                  }
+                  if (route.source === "/") {
+                    continue;
+                  }
+                  if (indexLambda) {
+                    convertedOutputs[route.source] = indexLambda;
+                  }
+                  convertedRoutes.push(newRoute);
                 }
+                buildResult.routes = [
+                  { handle: "filesystem" },
+                  ...convertedRoutes,
+                  { src: "/(.*)", dest: "/" }
+                ];
                 if (indexLambda) {
-                  convertedOutputs[route.source] = indexLambda;
+                  buildResult.output = convertedOutputs;
                 }
-                convertedRoutes.push(newRoute);
-              }
-              buildResult.routes = [
-                { handle: "filesystem" },
-                ...convertedRoutes,
-                { src: "/(.*)", dest: "/" }
-              ];
-              if (indexLambda) {
-                buildResult.output = convertedOutputs;
               }
+            } catch (error) {
+              output_manager_default.error(`Failed to read routes.json: ${error}`);
             }
-          } catch (error) {
-            output_manager_default.error(`Failed to read routes.json: ${error}`);
           }
         }
-      }
-      if (hasDetectedServices && service && "routes" in buildResult && Array.isArray(buildResult.routes) && detectedServices) {
-        buildResult.routes = scopeRoutesToServiceOwnership({
-          routes: buildResult.routes,
-          owner: service,
-          allServices: detectedServices
-        });
-      }
-      if (service && isQueueBackedService(service) && "output" in buildResult) {
-        attachQueueServiceTrigger(buildResult.output, service);
-      }
-      if (service && isScheduleTriggeredService(service) && !("crons" in buildResult && buildResult.crons?.length)) {
-        const staticSchedules = getStaticServiceSchedules(service.schedule);
-        if (typeof service.runtime === "string" && staticSchedules.length > 0) {
-          const cronEntrypoint = service.entrypoint || service.builder.src || "index";
-          for (const schedule of staticSchedules) {
-            synthesizedServiceCrons.push({
-              path: getInternalServiceCronPath(
-                service.name,
-                cronEntrypoint,
-                service.handlerFunction || "cron"
-              ),
-              schedule
-            });
-          }
-        } else {
-          throw new NowBuildError2({
-            code: "CRON_SERVICE_NO_CRONS",
-            message: `Scheduled service "${service.name}" did not produce any cron entries. The builder "${builderPkg.name}" may not support scheduled services.`
+        if (getHasDetectedServices() && service && "routes" in buildResult && Array.isArray(buildResult.routes) && detectedServices) {
+          buildResult.routes = scopeRoutesToServiceOwnership({
+            routes: buildResult.routes,
+            owner: service,
+            allServices: detectedServices
           });
         }
-      }
-      let mergedBuildResult = buildResult;
-      if ("buildOutputPath" in buildResult) {
-        const buildOutputConfigPath = join2(
-          buildResult.buildOutputPath,
-          "config.json"
-        );
-        const buildOutputConfig = await readJSONFile(
-          buildOutputConfigPath
-        );
-        if (buildOutputConfig instanceof CantParseJSONFile) {
-          throw buildOutputConfig;
+        if (service && isQueueBackedService(service) && "output" in buildResult) {
+          attachQueueServiceTrigger(buildResult.output, service);
         }
-        if (buildOutputConfig) {
-          if (buildOutputConfig.overrides) {
-            overrides.push(buildOutputConfig.overrides);
-          }
-          if (hasDetectedServices && service && Array.isArray(buildOutputConfig.routes) && detectedServices) {
-            buildOutputConfig.routes = scopeRoutesToServiceOwnership({
-              routes: buildOutputConfig.routes,
-              owner: service,
-              allServices: detectedServices
+        if (service && isScheduleTriggeredService(service) && !("crons" in buildResult && buildResult.crons?.length)) {
+          const staticSchedules = getStaticServiceSchedules(service.schedule);
+          if (typeof service.runtime === "string" && staticSchedules.length > 0) {
+            const cronEntrypoint = service.entrypoint || service.builder.src || "index";
+            for (const schedule of staticSchedules) {
+              synthesizedServiceCrons.push({
+                path: getInternalServiceCronPath(
+                  service.name,
+                  cronEntrypoint,
+                  service.handlerFunction || "cron"
+                ),
+                schedule
+              });
+            }
+          } else {
+            throw new NowBuildError2({
+              code: "CRON_SERVICE_NO_CRONS",
+              message: `Scheduled service "${service.name}" did not produce any cron entries. The builder "${builderPkg.name}" may not support scheduled services.`
             });
           }
-          mergedBuildResult = buildOutputConfig;
         }
+        let mergedBuildResult = buildResult;
+        if ("buildOutputPath" in buildResult) {
+          const buildOutputConfigPath = join2(
+            buildResult.buildOutputPath,
+            "config.json"
+          );
+          const buildOutputConfig = await readJSONFile(
+            buildOutputConfigPath
+          );
+          if (buildOutputConfig instanceof CantParseJSONFile) {
+            throw buildOutputConfig;
+          }
+          if (buildOutputConfig) {
+            if (!hasExperimentalServicesConfiguredInVercelConfig) {
+              const outputConfigPath = join2(outputDir, "config.json");
+              const outputConfig = await readJSONFile(outputConfigPath);
+              if (outputConfig instanceof CantParseJSONFile) {
+                throw outputConfig;
+              }
+              if (hasNonEmptyObject(outputConfig?.experimentalServices) && !hasNonEmptyObject(buildOutputConfig.experimentalServices)) {
+                buildOutputConfig.experimentalServices = outputConfig.experimentalServices;
+                await import_fs_extra2.default.writeJSON(buildOutputConfigPath, buildOutputConfig, {
+                  spaces: 2
+                });
+              }
+            }
+            if (buildOutputConfig.overrides) {
+              overrides.push(buildOutputConfig.overrides);
+            }
+            if (getHasDetectedServices() && service && Array.isArray(buildOutputConfig.routes) && detectedServices) {
+              buildOutputConfig.routes = scopeRoutesToServiceOwnership({
+                routes: buildOutputConfig.routes,
+                owner: service,
+                allServices: detectedServices
+              });
+            }
+            mergedBuildResult = buildOutputConfig;
+          }
+        }
+        buildResults.set(build, mergedBuildResult);
+        executedBuilds.push(build);
+        let buildOutputLength = 0;
+        if ("output" in buildResult) {
+          buildOutputLength = Array.isArray(buildResult.output) ? buildResult.output.length : 1;
+        }
+        ops.push(
+          builderSpan.child("vc.builder.writeBuildResult", {
+            buildOutputLength: String(buildOutputLength)
+          }).trace(
+            () => writeBuildResult({
+              repoRootPath,
+              outputDir,
+              buildResult: rawBuildResult,
+              build,
+              builder,
+              builderPkg,
+              vercelConfig: localConfig,
+              standalone,
+              workPath: buildWorkPath,
+              service,
+              stripServiceRoutePrefix
+            })
+          ).then(
+            (override) => {
+              if (override)
+                overrides.push(override);
+            },
+            (err) => err
+          )
+        );
+      } catch (err) {
+        const buildJsonBuild = buildsJsonBuilds.get(build);
+        if (buildJsonBuild) {
+          buildJsonBuild.error = toEnumerableError(err);
+        }
+        throw err;
+      } finally {
+        ops.push(
+          download(diagnostics, join2(outputDir, "diagnostics")).then(
+            () => void 0,
+            (err) => err
+          )
+        );
       }
-      buildResults.set(build, mergedBuildResult);
-      let buildOutputLength = 0;
-      if ("output" in buildResult) {
-        buildOutputLength = Array.isArray(buildResult.output) ? buildResult.output.length : 1;
+    }
+  };
+  const flushOps = async () => {
+    const errors = await Promise.all(ops.splice(0));
+    for (const error of errors) {
+      if (error) {
+        throw error;
       }
-      ops.push(
-        builderSpan.child("vc.builder.writeBuildResult", {
-          buildOutputLength: String(buildOutputLength)
-        }).trace(
-          () => writeBuildResult({
-            repoRootPath,
-            outputDir,
-            buildResult: rawBuildResult,
-            build,
-            builder,
-            builderPkg,
-            vercelConfig: localConfig,
-            standalone,
-            workPath: buildWorkPath,
-            service,
-            stripServiceRoutePrefix
-          })
-        ).then(
-          (override) => {
-            if (override)
-              overrides.push(override);
-          },
-          (err) => err
-        )
+    }
+  };
+  const normalizeBuilderSrc = (src) => typeof src === "string" ? normalizePath(src).replace(/^\.\//, "") : void 0;
+  const getBuilderIdentity = (build) => {
+    const normalizedSrc = normalizeBuilderSrc(build.src);
+    return normalizedSrc ? `${build.use}:${normalizedSrc}` : void 0;
+  };
+  const getAlreadyExecutedBuild = (candidate) => {
+    const candidateIdentity = getBuilderIdentity(candidate);
+    if (!candidateIdentity)
+      return void 0;
+    return executedBuilds.find(
+      (build) => getBuilderIdentity(build) === candidateIdentity
+    );
+  };
+  const appendServiceRoutes = (services) => {
+    const serviceRoutes = (0, import_fs_detectors2.generateServicesRoutes)(services);
+    zeroConfigRoutes = (0, import_routing_utils2.appendRoutesToPhase)({
+      routes: zeroConfigRoutes,
+      newRoutes: serviceRoutes.hostRewrites.length ? serviceRoutes.hostRewrites : null,
+      phase: null
+    });
+    zeroConfigRoutes.push(
+      ...(0, import_routing_utils2.appendRoutesToPhase)({
+        routes: [],
+        newRoutes: [
+          ...serviceRoutes.rewrites,
+          ...serviceRoutes.workers,
+          ...serviceRoutes.crons
+        ],
+        phase: "filesystem"
+      })
+    );
+    zeroConfigRoutes.push(...serviceRoutes.defaults);
+    zeroConfigFallbackRoutes.push(...serviceRoutes.fallbacks);
+  };
+  await runBuilders(builds);
+  await flushOps();
+  if (!hasExperimentalServicesConfiguredInVercelConfig) {
+    const generatedConfigPath = join2(outputDir, "config.json");
+    const generatedConfig = await readJSONFile(generatedConfigPath);
+    if (generatedConfig instanceof CantParseJSONFile) {
+      throw generatedConfig;
+    }
+    if (hasNonEmptyObject(generatedConfig?.experimentalServices)) {
+      detectedExperimentalServicesConfig = generatedConfig.experimentalServices;
+      const generatedBuilders = await span.child("vc.detectGeneratedServices").trace(
+        () => (0, import_fs_detectors2.detectBuilders)(files, pkg, {
+          ...localConfig,
+          services: void 0,
+          experimentalServices: generatedConfig.experimentalServices,
+          projectSettings,
+          ignoreBuildScript: true,
+          featHandleMiss: true,
+          workPath
+        })
       );
-    } catch (err) {
-      const buildJsonBuild = buildsJsonBuilds.get(build);
-      if (buildJsonBuild) {
-        buildJsonBuild.error = toEnumerableError(err);
+      if (generatedBuilders.errors && generatedBuilders.errors.length > 0) {
+        throw generatedBuilders.errors[0];
+      }
+      for (const w of generatedBuilders.warnings) {
+        output_manager_default.warn(w.message, null, w.link, w.action || "Learn More");
+      }
+      detectedServices = generatedBuilders.services;
+      if (!detectedServices || detectedServices.length === 0) {
+        detectedServices = void 0;
+      } else {
+        appendServiceRoutes(detectedServices);
+      }
+      if (detectedServices && generatedBuilders.useImplicitEnvInjection) {
+        const serviceUrlEnvVars = getExperimentalServiceUrlEnvVars({
+          services: detectedServices,
+          frameworkList: import_frameworks2.frameworkList,
+          currentEnv: process.env,
+          deploymentUrl: process.env.VERCEL_URL
+        });
+        for (const [key, value] of Object.entries(serviceUrlEnvVars)) {
+          process.env[key] = value;
+          output_manager_default.debug(`Injected service URL env var: ${key}=${value}`);
+        }
+      }
+      const buildsToRun = [];
+      const seenBuildsToRun = /* @__PURE__ */ new Set();
+      for (const service of detectedServices || []) {
+        serviceByBuilder.set(service.builder, service);
+        const alreadyExecutedBuild = getAlreadyExecutedBuild(service.builder);
+        if (alreadyExecutedBuild) {
+          serviceByBuilder.set(alreadyExecutedBuild, service);
+          continue;
+        }
+        const serviceBuilderIdentity = getBuilderIdentity(service.builder);
+        if (serviceBuilderIdentity && !seenBuildsToRun.has(serviceBuilderIdentity)) {
+          seenBuildsToRun.add(serviceBuilderIdentity);
+          buildsToRun.push(service.builder);
+        }
+      }
+      if (buildsToRun.length > 0) {
+        await runBuilders(buildsToRun);
       }
-      throw err;
-    } finally {
-      ops.push(
-        download(diagnostics, join2(outputDir, "diagnostics")).then(
-          () => void 0,
-          (err) => err
-        )
-      );
     }
   }
   for (const entry of preDeployEntries) {
@@ -1434,14 +1576,9 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
     cleanupCorepack(corepackShimDir);
   }
   const collectSpan = span.child("vc.finalizeBuildOutput");
-  const errors = await Promise.all(ops);
-  for (const error of errors) {
-    if (error) {
-      throw error;
-    }
-  }
+  await flushOps();
   let needBuildsJsonOverride = false;
-  const speedInsightsVersion = await getInstalledPackageVersion2(
+  const speedInsightsVersion = await getInstalledPackageVersion(
     "@vercel/speed-insights"
   );
   if (speedInsightsVersion) {
@@ -1451,7 +1588,7 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
     };
     needBuildsJsonOverride = true;
   }
-  const webAnalyticsVersion = await getInstalledPackageVersion2("@vercel/analytics");
+  const webAnalyticsVersion = await getInstalledPackageVersion("@vercel/analytics");
   if (webAnalyticsVersion) {
     buildsJson.features = {
       ...buildsJson.features ?? {},
@@ -1495,7 +1632,7 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
     const build = b[0];
     const buildResult = b[1];
     let entrypoint = build.src;
-    if (hasDetectedServices && typeof build.src === "string") {
+    if (getHasDetectedServices() && typeof build.src === "string") {
       const service = serviceByBuilder.get(build);
       if (service && service.type === "web" && typeof service.routePrefix === "string") {
         entrypoint = getServicesMergeEntrypoint(service, build.src);
@@ -1562,7 +1699,10 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
     overrides: mergedOverrides,
     framework,
     crons: mergedCrons,
-    ...detectedServices && detectedServices.length > 0 && { services: detectedServices },
+    ...detectedExperimentalServicesConfig && Object.keys(detectedExperimentalServicesConfig).length > 0 && {
+      experimentalServices: detectedExperimentalServicesConfig
+    },
+    ...!detectedExperimentalServicesConfig && detectedServices && detectedServices.length > 0 && { services: detectedServices },
     ...mergedDeploymentId && { deploymentId: mergedDeploymentId }
   };
   await import_fs_extra2.default.writeJSON(join2(outputDir, "config.json"), config, { spaces: 2 });