vercel 53.4.0 → 54.1.0

package/dist/commands/build/index.js

@@ -11,35 +11,34 @@ import {
   isLambda,
   staticFiles,
   writeBuildResult
-} from "../../chunks/chunk-CMAHZSFA.js";
+} from "../../chunks/chunk-PNA7EZB2.js";
 import {
   require_semver
 } from "../../chunks/chunk-IB5L4LKZ.js";
 import {
   pullCommandLogic
-} from "../../chunks/chunk-PU7YKGJI.js";
-import {
-  pickOverrides,
-  readProjectSettings
-} from "../../chunks/chunk-54T7XV3H.js";
+} from "../../chunks/chunk-FXOKKAK2.js";
 import {
   AGENT_REASON,
   AGENT_STATUS
 } from "../../chunks/chunk-E3NE4SKN.js";
+import {
+  pickOverrides,
+  readProjectSettings
+} from "../../chunks/chunk-LVUE7LLE.js";
 import {
   ua_default
-} from "../../chunks/chunk-WOWCXMTU.js";
-import "../../chunks/chunk-ZY4YCCXG.js";
-import "../../chunks/chunk-5HTDIHTQ.js";
-import "../../chunks/chunk-6EI6XOUG.js";
-import "../../chunks/chunk-KTULXE6M.js";
+} from "../../chunks/chunk-76ZNZKIN.js";
+import "../../chunks/chunk-N733ZD4W.js";
+import "../../chunks/chunk-N4WFAZKO.js";
+import "../../chunks/chunk-UTXSTM52.js";
+import "../../chunks/chunk-4VPRHRPA.js";
 import {
   buildCommand
-} from "../../chunks/chunk-6447C5WV.js";
+} from "../../chunks/chunk-ZKKIBUCU.js";
 import {
   help
-} from "../../chunks/chunk-IS56OO2J.js";
-import "../../chunks/chunk-KSIISCB2.js";
+} from "../../chunks/chunk-MMF4BVAP.js";
 import {
   DEFAULT_VERCEL_CONFIG_FILENAME,
   VERCEL_DIR,
@@ -59,33 +58,36 @@ import {
   require_minimatch,
   resolveProjectCwd,
   validateConfig
-} from "../../chunks/chunk-LBP7YFBV.js";
+} from "../../chunks/chunk-X775BOSL.js";
 import {
   TelemetryClient
 } from "../../chunks/chunk-4OEA5ILS.js";
 import {
   outputAgentError
-} from "../../chunks/chunk-AXQNAI65.js";
+} from "../../chunks/chunk-ULXHXZCZ.js";
 import {
   stamp_default
 } from "../../chunks/chunk-CO5D46AG.js";
+import "../../chunks/chunk-N2T234LO.js";
+import "../../chunks/chunk-DKD6GTQT.js";
 import {
   getFlagsSpecification,
   getGlobalFlagsOnlyFromArgs,
   parseArguments,
   printError,
   toEnumerableError
-} from "../../chunks/chunk-GQLARSTH.js";
+} from "../../chunks/chunk-4GQQJY5Y.js";
 import {
   CantParseJSONFile,
   cmd,
   getCommandName,
   getCommandNamePlain,
-  init_pkg,
   packageName,
-  pkg_default,
   require_lib as require_lib2
-} from "../../chunks/chunk-EBEBY45K.js";
+} from "../../chunks/chunk-UGXBNJMO.js";
+import {
+  pkg_default
+} from "../../chunks/chunk-P4QNYOFB.js";
 import {
   emoji,
   output_manager_default,
@@ -117,6 +119,7 @@ import {
   getDiscontinuedNodeVersions,
   getInstalledPackageVersion,
   getServiceUrlEnvVars,
+  getExperimentalServiceUrlEnvVars,
   normalizePath,
   NowBuildError as NowBuildError2,
   runNpmInstall,
@@ -314,9 +317,6 @@ function sortBuilders(builds) {
   });
 }
 
-// src/commands/build/index.ts
-init_pkg();
-
 // src/util/telemetry/commands/build/index.ts
 var BuildTelemetryClient = class extends TelemetryClient {
   trackCliOptionOutput(path) {
@@ -858,8 +858,8 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
       builds = [{ src: "**", use: "@vercel/static" }];
     }
     detectedServices = detectedBuilders.services;
-    if (detectedServices && detectedServices.length > 0) {
-      const serviceUrlEnvVars = getServiceUrlEnvVars({
+    if (detectedBuilders.useImplicitEnvInjection && detectedServices && detectedServices.length > 0) {
+      const serviceUrlEnvVars = getExperimentalServiceUrlEnvVars({
         services: detectedServices,
         frameworkList: import_frameworks2.frameworkList,
         currentEnv: process.env,
@@ -945,6 +945,7 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
       serviceByBuilder.set(service.builder, service);
     }
   }
+  const preDeployEntries = [];
   for (const build of sortedBuilders) {
     if (typeof build.src !== "string")
       continue;
@@ -1013,6 +1014,7 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
             },
             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
@@ -1045,6 +1047,11 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
       });
       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,
@@ -1053,6 +1060,11 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
         config: buildConfig,
         meta,
         span: builderSpan,
+        ...preDeployCmd ? {
+          registerPreDeploy: (callback) => {
+            preDeployEntry.callback = callback;
+          }
+        } : void 0,
         ...service ? {
           service: {
             name: service.name,
@@ -1067,6 +1079,24 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
       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}`);
+        }
+      }
       let buildResult;
       let rawBuildResult;
       try {
@@ -1090,6 +1120,13 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
           }
         }
       } 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);
@@ -1292,6 +1329,15 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
       );
     }
   }
+  for (const entry of preDeployEntries) {
+    if (entry.callback) {
+      await entry.callback();
+    } else {
+      output_manager_default.warn(
+        `Service "${entry.service}" has a preDeployCommand but its builder does not support it. The command was not executed.`
+      );
+    }
+  }
   if (packageManifests.length > 0) {
     const projectManifest = {};
     for (const {

package/dist/commands/deploy/index.js

@@ -14,10 +14,10 @@ import {
   purchaseDomainIfAvailable,
   require_cjs,
   setupDomain
-} from "../../chunks/chunk-44EL4BJL.js";
+} from "../../chunks/chunk-V6RCNEUA.js";
 import {
   readLocalConfig
-} from "../../chunks/chunk-IVC36JQ5.js";
+} from "../../chunks/chunk-F2UPASLT.js";
 import {
   highlight
 } from "../../chunks/chunk-V5P25P7F.js";
@@ -28,7 +28,7 @@ import {
 import {
   getDeployment,
   mapCertError
-} from "../../chunks/chunk-X7KU44KR.js";
+} from "../../chunks/chunk-NYJXGEIR.js";
 import {
   validateJsonOutput
 } from "../../chunks/chunk-XPKWKPWA.js";
@@ -41,60 +41,62 @@ import {
   deprecatedArchiveSplitTgz,
   getCommandAliases,
   initSubcommand
-} from "../../chunks/chunk-SLWOG5CX.js";
-import "../../chunks/chunk-4LDQIDKG.js";
-import "../../chunks/chunk-NIOGCTVR.js";
-import "../../chunks/chunk-HAJ2XRTQ.js";
-import "../../chunks/chunk-GCKUEAUE.js";
-import "../../chunks/chunk-3NSIZGHP.js";
-import "../../chunks/chunk-JZLADLMF.js";
-import "../../chunks/chunk-73EVSBLA.js";
-import "../../chunks/chunk-ONYQGA2O.js";
-import {
-  pickOverrides
-} from "../../chunks/chunk-54T7XV3H.js";
+} from "../../chunks/chunk-UVFXUXOZ.js";
+import "../../chunks/chunk-IFATV36R.js";
+import "../../chunks/chunk-JFVGRFME.js";
+import "../../chunks/chunk-TZMIHH5D.js";
+import "../../chunks/chunk-XVAEOG4L.js";
+import "../../chunks/chunk-ZAAKSLHC.js";
+import "../../chunks/chunk-CQANJIEC.js";
+import "../../chunks/chunk-KWDV5FZH.js";
+import "../../chunks/chunk-4PSOOFYO.js";
 import {
   AGENT_STATUS
 } from "../../chunks/chunk-E3NE4SKN.js";
-import "../../chunks/chunk-WOWCXMTU.js";
+import {
+  pickOverrides
+} from "../../chunks/chunk-LVUE7LLE.js";
+import "../../chunks/chunk-76ZNZKIN.js";
 import {
   ensureLink
-} from "../../chunks/chunk-5HTDIHTQ.js";
+} from "../../chunks/chunk-N4WFAZKO.js";
 import {
   validatePaths,
   validateRootDirectory
-} from "../../chunks/chunk-6EI6XOUG.js";
-import "../../chunks/chunk-KTULXE6M.js";
-import "../../chunks/chunk-6447C5WV.js";
+} from "../../chunks/chunk-UTXSTM52.js";
+import "../../chunks/chunk-4VPRHRPA.js";
+import "../../chunks/chunk-ZKKIBUCU.js";
 import {
   help
-} from "../../chunks/chunk-IS56OO2J.js";
-import "../../chunks/chunk-KSIISCB2.js";
+} from "../../chunks/chunk-MMF4BVAP.js";
 import {
   compileVercelConfig,
   createGitMeta,
   param,
   parseEnv,
   parseTarget,
+  printAlignedLabel,
   require_dist as require_dist2,
   require_lib
-} from "../../chunks/chunk-LBP7YFBV.js";
+} from "../../chunks/chunk-X775BOSL.js";
 import {
   TelemetryClient
 } from "../../chunks/chunk-4OEA5ILS.js";
 import {
   outputAgentError
-} from "../../chunks/chunk-AXQNAI65.js";
+} from "../../chunks/chunk-ULXHXZCZ.js";
 import {
   require_ms,
   stamp_default
 } from "../../chunks/chunk-CO5D46AG.js";
+import "../../chunks/chunk-N2T234LO.js";
+import "../../chunks/chunk-DKD6GTQT.js";
 import {
   getCommandNameWithGlobalFlags,
   getFlagsSpecification,
   parseArguments,
   printError
-} from "../../chunks/chunk-GQLARSTH.js";
+} from "../../chunks/chunk-4GQQJY5Y.js";
 import {
   AliasDomainConfigured,
   BuildError,
@@ -120,7 +122,8 @@ import {
   getCommandName,
   isAPIError,
   require_bytes
-} from "../../chunks/chunk-EBEBY45K.js";
+} from "../../chunks/chunk-UGXBNJMO.js";
+import "../../chunks/chunk-P4QNYOFB.js";
 import {
   emoji,
   output_manager_default,
@@ -688,7 +691,7 @@ async function handleInitDeployment(client, telemetryClient) {
   const isV0 = cliMeta.v0 === "true";
   const link = await ensureLink("deploy", client, cwd, {
     autoConfirm,
-    setupMsg: "Set up and deploy",
+    setupMsg: "Set up",
     projectName: getProjectName({
       nameParam: void 0,
       nowConfig: localConfig,
@@ -848,7 +851,8 @@ async function handleInitDeployment(client, telemetryClient) {
       autoAssignCustomDomains,
       manual: true,
       jsonOutput: asJson,
-      functionsBeta: functionsBeta || void 0
+      functionsBeta: functionsBeta || void 0,
+      linkedProject: project
     };
     if (!localConfig.builds || localConfig.builds.length === 0) {
       createArgs.projectSettings = {
@@ -1179,7 +1183,7 @@ async function handleContinueSubcommand(client, telemetryClient) {
   let { path: cwd } = pathValidation;
   const link = await ensureLink("deploy", client, cwd, {
     autoConfirm: true,
-    setupMsg: "Set up and deploy",
+    setupMsg: "Set up",
     projectName: getProjectName({
       nameParam: void 0,
       nowConfig: localConfig,
@@ -1423,7 +1427,7 @@ async function handleDefaultDeploy(client, telemetryClient) {
   const isV0 = cliMeta.v0 === "true";
   const link = await ensureLink("deploy", client, cwd, {
     autoConfirm,
-    setupMsg: "Set up and deploy",
+    setupMsg: "Set up",
     projectName: getProjectName({
       nameParam: parsedArguments.flags["--name"],
       nowConfig: localConfig,
@@ -1629,7 +1633,8 @@ async function handleDefaultDeploy(client, telemetryClient) {
       autoAssignCustomDomains,
       agentName: client.agentName,
       jsonOutput: asJson,
-      functionsBeta: functionsBeta || void 0
+      functionsBeta: functionsBeta || void 0,
+      linkedProject: project
     };
     if (!localConfig.builds || localConfig.builds.length === 0) {
       createArgs.projectSettings = {
@@ -1800,7 +1805,7 @@ async function handleDefaultDeploy(client, telemetryClient) {
       }
       return 1;
     }
-    if (!noWait) {
+    if (!noWait && shouldReconcileFinalDeployment(deployment)) {
       await getDeployment(client, contextName, deployment.id);
     }
     if (deployment === null) {
@@ -2211,7 +2216,7 @@ async function handleContinueDeployment({
     error("Missing authentication token");
     return 1;
   }
-  output_manager_default.spinner(`Continuing deployment...`, 0);
+  output_manager_default.spinner(`Continuing deployment\u2026`, 0);
   try {
     let finalDeployment = null;
     for await (const event of (0, import_client3.continueDeployment)({
@@ -2232,7 +2237,7 @@ async function handleContinueDeployment({
       if (event.type === "file-count") {
         const { total, missing } = event.payload;
         output_manager_default.spinner(
-          `Uploading ${missing.length} of ${total.size} files...`,
+          `Uploading ${missing.length} of ${total.size} files\u2026`,
           0
         );
       }
@@ -2240,25 +2245,23 @@ async function handleContinueDeployment({
         debug(`Uploaded: ${event.payload.file.names.join(" ")}`);
       }
       if (event.type === "all-files-uploaded") {
-        output_manager_default.spinner("Continuing deployment...", 0);
+        output_manager_default.spinner("Continuing deployment\u2026", 0);
       }
       if (event.type === "created") {
         finalDeployment = event.payload;
         output_manager_default.stopSpinner();
         if (finalDeployment.inspectorUrl) {
-          output_manager_default.print(
-            prependEmoji(
-              `Inspect: ${import_chalk.default.bold(finalDeployment.inspectorUrl)} ${deployStamp()}`,
-              emoji("inspect")
-            ) + "\n"
+          printAlignedLabel(
+            "Inspect",
+            import_chalk.default.cyan(finalDeployment.inspectorUrl)
           );
         }
+        const isProdDeployment = finalDeployment.target === "production";
         const previewUrl = `https://${finalDeployment.url}`;
-        output_manager_default.print(
-          prependEmoji(
-            `Preview: ${import_chalk.default.bold(previewUrl)} ${deployStamp()}`,
-            emoji("success")
-          ) + "\n"
+        printAlignedLabel(
+          isProdDeployment ? "Production" : "Preview",
+          import_chalk.default.cyan(previewUrl),
+          isProdDeployment ? { gutter: "\u25B2" } : {}
         );
         if (noWait) {
           return printDeploymentStatus(
@@ -2269,10 +2272,10 @@ async function handleContinueDeployment({
             false
           );
         }
-        output_manager_default.spinner("Building...", 0);
+        output_manager_default.spinner("Building\u2026", 0);
       }
       if (event.type === "building") {
-        output_manager_default.spinner("Building...", 0);
+        output_manager_default.spinner("Building\u2026", 0);
       }
       if (event.type === "ready") {
         finalDeployment = event.payload;
@@ -2284,12 +2287,7 @@ async function handleContinueDeployment({
         if (finalDeployment.target === "production" && finalDeployment.alias && finalDeployment.alias.length > 0) {
           const primaryDomain = finalDeployment.alias[0];
           const prodUrl = `https://${primaryDomain}`;
-          output_manager_default.print(
-            prependEmoji(
-              `Production: ${import_chalk.default.bold(prodUrl)} ${deployStamp()}`,
-              emoji("link")
-            ) + "\n"
-          );
+          printAlignedLabel("Aliased", import_chalk.default.cyan(prodUrl), { gutter: "\u25B2" });
         }
       }
       if (event.type === "checks-v2-failed") {
@@ -2337,6 +2335,21 @@ function getDeploymentOutputJson(deployment, apiUrl, error) {
     ...error ? { error } : {}
   };
 }
+function shouldReconcileFinalDeployment(deployment) {
+  if (!deployment) {
+    return false;
+  }
+  if (deployment.readyState !== "READY") {
+    return true;
+  }
+  if (deployment.aliasError || !deployment.aliasAssigned) {
+    return true;
+  }
+  if (deployment.checksConclusion === "failed" || deployment.checks?.["deployment-alias"]?.state === "failed") {
+    return true;
+  }
+  return false;
+}
 async function handleFailedCheckRuns(client, deployment, asJson) {
   const { runs } = await getDeploymentCheckRuns(client, deployment.id);
   const failedRuns = (runs ?? []).filter((run) => run.conclusion === "failed");