vercel 53.4.0 → 54.1.0

package/dist/chunks/{chunk-6EI6XOUG.js → chunk-UTXSTM52.js}

@@ -6,10 +6,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   getLocalPathConfig
-} from "./chunk-KTULXE6M.js";
-import {
-  table
-} from "./chunk-KSIISCB2.js";
+} from "./chunk-4VPRHRPA.js";
 import {
   VERCEL_DIR_PROJECT,
   VERCEL_DIR_README,
@@ -42,15 +39,18 @@ import {
   selectAndParseRemoteUrl,
   selectOrg,
   writeServicesConfig
-} from "./chunk-LBP7YFBV.js";
+} from "./chunk-X775BOSL.js";
+import {
+  table
+} from "./chunk-DKD6GTQT.js";
 import {
   printError
-} from "./chunk-GQLARSTH.js";
+} from "./chunk-4GQQJY5Y.js";
 import {
   CantParseJSONFile,
   ProjectNotFound,
   isAPIError
-} from "./chunk-EBEBY45K.js";
+} from "./chunk-UGXBNJMO.js";
 import {
   output_manager_default
 } from "./chunk-ZQKJVHXY.js";
@@ -284,6 +284,7 @@ function displayServiceErrors(errors) {
 // src/util/link/setup-and-link.ts
 var import_chalk6 = __toESM(require_source(), 1);
 var import_fs_extra2 = __toESM(require_lib(), 1);
+var import_fs_detectors2 = __toESM(require_dist(), 1);
 import { join as join2, basename } from "path";
 
 // src/util/input/input-project.ts
@@ -324,7 +325,7 @@ async function inputProject(client, org, detectedProjectName, autoConfirm = fals
   } else {
     if (await client.input.confirm(
       `Found project ${import_chalk2.default.cyan(
-        `\u201C${org.slug}/${detectedProject.name}\u201D`
+        `"${org.slug}/${detectedProject.name}"`
       )}. Link to it?`,
       true
     )) {
@@ -346,7 +347,7 @@ async function inputProject(client, org, detectedProjectName, autoConfirm = fals
     } else if (hasMoreProjects) {
       let toLink;
       await client.input.text({
-        message: "What's the name of your existing project?",
+        message: "Existing project name?",
         validate: async (val) => {
           if (!val) {
             return "Project name cannot be empty";
@@ -373,7 +374,7 @@ async function inputProject(client, org, detectedProjectName, autoConfirm = fals
     }
   }
   return await client.input.text({
-    message: `What\u2019s your project\u2019s name?`,
+    message: `Name?`,
     default: !detectedProject ? slugifiedName : void 0,
     validate: async (val) => {
       if (!val) {
@@ -460,14 +461,14 @@ async function editProjectSettings(client, projectSettings, framework, autoConfi
       if (localConfigValue)
         settings[setting] = localConfigValue;
     }
-    output_manager_default.print(`Local settings detected in ${configFileName}:
+    output_manager_default.print(`  Local settings detected in ${configFileName}:
 `);
     for (const setting of settingKeys) {
       const override = localConfigurationOverrides[setting];
       if (override) {
         output_manager_default.print(
-          `${import_chalk4.default.dim(
-            `- ${import_chalk4.default.bold(`${settingMap[setting]}:`)} ${override}`
+          `  ${import_chalk4.default.dim(
+            `${import_chalk4.default.bold(`${settingMap[setting]}:`)} ${override}`
           )}
 `
         );
@@ -480,7 +481,7 @@ async function editProjectSettings(client, projectSettings, framework, autoConfi
       if (overrideFramework) {
         framework = overrideFramework;
         output_manager_default.print(
-          `Merging default Project Settings for ${framework.name}. Previously listed overrides are prioritized.
+          `  Merging default Project Settings for ${framework.name}. Previously listed overrides are prioritized.
 `
         );
       }
@@ -490,22 +491,21 @@ async function editProjectSettings(client, projectSettings, framework, autoConfi
     settings.framework = null;
     return settings;
   }
-  const styledFramework = (frameworkName) => {
-    const frameworkStyle = {
-      text: frameworkName,
-      color: import_chalk4.default.blue
-    };
-    if (frameworkName === "Hono") {
-      frameworkStyle.text = "\u{1F525} Hono";
-      frameworkStyle.color = import_chalk4.default.hex("#FFA500");
-    }
-    return import_chalk4.default.bold(frameworkStyle.color(frameworkStyle.text));
-  };
-  output_manager_default.log(
-    !framework.slug ? `No framework detected. Default Project Settings:
-` : `Auto-detected Project Settings for ${styledFramework(framework.name)}
-`
-  );
+  if (!framework.slug) {
+    output_manager_default.print(`  No framework detected. Default Project Settings:
+`);
+  } else {
+    const buildCmd = framework.settings.buildCommand?.value ?? null;
+    const outputSetting = framework.settings.outputDirectory;
+    const outputDir = outputSetting ? isSettingValue(outputSetting) ? outputSetting.value : outputSetting.placeholder : null;
+    const inline = [
+      buildCmd ? `${settingMap.buildCommand}: ${buildCmd}` : null,
+      outputDir ? `${settingMap.outputDirectory}: ${outputDir}` : null
+    ].filter(Boolean);
+    const detail = inline.length ? import_chalk4.default.dim(` (${inline.join(", ")})`) : "";
+    output_manager_default.print(`  ${import_chalk4.default.bold("Detected")} ${framework.name}${detail}
+`);
+  }
   settings.framework = framework.slug;
   if (!framework.slug) {
     for (const setting of settingKeys) {
@@ -516,15 +516,15 @@ async function editProjectSettings(client, projectSettings, framework, autoConfi
       const override = localConfigurationOverrides?.[setting];
       if (!override && defaultSetting) {
         output_manager_default.print(
-          `${import_chalk4.default.dim(
-            `- ${import_chalk4.default.bold(`${settingMap[setting]}:`)} ${isSettingValue(defaultSetting) ? defaultSetting.value : import_chalk4.default.italic(`${defaultSetting.placeholder}`)}`
+          `  ${import_chalk4.default.dim(
+            `${import_chalk4.default.bold(`${settingMap[setting]}:`)} ${isSettingValue(defaultSetting) ? defaultSetting.value : import_chalk4.default.italic(`${defaultSetting.placeholder}`)}`
           )}
 `
         );
       }
     }
   }
-  if (autoConfirm || !await client.input.confirm("Want to modify these settings?", false)) {
+  if (autoConfirm || !await client.input.confirm("Customize settings?", false)) {
     return settings;
   }
   const choices = settingKeys.reduce(
@@ -543,7 +543,7 @@ async function editProjectSettings(client, projectSettings, framework, autoConfi
   for (const setting of settingFields) {
     const field = settingMap[setting];
     settings[setting] = await client.input.text({
-      message: `What's your ${import_chalk4.default.bold(field)}?`
+      message: `${import_chalk4.default.bold(field)}?`
     });
   }
   return settings;
@@ -594,7 +594,7 @@ async function getServicesSetupState(workPath) {
   const detectServicesResult = await (0, import_fs_detectors.detectServices)({
     fs: new import_fs_detectors.LocalFileSystemDetector(workPath)
   });
-  const hasConfiguredServices = detectServicesResult.resolved.source === "configured";
+  const hasConfiguredServices = detectServicesResult.resolved?.source === "configured";
   const inferredServices = hasConfiguredServices ? null : detectServicesResult.inferred;
   const inferredServicesWriteBlocker = inferredServices ? await getServicesConfigWriteBlocker(workPath, inferredServices.config) : null;
   return {
@@ -700,7 +700,8 @@ async function promptForInferredServicesSetup({
     workPath,
     inferred.config
   );
-  output_manager_default.log(`Added services configuration to ${configFileName}.`);
+  output_manager_default.print(`  Added services configuration to ${configFileName}.
+`);
   return { type: "services" };
 }
 
@@ -859,7 +860,7 @@ function formatMatchReason(match) {
   return import_chalk6.default.gray("(folder name)");
 }
 function formatCrossTeamMatch(match) {
-  return `${import_chalk6.default.blue(match.org.slug)}/${match.project.name} ${formatMatchReason(
+  return `${import_chalk6.default.bold(match.org.slug)}/${match.project.name} ${formatMatchReason(
     match
   )}`;
 }
@@ -873,14 +874,48 @@ function printCrossTeamSearchScope({
   skippedLimitedTeamSlugs
 }) {
   if (searchedTeamSlugs.length > 0) {
-    output_manager_default.log(`Searched teams: ${formatTeamList(searchedTeamSlugs)}`);
+    output_manager_default.print(`  Searched teams: ${formatTeamList(searchedTeamSlugs)}
+`);
   }
   if (skippedLimitedTeamSlugs.length > 0) {
-    output_manager_default.log(
-      `Skipped ${skippedLimitedTeamSlugs.length} SSO-protected ${skippedLimitedTeamSlugs.length === 1 ? "team" : "teams"}`
+    output_manager_default.print(
+      `  Skipped ${skippedLimitedTeamSlugs.length} SSO-protected ${skippedLimitedTeamSlugs.length === 1 ? "team" : "teams"}
+`
     );
   }
 }
+function isErrnoException(err) {
+  return err instanceof Error && typeof err.code === "string";
+}
+async function hasWorkspaces(cwd) {
+  try {
+    const fs = new import_fs_detectors2.LocalFileSystemDetector(cwd);
+    const workspaces = await (0, import_fs_detectors2.getWorkspaces)({ fs });
+    return workspaces.length > 0;
+  } catch (err) {
+    if (isErrnoException(err) && err.code && ["ENOENT", "EACCES", "ENOTDIR"].includes(err.code)) {
+      output_manager_default.debug(`getWorkspaces failed for ${cwd}: ${err}`);
+      return false;
+    }
+    throw err;
+  }
+}
+async function shouldPromptForRootDirectory(opts) {
+  if (opts.servicesChoice?.type === "project-directory") {
+    return true;
+  }
+  if (await hasWorkspaces(opts.path)) {
+    return true;
+  }
+  try {
+    const detected = await detectProjects(opts.path);
+    const frameworksAtRoot = detected.get("") ?? [];
+    return frameworksAtRoot.length === 0;
+  } catch (err) {
+    output_manager_default.debug(`detectProjects failed at root: ${err}`);
+    return true;
+  }
+}
 async function maybePullEnvAfterLink(client, path2, autoConfirm, pullEnv) {
   if (!pullEnv || !client.stdin.isTTY || client.nonInteractive) {
     return;
@@ -1107,15 +1142,11 @@ async function setupAndLink(client, path2, {
   if (!isTTY && !autoConfirm && !nonInteractive) {
     return { status: "error", exitCode: 1, reason: "HEADLESS" };
   }
-  const shouldStartSetup = autoConfirm || nonInteractive || await client.input.confirm(
-    `${setupMsg} ${import_chalk6.default.cyan(`\u201C${humanizePath(path2)}\u201D`)}?`,
-    true
+  output_manager_default.print(
+    `
+  ${import_chalk6.default.bold(setupMsg)} ${import_chalk6.default.dim(`"${humanizePath(path2)}"`)}
+`
   );
-  if (!shouldStartSetup) {
-    output_manager_default.print(`Canceled. Project not set up.
-`);
-    return { status: "not_linked", org: null, project: null };
-  }
   let skipAutoDetect = false;
   if (searchAcrossTeams) {
     let crossTeamMatches = [];
@@ -1163,8 +1194,9 @@ async function setupAndLink(client, path2, {
     }
     if (!autoConfirm && !nonInteractive && skippedLimitedTeams.length > 0) {
       if (crossTeamMatches.length === 0) {
-        output_manager_default.log(
-          `No matching projects found in the ${searchedTeamSlugs.length} ${searchedTeamSlugs.length === 1 ? "team" : "teams"} available in your current session.`
+        output_manager_default.print(
+          `  No matching projects found in the ${searchedTeamSlugs.length} ${searchedTeamSlugs.length === 1 ? "team" : "teams"} available in your current session.
+`
         );
       }
       const limitedTeamMatches = await searchSelectedLimitedTeams({
@@ -1187,8 +1219,8 @@ async function setupAndLink(client, path2, {
         return linkedLimitedMatch;
       }
       if (limitedTeamMatches.length === 0) {
-        output_manager_default.log(
-          "No matching projects found in the selected SSO-protected teams."
+        output_manager_default.print(
+          "  No matching projects found in the selected SSO-protected teams.\n"
         );
       }
       skipAutoDetect = skipAutoDetect || crossTeamMatches.length > 0 || limitedTeamMatches.length > 0;
@@ -1197,11 +1229,7 @@ async function setupAndLink(client, path2, {
     }
   }
   try {
-    org = await selectOrg(
-      client,
-      "Which scope should contain your project?",
-      autoConfirm
-    );
+    org = await selectOrg(client, "Which team?", autoConfirm);
   } catch (err) {
     if (isAPIError(err)) {
       if (err.code === "NOT_AUTHORIZED") {
@@ -1283,13 +1311,19 @@ async function setupAndLink(client, path2, {
           rootInferredServicesChoice.selectedPath
         );
       } else {
-        rootDirectory = await inputRootDirectory(client, path2, autoConfirm);
-        if (rootDirectory && !await validateRootDirectory(path2, join2(path2, rootDirectory))) {
-          return {
-            status: "error",
-            exitCode: 1,
-            reason: "INVALID_ROOT_DIRECTORY"
-          };
+        const shouldPromptRoot = await shouldPromptForRootDirectory({
+          path: path2,
+          servicesChoice: rootInferredServicesChoice
+        });
+        if (shouldPromptRoot) {
+          rootDirectory = await inputRootDirectory(client, path2, autoConfirm);
+          if (rootDirectory && !await validateRootDirectory(path2, join2(path2, rootDirectory))) {
+            return {
+              status: "error",
+              exitCode: 1,
+              reason: "INVALID_ROOT_DIRECTORY"
+            };
+          }
         }
       }
       pathWithRootDirectory = rootDirectory ? join2(path2, rootDirectory) : path2;