wrangler 0.0.21 → 0.0.24

package/wrangler-dist/cli.js

@@ -1659,20 +1659,20 @@ var require_parse_async = __commonJS({
       const index = 0;
       const blocksize = opts.blocksize || 40960;
       const parser2 = new TOMLParser();
-      return new Promise((resolve7, reject) => {
-        setImmediate(parseAsyncNext, index, blocksize, resolve7, reject);
+      return new Promise((resolve8, reject) => {
+        setImmediate(parseAsyncNext, index, blocksize, resolve8, reject);
       });
-      function parseAsyncNext(index2, blocksize2, resolve7, reject) {
+      function parseAsyncNext(index2, blocksize2, resolve8, reject) {
         if (index2 >= str.length) {
           try {
-            return resolve7(parser2.finish());
+            return resolve8(parser2.finish());
           } catch (err2) {
             return reject(prettyError(err2, str));
           }
         }
         try {
           parser2.parse(str.slice(index2, index2 + blocksize2));
-          setImmediate(parseAsyncNext, index2 + blocksize2, blocksize2, resolve7, reject);
+          setImmediate(parseAsyncNext, index2 + blocksize2, blocksize2, resolve8, reject);
         } catch (err2) {
           reject(prettyError(err2, str));
         }
@@ -1699,7 +1699,7 @@ var require_parse_stream = __commonJS({
     function parseReadable(stm) {
       const parser2 = new TOMLParser();
       stm.setEncoding("utf8");
-      return new Promise((resolve7, reject) => {
+      return new Promise((resolve8, reject) => {
         let readable;
         let ended = false;
         let errored = false;
@@ -1708,7 +1708,7 @@ var require_parse_stream = __commonJS({
           if (readable)
             return;
           try {
-            resolve7(parser2.finish());
+            resolve8(parser2.finish());
           } catch (err2) {
             reject(err2);
           }
@@ -2167,11 +2167,11 @@ var require_tslib = __commonJS({
       };
       __awaiter = function(thisArg, _arguments, P, generator) {
         function adopt(value) {
-          return value instanceof P ? value : new P(function(resolve7) {
-            resolve7(value);
+          return value instanceof P ? value : new P(function(resolve8) {
+            resolve8(value);
           });
         }
-        return new (P || (P = Promise))(function(resolve7, reject) {
+        return new (P || (P = Promise))(function(resolve8, reject) {
           function fulfilled(value) {
             try {
               step(generator.next(value));
@@ -2187,7 +2187,7 @@ var require_tslib = __commonJS({
             }
           }
           function step(result) {
-            result.done ? resolve7(result.value) : adopt(result.value).then(fulfilled, rejected);
+            result.done ? resolve8(result.value) : adopt(result.value).then(fulfilled, rejected);
           }
           step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
@@ -2387,14 +2387,14 @@ var require_tslib = __commonJS({
         }, i2);
         function verb(n) {
           i2[n] = o[n] && function(v) {
-            return new Promise(function(resolve7, reject) {
-              v = o[n](v), settle(resolve7, reject, v.done, v.value);
+            return new Promise(function(resolve8, reject) {
+              v = o[n](v), settle(resolve8, reject, v.done, v.value);
             });
           };
         }
-        function settle(resolve7, reject, d, v) {
+        function settle(resolve8, reject, d, v) {
           Promise.resolve(v).then(function(v2) {
-            resolve7({ value: v2, done: d });
+            resolve8({ value: v2, done: d });
           }, reject);
         }
       };
@@ -4075,7 +4075,7 @@ var require_path = __commonJS({
       var parts = splitPathRe.exec(filename);
       return parts ? parts.slice(1) : [];
     }
-    function resolve7() {
+    function resolve8() {
       var args2 = [];
       for (var _i = 0; _i < arguments.length; _i++) {
         args2[_i] = arguments[_i];
@@ -4095,7 +4095,7 @@ var require_path = __commonJS({
       }), !resolvedAbsolute).join("/");
       return (resolvedAbsolute ? "/" : "") + resolvedPath || ".";
     }
-    exports2.resolve = resolve7;
+    exports2.resolve = resolve8;
     function trim(arr) {
       var start = 0;
       for (; start < arr.length; start++) {
@@ -4115,8 +4115,8 @@ var require_path = __commonJS({
       return arr.slice(start, end - start + 1);
     }
     function relative4(from, to) {
-      from = resolve7(from).substr(1);
-      to = resolve7(to).substr(1);
+      from = resolve8(from).substr(1);
+      to = resolve8(to).substr(1);
       var fromParts = trim(from.split("/"));
       var toParts = trim(to.split("/"));
       var length = Math.min(fromParts.length, toParts.length);
@@ -4193,8 +4193,8 @@ var require_syncpromise = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     var is_1 = require_is();
     function resolvedSyncPromise(value) {
-      return new SyncPromise(function(resolve7) {
-        resolve7(value);
+      return new SyncPromise(function(resolve8) {
+        resolve8(value);
       });
     }
     exports2.resolvedSyncPromise = resolvedSyncPromise;
@@ -4254,15 +4254,15 @@ var require_syncpromise = __commonJS({
       }
       SyncPromise2.prototype.then = function(onfulfilled, onrejected) {
         var _this = this;
-        return new SyncPromise2(function(resolve7, reject) {
+        return new SyncPromise2(function(resolve8, reject) {
           _this._handlers.push([
             false,
             function(result) {
               if (!onfulfilled) {
-                resolve7(result);
+                resolve8(result);
               } else {
                 try {
-                  resolve7(onfulfilled(result));
+                  resolve8(onfulfilled(result));
                 } catch (e2) {
                   reject(e2);
                 }
@@ -4273,7 +4273,7 @@ var require_syncpromise = __commonJS({
                 reject(reason);
               } else {
                 try {
-                  resolve7(onrejected(reason));
+                  resolve8(onrejected(reason));
                 } catch (e2) {
                   reject(e2);
                 }
@@ -4290,7 +4290,7 @@ var require_syncpromise = __commonJS({
       };
       SyncPromise2.prototype.finally = function(onfinally) {
         var _this = this;
-        return new SyncPromise2(function(resolve7, reject) {
+        return new SyncPromise2(function(resolve8, reject) {
           var val;
           var isRejected;
           return _this.then(function(value) {
@@ -4310,7 +4310,7 @@ var require_syncpromise = __commonJS({
               reject(val);
               return;
             }
-            resolve7(val);
+            resolve8(val);
           });
         });
       };
@@ -4352,21 +4352,21 @@ var require_promisebuffer = __commonJS({
         return task;
       }
       function drain(timeout) {
-        return new syncpromise_1.SyncPromise(function(resolve7, reject) {
+        return new syncpromise_1.SyncPromise(function(resolve8, reject) {
           var counter = buffer2.length;
           if (!counter) {
-            return resolve7(true);
+            return resolve8(true);
           }
           var capturedSetTimeout = setTimeout(function() {
             if (timeout && timeout > 0) {
-              resolve7(false);
+              resolve8(false);
             }
           }, timeout);
           buffer2.forEach(function(item) {
             void syncpromise_1.resolvedSyncPromise(item).then(function() {
               if (!--counter) {
                 clearTimeout(capturedSetTimeout);
-                resolve7(true);
+                resolve8(true);
               }
             }, reject);
           });
@@ -5303,8 +5303,8 @@ var require_localforage = __commonJS({
           }
           return out;
         }
-        Promise2.resolve = resolve7;
-        function resolve7(value) {
+        Promise2.resolve = resolve8;
+        function resolve8(value) {
           if (value instanceof this) {
             return value;
           }
@@ -5500,19 +5500,19 @@ var require_localforage = __commonJS({
           return buf;
         }
         function _checkBlobSupportWithoutCaching(idb2) {
-          return new Promise$1(function(resolve7) {
+          return new Promise$1(function(resolve8) {
             var txn = idb2.transaction(DETECT_BLOB_SUPPORT_STORE, READ_WRITE);
             var blob = createBlob([""]);
             txn.objectStore(DETECT_BLOB_SUPPORT_STORE).put(blob, "key");
             txn.onabort = function(e2) {
               e2.preventDefault();
               e2.stopPropagation();
-              resolve7(false);
+              resolve8(false);
             };
             txn.oncomplete = function() {
               var matchedChrome = navigator.userAgent.match(/Chrome\/(\d+)/);
               var matchedEdge = navigator.userAgent.match(/Edge\//);
-              resolve7(matchedEdge || !matchedChrome || parseInt(matchedChrome[1], 10) >= 43);
+              resolve8(matchedEdge || !matchedChrome || parseInt(matchedChrome[1], 10) >= 43);
             };
           })["catch"](function() {
             return false;
@@ -5530,8 +5530,8 @@ var require_localforage = __commonJS({
         function _deferReadiness(dbInfo) {
           var dbContext = dbContexts[dbInfo.name];
           var deferredOperation = {};
-          deferredOperation.promise = new Promise$1(function(resolve7, reject) {
-            deferredOperation.resolve = resolve7;
+          deferredOperation.promise = new Promise$1(function(resolve8, reject) {
+            deferredOperation.resolve = resolve8;
             deferredOperation.reject = reject;
           });
           dbContext.deferredOperations.push(deferredOperation);
@@ -5560,14 +5560,14 @@ var require_localforage = __commonJS({
           }
         }
         function _getConnection(dbInfo, upgradeNeeded) {
-          return new Promise$1(function(resolve7, reject) {
+          return new Promise$1(function(resolve8, reject) {
             dbContexts[dbInfo.name] = dbContexts[dbInfo.name] || createDbContext();
             if (dbInfo.db) {
               if (upgradeNeeded) {
                 _deferReadiness(dbInfo);
                 dbInfo.db.close();
               } else {
-                return resolve7(dbInfo.db);
+                return resolve8(dbInfo.db);
               }
             }
             var dbArgs = [dbInfo.name];
@@ -5601,7 +5601,7 @@ var require_localforage = __commonJS({
               db.onversionchange = function(e2) {
                 e2.target.close();
               };
-              resolve7(db);
+              resolve8(db);
               _advanceReadiness(dbInfo);
             };
           });
@@ -5637,12 +5637,12 @@ var require_localforage = __commonJS({
           return false;
         }
         function _encodeBlob(blob) {
-          return new Promise$1(function(resolve7, reject) {
+          return new Promise$1(function(resolve8, reject) {
             var reader = new FileReader();
             reader.onerror = reject;
             reader.onloadend = function(e2) {
               var base64 = btoa(e2.target.result || "");
-              resolve7({
+              resolve8({
                 __local_forage_encoded_blob: true,
                 data: base64,
                 type: blob.type
@@ -5785,7 +5785,7 @@ var require_localforage = __commonJS({
         function getItem(key3, callback) {
           var self2 = this;
           key3 = normalizeKey(key3);
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               createTransaction(self2._dbInfo, READ_ONLY, function(err2, transaction) {
                 if (err2) {
@@ -5802,7 +5802,7 @@ var require_localforage = __commonJS({
                     if (_isEncodedBlob(value)) {
                       value = _decodeBlob(value);
                     }
-                    resolve7(value);
+                    resolve8(value);
                   };
                   req.onerror = function() {
                     reject(req.error);
@@ -5818,7 +5818,7 @@ var require_localforage = __commonJS({
         }
         function iterate(iterator, callback) {
           var self2 = this;
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               createTransaction(self2._dbInfo, READ_ONLY, function(err2, transaction) {
                 if (err2) {
@@ -5837,12 +5837,12 @@ var require_localforage = __commonJS({
                       }
                       var result = iterator(value, cursor.key, iterationNumber++);
                       if (result !== void 0) {
-                        resolve7(result);
+                        resolve8(result);
                       } else {
                         cursor["continue"]();
                       }
                     } else {
-                      resolve7();
+                      resolve8();
                     }
                   };
                   req.onerror = function() {
@@ -5860,7 +5860,7 @@ var require_localforage = __commonJS({
         function setItem(key3, value, callback) {
           var self2 = this;
           key3 = normalizeKey(key3);
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             var dbInfo;
             self2.ready().then(function() {
               dbInfo = self2._dbInfo;
@@ -5888,7 +5888,7 @@ var require_localforage = __commonJS({
                     if (value2 === void 0) {
                       value2 = null;
                     }
-                    resolve7(value2);
+                    resolve8(value2);
                   };
                   transaction.onabort = transaction.onerror = function() {
                     var err3 = req.error ? req.error : req.transaction.error;
@@ -5906,7 +5906,7 @@ var require_localforage = __commonJS({
         function removeItem(key3, callback) {
           var self2 = this;
           key3 = normalizeKey(key3);
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               createTransaction(self2._dbInfo, READ_WRITE, function(err2, transaction) {
                 if (err2) {
@@ -5916,7 +5916,7 @@ var require_localforage = __commonJS({
                   var store = transaction.objectStore(self2._dbInfo.storeName);
                   var req = store["delete"](key3);
                   transaction.oncomplete = function() {
-                    resolve7();
+                    resolve8();
                   };
                   transaction.onerror = function() {
                     reject(req.error);
@@ -5936,7 +5936,7 @@ var require_localforage = __commonJS({
         }
         function clear(callback) {
           var self2 = this;
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               createTransaction(self2._dbInfo, READ_WRITE, function(err2, transaction) {
                 if (err2) {
@@ -5946,7 +5946,7 @@ var require_localforage = __commonJS({
                   var store = transaction.objectStore(self2._dbInfo.storeName);
                   var req = store.clear();
                   transaction.oncomplete = function() {
-                    resolve7();
+                    resolve8();
                   };
                   transaction.onabort = transaction.onerror = function() {
                     var err3 = req.error ? req.error : req.transaction.error;
@@ -5963,7 +5963,7 @@ var require_localforage = __commonJS({
         }
         function length(callback) {
           var self2 = this;
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               createTransaction(self2._dbInfo, READ_ONLY, function(err2, transaction) {
                 if (err2) {
@@ -5973,7 +5973,7 @@ var require_localforage = __commonJS({
                   var store = transaction.objectStore(self2._dbInfo.storeName);
                   var req = store.count();
                   req.onsuccess = function() {
-                    resolve7(req.result);
+                    resolve8(req.result);
                   };
                   req.onerror = function() {
                     reject(req.error);
@@ -5989,9 +5989,9 @@ var require_localforage = __commonJS({
         }
         function key2(n, callback) {
           var self2 = this;
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             if (n < 0) {
-              resolve7(null);
+              resolve8(null);
               return;
             }
             self2.ready().then(function() {
@@ -6006,17 +6006,17 @@ var require_localforage = __commonJS({
                   req.onsuccess = function() {
                     var cursor = req.result;
                     if (!cursor) {
-                      resolve7(null);
+                      resolve8(null);
                       return;
                     }
                     if (n === 0) {
-                      resolve7(cursor.key);
+                      resolve8(cursor.key);
                     } else {
                       if (!advanced) {
                         advanced = true;
                         cursor.advance(n);
                       } else {
-                        resolve7(cursor.key);
+                        resolve8(cursor.key);
                       }
                     }
                   };
@@ -6034,7 +6034,7 @@ var require_localforage = __commonJS({
         }
         function keys(callback) {
           var self2 = this;
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               createTransaction(self2._dbInfo, READ_ONLY, function(err2, transaction) {
                 if (err2) {
@@ -6047,7 +6047,7 @@ var require_localforage = __commonJS({
                   req.onsuccess = function() {
                     var cursor = req.result;
                     if (!cursor) {
-                      resolve7(keys2);
+                      resolve8(keys2);
                       return;
                     }
                     keys2.push(cursor.key);
@@ -6098,7 +6098,7 @@ var require_localforage = __commonJS({
                   var forage = forages[i2];
                   forage._dbInfo.db = null;
                 }
-                var dropDBPromise = new Promise$1(function(resolve7, reject) {
+                var dropDBPromise = new Promise$1(function(resolve8, reject) {
                   var req = idb.deleteDatabase(options.name);
                   req.onerror = function() {
                     var db2 = req.result;
@@ -6115,7 +6115,7 @@ var require_localforage = __commonJS({
                     if (db2) {
                       db2.close();
                     }
-                    resolve7(db2);
+                    resolve8(db2);
                   };
                 });
                 return dropDBPromise.then(function(db2) {
@@ -6145,7 +6145,7 @@ var require_localforage = __commonJS({
                   forage._dbInfo.db = null;
                   forage._dbInfo.version = newVersion;
                 }
-                var dropObjectPromise = new Promise$1(function(resolve7, reject) {
+                var dropObjectPromise = new Promise$1(function(resolve8, reject) {
                   var req = idb.open(options.name, newVersion);
                   req.onerror = function(err2) {
                     var db2 = req.result;
@@ -6159,7 +6159,7 @@ var require_localforage = __commonJS({
                   req.onsuccess = function() {
                     var db2 = req.result;
                     db2.close();
-                    resolve7(db2);
+                    resolve8(db2);
                   };
                 });
                 return dropObjectPromise.then(function(db2) {
@@ -6368,7 +6368,7 @@ var require_localforage = __commonJS({
               dbInfo[i2] = typeof options[i2] !== "string" ? options[i2].toString() : options[i2];
             }
           }
-          var dbInfoPromise = new Promise$1(function(resolve7, reject) {
+          var dbInfoPromise = new Promise$1(function(resolve8, reject) {
             try {
               dbInfo.db = openDatabase(dbInfo.name, String(dbInfo.version), dbInfo.description, dbInfo.size);
             } catch (e2) {
@@ -6377,7 +6377,7 @@ var require_localforage = __commonJS({
             dbInfo.db.transaction(function(t2) {
               createDbTable(t2, dbInfo, function() {
                 self2._dbInfo = dbInfo;
-                resolve7();
+                resolve8();
               }, function(t3, error) {
                 reject(error);
               });
@@ -6406,7 +6406,7 @@ var require_localforage = __commonJS({
         function getItem$1(key3, callback) {
           var self2 = this;
           key3 = normalizeKey(key3);
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               var dbInfo = self2._dbInfo;
               dbInfo.db.transaction(function(t2) {
@@ -6415,7 +6415,7 @@ var require_localforage = __commonJS({
                   if (result) {
                     result = dbInfo.serializer.deserialize(result);
                   }
-                  resolve7(result);
+                  resolve8(result);
                 }, function(t3, error) {
                   reject(error);
                 });
@@ -6427,7 +6427,7 @@ var require_localforage = __commonJS({
         }
         function iterate$1(iterator, callback) {
           var self2 = this;
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               var dbInfo = self2._dbInfo;
               dbInfo.db.transaction(function(t2) {
@@ -6442,11 +6442,11 @@ var require_localforage = __commonJS({
                     }
                     result = iterator(result, item.key, i2 + 1);
                     if (result !== void 0) {
-                      resolve7(result);
+                      resolve8(result);
                       return;
                     }
                   }
-                  resolve7();
+                  resolve8();
                 }, function(t3, error) {
                   reject(error);
                 });
@@ -6459,7 +6459,7 @@ var require_localforage = __commonJS({
         function _setItem(key3, value, callback, retriesLeft) {
           var self2 = this;
           key3 = normalizeKey(key3);
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               if (value === void 0) {
                 value = null;
@@ -6472,14 +6472,14 @@ var require_localforage = __commonJS({
                 } else {
                   dbInfo.db.transaction(function(t2) {
                     tryExecuteSql(t2, dbInfo, "INSERT OR REPLACE INTO " + dbInfo.storeName + " (key, value) VALUES (?, ?)", [key3, value2], function() {
-                      resolve7(originalValue);
+                      resolve8(originalValue);
                     }, function(t3, error2) {
                       reject(error2);
                     });
                   }, function(sqlError) {
                     if (sqlError.code === sqlError.QUOTA_ERR) {
                       if (retriesLeft > 0) {
-                        resolve7(_setItem.apply(self2, [key3, originalValue, callback, retriesLeft - 1]));
+                        resolve8(_setItem.apply(self2, [key3, originalValue, callback, retriesLeft - 1]));
                         return;
                       }
                       reject(sqlError);
@@ -6498,12 +6498,12 @@ var require_localforage = __commonJS({
         function removeItem$1(key3, callback) {
           var self2 = this;
           key3 = normalizeKey(key3);
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               var dbInfo = self2._dbInfo;
               dbInfo.db.transaction(function(t2) {
                 tryExecuteSql(t2, dbInfo, "DELETE FROM " + dbInfo.storeName + " WHERE key = ?", [key3], function() {
-                  resolve7();
+                  resolve8();
                 }, function(t3, error) {
                   reject(error);
                 });
@@ -6515,12 +6515,12 @@ var require_localforage = __commonJS({
         }
         function clear$1(callback) {
           var self2 = this;
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               var dbInfo = self2._dbInfo;
               dbInfo.db.transaction(function(t2) {
                 tryExecuteSql(t2, dbInfo, "DELETE FROM " + dbInfo.storeName, [], function() {
-                  resolve7();
+                  resolve8();
                 }, function(t3, error) {
                   reject(error);
                 });
@@ -6532,13 +6532,13 @@ var require_localforage = __commonJS({
         }
         function length$1(callback) {
           var self2 = this;
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               var dbInfo = self2._dbInfo;
               dbInfo.db.transaction(function(t2) {
                 tryExecuteSql(t2, dbInfo, "SELECT COUNT(key) as c FROM " + dbInfo.storeName, [], function(t3, results) {
                   var result = results.rows.item(0).c;
-                  resolve7(result);
+                  resolve8(result);
                 }, function(t3, error) {
                   reject(error);
                 });
@@ -6550,13 +6550,13 @@ var require_localforage = __commonJS({
         }
         function key$1(n, callback) {
           var self2 = this;
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               var dbInfo = self2._dbInfo;
               dbInfo.db.transaction(function(t2) {
                 tryExecuteSql(t2, dbInfo, "SELECT key FROM " + dbInfo.storeName + " WHERE id = ? LIMIT 1", [n + 1], function(t3, results) {
                   var result = results.rows.length ? results.rows.item(0).key : null;
-                  resolve7(result);
+                  resolve8(result);
                 }, function(t3, error) {
                   reject(error);
                 });
@@ -6568,7 +6568,7 @@ var require_localforage = __commonJS({
         }
         function keys$1(callback) {
           var self2 = this;
-          var promise = new Promise$1(function(resolve7, reject) {
+          var promise = new Promise$1(function(resolve8, reject) {
             self2.ready().then(function() {
               var dbInfo = self2._dbInfo;
               dbInfo.db.transaction(function(t2) {
@@ -6577,7 +6577,7 @@ var require_localforage = __commonJS({
                   for (var i2 = 0; i2 < results.rows.length; i2++) {
                     keys2.push(results.rows.item(i2).key);
                   }
-                  resolve7(keys2);
+                  resolve8(keys2);
                 }, function(t3, error) {
                   reject(error);
                 });
@@ -6588,14 +6588,14 @@ var require_localforage = __commonJS({
           return promise;
         }
         function getAllStoreNames(db) {
-          return new Promise$1(function(resolve7, reject) {
+          return new Promise$1(function(resolve8, reject) {
             db.transaction(function(t2) {
               t2.executeSql("SELECT name FROM sqlite_master WHERE type='table' AND name <> '__WebKitDatabaseInfoTable__'", [], function(t3, results) {
                 var storeNames = [];
                 for (var i2 = 0; i2 < results.rows.length; i2++) {
                   storeNames.push(results.rows.item(i2).name);
                 }
-                resolve7({
+                resolve8({
                   db,
                   storeNames
                 });
@@ -6620,7 +6620,7 @@ var require_localforage = __commonJS({
           if (!options.name) {
             promise = Promise$1.reject("Invalid arguments");
           } else {
-            promise = new Promise$1(function(resolve7) {
+            promise = new Promise$1(function(resolve8) {
               var db;
               if (options.name === currentConfig.name) {
                 db = self2._dbInfo.db;
@@ -6628,20 +6628,20 @@ var require_localforage = __commonJS({
                 db = openDatabase(options.name, "", "", 0);
               }
               if (!options.storeName) {
-                resolve7(getAllStoreNames(db));
+                resolve8(getAllStoreNames(db));
               } else {
-                resolve7({
+                resolve8({
                   db,
                   storeNames: [options.storeName]
                 });
               }
             }).then(function(operationInfo) {
-              return new Promise$1(function(resolve7, reject) {
+              return new Promise$1(function(resolve8, reject) {
                 operationInfo.db.transaction(function(t2) {
                   function dropTable(storeName) {
-                    return new Promise$1(function(resolve8, reject2) {
+                    return new Promise$1(function(resolve9, reject2) {
                       t2.executeSql("DROP TABLE IF EXISTS " + storeName, [], function() {
-                        resolve8();
+                        resolve9();
                       }, function(t3, error) {
                         reject2(error);
                       });
@@ -6652,7 +6652,7 @@ var require_localforage = __commonJS({
                     operations.push(dropTable(operationInfo.storeNames[i2]));
                   }
                   Promise$1.all(operations).then(function() {
-                    resolve7();
+                    resolve8();
                   })["catch"](function(e2) {
                     reject(e2);
                   });
@@ -6837,7 +6837,7 @@ var require_localforage = __commonJS({
               value = null;
             }
             var originalValue = value;
-            return new Promise$1(function(resolve7, reject) {
+            return new Promise$1(function(resolve8, reject) {
               var dbInfo = self2._dbInfo;
               dbInfo.serializer.serialize(value, function(value2, error) {
                 if (error) {
@@ -6845,7 +6845,7 @@ var require_localforage = __commonJS({
                 } else {
                   try {
                     localStorage.setItem(dbInfo.keyPrefix + key3, value2);
-                    resolve7(originalValue);
+                    resolve8(originalValue);
                   } catch (e2) {
                     if (e2.name === "QuotaExceededError" || e2.name === "NS_ERROR_DOM_QUOTA_REACHED") {
                       reject(e2);
@@ -6872,11 +6872,11 @@ var require_localforage = __commonJS({
           if (!options.name) {
             promise = Promise$1.reject("Invalid arguments");
           } else {
-            promise = new Promise$1(function(resolve7) {
+            promise = new Promise$1(function(resolve8) {
               if (!options.storeName) {
-                resolve7(options.name + "/");
+                resolve8(options.name + "/");
               } else {
-                resolve7(_getKeyPrefix(options, self2._defaultConfig));
+                resolve8(_getKeyPrefix(options, self2._defaultConfig));
               }
             }).then(function(keyPrefix) {
               for (var i2 = localStorage.length - 1; i2 >= 0; i2--) {
@@ -7012,7 +7012,7 @@ var require_localforage = __commonJS({
             }
           };
           LocalForage2.prototype.defineDriver = function defineDriver(driverObject, callback, errorCallback) {
-            var promise = new Promise$1(function(resolve7, reject) {
+            var promise = new Promise$1(function(resolve8, reject) {
               try {
                 var driverName = driverObject._driver;
                 var complianceError = new Error("Custom driver not compliant; see https://mozilla.github.io/localForage/#definedriver");
@@ -7052,7 +7052,7 @@ var require_localforage = __commonJS({
                   }
                   DefinedDrivers[driverName] = driverObject;
                   DriverSupport[driverName] = support;
-                  resolve7();
+                  resolve8();
                 };
                 if ("_support" in driverObject) {
                   if (driverObject._support && typeof driverObject._support === "function") {
@@ -8059,18 +8059,18 @@ var require_scope = __commonJS({
         if (index === void 0) {
           index = 0;
         }
-        return new utils_1.SyncPromise(function(resolve7, reject) {
+        return new utils_1.SyncPromise(function(resolve8, reject) {
           var processor = processors[index];
           if (event === null || typeof processor !== "function") {
-            resolve7(event);
+            resolve8(event);
           } else {
             var result = processor(tslib_1.__assign({}, event), hint);
             if (utils_1.isThenable(result)) {
               void result.then(function(final) {
-                return _this._notifyEventProcessors(processors, final, hint, index + 1).then(resolve7);
+                return _this._notifyEventProcessors(processors, final, hint, index + 1).then(resolve8);
               }).then(null, reject);
             } else {
-              void _this._notifyEventProcessors(processors, result, hint, index + 1).then(resolve7).then(null, reject);
+              void _this._notifyEventProcessors(processors, result, hint, index + 1).then(resolve8).then(null, reject);
             }
           }
         });
@@ -9105,18 +9105,18 @@ var require_baseclient = __commonJS({
       };
       BaseClient2.prototype._isClientDoneProcessing = function(timeout) {
         var _this = this;
-        return new utils_1.SyncPromise(function(resolve7) {
+        return new utils_1.SyncPromise(function(resolve8) {
           var ticked = 0;
           var tick = 1;
           var interval2 = setInterval(function() {
             if (_this._numProcessing == 0) {
               clearInterval(interval2);
-              resolve7(true);
+              resolve8(true);
             } else {
               ticked += tick;
               if (timeout && ticked >= timeout) {
                 clearInterval(interval2);
-                resolve7(false);
+                resolve8(false);
               }
             }
           }, tick);
@@ -10122,7 +10122,7 @@ var require_parsers = __commonJS({
       if (filenames.length === 0) {
         return utils_1.resolvedSyncPromise({});
       }
-      return new utils_1.SyncPromise(function(resolve7) {
+      return new utils_1.SyncPromise(function(resolve8) {
         var sourceFiles = {};
         var count = 0;
         var _loop_1 = function(i3) {
@@ -10134,7 +10134,7 @@ var require_parsers = __commonJS({
             }
             count++;
             if (count === filenames.length) {
-              resolve7(sourceFiles);
+              resolve8(sourceFiles);
             }
             return "continue";
           }
@@ -10144,7 +10144,7 @@ var require_parsers = __commonJS({
             FILE_CONTENT_CACHE.set(filename, content);
             count++;
             if (count === filenames.length) {
-              resolve7(sourceFiles);
+              resolve8(sourceFiles);
             }
           });
         };
@@ -10193,7 +10193,7 @@ var require_parsers = __commonJS({
     }
     exports2.parseStack = parseStack;
     function addPrePostContext(filesToRead, frames, linesOfContext) {
-      return new utils_1.SyncPromise(function(resolve7) {
+      return new utils_1.SyncPromise(function(resolve8) {
         return readSourceFiles(filesToRead).then(function(sourceFiles) {
           var result = frames.map(function(frame) {
             if (frame.filename && sourceFiles[frame.filename]) {
@@ -10205,14 +10205,14 @@ var require_parsers = __commonJS({
             }
             return frame;
           });
-          resolve7(result);
+          resolve8(result);
         });
       });
     }
     function getExceptionFromError(error, options) {
       var name2 = error.name || error.constructor.name;
       var stack2 = extractStackFromError(error);
-      return new utils_1.SyncPromise(function(resolve7) {
+      return new utils_1.SyncPromise(function(resolve8) {
         return parseStack(stack2, options).then(function(frames) {
           var result = {
             stacktrace: {
@@ -10221,15 +10221,15 @@ var require_parsers = __commonJS({
             type: name2,
             value: error.message
           };
-          resolve7(result);
+          resolve8(result);
         });
       });
     }
     exports2.getExceptionFromError = getExceptionFromError;
     function parseError(error, options) {
-      return new utils_1.SyncPromise(function(resolve7) {
+      return new utils_1.SyncPromise(function(resolve8) {
         return getExceptionFromError(error, options).then(function(exception) {
-          resolve7({
+          resolve8({
             exception: {
               values: [exception]
             }
@@ -10284,11 +10284,11 @@ var require_eventbuilder = __commonJS({
         }
         mechanism.synthetic = true;
       }
-      return new utils_1.SyncPromise(function(resolve7, reject) {
+      return new utils_1.SyncPromise(function(resolve8, reject) {
         return parsers_1.parseError(ex, options).then(function(event) {
           utils_1.addExceptionTypeValue(event, void 0, void 0);
           utils_1.addExceptionMechanism(event, mechanism);
-          resolve7(tslib_1.__assign(tslib_1.__assign({}, event), { event_id: hint && hint.event_id }));
+          resolve8(tslib_1.__assign(tslib_1.__assign({}, event), { event_id: hint && hint.event_id }));
         }).then(null, reject);
       });
     }
@@ -10302,19 +10302,19 @@ var require_eventbuilder = __commonJS({
         level,
         message: message2
       };
-      return new utils_1.SyncPromise(function(resolve7) {
+      return new utils_1.SyncPromise(function(resolve8) {
         if (options.attachStacktrace && hint && hint.syntheticException) {
           var stack2 = hint.syntheticException ? parsers_1.extractStackFromError(hint.syntheticException) : [];
           void parsers_1.parseStack(stack2, options).then(function(frames) {
             event.stacktrace = {
               frames: parsers_1.prepareFramesForEvent(frames)
             };
-            resolve7(event);
+            resolve8(event);
           }).then(null, function() {
-            resolve7(event);
+            resolve8(event);
           });
         } else {
-          resolve7(event);
+          resolve8(event);
         }
       });
     }
@@ -10485,7 +10485,7 @@ var require_base = __commonJS({
               })];
             }
             return [2, this._buffer.add(function() {
-              return new Promise(function(resolve7, reject) {
+              return new Promise(function(resolve8, reject) {
                 if (!_this.module) {
                   throw new utils_1.SentryError("No module available");
                 }
@@ -10506,7 +10506,7 @@ var require_base = __commonJS({
                   if (limited)
                     utils_1.logger.warn("Too many " + sentryRequest.type + " requests, backing off until: " + _this._disabledUntil(sentryRequest.type));
                   if (status === "success") {
-                    resolve7({ status });
+                    resolve8({ status });
                   } else {
                     var rejectionMessage = "HTTP Error (" + statusCode + ")";
                     if (res.headers && res.headers["x-sentry-error"]) {
@@ -11278,12 +11278,12 @@ var require_promisify = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     function promisify2(fn2) {
       return function(req, opts) {
-        return new Promise((resolve7, reject) => {
+        return new Promise((resolve8, reject) => {
           fn2.call(this, req, opts, (err2, rtn) => {
             if (err2) {
               reject(err2);
             } else {
-              resolve7(rtn);
+              resolve8(rtn);
             }
           });
         });
@@ -11483,7 +11483,7 @@ var require_parse_proxy_response = __commonJS({
     var debug_1 = __importDefault(require_src());
     var debug = debug_1.default("https-proxy-agent:parse-proxy-response");
     function parseProxyResponse(socket) {
-      return new Promise((resolve7, reject) => {
+      return new Promise((resolve8, reject) => {
         let buffersLength = 0;
         const buffers = [];
         function read2() {
@@ -11523,7 +11523,7 @@ var require_parse_proxy_response = __commonJS({
           const firstLine = buffered.toString("ascii", 0, buffered.indexOf("\r\n"));
           const statusCode = +firstLine.split(" ")[1];
           debug("got proxy server response: %o", firstLine);
-          resolve7({
+          resolve8({
             statusCode,
             buffered
           });
@@ -11545,11 +11545,11 @@ var require_agent = __commonJS({
     init_import_meta_url();
     var __awaiter = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
       function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve7) {
-          resolve7(value);
+        return value instanceof P ? value : new P(function(resolve8) {
+          resolve8(value);
         });
       }
-      return new (P || (P = Promise))(function(resolve7, reject) {
+      return new (P || (P = Promise))(function(resolve8, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -11565,7 +11565,7 @@ var require_agent = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve7(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve8(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -12393,14 +12393,14 @@ var require_linkederrors = __commonJS({
         if (!event.exception || !event.exception.values || !hint || !utils_1.isInstanceOf(hint.originalException, Error)) {
           return utils_1.resolvedSyncPromise(event);
         }
-        return new utils_1.SyncPromise(function(resolve7) {
+        return new utils_1.SyncPromise(function(resolve8) {
           void _this._walkErrorTree(hint.originalException, _this._key).then(function(linkedErrors) {
             if (event && event.exception && event.exception.values) {
               event.exception.values = tslib_1.__spread(linkedErrors, event.exception.values);
             }
-            resolve7(event);
+            resolve8(event);
           }).then(null, function() {
-            resolve7(event);
+            resolve8(event);
           });
         });
       };
@@ -12412,9 +12412,9 @@ var require_linkederrors = __commonJS({
         if (!utils_1.isInstanceOf(error[key2], Error) || stack2.length + 1 >= this._limit) {
           return utils_1.resolvedSyncPromise(stack2);
         }
-        return new utils_1.SyncPromise(function(resolve7, reject) {
+        return new utils_1.SyncPromise(function(resolve8, reject) {
           void parsers_1.getExceptionFromError(error[key2]).then(function(exception) {
-            void _this._walkErrorTree(error[key2], key2, tslib_1.__spread([exception], stack2)).then(resolve7).then(null, function() {
+            void _this._walkErrorTree(error[key2], key2, tslib_1.__spread([exception], stack2)).then(resolve8).then(null, function() {
               reject();
             });
           }).then(null, function() {
@@ -15379,12 +15379,12 @@ var require_isexe = __commonJS({
         if (typeof Promise !== "function") {
           throw new TypeError("callback not provided");
         }
-        return new Promise(function(resolve7, reject) {
+        return new Promise(function(resolve8, reject) {
           isexe(path22, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
-              resolve7(is);
+              resolve8(is);
             }
           });
         });
@@ -15449,27 +15449,27 @@ var require_which = __commonJS({
         opt = {};
       const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
       const found = [];
-      const step = (i2) => new Promise((resolve7, reject) => {
+      const step = (i2) => new Promise((resolve8, reject) => {
         if (i2 === pathEnv.length)
-          return opt.all && found.length ? resolve7(found) : reject(getNotFoundError(cmd));
+          return opt.all && found.length ? resolve8(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i2];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
         const pCmd = path22.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-        resolve7(subStep(p, i2, 0));
+        resolve8(subStep(p, i2, 0));
       });
-      const subStep = (p, i2, ii) => new Promise((resolve7, reject) => {
+      const subStep = (p, i2, ii) => new Promise((resolve8, reject) => {
         if (ii === pathExt.length)
-          return resolve7(step(i2 + 1));
+          return resolve8(step(i2 + 1));
         const ext = pathExt[ii];
         isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
           if (!er && is) {
             if (opt.all)
               found.push(p + ext);
             else
-              return resolve7(p + ext);
+              return resolve8(p + ext);
           }
-          return resolve7(subStep(p, i2, ii + 1));
+          return resolve8(subStep(p, i2, ii + 1));
         });
       });
       return cb2 ? step(0).then((res) => cb2(null, res), cb2) : step(0);
@@ -16041,7 +16041,7 @@ var require_get_stream = __commonJS({
       };
       const { maxBuffer } = options;
       const stream2 = bufferStream(options);
-      await new Promise((resolve7, reject) => {
+      await new Promise((resolve8, reject) => {
         const rejectPromise = (error) => {
           if (error && stream2.getBufferedLength() <= BufferConstants.MAX_LENGTH) {
             error.bufferedData = stream2.getBufferedValue();
@@ -16051,7 +16051,7 @@ var require_get_stream = __commonJS({
         (async () => {
           try {
             await streamPipelinePromisified(inputStream, stream2);
-            resolve7();
+            resolve8();
           } catch (error) {
             rejectPromise(error);
           }
@@ -16662,7 +16662,7 @@ var require_text = __commonJS({
   "../../node_modules/prompts/dist/elements/text.js"(exports2, module2) {
     "use strict";
     init_import_meta_url();
-    function asyncGeneratorStep(gen, resolve7, reject, _next, _throw, key2, arg2) {
+    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key2, arg2) {
       try {
         var info = gen[key2](arg2);
         var value = info.value;
@@ -16671,7 +16671,7 @@ var require_text = __commonJS({
         return;
       }
       if (info.done) {
-        resolve7(value);
+        resolve8(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -16679,13 +16679,13 @@ var require_text = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self2 = this, args2 = arguments;
-        return new Promise(function(resolve7, reject) {
+        return new Promise(function(resolve8, reject) {
           var gen = fn2.apply(self2, args2);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve7, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
           }
           function _throw(err2) {
-            asyncGeneratorStep(gen, resolve7, reject, _next, _throw, "throw", err2);
+            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err2);
           }
           _next(void 0);
         });
@@ -17435,7 +17435,7 @@ var require_date = __commonJS({
   "../../node_modules/prompts/dist/elements/date.js"(exports2, module2) {
     "use strict";
     init_import_meta_url();
-    function asyncGeneratorStep(gen, resolve7, reject, _next, _throw, key2, arg2) {
+    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key2, arg2) {
       try {
         var info = gen[key2](arg2);
         var value = info.value;
@@ -17444,7 +17444,7 @@ var require_date = __commonJS({
         return;
       }
       if (info.done) {
-        resolve7(value);
+        resolve8(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -17452,13 +17452,13 @@ var require_date = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self2 = this, args2 = arguments;
-        return new Promise(function(resolve7, reject) {
+        return new Promise(function(resolve8, reject) {
           var gen = fn2.apply(self2, args2);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve7, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
           }
           function _throw(err2) {
-            asyncGeneratorStep(gen, resolve7, reject, _next, _throw, "throw", err2);
+            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err2);
           }
           _next(void 0);
         });
@@ -17662,7 +17662,7 @@ var require_number = __commonJS({
   "../../node_modules/prompts/dist/elements/number.js"(exports2, module2) {
     "use strict";
     init_import_meta_url();
-    function asyncGeneratorStep(gen, resolve7, reject, _next, _throw, key2, arg2) {
+    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key2, arg2) {
       try {
         var info = gen[key2](arg2);
         var value = info.value;
@@ -17671,7 +17671,7 @@ var require_number = __commonJS({
         return;
       }
       if (info.done) {
-        resolve7(value);
+        resolve8(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -17679,13 +17679,13 @@ var require_number = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self2 = this, args2 = arguments;
-        return new Promise(function(resolve7, reject) {
+        return new Promise(function(resolve8, reject) {
           var gen = fn2.apply(self2, args2);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve7, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
           }
           function _throw(err2) {
-            asyncGeneratorStep(gen, resolve7, reject, _next, _throw, "throw", err2);
+            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err2);
           }
           _next(void 0);
         });
@@ -18122,7 +18122,7 @@ var require_autocomplete = __commonJS({
   "../../node_modules/prompts/dist/elements/autocomplete.js"(exports2, module2) {
     "use strict";
     init_import_meta_url();
-    function asyncGeneratorStep(gen, resolve7, reject, _next, _throw, key2, arg2) {
+    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key2, arg2) {
       try {
         var info = gen[key2](arg2);
         var value = info.value;
@@ -18131,7 +18131,7 @@ var require_autocomplete = __commonJS({
         return;
       }
       if (info.done) {
-        resolve7(value);
+        resolve8(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -18139,13 +18139,13 @@ var require_autocomplete = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self2 = this, args2 = arguments;
-        return new Promise(function(resolve7, reject) {
+        return new Promise(function(resolve8, reject) {
           var gen = fn2.apply(self2, args2);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve7, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
           }
           function _throw(err2) {
-            asyncGeneratorStep(gen, resolve7, reject, _next, _throw, "throw", err2);
+            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err2);
           }
           _next(void 0);
         });
@@ -18813,7 +18813,7 @@ var require_dist10 = __commonJS({
         arr2[i2] = arr[i2];
       return arr2;
     }
-    function asyncGeneratorStep(gen, resolve7, reject, _next, _throw, key2, arg2) {
+    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key2, arg2) {
       try {
         var info = gen[key2](arg2);
         var value = info.value;
@@ -18822,7 +18822,7 @@ var require_dist10 = __commonJS({
         return;
       }
       if (info.done) {
-        resolve7(value);
+        resolve8(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -18830,13 +18830,13 @@ var require_dist10 = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self2 = this, args2 = arguments;
-        return new Promise(function(resolve7, reject) {
+        return new Promise(function(resolve8, reject) {
           var gen = fn2.apply(self2, args2);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve7, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
           }
           function _throw(err2) {
-            asyncGeneratorStep(gen, resolve7, reject, _next, _throw, "throw", err2);
+            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err2);
           }
           _next(void 0);
         });
@@ -47798,12 +47798,12 @@ For more info, visit https://reactjs.org/link/mock-scheduler`);
               }
             }
             return {
-              then: function(resolve7, reject) {
+              then: function(resolve8, reject) {
                 called = true;
                 result.then(function() {
                   if (actingUpdatesScopeDepth > 1 || isSchedulerMocked === true && previousIsSomeRendererActing === true) {
                     onDone();
-                    resolve7();
+                    resolve8();
                     return;
                   }
                   flushWorkAndMicroTasks(function(err2) {
@@ -47811,7 +47811,7 @@ For more info, visit https://reactjs.org/link/mock-scheduler`);
                     if (err2) {
                       reject(err2);
                     } else {
-                      resolve7();
+                      resolve8();
                     }
                   });
                 }, function(err2) {
@@ -47836,11 +47836,11 @@ For more info, visit https://reactjs.org/link/mock-scheduler`);
               throw err2;
             }
             return {
-              then: function(resolve7) {
+              then: function(resolve8) {
                 {
                   error("Do not await the result of calling act(...) with sync logic, it is not a Promise.");
                 }
-                resolve7();
+                resolve8();
               }
             };
           }
@@ -89632,7 +89632,7 @@ var require_backend2 = __commonJS({
                 }
                 ;
                 return function(data) {
-                  return new Promise(function(resolve7, reject) {
+                  return new Promise(function(resolve8, reject) {
                     _intercept = true;
                     if (typeof data === "string") {
                       _data = {
@@ -89651,7 +89651,7 @@ var require_backend2 = __commonJS({
                       try {
                         if (document.execCommand("copy")) {
                           cleanup();
-                          resolve7();
+                          resolve8();
                         } else {
                           if (!tryBogusSelect) {
                             bogusSelect();
@@ -89678,15 +89678,15 @@ var require_backend2 = __commonJS({
                   if (_intercept) {
                     _intercept = false;
                     e2.preventDefault();
-                    var resolve7 = _resolve;
+                    var resolve8 = _resolve;
                     _resolve = null;
-                    resolve7(e2.clipboardData.getData(_dataType));
+                    resolve8(e2.clipboardData.getData(_dataType));
                   }
                 });
                 return function(dataType) {
-                  return new Promise(function(resolve7, reject) {
+                  return new Promise(function(resolve8, reject) {
                     _intercept = true;
-                    _resolve = resolve7;
+                    _resolve = resolve8;
                     _dataType = dataType || "text/plain";
                     try {
                       if (!document.execCommand("paste")) {
@@ -89821,24 +89821,24 @@ var require_backend2 = __commonJS({
                   }, module3.exports ? module3.exports = c : a.Promise || (a.Promise = c);
                 })(this);
                 clipboard6.copy = function(data) {
-                  return new Promise(function(resolve7, reject) {
+                  return new Promise(function(resolve8, reject) {
                     if (typeof data !== "string" && !("text/plain" in data)) {
                       throw new Error("You must provide a text/plain type.");
                     }
                     var strData = typeof data === "string" ? data : data["text/plain"];
                     var copySucceeded = window.clipboardData.setData("Text", strData);
                     if (copySucceeded) {
-                      resolve7();
+                      resolve8();
                     } else {
                       reject(new Error("Copying was rejected."));
                     }
                   });
                 };
                 clipboard6.paste = function() {
-                  return new Promise(function(resolve7, reject) {
+                  return new Promise(function(resolve8, reject) {
                     var strData = window.clipboardData.getData("Text");
                     if (strData) {
-                      resolve7(strData);
+                      resolve8(strData);
                     } else {
                       reject(new Error("Pasting was rejected."));
                     }
@@ -99125,8 +99125,8 @@ var require_ink = __commonJS({
       }
       waitUntilExit() {
         if (!this.exitPromise) {
-          this.exitPromise = new Promise((resolve7, reject) => {
-            this.resolveExitPromise = resolve7;
+          this.exitPromise = new Promise((resolve8, reject) => {
+            this.resolveExitPromise = resolve8;
             this.rejectExitPromise = reject;
           });
         }
@@ -99328,8 +99328,8 @@ var require_use_stdin = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     var react_1 = require_react();
     var StdinContext_1 = __importDefault(require_StdinContext());
-    var useStdin = () => react_1.useContext(StdinContext_1.default);
-    exports2.default = useStdin;
+    var useStdin2 = () => react_1.useContext(StdinContext_1.default);
+    exports2.default = useStdin2;
   }
 });
 
@@ -101214,9 +101214,9 @@ var require_client2 = __commonJS({
       }
       close(callback) {
         if (callback === void 0) {
-          return new Promise((resolve7, reject) => {
+          return new Promise((resolve8, reject) => {
             this.close((err2, data) => {
-              return err2 ? reject(err2) : resolve7(data);
+              return err2 ? reject(err2) : resolve8(data);
             });
           });
         }
@@ -101240,9 +101240,9 @@ var require_client2 = __commonJS({
           err2 = null;
         }
         if (callback === void 0) {
-          return new Promise((resolve7, reject) => {
+          return new Promise((resolve8, reject) => {
             this.destroy(err2, (err3, data) => {
-              return err3 ? reject(err3) : resolve7(data);
+              return err3 ? reject(err3) : resolve8(data);
             });
           });
         }
@@ -101823,7 +101823,7 @@ var require_client2 = __commonJS({
         });
       }
       try {
-        const socket = await new Promise((resolve7, reject) => {
+        const socket = await new Promise((resolve8, reject) => {
           client[kConnector]({
             host,
             hostname,
@@ -101834,7 +101834,7 @@ var require_client2 = __commonJS({
             if (err2) {
               reject(err2);
             } else {
-              resolve7(socket2);
+              resolve8(socket2);
             }
           });
         });
@@ -102204,12 +102204,12 @@ upgrade: ${upgrade}\r
           cb2();
         }
       }
-      const waitForDrain = () => new Promise((resolve7, reject) => {
+      const waitForDrain = () => new Promise((resolve8, reject) => {
         assert10(callback === null);
         if (socket[kError]) {
           reject(socket[kError]);
         } else {
-          callback = resolve7;
+          callback = resolve8;
         }
       });
       socket.on("close", onDrain).on("drain", onDrain);
@@ -102548,8 +102548,8 @@ var require_pool_base = __commonJS({
             if (this[kQueue].isEmpty()) {
               this[kClosedPromise] = Promise.all(this[kClients].map((c) => c.close()));
             } else {
-              this[kClosedPromise] = new Promise((resolve7) => {
-                this[kClosedResolve] = resolve7;
+              this[kClosedPromise] = new Promise((resolve8) => {
+                this[kClosedResolve] = resolve8;
               });
             }
             this[kClosedPromise] = this[kClosedPromise].then(() => {
@@ -103139,11 +103139,11 @@ var require_readable = __commonJS({
         throw new TypeError("unusable");
       }
       assert10(!stream[kConsume]);
-      return new Promise((resolve7, reject) => {
+      return new Promise((resolve8, reject) => {
         stream[kConsume] = {
           type: type2,
           stream,
-          resolve: resolve7,
+          resolve: resolve8,
           reject,
           length: 0,
           body: []
@@ -103178,12 +103178,12 @@ var require_readable = __commonJS({
       }
     }
     function consumeEnd(consume2) {
-      const { type: type2, body, resolve: resolve7, stream, length } = consume2;
+      const { type: type2, body, resolve: resolve8, stream, length } = consume2;
       try {
         if (type2 === "text") {
-          resolve7(toUSVString(Buffer.concat(body)));
+          resolve8(toUSVString(Buffer.concat(body)));
         } else if (type2 === "json") {
-          resolve7(JSON.parse(Buffer.concat(body)));
+          resolve8(JSON.parse(Buffer.concat(body)));
         } else if (type2 === "arrayBuffer") {
           const dst = new Uint8Array(length);
           let pos = 0;
@@ -103191,12 +103191,12 @@ var require_readable = __commonJS({
             dst.set(buf, pos);
             pos += buf.byteLength;
           }
-          resolve7(dst);
+          resolve8(dst);
         } else if (type2 === "blob") {
           if (!Blob2) {
             Blob2 = require("buffer").Blob;
           }
-          resolve7(new Blob2(body, { type: stream[kContentType] }));
+          resolve8(new Blob2(body, { type: stream[kContentType] }));
         }
         consumeFinish(consume2);
       } catch (err2) {
@@ -103397,9 +103397,9 @@ var require_api_request = __commonJS({
     };
     function request(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve7, reject) => {
+        return new Promise((resolve8, reject) => {
           request.call(this, opts, (err2, data) => {
-            return err2 ? reject(err2) : resolve7(data);
+            return err2 ? reject(err2) : resolve8(data);
           });
         });
       }
@@ -103552,9 +103552,9 @@ var require_api_stream = __commonJS({
     };
     function stream(opts, factory, callback) {
       if (callback === void 0) {
-        return new Promise((resolve7, reject) => {
+        return new Promise((resolve8, reject) => {
           stream.call(this, opts, factory, (err2, data) => {
-            return err2 ? reject(err2) : resolve7(data);
+            return err2 ? reject(err2) : resolve8(data);
           });
         });
       }
@@ -103837,9 +103837,9 @@ var require_api_upgrade = __commonJS({
     };
     function upgrade(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve7, reject) => {
+        return new Promise((resolve8, reject) => {
           upgrade.call(this, opts, (err2, data) => {
-            return err2 ? reject(err2) : resolve7(data);
+            return err2 ? reject(err2) : resolve8(data);
           });
         });
       }
@@ -103926,9 +103926,9 @@ var require_api_connect = __commonJS({
     };
     function connect2(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve7, reject) => {
+        return new Promise((resolve8, reject) => {
           connect2.call(this, opts, (err2, data) => {
-            return err2 ? reject(err2) : resolve7(data);
+            return err2 ? reject(err2) : resolve8(data);
           });
         });
       }
@@ -105336,8 +105336,8 @@ var require_util5 = __commonJS({
     function createDeferredPromise() {
       let res;
       let rej;
-      const promise = new Promise((resolve7, reject) => {
-        res = resolve7;
+      const promise = new Promise((resolve8, reject) => {
+        res = resolve8;
         rej = reject;
       });
       return { promise, resolve: res, reject: rej };
@@ -107350,7 +107350,7 @@ var require_fetch = __commonJS({
     }
     function httpNetworkFetch(fetchParams, includeCredentials = false, forceNewConnection = false) {
       const context = this;
-      return new Promise((resolve7) => {
+      return new Promise((resolve8) => {
         assert10(!context.connection || context.connection.destroyed);
         context.connection = {
           abort: null,
@@ -107404,9 +107404,9 @@ var require_fetch = __commonJS({
           const aborted = this.terminated.aborted;
           this.connection.destroy();
           if (aborted) {
-            return resolve7(makeNetworkError(new AbortError()));
+            return resolve8(makeNetworkError(new AbortError()));
           }
-          return resolve7(makeNetworkError(this.terminated.reason));
+          return resolve8(makeNetworkError(this.terminated.reason));
         }
         let pullAlgorithm;
         const cancelAlgorithm = () => {
@@ -107423,8 +107423,8 @@ var require_fetch = __commonJS({
           },
           async pull(controller) {
             if (!pullAlgorithm) {
-              await new Promise((resolve8) => {
-                pullResolve = resolve8;
+              await new Promise((resolve9) => {
+                pullResolve = resolve9;
               });
             }
             await pullAlgorithm(controller);
@@ -107537,7 +107537,7 @@ var require_fetch = __commonJS({
               pullResolve();
               pullResolve = null;
             }
-            resolve7(response);
+            resolve8(response);
             return true;
           },
           onData(chunk) {
@@ -107555,7 +107555,7 @@ var require_fetch = __commonJS({
             this.decoder?.destroy(error);
             this.context.terminate({ reason: error });
             if (!response) {
-              resolve7(makeNetworkError(error));
+              resolve8(makeNetworkError(error));
             }
           }
         });
@@ -109431,14 +109431,14 @@ var require_open = __commonJS({
       }
       const subprocess = childProcess2.spawn(command2, cliArguments, childProcessOptions);
       if (options.wait) {
-        return new Promise((resolve7, reject) => {
+        return new Promise((resolve8, reject) => {
           subprocess.once("error", reject);
           subprocess.once("close", (exitCode) => {
             if (options.allowNonzeroExitCode && exitCode > 0) {
               reject(new Error(`Exited with code ${exitCode}`));
               return;
             }
-            resolve7(subprocess);
+            resolve8(subprocess);
           });
         });
       }
@@ -111205,9 +111205,9 @@ var require_readdirp = __commonJS({
       return new ReaddirpStream(options);
     };
     var readdirpPromise = (root, options = {}) => {
-      return new Promise((resolve7, reject) => {
+      return new Promise((resolve8, reject) => {
         const files = [];
-        readdirp(root, options).on("data", (entry) => files.push(entry)).on("end", () => resolve7(files)).on("error", (error) => reject(error));
+        readdirp(root, options).on("data", (entry) => files.push(entry)).on("end", () => resolve8(files)).on("error", (error) => reject(error));
       });
     };
     readdirp.promise = readdirpPromise;
@@ -113235,13 +113235,13 @@ var require_nodefs_handler = __commonJS({
             this._addToNodeFs(path22, initialAdd, wh, depth + 1);
           }
         }).on(EV_ERROR, this._boundHandleError);
-        return new Promise((resolve7) => stream.once(STR_END, () => {
+        return new Promise((resolve8) => stream.once(STR_END, () => {
           if (this.fsw.closed) {
             stream = void 0;
             return;
           }
           const wasThrottled = throttler ? throttler.clear() : false;
-          resolve7();
+          resolve8();
           previous.getChildren().filter((item) => {
             return item !== directory && !current.has(item) && (!wh.hasGlob || wh.filterPath({
               fullPath: sysPath.resolve(directory, item)
@@ -115096,7 +115096,7 @@ var require_kill = __commonJS({
         return spawnedPromise;
       }
       let timeoutId;
-      const timeoutPromise = new Promise((resolve7, reject) => {
+      const timeoutPromise = new Promise((resolve8, reject) => {
         timeoutId = setTimeout(() => {
           timeoutKill2(spawned, killSignal, reject);
         }, timeout);
@@ -115245,9 +115245,9 @@ var require_promise = __commonJS({
       return spawned;
     };
     var getSpawnedPromise2 = (spawned) => {
-      return new Promise((resolve7, reject) => {
+      return new Promise((resolve8, reject) => {
         spawned.on("exit", (exitCode, signal) => {
-          resolve7({ exitCode, signal });
+          resolve8({ exitCode, signal });
         });
         spawned.on("error", (error) => {
           reject(error);
@@ -115680,10 +115680,10 @@ var require_command_exists = __commonJS({
     module2.exports = function commandExists2(commandName, callback) {
       var cleanedCommandName = cleanInput(commandName);
       if (!callback && typeof Promise !== "undefined") {
-        return new Promise(function(resolve7, reject) {
+        return new Promise(function(resolve8, reject) {
           commandExists2(commandName, function(error, output) {
             if (output) {
-              resolve7(commandName);
+              resolve8(commandName);
             } else {
               reject(error);
             }
@@ -126331,7 +126331,7 @@ var require_send = __commonJS({
     var extname3 = path22.extname;
     var join6 = path22.join;
     var normalize2 = path22.normalize;
-    var resolve7 = path22.resolve;
+    var resolve8 = path22.resolve;
     var sep = path22.sep;
     var BYTES_RANGE_REGEXP = /^ *bytes=/;
     var MAX_MAXAGE = 60 * 60 * 24 * 365 * 1e3;
@@ -126368,7 +126368,7 @@ var require_send = __commonJS({
       this._maxage = opts.maxAge || opts.maxage;
       this._maxage = typeof this._maxage === "string" ? ms(this._maxage) : Number(this._maxage);
       this._maxage = !isNaN(this._maxage) ? Math.min(Math.max(0, this._maxage), MAX_MAXAGE) : 0;
-      this._root = opts.root ? resolve7(opts.root) : null;
+      this._root = opts.root ? resolve8(opts.root) : null;
       if (!this._root && opts.from) {
         this.from(opts.from);
       }
@@ -126392,7 +126392,7 @@ var require_send = __commonJS({
       return this;
     }, "send.index: pass index as option");
     SendStream.prototype.root = function root(path23) {
-      this._root = resolve7(String(path23));
+      this._root = resolve8(String(path23));
       debug("root %s", this._root);
       return this;
     };
@@ -126554,7 +126554,7 @@ var require_send = __commonJS({
           return res;
         }
         parts = normalize2(path23).split(sep);
-        path23 = resolve7(path23);
+        path23 = resolve8(path23);
       }
       if (containsDotFile(parts)) {
         var access = this._dotfiles;
@@ -126865,7 +126865,7 @@ var require_serve_static = __commonJS({
     var encodeUrl = require_encodeurl();
     var escapeHtml = require_escape_html();
     var parseUrl = require_parseurl();
-    var resolve7 = require("path").resolve;
+    var resolve8 = require("path").resolve;
     var send = require_send();
     var url2 = require("url");
     module2.exports = serveStatic2;
@@ -126885,7 +126885,7 @@ var require_serve_static = __commonJS({
         throw new TypeError("option setHeaders must be function");
       }
       opts.maxage = opts.maxage || opts.maxAge || 0;
-      opts.root = resolve7(root);
+      opts.root = resolve8(root);
       var onDirectory = redirect ? createRedirectDirectoryListener() : createNotFoundDirectoryListener();
       return function serveStatic3(req, res, next) {
         if (req.method !== "GET" && req.method !== "HEAD") {
@@ -131357,7 +131357,7 @@ var setupTimeout = (spawned, { timeout, killSignal = "SIGTERM" }, spawnedPromise
     return spawnedPromise;
   }
   let timeoutId;
-  const timeoutPromise = new Promise((resolve7, reject) => {
+  const timeoutPromise = new Promise((resolve8, reject) => {
     timeoutId = setTimeout(() => {
       timeoutKill(spawned, killSignal, reject);
     }, timeout);
@@ -131475,9 +131475,9 @@ var mergePromise = (spawned, promise) => {
   }
   return spawned;
 };
-var getSpawnedPromise = (spawned) => new Promise((resolve7, reject) => {
+var getSpawnedPromise = (spawned) => new Promise((resolve8, reject) => {
   spawned.on("exit", (exitCode, signal) => {
-    resolve7({ exitCode, signal });
+    resolve8({ exitCode, signal });
   });
   spawned.on("error", (error) => {
     reject(error);
@@ -131708,7 +131708,7 @@ var import_prompts = __toESM(require_prompts3());
 
 // package.json
 var name = "wrangler";
-var version = "0.0.21";
+var version = "0.0.24";
 
 // src/reporting.ts
 function initReporting() {
@@ -131887,18 +131887,18 @@ function pLimit(concurrency) {
       queue.dequeue()();
     }
   };
-  const run2 = async (fn2, resolve7, args2) => {
+  const run2 = async (fn2, resolve8, args2) => {
     activeCount++;
     const result = (async () => fn2(...args2))();
-    resolve7(result);
+    resolve8(result);
     try {
       await result;
     } catch {
     }
     next();
   };
-  const enqueue = (fn2, resolve7, args2) => {
-    queue.enqueue(run2.bind(void 0, fn2, resolve7, args2));
+  const enqueue = (fn2, resolve8, args2) => {
+    queue.enqueue(run2.bind(void 0, fn2, resolve8, args2));
     (async () => {
       await Promise.resolve();
       if (activeCount < concurrency && queue.size > 0) {
@@ -131906,8 +131906,8 @@ function pLimit(concurrency) {
       }
     })();
   };
-  const generator = (fn2, ...args2) => new Promise((resolve7) => {
-    enqueue(fn2, resolve7, args2);
+  const generator = (fn2, ...args2) => new Promise((resolve8) => {
+    enqueue(fn2, resolve8, args2);
   });
   Object.defineProperties(generator, {
     activeCount: {
@@ -132108,14 +132108,14 @@ var getLocalHosts = () => {
   }
   return results;
 };
-var checkAvailablePort = (options) => new Promise((resolve7, reject) => {
+var checkAvailablePort = (options) => new Promise((resolve8, reject) => {
   const server = import_node_net.default.createServer();
   server.unref();
   server.on("error", reject);
   server.listen(options, () => {
     const { port } = server.address();
     server.close(() => {
-      resolve7(port);
+      resolve8(port);
     });
   });
 });
@@ -134457,12 +134457,12 @@ var YargsInstance = class {
   async getCompletion(args2, done) {
     argsert("<array> [function]", [args2, done], arguments.length);
     if (!done) {
-      return new Promise((resolve7, reject) => {
+      return new Promise((resolve8, reject) => {
         __classPrivateFieldGet(this, _YargsInstance_completion, "f").getCompletion(args2, (err2, completions) => {
           if (err2)
             reject(err2);
           else
-            resolve7(completions);
+            resolve8(completions);
         });
       });
     } else {
@@ -135852,7 +135852,7 @@ async function getAuthURL(scopes = ScopeKeys) {
     codeVerifier,
     stateQueryParam
   });
-  return AUTH_URL + `?response_type=code&client_id=${encodeURIComponent(CLIENT_ID)}&redirect_uri=${encodeURIComponent(CALLBACK_URL)}&scope=${encodeURIComponent(scopes.concat("offline_access").join(" "))}&state=${stateQueryParam}&code_challenge=${encodeURIComponent(codeChallenge)}&code_challenge_method=S256`;
+  return AUTH_URL + `?response_type=code&client_id=${encodeURIComponent(CLIENT_ID)}&redirect_uri=${encodeURIComponent(CALLBACK_URL)}&scope=${encodeURIComponent([...scopes, "offline_access"].join(" "))}&state=${stateQueryParam}&code_challenge=${encodeURIComponent(codeChallenge)}&code_challenge_method=S256`;
 }
 async function exchangeRefreshTokenForAccessToken() {
   if (!LocalState.refreshToken) {
@@ -136004,7 +136004,12 @@ async function loginOrRefreshIfRequired(isInteractive = true) {
   if (!getAPIToken()) {
     return isInteractive && await login();
   } else if (isAccessTokenExpired()) {
-    return await refreshToken();
+    const didRefresh = await refreshToken();
+    if (didRefresh) {
+      return true;
+    } else {
+      return isInteractive && await login();
+    }
   } else {
     return true;
   }
@@ -136015,15 +136020,15 @@ async function login(props) {
   await openInBrowser(urlToOpen);
   let server;
   let loginTimeoutHandle;
-  const timerPromise = new Promise((resolve7) => {
+  const timerPromise = new Promise((resolve8) => {
     loginTimeoutHandle = setTimeout(() => {
       console.error("Timed out waiting for authorization code, please try again.");
       server.close();
       clearTimeout(loginTimeoutHandle);
-      resolve7(false);
+      resolve8(false);
     }, 6e4);
   });
-  const loginPromise = new Promise((resolve7, reject) => {
+  const loginPromise = new Promise((resolve8, reject) => {
     server = import_node_http.default.createServer(async (req, res) => {
       function finish(status, error) {
         clearTimeout(loginTimeoutHandle);
@@ -136031,7 +136036,7 @@ async function login(props) {
           if (error || closeErr) {
             reject(error || closeErr);
           } else
-            resolve7(status);
+            resolve8(status);
         });
       }
       (0, import_node_assert.default)(req.url, "This request doesn't have a URL");
@@ -136166,12 +136171,12 @@ async function getAccountId(isInteractive = true) {
     if (responseJSON.result.length === 1) {
       accountId = responseJSON.result[0].account.id;
     } else if (isInteractive) {
-      accountId = await new Promise((resolve7) => {
+      accountId = await new Promise((resolve8) => {
         const accounts = responseJSON.result.map((x) => x.account);
         const { unmount } = (0, import_ink.render)(/* @__PURE__ */ import_react.default.createElement(ChooseAccount, {
           accounts,
           onSelect: async (selected) => {
-            resolve7(selected.value.id);
+            resolve8(selected.value.id);
             unmount();
           }
         }));
@@ -136399,23 +136404,24 @@ function experimental(diagnostics, config, fieldPath) {
     diagnostics.warnings.push(`"${fieldPath}" fields are experimental and may change or break at any time.`);
   }
 }
-function inheritable(diagnostics, config, rawEnv, field, validate, defaultValue) {
-  validate(diagnostics, field, rawEnv[field], config);
-  return rawEnv[field] ?? config?.[field] ?? defaultValue;
+function inheritable(diagnostics, topLevelEnv, rawEnv, field, validate, defaultValue, transformFn = (v) => v) {
+  validate(diagnostics, field, rawEnv[field], topLevelEnv);
+  return rawEnv[field] ?? transformFn(topLevelEnv?.[field]) ?? defaultValue;
 }
-function inheritableInLegacyEnvironments(diagnostics, config, rawEnv, field, validate, defaultValue) {
-  return config === void 0 || config.legacy_env ? inheritable(diagnostics, config, rawEnv, field, validate, defaultValue) : notAllowedInNamedServiceEnvironment(diagnostics, config, rawEnv, field);
+function inheritableInLegacyEnvironments(diagnostics, isLegacyEnv2, topLevelEnv, rawEnv, field, validate, transformFn, defaultValue) {
+  return topLevelEnv === void 0 || isLegacyEnv2 === true ? inheritable(diagnostics, topLevelEnv, rawEnv, field, validate, defaultValue, transformFn) : notAllowedInNamedServiceEnvironment(diagnostics, topLevelEnv, rawEnv, field);
 }
-function notAllowedInNamedServiceEnvironment(diagnostics, config, rawEnv, field) {
+var appendEnvName = (envName) => (fieldValue) => fieldValue ? `${fieldValue}-${envName}` : void 0;
+function notAllowedInNamedServiceEnvironment(diagnostics, topLevelEnv, rawEnv, field) {
   if (field in rawEnv) {
     diagnostics.errors.push(`The "${field}" field is not allowed in named service environments.
 Please remove the field from this environment.`);
   }
-  return config[field];
+  return topLevelEnv[field];
 }
-function notInheritable(diagnostics, config, rawConfig, rawEnv, envName, field, validate, defaultValue) {
+function notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, field, validate, defaultValue) {
   if (rawEnv[field] !== void 0) {
-    validate(diagnostics, field, rawEnv[field], config);
+    validate(diagnostics, field, rawEnv[field], topLevelEnv);
   } else {
     if (rawConfig?.[field] !== void 0) {
       diagnostics.warnings.push(`"${field}" exists at the top level, but not on "env.${envName}".
@@ -136438,21 +136444,21 @@ function unwindPropertyPath(root, path22) {
 }
 var isString = (diagnostics, field, value) => {
   if (value !== void 0 && typeof value !== "string") {
-    diagnostics.errors.push(`Expected "${field}" field to be a string but got ${JSON.stringify(value)}.`);
+    diagnostics.errors.push(`Expected "${field}" to be of type string but got ${JSON.stringify(value)}.`);
     return false;
   }
   return true;
 };
 var isStringArray = (diagnostics, field, value) => {
   if (value !== void 0 && (!Array.isArray(value) || value.some((item) => typeof item !== "string"))) {
-    diagnostics.errors.push(`Expected "${field}" field to be an array of strings but got ${JSON.stringify(value)}.`);
+    diagnostics.errors.push(`Expected "${field}" to be of type string array but got ${JSON.stringify(value)}.`);
     return false;
   }
   return true;
 };
 var isObjectWith = (...properties) => (diagnostics, field, value) => {
   if (value !== void 0 && (typeof value !== "object" || value === null || !properties.every((prop) => prop in value))) {
-    diagnostics.errors.push(`Expected "${field}" field to be an object containing properties ${properties} but got ${JSON.stringify(value)}.`);
+    diagnostics.errors.push(`Expected "${field}" to be of type object, containing properties ${properties}, but got ${JSON.stringify(value)}.`);
     return false;
   }
   return true;
@@ -136482,7 +136488,10 @@ var isMutuallyExclusiveWith = (container, ...fields) => {
     }
     for (const exclusiveWith of fields) {
       if (container[exclusiveWith] !== void 0) {
-        diagnostics.errors.push(`Expected exactly one of ${JSON.stringify([field, ...fields])}.`);
+        diagnostics.errors.push(`Expected exactly one of the following fields ${JSON.stringify([
+          field,
+          ...fields
+        ])}.`);
         return false;
       }
     }
@@ -136491,7 +136500,7 @@ var isMutuallyExclusiveWith = (container, ...fields) => {
 };
 var isBoolean2 = (diagnostics, field, value) => {
   if (value !== void 0 && typeof value !== "boolean") {
-    diagnostics.errors.push(`Expected "${field}" field to be a boolean but got ${JSON.stringify(value)}.`);
+    diagnostics.errors.push(`Expected "${field}" to be of type boolean but got ${JSON.stringify(value)}.`);
     return false;
   }
   return true;
@@ -136552,59 +136561,93 @@ var validateAdditionalProperties = (diagnostics, fieldPath, restProps, knownProp
   }
   return true;
 };
+var getBindingNames = (value) => {
+  if (typeof value !== "object" || value === null) {
+    return [];
+  }
+  if (isBindingList(value)) {
+    return value.bindings.map(({ name: name2 }) => name2);
+  } else if (isNamespaceList(value)) {
+    return value.map(({ binding }) => binding);
+  } else if (isRecord(value)) {
+    return Object.keys(value);
+  } else {
+    return [];
+  }
+};
+var isBindingList = (value) => isRecord(value) && "bindings" in value && Array.isArray(value.bindings) && value.bindings.every((binding) => isRecord(binding) && "name" in binding && typeof binding.name === "string");
+var isNamespaceList = (value) => Array.isArray(value) && value.every((entry) => isRecord(entry) && "binding" in entry && typeof entry.binding === "string");
+var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 
 // src/config/validation.ts
-function normalizeAndValidateConfig(rawConfig, configPath) {
+var ENGLISH = new Intl.ListFormat("en");
+function normalizeAndValidateConfig(rawConfig, configPath, args2) {
   const diagnostics = new Diagnostics(`Processing ${configPath ? import_node_path8.default.relative(process.cwd(), configPath) : "wrangler"} configuration:`);
   deprecated(diagnostics, rawConfig, "type", "DO NOT USE THIS. Most common features now work out of the box with wrangler, including modules, jsx, typescript, etc. If you need anything more, use a custom build.", true);
   deprecated(diagnostics, rawConfig, "webpack_config", "DO NOT USE THIS. Most common features now work out of the box with wrangler, including modules, jsx, typescript, etc. If you need anything more, use a custom build.", true);
   deprecated(diagnostics, rawConfig, `site.entry-point`, `The \`site.entry-point\` config field is no longer used.
 The entry-point should be specified via the command line or the \`main\` config field.`, false, true);
-  const { deprecatedUpload, ...build5 } = normalizeAndValidateBuild(diagnostics, rawConfig, rawConfig.build ?? {}, configPath);
   validateOptionalProperty(diagnostics, "", "legacy_env", rawConfig.legacy_env, "boolean");
+  const isLegacyEnv2 = args2["legacy-env"] ?? rawConfig.legacy_env ?? true;
+  const topLevelEnv = normalizeAndValidateEnvironment(diagnostics, configPath, rawConfig);
+  const envName = args2.env;
+  let activeEnv = topLevelEnv;
+  if (envName !== void 0) {
+    const envDiagnostics = new Diagnostics(`"env.${envName}" environment configuration`);
+    const rawEnv = rawConfig.env?.[envName];
+    if (rawEnv !== void 0) {
+      activeEnv = normalizeAndValidateEnvironment(envDiagnostics, configPath, rawEnv, envName, topLevelEnv, isLegacyEnv2, rawConfig);
+      diagnostics.addChild(envDiagnostics);
+    } else {
+      activeEnv = normalizeAndValidateEnvironment(envDiagnostics, configPath, {}, envName, topLevelEnv, isLegacyEnv2, rawConfig);
+      const envNames = rawConfig.env ? `The available configured environment names are: ${JSON.stringify(Object.keys(rawConfig.env))}
+` : "";
+      const message2 = `No environment found in configuration with name "${envName}".
+Before using \`--env=${envName}\` there should be an equivalent environment section in the configuration.
+${envNames}
+Consider adding an environment configuration section to the wrangler.toml file:
+\`\`\`
+[env.` + envName + "]\n```\n";
+      if (envNames.length > 0) {
+        diagnostics.errors.push(message2);
+      } else {
+        diagnostics.warnings.push(message2);
+      }
+    }
+  }
   const config = {
     configPath,
-    main: normalizeAndValidateMainField(diagnostics, configPath, rawConfig.main, deprecatedUpload),
-    legacy_env: rawConfig.legacy_env ?? true,
-    ...normalizeAndValidateEnvironment(diagnostics, rawConfig, deprecatedUpload.rules),
-    env: {},
+    legacy_env: isLegacyEnv2,
+    ...activeEnv,
     dev: normalizeAndValidateDev(diagnostics, rawConfig.dev ?? {}),
     migrations: normalizeAndValidateMigrations(diagnostics, rawConfig.migrations ?? []),
     site: normalizeAndValidateSite(diagnostics, rawConfig.site),
     wasm_modules: normalizeAndValidateModulePaths(diagnostics, configPath, "wasm_modules", rawConfig.wasm_modules),
-    text_blobs: normalizeAndValidateModulePaths(diagnostics, configPath, "text_blobs", rawConfig.text_blobs),
-    build: build5
+    text_blobs: normalizeAndValidateModulePaths(diagnostics, configPath, "text_blobs", rawConfig.text_blobs)
   };
-  if (rawConfig.env !== void 0) {
-    for (const envName of Object.keys(rawConfig.env)) {
-      const envDiagnostics = new Diagnostics(`"env.${envName}" environment configuration`);
-      const environment = normalizeAndValidateEnvironment(envDiagnostics, rawConfig.env[envName], deprecatedUpload.rules, envName, config, rawConfig);
-      config.env[envName] = environment;
-      diagnostics.addChild(envDiagnostics);
-    }
-  }
-  validateAdditionalProperties(diagnostics, "top-level", Object.keys(rawConfig), [...Object.keys(config), "miniflare"]);
+  validateBindingsHaveUniqueNames(diagnostics, config);
+  validateAdditionalProperties(diagnostics, "top-level", Object.keys(rawConfig), [...Object.keys(config), "env", "miniflare"]);
   return { config, diagnostics };
 }
-function normalizeAndValidateBuild(diagnostics, rawConfig, rawBuild, configPath) {
+function normalizeAndValidateBuild(diagnostics, rawEnv, rawBuild, configPath) {
   const { command: command2, cwd, watch_dir, upload, ...rest } = rawBuild;
   const deprecatedUpload = { ...upload };
   validateAdditionalProperties(diagnostics, "build", Object.keys(rest), []);
   validateOptionalProperty(diagnostics, "build", "command", command2, "string");
   validateOptionalProperty(diagnostics, "build", "cwd", cwd, "string");
   validateOptionalProperty(diagnostics, "build", "watch_dir", watch_dir, "string");
-  deprecated(diagnostics, rawConfig, "build.upload.format", "The format is inferred automatically from the code.", true);
-  if (rawConfig.main !== void 0 && rawBuild.upload?.main) {
+  deprecated(diagnostics, rawEnv, "build.upload.format", "The format is inferred automatically from the code.", true);
+  if (rawEnv.main !== void 0 && rawBuild.upload?.main) {
     diagnostics.errors.push(`Don't define both the \`main\` and \`build.upload.main\` fields in your configuration.
 They serve the same purpose: to point to the entry-point of your worker.
 Delete the \`build.upload.main\` and \`build.upload.dir\` field from your config.`);
   } else {
-    deprecated(diagnostics, rawConfig, "build.upload.main", `Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
+    deprecated(diagnostics, rawEnv, "build.upload.main", `Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
 Then add the top level \`main\` field to your configuration file:
 \`\`\`
 main = "${import_node_path8.default.join(rawBuild.upload?.dir ?? "./dist", rawBuild.upload?.main ?? ".")}"
 \`\`\``, true);
-    deprecated(diagnostics, rawConfig, "build.upload.dir", `Use the top level "main" field or a command-line argument to specify the entry-point for the Worker.`, true);
+    deprecated(diagnostics, rawEnv, "build.upload.dir", `Use the top level "main" field or a command-line argument to specify the entry-point for the Worker.`, true);
   }
   return {
     command: command2,
@@ -136613,18 +136656,17 @@ main = "${import_node_path8.default.join(rawBuild.upload?.dir ?? "./dist", rawBu
     deprecatedUpload
   };
 }
-function normalizeAndValidateMainField(diagnostics, configPath, rawMain, deprecatedUpload) {
+function normalizeAndValidateMainField(configPath, rawMain, deprecatedUpload) {
   const configDir = import_node_path8.default.dirname(configPath ?? "wrangler.toml");
   if (rawMain !== void 0) {
     if (typeof rawMain === "string") {
       const directory = import_node_path8.default.resolve(configDir);
       return import_node_path8.default.resolve(directory, rawMain);
     } else {
-      diagnostics.errors.push(`Expected "main" to be a string but got ${JSON.stringify(rawMain)}`);
-      return;
+      return rawMain;
     }
-  } else if (deprecatedUpload.main !== void 0) {
-    const directory = import_node_path8.default.resolve(configDir, deprecatedUpload.dir || "./dist");
+  } else if (deprecatedUpload?.main !== void 0) {
+    const directory = import_node_path8.default.resolve(configDir, deprecatedUpload?.dir || "./dist");
     return import_node_path8.default.resolve(directory, deprecatedUpload.main);
   } else {
     return;
@@ -136693,7 +136735,7 @@ function normalizeAndValidateModulePaths(diagnostics, configPath, field, rawMapp
   }
   return mapping;
 }
-function normalizeAndValidateEnvironment(diagnostics, rawEnv, deprecatedRules, envName = "top level", config, rawConfig) {
+function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, envName = "top level", topLevelEnv, isLegacyEnv2, rawConfig) {
   deprecated(diagnostics, rawEnv, "zone_id", "This is unnecessary since we can deduce this from routes directly.", false);
   deprecated(diagnostics, rawEnv, "experimental_services", `The "experimental_services" field is no longer supported. Instead, use [[unsafe.bindings]] to enable experimental features. Add this to your wrangler.toml:
 \`\`\`
@@ -136710,37 +136752,45 @@ function normalizeAndValidateEnvironment(diagnostics, rawEnv, deprecatedRules, e
     }
   }) + "```", true);
   experimental(diagnostics, rawEnv, "unsafe");
-  const route = inheritable(diagnostics, config, rawEnv, "route", isString, void 0);
-  const routes = inheritable(diagnostics, config, rawEnv, "routes", all(isStringArray, isMutuallyExclusiveWith(rawEnv, "route")), void 0);
-  const workers_dev = inheritable(diagnostics, config, rawEnv, "workers_dev", isBoolean2, !(routes || route));
+  const route = inheritable(diagnostics, topLevelEnv, rawEnv, "route", isString, void 0);
+  const routes = inheritable(diagnostics, topLevelEnv, rawEnv, "routes", all(isStringArray, isMutuallyExclusiveWith(rawEnv, "route")), void 0);
+  const workers_dev = inheritable(diagnostics, topLevelEnv, rawEnv, "workers_dev", isBoolean2, void 0);
+  const { deprecatedUpload, ...build5 } = normalizeAndValidateBuild(diagnostics, rawEnv, rawEnv.build ?? topLevelEnv?.build ?? {}, configPath);
   const environment = {
-    account_id: inheritable(diagnostics, config, rawEnv, "account_id", isString, void 0),
-    compatibility_date: inheritable(diagnostics, config, rawEnv, "compatibility_date", isString, void 0),
-    compatibility_flags: inheritable(diagnostics, config, rawEnv, "compatibility_flags", isStringArray, []),
-    jsx_factory: inheritable(diagnostics, config, rawEnv, "jsx_factory", isString, "React.createElement"),
-    jsx_fragment: inheritable(diagnostics, config, rawEnv, "jsx_fragment", isString, "React.Fragment"),
-    rules: validateAndNormalizeRules(diagnostics, config, rawEnv, deprecatedRules, envName),
-    name: inheritableInLegacyEnvironments(diagnostics, config, rawEnv, "name", isString, void 0),
+    account_id: inheritable(diagnostics, topLevelEnv, rawEnv, "account_id", isString, void 0),
+    compatibility_date: inheritable(diagnostics, topLevelEnv, rawEnv, "compatibility_date", isString, void 0),
+    compatibility_flags: inheritable(diagnostics, topLevelEnv, rawEnv, "compatibility_flags", isStringArray, []),
+    jsx_factory: inheritable(diagnostics, topLevelEnv, rawEnv, "jsx_factory", isString, "React.createElement"),
+    jsx_fragment: inheritable(diagnostics, topLevelEnv, rawEnv, "jsx_fragment", isString, "React.Fragment"),
+    tsconfig: validateAndNormalizeTsconfig(diagnostics, topLevelEnv, rawEnv, configPath),
+    rules: validateAndNormalizeRules(diagnostics, topLevelEnv, rawEnv, deprecatedUpload?.rules, envName),
+    name: inheritableInLegacyEnvironments(diagnostics, isLegacyEnv2, topLevelEnv, rawEnv, "name", isString, appendEnvName(envName), void 0),
+    main: normalizeAndValidateMainField(configPath, inheritable(diagnostics, topLevelEnv, rawEnv, "main", isString, void 0), deprecatedUpload),
     route,
     routes,
-    triggers: inheritable(diagnostics, config, rawEnv, "triggers", isObjectWith("crons"), { crons: [] }),
-    usage_model: inheritable(diagnostics, config, rawEnv, "usage_model", isOneOf("bundled", "unbound"), void 0),
+    triggers: inheritable(diagnostics, topLevelEnv, rawEnv, "triggers", isObjectWith("crons"), { crons: [] }),
+    usage_model: inheritable(diagnostics, topLevelEnv, rawEnv, "usage_model", isOneOf("bundled", "unbound"), void 0),
+    build: build5,
     workers_dev,
-    vars: notInheritable(diagnostics, config, rawConfig, rawEnv, envName, "vars", validateVars(envName), {}),
-    durable_objects: notInheritable(diagnostics, config, rawConfig, rawEnv, envName, "durable_objects", validateBindingsProperty(envName, validateDurableObjectBinding), {
+    vars: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "vars", validateVars(envName), {}),
+    durable_objects: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "durable_objects", validateBindingsProperty(envName, validateDurableObjectBinding), {
       bindings: []
     }),
-    kv_namespaces: notInheritable(diagnostics, config, rawConfig, rawEnv, envName, "kv_namespaces", validateBindingArray(envName, validateKVBinding), []),
-    r2_buckets: notInheritable(diagnostics, config, rawConfig, rawEnv, envName, "r2_buckets", validateBindingArray(envName, validateR2Binding), []),
-    unsafe: notInheritable(diagnostics, config, rawConfig, rawEnv, envName, "unsafe", validateBindingsProperty(envName, validateUnsafeBinding), {
+    kv_namespaces: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "kv_namespaces", validateBindingArray(envName, validateKVBinding), []),
+    r2_buckets: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "r2_buckets", validateBindingArray(envName, validateR2Binding), []),
+    unsafe: notInheritable(diagnostics, topLevelEnv, rawConfig, rawEnv, envName, "unsafe", validateBindingsProperty(envName, validateUnsafeBinding), {
       bindings: []
     }),
     zone_id: rawEnv.zone_id
   };
   return environment;
 }
-var validateAndNormalizeRules = (diagnostics, config, rawEnv, deprecatedRules, envName) => {
-  if (config === void 0) {
+function validateAndNormalizeTsconfig(diagnostics, topLevelEnv, rawEnv, configPath) {
+  const tsconfig = inheritable(diagnostics, topLevelEnv, rawEnv, "tsconfig", isString, void 0);
+  return configPath && tsconfig ? import_node_path8.default.relative(process.cwd(), import_node_path8.default.join(import_node_path8.default.dirname(configPath), tsconfig)) : tsconfig;
+}
+var validateAndNormalizeRules = (diagnostics, topLevelEnv, rawEnv, deprecatedRules, envName) => {
+  if (topLevelEnv === void 0) {
     if (rawEnv.rules && deprecatedRules) {
       diagnostics.errors.push(`You cannot configure both [rules] and [build.upload.rules] in your wrangler.toml. Delete the \`build.upload\` section.`);
     } else if (deprecatedRules) {
@@ -136749,7 +136799,7 @@ var validateAndNormalizeRules = (diagnostics, config, rawEnv, deprecatedRules, e
 ` + import_toml4.default.stringify({ rules: deprecatedRules }) + "```");
     }
   }
-  return inheritable(diagnostics, config, rawEnv, "rules", validateRules(envName), deprecatedRules ?? []);
+  return inheritable(diagnostics, topLevelEnv, rawEnv, "rules", validateRules(envName), deprecatedRules ?? []);
 };
 var validateRules = (envName) => (diagnostics, field, envValue, config) => {
   if (!envValue) {
@@ -136845,7 +136895,6 @@ Please add a binding for each to "${fieldPath}.bindings".` + missingBindings.map
   }
   return isValid;
 };
-var getBindingNames = (value) => (value?.bindings ?? []).map((binding) => binding.name);
 var validateDurableObjectBinding = (diagnostics, field, value) => {
   if (typeof value !== "object" || value === null) {
     diagnostics.errors.push(`Expected "${field}" to be an object but got ${JSON.stringify(value)}`);
@@ -136963,9 +137012,61 @@ var validateR2Binding = (diagnostics, field, value) => {
   }
   return isValid;
 };
+var validateBindingsHaveUniqueNames = (diagnostics, {
+  durable_objects,
+  kv_namespaces,
+  r2_buckets,
+  text_blobs,
+  unsafe,
+  vars,
+  wasm_modules
+}) => {
+  let hasDuplicates = false;
+  const bindingsGroupedByType = {
+    "Durable Object": getBindingNames(durable_objects),
+    "KV Namespace": getBindingNames(kv_namespaces),
+    "R2 Bucket": getBindingNames(r2_buckets),
+    "Text Blob": getBindingNames(text_blobs),
+    Unsafe: getBindingNames(unsafe),
+    "Environment Variable": getBindingNames(vars),
+    "WASM Module": getBindingNames(wasm_modules)
+  };
+  const bindingsGroupedByName = {};
+  for (const bindingType in bindingsGroupedByType) {
+    const bindingNames = bindingsGroupedByType[bindingType];
+    for (const bindingName of bindingNames) {
+      if (!(bindingName in bindingsGroupedByName)) {
+        bindingsGroupedByName[bindingName] = [];
+      }
+      bindingsGroupedByName[bindingName].push(bindingType);
+    }
+  }
+  for (const bindingName in bindingsGroupedByName) {
+    const bindingTypes = bindingsGroupedByName[bindingName];
+    if (bindingTypes.length < 2) {
+      continue;
+    }
+    hasDuplicates = true;
+    const sameType = bindingTypes.filter((type2, i2) => bindingTypes.indexOf(type2) !== i2).filter((type2, i2, duplicateBindingTypes) => duplicateBindingTypes.indexOf(type2) === i2);
+    const differentTypes = bindingTypes.filter((type2, i2) => bindingTypes.indexOf(type2) === i2);
+    if (differentTypes.length > 1) {
+      diagnostics.errors.push(`${bindingName} assigned to ${ENGLISH.format(differentTypes)} bindings.`);
+    }
+    sameType.forEach((bindingType) => {
+      diagnostics.errors.push(`${bindingName} assigned to multiple ${bindingType} bindings.`);
+    });
+  }
+  if (hasDuplicates) {
+    const problem = "Bindings must have unique names, so that they can all be referenced in the worker.";
+    const resolution = "Please change your bindings to have unique names.";
+    diagnostics.errors.push(`${problem}
+${resolution}`);
+  }
+  return !hasDuplicates;
+};
 
 // src/config/index.ts
-function readConfig(configPath) {
+function readConfig(configPath, args2) {
   let rawConfig = {};
   if (!configPath) {
     configPath = findWranglerToml();
@@ -136973,7 +137074,7 @@ function readConfig(configPath) {
   if (configPath) {
     rawConfig = parseTOML(readFileSync5(configPath), configPath);
   }
-  const { config, diagnostics } = normalizeAndValidateConfig(rawConfig, configPath);
+  const { config, diagnostics } = normalizeAndValidateConfig(rawConfig, configPath, args2);
   if (diagnostics.hasWarnings()) {
     console.warn(diagnostics.renderWarnings());
   }
@@ -137328,7 +137429,23 @@ async function getEntry(args2, config, command2) {
   if (fileExists(file) === false) {
     throw new Error(`Could not resolve "${import_node_path11.default.relative(process.cwd(), file)}".`);
   }
-  const format3 = await guessWorkerFormat(file, directory, args2.format ?? config.build?.upload?.format);
+  const format3 = await guessWorkerFormat(file, directory, args2.format ?? config.build?.upload?.format, config.tsconfig);
+  const { localBindings, remoteBindings } = partitionDurableObjectBindings(config);
+  if (command2 === "dev" && remoteBindings.length > 0) {
+    console.warn("WARNING: You have Durable Object bindings, which are not defined locally in the worker being developed.\nBe aware that changes to the data stored in these Durable Objects will be permanent and affect the live instances.\nRemote Durable Objects that are affected:\n" + remoteBindings.map((b) => `- ${JSON.stringify(b)}`).join("\n"));
+  }
+  if (format3 === "service-worker" && localBindings.length > 0) {
+    const errorMessage = "You seem to be trying to use Durable Objects in a Worker written with Service Worker syntax.";
+    const addScriptName = "You can use Durable Objects defined in other Workers by specifying a `script_name` in your wrangler.toml, where `script_name` is the name of the Worker that implements that Durable Object. For example:";
+    const addScriptNameExamples = generateAddScriptNameExamples(localBindings);
+    const migrateText = "Alternatively, migrate your worker to ES Module syntax to implement a Durable Object in this Worker:";
+    const migrateUrl = "https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/";
+    throw new Error(`${errorMessage}
+${addScriptName}
+${addScriptNameExamples}
+${migrateText}
+${migrateUrl}`);
+  }
   return { file, directory, format: format3 };
 }
 async function runCustomBuild(expectedEntry, build5) {
@@ -137346,14 +137463,20 @@ async function runCustomBuild(expectedEntry, build5) {
     }
   }
 }
-async function guessWorkerFormat(entryFile, entryWorkingDirectory, hint) {
+async function guessWorkerFormat(entryFile, entryWorkingDirectory, hint, tsconfig) {
   const result = await esbuild.build({
     entryPoints: [entryFile],
     absWorkingDir: entryWorkingDirectory,
     metafile: true,
     bundle: false,
     format: "esm",
-    write: false
+    write: false,
+    loader: {
+      ".js": "jsx",
+      ".mjs": "jsx",
+      ".cjs": "jsx"
+    },
+    ...tsconfig && { tsconfig }
   });
   const metafile = result.metafile;
   const entryPoints = Object.entries(metafile.outputs).filter(([_path, output]) => output.entryPoint !== void 0);
@@ -137386,6 +137509,29 @@ function fileExists(filePath) {
   }
   return false;
 }
+function partitionDurableObjectBindings(config) {
+  const localBindings = [];
+  const remoteBindings = [];
+  for (const binding of config.durable_objects.bindings) {
+    if (binding.script_name === void 0) {
+      localBindings.push(binding);
+    } else {
+      remoteBindings.push(binding);
+    }
+  }
+  return { localBindings, remoteBindings };
+}
+function generateAddScriptNameExamples(localBindings) {
+  function exampleScriptName(binding_name) {
+    return `${binding_name.toLowerCase().replaceAll("_", "-")}-worker`;
+  }
+  return localBindings.map(({ name: name2, class_name }) => {
+    const script_name = exampleScriptName(name2);
+    const currentBinding = `{ name = ${name2}, class_name = ${class_name} }`;
+    const fixedBinding = `{ name = ${name2}, class_name = ${class_name}, script_name = ${script_name} }`;
+    return `${currentBinding} ==> ${fixedBinding}`;
+  }).join("\n");
+}
 
 // src/dev/local.tsx
 init_import_meta_url();
@@ -137684,7 +137830,7 @@ function createStreamHandler(previewToken, remote, localPort, localProtocol) {
   };
 }
 async function waitForPortToBeAvailable(port, options) {
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve8, reject) => {
     const timeout = setTimeout(() => {
       doReject(new Error(`Timed out waiting for port ${port}`));
     }, options.timeout);
@@ -137693,7 +137839,7 @@ async function waitForPortToBeAvailable(port, options) {
     function doResolve() {
       clearTimeout(timeout);
       clearInterval(interval2);
-      resolve7();
+      resolve8();
     }
     function doReject(err2) {
       clearInterval(interval2);
@@ -138094,32 +138240,34 @@ function createModuleCollector(props) {
             };
           });
         });
-        build5.onResolve({
-          filter: new RegExp([...props.wrangler1xlegacyModuleReferences.fileNames].map((fileName) => `^${fileName}$`).join("|"))
-        }, async (args2) => {
-          if (args2.kind !== "import-statement" && args2.kind !== "require-call") {
-            return;
-          }
-          console.warn(`Deprecation warning: detected a legacy module import in "./${import_node_path12.default.relative(process.cwd(), args2.importer)}". This will stop working in the future. Replace references to "${args2.path}" with "./${args2.path}";`);
-          const filePath = import_node_path12.default.join(props.wrangler1xlegacyModuleReferences.rootDirectory, args2.path);
-          const fileContent = await (0, import_promises2.readFile)(filePath);
-          const fileHash = import_node_crypto2.default.createHash("sha1").update(fileContent).digest("hex");
-          const fileName = `./${fileHash}-${import_node_path12.default.basename(args2.path)}`;
-          const { rule } = rulesMatchers.find(({ regex }) => regex.test(fileName)) || {};
-          if (rule) {
-            modules.push({
-              name: fileName,
-              content: fileContent,
-              type: RuleTypeToModuleType[rule.type]
-            });
-            return {
-              path: fileName,
-              external: props.format === "modules",
-              namespace: `wrangler-module-${rule.type}`,
-              watchFiles: [filePath]
-            };
-          }
-        });
+        if (props.wrangler1xlegacyModuleReferences.fileNames.size > 0) {
+          build5.onResolve({
+            filter: new RegExp("^(" + [...props.wrangler1xlegacyModuleReferences.fileNames].join("|") + ")$")
+          }, async (args2) => {
+            if (args2.kind !== "import-statement" && args2.kind !== "require-call") {
+              return;
+            }
+            console.warn(`Deprecation warning: detected a legacy module import in "./${import_node_path12.default.relative(process.cwd(), args2.importer)}". This will stop working in the future. Replace references to "${args2.path}" with "./${args2.path}";`);
+            const filePath = import_node_path12.default.join(props.wrangler1xlegacyModuleReferences.rootDirectory, args2.path);
+            const fileContent = await (0, import_promises2.readFile)(filePath);
+            const fileHash = import_node_crypto2.default.createHash("sha1").update(fileContent).digest("hex");
+            const fileName = `./${fileHash}-${import_node_path12.default.basename(args2.path)}`;
+            const { rule } = rulesMatchers.find(({ regex }) => regex.test(fileName)) || {};
+            if (rule) {
+              modules.push({
+                name: fileName,
+                content: fileContent,
+                type: RuleTypeToModuleType[rule.type]
+              });
+              return {
+                path: fileName,
+                external: props.format === "modules",
+                namespace: `wrangler-module-${rule.type}`,
+                watchFiles: [filePath]
+              };
+            }
+          });
+        }
         rules?.forEach((rule) => {
           if (rule.type === "ESModule" || rule.type === "CommonJS")
             return;
@@ -138164,18 +138312,7 @@ function createModuleCollector(props) {
 
 // src/dev/local.tsx
 function Local(props) {
-  const { inspectorUrl } = useLocalWorker({
-    name: props.name,
-    bundle: props.bundle,
-    format: props.format,
-    bindings: props.bindings,
-    assetPaths: props.assetPaths,
-    public: props.public,
-    port: props.port,
-    ip: props.ip,
-    rules: props.rules,
-    enableLocalPersistence: props.enableLocalPersistence
-  });
+  const { inspectorUrl } = useLocalWorker(props);
   useInspector({
     inspectorUrl,
     port: props.inspectorPort,
@@ -138183,8 +138320,20 @@ function Local(props) {
   });
   return null;
 }
-function useLocalWorker(props) {
-  const { bundle, format: format3, bindings, port, ip, assetPaths } = props;
+function useLocalWorker({
+  name: workerName,
+  bundle,
+  format: format3,
+  compatibilityDate,
+  compatibilityFlags,
+  bindings,
+  assetPaths,
+  public: publicDirectory,
+  port,
+  rules,
+  enableLocalPersistence,
+  ip
+}) {
   const local = (0, import_react4.useRef)();
   const removeSignalExitListener = (0, import_react4.useRef)();
   const [inspectorUrl, setInspectorUrl] = (0, import_react4.useState)();
@@ -138193,81 +138342,63 @@ function useLocalWorker(props) {
       if (!bundle || !format3)
         return;
       await waitForPortToBeAvailable(port, { retryPeriod: 200, timeout: 2e3 });
-      if (props.public) {
+      if (publicDirectory) {
         throw new Error('\u2394 A "public" folder is not yet supported in local mode.');
       }
       for (const module2 of bundle.modules) {
         await (0, import_promises3.writeFile)(import_node_path13.default.join(import_node_path13.default.dirname(bundle.path), module2.name), module2.content);
       }
+      const scriptPath = (0, import_node_fs5.realpathSync)(bundle.path);
+      const wasmBindings = { ...bindings.wasm_modules };
+      if (format3 === "service-worker") {
+        for (const { type: type2, name: name2 } of bundle.modules) {
+          if (type2 === "compiled-wasm") {
+            const identifier = name2.replace(/[^a-zA-Z0-9_$]/g, "_");
+            wasmBindings[identifier] = name2;
+          }
+        }
+      }
+      const options = {
+        name: workerName,
+        port,
+        scriptPath,
+        host: ip,
+        modules: format3 === "modules",
+        modulesRules: (rules || []).concat(DEFAULT_MODULE_RULES).map(({ type: type2, globs: include, fallthrough }) => ({
+          type: type2,
+          include,
+          fallthrough
+        })),
+        compatibilityDate,
+        compatibilityFlags,
+        kvNamespaces: bindings.kv_namespaces?.map((kv) => kv.binding),
+        kvPersist: enableLocalPersistence,
+        durableObjects: Object.fromEntries((bindings.durable_objects?.bindings ?? []).map((value) => [value.name, value.class_name])),
+        durableObjectsPersist: enableLocalPersistence,
+        cachePersist: enableLocalPersistence,
+        sitePath: assetPaths?.assetDirectory ? import_node_path13.default.join(assetPaths.baseDirectory, assetPaths.assetDirectory) : void 0,
+        siteInclude: assetPaths?.includePatterns.length ? assetPaths?.includePatterns : void 0,
+        siteExclude: assetPaths?.excludePatterns.length ? assetPaths.excludePatterns : void 0,
+        bindings: bindings.vars,
+        wasmBindings,
+        sourceMap: true,
+        logUnhandledRejections: true
+      };
+      const miniflareCLIPath = import_node_path13.default.resolve(__dirname, "../miniflare-dist/index.mjs");
+      const optionsArg = JSON.stringify(options, null);
       console.log("\u2394 Starting a local server...");
       local.current = (0, import_node_child_process2.spawn)("node", [
         "--experimental-vm-modules",
+        "--no-warnings",
         "--inspect",
-        require.resolve("miniflare/cli"),
-        (0, import_node_fs5.realpathSync)(bundle.path),
-        "--watch",
-        "--wrangler-config",
-        import_node_path13.default.join(__dirname, "../miniflare-config-stubs/wrangler.empty.toml"),
-        "--env",
-        import_node_path13.default.join(__dirname, "../miniflare-config-stubs/.env.empty"),
-        "--package",
-        import_node_path13.default.join(__dirname, "../miniflare-config-stubs/package.empty.json"),
-        "--port",
-        port.toString(),
-        "--host",
-        ip,
-        ...assetPaths ? [
-          "--site",
-          import_node_path13.default.join(process.cwd(), assetPaths.baseDirectory),
-          ...assetPaths.includePatterns.map((pattern) => [
-            "--site-include",
-            pattern
-          ]),
-          ...assetPaths.excludePatterns.map((pattern) => [
-            "--site-exclude",
-            pattern
-          ])
-        ].flatMap((x) => x) : [],
-        ...props.enableLocalPersistence ? ["--kv-persist", "--cache-persist", "--do-persist"] : [],
-        ...Object.entries(bindings.vars || {}).flatMap(([key2, value]) => {
-          return ["--binding", `${key2}=${value}`];
-        }),
-        ...(bindings.kv_namespaces || []).flatMap(({ binding }) => {
-          return ["--kv", binding];
-        }),
-        ...(bindings.durable_objects?.bindings || []).flatMap(({ name: name2, class_name }) => {
-          return ["--do", `${name2}=${class_name}`];
-        }),
-        ...Object.entries(bindings.wasm_modules || {}).flatMap(([name2, filePath]) => {
-          return [
-            "--wasm",
-            `${name2}=${import_node_path13.default.join(process.cwd(), filePath)}`
-          ];
-        }),
-        ...bundle.modules.reduce((cmd, { name: name2, type: type2 }) => {
-          if (format3 === "service-worker") {
-            if (type2 === "compiled-wasm") {
-              const identifier = name2.replace(/[^a-zA-Z0-9_$]/g, "_");
-              return cmd.concat([`--wasm`, `${identifier}=${name2}`]);
-            } else {
-              throw new Error(`\u2394 Unsupported module type ${type2} for file ${name2} in service-worker format`);
-            }
-          }
-          return cmd;
-        }, []),
-        "--modules",
-        String(format3 === "modules"),
-        ...(props.rules || []).concat(DEFAULT_MODULE_RULES).flatMap((rule) => rule.globs.flatMap((glob) => [
-          "--modules-rule",
-          `${rule.type}=${glob}`
-        ]))
+        miniflareCLIPath,
+        optionsArg
       ], {
-        cwd: import_node_path13.default.dirname((0, import_node_fs5.realpathSync)(bundle.path))
+        cwd: import_node_path13.default.dirname(scriptPath)
       });
-      console.log(`\u2B23 Listening at http://localhost:${port}`);
       local.current.on("close", (code) => {
         if (code) {
-          console.log(`miniflare process exited with code ${code}`);
+          console.log(`Miniflare process exited with code ${code}`);
         }
       });
       local.current.stdout?.on("data", (data) => {
@@ -138282,11 +138413,11 @@ function useLocalWorker(props) {
       });
       local.current.on("exit", (code) => {
         if (code) {
-          console.error(`miniflare process exited with code ${code}`);
+          console.error(`Miniflare process exited with code ${code}`);
         }
       });
       local.current.on("error", (error) => {
-        console.error(`miniflare process failed to spawn`);
+        console.error(`Miniflare process failed to spawn`);
         console.error(error);
       });
       removeSignalExitListener.current = (0, import_signal_exit2.default)((_code, _signal) => {
@@ -138309,16 +138440,19 @@ function useLocalWorker(props) {
     };
   }, [
     bundle,
+    workerName,
     format3,
     port,
     ip,
     bindings.durable_objects?.bindings,
     bindings.kv_namespaces,
     bindings.vars,
-    props.enableLocalPersistence,
+    compatibilityDate,
+    compatibilityFlags,
+    enableLocalPersistence,
     assetPaths,
-    props.public,
-    props.rules,
+    publicDirectory,
+    rules,
     bindings.wasm_modules
   ]);
   return { inspectorUrl };
@@ -138548,30 +138682,20 @@ async function deleteBulkKeyValue(accountId, namespaceId, keys, progressCallback
     progressCallback(keys.length, keys.length);
   }
 }
-function getNamespaceId({ preview, binding, "namespace-id": namespaceId, env: env4 }, configOrEnv) {
+function getNamespaceId({ preview, binding, "namespace-id": namespaceId }, config) {
   if (namespaceId) {
     return namespaceId;
   }
-  if (binding && !configOrEnv) {
+  if (binding && !config) {
     throw new Error("--binding specified, but no config file was found.");
   }
-  if (!configOrEnv) {
+  if (!config) {
     throw new Error("Failed to find a config file.\nEither use --namespace-id to upload directly or create a configuration file with a binding.");
   }
-  if (env4) {
-    if (!("env" in configOrEnv) || !configOrEnv.env[env4]) {
-      throw new Error(`Failed to find environment "${env4}" in configuration file!`);
-    }
-    return getNamespaceId({
-      binding,
-      "namespace-id": namespaceId,
-      preview
-    }, configOrEnv.env[env4]);
-  }
-  if (!configOrEnv.kv_namespaces || configOrEnv.kv_namespaces.length === 0) {
+  if (!config.kv_namespaces || config.kv_namespaces.length === 0) {
     throw new Error("No KV Namespaces configured! Either use --namespace-id to upload directly or add a KV namespace to your wrangler config file.");
   }
-  const namespace = configOrEnv.kv_namespaces.find((ns) => ns.binding === binding);
+  const namespace = config.kv_namespaces.find((ns) => ns.binding === binding);
   if (!namespace) {
     throw new Error(`A namespace with binding name "${binding}" was not found in the configured "kv_namespaces".`);
   }
@@ -138608,7 +138732,6 @@ var ALWAYS_IGNORE = /* @__PURE__ */ new Set(["node_modules"]);
 var HIDDEN_FILES_TO_INCLUDE = /* @__PURE__ */ new Set([
   ".well-known"
 ]);
-var FIVE_MINUTES = 60 * 5;
 async function* getFilesInFolder(dirPath) {
   const files = await (0, import_promises4.readdir)(dirPath, { withFileTypes: true });
   for (const file of files) {
@@ -138655,25 +138778,27 @@ async function syncAssets(accountId, scriptName, siteAssets, preview) {
   const title = `__${scriptName}-workers_sites_assets${preview ? "_preview" : ""}`;
   const { id: namespace } = await createKVNamespaceIfNotAlreadyExisting(title, accountId);
   const result = await listNamespaceKeys(accountId, namespace);
-  const keyMap = result.reduce((km, key2) => Object.assign(km, { [key2.name]: key2 }), {});
+  const keys = new Set(result.map((x) => x.name));
   const manifest = {};
   const toUpload = [];
   const include = createPatternMatcher(siteAssets.includePatterns, false);
   const exclude = createPatternMatcher(siteAssets.excludePatterns, true);
   const hasher = await e();
-  for await (const file of getFilesInFolder(siteAssets.baseDirectory)) {
-    if (!include(file)) {
+  const assetDirectory = path14.join(siteAssets.baseDirectory, siteAssets.assetDirectory);
+  for await (const absAssetFile of getFilesInFolder(assetDirectory)) {
+    const assetFile = path14.relative(siteAssets.baseDirectory, absAssetFile);
+    if (!include(assetFile)) {
       continue;
     }
-    if (exclude(file)) {
+    if (exclude(assetFile)) {
       continue;
     }
-    await validateAssetSize(file);
-    console.log(`reading ${file}...`);
-    const content = await (0, import_promises4.readFile)(file, "base64");
-    const assetKey = hashAsset(hasher, file, content);
+    await validateAssetSize(absAssetFile, assetFile);
+    console.log(`reading ${assetFile}...`);
+    const content = await (0, import_promises4.readFile)(absAssetFile, "base64");
+    const assetKey = hashAsset(hasher, assetFile, content);
     validateAssetKey(assetKey);
-    if (!(assetKey in keyMap) || keyMap[assetKey].expiration) {
+    if (!keys.has(assetKey)) {
       console.log(`uploading as ${assetKey}...`);
       toUpload.push({
         key: assetKey,
@@ -138683,27 +138808,19 @@ async function syncAssets(accountId, scriptName, siteAssets, preview) {
     } else {
       console.log(`skipping - already uploaded`);
     }
-    delete keyMap[assetKey];
-    manifest[path14.relative(siteAssets.baseDirectory, file)] = assetKey;
+    keys.delete(assetKey);
+    manifest[path14.relative(siteAssets.assetDirectory, absAssetFile)] = assetKey;
   }
-  let toExpire = [];
-  for (const asset of Object.values(keyMap)) {
-    if (!asset.expiration) {
-      console.log(`expiring unused ${asset.name}...`);
-      toExpire.push({
-        key: asset.name,
-        value: "",
-        expiration_ttl: FIVE_MINUTES,
-        base64: true
-      });
-    }
+  for (const key2 of keys) {
+    console.log(`deleting ${key2} from the asset store...`);
   }
-  toExpire = await Promise.all(toExpire.map(async (asset) => ({
-    ...asset,
-    value: await getKeyValue(accountId, namespace, asset.key)
-  })));
-  await putBulkKeyValue(accountId, namespace, toUpload.concat(toExpire), () => {
-  });
+  await Promise.all([
+    putBulkKeyValue(accountId, namespace, toUpload, () => {
+    }),
+    deleteBulkKeyValue(accountId, namespace, Array.from(keys), () => {
+    })
+  ]);
+  console.log("\u2197\uFE0F  Done syncing assets");
   return { manifest, namespace };
 }
 function createPatternMatcher(patterns, exclude) {
@@ -138714,10 +138831,10 @@ function createPatternMatcher(patterns, exclude) {
     return (filePath) => ignorer.test(filePath).ignored;
   }
 }
-async function validateAssetSize(filePath) {
-  const { size } = await (0, import_promises4.stat)(filePath);
+async function validateAssetSize(absFilePath, relativeFilePath) {
+  const { size } = await (0, import_promises4.stat)(absFilePath);
   if (size > 25 * 1024 * 1024) {
-    throw new Error(`File ${filePath} is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits`);
+    throw new Error(`File ${relativeFilePath} is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits`);
   }
 }
 function validateAssetKey(assetKey) {
@@ -138728,9 +138845,11 @@ function validateAssetKey(assetKey) {
 function urlSafe(filePath) {
   return filePath.replace(/\\/g, "/");
 }
-function getAssetPaths(config, baseDirectory = config.site?.bucket, includePatterns = config.site?.include ?? [], excludePatterns = config.site?.exclude ?? []) {
-  return baseDirectory ? {
+function getAssetPaths(config, assetDirectory = config.site?.bucket, includePatterns = config.site?.include ?? [], excludePatterns = config.site?.exclude ?? []) {
+  const baseDirectory = path14.resolve(path14.dirname(config.configPath ?? "wrangler.toml"));
+  return assetDirectory ? {
     baseDirectory,
+    assetDirectory,
     includePatterns,
     excludePatterns
   } : void 0;
@@ -138867,7 +138986,14 @@ var fs5 = __toESM(require("node:fs"));
 var path16 = __toESM(require("node:path"));
 var esbuild2 = __toESM(require("esbuild"));
 async function bundleWorker(entry, destination, options) {
-  const { serveAssetsFromWorker, jsxFactory, jsxFragment, rules, watch: watch3 } = options;
+  const {
+    serveAssetsFromWorker,
+    jsxFactory,
+    jsxFragment,
+    rules,
+    watch: watch3,
+    tsconfig
+  } = options;
   const entryDirectory = path16.dirname(entry.file);
   const moduleCollector = createModuleCollector({
     wrangler1xlegacyModuleReferences: {
@@ -138887,6 +139013,11 @@ async function bundleWorker(entry, destination, options) {
     sourcemap: true,
     metafile: true,
     conditions: ["worker", "browser"],
+    ...process.env.NODE_ENV && {
+      define: {
+        "process.env.NODE_ENV": `"${process.env.NODE_ENV}"`
+      }
+    },
     loader: {
       ".js": "jsx",
       ".mjs": "jsx",
@@ -138895,6 +139026,7 @@ async function bundleWorker(entry, destination, options) {
     plugins: [moduleCollector.plugin],
     ...jsxFactory && { jsxFactory },
     ...jsxFragment && { jsxFragment },
+    ...tsconfig && { tsconfig },
     watch: watch3
   });
   const entryPointOutputs = Object.entries(result.metafile.outputs).filter(([_path, output]) => output.entryPoint !== void 0);
@@ -138935,7 +139067,8 @@ function useEsbuild({
   jsxFactory,
   jsxFragment,
   rules,
-  serveAssetsFromWorker
+  serveAssetsFromWorker,
+  tsconfig
 }) {
   const [bundle, setBundle] = (0, import_react6.useState)();
   (0, import_react6.useEffect)(() => {
@@ -138960,7 +139093,8 @@ function useEsbuild({
         jsxFactory,
         jsxFragment,
         rules,
-        watch: watchMode
+        watch: watchMode,
+        tsconfig
       });
       stopWatching = stop;
       setBundle({
@@ -138984,17 +139118,17 @@ function useEsbuild({
     jsxFactory,
     jsxFragment,
     serveAssetsFromWorker,
-    rules
+    rules,
+    tsconfig
   ]);
   return bundle;
 }
 
 // src/dev/dev.tsx
 function DevImplementation(props) {
-  const port = props.port ?? 8787;
   const apiToken = props.initialMode === "remote" ? getAPIToken() : void 0;
   const directory = useTmpDir();
-  useCustomBuild(props.entry, props.buildCommand);
+  useCustomBuild(props.entry, props.build);
   if (props.public && props.entry.format === "service-worker") {
     throw new Error("You cannot use the service worker format with a `public` directory.");
   }
@@ -139011,35 +139145,61 @@ function DevImplementation(props) {
     jsxFactory: props.jsxFactory,
     rules: props.rules,
     jsxFragment: props.jsxFragment,
-    serveAssetsFromWorker: !!props.public
+    serveAssetsFromWorker: !!props.public,
+    tsconfig: props.tsconfig
   });
+  const { isRawModeSupported } = (0, import_ink2.useStdin)();
+  return isRawModeSupported ? /* @__PURE__ */ import_react7.default.createElement(InteractiveDevSession, {
+    ...props,
+    bundle,
+    apiToken
+  }) : /* @__PURE__ */ import_react7.default.createElement(DevSession, {
+    ...props,
+    bundle,
+    apiToken,
+    local: props.initialMode === "local"
+  });
+}
+function InteractiveDevSession(props) {
   const toggles = useHotkeys({
     local: props.initialMode === "local",
     tunnel: false
-  }, port, props.ip, props.inspectorPort, props.localProtocol);
+  }, props.port, props.ip, props.inspectorPort, props.localProtocol);
   useTunnel(toggles.tunnel);
-  return /* @__PURE__ */ import_react7.default.createElement(import_react7.default.Fragment, null, toggles.local ? /* @__PURE__ */ import_react7.default.createElement(Local, {
+  return /* @__PURE__ */ import_react7.default.createElement(import_react7.default.Fragment, null, /* @__PURE__ */ import_react7.default.createElement(DevSession, {
+    ...props,
+    local: toggles.local
+  }), /* @__PURE__ */ import_react7.default.createElement(import_ink2.Box, {
+    borderStyle: "round",
+    paddingLeft: 1,
+    paddingRight: 1
+  }, /* @__PURE__ */ import_react7.default.createElement(import_ink2.Text, null, `B to open a browser, D to open Devtools, L to ${toggles.local ? "turn off" : "turn on"} local mode, X to exit`)));
+}
+function DevSession(props) {
+  return props.local ? /* @__PURE__ */ import_react7.default.createElement(Local, {
     name: props.name,
-    bundle,
+    bundle: props.bundle,
     format: props.entry.format,
+    compatibilityDate: props.compatibilityDate,
+    compatibilityFlags: props.compatibilityFlags,
     bindings: props.bindings,
     assetPaths: props.assetPaths,
     public: props.public,
-    port,
+    port: props.port,
     ip: props.ip,
     rules: props.rules,
     inspectorPort: props.inspectorPort,
     enableLocalPersistence: props.enableLocalPersistence
   }) : /* @__PURE__ */ import_react7.default.createElement(Remote, {
     name: props.name,
-    bundle,
+    bundle: props.bundle,
     format: props.entry.format,
     accountId: props.accountId,
-    apiToken,
+    apiToken: props.apiToken,
     bindings: props.bindings,
     assetPaths: props.assetPaths,
     public: props.public,
-    port,
+    port: props.port,
     ip: props.ip,
     localProtocol: props.localProtocol,
     inspectorPort: props.inspectorPort,
@@ -139049,11 +139209,7 @@ function DevImplementation(props) {
     env: props.env,
     legacyEnv: props.legacyEnv,
     zone: props.zone
-  }), /* @__PURE__ */ import_react7.default.createElement(import_ink2.Box, {
-    borderStyle: "round",
-    paddingLeft: 1,
-    paddingRight: 1
-  }, /* @__PURE__ */ import_react7.default.createElement(import_ink2.Text, null, `B to open a browser, D to open Devtools, L to ${toggles.local ? "turn off" : "turn on"} local mode, X to exit`)));
+  });
 }
 function useTmpDir() {
   const [directory, setDirectory] = (0, import_react7.useState)();
@@ -139096,7 +139252,7 @@ function useCustomBuild(expectedEntry, build5) {
   }, [build5, expectedEntry.file]);
 }
 function sleep(period) {
-  return new Promise((resolve7) => setTimeout(resolve7, period));
+  return new Promise((resolve8) => setTimeout(resolve8, period));
 }
 var SLEEP_DURATION = 2e3;
 var hostNameRegex = /userHostname="(.*)"/g;
@@ -139220,12 +139376,12 @@ function Confirm(props) {
   return /* @__PURE__ */ React3.createElement(import_ink3.Box, null, /* @__PURE__ */ React3.createElement(import_ink3.Text, null, props.text, " (y/n) "));
 }
 function confirm(text) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const { unmount } = (0, import_ink3.render)(/* @__PURE__ */ React3.createElement(Confirm, {
       text,
       onConfirm: (answer) => {
         unmount();
-        resolve7(answer);
+        resolve8(answer);
       }
     }));
   });
@@ -139240,13 +139396,13 @@ function Prompt(props) {
   })));
 }
 async function prompt(text, type2 = "text") {
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const { unmount } = (0, import_ink3.render)(/* @__PURE__ */ React3.createElement(Prompt, {
       text,
       type: type2,
       onSubmit: (inputText) => {
         unmount();
-        resolve7(inputText);
+        resolve8(inputText);
       }
     }));
   });
@@ -139665,6 +139821,7 @@ export const routes = [
 }
 
 // src/pages.tsx
+var pagesBetaWarning = "\u{1F6A7} 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose";
 var EXIT_CALLBACKS = [];
 var EXIT = (message2, code) => {
   if (message2)
@@ -139672,6 +139829,7 @@ var EXIT = (message2, code) => {
   if (code)
     process.exitCode = code;
   EXIT_CALLBACKS.forEach((callback) => callback());
+  RUNNING_BUILDERS.forEach((builder) => builder.stop?.());
   process.exit(code);
 };
 process.on("SIGINT", () => EXIT());
@@ -139681,7 +139839,7 @@ function isWindows() {
 }
 var SECONDS_TO_WAIT_FOR_PROXY = 5;
 async function sleep2(ms) {
-  await new Promise((resolve7) => setTimeout(resolve7, ms));
+  await new Promise((resolve8) => setTimeout(resolve8, ms));
 }
 function getPids(pid) {
   const pids = [pid];
@@ -140161,7 +140319,7 @@ var pages = (yargs) => {
         default: false,
         description: "Auto reload HTML pages when change is detected"
       }
-    });
+    }).epilogue(pagesBetaWarning);
   }, async ({
     local,
     directory,
@@ -140174,6 +140332,7 @@ var pages = (yargs) => {
     "live-reload": liveReload,
     _: [_pages, _dev, ...remaining]
   }) => {
+    console.log(pagesBetaWarning);
     if (!local) {
       console.error("Only local mode is supported at the moment.");
       return;
@@ -140192,17 +140351,20 @@ var pages = (yargs) => {
     }
     let miniflareArgs = {};
     let scriptReadyResolve;
-    const scriptReadyPromise = new Promise((resolve7) => scriptReadyResolve = resolve7);
+    const scriptReadyPromise = new Promise((resolve8) => scriptReadyResolve = resolve8);
     if (usingFunctions) {
       const scriptPath = (0, import_node_path19.join)((0, import_node_os7.tmpdir)(), "./functionsWorker.js");
       console.log(`Compiling worker to "${scriptPath}"...`);
-      await buildFunctions({
-        scriptPath,
-        functionsDirectory,
-        sourcemap: true,
-        watch: true,
-        onEnd: () => scriptReadyResolve()
-      });
+      try {
+        await buildFunctions({
+          scriptPath,
+          functionsDirectory,
+          sourcemap: true,
+          watch: true,
+          onEnd: () => scriptReadyResolve()
+        });
+      } catch {
+      }
       (0, import_chokidar2.watch)([functionsDirectory], {
         persistent: true,
         ignoreInitial: true
@@ -140252,7 +140414,7 @@ var pages = (yargs) => {
       kvNamespaces: kvs.map((kv) => kv.toString()),
       durableObjects: Object.fromEntries(durableObjects.map((durableObject) => durableObject.toString().split("="))),
       bindings: {
-        ...Object.fromEntries(bindings.map((binding) => binding.toString().split("=", 1)))
+        ...Object.fromEntries(bindings.map((binding) => binding.toString().split("=")).map(([key2, ...values]) => [key2, values.join("=")]))
       },
       serviceBindings: {
         async ASSETS(request) {
@@ -140337,7 +140499,7 @@ var pages = (yargs) => {
       default: false,
       description: "Watch for changes to the functions and automatically rebuild the Worker script"
     }
-  }), async ({
+  }).epilogue(pagesBetaWarning), async ({
     directory,
     "script-path": scriptPath,
     "output-config-path": outputConfigPath,
@@ -140346,6 +140508,7 @@ var pages = (yargs) => {
     fallbackService,
     watch: watch3
   }) => {
+    console.log(pagesBetaWarning);
     await buildFunctions({
       scriptPath,
       outputConfigPath,
@@ -140369,17 +140532,16 @@ var import_node_path20 = __toESM(require("node:path"));
 var import_node_url9 = require("node:url");
 var import_tmp_promise2 = __toESM(require_tmp_promise());
 function sleep3(ms) {
-  return new Promise((resolve7) => setTimeout(resolve7, ms));
+  return new Promise((resolve8) => setTimeout(resolve8, ms));
 }
 async function publish(props) {
   const { config, accountId } = props;
-  const envRootObj = props.env && config.env[props.env] || config;
-  (0, import_node_assert7.default)(props.compatibilityDate || envRootObj.compatibility_date, "A compatibility_date is required when publishing. Add one to your wrangler.toml file, or pass it in your terminal as --compatibility_date. See https://developers.cloudflare.com/workers/platform/compatibility-dates for more information.");
-  const triggers = props.triggers || envRootObj.triggers?.crons;
-  const routes = props.routes ?? envRootObj.routes ?? (envRootObj.route ? [envRootObj.route] : []) ?? [];
-  const deployToWorkersDev = envRootObj.workers_dev;
-  const jsxFactory = props.jsxFactory || envRootObj.jsx_factory;
-  const jsxFragment = props.jsxFragment || envRootObj.jsx_fragment;
+  (0, import_node_assert7.default)(props.compatibilityDate || config.compatibility_date, "A compatibility_date is required when publishing. Add one to your wrangler.toml file, or pass it in your terminal as --compatibility_date. See https://developers.cloudflare.com/workers/platform/compatibility-dates for more information.");
+  const triggers = props.triggers || config.triggers?.crons;
+  const routes = props.routes ?? config.routes ?? (config.route ? [config.route] : []) ?? [];
+  const deployToWorkersDev = config.workers_dev ?? routes.length === 0;
+  const jsxFactory = props.jsxFactory || config.jsx_factory;
+  const jsxFragment = props.jsxFragment || config.jsx_fragment;
   const scriptName = props.name;
   (0, import_node_assert7.default)(scriptName, 'You need to provide a name when publishing a worker. Either pass it as a cli arg with `--name <name>` or in your config file as `name = "<name>"`');
   (0, import_node_assert7.default)(!config.site || config.site.bucket, "A [site] definition requires a `bucket` field with a path to the site's public directory.");
@@ -140400,7 +140562,8 @@ async function publish(props) {
       serveAssetsFromWorker: props.experimentalPublic,
       jsxFactory,
       jsxFragment,
-      rules: props.rules
+      rules: props.rules,
+      tsconfig: props.tsconfig ?? config.tsconfig
     });
     const content = (0, import_node_fs8.readFileSync)(resolvedEntryPointPath, {
       encoding: "utf-8"
@@ -140434,8 +140597,8 @@ async function publish(props) {
     }
     const assets = await syncAssets(accountId, scriptName + (!props.legacyEnv && props.env ? `-${props.env}` : ""), props.assetPaths, false);
     const bindings = {
-      kv_namespaces: (envRootObj.kv_namespaces || []).concat(assets.namespace ? { binding: "__STATIC_CONTENT", id: assets.namespace } : []),
-      vars: envRootObj.vars,
+      kv_namespaces: (config.kv_namespaces || []).concat(assets.namespace ? { binding: "__STATIC_CONTENT", id: assets.namespace } : []),
+      vars: config.vars,
       wasm_modules: config.wasm_modules,
       text_blobs: {
         ...config.text_blobs,
@@ -140443,9 +140606,9 @@ async function publish(props) {
           __STATIC_CONTENT_MANIFEST: "__STATIC_CONTENT_MANIFEST"
         }
       },
-      durable_objects: envRootObj.durable_objects,
-      r2_buckets: envRootObj.r2_buckets,
-      unsafe: envRootObj.unsafe?.bindings
+      durable_objects: config.durable_objects,
+      r2_buckets: config.r2_buckets,
+      unsafe: config.unsafe?.bindings
     };
     if (assets.manifest) {
       modules.push({
@@ -140464,9 +140627,9 @@ async function publish(props) {
       bindings,
       migrations,
       modules,
-      compatibility_date: props.compatibilityDate ?? envRootObj.compatibility_date,
-      compatibility_flags: props.compatibilityFlags ?? envRootObj.compatibility_flags,
-      usage_model: envRootObj.usage_model
+      compatibility_date: props.compatibilityDate ?? config.compatibility_date,
+      compatibility_flags: props.compatibilityFlags ?? config.compatibility_flags,
+      usage_model: config.usage_model
     };
     const start = Date.now();
     const notProd = !props.legacyEnv && props.env;
@@ -140673,12 +140836,12 @@ function prettyPrintLogs(data) {
   }
   if (eventMessage.logs.length > 0) {
     eventMessage.logs.forEach(({ level, message: message2 }) => {
-      console.log(`  (${level}) ${message2}`);
+      console.log(`  (${level})`, message2);
     });
   }
   if (eventMessage.exceptions.length > 0) {
     eventMessage.exceptions.forEach(({ name: name2, message: message2 }) => {
-      console.error(`  ${name2}: ${message2}`);
+      console.error(`  ${name2}:`, message2);
     });
   }
 }
@@ -140812,14 +140975,19 @@ function printWranglerBanner() {
   console.log(text + "\n" + (supports_color_default.stdout ? import_chalk.default.hex("#FF8800")("-".repeat(text.length)) : "-".repeat(text.length)));
 }
 function isLegacyEnv(args2, config) {
-  return args2["legacy-env"] ?? config.legacy_env;
+  return config.legacy_env;
 }
 function getScriptName(args2, config) {
-  const shortScriptName = args2.name ?? config.name;
-  if (!shortScriptName) {
-    return;
+  if (args2.name && isLegacyEnv(args2, config) && args2.env) {
+    throw new CommandLineArgsError(`In legacy environment mode you cannot use --name and --env together. If you want to specify a Worker name for a specific environment you can add the following to your wrangler.toml config:
+    [env.${args2.env}]
+    name = "${args2.name}"
+    `);
   }
-  return isLegacyEnv(args2, config) ? `${shortScriptName}${args2.env ? `-${args2.env}` : ""}` : shortScriptName;
+  return args2.name ?? config.name;
+}
+function getLegacyScriptName(args2, config) {
+  return args2.name && args2.env && isLegacyEnv(args2, config) ? `${args2.name}-${args2.env}` : args2.name ?? config.name;
 }
 async function requireAuth(config, isInteractive = true) {
   const loggedIn = await loginOrRefreshIfRequired(isInteractive);
@@ -140833,7 +141001,7 @@ async function requireAuth(config, isInteractive = true) {
   return accountId;
 }
 function readFromStdin() {
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve8, reject) => {
     const stdin = process.stdin;
     const chunks = [];
     stdin.on("readable", () => {
@@ -140843,7 +141011,7 @@ function readFromStdin() {
       }
     });
     stdin.on("end", () => {
-      resolve7(chunks.join(""));
+      resolve8(chunks.join(""));
     });
     stdin.on("error", (err2) => {
       reject(err2);
@@ -140871,7 +141039,7 @@ ${message2}`);
   }
 };
 async function main(argv) {
-  const wrangler = yargs_default(argv).showHelpOnFail(false).fail((msg, error) => {
+  const wrangler = yargs_default(argv).strict().showHelpOnFail(false).fail((msg, error) => {
     if (!error) {
       error = new CommandLineArgsError(msg);
     }
@@ -140906,6 +141074,11 @@ async function main(argv) {
     return yargs.positional("name", {
       describe: "The name of your worker",
       type: "string"
+    }).option("type", {
+      describe: "The type of worker to create",
+      type: "string",
+      choices: ["rust", "javascript", "webpack"],
+      deprecated: true
     }).option("yes", {
       describe: 'Answer "yes" to any prompts for new projects',
       type: "boolean",
@@ -140913,7 +141086,7 @@ async function main(argv) {
     });
   }, async (args2) => {
     printWranglerBanner();
-    if ("type" in args2) {
+    if (args2.type) {
       let message2 = "The --type option is no longer supported.";
       if (args2.type === "webpack") {
         message2 += "\nIf you wish to use webpack then you will need to create a custom build.";
@@ -141115,7 +141288,8 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       describe: "Choose an entry type"
     }).option("env", {
       describe: "Perform on a specific environment",
-      type: "string"
+      type: "string",
+      alias: "e"
     }).option("compatibility-date", {
       describe: "Date to use for compatibility checks",
       type: "string"
@@ -141169,6 +141343,9 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
     }).option("jsx-fragment", {
       describe: "The function that is called for each JSX fragment",
       type: "string"
+    }).option("tsconfig", {
+      describe: "Path to a custom tsconfig.json file",
+      type: "string"
     }).option("local", {
       alias: "l",
       describe: "Run on my machine",
@@ -141180,7 +141357,8 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
     });
   }, async (args2) => {
     printWranglerBanner();
-    const config = readConfig(args2.config || args2.script && findWranglerToml(import_node_path21.default.dirname(args2.script)));
+    const configPath = args2.config || args2.script && findWranglerToml(import_node_path21.default.dirname(args2.script));
+    const config = readConfig(configPath, args2);
     const entry = await getEntry(args2, config, "dev");
     if (args2["experimental-public"]) {
       console.warn("\u{1F6A8}  The --experimental-public field is experimental and will change in the future.");
@@ -141199,29 +141377,30 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       }
       return new URL(urlLike).host;
     }
-    async function getZoneId(host2) {
-      const zones = await fetchResult(`/zones`, {}, new URLSearchParams({ name: host2 }));
+    async function getZoneId(host) {
+      const zones = await fetchResult(`/zones`, {}, new URLSearchParams({ name: host }));
       return zones[0]?.id;
     }
-    const environments = config.env ?? {};
-    const envRootObj = args2.env ? environments[args2.env] || {} : config;
-    const hostLike = args2.host || config.dev.host || args2.routes && args2.routes[0] || envRootObj.route || envRootObj.routes && envRootObj.routes[0];
-    const host = typeof hostLike === "string" ? getHost(hostLike) : void 0;
-    let zoneId;
-    const hostPieces = typeof host === "string" ? host.split(".") : void 0;
-    while (hostPieces && hostPieces.length > 1) {
-      zoneId = await getZoneId(hostPieces.join("."));
-      if (zoneId)
-        break;
-      hostPieces.shift();
-    }
-    if (host && !zoneId) {
-      throw new Error(`Could not find zone for ${hostLike}`);
+    let zone;
+    if (!args2.local) {
+      const hostLike = args2.host || config.dev.host || args2.routes && args2.routes[0] || config.route || config.routes && config.routes[0];
+      const host = typeof hostLike === "string" ? getHost(hostLike) : void 0;
+      let zoneId;
+      const hostPieces = typeof host === "string" ? host.split(".") : void 0;
+      while (hostPieces && hostPieces.length > 1) {
+        zoneId = await getZoneId(hostPieces.join("."));
+        if (zoneId)
+          break;
+        hostPieces.shift();
+      }
+      if (host && !zoneId) {
+        throw new Error(`Could not find zone for ${hostLike}`);
+      }
+      zone = typeof zoneId === "string" && typeof host === "string" ? {
+        host,
+        id: zoneId
+      } : void 0;
     }
-    const zone = typeof zoneId === "string" && typeof host === "string" ? {
-      host,
-      id: zoneId
-    } : void 0;
     const { waitUntilExit } = (0, import_ink5.render)(/* @__PURE__ */ import_react10.default.createElement(dev_default, {
       name: getScriptName(args2, config),
       entry,
@@ -141229,10 +141408,11 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       zone,
       rules: getRules(config),
       legacyEnv: isLegacyEnv(args2, config),
-      buildCommand: config.build || {},
+      build: config.build || {},
       initialMode: args2.local ? "local" : "remote",
-      jsxFactory: args2["jsx-factory"] || envRootObj?.jsx_factory,
-      jsxFragment: args2["jsx-fragment"] || envRootObj?.jsx_fragment,
+      jsxFactory: args2["jsx-factory"] || config.jsx_factory,
+      jsxFragment: args2["jsx-fragment"] || config.jsx_fragment,
+      tsconfig: args2.tsconfig ?? config.tsconfig,
       upstreamProtocol,
       localProtocol: args2["local-protocol"] || config.dev.local_protocol,
       enableLocalPersistence: args2["experimental-enable-local-persistence"] || false,
@@ -141244,9 +141424,9 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       public: args2["experimental-public"],
       compatibilityDate: args2["compatibility-date"] || config.compatibility_date || new Date().toISOString().substring(0, 10),
       compatibilityFlags: args2["compatibility-flags"] || config.compatibility_flags,
-      usageModel: envRootObj.usage_model,
+      usageModel: config.usage_model,
       bindings: {
-        kv_namespaces: envRootObj.kv_namespaces?.map(({ binding, preview_id, id: _id }) => {
+        kv_namespaces: config.kv_namespaces?.map(({ binding, preview_id, id: _id }) => {
           if (!preview_id) {
             throw new Error(`In development, you should use a separate kv namespace than the one you'd use in production. Please create a new kv namespace with "wrangler kv:namespace create <name> --preview" and add its id as preview_id to the kv_namespace "${binding}" in your wrangler.toml`);
           }
@@ -141255,12 +141435,12 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
             id: preview_id
           };
         }),
-        vars: envRootObj.vars,
+        vars: config.vars,
         wasm_modules: config.wasm_modules,
         text_blobs: config.text_blobs,
-        durable_objects: envRootObj.durable_objects,
-        r2_buckets: envRootObj.r2_buckets,
-        unsafe: envRootObj.unsafe?.bindings
+        durable_objects: config.durable_objects,
+        r2_buckets: config.r2_buckets,
+        unsafe: config.unsafe?.bindings
       }
     }));
     await waitUntilExit();
@@ -141268,7 +141448,8 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
   wrangler.command("publish [script]", "\u{1F199} Publish your Worker to Cloudflare.", (yargs) => {
     return yargs.option("env", {
       type: "string",
-      describe: "Perform on a specific environment"
+      describe: "Perform on a specific environment",
+      alias: "e"
     }).positional("script", {
       describe: "The path to an entry point for your worker",
       type: "string"
@@ -141317,6 +141498,9 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
     }).option("jsx-fragment", {
       describe: "The function that is called for each JSX fragment",
       type: "string"
+    }).option("tsconfig", {
+      describe: "Path to a custom tsconfig.json file",
+      type: "string"
     });
   }, async (args2) => {
     printWranglerBanner();
@@ -141326,7 +141510,8 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
     if (args2.public) {
       throw new Error("\u{1F6A8}  The --public field has been renamed to --experimental-public, and will change behaviour in the future.");
     }
-    const config = readConfig(args2.config || args2.script && findWranglerToml(import_node_path21.default.dirname(args2.script)));
+    const configPath = args2.config || args2.script && findWranglerToml(import_node_path21.default.dirname(args2.script));
+    const config = readConfig(configPath, args2);
     const entry = await getEntry(args2, config, "publish");
     if (args2.latest) {
       console.warn("\u26A0\uFE0F  Using the latest version of the Workers runtime. To silence this warning, please choose a specific version of the runtime with --compatibility-date, or add a compatibility_date to your wrangler.toml.\n");
@@ -141345,6 +141530,7 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       triggers: args2.triggers,
       jsxFactory: args2["jsx-factory"],
       jsxFragment: args2["jsx-fragment"],
+      tsconfig: args2.tsconfig,
       routes: args2.routes,
       assetPaths,
       legacyEnv: isLegacyEnv(args2, config),
@@ -141356,7 +141542,7 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       describe: "Name of the worker",
       type: "string"
     }).option("format", {
-      default: "json",
+      default: "pretty",
       choices: ["json", "pretty"],
       describe: "The format of log entries"
     }).option("status", {
@@ -141382,7 +141568,8 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       array: true
     }).option("env", {
       type: "string",
-      describe: "Perform on a specific environment"
+      describe: "Perform on a specific environment",
+      alias: "e"
     }).option("debug", {
       type: "boolean",
       hidden: true,
@@ -141393,8 +141580,8 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
     if (args2.format === "pretty") {
       printWranglerBanner();
     }
-    const config = readConfig(args2.config);
-    const scriptName = getScriptName(args2, config);
+    const config = readConfig(args2.config, args2);
+    const scriptName = getLegacyScriptName(args2, config);
     if (!scriptName) {
       throw new Error("Missing script name");
     }
@@ -141455,11 +141642,9 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       throw new DeprecationError2("The `wrangler preview` command has been deprecated.\nTry using `wrangler dev` to to try out a worker during development.\n");
     }
     console.warn("***************************************************\nThe `wrangler preview` command has been deprecated.\nAttempting to run `wrangler dev` instead.\n***************************************************\n");
-    const config = readConfig(args2.config);
+    const config = readConfig(args2.config, args2);
     const entry = await getEntry({}, config, "dev");
     const accountId = await requireAuth(config);
-    const environments = config.env ?? {};
-    const envRootObj = args2.env ? environments[args2.env] || {} : config;
     const { waitUntilExit } = (0, import_ink5.render)(/* @__PURE__ */ import_react10.default.createElement(dev_default, {
       name: config.name,
       entry,
@@ -141467,10 +141652,11 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       env: args2.env,
       zone: void 0,
       legacyEnv: isLegacyEnv(args2, config),
-      buildCommand: config.build || {},
+      build: config.build || {},
       initialMode: args2.local ? "local" : "remote",
-      jsxFactory: envRootObj?.jsx_factory,
-      jsxFragment: envRootObj?.jsx_fragment,
+      jsxFactory: config.jsx_factory,
+      jsxFragment: config.jsx_fragment,
+      tsconfig: config.tsconfig,
       upstreamProtocol: config.dev.upstream_protocol,
       localProtocol: config.dev.local_protocol,
       enableLocalPersistence: false,
@@ -141483,7 +141669,7 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       compatibilityFlags: args2["compatibility-flags"] || config.compatibility_flags,
       usageModel: config.usage_model,
       bindings: {
-        kv_namespaces: envRootObj.kv_namespaces?.map(({ binding, preview_id, id: _id }) => {
+        kv_namespaces: config.kv_namespaces?.map(({ binding, preview_id, id: _id }) => {
           if (!preview_id) {
             throw new Error(`In development, you should use a separate kv namespace than the one you'd use in production. Please create a new kv namespace with "wrangler kv:namespace create <name> --preview" and add its id as preview_id to the kv_namespace "${binding}" in your wrangler.toml`);
           }
@@ -141492,12 +141678,12 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
             id: preview_id
           };
         }),
-        vars: envRootObj.vars,
+        vars: config.vars,
         wasm_modules: config.wasm_modules,
         text_blobs: config.text_blobs,
-        durable_objects: envRootObj.durable_objects,
-        r2_buckets: envRootObj.r2_buckets,
-        unsafe: envRootObj.unsafe?.bindings
+        durable_objects: config.durable_objects,
+        r2_buckets: config.r2_buckets,
+        unsafe: config.unsafe?.bindings
       },
       inspectorPort: await getPorts({ port: 9229 })
     }));
@@ -141522,7 +141708,7 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       throw new DeprecationError2(`${deprecationNotice}
 ${futureRoutes}
 ${presentRoutes}`);
-    }).command("delete", "Delete a route associated with a zone", (yargs) => {
+    }).command("delete [id]", "Delete a route associated with a zone", (yargs) => {
       return yargs.positional("id", {
         describe: "The hash of the route ID to delete.",
         type: "string"
@@ -141560,12 +141746,13 @@ ${shouldDo}`);
         type: "string"
       }).option("env", {
         type: "string",
-        describe: "Binds the secret to the Worker of the specific environment"
+        describe: "Binds the secret to the Worker of the specific environment",
+        alias: "e"
       });
     }, async (args2) => {
       printWranglerBanner();
-      const config = readConfig(args2.config);
-      const scriptName = getScriptName(args2, config);
+      const config = readConfig(args2.config, args2);
+      const scriptName = getLegacyScriptName(args2, config);
       if (!scriptName) {
         throw new Error("Missing script name");
       }
@@ -141636,11 +141823,12 @@ ${shouldDo}`);
         type: "string"
       }).option("env", {
         type: "string",
-        describe: "Binds the secret to the Worker of the specific environment"
+        describe: "Binds the secret to the Worker of the specific environment",
+        alias: "e"
       });
     }, async (args2) => {
-      const config = readConfig(args2.config);
-      const scriptName = getScriptName(args2, config);
+      const config = readConfig(args2.config, args2);
+      const scriptName = getLegacyScriptName(args2, config);
       if (!scriptName) {
         throw new Error("Missing script name");
       }
@@ -141657,11 +141845,12 @@ ${shouldDo}`);
         type: "string"
       }).option("env", {
         type: "string",
-        describe: "Binds the secret to the Worker of the specific environment."
+        describe: "Binds the secret to the Worker of the specific environment.",
+        alias: "e"
       });
     }, async (args2) => {
-      const config = readConfig(args2.config);
-      const scriptName = getScriptName(args2, config);
+      const config = readConfig(args2.config, args2);
+      const scriptName = getLegacyScriptName(args2, config);
       if (!scriptName) {
         throw new Error("Missing script name");
       }
@@ -141678,21 +141867,18 @@ ${shouldDo}`);
         demandOption: true
       }).option("env", {
         type: "string",
-        describe: "Perform on a specific environment"
+        describe: "Perform on a specific environment",
+        alias: "e"
       }).option("preview", {
         type: "boolean",
         describe: "Interact with a preview namespace"
       });
     }, async (args2) => {
       printWranglerBanner();
-      if (args2._.length > 2) {
-        const extraArgs = args2._.slice(2).join(" ");
-        throw new CommandLineArgsError(`Unexpected additional positional arguments "${extraArgs}".`);
-      }
       if (!isValidNamespaceBinding(args2.namespace)) {
         throw new CommandLineArgsError(`The namespace binding name "${args2.namespace}" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number.`);
       }
-      const config = readConfig(args2.config);
+      const config = readConfig(args2.config, args2);
       if (!config.name) {
         console.warn("No configured name present, using `worker` as a prefix for the title");
       }
@@ -141709,7 +141895,7 @@ ${shouldDo}`);
       console.log(`Add the following to your configuration file in your kv_namespaces array${envString}:`);
       console.log(`{ binding = "${args2.namespace}", ${previewString}id = "${namespaceId}" }`);
     }).command("list", "Outputs a list of all KV namespaces associated with your account id.", {}, async (args2) => {
-      const config = readConfig(args2.config);
+      const config = readConfig(args2.config, args2);
       const accountId = await requireAuth(config);
       console.log(JSON.stringify(await listNamespaces(accountId), null, "  "));
     }).command("delete", "Deletes a given namespace.", (yargs) => {
@@ -141721,14 +141907,15 @@ ${shouldDo}`);
         describe: "The id of the namespace to delete"
       }).check(demandOneOfOption("binding", "namespace-id")).option("env", {
         type: "string",
-        describe: "Perform on a specific environment"
+        describe: "Perform on a specific environment",
+        alias: "e"
       }).option("preview", {
         type: "boolean",
         describe: "Interact with a preview namespace"
       });
     }, async (args2) => {
       printWranglerBanner();
-      const config = readConfig(args2.config);
+      const config = readConfig(args2.config, args2);
       let id;
       try {
         id = getNamespaceId(args2, config);
@@ -141756,7 +141943,8 @@ ${shouldDo}`);
         describe: "The id of the namespace to write to"
       }).check(demandOneOfOption("binding", "namespace-id")).option("env", {
         type: "string",
-        describe: "Perform on a specific environment"
+        describe: "Perform on a specific environment",
+        alias: "e"
       }).option("preview", {
         type: "boolean",
         describe: "Interact with a preview namespace"
@@ -141772,7 +141960,7 @@ ${shouldDo}`);
       }).check(demandOneOfOption("value", "path"));
     }, async ({ key: key2, ttl, expiration, ...args2 }) => {
       printWranglerBanner();
-      const config = readConfig(args2.config);
+      const config = readConfig(args2.config, args2);
       const namespaceId = getNamespaceId(args2, config);
       const value = args2.path ? readFileSync5(args2.path) : args2.value;
       if (args2.path) {
@@ -141796,7 +141984,8 @@ ${shouldDo}`);
         describe: "The id of the namespace to list"
       }).check(demandOneOfOption("binding", "namespace-id")).option("env", {
         type: "string",
-        describe: "Perform on a specific environment"
+        describe: "Perform on a specific environment",
+        alias: "e"
       }).option("preview", {
         type: "boolean",
         default: false,
@@ -141806,7 +141995,7 @@ ${shouldDo}`);
         describe: "A prefix to filter listed keys"
       });
     }, async ({ prefix: prefix2, ...args2 }) => {
-      const config = readConfig(args2.config);
+      const config = readConfig(args2.config, args2);
       const namespaceId = getNamespaceId(args2, config);
       const accountId = await requireAuth(config);
       const results = await listNamespaceKeys(accountId, namespaceId, prefix2);
@@ -141824,7 +142013,8 @@ ${shouldDo}`);
         describe: "The id of the namespace to get from"
       }).check(demandOneOfOption("binding", "namespace-id")).option("env", {
         type: "string",
-        describe: "Perform on a specific environment"
+        describe: "Perform on a specific environment",
+        alias: "e"
       }).option("preview", {
         type: "boolean",
         describe: "Interact with a preview namespace"
@@ -141834,7 +142024,7 @@ ${shouldDo}`);
         describe: "Interact with a preview namespace"
       });
     }, async ({ key: key2, ...args2 }) => {
-      const config = readConfig(args2.config);
+      const config = readConfig(args2.config, args2);
       const namespaceId = getNamespaceId(args2, config);
       const accountId = await requireAuth(config);
       console.log(await getKeyValue(accountId, namespaceId, key2));
@@ -141851,14 +142041,15 @@ ${shouldDo}`);
         describe: "The id of the namespace to delete from"
       }).check(demandOneOfOption("binding", "namespace-id")).option("env", {
         type: "string",
-        describe: "Perform on a specific environment"
+        describe: "Perform on a specific environment",
+        alias: "e"
       }).option("preview", {
         type: "boolean",
         describe: "Interact with a preview namespace"
       });
     }, async ({ key: key2, ...args2 }) => {
       printWranglerBanner();
-      const config = readConfig(args2.config);
+      const config = readConfig(args2.config, args2);
       const namespaceId = getNamespaceId(args2, config);
       console.log(`deleting the key "${key2}" on namespace ${namespaceId}`);
       const accountId = await requireAuth(config);
@@ -141879,14 +142070,15 @@ ${shouldDo}`);
         describe: "The id of the namespace to insert values into"
       }).check(demandOneOfOption("binding", "namespace-id")).option("env", {
         type: "string",
-        describe: "Perform on a specific environment"
+        describe: "Perform on a specific environment",
+        alias: "e"
       }).option("preview", {
         type: "boolean",
         describe: "Interact with a preview namespace"
       });
     }, async ({ filename, ...args2 }) => {
       printWranglerBanner();
-      const config = readConfig(args2.config);
+      const config = readConfig(args2.config, args2);
       const namespaceId = getNamespaceId(args2, config);
       const content = parseJSON(readFileSync5(filename), filename);
       if (!Array.isArray(content)) {
@@ -141945,7 +142137,8 @@ interface KeyValue {
         describe: "The id of the namespace to delete from"
       }).check(demandOneOfOption("binding", "namespace-id")).option("env", {
         type: "string",
-        describe: "Perform on a specific environment"
+        describe: "Perform on a specific environment",
+        alias: "e"
       }).option("preview", {
         type: "boolean",
         describe: "Interact with a preview namespace"
@@ -141956,7 +142149,7 @@ interface KeyValue {
       });
     }, async ({ filename, ...args2 }) => {
       printWranglerBanner();
-      const config = readConfig(args2.config);
+      const config = readConfig(args2.config, args2);
       const namespaceId = getNamespaceId(args2, config);
       if (!args2.force) {
         const result = await confirm(`Are you sure you want to delete all the keys read from "${filename}" from kv-namespace with id "${namespaceId}"?`);
@@ -141990,7 +142183,9 @@ Expected an array of strings.
       console.log("Success!");
     });
   });
-  wrangler.command("pages", "\u26A1\uFE0F Configure Cloudflare Pages", (pagesYargs) => pages(pagesYargs.command(subHelp)));
+  wrangler.command("pages", "\u26A1\uFE0F Configure Cloudflare Pages", async (pagesYargs) => {
+    await pages(pagesYargs.command(subHelp).epilogue(pagesBetaWarning));
+  });
   wrangler.command("r2", "\u{1F4E6} Interact with an R2 store", (r2Yargs) => {
     return r2Yargs.command(subHelp).command("bucket", "Manage R2 buckets", (r2BucketYargs) => {
       r2BucketYargs.command("create <name>", "Create a new R2 bucket", (yargs) => {
@@ -142001,18 +142196,14 @@ Expected an array of strings.
         });
       }, async (args2) => {
         printWranglerBanner();
-        if (args2._.length > 3) {
-          const extraArgs = args2._.slice(3).join(" ");
-          throw new CommandLineArgsError(`Unexpected additional positional arguments "${extraArgs}".`);
-        }
-        const config = readConfig(args2.config);
+        const config = readConfig(args2.config, args2);
         const accountId = await requireAuth(config);
         console.log(`Creating bucket ${args2.name}.`);
         await createR2Bucket(accountId, args2.name);
         console.log(`Created bucket ${args2.name}.`);
       });
       r2BucketYargs.command("list", "List R2 buckets", {}, async (args2) => {
-        const config = readConfig(args2.config);
+        const config = readConfig(args2.config, args2);
         const accountId = await requireAuth(config);
         console.log(JSON.stringify(await listR2Buckets(accountId), null, 2));
       });
@@ -142024,11 +142215,7 @@ Expected an array of strings.
         });
       }, async (args2) => {
         printWranglerBanner();
-        if (args2._.length > 3) {
-          const extraArgs = args2._.slice(3).join(" ");
-          throw new CommandLineArgsError(`Unexpected additional positional arguments "${extraArgs}".`);
-        }
-        const config = readConfig(args2.config);
+        const config = readConfig(args2.config, args2);
         const accountId = await requireAuth(config);
         console.log(`Deleting bucket ${args2.name}.`);
         await deleteR2Bucket(accountId, args2.name);