vercel 54.9.0 → 54.10.0

package/dist/chunks/{add-PFVGXHF2.js → add-5DY5F6KR.js}

@@ -9,8 +9,8 @@ import {
   handleRulesApiError,
   parseRulesFlagsAndScope,
   rulesCollectionPath
-} from "./chunk-BLSNH6GW.js";
-import "./chunk-RM5VGLCD.js";
+} from "./chunk-3QEUKH37.js";
+import "./chunk-LFHOOCSD.js";
 import "./chunk-5SYDEK2N.js";
 import {
   validateJsonOutput
@@ -21,9 +21,9 @@ import {
 import {
   AGENT_REASON
 } from "./chunk-LJ5WXXG6.js";
-import "./chunk-XK2FJELV.js";
-import "./chunk-CNZVD6AY.js";
-import "./chunk-DPXUXH7G.js";
+import "./chunk-J763BFOA.js";
+import "./chunk-GSR2GQLJ.js";
+import "./chunk-J5273CSE.js";
 import {
   buildCommandWithGlobalFlags,
   outputAgentError

package/dist/chunks/{chunk-BLSNH6GW.js → chunk-3QEUKH37.js}

@@ -6,7 +6,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   resolveAlertsScope
-} from "./chunk-RM5VGLCD.js";
+} from "./chunk-LFHOOCSD.js";
 import {
   handleValidationError,
   outputError,

package/dist/chunks/{chunk-ZEG75UDS.js → chunk-6B7TYTF6.js}

@@ -9,7 +9,7 @@ import {
   printIndications,
   require_dist as require_dist2,
   sleep
-} from "./chunk-3XKN4LMN.js";
+} from "./chunk-R3OUWO35.js";
 import {
   suggestNextCommands
 } from "./chunk-LKBI43XK.js";
@@ -19,10 +19,10 @@ import {
 } from "./chunk-TCF6MGBY.js";
 import {
   CommandTimeout
-} from "./chunk-2LJ4CNBS.js";
+} from "./chunk-SHWTWKFP.js";
 import {
   getScope
-} from "./chunk-XK2FJELV.js";
+} from "./chunk-J763BFOA.js";
 import {
   getProjectByNameOrId,
   param,
@@ -31,7 +31,7 @@ import {
   require_pluralize,
   showPluginTipIfNeeded,
   ua_default
-} from "./chunk-CNZVD6AY.js";
+} from "./chunk-GSR2GQLJ.js";
 import {
   require_ms,
   stamp_default

package/dist/chunks/{chunk-MHQ3YMRD.js → chunk-6ESIT3CL.js}

@@ -6,7 +6,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   require_lib
-} from "./chunk-CNZVD6AY.js";
+} from "./chunk-GSR2GQLJ.js";
 import {
   packageName
 } from "./chunk-LN6B7ZI3.js";

package/dist/chunks/{chunk-2KRTC3Z6.js → chunk-6UWHSMGM.js}

@@ -7,12 +7,12 @@ const __dirname = __dirname_(__filename);
 import {
   printProjectNotFoundError,
   setupAndLink
-} from "./chunk-27O5ZTLD.js";
+} from "./chunk-YSBVITVJ.js";
 import {
   getLinkedProject,
   param,
   resolveProjectCwd
-} from "./chunk-CNZVD6AY.js";
+} from "./chunk-GSR2GQLJ.js";
 import {
   buildCommandWithYes,
   outputActionRequired

package/dist/chunks/{chunk-PQ6FQ427.js → chunk-7V42ARD4.js}

@@ -6,16 +6,16 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   writeProjectSettings
-} from "./chunk-FRCPMIYP.js";
+} from "./chunk-PAB6JAI7.js";
 import {
   ensureLink
-} from "./chunk-2KRTC3Z6.js";
+} from "./chunk-6UWHSMGM.js";
 import {
   pullCommand
-} from "./chunk-QED7VSDY.js";
+} from "./chunk-GPBBIDQ5.js";
 import {
   help
-} from "./chunk-5ZJHY4AC.js";
+} from "./chunk-VNUNCNPE.js";
 import {
   VERCEL_DIR,
   VERCEL_DIR_PROJECT,
@@ -23,10 +23,10 @@ import {
   envPullCommandLogic,
   humanizePath,
   parseTarget
-} from "./chunk-CNZVD6AY.js";
+} from "./chunk-GSR2GQLJ.js";
 import {
   TelemetryClient
-} from "./chunk-DPXUXH7G.js";
+} from "./chunk-J5273CSE.js";
 import {
   stamp_default
 } from "./chunk-CO5D46AG.js";

package/dist/chunks/{chunk-5QPKXSAQ.js → chunk-ERHL5CQY.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-IB5L4LKZ.js";
 import {
   require_execa
-} from "./chunk-BBJUIDZF.js";
+} from "./chunk-YI3JV6GM.js";
 import {
   VERCEL_DIR,
   readJSONFile,
@@ -18,7 +18,7 @@ import {
   require_lib,
   require_minimatch,
   require_pluralize
-} from "./chunk-CNZVD6AY.js";
+} from "./chunk-GSR2GQLJ.js";
 import {
   CantParseJSONFile,
   cmd,
@@ -11227,6 +11227,7 @@ import {
   normalizePath,
   isBackendBuilder,
   isExperimentalBackendsEnabled,
+  isExperimentalService,
   isExternalSymlink
 } from "@vercel/build-utils";
 
@@ -11355,6 +11356,12 @@ function getExtractedMode(entryMode, isDir) {
 var import_client2 = __toESM(require_dist2(), 1);
 var { normalize } = posix;
 var OUTPUT_DIR = join4(VERCEL_DIR, "output");
+var BUILD_OUTPUT_API_ENTRIES = [
+  "config.json",
+  "functions",
+  "routes",
+  "static"
+];
 async function writeBuildResult(args) {
   const {
     repoRootPath,
@@ -11367,8 +11374,10 @@ async function writeBuildResult(args) {
     standalone,
     workPath,
     service,
+    nestServiceOutput = false,
     stripServiceRoutePrefix = false
   } = args;
+  const writeOutputDir = service && nestServiceOutput ? getServiceOutputDir(outputDir, service) : outputDir;
   let version2;
   let actualResult;
   if (builder.version === -1) {
@@ -11382,25 +11391,27 @@ async function writeBuildResult(args) {
   if (typeof version2 !== "number" || version2 === 2) {
     return writeBuildResultV2({
       repoRootPath,
-      outputDir,
+      outputDir: writeOutputDir,
       buildResult: actualResult,
       build: build2,
       vercelConfig,
       standalone,
       workPath,
       service,
+      rootOutputDir: outputDir,
       stripServiceRoutePrefix
     });
   } else if (version2 === 3) {
     return writeBuildResultV3({
       repoRootPath,
-      outputDir,
+      outputDir: writeOutputDir,
       buildResult: actualResult,
       build: build2,
       vercelConfig,
       standalone,
       workPath,
       service,
+      rootOutputDir: outputDir,
       stripServiceRoutePrefix
     });
   }
@@ -11441,6 +11452,17 @@ function injectServiceEnvVars(lambda, service, stripServiceRoutePrefix = false)
 function stripDuplicateSlashes(path2) {
   return normalize(path2).replace(/(^\/|\/$)/g, "");
 }
+function getServiceOutputDir(outputDir, service) {
+  return join4(outputDir, "services", service.name);
+}
+async function relocateRootBuildOutputToService(args) {
+  const { outputDir, service, workPath } = args;
+  await relocateBuildOutputApiEntries(
+    outputDir,
+    getServiceOutputDir(outputDir, service),
+    workPath
+  );
+}
 async function writeBuildResultV2(args) {
   const {
     repoRootPath,
@@ -11451,10 +11473,11 @@ async function writeBuildResultV2(args) {
     standalone,
     workPath,
     service,
+    rootOutputDir,
     stripServiceRoutePrefix
   } = args;
   if ("buildOutputPath" in buildResult) {
-    await mergeBuilderOutput(outputDir, buildResult, workPath);
+    await mergeBuilderOutput(outputDir, buildResult, workPath, rootOutputDir);
     return;
   }
   if (!buildResult.output) {
@@ -11469,7 +11492,11 @@ async function writeBuildResultV2(args) {
   for (const [path2, output] of Object.entries(buildResult.output)) {
     const normalizedPath = stripDuplicateSlashes(path2);
     if (isLambda(output)) {
-      injectServiceEnvVars(output, service, stripServiceRoutePrefix);
+      injectServiceEnvVars(
+        output,
+        service && isExperimentalService(service) ? service : void 0,
+        stripServiceRoutePrefix
+      );
       await writeLambda(
         repoRootPath,
         outputDir,
@@ -11565,6 +11592,7 @@ async function writeBuildResultV3(args) {
     standalone,
     workPath,
     service,
+    rootOutputDir,
     stripServiceRoutePrefix
   } = args;
   const { output } = buildResult;
@@ -11595,6 +11623,7 @@ async function writeBuildResultV3(args) {
           standalone,
           workPath,
           service,
+          rootOutputDir,
           stripServiceRoutePrefix
         });
       } catch (error) {
@@ -11611,6 +11640,7 @@ async function writeBuildResultV3(args) {
         standalone,
         workPath,
         service,
+        rootOutputDir,
         stripServiceRoutePrefix
       });
     }
@@ -11628,7 +11658,11 @@ async function writeBuildResultV3(args) {
     build2.config?.zeroConfig ? src.substring(0, src.length - ext.length) : src
   );
   if (isLambda(output)) {
-    injectServiceEnvVars(output, service, stripServiceRoutePrefix);
+    injectServiceEnvVars(
+      output,
+      service && isExperimentalService(service) ? service : void 0,
+      stripServiceRoutePrefix
+    );
     await writeLambda(
       repoRootPath,
       outputDir,
@@ -11812,8 +11846,9 @@ async function writeLambda(repoRootPath, outputDir, lambda, path2, functionConfi
     }
   }
 }
-async function mergeBuilderOutput(outputDir, buildResult, workPath) {
+async function mergeBuilderOutput(outputDir, buildResult, workPath, rootOutputDir) {
   const absOutputDir = resolve2(outputDir);
+  const absRootOutputDir = resolve2(rootOutputDir);
   const { ig } = await (0, import_client2.getVercelIgnore)(workPath);
   const filter = ig.createFilter();
   if (absOutputDir === buildResult.buildOutputPath) {
@@ -11826,6 +11861,10 @@ async function mergeBuilderOutput(outputDir, buildResult, workPath) {
     }
     return;
   }
+  if (resolve2(buildResult.buildOutputPath) === absRootOutputDir) {
+    await relocateBuildOutputApiEntries(rootOutputDir, outputDir, workPath);
+    return;
+  }
   const ignoreFilter = (path2) => {
     const normalizedPath = path2.replace(/\\/g, "/");
     if (normalizedPath.startsWith("static/")) {
@@ -11835,6 +11874,24 @@ async function mergeBuilderOutput(outputDir, buildResult, workPath) {
   };
   await merge(buildResult.buildOutputPath, outputDir, ignoreFilter);
 }
+async function relocateBuildOutputApiEntries(rootOutputDir, outputDir, workPath) {
+  const { ig } = await (0, import_client2.getVercelIgnore)(workPath);
+  const filter = ig.createFilter();
+  await import_fs_extra5.default.mkdirp(outputDir);
+  await Promise.all(
+    BUILD_OUTPUT_API_ENTRIES.map(async (entry) => {
+      const src = join4(rootOutputDir, entry);
+      if (!await import_fs_extra5.default.pathExists(src))
+        return;
+      const dest = join4(outputDir, entry);
+      if (entry === "static") {
+        await merge(src, dest, (path2) => filter(path2));
+      } else {
+        await merge(src, dest);
+      }
+    })
+  );
+}
 async function cleanIgnoredFiles(dir, staticRoot, filter) {
   const entries = await import_fs_extra5.default.readdir(dir);
   await Promise.all(
@@ -11897,6 +11954,15 @@ async function* findDirs(name, dir, root = dir) {
     }
   }
 }
+function stripParentSegments(path2) {
+  const normalized = normalizePath(path2);
+  const segments = normalized.split("/");
+  let i = 0;
+  while (i < segments.length && segments[i] === "..") {
+    i++;
+  }
+  return segments.slice(i).join("/");
+}
 function filesWithoutFsRefs(files, repoRootPath, sharedDest, standalone) {
   let filePathMap;
   const out = {};
@@ -11909,9 +11975,10 @@ function filesWithoutFsRefs(files, repoRootPath, sharedDest, standalone) {
         if (isExternalSymlink(file)) {
           continue;
         }
-        shared[path2] = file;
-        filePathMap[normalizePath(path2)] = normalizePath(
-          relative2(repoRootPath, join4(sharedDest, path2))
+        const funcPath = stripParentSegments(path2);
+        shared[funcPath] = file;
+        filePathMap[funcPath] = normalizePath(
+          relative2(repoRootPath, join4(sharedDest, funcPath))
         );
       } else {
         filePathMap[normalizePath(path2)] = normalizePath(
@@ -11933,7 +12000,8 @@ export {
   getStaticServiceSchedules,
   OUTPUT_DIR,
   writeBuildResult,
-  isLambda
+  isLambda,
+  relocateRootBuildOutputToService
 };
 /*! Bundled license information:
 

package/dist/chunks/{chunk-QED7VSDY.js → chunk-GPBBIDQ5.js}

@@ -6,7 +6,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   getEnvTargetPlaceholder
-} from "./chunk-CNZVD6AY.js";
+} from "./chunk-GSR2GQLJ.js";
 import {
   projectOption,
   yesOption