vercel 50.31.0 → 50.31.2

package/dist/chunks/{chunk-6BQDSUW6.js → chunk-2MDXGVZV.js}

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

package/dist/chunks/{chunk-QVLCQV6Z.js → chunk-43L4BNYM.js}

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

package/dist/chunks/{chunk-KRQOJLQS.js → chunk-4MTNDNUR.js}

@@ -10316,7 +10316,6 @@ var require_frameworks = __commonJS({
       {
         name: "Django",
         slug: "django",
-        experimental: true,
         logo: "https://api-frameworks.vercel.sh/framework-logos/django.svg",
         tagline: "Django is a high-level Python web framework that encourages rapid development and clean, pragmatic design. ",
         description: "A Django project served via the Python Runtime.",
@@ -11937,7 +11936,6 @@ var require_frameworks = __commonJS({
       {
         name: "Python",
         slug: "python",
-        experimental: true,
         runtimeFramework: true,
         logo: "https://api-frameworks.vercel.sh/framework-logos/python.svg",
         tagline: "Python is a programming language that lets you work quickly and integrate systems more effectively.",
@@ -37201,27 +37199,23 @@ function findChanges(oldEnv, newEnv) {
     } else if (oldEnv[key] !== newEnv[key]) {
       changed.push(key);
     }
-    delete oldEnv[key];
   }
-  const removed = Object.keys(oldEnv);
   return {
     added,
-    changed,
-    removed
+    changed
   };
 }
 function buildDeltaString(oldEnv, newEnv) {
-  const { added, changed, removed } = findChanges(oldEnv, newEnv);
+  const { added, changed } = findChanges(oldEnv, newEnv);
   let deltaString = "";
-  deltaString += import_chalk5.default.green(addDeltaSection("+", changed, true));
+  deltaString += import_chalk5.default.yellow(addDeltaSection("M", changed));
   deltaString += import_chalk5.default.green(addDeltaSection("+", added));
-  deltaString += import_chalk5.default.red(addDeltaSection("-", removed));
   return deltaString ? import_chalk5.default.gray("Changes:\n") + deltaString + "\n" : deltaString;
 }
-function addDeltaSection(prefix, arr, changed = false) {
+function addDeltaSection(prefix, arr) {
   if (arr.length === 0)
     return "";
-  return arr.sort().map((item) => `${prefix} ${item}${changed ? " (Updated)" : ""}`).join("\n") + "\n";
+  return arr.sort().map((item) => `${prefix} ${item}`).join("\n") + "\n";
 }
 
 // src/commands/env/pull.ts
@@ -37588,33 +37582,26 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
   const fullPath = resolve2(cwd, filename);
   const head = tryReadHeadSync(fullPath, Buffer.byteLength(CONTENTS_PREFIX));
   const exists = typeof head !== "undefined";
+  const requiresConfirmation = exists && head !== CONTENTS_PREFIX && !skipConfirmation && !client.nonInteractive;
   if (head === CONTENTS_PREFIX) {
     output_manager_default.log(`Overwriting existing ${import_chalk7.default.bold(filename)} file`);
-  } else if (exists && !skipConfirmation) {
-    if (client.nonInteractive) {
-      outputActionRequired(client, {
-        status: "action_required",
-        reason: "env_file_exists",
-        message: `File ${param(filename)} already exists and was not created by Vercel CLI. Use --yes to overwrite or specify a different filename.`,
-        next: [
-          {
-            command: getCommandNamePlain(`env pull ${filename} --yes`),
-            when: "Overwrite this file"
-          },
-          {
-            command: getCommandNamePlain("env pull <filename>"),
-            when: "Use a different filename"
-          }
-        ]
-      });
-    }
-    if (!await client.input.confirm(
-      `Found existing file ${param(filename)}. Do you want to overwrite?`,
-      false
-    )) {
-      output_manager_default.log("Canceled");
-      return;
-    }
+  } else if (exists && !skipConfirmation && client.nonInteractive) {
+    outputActionRequired(client, {
+      status: "action_required",
+      reason: "env_file_exists",
+      message: `File ${param(filename)} already exists and was not created by Vercel CLI. Use --yes to apply the downloaded changes or specify a different filename.`,
+      next: [
+        {
+          command: getCommandNamePlain(`env pull ${filename} --yes`),
+          when: "Apply the downloaded changes to this file"
+        },
+        {
+          command: getCommandNamePlain("env pull <filename>"),
+          when: "Use a different filename"
+        }
+      ]
+    });
+    return;
   }
   const projectSlugLink = formatProject(link.org.slug, link.project.name);
   const downloadMessage = gitBranch ? `Downloading \`${import_chalk7.default.cyan(
@@ -37633,20 +37620,34 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
   })).env;
   let deltaString = "";
   let oldEnv;
+  const downloadedEnv = getDownloadedEnv(records);
   if (exists) {
     oldEnv = await createEnvObject(fullPath);
     if (oldEnv) {
-      const newEnv = (0, import_json_parse_better_errors.default)(JSON.stringify(records).replace(/\\"/g, ""));
-      deltaString = buildDeltaString(oldEnv, newEnv);
+      deltaString = buildDeltaString(oldEnv, {
+        ...oldEnv,
+        ...downloadedEnv
+      });
     }
   }
-  const contents = CONTENTS_PREFIX + Object.keys(records).sort().filter((key) => !VARIABLES_TO_IGNORE.includes(key)).map((key) => `${key}="${escapeValue(records[key])}"`).join("\n") + "\n";
-  await (0, import_fs_extra4.outputFile)(fullPath, contents, "utf8");
+  const envToWrite = oldEnv ? {
+    ...oldEnv,
+    ...downloadedEnv
+  } : downloadedEnv;
   if (deltaString) {
     output_manager_default.print("\n" + deltaString);
   } else if (oldEnv && exists) {
     output_manager_default.log("No changes found.");
   }
+  if (requiresConfirmation && deltaString !== "" && !await client.input.confirm(
+    `Apply these changes to ${param(filename)}?`,
+    false
+  )) {
+    output_manager_default.log("Canceled");
+    return;
+  }
+  const contents = CONTENTS_PREFIX + Object.keys(envToWrite).sort().map((key) => `${key}="${escapeValue(envToWrite[key])}"`).join("\n") + "\n";
+  await (0, import_fs_extra4.outputFile)(fullPath, contents, "utf8");
   let isGitIgnoreUpdated = false;
   if (filename === ".env.local") {
     const rootPath = link.repoRoot ?? cwd;
@@ -37663,6 +37664,17 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
 function escapeValue(value) {
   return value ? value.replace(new RegExp("\n", "g"), "\\n").replace(new RegExp("\r", "g"), "\\r") : "";
 }
+function getDownloadedEnv(records) {
+  return (0, import_json_parse_better_errors.default)(
+    JSON.stringify(
+      Object.fromEntries(
+        Object.entries(records).filter(
+          ([key]) => !VARIABLES_TO_IGNORE.includes(key)
+        )
+      )
+    ).replace(/\\"/g, "")
+  );
+}
 
 // src/util/projects/find-project-root.ts
 var import_chalk8 = __toESM(require_source(), 1);

package/dist/chunks/{chunk-TCKKAVXJ.js → chunk-4QETQOUQ.js}

@@ -9,10 +9,10 @@ import {
 } from "./chunk-IB5L4LKZ.js";
 import {
   require_dist as require_dist2
-} from "./chunk-RQUG6O67.js";
+} from "./chunk-XGUZYJXE.js";
 import {
   require_execa
-} from "./chunk-3XOBMJP4.js";
+} from "./chunk-CUUJWNAY.js";
 import {
   VERCEL_DIR,
   readJSONFile,
@@ -21,7 +21,7 @@ import {
   require_dist2 as require_dist4,
   require_lib,
   require_minimatch2 as require_minimatch
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   require_pluralize
 } from "./chunk-7EHTK7LP.js";

package/dist/chunks/{chunk-5WP2BYPE.js → chunk-AABYT6JI.js}

@@ -9,17 +9,17 @@ import {
 } from "./chunk-V5P25P7F.js";
 import {
   require_dist as require_dist2
-} from "./chunk-RQUG6O67.js";
+} from "./chunk-XGUZYJXE.js";
 import {
   require_lib as require_lib2
 } from "./chunk-QXRJ52T4.js";
 import {
   getLocalPathConfig
-} from "./chunk-ENFI7RR4.js";
+} from "./chunk-VKQV2LPP.js";
 import {
   DEFAULT_VERCEL_CONFIG_FILENAME,
   VERCEL_CONFIG_EXTENSIONS
-} from "./chunk-FFNOBWQ4.js";
+} from "./chunk-NN6I6YMJ.js";
 import {
   VERCEL_DIR,
   createPrompt,
@@ -41,7 +41,7 @@ import {
   useKeypress,
   usePrefix,
   useState
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   APIError,
   NowError,

package/dist/chunks/{chunk-3XOBMJP4.js → chunk-CUUJWNAY.js}

@@ -6,10 +6,10 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   require_end_of_stream
-} from "./chunk-QLZZBARH.js";
+} from "./chunk-F2FJ3QZG.js";
 import {
   require_once
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   require_signal_exit
 } from "./chunk-FDJURQMQ.js";

package/dist/chunks/{chunk-Y7RWCZ56.js → chunk-EFKVLLXG.js}

@@ -10,7 +10,7 @@ import {
   require_dist as require_dist2,
   sleep,
   ua_default
-} from "./chunk-5WP2BYPE.js";
+} from "./chunk-AABYT6JI.js";
 import {
   suggestNextCommands
 } from "./chunk-XR53KVJD.js";
@@ -20,20 +20,20 @@ import {
 } from "./chunk-2IQTNMUG.js";
 import {
   getScope
-} from "./chunk-KDZYLR6U.js";
+} from "./chunk-XIQUACWR.js";
 import {
   CommandTimeout
-} from "./chunk-TRQ5N5DU.js";
+} from "./chunk-XNH2ODPG.js";
 import {
   require_dist as require_dist3
-} from "./chunk-RQUG6O67.js";
+} from "./chunk-XGUZYJXE.js";
 import {
   require_lib
 } from "./chunk-QXRJ52T4.js";
 import {
   getProjectByNameOrId,
   param
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   stamp_default
 } from "./chunk-SOTR4CXR.js";

package/dist/chunks/{chunk-QLZZBARH.js → chunk-F2FJ3QZG.js}

@@ -6,7 +6,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   require_once
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   __commonJS
 } from "./chunk-TZ2YI2VH.js";

package/dist/chunks/{chunk-DECPS6UF.js → chunk-FTXIZBTY.js}

@@ -6,7 +6,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   getLinkedProject
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   getCommandName,
   getFlagsSpecification,

package/dist/chunks/{chunk-6NXY2OLP.js → chunk-GEYBIZGF.js}

@@ -6,13 +6,13 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   writeProjectSettings
-} from "./chunk-ZER7BAFS.js";
+} from "./chunk-IGWOW3XS.js";
 import {
   ensureLink
-} from "./chunk-5C6CQLVT.js";
+} from "./chunk-LF56WF3E.js";
 import {
   pullCommand
-} from "./chunk-QVLCQV6Z.js";
+} from "./chunk-43L4BNYM.js";
 import {
   help
 } from "./chunk-DOBFJJLK.js";
@@ -22,7 +22,7 @@ import {
   envPullCommandLogic,
   humanizePath,
   parseTarget
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   TelemetryClient
 } from "./chunk-XB2KZC2B.js";

package/dist/chunks/{chunk-PZC4VEFN.js → chunk-HXZPHN34.js}

@@ -6,10 +6,10 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   getLocalPathConfig
-} from "./chunk-ENFI7RR4.js";
+} from "./chunk-VKQV2LPP.js";
 import {
   compileVercelConfig
-} from "./chunk-FFNOBWQ4.js";
+} from "./chunk-NN6I6YMJ.js";
 import {
   VERCEL_DIR_PROJECT,
   VERCEL_DIR_README,
@@ -31,7 +31,7 @@ import {
   selectAndParseRemoteUrl,
   selectOrg,
   tryDetectServices
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   table
 } from "./chunk-LWBSOTJP.js";

package/dist/chunks/{chunk-ZER7BAFS.js → chunk-IGWOW3XS.js}

@@ -8,7 +8,7 @@ import {
   VERCEL_DIR,
   VERCEL_DIR_PROJECT,
   require_lib
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   require_dist
 } from "./chunk-FDJURQMQ.js";

package/dist/chunks/{chunk-JM7YTFXQ.js → chunk-JW7XOJYM.js}

@@ -6,13 +6,13 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   getUpdateCommand
-} from "./chunk-6BQDSUW6.js";
+} from "./chunk-2MDXGVZV.js";
 import {
   login
-} from "./chunk-5WP2BYPE.js";
+} from "./chunk-AABYT6JI.js";
 import {
   loginCommand
-} from "./chunk-TRQ5N5DU.js";
+} from "./chunk-XNH2ODPG.js";
 import {
   help
 } from "./chunk-DOBFJJLK.js";

package/dist/chunks/{chunk-5C6CQLVT.js → chunk-LF56WF3E.js}

@@ -6,14 +6,14 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   setupAndLink
-} from "./chunk-PZC4VEFN.js";
+} from "./chunk-HXZPHN34.js";
 import {
   buildCommandWithYes,
   getLinkedProject,
   outputActionRequired,
   param,
   resolveProjectCwd
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   getCommandName,
   getCommandNamePlain

package/dist/chunks/{chunk-GTDGTWEY.js → chunk-MH27YRIK.js}

@@ -6,7 +6,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   STANDARD_ENVIRONMENTS
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   getCommandName,
   require_lib

package/dist/chunks/{chunk-FFNOBWQ4.js → chunk-NN6I6YMJ.js}

@@ -6,7 +6,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   VERCEL_DIR
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   ConflictingConfigFiles
 } from "./chunk-ZLCMHY2G.js";

package/dist/chunks/{chunk-NJQGGQDK.js → chunk-UEWMMW2T.js}

@@ -7,7 +7,7 @@ const __dirname = __dirname_(__filename);
 import {
   formatCondition,
   formatTransform
-} from "./chunk-DECPS6UF.js";
+} from "./chunk-FTXIZBTY.js";
 import {
   output_manager_default
 } from "./chunk-FDJURQMQ.js";

package/dist/chunks/{chunk-ENFI7RR4.js → chunk-VKQV2LPP.js}

@@ -6,7 +6,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   VERCEL_DIR
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   ConflictingConfigFiles,
   InvalidLocalConfig,

package/dist/chunks/{chunk-RQUG6O67.js → chunk-XGUZYJXE.js}

@@ -9,13 +9,13 @@ import {
 } from "./chunk-QXRJ52T4.js";
 import {
   require_end_of_stream
-} from "./chunk-QLZZBARH.js";
+} from "./chunk-F2FJ3QZG.js";
 import {
   require_graceful_fs,
   require_inherits,
   require_minimatch,
   require_once
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   require_ms
 } from "./chunk-GGP5R3FU.js";

package/dist/chunks/{chunk-KDZYLR6U.js → chunk-XIQUACWR.js}

@@ -7,7 +7,7 @@ const __dirname = __dirname_(__filename);
 import {
   getTeamById,
   getUser
-} from "./chunk-KRQOJLQS.js";
+} from "./chunk-4MTNDNUR.js";
 import {
   TeamDeleted
 } from "./chunk-ZLCMHY2G.js";