wrangler 3.53.0 → 3.55.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.53.0",
+  "version": "3.55.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -91,7 +91,7 @@
     "source-map": "0.6.1",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.2",
-    "miniflare": "3.20240419.0"
+    "miniflare": "3.20240419.1"
   },
   "devDependencies": {
     "@cloudflare/eslint-config-worker": "*",
@@ -177,7 +177,7 @@
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/pages-shared": "^0.11.31",
+    "@cloudflare/pages-shared": "^0.11.34",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {

package/wrangler-dist/cli.js

@@ -139209,12 +139209,15 @@ var init_rulesEngine = __esm({
 var handler_exports = {};
 __export(handler_exports, {
   ANALYTICS_VERSION: () => ANALYTICS_VERSION2,
-  ASSET_PRESERVATION_CACHE: () => ASSET_PRESERVATION_CACHE,
+  ASSET_PRESERVATION_CACHE_V1: () => ASSET_PRESERVATION_CACHE_V1,
+  ASSET_PRESERVATION_CACHE_V2: () => ASSET_PRESERVATION_CACHE_V2,
   CACHE_CONTROL_BROWSER: () => CACHE_CONTROL_BROWSER,
+  CACHE_PRESERVATION_WRITE_FREQUENCY: () => CACHE_PRESERVATION_WRITE_FREQUENCY,
   HEADERS_VERSION: () => HEADERS_VERSION2,
   HEADERS_VERSION_V1: () => HEADERS_VERSION_V1,
   REDIRECTS_VERSION: () => REDIRECTS_VERSION2,
   generateHandler: () => generateHandler,
+  isPreservationCacheResponseExpiring: () => isPreservationCacheResponseExpiring,
   normaliseHeaders: () => normaliseHeaders,
   parseQualityWeightedList: () => parseQualityWeightedList
 });
@@ -139371,6 +139374,10 @@ async function generateHandler({
     }
   }
   __name(generateResponse, "generateResponse");
+  function isNullBodyStatus(status2) {
+    return [101, 204, 205, 304].includes(status2);
+  }
+  __name(isNullBodyStatus, "isNullBodyStatus");
   async function attachHeaders(response) {
     const existingHeaders = new Headers(response.headers);
     const extraHeaders = new Headers({
@@ -139485,7 +139492,7 @@ async function generateHandler({
       });
     });
     return new Response(
-      [101, 204, 205, 304].includes(response.status) ? null : response.body,
+      isNullBodyStatus(response.status) ? null : response.body,
       {
         headers,
         status: response.status,
@@ -139541,25 +139548,31 @@ async function generateHandler({
       if (isPreview(new URL(request3.url))) {
         response.headers.set("x-robots-tag", "noindex");
       }
-      if (options29.preserve) {
-        const preservedResponse = new Response(
-          [101, 204, 205, 304].includes(response.status) ? null : response.clone().body,
-          response
-        );
-        preservedResponse.headers.set(
-          "cache-control",
-          CACHE_CONTROL_PRESERVATION
-        );
-        preservedResponse.headers.set("x-robots-tag", "noindex");
-        if (waitUntil && caches) {
-          waitUntil(
-            caches.open(ASSET_PRESERVATION_CACHE).then(
-              (assetPreservationCache) => assetPreservationCache.put(request3.url, preservedResponse)
-            ).catch((err) => {
+      if (options29.preserve && waitUntil && caches) {
+        waitUntil(
+          (async () => {
+            try {
+              const assetPreservationCacheV2 = await caches.open(
+                ASSET_PRESERVATION_CACHE_V2
+              );
+              const match = await assetPreservationCacheV2.match(request3);
+              if (!match || assetKey !== await match.text() || isPreservationCacheResponseExpiring(match)) {
+                const preservedResponse = new Response(assetKey, response);
+                preservedResponse.headers.set(
+                  "cache-control",
+                  CACHE_CONTROL_PRESERVATION
+                );
+                preservedResponse.headers.set("x-robots-tag", "noindex");
+                await assetPreservationCacheV2.put(
+                  request3.url,
+                  preservedResponse
+                );
+              }
+            } catch (err) {
               logError(err);
-            })
-          );
-        }
+            }
+          })()
+        );
       }
       if (isHTMLContentType(asset.contentType) && metadata.analytics?.version === ANALYTICS_VERSION2) {
         return new HTMLRewriter().on("body", {
@@ -139580,17 +139593,55 @@ async function generateHandler({
   __name(serveAsset, "serveAsset");
   async function notFound() {
     if (caches) {
-      const assetPreservationCache = await caches.open(
-        ASSET_PRESERVATION_CACHE
-      );
-      const preservedResponse = await assetPreservationCache.match(request3.url);
-      if (preservedResponse) {
-        if (setMetrics)
-          setMetrics({ preservationCacheResult: "checked-hit" });
-        return preservedResponse;
-      } else {
-        if (setMetrics)
-          setMetrics({ preservationCacheResult: "checked-miss" });
+      try {
+        const assetPreservationCacheV2 = await caches.open(
+          ASSET_PRESERVATION_CACHE_V2
+        );
+        let preservedResponse = await assetPreservationCacheV2.match(
+          request3.url
+        );
+        const cutoffDate = /* @__PURE__ */ new Date("2024-05-17");
+        if (!preservedResponse && Date.now() < cutoffDate.getTime()) {
+          const assetPreservationCacheV1 = await caches.open(
+            ASSET_PRESERVATION_CACHE_V1
+          );
+          preservedResponse = await assetPreservationCacheV1.match(request3.url);
+          if (preservedResponse) {
+            if (setMetrics) {
+              setMetrics({ preservationCacheResult: "checked-hit" });
+            }
+            return preservedResponse;
+          }
+        }
+        if (preservedResponse) {
+          if (setMetrics) {
+            setMetrics({ preservationCacheResult: "checked-hit" });
+          }
+          const assetKey = await preservedResponse.text();
+          if (isNullBodyStatus(preservedResponse.status)) {
+            return new Response(null, preservedResponse);
+          }
+          if (assetKey) {
+            const asset = await fetchAsset(assetKey);
+            if (asset) {
+              return new Response(asset.body, preservedResponse);
+            } else {
+              logError(
+                new Error(
+                  `preservation cache contained assetKey that does not exist in storage: ${assetKey}`
+                )
+              );
+            }
+          } else {
+            logError(new Error(`cached response had no assetKey: ${assetKey}`));
+          }
+        } else {
+          if (setMetrics) {
+            setMetrics({ preservationCacheResult: "checked-miss" });
+          }
+        }
+      } catch (err) {
+        logError(err);
       }
     } else {
       if (setMetrics)
@@ -139643,17 +139694,33 @@ function isPreview(url4) {
   }
   return false;
 }
+function isPreservationCacheResponseExpiring(response) {
+  const ageHeader = response.headers.get("age");
+  if (!ageHeader)
+    return false;
+  try {
+    const age = parseInt(ageHeader);
+    const jitter = Math.floor(Math.random() * 43200);
+    if (age > CACHE_PRESERVATION_WRITE_FREQUENCY + jitter)
+      return true;
+  } catch {
+    return false;
+  }
+  return false;
+}
 function isHTMLContentType(contentType) {
   return contentType?.toLowerCase().startsWith("text/html") || false;
 }
-var ASSET_PRESERVATION_CACHE, CACHE_CONTROL_PRESERVATION, CACHE_CONTROL_BROWSER, REDIRECTS_VERSION2, HEADERS_VERSION2, HEADERS_VERSION_V1, ANALYTICS_VERSION2, ALLOWED_EARLY_HINT_LINK_ATTRIBUTES;
+var ASSET_PRESERVATION_CACHE_V1, ASSET_PRESERVATION_CACHE_V2, CACHE_CONTROL_PRESERVATION, CACHE_PRESERVATION_WRITE_FREQUENCY, CACHE_CONTROL_BROWSER, REDIRECTS_VERSION2, HEADERS_VERSION2, HEADERS_VERSION_V1, ANALYTICS_VERSION2, ALLOWED_EARLY_HINT_LINK_ATTRIBUTES;
 var init_handler = __esm({
   "../pages-shared/asset-server/handler.ts"() {
     init_import_meta_url();
     init_responses();
     init_rulesEngine();
-    ASSET_PRESERVATION_CACHE = "assetPreservationCache";
+    ASSET_PRESERVATION_CACHE_V1 = "assetPreservationCache";
+    ASSET_PRESERVATION_CACHE_V2 = "assetPreservationCacheV2";
     CACHE_CONTROL_PRESERVATION = "public, s-maxage=604800";
+    CACHE_PRESERVATION_WRITE_FREQUENCY = 86400;
     CACHE_CONTROL_BROWSER = "public, max-age=0, must-revalidate";
     REDIRECTS_VERSION2 = 1;
     HEADERS_VERSION2 = 2;
@@ -139665,6 +139732,7 @@ var init_handler = __esm({
     __name(parseQualityWeightedList, "parseQualityWeightedList");
     __name(isCacheable, "isCacheable");
     __name(isPreview, "isPreview");
+    __name(isPreservationCacheResponseExpiring, "isPreservationCacheResponseExpiring");
     __name(isHTMLContentType, "isHTMLContentType");
   }
 });
@@ -152336,7 +152404,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.53.0";
+var version = "3.55.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -157253,6 +157321,12 @@ var validateDurableObjectBinding = /* @__PURE__ */ __name((diagnostics, field, v
     );
     isValid = false;
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "class_name",
+    "environment",
+    "name",
+    "script_name"
+  ]);
   return isValid;
 }, "validateDurableObjectBinding");
 var validateCflogfwdrObject = /* @__PURE__ */ __name((envName) => (diagnostics, field, value, topLevelEnv) => {
@@ -157289,6 +157363,10 @@ var validateCflogfwdrBinding = /* @__PURE__ */ __name((diagnostics, field, value
     );
     isValid = false;
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "destination",
+    "name"
+  ]);
   return isValid;
 }, "validateCflogfwdrBinding");
 var validateBrowserBinding = /* @__PURE__ */ __name((envName) => (diagnostics, field, value, config) => {
@@ -157306,6 +157384,9 @@ var validateBrowserBinding = /* @__PURE__ */ __name((envName) => (diagnostics, f
     diagnostics.errors.push(`binding should have a string "binding" field.`);
     isValid = false;
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "binding"
+  ]);
   return isValid;
 }, "validateBrowserBinding");
 var validateAIBinding = /* @__PURE__ */ __name((envName) => (diagnostics, field, value, config) => {
@@ -157480,6 +157561,11 @@ var validateKVBinding = /* @__PURE__ */ __name((diagnostics, field, value) => {
     );
     isValid = false;
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "binding",
+    "id",
+    "preview_id"
+  ]);
   return isValid;
 }, "validateKVBinding");
 var validateSendEmailBinding = /* @__PURE__ */ __name((diagnostics, field, value) => {
@@ -157522,6 +157608,12 @@ var validateSendEmailBinding = /* @__PURE__ */ __name((diagnostics, field, value
     );
     isValid = false;
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "allowed_destination_addresses",
+    "destination_address",
+    "name",
+    "binding"
+  ]);
   return isValid;
 }, "validateSendEmailBinding");
 var validateQueueBinding = /* @__PURE__ */ __name((diagnostics, field, value) => {
@@ -157608,6 +157700,12 @@ var validateR2Binding = /* @__PURE__ */ __name((diagnostics, field, value) => {
     );
     isValid = false;
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "binding",
+    "bucket_name",
+    "preview_bucket_name",
+    "jurisdiction"
+  ]);
   return isValid;
 }, "validateR2Binding");
 var validateD1Binding = /* @__PURE__ */ __name((diagnostics, field, value) => {
@@ -157648,6 +157746,15 @@ var validateD1Binding = /* @__PURE__ */ __name((diagnostics, field, value) => {
     );
     isValid = false;
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "binding",
+    "database_id",
+    "database_internal_env",
+    "database_name",
+    "migrations_dir",
+    "migrations_table",
+    "preview_database_id"
+  ]);
   return isValid;
 }, "validateD1Binding");
 var validateVectorizeBinding = /* @__PURE__ */ __name((diagnostics, field, value) => {
@@ -157674,6 +157781,10 @@ var validateVectorizeBinding = /* @__PURE__ */ __name((diagnostics, field, value
     );
     isValid = false;
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "binding",
+    "index_name"
+  ]);
   return isValid;
 }, "validateVectorizeBinding");
 var validateConstellationBinding = /* @__PURE__ */ __name((diagnostics, field, value) => {
@@ -157707,6 +157818,10 @@ var validateConstellationBinding = /* @__PURE__ */ __name((diagnostics, field, v
       "Constellation Bindings are currently in beta to allow the API to evolve before general availability.\nPlease report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose\nNote: Run this command with the environment variable NO_CONSTELLATION_WARNING=true to hide this message\n\nFor example: `export NO_CONSTELLATION_WARNING=true && wrangler <YOUR COMMAND HERE>`"
     );
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "binding",
+    "project_id"
+  ]);
   return isValid;
 }, "validateConstellationBinding");
 var validateHyperdriveBinding = /* @__PURE__ */ __name((diagnostics, field, value) => {
@@ -157735,6 +157850,11 @@ var validateHyperdriveBinding = /* @__PURE__ */ __name((diagnostics, field, valu
     );
     isValid = false;
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "binding",
+    "id",
+    "localConnectionString"
+  ]);
   return isValid;
 }, "validateHyperdriveBinding");
 var validateBindingsHaveUniqueNames = /* @__PURE__ */ __name((diagnostics, {
@@ -157875,6 +157995,10 @@ var validateAnalyticsEngineBinding = /* @__PURE__ */ __name((diagnostics, field,
     );
     isValid = false;
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "binding",
+    "dataset"
+  ]);
   return isValid;
 }, "validateAnalyticsEngineBinding");
 var validateWorkerNamespaceBinding = /* @__PURE__ */ __name((diagnostics, field, value) => {
@@ -157970,6 +158094,10 @@ var validateMTlsCertificateBinding = /* @__PURE__ */ __name((diagnostics, field,
     );
     isValid = false;
   }
+  validateAdditionalProperties(diagnostics, field, Object.keys(value), [
+    "binding",
+    "certificate_id"
+  ]);
   return isValid;
 }, "validateMTlsCertificateBinding");
 function validateQueues(envName) {
@@ -161616,7 +161744,10 @@ function d1DatabaseEntry(db) {
 }
 __name(d1DatabaseEntry, "d1DatabaseEntry");
 function queueProducerEntry(queue) {
-  return [queue.binding, queue.queue_name];
+  return [
+    queue.binding,
+    { queueName: queue.queue_name, deliveryDelay: queue.delivery_delay }
+  ];
 }
 __name(queueProducerEntry, "queueProducerEntry");
 function hyperdriveEntry(hyperdrive2) {
@@ -161632,7 +161763,8 @@ function queueConsumerEntry(consumer) {
     maxBatchSize: consumer.max_batch_size,
     maxBatchTimeout: consumer.max_batch_timeout,
     maxRetires: consumer.max_retries,
-    deadLetterQueue: consumer.dead_letter_queue
+    deadLetterQueue: consumer.dead_letter_queue,
+    retryDelay: consumer.retry_delay
   };
   return [consumer.queue, options29];
 }
@@ -162416,11 +162548,12 @@ function createWorkerUploadForm(worker) {
       });
     }
   );
-  bindings.queues?.forEach(({ binding, queue_name }) => {
+  bindings.queues?.forEach(({ binding, queue_name, delivery_delay }) => {
     metadataBindings.push({
       type: "queue",
       name: binding,
-      queue_name
+      queue_name,
+      delivery_delay
     });
   });
   bindings.r2_buckets?.forEach(({ binding, bucket_name, jurisdiction }) => {
@@ -162704,18 +162837,18 @@ function loadSourceMap({ name, filePath }, sourceMapPath, { entryDirectory }) {
     return [];
   }
   const map = JSON.parse(
-    import_node_fs16.default.readFileSync(sourceMapPath, "utf8")
+    import_node_fs16.default.readFileSync(import_node_path25.default.join(entryDirectory, sourceMapPath), "utf8")
   );
   map.file = name;
   if (map.sourceRoot) {
     const sourceRootPath = import_node_path25.default.dirname(
       import_node_path25.default.join(entryDirectory, sourceMapPath)
     );
-    map.sourceRoot = stripPathPrefix(sourceRootPath, map.sourceRoot);
+    map.sourceRoot = import_node_path25.default.relative(sourceRootPath, map.sourceRoot);
   }
   map.sources = map.sources.map((source) => {
     const originalPath = import_node_path25.default.join(import_node_path25.default.dirname(filePath), source);
-    return stripPathPrefix(entryDirectory, originalPath);
+    return import_node_path25.default.relative(entryDirectory, originalPath);
   });
   return [
     {
@@ -162768,13 +162901,6 @@ function cleanPathPrefix(filePath) {
   );
 }
 __name(cleanPathPrefix, "cleanPathPrefix");
-function stripPathPrefix(prefix, filePath) {
-  return stripPrefix(
-    prefix,
-    stripPrefix(prefix + "\\", stripPrefix(prefix + "/", filePath))
-  );
-}
-__name(stripPathPrefix, "stripPathPrefix");
 function stripPrefix(prefix, input) {
   let stripped = input;
   while (stripped.startsWith(prefix)) {
@@ -178157,7 +178283,6 @@ async function getWorkerNamespaceInfo(accountId, name) {
 }
 __name(getWorkerNamespaceInfo, "getWorkerNamespaceInfo");
 async function renameWorkerNamespace(accountId, oldName, newName) {
-  void printWranglerBanner();
   await fetchResult(
     `/accounts/${accountId}/workers/dispatch/namespaces/${oldName}`,
     {
@@ -197570,6 +197695,31 @@ async function typesHandler(args) {
   );
 }
 __name(typesHandler, "typesHandler");
+function isValidIdentifier2(key) {
+  return /^[a-zA-Z_$][\w$]*$/.test(key);
+}
+__name(isValidIdentifier2, "isValidIdentifier");
+function constructTypeKey(key) {
+  if (isValidIdentifier2(key)) {
+    return `${key}`;
+  }
+  return `"${key}"`;
+}
+__name(constructTypeKey, "constructTypeKey");
+function constructType(key, value, useRawVal = true) {
+  const typeKey = constructTypeKey(key);
+  if (typeof value === "string") {
+    if (useRawVal) {
+      return `${typeKey}: ${value};`;
+    }
+    return `${typeKey}: "${value.replace(/"/g, '\\"')}";`;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return `${typeKey}: ${value};`;
+  }
+  return `${typeKey}: unknown;`;
+}
+__name(constructType, "constructType");
 async function generateTypes(configToDTS, config, envInterface, outputPath) {
   const configContainsEntryPoint = config.main !== void 0 || !!config.site?.["entry-point"];
   const entrypointFormat = configContainsEntryPoint ? (await getEntry({}, config, "types")).format : "modules";
@@ -197582,7 +197732,7 @@ async function generateTypes(configToDTS, config, envInterface, outputPath) {
   const envTypeStructure = [];
   if (configToDTS.kv_namespaces) {
     for (const kvNamespace2 of configToDTS.kv_namespaces) {
-      envTypeStructure.push(`${kvNamespace2.binding}: KVNamespace;`);
+      envTypeStructure.push(constructType(kvNamespace2.binding, "KVNamespace"));
     }
   }
   if (configToDTS.vars) {
@@ -197591,103 +197741,111 @@ async function generateTypes(configToDTS, config, envInterface, outputPath) {
     );
     for (const [varName, varValue] of vars) {
       if (typeof varValue === "string" || typeof varValue === "number" || typeof varValue === "boolean") {
-        envTypeStructure.push(`${varName}: "${varValue}";`);
+        envTypeStructure.push(constructType(varName, varValue, false));
       }
       if (typeof varValue === "object" && varValue !== null) {
-        envTypeStructure.push(`${varName}: ${JSON.stringify(varValue)};`);
+        envTypeStructure.push(
+          constructType(varName, JSON.stringify(varValue), true)
+        );
       }
     }
   }
   for (const secretName in configToDTS.secrets) {
-    envTypeStructure.push(`${secretName}: string;`);
+    envTypeStructure.push(constructType(secretName, "string", true));
   }
   if (configToDTS.durable_objects?.bindings) {
     for (const durableObject of configToDTS.durable_objects.bindings) {
-      envTypeStructure.push(`${durableObject.name}: DurableObjectNamespace;`);
+      envTypeStructure.push(
+        constructType(durableObject.name, "DurableObjectNamespace")
+      );
     }
   }
   if (configToDTS.r2_buckets) {
     for (const R2Bucket of configToDTS.r2_buckets) {
-      envTypeStructure.push(`${R2Bucket.binding}: R2Bucket;`);
+      envTypeStructure.push(constructType(R2Bucket.binding, "R2Bucket"));
     }
   }
   if (configToDTS.d1_databases) {
     for (const d12 of configToDTS.d1_databases) {
-      envTypeStructure.push(`${d12.binding}: D1Database;`);
+      envTypeStructure.push(constructType(d12.binding, "D1Database"));
     }
   }
   if (configToDTS.services) {
     for (const service of configToDTS.services) {
-      envTypeStructure.push(`${service.binding}: Fetcher;`);
+      envTypeStructure.push(constructType(service.binding, "Fetcher"));
     }
   }
   if (configToDTS.constellation) {
     for (const service of configToDTS.constellation) {
-      envTypeStructure.push(`${service.binding}: Fetcher;`);
+      envTypeStructure.push(constructType(service.binding, "Fetcher"));
     }
   }
   if (configToDTS.analytics_engine_datasets) {
     for (const analyticsEngine of configToDTS.analytics_engine_datasets) {
       envTypeStructure.push(
-        `${analyticsEngine.binding}: AnalyticsEngineDataset;`
+        constructType(analyticsEngine.binding, "AnalyticsEngineDataset")
       );
     }
   }
   if (configToDTS.dispatch_namespaces) {
     for (const namespace of configToDTS.dispatch_namespaces) {
-      envTypeStructure.push(`${namespace.binding}: DispatchNamespace;`);
+      envTypeStructure.push(
+        constructType(namespace.binding, "DispatchNamespace")
+      );
     }
   }
   if (configToDTS.logfwdr?.bindings?.length) {
-    envTypeStructure.push(`LOGFWDR_SCHEMA: any;`);
+    envTypeStructure.push(constructType("LOGFWDR_SCHEMA", "any"));
   }
   if (configToDTS.data_blobs) {
     for (const dataBlobs in configToDTS.data_blobs) {
-      envTypeStructure.push(`${dataBlobs}: ArrayBuffer;`);
+      envTypeStructure.push(constructType(dataBlobs, "ArrayBuffer"));
     }
   }
   if (configToDTS.text_blobs) {
     for (const textBlobs in configToDTS.text_blobs) {
-      envTypeStructure.push(`${textBlobs}: string;`);
+      envTypeStructure.push(constructType(textBlobs, "string"));
     }
   }
   if (configToDTS.unsafe?.bindings) {
     for (const unsafe of configToDTS.unsafe.bindings) {
-      envTypeStructure.push(`${unsafe.name}: any;`);
+      envTypeStructure.push(constructType(unsafe.name, "any"));
     }
   }
   if (configToDTS.queues) {
     if (configToDTS.queues.producers) {
       for (const queue of configToDTS.queues.producers) {
-        envTypeStructure.push(`${queue.binding}: Queue;`);
+        envTypeStructure.push(constructType(queue.binding, "Queue"));
       }
     }
   }
   if (configToDTS.send_email) {
     for (const sendEmail of configToDTS.send_email) {
-      envTypeStructure.push(`${sendEmail.name}: SendEmail;`);
+      envTypeStructure.push(constructType(sendEmail.name, "SendEmail"));
     }
   }
   if (configToDTS.vectorize) {
     for (const vectorize2 of configToDTS.vectorize) {
-      envTypeStructure.push(`${vectorize2.binding}: VectorizeIndex;`);
+      envTypeStructure.push(constructType(vectorize2.binding, "VectorizeIndex"));
     }
   }
   if (configToDTS.hyperdrive) {
     for (const hyperdrive2 of configToDTS.hyperdrive) {
-      envTypeStructure.push(`${hyperdrive2.binding}: Hyperdrive;`);
+      envTypeStructure.push(constructType(hyperdrive2.binding, "Hyperdrive"));
     }
   }
   if (configToDTS.mtls_certificates) {
     for (const mtlsCertificate of configToDTS.mtls_certificates) {
-      envTypeStructure.push(`${mtlsCertificate.binding}: Fetcher;`);
+      envTypeStructure.push(constructType(mtlsCertificate.binding, "Fetcher"));
     }
   }
   if (configToDTS.browser) {
-    envTypeStructure.push(`${configToDTS.browser.binding}: Fetcher;`);
+    envTypeStructure.push(
+      constructType(configToDTS.browser.binding, "Fetcher")
+    );
   }
   if (configToDTS.ai) {
-    envTypeStructure.push(`${configToDTS.ai.binding}: unknown;`);
+    envTypeStructure.push(constructType(configToDTS.ai.binding, "unknown"));
   }
   if (configToDTS.version_metadata) {
     envTypeStructure.push(
@@ -200490,10 +200648,7 @@ ${tryRunningItIn}${oneOfThese}`
     } else {
       logger.error(e3 instanceof Error ? e3.message : e3);
       if (!(e3 instanceof UserError)) {
-        logger.log(
-          `${fgGreenColor}%s${resetColor}`,
-          "If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
-        );
+        await logPossibleBugMessage();
       }
     }
     if (
@@ -200540,6 +200695,19 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates/ for
   return compatibilityDate ?? currentDate;
 }
 __name(getDevCompatibilityDate, "getDevCompatibilityDate");
+async function logPossibleBugMessage() {
+  logger.log(
+    `${fgGreenColor}%s${resetColor}`,
+    "If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
+  );
+  const latestVersion = await updateCheck();
+  if (latestVersion) {
+    logger.log(
+      `Note that there is a newer version of Wrangler available (${latestVersion}). Consider checking whether upgrading resolves this error.`
+    );
+  }
+}
+__name(logPossibleBugMessage, "logPossibleBugMessage");
 
 // src/init.ts
 function initOptions(yargs) {
@@ -201429,7 +201597,7 @@ function logVersionIdChange() {
   logger.log(
     `
 
-NOTE: "Deployment ID" in this output will be changed to "Version ID" in a future version of Wrangler. To learn more visit: ${docsLink}`
+Note: Deployment ID has been renamed to Version ID. Deployment ID is present to maintain compatibility with the previous behavior of this command. This output will change in a future version of Wrangler. To learn more visit: ${docsLink}`
   );
 }
 __name(logVersionIdChange, "logVersionIdChange");
@@ -201458,6 +201626,7 @@ async function deployments(accountId, scriptName, { send_metrics: sendMetrics }
     )} from ${formatSource2(versions.metadata.source)}` : `${formatSource2(versions.metadata.source)}`;
     let version3 = `
 Deployment ID: ${versions.id}
+Version ID:    ${versions.id}
 Created on:    ${versions.metadata.created_on}
 Author:        ${versions.metadata.author_email}
 Source:        ${triggerStr}`;
@@ -201547,7 +201716,7 @@ async function rollbackDeployment(accountId, scriptName, { send_metrics: sendMet
       { defaultValue: "" }
     );
   }
-  let deployment_id = await rollbackRequest(
+  let rollbackVersion = await rollbackRequest(
     accountId,
     scriptName,
     deploymentId,
@@ -201561,10 +201730,11 @@ async function rollbackDeployment(accountId, scriptName, { send_metrics: sendMet
     }
   );
   deploymentId = addHyphens(deploymentId) ?? deploymentId;
-  deployment_id = addHyphens(deployment_id) ?? deployment_id;
+  rollbackVersion = addHyphens(rollbackVersion) ?? rollbackVersion;
   logger.log(`
 Successfully rolled back to Deployment ID: ${deploymentId}`);
-  logger.log("Current Deployment ID:", deployment_id);
+  logger.log("Current Deployment ID:", rollbackVersion);
+  logger.log("Current Version ID:", rollbackVersion);
   logVersionIdChange();
 }
 __name(rollbackDeployment, "rollbackDeployment");
@@ -201621,6 +201791,7 @@ Compatibility Flags: ${deploymentDetails.resources.script_runtime?.compatibility
   const bindings = deploymentDetails.resources.bindings;
   const version3 = `
 Deployment ID:       ${deploymentDetails.id}
+Version ID:          ${deploymentDetails.id}
 Created on:          ${deploymentDetails.metadata.created_on}
 Author:              ${deploymentDetails.metadata.author_email}
 Source:              ${triggerStr}${rollbackStr}${reasonStr}
@@ -202179,12 +202350,14 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
   }
   await triggersDeploy(props);
   logger.log("Current Deployment ID:", deploymentId);
+  logger.log("Current Version ID:", deploymentId);
   logVersionIdChange();
 }
 __name(deploy, "deploy");
 function deployWfpUserWorker(dispatchNamespace, deploymentId) {
   logger.log("  Dispatch Namespace:", dispatchNamespace);
   logger.log("Current Deployment ID:", deploymentId);
+  logger.log("Current Version ID:", deploymentId);
   logVersionIdChange();
 }
 __name(deployWfpUserWorker, "deployWfpUserWorker");
@@ -203506,7 +203679,7 @@ function useEsbuild({
   testScheduled,
   experimentalLocal,
   projectRoot,
-  onBundleStart,
+  onStart,
   defineNavigatorUserAgent
 }) {
   const [bundle, setBundle] = (0, import_react18.useState)();
@@ -203550,7 +203723,7 @@ function useEsbuild({
       name: "on-end",
       setup(b2) {
         b2.onStart(() => {
-          onBundleStart();
+          onStart();
         });
         b2.onEnd(async (result) => {
           const errors = result.errors;
@@ -203662,7 +203835,7 @@ function useEsbuild({
     testScheduled,
     experimentalLocal,
     projectRoot,
-    onBundleStart,
+    onStart,
     defineNavigatorUserAgent
   ]);
   return bundle;
@@ -203849,17 +204022,36 @@ function DevSession(props) {
       config: startDevWorkerOptions
     });
   }, [devEnv, startDevWorkerOptions]);
+  const esbuildStartTimeoutRef = (0, import_react19.useRef)();
+  const latestReloadCompleteEvent = (0, import_react19.useRef)();
+  const bundle = (0, import_react19.useRef)();
+  const onCustomBuildEnd = (0, import_react19.useCallback)(() => {
+    const TIMEOUT = 300;
+    clearTimeout(esbuildStartTimeoutRef.current);
+    esbuildStartTimeoutRef.current = setTimeout(() => {
+      if (latestReloadCompleteEvent.current) {
+        devEnv.proxy.onReloadComplete(latestReloadCompleteEvent.current);
+      }
+    }, TIMEOUT);
+    return () => {
+      clearTimeout(esbuildStartTimeoutRef.current);
+    };
+  }, [devEnv, latestReloadCompleteEvent]);
+  const onEsbuildStart = (0, import_react19.useCallback)(() => {
+    clearTimeout(esbuildStartTimeoutRef.current);
+    onBundleStart();
+  }, [esbuildStartTimeoutRef, onBundleStart]);
   const onReloadStart = (0, import_react19.useCallback)(
-    (bundle2) => {
+    (esbuildBundle) => {
       devEnv.proxy.onReloadStart({
         type: "reloadStart",
         config: startDevWorkerOptions,
-        bundle: bundle2
+        bundle: esbuildBundle
       });
     },
     [devEnv, startDevWorkerOptions]
   );
-  useCustomBuild(props.entry, props.build, onBundleStart);
+  useCustomBuild(props.entry, props.build, onBundleStart, onCustomBuildEnd);
   const directory = useTmpDir(props.projectRoot);
   const workerDefinitions = useDevRegistry(
     props.name,
@@ -203873,7 +204065,7 @@ function DevSession(props) {
       config: startDevWorkerOptions
     });
   }, [devEnv, startDevWorkerOptions]);
-  const bundle = useEsbuild({
+  bundle.current = useEsbuild({
     entry: props.entry,
     destination: directory,
     jsxFactory: props.jsxFactory,
@@ -203901,15 +204093,15 @@ function DevSession(props) {
     testScheduled: props.testScheduled ?? false,
     experimentalLocal: props.experimentalLocal,
     projectRoot: props.projectRoot,
-    onBundleStart,
+    onStart: onEsbuildStart,
     defineNavigatorUserAgent: isNavigatorDefined(
       props.compatibilityDate,
       props.compatibilityFlags
     )
   });
   (0, import_react19.useEffect)(() => {
-    if (bundle)
-      onReloadStart(bundle);
+    if (bundle.current)
+      onReloadStart(bundle.current);
   }, [onReloadStart, bundle]);
   if (!props.local && (props.bindings.queues?.length || props.queueConsumers?.length)) {
     logger.warn(
@@ -203943,13 +204135,14 @@ function DevSession(props) {
         })
       );
     }
-    if (bundle) {
-      devEnv.proxy.onReloadComplete({
+    if (bundle.current) {
+      latestReloadCompleteEvent.current = {
         type: "reloadComplete",
         config: startDevWorkerOptions,
-        bundle,
+        bundle: bundle.current,
         proxyData
-      });
+      };
+      devEnv.proxy.onReloadComplete(latestReloadCompleteEvent.current);
     }
     if (props.onReady) {
       props.onReady(finalIp, finalPort, proxyData);
@@ -203959,7 +204152,7 @@ function DevSession(props) {
     Local,
     {
       name: props.name,
-      bundle,
+      bundle: bundle.current,
       format: props.entry.format,
       compatibilityDate: props.compatibilityDate,
       compatibilityFlags: props.compatibilityFlags,
@@ -203984,14 +204177,14 @@ function DevSession(props) {
       inspect: props.inspect,
       onReady: announceAndOnReady,
       enablePagesAssetsServiceBinding: props.enablePagesAssetsServiceBinding,
-      sourceMapPath: bundle?.sourceMapPath,
+      sourceMapPath: bundle.current?.sourceMapPath,
       services: props.bindings.services
     }
   ) : /* @__PURE__ */ import_react19.default.createElement(
     Remote,
     {
       name: props.name,
-      bundle,
+      bundle: bundle.current,
       format: props.entry.format,
       accountId: props.accountId,
       bindings: props.bindings,
@@ -204012,7 +204205,7 @@ function DevSession(props) {
       host: props.host,
       routes: props.routes,
       onReady: announceAndOnReady,
-      sourceMapPath: bundle?.sourceMapPath,
+      sourceMapPath: bundle.current?.sourceMapPath,
       sendMetrics: props.sendMetrics
     }
   );
@@ -204038,7 +204231,7 @@ function useTmpDir(projectRoot) {
   return directory;
 }
 __name(useTmpDir, "useTmpDir");
-function useCustomBuild(expectedEntry, build5, onBundleStart) {
+function useCustomBuild(expectedEntry, build5, onStart, onEnd) {
   (0, import_react19.useEffect)(() => {
     if (!build5.command)
       return;
@@ -204050,16 +204243,18 @@ function useCustomBuild(expectedEntry, build5, onBundleStart) {
       }).on("all", (_event, filePath) => {
         const relativeFile = path61.relative(expectedEntry.directory, expectedEntry.file) || ".";
         logger.log(`The file ${filePath} changed, restarting build...`);
-        onBundleStart();
+        onStart();
         runCustomBuild(expectedEntry.file, relativeFile, build5).catch((err) => {
           logger.error("Custom build failed:", err);
+        }).finally(() => {
+          onEnd();
         });
       });
     }
     return () => {
       void watcher?.close();
     };
-  }, [build5, expectedEntry, onBundleStart]);
+  }, [build5, expectedEntry, onStart, onEnd]);
 }
 __name(useCustomBuild, "useCustomBuild");
 function sleep3(period) {
@@ -205277,7 +205472,11 @@ function getBindings(configParam, env5, local, args) {
   });
   const queuesBindings = [
     ...(configParam.queues.producers || []).map((queue) => {
-      return { binding: queue.binding, queue_name: queue.queue };
+      return {
+        binding: queue.binding,
+        queue_name: queue.queue,
+        delivery_delay: queue.delivery_delay
+      };
     })
   ];
   const bindings = {