wrangler 3.60.1 → 3.60.3

package/wrangler-dist/cli.js

@@ -66506,7 +66506,7 @@ var require_path_parse = __commonJS({
   "../../node_modules/.pnpm/path-parse@1.0.7/node_modules/path-parse/index.js"(exports2, module3) {
     "use strict";
     init_import_meta_url();
-    var isWindows2 = process.platform === "win32";
+    var isWindows3 = process.platform === "win32";
     var splitWindowsRe = /^(((?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?[\\\/]?)(?:[^\\\/]*[\\\/])*)((\.{1,2}|[^\\\/]+?|)(\.[^.\/\\]*|))[\\\/]*$/;
     var win32 = {};
     function win32SplitPath(filename) {
@@ -66555,7 +66555,7 @@ var require_path_parse = __commonJS({
         name: allParts[3]
       };
     };
-    if (isWindows2)
+    if (isWindows3)
       module3.exports = win32.parse;
     else
       module3.exports = posix2.parse;
@@ -67830,22 +67830,22 @@ var require_isexe = __commonJS({
 var require_which = __commonJS({
   "../../node_modules/.pnpm/which@2.0.2/node_modules/which/which.js"(exports2, module3) {
     init_import_meta_url();
-    var isWindows2 = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
+    var isWindows3 = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
     var path68 = require("path");
-    var COLON = isWindows2 ? ";" : ":";
+    var COLON = isWindows3 ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = /* @__PURE__ */ __name((cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" }), "getNotFoundError");
     var getPathInfo = /* @__PURE__ */ __name((cmd, opt) => {
       const colon = opt.colon || COLON;
-      const pathEnv = cmd.match(/\//) || isWindows2 && cmd.match(/\\/) ? [""] : [
+      const pathEnv = cmd.match(/\//) || isWindows3 && cmd.match(/\\/) ? [""] : [
         // windows always checks the cwd first
-        ...isWindows2 ? [process.cwd()] : [],
+        ...isWindows3 ? [process.cwd()] : [],
         ...(opt.path || process.env.PATH || /* istanbul ignore next: very unusual */
         "").split(colon)
       ];
-      const pathExtExe = isWindows2 ? opt.pathExt || process.env.PATHEXT || ".EXE;.CMD;.BAT;.COM" : "";
-      const pathExt = isWindows2 ? pathExtExe.split(colon) : [""];
-      if (isWindows2) {
+      const pathExtExe = isWindows3 ? opt.pathExt || process.env.PATHEXT || ".EXE;.CMD;.BAT;.COM" : "";
+      const pathExt = isWindows3 ? pathExtExe.split(colon) : [""];
+      if (isWindows3) {
         if (cmd.indexOf(".") !== -1 && pathExt[0] !== "")
           pathExt.unshift("");
       }
@@ -144291,8 +144291,8 @@ var require_eventemitter3 = __commonJS({
 var require_path = __commonJS({
   "../../node_modules/.pnpm/minimatch@5.1.0/node_modules/minimatch/lib/path.js"(exports2, module3) {
     init_import_meta_url();
-    var isWindows2 = typeof process === "object" && process && process.platform === "win32";
-    module3.exports = isWindows2 ? { sep: "\\" } : { sep: "/" };
+    var isWindows3 = typeof process === "object" && process && process.platform === "win32";
+    module3.exports = isWindows3 ? { sep: "\\" } : { sep: "/" };
   }
 });
 
@@ -152685,7 +152685,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.60.1";
+var version = "3.60.3";
 var package_default = {
   name: "wrangler",
   version,
@@ -152884,11 +152884,12 @@ var package_default = {
 };
 
 // src/pages/constants.ts
+var isWindows = process.platform === "win32";
 var MAX_ASSET_COUNT = 2e4;
 var MAX_ASSET_SIZE = 25 * 1024 * 1024;
 var PAGES_CONFIG_CACHE_FILENAME = "pages.json";
 var MAX_BUCKET_SIZE = 40 * 1024 * 1024;
-var MAX_BUCKET_FILE_COUNT = 2e3;
+var MAX_BUCKET_FILE_COUNT = isWindows ? 1e3 : 2e3;
 var BULK_UPLOAD_CONCURRENCY = 3;
 var MAX_UPLOAD_ATTEMPTS = 5;
 var MAX_UPLOAD_GATEWAY_ERRORS = 5;
@@ -159513,13 +159514,13 @@ function handleNodeJSGlobals(build5, inject) {
     ...Object.keys(inject).map(
       (globalName) => import_node_path9.default.resolve(
         getBasePath(),
-        `_virtual_unenv_global_polyfill-${globalName}.js`
+        `_virtual_unenv_global_polyfill-${encodeToLowerCase(globalName)}.js`
       )
     )
   ];
   build5.onResolve({ filter: UNENV_GLOBALS_RE }, ({ path: path68 }) => ({ path: path68 }));
   build5.onLoad({ filter: UNENV_GLOBALS_RE }, ({ path: path68 }) => {
-    const globalName = path68.match(UNENV_GLOBALS_RE)[1];
+    const globalName = decodeFromLowerCase(path68.match(UNENV_GLOBALS_RE)[1]);
     const globalMapping = inject[globalName];
     if (typeof globalMapping === "string") {
       const globalPolyfillSpecifier = globalMapping;
@@ -159543,10 +159544,6 @@ function handleNodeJSGlobals(build5, inject) {
         */
         ""}
 									/* @__PURE__ */ (() => {
-										${/*
-        // TODO: should we try to preserve globalThis.${globalName} if it exists?
-        */
-        ""}
 										return globalThis.${globalName} = globalVar;
 									})();
 
@@ -159578,10 +159575,6 @@ function handleNodeJSGlobals(build5, inject) {
       */
       ""}
 								/* @__PURE__ */ (() => {
-									${/*
-      // TODO: should we try to preserve globalThis.${globalName} if it exists?
-      */
-      ""}
 									return globalThis.${globalName} = ${exportName};
 							})();
 
@@ -159595,6 +159588,17 @@ function handleNodeJSGlobals(build5, inject) {
   });
 }
 __name(handleNodeJSGlobals, "handleNodeJSGlobals");
+function encodeToLowerCase(str) {
+  return str.replaceAll(/[A-Z]/g, (letter) => `$${letter.toLowerCase()}`);
+}
+__name(encodeToLowerCase, "encodeToLowerCase");
+function decodeFromLowerCase(str) {
+  return str.replaceAll(
+    /\$([a-z])/g,
+    (match, letter) => `${letter.toUpperCase()}`
+  );
+}
+__name(decodeFromLowerCase, "decodeFromLowerCase");
 
 // src/deployment-bundle/esbuild-plugins/nodejs-compat.ts
 init_import_meta_url();
@@ -163112,11 +163116,184 @@ var import_node_fs32 = require("node:fs");
 var import_node_path55 = __toESM(require("node:path"));
 var import_node_url15 = require("node:url");
 
+// ../cli/index.ts
+init_import_meta_url();
+var import_process = require("process");
+
+// ../cli/colors.ts
+init_import_meta_url();
+var import_chalk7 = __toESM(require_chalk());
+var { white, gray, dim, hidden, bold, cyanBright, bgCyan } = import_chalk7.default;
+var brandColor = import_chalk7.default.hex("#BD5B08");
+var black = import_chalk7.default.hex("#111");
+var blue = import_chalk7.default.hex("#0E838F");
+var bgBlue = black.bgHex("#0E838F");
+var red = import_chalk7.default.hex("#AB2526");
+var bgRed = black.bgHex("#AB2526");
+var green = import_chalk7.default.hex("#218529");
+var bgGreen = black.bgHex("#218529");
+var yellow = import_chalk7.default.hex("#7F7322");
+var bgYellow = black.bgHex("#7F7322");
+
+// ../cli/streams.ts
+init_import_meta_url();
+var stdout = process.stdout;
+var stderr = process.stderr;
+
+// ../cli/index.ts
+var shapes = {
+  diamond: "\u25C7",
+  dash: "\u2500",
+  radioInactive: "\u25CB",
+  radioActive: "\u25CF",
+  bar: "\u2502",
+  leftT: "\u251C",
+  rigthT: "\u2524",
+  arrows: {
+    left: "\u2039",
+    right: "\u203A"
+  },
+  corners: {
+    tl: "\u256D",
+    bl: "\u2570",
+    tr: "\u256E",
+    br: "\u256F"
+  }
+};
+var status = {
+  error: bgRed(` ERROR `),
+  warning: bgYellow(` WARNING `),
+  info: bgBlue(` INFO `),
+  success: bgGreen(` SUCCESS `),
+  cancel: white.bgRed(` X `)
+};
+var space = /* @__PURE__ */ __name((n2 = 1) => {
+  return hidden("\u200A".repeat(n2));
+}, "space");
+var logRaw = /* @__PURE__ */ __name((msg) => {
+  stdout.write(`${msg}
+`);
+}, "logRaw");
+var log = /* @__PURE__ */ __name((msg) => {
+  const lines = msg.split("\n").map((ln) => `${gray(shapes.bar)} ${white(ln)}`);
+  logRaw(lines.join("\n"));
+}, "log");
+var newline = /* @__PURE__ */ __name(() => {
+  log("");
+}, "newline");
+var format5 = /* @__PURE__ */ __name((msg, {
+  linePrefix = gray(shapes.bar),
+  firstLinePrefix = linePrefix,
+  newlineBefore = false,
+  newlineAfter = false,
+  formatLine = /* @__PURE__ */ __name((line) => white(line), "formatLine"),
+  multiline = true
+} = {}) => {
+  const lines = multiline ? msg.split("\n") : [msg];
+  const formattedLines = lines.map(
+    (line, i) => (i === 0 ? firstLinePrefix : linePrefix) + space() + formatLine(line)
+  );
+  if (newlineBefore) {
+    formattedLines.unshift(linePrefix);
+  }
+  if (newlineAfter) {
+    formattedLines.push(linePrefix);
+  }
+  return formattedLines.join("\n");
+}, "format");
+var updateStatus = /* @__PURE__ */ __name((msg, printNewLine = true) => {
+  logRaw(
+    format5(msg, {
+      firstLinePrefix: gray(shapes.leftT),
+      linePrefix: gray(shapes.bar),
+      newlineAfter: printNewLine
+    })
+  );
+}, "updateStatus");
+var startSection = /* @__PURE__ */ __name((heading, subheading, printNewLine = true) => {
+  logRaw(
+    `${gray(shapes.corners.tl)} ${brandColor(heading)} ${subheading ? dim(subheading) : ""}`
+  );
+  if (printNewLine) {
+    newline();
+  }
+}, "startSection");
+var endSection = /* @__PURE__ */ __name((heading, subheading) => {
+  logRaw(
+    `${gray(shapes.corners.bl)} ${brandColor(heading)} ${subheading ? dim(subheading) : ""}
+`
+  );
+}, "endSection");
+var cancel = /* @__PURE__ */ __name((msg, {
+  // current default is backcompat and makes sense going forward too
+  shape = shapes.corners.bl,
+  // current default for backcompat -- TODO: change default to true once all callees have been updated
+  multiline = false
+} = {}) => {
+  logRaw(
+    format5(msg, {
+      firstLinePrefix: `${gray(shape)} ${status.cancel}`,
+      linePrefix: gray(shapes.bar),
+      newlineBefore: true,
+      formatLine: (line) => dim(line),
+      // for backcompat but it's not ideal for this to be "dim"
+      multiline
+    })
+  );
+}, "cancel");
+var warn = /* @__PURE__ */ __name((msg, {
+  // current default for backcompat -- TODO: change default to shapes.bar once all callees have been updated
+  shape = shapes.corners.bl,
+  // current default for backcompat -- TODO: change default to true once all callees have been updated
+  multiline = false,
+  newlineBefore = true
+} = {}) => {
+  logRaw(
+    format5(msg, {
+      firstLinePrefix: gray(shape) + space() + status.warning,
+      linePrefix: gray(shapes.bar),
+      formatLine: (line) => dim(line),
+      // for backcompat but it's not ideal for this to be "dim"
+      multiline,
+      newlineBefore
+    })
+  );
+}, "warn");
+var success = /* @__PURE__ */ __name((msg, {
+  // current default for backcompat -- TODO: change default to shapes.bar once all callees have been updated
+  shape = shapes.corners.bl,
+  // current default for backcompat -- TODO: change default to true once all callees have been updated
+  multiline = false
+} = {}) => {
+  logRaw(
+    format5(msg, {
+      firstLinePrefix: gray(shape) + space() + status.success,
+      linePrefix: gray(shapes.bar),
+      newlineBefore: true,
+      formatLine: (line) => dim(line),
+      // for backcompat but it's not ideal for this to be "dim"
+      multiline
+    })
+  );
+}, "success");
+var crash = /* @__PURE__ */ __name((msg, extra) => {
+  error(msg, extra);
+  (0, import_process.exit)(1);
+}, "crash");
+var error = /* @__PURE__ */ __name((msg, extra, corner = shapes.corners.bl) => {
+  if (msg) {
+    stderr.write(
+      `${gray(corner)} ${status.error} ${dim(msg)}
+${extra ? space() + extra + "\n" : ""}`
+    );
+  }
+}, "error");
+
 // src/deployment-bundle/bundle-reporter.ts
 init_import_meta_url();
 var import_node_buffer2 = require("node:buffer");
 var import_node_zlib = require("node:zlib");
-var import_chalk7 = __toESM(require_chalk());
+var import_chalk8 = __toESM(require_chalk());
 var ONE_KIB_BYTES = 1024;
 var ALLOWED_INITIAL_MAX = ONE_KIB_BYTES * 1024;
 async function getSize(modules) {
@@ -163131,7 +163308,7 @@ async function printBundleSize(main2, modules) {
   const { size, gzipSize } = await getSize([...modules, main2]);
   const bundleReport = `${(size / ONE_KIB_BYTES).toFixed(2)} KiB / gzip: ${(gzipSize / ONE_KIB_BYTES).toFixed(2)} KiB`;
   const percentage = gzipSize / ALLOWED_INITIAL_MAX * 100;
-  const colorizedReport = percentage > 90 ? import_chalk7.default.red(bundleReport) : percentage > 70 ? import_chalk7.default.yellow(bundleReport) : import_chalk7.default.green(bundleReport);
+  const colorizedReport = percentage > 90 ? import_chalk8.default.red(bundleReport) : percentage > 70 ? import_chalk8.default.yellow(bundleReport) : import_chalk8.default.green(bundleReport);
   logger.log(`Total Upload: ${colorizedReport}`);
   if (gzipSize > ALLOWED_INITIAL_MAX && !process.env.NO_SCRIPT_SIZE_WARNING) {
     logger.warn(
@@ -163859,6 +164036,15 @@ function sniffUserAgent() {
 }
 __name(sniffUserAgent, "sniffUserAgent");
 
+// src/utils/create-batches.ts
+init_import_meta_url();
+function* createBatches(array, size) {
+  for (let i = 0; i < array.length; i += size) {
+    yield array.slice(i, i + size);
+  }
+}
+__name(createBatches, "createBatches");
+
 // src/utils/shell-quote.ts
 init_import_meta_url();
 var import_shell_quote = __toESM(require_shell_quote());
@@ -167471,178 +167657,6 @@ init_import_meta_url();
 var import_promises5 = require("fs/promises");
 var import_process2 = require("process");
 
-// ../cli/index.ts
-init_import_meta_url();
-var import_process = require("process");
-
-// ../cli/colors.ts
-init_import_meta_url();
-var import_chalk8 = __toESM(require_chalk());
-var { white, gray, dim, hidden, bold, cyanBright, bgCyan } = import_chalk8.default;
-var brandColor = import_chalk8.default.hex("#BD5B08");
-var black = import_chalk8.default.hex("#111");
-var blue = import_chalk8.default.hex("#0E838F");
-var bgBlue = black.bgHex("#0E838F");
-var red = import_chalk8.default.hex("#AB2526");
-var bgRed = black.bgHex("#AB2526");
-var green = import_chalk8.default.hex("#218529");
-var bgGreen = black.bgHex("#218529");
-var yellow = import_chalk8.default.hex("#7F7322");
-var bgYellow = black.bgHex("#7F7322");
-
-// ../cli/streams.ts
-init_import_meta_url();
-var stdout = process.stdout;
-var stderr = process.stderr;
-
-// ../cli/index.ts
-var shapes = {
-  diamond: "\u25C7",
-  dash: "\u2500",
-  radioInactive: "\u25CB",
-  radioActive: "\u25CF",
-  bar: "\u2502",
-  leftT: "\u251C",
-  rigthT: "\u2524",
-  arrows: {
-    left: "\u2039",
-    right: "\u203A"
-  },
-  corners: {
-    tl: "\u256D",
-    bl: "\u2570",
-    tr: "\u256E",
-    br: "\u256F"
-  }
-};
-var status = {
-  error: bgRed(` ERROR `),
-  warning: bgYellow(` WARNING `),
-  info: bgBlue(` INFO `),
-  success: bgGreen(` SUCCESS `),
-  cancel: white.bgRed(` X `)
-};
-var space = /* @__PURE__ */ __name((n2 = 1) => {
-  return hidden("\u200A".repeat(n2));
-}, "space");
-var logRaw = /* @__PURE__ */ __name((msg) => {
-  stdout.write(`${msg}
-`);
-}, "logRaw");
-var log = /* @__PURE__ */ __name((msg) => {
-  const lines = msg.split("\n").map((ln) => `${gray(shapes.bar)} ${white(ln)}`);
-  logRaw(lines.join("\n"));
-}, "log");
-var newline = /* @__PURE__ */ __name(() => {
-  log("");
-}, "newline");
-var format5 = /* @__PURE__ */ __name((msg, {
-  linePrefix = gray(shapes.bar),
-  firstLinePrefix = linePrefix,
-  newlineBefore = false,
-  newlineAfter = false,
-  formatLine = /* @__PURE__ */ __name((line) => white(line), "formatLine"),
-  multiline = true
-} = {}) => {
-  const lines = multiline ? msg.split("\n") : [msg];
-  const formattedLines = lines.map(
-    (line, i) => (i === 0 ? firstLinePrefix : linePrefix) + space() + formatLine(line)
-  );
-  if (newlineBefore) {
-    formattedLines.unshift(linePrefix);
-  }
-  if (newlineAfter) {
-    formattedLines.push(linePrefix);
-  }
-  return formattedLines.join("\n");
-}, "format");
-var updateStatus = /* @__PURE__ */ __name((msg, printNewLine = true) => {
-  logRaw(
-    format5(msg, {
-      firstLinePrefix: gray(shapes.leftT),
-      linePrefix: gray(shapes.bar),
-      newlineAfter: printNewLine
-    })
-  );
-}, "updateStatus");
-var startSection = /* @__PURE__ */ __name((heading, subheading, printNewLine = true) => {
-  logRaw(
-    `${gray(shapes.corners.tl)} ${brandColor(heading)} ${subheading ? dim(subheading) : ""}`
-  );
-  if (printNewLine) {
-    newline();
-  }
-}, "startSection");
-var endSection = /* @__PURE__ */ __name((heading, subheading) => {
-  logRaw(
-    `${gray(shapes.corners.bl)} ${brandColor(heading)} ${subheading ? dim(subheading) : ""}
-`
-  );
-}, "endSection");
-var cancel = /* @__PURE__ */ __name((msg, {
-  // current default is backcompat and makes sense going forward too
-  shape = shapes.corners.bl,
-  // current default for backcompat -- TODO: change default to true once all callees have been updated
-  multiline = false
-} = {}) => {
-  logRaw(
-    format5(msg, {
-      firstLinePrefix: `${gray(shape)} ${status.cancel}`,
-      linePrefix: gray(shapes.bar),
-      newlineBefore: true,
-      formatLine: (line) => dim(line),
-      // for backcompat but it's not ideal for this to be "dim"
-      multiline
-    })
-  );
-}, "cancel");
-var warn = /* @__PURE__ */ __name((msg, {
-  // current default for backcompat -- TODO: change default to shapes.bar once all callees have been updated
-  shape = shapes.corners.bl,
-  // current default for backcompat -- TODO: change default to true once all callees have been updated
-  multiline = false
-} = {}) => {
-  logRaw(
-    format5(msg, {
-      firstLinePrefix: gray(shape) + space() + status.warning,
-      linePrefix: gray(shapes.bar),
-      newlineBefore: true,
-      formatLine: (line) => dim(line),
-      // for backcompat but it's not ideal for this to be "dim"
-      multiline
-    })
-  );
-}, "warn");
-var success = /* @__PURE__ */ __name((msg, {
-  // current default for backcompat -- TODO: change default to shapes.bar once all callees have been updated
-  shape = shapes.corners.bl,
-  // current default for backcompat -- TODO: change default to true once all callees have been updated
-  multiline = false
-} = {}) => {
-  logRaw(
-    format5(msg, {
-      firstLinePrefix: gray(shape) + space() + status.success,
-      linePrefix: gray(shapes.bar),
-      newlineBefore: true,
-      formatLine: (line) => dim(line),
-      // for backcompat but it's not ideal for this to be "dim"
-      multiline
-    })
-  );
-}, "success");
-var crash = /* @__PURE__ */ __name((msg, extra) => {
-  error(msg, extra);
-  (0, import_process.exit)(1);
-}, "crash");
-var error = /* @__PURE__ */ __name((msg, extra, corner = shapes.corners.bl) => {
-  if (msg) {
-    stderr.write(
-      `${gray(corner)} ${status.error} ${dim(msg)}
-${extra ? space() + extra + "\n" : ""}`
-    );
-  }
-}, "error");
-
 // ../cli/interactive.ts
 init_import_meta_url();
 
@@ -176807,7 +176821,6 @@ function Options7(d1ListYargs) {
     type: "string",
     demandOption: true
   }).option("timePeriod", {
-    choices: ["1d", "7d", "31d"],
     describe: "Fetch data from now to the provided time period",
     default: "1d"
   }).option("sort-type", {
@@ -176839,6 +176852,42 @@ var cliOptionToGraphQLOption = {
   writes: "rowsWritten",
   count: "count"
 };
+function getDurationDates(durationString) {
+  const endDate = /* @__PURE__ */ new Date();
+  const durationValue = parseInt(durationString.slice(0, -1));
+  const durationUnit = durationString.slice(-1);
+  let startDate;
+  switch (durationUnit) {
+    case "d":
+      if (durationValue > 31) {
+        throw new Error("Duration cannot be greater than 31 days");
+      }
+      startDate = new Date(
+        endDate.getTime() - durationValue * 24 * 60 * 60 * 1e3
+      );
+      break;
+    case "m":
+      if (durationValue > 31 * 24 * 60) {
+        throw new Error(
+          `Duration cannot be greater than ${31 * 24 * 60} minutes (31 days)`
+        );
+      }
+      startDate = new Date(endDate.getTime() - durationValue * 60 * 1e3);
+      break;
+    case "h":
+      if (durationValue > 31 * 24) {
+        throw new Error(
+          `Duration cannot be greater than ${31 * 24} hours (31 days)`
+        );
+      }
+      startDate = new Date(endDate.getTime() - durationValue * 60 * 60 * 1e3);
+      break;
+    default:
+      throw new Error("Invalid duration unit");
+  }
+  return [startDate.toISOString(), endDate.toISOString()];
+}
+__name(getDurationDates, "getDurationDates");
 var Handler7 = withConfig(
   async ({
     name,
@@ -176859,11 +176908,7 @@ var Handler7 = withConfig(
     const result = await getDatabaseInfoFromId(accountId, db.uuid);
     const output = [];
     if (result.version !== "alpha") {
-      const convertedTimePeriod = Number(timePeriod.replace("d", ""));
-      const endDate = /* @__PURE__ */ new Date();
-      const startDate = new Date(
-        new Date(endDate).setDate(endDate.getDate() - convertedTimePeriod)
-      );
+      const [startDate, endDate] = getDurationDates(timePeriod);
       const parsedSortBy = cliOptionToGraphQLOption[sortBy];
       const orderByClause = parsedSortBy === "count" ? `${parsedSortBy}_${sortDirection}` : `${sortType}_${parsedSortBy}_${sortDirection}`;
       const graphqlQueriesResult = await fetchGraphqlResult({
@@ -176897,8 +176942,8 @@ var Handler7 = withConfig(
             filter: {
               AND: [
                 {
-                  datetimeHour_geq: startDate.toISOString(),
-                  datetimeHour_leq: endDate.toISOString(),
+                  datetimeHour_geq: startDate,
+                  datetimeHour_leq: endDate,
                   databaseId: db.uuid
                 }
               ]
@@ -185087,10 +185132,10 @@ ${JSON.stringify(defaultRoutesJSONSpec, null, 2)}`
   CLEANUP();
   process.exit(0);
 }, "Handler");
-function isWindows() {
+function isWindows2() {
   return process.platform === "win32";
 }
-__name(isWindows, "isWindows");
+__name(isWindows2, "isWindows");
 async function sleep(ms) {
   await new Promise((promiseResolve) => setTimeout(promiseResolve, ms));
 }
@@ -185098,7 +185143,7 @@ __name(sleep, "sleep");
 function getPids(pid) {
   const pids = [pid];
   let command2, regExp;
-  if (isWindows()) {
+  if (isWindows2()) {
     command2 = `wmic process where (ParentProcessId=${pid}) get ProcessId`;
     regExp = new RegExp(/(\d+)/);
   } else {
@@ -185115,7 +185160,7 @@ function getPids(pid) {
 __name(getPids, "getPids");
 function getPort(pid) {
   let command2, regExp;
-  if (isWindows()) {
+  if (isWindows2()) {
     command2 = process.env.SYSTEMROOT + "\\system32\\netstat.exe -nao";
     regExp = new RegExp(`TCP\\s+.*:(\\d+)\\s+.*:\\d+\\s+LISTENING\\s+${pid}`);
   } else {
@@ -185161,7 +185206,7 @@ This results in a more faithful emulation of production behavior.`
     command2[0].toString(),
     command2.slice(1).map((value) => value.toString()),
     {
-      shell: isWindows(),
+      shell: isWindows2(),
       env: {
         BROWSER: "none",
         ...process.env
@@ -199396,16 +199441,12 @@ async function fetchLatestDeployment(accountId, workerName) {
   return deployments2.at(0);
 }
 __name(fetchLatestDeployment, "fetchLatestDeployment");
-async function fetchLatestDeploymentVersions(accountId, workerName, versionCache) {
-  const latestDeployment = await fetchLatestDeployment(accountId, workerName);
-  if (!latestDeployment) {
+async function fetchDeploymentVersions(accountId, workerName, deployment, versionCache) {
+  if (!deployment) {
     return [[], /* @__PURE__ */ new Map()];
   }
   const versionTraffic = new Map(
-    latestDeployment.versions.map(({ version_id: versionId, percentage }) => [
-      versionId,
-      percentage
-    ])
+    deployment.versions.map((v2) => [v2.version_id, v2.percentage])
   );
   const versions = await fetchVersions(
     accountId,
@@ -199415,7 +199456,7 @@ async function fetchLatestDeploymentVersions(accountId, workerName, versionCache
   );
   return [versions, versionTraffic];
 }
-__name(fetchLatestDeploymentVersions, "fetchLatestDeploymentVersions");
+__name(fetchDeploymentVersions, "fetchDeploymentVersions");
 async function fetchDeployableVersions(accountId, workerName, versionCache) {
   const { items: versions } = await fetchResult(
     `/accounts/${accountId}/workers/scripts/${workerName}/versions?deployable=true`
@@ -199595,34 +199636,88 @@ function getConfig2(args) {
   return config;
 }
 __name(getConfig2, "getConfig");
+async function confirmLatestDeploymentOverwrite(accountId, scriptName) {
+  try {
+    const latest = await fetchLatestDeployment(accountId, scriptName);
+    if (latest && latest.versions.length >= 2) {
+      const versionCache = /* @__PURE__ */ new Map();
+      warn(
+        `Your last deployment has multiple versions. To progress that deployment use "wrangler versions deploy" instead.`,
+        { shape: shapes.corners.tl, newlineBefore: false }
+      );
+      newline();
+      await printDeployment(
+        accountId,
+        scriptName,
+        latest,
+        "last",
+        versionCache
+      );
+      return inputPrompt({
+        type: "confirm",
+        question: `"wrangler deploy" will upload a new version and deploy it globally immediately.
+Are you sure you want to continue?`,
+        label: "",
+        defaultValue: !isInteractive() || CI.isCI(),
+        // defaults to true in CI for back-compat
+        acceptDefault: !isInteractive() || CI.isCI()
+      });
+    }
+  } catch (e3) {
+    const isNotFound = e3 instanceof APIError && e3.code == 10007;
+    if (!isNotFound) {
+      throw e3;
+    }
+  }
+  return true;
+}
+__name(confirmLatestDeploymentOverwrite, "confirmLatestDeploymentOverwrite");
 async function printLatestDeployment(accountId, workerName, versionCache) {
-  const [versions, traffic] = await spinnerWhile({
+  const latestDeployment = await spinnerWhile({
     startMessage: "Fetching latest deployment",
     async promise() {
-      return fetchLatestDeploymentVersions(accountId, workerName, versionCache);
+      return fetchLatestDeployment(accountId, workerName);
     }
   });
+  await printDeployment(
+    accountId,
+    workerName,
+    latestDeployment,
+    "current",
+    versionCache
+  );
+}
+__name(printLatestDeployment, "printLatestDeployment");
+async function printDeployment(accountId, workerName, deployment, adjective, versionCache) {
+  const [versions, traffic] = await fetchDeploymentVersions(
+    accountId,
+    workerName,
+    deployment,
+    versionCache
+  );
   logRaw(
-    `${leftT} Your current deployment has ${versions.length} version(s):`
+    `${leftT} Your ${adjective} deployment has ${versions.length} version(s):`
   );
   printVersions(versions, traffic);
 }
-__name(printLatestDeployment, "printLatestDeployment");
+__name(printDeployment, "printDeployment");
 function printVersions(versions, traffic) {
-  for (const version3 of versions) {
+  newline();
+  log(formatVersions(versions, traffic));
+  newline();
+}
+__name(printVersions, "printVersions");
+function formatVersions(versions, traffic) {
+  return versions.map((version3) => {
     const trafficString = brandColor(`(${traffic.get(version3.id)}%)`);
     const versionIdString = white(version3.id);
-    log(
-      gray(`
-${trafficString} ${versionIdString}
+    return gray(`${trafficString} ${versionIdString}
       Created:  ${version3.metadata.created_on}
           Tag:  ${version3.annotations?.["workers/tag"] ?? BLANK_INPUT}
-      Message:  ${version3.annotations?.["workers/message"] ?? BLANK_INPUT}`)
-    );
-  }
-  newline();
+      Message:  ${version3.annotations?.["workers/message"] ?? BLANK_INPUT}`);
+  }).join("\n\n");
 }
-__name(printVersions, "printVersions");
+__name(formatVersions, "formatVersions");
 async function promptVersionsToDeploy(accountId, workerName, defaultSelectedVersionIds, versionCache, yesFlag) {
   await spinnerWhile({
     startMessage: "Fetching deployable versions",
@@ -202557,12 +202652,6 @@ function mapBindings(bindings) {
   }, {});
 }
 __name(mapBindings, "mapBindings");
-function* createBatches(array, size) {
-  for (let i = 0; i < array.length; i += size) {
-    yield array.slice(i, i + size);
-  }
-}
-__name(createBatches, "createBatches");
 function assertNoTypeArg(args) {
   if (args.type) {
     let message = "The --type option is no longer supported.";
@@ -203079,11 +203168,19 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
   const destination = props.outDir ?? getWranglerTmpDir(props.projectRoot, "deploy");
   const envName = props.env ?? "production";
   const start = Date.now();
-  const notProd = Boolean(!props.legacyEnv && props.env);
+  const prod = Boolean(props.legacyEnv || !props.env);
+  const notProd = !prod;
   const workerName = notProd ? `${scriptName} (${envName})` : scriptName;
   const workerUrl = props.dispatchNamespace ? `/accounts/${accountId}/workers/dispatch/namespaces/${props.dispatchNamespace}/scripts/${scriptName}` : notProd ? `/accounts/${accountId}/workers/services/${scriptName}/environments/${envName}` : `/accounts/${accountId}/workers/scripts/${scriptName}`;
   let deploymentId = null;
   const { format: format10 } = props.entry;
+  if (!props.dispatchNamespace && prod && accountId && scriptName) {
+    const yes = await confirmLatestDeploymentOverwrite(accountId, scriptName);
+    if (!yes) {
+      cancel("Aborting deploy...");
+      return;
+    }
+  }
   if (!props.isWorkersSite && Boolean(props.assetPaths) && format10 === "service-worker") {
     throw new UserError(
       "You cannot use the service-worker format with an `assets` directory yet. For information on how to migrate to the module-worker format, see: https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"