wrangler 3.57.1 → 3.58.0

package/wrangler-dist/cli.js

@@ -477,7 +477,7 @@ var require_util = __commonJS({
     var { InvalidArgumentError } = require_errors();
     var { Blob: Blob6 } = require("buffer");
     var nodeUtil = require("util");
-    var { stringify } = require("querystring");
+    var { stringify: stringify2 } = require("querystring");
     var { headerNameLowerCasedRecord } = require_constants();
     var [nodeMajor, nodeMinor] = process.versions.node.split(".").map((v2) => Number(v2));
     function nop() {
@@ -495,7 +495,7 @@ var require_util = __commonJS({
       if (url4.includes("?") || url4.includes("#")) {
         throw new Error('Query params cannot be passed when url already contains "?" or "#".');
       }
-      const stringified = stringify(queryParams);
+      const stringified = stringify2(queryParams);
       if (stringified) {
         url4 += "?" + stringified;
       }
@@ -15494,7 +15494,7 @@ var require_util6 = __commonJS({
       }
     }
     __name(validateCookieMaxAge, "validateCookieMaxAge");
-    function stringify(cookie) {
+    function stringify2(cookie) {
       if (cookie.name.length === 0) {
         return null;
       }
@@ -15542,7 +15542,7 @@ var require_util6 = __commonJS({
       }
       return out.join("; ");
     }
-    __name(stringify, "stringify");
+    __name(stringify2, "stringify");
     var kHeadersListNode;
     function getHeadersList(headers) {
       if (headers[kHeadersList]) {
@@ -15561,7 +15561,7 @@ var require_util6 = __commonJS({
     __name(getHeadersList, "getHeadersList");
     module3.exports = {
       isCTLExcludingHtab,
-      stringify,
+      stringify: stringify2,
       getHeadersList
     };
   }
@@ -15716,7 +15716,7 @@ var require_cookies = __commonJS({
     "use strict";
     init_import_meta_url();
     var { parseSetCookie } = require_parse();
-    var { stringify, getHeadersList } = require_util6();
+    var { stringify: stringify2, getHeadersList } = require_util6();
     var { webidl } = require_webidl();
     var { Headers: Headers5 } = require_headers();
     function getCookies(headers) {
@@ -15761,9 +15761,9 @@ var require_cookies = __commonJS({
       webidl.argumentLengthCheck(arguments, 2, { header: "setCookie" });
       webidl.brandCheck(headers, Headers5, { strict: false });
       cookie = webidl.converters.Cookie(cookie);
-      const str = stringify(cookie);
+      const str = stringify2(cookie);
       if (str) {
-        headers.append("Set-Cookie", stringify(cookie));
+        headers.append("Set-Cookie", stringify2(cookie));
       }
     }
     __name(setCookie, "setCookie");
@@ -53219,18 +53219,18 @@ var require_Box = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     var react_1 = __importStar(require_react());
-    var Box7 = react_1.forwardRef((_a2, ref) => {
+    var Box6 = react_1.forwardRef((_a2, ref) => {
       var { children } = _a2, style = __rest(_a2, ["children"]);
       const transformedStyle = Object.assign(Object.assign({}, style), { marginLeft: style.marginLeft || style.marginX || style.margin || 0, marginRight: style.marginRight || style.marginX || style.margin || 0, marginTop: style.marginTop || style.marginY || style.margin || 0, marginBottom: style.marginBottom || style.marginY || style.margin || 0, paddingLeft: style.paddingLeft || style.paddingX || style.padding || 0, paddingRight: style.paddingRight || style.paddingX || style.padding || 0, paddingTop: style.paddingTop || style.paddingY || style.padding || 0, paddingBottom: style.paddingBottom || style.paddingY || style.padding || 0 });
       return react_1.default.createElement("ink-box", { ref, style: transformedStyle }, children);
     });
-    Box7.displayName = "Box";
-    Box7.defaultProps = {
+    Box6.displayName = "Box";
+    Box6.defaultProps = {
       flexDirection: "row",
       flexGrow: 0,
       flexShrink: 1
     };
-    exports2.default = Box7;
+    exports2.default = Box6;
   }
 });
 
@@ -53246,7 +53246,7 @@ var require_Text = __commonJS({
     var react_1 = __importDefault(require_react());
     var chalk_1 = __importDefault(require_source());
     var colorize_1 = __importDefault(require_colorize());
-    var Text12 = /* @__PURE__ */ __name(({ color, backgroundColor, dimColor, bold: bold2, italic, underline, strikethrough, inverse, wrap: wrap4, children }) => {
+    var Text11 = /* @__PURE__ */ __name(({ color, backgroundColor, dimColor, bold: bold2, italic, underline, strikethrough, inverse, wrap: wrap4, children }) => {
       if (children === void 0 || children === null) {
         return null;
       }
@@ -53279,8 +53279,8 @@ var require_Text = __commonJS({
       }, "transform");
       return react_1.default.createElement("ink-text", { style: { flexGrow: 0, flexShrink: 1, flexDirection: "row", textWrap: wrap4 }, internal_transform: transform }, children);
     }, "Text");
-    Text12.displayName = "Text";
-    Text12.defaultProps = {
+    Text11.displayName = "Text";
+    Text11.defaultProps = {
       dimColor: false,
       bold: false,
       italic: false,
@@ -53288,7 +53288,7 @@ var require_Text = __commonJS({
       strikethrough: false,
       wrap: "wrap"
     };
-    exports2.default = Text12;
+    exports2.default = Text11;
   }
 });
 
@@ -60263,9 +60263,9 @@ var require_stringify = __commonJS({
   "../../node_modules/.pnpm/@iarna+toml@3.0.0/node_modules/@iarna/toml/stringify.js"(exports2, module3) {
     "use strict";
     init_import_meta_url();
-    module3.exports = stringify;
+    module3.exports = stringify2;
     module3.exports.value = stringifyInline;
-    function stringify(obj) {
+    function stringify2(obj) {
       if (obj === null)
         throw typeError("null");
       if (obj === void 0)
@@ -60281,7 +60281,7 @@ var require_stringify = __commonJS({
         throw typeError(type);
       return stringifyObject("", "", obj);
     }
-    __name(stringify, "stringify");
+    __name(stringify2, "stringify");
     function typeError(type) {
       return new Error("Can only stringify objects, not " + type);
     }
@@ -86841,7 +86841,7 @@ var require_stringify2 = __commonJS({
       return typeof v2 === "string" || typeof v2 === "number" || typeof v2 === "boolean" || typeof v2 === "symbol" || typeof v2 === "bigint";
     }, "isNonNullishPrimitive");
     var sentinel = {};
-    var stringify = /* @__PURE__ */ __name(function stringify2(object, prefix, generateArrayPrefix, strictNullHandling, skipNulls, encoder, filter, sort, allowDots, serializeDate, format10, formatter, encodeValuesOnly, charset, sideChannel) {
+    var stringify2 = /* @__PURE__ */ __name(function stringify3(object, prefix, generateArrayPrefix, strictNullHandling, skipNulls, encoder, filter, sort, allowDots, serializeDate, format10, formatter, encodeValuesOnly, charset, sideChannel) {
       var obj = object;
       var tmpSc = sideChannel;
       var step = 0;
@@ -86916,7 +86916,7 @@ var require_stringify2 = __commonJS({
         sideChannel.set(object, step);
         var valueSideChannel = getSideChannel();
         valueSideChannel.set(sentinel, sideChannel);
-        pushToArray(values, stringify2(
+        pushToArray(values, stringify3(
           value,
           keyPrefix,
           generateArrayPrefix,
@@ -87014,7 +87014,7 @@ var require_stringify2 = __commonJS({
         if (options29.skipNulls && obj[key] === null) {
           continue;
         }
-        pushToArray(keys, stringify(
+        pushToArray(keys, stringify2(
           obj[key],
           key,
           generateArrayPrefix,
@@ -87254,13 +87254,13 @@ var require_lib3 = __commonJS({
   "../../node_modules/.pnpm/qs@6.10.3/node_modules/qs/lib/index.js"(exports2, module3) {
     "use strict";
     init_import_meta_url();
-    var stringify = require_stringify2();
+    var stringify2 = require_stringify2();
     var parse7 = require_parse4();
     var formats = require_formats();
     module3.exports = {
       formats,
       parse: parse7,
-      stringify
+      stringify: stringify2
     };
   }
 });
@@ -92471,7 +92471,7 @@ var require_response2 = __commonJS({
       var escape2 = app.get("json escape");
       var replacer2 = app.get("json replacer");
       var spaces = app.get("json spaces");
-      var body = stringify(val, replacer2, spaces, escape2);
+      var body = stringify2(val, replacer2, spaces, escape2);
       if (!this.get("Content-Type")) {
         this.set("Content-Type", "application/json");
       }
@@ -92493,7 +92493,7 @@ var require_response2 = __commonJS({
       var escape2 = app.get("json escape");
       var replacer2 = app.get("json replacer");
       var spaces = app.get("json spaces");
-      var body = stringify(val, replacer2, spaces, escape2);
+      var body = stringify2(val, replacer2, spaces, escape2);
       var callback = this.req.query[app.get("jsonp callback name")];
       if (!this.get("Content-Type")) {
         this.set("X-Content-Type-Options", "nosniff");
@@ -92851,7 +92851,7 @@ var require_response2 = __commonJS({
       file.pipe(res2);
     }
     __name(sendfile, "sendfile");
-    function stringify(value, replacer2, spaces, escape2) {
+    function stringify2(value, replacer2, spaces, escape2) {
       var json = replacer2 || spaces ? JSON.stringify(value, replacer2, spaces) : JSON.stringify(value);
       if (escape2 && typeof json === "string") {
         json = json.replace(/[<>&]/g, function(c2) {
@@ -92869,7 +92869,7 @@ var require_response2 = __commonJS({
       }
       return json;
     }
-    __name(stringify, "stringify");
+    __name(stringify2, "stringify");
   }
 });
 
@@ -95043,7 +95043,7 @@ var require_fast_json_stable_stringify = __commonJS({
         };
       }(opts.cmp);
       var seen = [];
-      return (/* @__PURE__ */ __name(function stringify(node2) {
+      return (/* @__PURE__ */ __name(function stringify2(node2) {
         if (node2 && node2.toJSON && typeof node2.toJSON === "function") {
           node2 = node2.toJSON();
         }
@@ -95059,7 +95059,7 @@ var require_fast_json_stable_stringify = __commonJS({
           for (i = 0; i < node2.length; i++) {
             if (i)
               out += ",";
-            out += stringify(node2[i]) || "null";
+            out += stringify2(node2[i]) || "null";
           }
           return out + "]";
         }
@@ -95075,7 +95075,7 @@ var require_fast_json_stable_stringify = __commonJS({
         out = "";
         for (i = 0; i < keys.length; i++) {
           var key = keys[i];
-          var value = stringify(node2[key]);
+          var value = stringify2(node2[key]);
           if (!value)
             continue;
           if (out)
@@ -103322,10 +103322,10 @@ function $asStringSmall (str) {
 var require_fast_safe_stringify = __commonJS({
   "../../node_modules/.pnpm/fast-safe-stringify@2.1.1/node_modules/fast-safe-stringify/index.js"(exports2, module3) {
     init_import_meta_url();
-    module3.exports = stringify;
-    stringify.default = stringify;
-    stringify.stable = deterministicStringify;
-    stringify.stableStringify = deterministicStringify;
+    module3.exports = stringify2;
+    stringify2.default = stringify2;
+    stringify2.stable = deterministicStringify;
+    stringify2.stableStringify = deterministicStringify;
     var LIMIT_REPLACE_NODE = "[...]";
     var CIRCULAR_REPLACE_NODE = "[Circular]";
     var arr = [];
@@ -103337,7 +103337,7 @@ var require_fast_safe_stringify = __commonJS({
       };
     }
     __name(defaultOptions, "defaultOptions");
-    function stringify(obj, replacer2, spacer, options29) {
+    function stringify2(obj, replacer2, spacer, options29) {
       if (typeof options29 === "undefined") {
         options29 = defaultOptions();
       }
@@ -103363,7 +103363,7 @@ var require_fast_safe_stringify = __commonJS({
       }
       return res;
     }
-    __name(stringify, "stringify");
+    __name(stringify2, "stringify");
     function setReplace(replace, val, k2, parent) {
       var propertyDescriptor = Object.getOwnPropertyDescriptor(parent, k2);
       if (propertyDescriptor.get !== void 0) {
@@ -112176,7 +112176,7 @@ var require_util12 = __commonJS({
     var { InvalidArgumentError } = require_errors2();
     var { Blob: Blob6 } = require("buffer");
     var nodeUtil = require("util");
-    var { stringify } = require("querystring");
+    var { stringify: stringify2 } = require("querystring");
     var [nodeMajor, nodeMinor] = process.versions.node.split(".").map((v2) => Number(v2));
     function nop() {
     }
@@ -112193,7 +112193,7 @@ var require_util12 = __commonJS({
       if (url4.includes("?") || url4.includes("#")) {
         throw new Error('Query params cannot be passed when url already contains "?" or "#".');
       }
-      const stringified = stringify(queryParams);
+      const stringified = stringify2(queryParams);
       if (stringified) {
         url4 += "?" + stringified;
       }
@@ -125116,7 +125116,7 @@ var require_util17 = __commonJS({
       }
     }
     __name(validateCookieMaxAge, "validateCookieMaxAge");
-    function stringify(cookie) {
+    function stringify2(cookie) {
       if (cookie.name.length === 0) {
         return null;
       }
@@ -125164,7 +125164,7 @@ var require_util17 = __commonJS({
       }
       return out.join("; ");
     }
-    __name(stringify, "stringify");
+    __name(stringify2, "stringify");
     var kHeadersListNode;
     function getHeadersList(headers) {
       if (headers[kHeadersList]) {
@@ -125183,7 +125183,7 @@ var require_util17 = __commonJS({
     __name(getHeadersList, "getHeadersList");
     module3.exports = {
       isCTLExcludingHtab,
-      stringify,
+      stringify: stringify2,
       getHeadersList
     };
   }
@@ -125338,7 +125338,7 @@ var require_cookies2 = __commonJS({
     "use strict";
     init_import_meta_url();
     var { parseSetCookie } = require_parse7();
-    var { stringify, getHeadersList } = require_util17();
+    var { stringify: stringify2, getHeadersList } = require_util17();
     var { webidl } = require_webidl2();
     var { Headers: Headers5 } = require_headers2();
     function getCookies(headers) {
@@ -125383,9 +125383,9 @@ var require_cookies2 = __commonJS({
       webidl.argumentLengthCheck(arguments, 2, { header: "setCookie" });
       webidl.brandCheck(headers, Headers5, { strict: false });
       cookie = webidl.converters.Cookie(cookie);
-      const str = stringify(cookie);
+      const str = stringify2(cookie);
       if (str) {
-        headers.append("Set-Cookie", stringify(cookie));
+        headers.append("Set-Cookie", stringify2(cookie));
       }
     }
     __name(setCookie, "setCookie");
@@ -133938,9 +133938,9 @@ var require_stringify3 = __commonJS({
   "../../node_modules/.pnpm/@iarna+toml@2.2.5/node_modules/@iarna/toml/stringify.js"(exports2, module3) {
     "use strict";
     init_import_meta_url();
-    module3.exports = stringify;
+    module3.exports = stringify2;
     module3.exports.value = stringifyInline;
-    function stringify(obj) {
+    function stringify2(obj) {
       if (obj === null)
         throw typeError("null");
       if (obj === void 0)
@@ -133956,7 +133956,7 @@ var require_stringify3 = __commonJS({
         throw typeError(type);
       return stringifyObject("", "", obj);
     }
-    __name(stringify, "stringify");
+    __name(stringify2, "stringify");
     function typeError(type) {
       return new Error("Can only stringify objects, not " + type);
     }
@@ -139695,7 +139695,14 @@ async function generateHandler({
   if (responseWithoutHeaders.status >= 500) {
     return responseWithoutHeaders;
   }
-  return await attachHeaders(responseWithoutHeaders);
+  const responseWithHeaders = await attachHeaders(responseWithoutHeaders);
+  if (responseWithHeaders.status === 404) {
+    if (responseWithHeaders.headers.has("cache-control")) {
+      responseWithHeaders.headers.delete("cache-control");
+    }
+    responseWithHeaders.headers.append("cache-control", "no-store");
+  }
+  return responseWithHeaders;
   async function serveAsset(servingAssetEntry, options29 = { preserve: true }) {
     let content;
     try {
@@ -141079,10 +141086,10 @@ var require_Indicator = __commonJS({
     "use strict";
     init_import_meta_url();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    var React19 = require_react();
+    var React18 = require_react();
     var ink_1 = require_build2();
     var figures = require_figures3();
-    var Indicator = /* @__PURE__ */ __name(({ isSelected = false }) => React19.createElement(ink_1.Box, { marginRight: 1 }, isSelected ? React19.createElement(ink_1.Text, { color: "blue" }, figures.pointer) : React19.createElement(ink_1.Text, null, " ")), "Indicator");
+    var Indicator = /* @__PURE__ */ __name(({ isSelected = false }) => React18.createElement(ink_1.Box, { marginRight: 1 }, isSelected ? React18.createElement(ink_1.Text, { color: "blue" }, figures.pointer) : React18.createElement(ink_1.Text, null, " ")), "Indicator");
     exports2.default = Indicator;
   }
 });
@@ -141093,9 +141100,9 @@ var require_Item = __commonJS({
     "use strict";
     init_import_meta_url();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    var React19 = require_react();
+    var React18 = require_react();
     var ink_1 = require_build2();
-    var Item = /* @__PURE__ */ __name(({ isSelected = false, label }) => React19.createElement(ink_1.Text, { color: isSelected ? "blue" : void 0 }, label), "Item");
+    var Item = /* @__PURE__ */ __name(({ isSelected = false, label }) => React18.createElement(ink_1.Text, { color: isSelected ? "blue" : void 0 }, label), "Item");
     exports2.default = Item;
   }
 });
@@ -141106,7 +141113,7 @@ var require_SelectInput = __commonJS({
     "use strict";
     init_import_meta_url();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    var React19 = require_react();
+    var React18 = require_react();
     var react_1 = require_react();
     var isEqual = require_lodash2();
     var arrayRotate = require_arr_rotate();
@@ -141168,14 +141175,14 @@ var require_SelectInput = __commonJS({
         onHighlight
       ]), { isActive: isFocused });
       const slicedItems = hasLimit ? arrayRotate(items, rotateIndex).slice(0, limit) : items;
-      return React19.createElement(ink_1.Box, { flexDirection: "column" }, slicedItems.map((item, index) => {
+      return React18.createElement(ink_1.Box, { flexDirection: "column" }, slicedItems.map((item, index) => {
         var _a2;
         const isSelected = index === selectedIndex;
-        return React19.createElement(
+        return React18.createElement(
           ink_1.Box,
           { key: (_a2 = item.key) !== null && _a2 !== void 0 ? _a2 : item.value },
-          React19.createElement(indicatorComponent, { isSelected }),
-          React19.createElement(itemComponent, { ...item, isSelected })
+          React18.createElement(indicatorComponent, { isSelected }),
+          React18.createElement(itemComponent, { ...item, isSelected })
         );
       }));
     }
@@ -144043,7 +144050,7 @@ var require_build4 = __commonJS({
     "use strict";
     init_import_meta_url();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    var React19 = require_react();
+    var React18 = require_react();
     var react_1 = require_react();
     var ink_1 = require_build2();
     var spinners = require_cli_spinners();
@@ -144061,7 +144068,7 @@ var require_build4 = __commonJS({
           clearInterval(timer);
         };
       }, [spinner2]);
-      return React19.createElement(ink_1.Text, null, spinner2.frames[frame]);
+      return React18.createElement(ink_1.Text, null, spinner2.frames[frame]);
     }, "Spinner");
     exports2.default = Spinner2;
   }
@@ -150169,6 +150176,7 @@ __export(cli_exports2, {
   getPlatformProxy: () => getPlatformProxy,
   unstable_DevEnv: () => DevEnv,
   unstable_dev: () => unstable_dev,
+  unstable_generateASSETSBinding: () => generateASSETSBinding2,
   unstable_getMiniflareWorkerOptions: () => unstable_getMiniflareWorkerOptions,
   unstable_pages: () => unstable_pages,
   unstable_splitSqlQuery: () => splitSqlQuery,
@@ -152025,8 +152033,8 @@ async function getPorts(options29) {
 __name(getPorts, "getPorts");
 
 // src/dev.tsx
-var import_ink14 = __toESM(require_build2());
-var import_react20 = __toESM(require_react());
+var import_ink13 = __toESM(require_build2());
+var import_react19 = __toESM(require_react());
 
 // src/config/index.ts
 init_import_meta_url();
@@ -152598,7 +152606,7 @@ var Logger = class {
   }
   doLog(messageLevel, args) {
     const message = this.formatMessage(messageLevel, (0, import_node_util.format)(...args));
-    const inUnitTests = typeof jest !== "undefined";
+    const inUnitTests = typeof vitest !== "undefined";
     if (!inUnitTests) {
       void appendToDebugLogFile(messageLevel, message);
     }
@@ -152646,7 +152654,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.57.1";
+var version = "3.58.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -152696,7 +152704,6 @@ var package_default = {
     "wrangler-dist",
     "templates",
     "kv-asset-handler.js",
-    "Cloudflare_CA.pem",
     "config-schema.json"
   ],
   scripts: {
@@ -152711,41 +152718,13 @@ var package_default = {
     "generate-json-schema": "pnpm exec ts-json-schema-generator --no-type-check --path src/config/config.ts --type RawConfig --out config-schema.json",
     prepublishOnly: "SOURCEMAPS=false pnpm run -w build",
     start: "pnpm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-    test: "pnpm run assert-git-version && jest",
-    "test:ci": "pnpm run test",
+    test: "pnpm run assert-git-version && vitest",
+    "test:ci": "pnpm run test run",
     "test:debug": "pnpm run test --silent=false --verbose=true",
     "test:e2e": "vitest -c ./e2e/vitest.config.ts",
     "test:watch": "pnpm run test --testTimeout=50000 --watch",
     "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
   },
-  jest: {
-    moduleNameMapper: {
-      clipboardy: "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",
-      "miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js"
-    },
-    restoreMocks: true,
-    setupFilesAfterEnv: [
-      "<rootDir>/src/__tests__/jest.setup.ts"
-    ],
-    testRegex: "src/__tests__/.*\\.(test|spec)\\.[jt]sx?$",
-    testTimeout: 5e4,
-    transform: {
-      "^.+\\.c?(t|j)sx?$": [
-        "esbuild-jest",
-        {
-          sourcemap: true
-        }
-      ]
-    },
-    transformIgnorePatterns: [
-      "node_modules/.pnpm/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes|strip-ansi|ansi-regex)"
-    ],
-    snapshotFormat: {
-      escapeString: true,
-      printBasicPrototype: true
-    },
-    prettierPath: null
-  },
   dependencies: {
     "@cloudflare/kv-asset-handler": "workspace:*",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
@@ -152768,7 +152747,7 @@ var package_default = {
     "@cloudflare/pages-shared": "workspace:^",
     "@cloudflare/types": "^6.18.4",
     "@cloudflare/workers-tsconfig": "workspace:*",
-    "@cloudflare/workers-types": "^4.20240512.0",
+    "@cloudflare/workers-types": "^4.20240524.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.28.3",
@@ -152781,7 +152760,6 @@ var package_default = {
     "@types/glob-to-regexp": "0.4.1",
     "@types/is-ci": "^3.0.0",
     "@types/javascript-time-ago": "^2.0.3",
-    "@types/jest": "^29.5.5",
     "@types/mime": "^2.0.3",
     "@types/minimatch": "^5.1.2",
     "@types/prompts": "^2.0.14",
@@ -152805,7 +152783,6 @@ var package_default = {
     "devtools-protocol": "^0.0.955664",
     dotenv: "^16.0.0",
     "es-module-lexer": "^1.3.0",
-    "esbuild-jest": "0.5.0",
     execa: "^6.1.0",
     express: "^4.18.1",
     "find-up": "^6.3.0",
@@ -152820,13 +152797,11 @@ var package_default = {
     "ink-table": "^3.0.0",
     "is-ci": "^3.0.1",
     "javascript-time-ago": "^2.5.4",
-    jest: "^29.7.0",
-    "jest-fetch-mock": "^3.0.3",
-    "jest-websocket-mock": "^2.5.0",
     "md5-file": "5.0.0",
     mime: "^3.0.0",
     minimatch: "^5.1.0",
-    msw: "^0.49.1",
+    "mock-socket": "^9.3.1",
+    msw: "^2.3.0",
     open: "^8.4.0",
     "p-queue": "^7.2.0",
     "patch-console": "^1.0.0",
@@ -152848,6 +152823,7 @@ var package_default = {
     undici: "5.28.4",
     "update-check": "^1.5.4",
     vitest: "^1.6.0",
+    "vitest-websocket-mock": "^0.3.0",
     ws: "^8.5.0",
     "xdg-app-paths": "^8.3.0",
     yargs: "^17.7.2",
@@ -152857,7 +152833,7 @@ var package_default = {
     fsevents: "~2.3.2"
   },
   peerDependencies: {
-    "@cloudflare/workers-types": "^4.20240512.0"
+    "@cloudflare/workers-types": "^4.20240524.0"
   },
   peerDependenciesMeta: {
     "@cloudflare/workers-types": {
@@ -153985,6 +153961,7 @@ var ParseError = class extends UserError {
 __name(ParseError, "ParseError");
 var APIError = class extends ParseError {
   #status;
+  code;
   constructor({ status: status2, ...rest }) {
     super(rest);
     this.name = this.constructor.name;
@@ -154614,7 +154591,7 @@ function getAuthFromEnv() {
   }
 }
 __name(getAuthFromEnv, "getAuthFromEnv");
-var USER_AUTH_CONFIG_FILE = "config/default.toml";
+var USER_AUTH_CONFIG_PATH = "config";
 var DefaultScopes = {
   "account:read": "See your account info such as account details, analytics, and memberships.",
   "user:read": "See your user info such as name, email address, and account memberships.",
@@ -155013,28 +154990,25 @@ async function generatePKCECodes() {
   return { codeChallenge, codeVerifier };
 }
 __name(generatePKCECodes, "generatePKCECodes");
+function getAuthConfigFilePath() {
+  const environment = getCloudflareApiEnvironmentFromEnv();
+  const filePath = `${USER_AUTH_CONFIG_PATH}/${environment === "production" ? "default.toml" : `${environment}.toml`}`;
+  return import_node_path6.default.join(getGlobalWranglerConfigPath(), filePath);
+}
+__name(getAuthConfigFilePath, "getAuthConfigFilePath");
 function writeAuthConfigFile(config) {
-  const authConfigFilePath = import_node_path6.default.join(
-    getGlobalWranglerConfigPath(),
-    USER_AUTH_CONFIG_FILE
-  );
-  (0, import_node_fs3.mkdirSync)(import_node_path6.default.dirname(authConfigFilePath), {
+  const configPath = getAuthConfigFilePath();
+  (0, import_node_fs3.mkdirSync)(import_node_path6.default.dirname(configPath), {
     recursive: true
   });
-  (0, import_node_fs3.writeFileSync)(
-    import_node_path6.default.join(authConfigFilePath),
-    import_toml2.default.stringify(config),
-    { encoding: "utf-8" }
-  );
+  (0, import_node_fs3.writeFileSync)(import_node_path6.default.join(configPath), import_toml2.default.stringify(config), {
+    encoding: "utf-8"
+  });
   reinitialiseAuthTokens();
 }
 __name(writeAuthConfigFile, "writeAuthConfigFile");
 function readAuthConfigFile() {
-  const authConfigFilePath = import_node_path6.default.join(
-    getGlobalWranglerConfigPath(),
-    USER_AUTH_CONFIG_FILE
-  );
-  const toml = parseTOML(readFileSync5(authConfigFilePath));
+  const toml = parseTOML(readFileSync5(getAuthConfigFilePath()));
   return toml;
 }
 __name(readAuthConfigFile, "readAuthConfigFile");
@@ -155199,7 +155173,7 @@ async function logout() {
     }
   });
   await response.text();
-  (0, import_node_fs3.rmSync)(import_node_path6.default.join(getGlobalWranglerConfigPath(), USER_AUTH_CONFIG_FILE));
+  (0, import_node_fs3.rmSync)(getAuthConfigFilePath());
   logger.log(`Successfully logged out.`);
 }
 __name(logout, "logout");
@@ -155585,6 +155559,9 @@ function hasMorePages(result_info) {
 }
 __name(hasMorePages, "hasMorePages");
 function throwFetchError(resource, response) {
+  if (typeof vitest !== "undefined" && !("errors" in response)) {
+    throw response;
+  }
   for (const error3 of response.errors) {
     maybeThrowFriendlyError(error3);
   }
@@ -159258,20 +159235,20 @@ async function applyMiddlewareLoaderFacade(entry, tmpDirPath, middleware) {
       )}";`
     )
   ).join("\n");
-  const middlewareFns = middlewareIdentifiers.map(([m2]) => `${m2}.default`);
+  const middlewareFns = middlewareIdentifiers.map(([m2]) => `${m2}.default`).join(",");
   if (entry.format === "modules") {
     await fs6.promises.writeFile(
       dynamicFacadePath,
       dedent`
 				import worker, * as OTHER_EXPORTS from "${prepareFilePath(entry.file)}";
 				${imports}
-				
-				worker.middleware = [
-					${middlewareFns.join(",")},
-					...(worker.middleware ?? []),
-				].filter(Boolean);
-				
+
 				export * from "${prepareFilePath(entry.file)}";
+
+				export const __INTERNAL_WRANGLER_MIDDLEWARE__ = [
+					...(OTHER_EXPORTS.__INJECT_FOR_TESTING_WRANGLER_MIDDLEWARE__ ?? []),
+					${middlewareFns}
+				]
 				export default worker;
 			`
     );
@@ -160756,8 +160733,8 @@ var clipboardy_default = clipboard5;
 
 // src/dev/dev.tsx
 var import_command_exists2 = __toESM(require_command_exists2());
-var import_ink13 = __toESM(require_build2());
-var import_react19 = __toESM(require_react());
+var import_ink12 = __toESM(require_build2());
+var import_react18 = __toESM(require_react());
 
 // ../../node_modules/.pnpm/react-error-boundary@3.1.4_react@17.0.2/node_modules/react-error-boundary/dist/react-error-boundary.esm.js
 init_import_meta_url();
@@ -162531,8 +162508,8 @@ async function localPropsToConfigBundle(props) {
   (0, import_node_assert10.default)(props.bundle !== void 0);
   const serviceBindings = {};
   if (props.enablePagesAssetsServiceBinding !== void 0) {
-    const generateASSETSBinding2 = (init_assets(), __toCommonJS(assets_exports)).default;
-    serviceBindings.ASSETS = await generateASSETSBinding2({
+    const generateASSETSBinding3 = (init_assets(), __toCommonJS(assets_exports)).default;
+    serviceBindings.ASSETS = await generateASSETSBinding3({
       log: logger,
       ...props.enablePagesAssetsServiceBinding
     });
@@ -162700,9 +162677,9 @@ __name(useLocalWorker, "useLocalWorker");
 // src/dev/remote.tsx
 init_import_meta_url();
 var import_node_path54 = __toESM(require("node:path"));
-var import_ink11 = __toESM(require_build2());
+var import_ink10 = __toESM(require_build2());
 var import_ink_select_input3 = __toESM(require_build3());
-var import_react17 = __toESM(require_react());
+var import_react16 = __toESM(require_react());
 
 // src/deploy/deploy.ts
 init_import_meta_url();
@@ -163247,7 +163224,7 @@ __name(stripPrefix, "stripPrefix");
 // src/deployments.ts
 init_import_meta_url();
 var import_url8 = require("url");
-var import_toml7 = __toESM(require_toml());
+var import_toml8 = __toESM(require_toml());
 var import_chalk19 = __toESM(require_chalk());
 var import_undici23 = __toESM(require_undici());
 
@@ -163256,7 +163233,7 @@ init_import_meta_url();
 var fs26 = __toESM(require("node:fs"));
 var import_promises20 = require("node:fs/promises");
 var import_node_path52 = __toESM(require("node:path"));
-var import_toml6 = __toESM(require_toml());
+var import_toml7 = __toESM(require_toml());
 init_execa();
 
 // src/git-client.ts
@@ -163578,7 +163555,7 @@ __name(parse6, "parse");
 init_import_meta_url();
 var import_node_module3 = __toESM(require("node:module"));
 var import_node_os8 = __toESM(require("node:os"));
-var import_toml5 = __toESM(require_toml());
+var import_toml6 = __toESM(require_toml());
 var import_chalk18 = __toESM(require_chalk());
 var import_undici22 = __toESM(require_undici());
 
@@ -175250,7 +175227,8 @@ function prettyBytes(number, options29) {
 __name(prettyBytes, "prettyBytes");
 
 // src/d1/formatTimeAgo.ts
-TimeAgo.addDefaultLocale(en_json_default);
+TimeAgo.addLocale(en_json_default);
+TimeAgo.setDefaultLocale("en");
 var timeAgo = new TimeAgo("en-US");
 var formatTimeAgo = /* @__PURE__ */ __name((date) => {
   const result = timeAgo.format(date);
@@ -182657,6 +182635,9 @@ var upload = /* @__PURE__ */ __name(async (args) => {
   );
 }, "upload");
 function isJwtExpired(token) {
+  if (typeof vitest !== "undefined" && (token === "<<funfetti-auth-jwt>>" || token === "<<funfetti-auth-jwt2>>")) {
+    return false;
+  }
   try {
     const decodedJwt = JSON.parse(
       Buffer.from(token.split(".")[1], "base64").toString()
@@ -188087,6 +188068,7 @@ init_import_meta_url();
 var import_node_path49 = __toESM(require("node:path"));
 var import_node_readline3 = __toESM(require("node:readline"));
 var import_undici17 = __toESM(require_undici());
+var VERSION_NOT_DEPLOYED_ERR_CODE = 10215;
 function isMissingWorkerError(e3) {
   return typeof e3 === "object" && e3 !== null && e3.code === 10007;
 }
@@ -188193,15 +188175,25 @@ var secret2 = /* @__PURE__ */ __name((secretYargs) => {
       );
       async function submitSecret() {
         const url4 = !args.env || isLegacyEnv(config) ? `/accounts/${accountId}/workers/scripts/${scriptName}/secrets` : `/accounts/${accountId}/workers/services/${scriptName}/environments/${args.env}/secrets`;
-        return await fetchResult(url4, {
-          method: "PUT",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
-            name: args.key,
-            text: secretValue,
-            type: "secret_text"
-          })
-        });
+        try {
+          return await fetchResult(url4, {
+            method: "PUT",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+              name: args.key,
+              text: secretValue,
+              type: "secret_text"
+            })
+          });
+        } catch (e3) {
+          if (e3 instanceof APIError && e3.code === VERSION_NOT_DEPLOYED_ERR_CODE) {
+            throw new UserError(
+              "Secret edit failed. You attempted to modify a secret, but the latest version of your Worker isn't currently deployed. Please ensure that the latest version of your Worker is fully deployed (wrangler versions deploy --x-versions) before modifying secrets. Alternatively, you can use the Cloudflare dashboard to modify secrets and deploy the version.\n\nNote: This limitation will be addressed in an upcoming release."
+            );
+          } else {
+            throw e3;
+          }
+        }
       }
       __name(submitSecret, "submitSecret");
       try {
@@ -198487,7 +198479,7 @@ async function generateTypes(configToDTS, config, envInterface, outputPath) {
     );
   }
   if (configToDTS.ai) {
-    envTypeStructure.push(constructType(configToDTS.ai.binding, "unknown"));
+    envTypeStructure.push(constructType(configToDTS.ai.binding, "Ai"));
   }
   if (configToDTS.version_metadata) {
     envTypeStructure.push(
@@ -198586,8 +198578,7 @@ var vectorizeBetaWarning = `--------------------
 
 // src/vectorize/create.tsx
 init_import_meta_url();
-var import_ink10 = __toESM(require_build2());
-var import_react15 = __toESM(require_react());
+var import_toml5 = __toESM(require_toml());
 
 // src/vectorize/client.ts
 init_import_meta_url();
@@ -198720,9 +198711,21 @@ async function handler25(args) {
     return;
   }
   logger.log(
-    renderToString(
-      /* @__PURE__ */ import_react15.default.createElement(import_ink10.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react15.default.createElement(import_ink10.Text, null, "\u2705 Successfully created a new Vectorize index: '", indexResult.name, "'"), /* @__PURE__ */ import_react15.default.createElement(import_ink10.Text, null, "\u{1F4CB} To start querying from a Worker, add the following binding configuration into 'wrangler.toml':"), /* @__PURE__ */ import_react15.default.createElement(import_ink10.Text, null, "\xA0"), /* @__PURE__ */ import_react15.default.createElement(import_ink10.Text, null, "[[vectorize]]"), /* @__PURE__ */ import_react15.default.createElement(import_ink10.Text, null, 'binding = "VECTORIZE_INDEX" # available within your Worker on env.VECTORIZE_INDEX'), /* @__PURE__ */ import_react15.default.createElement(import_ink10.Text, null, 'index_name = "', indexResult.name, '"'))
-    )
+    `\u2705 Successfully created a new Vectorize index: '${indexResult.name}'`
+  );
+  logger.log(
+    `\u{1F4CB} To start querying from a Worker, add the following binding configuration into 'wrangler.toml':
+`
+  );
+  logger.log(
+    (0, import_toml5.stringify)({
+      vectorize: [
+        {
+          binding: "VECTORIZE_INDEX",
+          index_name: indexResult.name
+        }
+      ]
+    })
   );
 }
 __name(handler25, "handler");
@@ -199970,14 +199973,10 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
         "workers/tag": props.tag
       }
     };
-    const bundleSizePromise = printBundleSize(
+    await printBundleSize(
       { name: import_node_path50.default.basename(resolvedEntryPointPath), content },
       modules
     );
-    if (process.env.JEST_WORKER_ID !== void 0) {
-      await bundleSizePromise;
-    } else {
-    }
     const withoutStaticAssets = {
       ...bindings,
       kv_namespaces: config.kv_namespaces,
@@ -200764,7 +200763,7 @@ function getRules(config) {
     logger.warn(
       `Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration file, and add this:
 
-${import_toml5.default.stringify({ rules: config.build.upload.rules })}`
+${import_toml6.default.stringify({ rules: config.build.upload.rules })}`
     );
   }
   return rules;
@@ -201319,7 +201318,7 @@ ${tryRunningItIn}${oneOfThese}`
     throw e3;
   } finally {
     try {
-      if (typeof jest === "undefined") {
+      if (typeof vitest === "undefined") {
         process.disconnect?.();
       }
       await closeSentry();
@@ -201514,7 +201513,7 @@ The \`init\` command will be removed in a future version.`
     try {
       await (0, import_promises20.writeFile)(
         wranglerTomlDestination,
-        import_toml6.default.stringify({
+        import_toml7.default.stringify({
           name: workerName,
           compatibility_date: compatibilityDate
         }) + "\n"
@@ -201671,7 +201670,7 @@ ${err.message ?? err}`
         compatibility_date: parsedWranglerToml.compatibility_date,
         ...extraToml
       };
-      fs26.writeFileSync(wranglerTomlDestination, import_toml6.default.stringify(newToml));
+      fs26.writeFileSync(wranglerTomlDestination, import_toml7.default.stringify(newToml));
     }
     const isNamedWorker = isCreatingWranglerToml && import_node_path52.default.dirname(packagePath) !== process.cwd();
     const isAddingTestScripts = isAddingTests && !packageJsonContent.scripts?.test;
@@ -202460,7 +202459,7 @@ Author ID:           ${deploymentDetails.metadata.author_id}
 Usage Model:         ${deploymentDetails.resources.script_runtime.usage_model}
 Handlers:            ${deploymentDetails.resources.script.handlers}${compatDateStr}${compatFlagsStr}
 --------------------------bindings--------------------------
-${bindings.length > 0 ? import_toml7.default.stringify(mapBindings(bindings)) : `None`}
+${bindings.length > 0 ? import_toml8.default.stringify(mapBindings(bindings)) : `None`}
 `;
   logger.log(version3);
   logVersionIdChange();
@@ -202917,14 +202916,10 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       tail_consumers: config.tail_consumers,
       limits: config.limits
     };
-    const bundleSizePromise = printBundleSize(
+    await printBundleSize(
       { name: import_node_path53.default.basename(resolvedEntryPointPath), content },
       modules
     );
-    if (process.env.JEST_WORKER_ID !== void 0) {
-      await bundleSizePromise;
-    } else {
-    }
     const withoutStaticAssets = {
       ...bindings,
       kv_namespaces: config.kv_namespaces,
@@ -203419,7 +203414,7 @@ var import_node_http22 = require("node:http2");
 var import_node_https = __toESM(require("node:https"));
 var import_http_terminator2 = __toESM(require_src5());
 var import_miniflare13 = require("miniflare");
-var import_react16 = __toESM(require_react());
+var import_react15 = __toESM(require_react());
 var import_serve_static = __toESM(require_serve_static());
 function addCfPreviewTokenHeader(headers, previewTokenValue) {
   headers["cf-workers-preview-token"] = previewTokenValue;
@@ -203808,9 +203803,9 @@ __name(waitForPortToBeAvailable, "waitForPortToBeAvailable");
 
 // src/dev/remote.tsx
 function Remote(props) {
-  const [accountId, setAccountId] = (0, import_react17.useState)(props.accountId);
-  const accountChoicesRef = (0, import_react17.useRef)();
-  const [accountChoices, setAccountChoices] = (0, import_react17.useState)();
+  const [accountId, setAccountId] = (0, import_react16.useState)(props.accountId);
+  const accountChoicesRef = (0, import_react16.useRef)();
+  const [accountChoices, setAccountChoices] = (0, import_react16.useState)();
   useWorker({
     name: props.name,
     bundle: props.bundle,
@@ -203832,7 +203827,7 @@ function Remote(props) {
     port: props.port
   });
   const errorHandler = useErrorHandler();
-  (0, import_react17.useEffect)(() => {
+  (0, import_react16.useEffect)(() => {
     if (accountChoicesRef.current !== void 0 || props.accountId !== void 0) {
       return;
     }
@@ -203854,7 +203849,7 @@ function Remote(props) {
       }
     );
   });
-  return accountId === void 0 && accountChoices !== void 0 ? /* @__PURE__ */ import_react17.default.createElement(
+  return accountId === void 0 && accountChoices !== void 0 ? /* @__PURE__ */ import_react16.default.createElement(
     ChooseAccount,
     {
       accounts: accountChoices,
@@ -203868,12 +203863,12 @@ function Remote(props) {
 }
 __name(Remote, "Remote");
 function useWorker(props) {
-  const [session, setSession] = (0, import_react17.useState)();
-  const [token, setToken] = (0, import_react17.useState)();
-  const [restartCounter, setRestartCounter] = (0, import_react17.useState)(0);
-  const startedRef = (0, import_react17.useRef)(false);
+  const [session, setSession] = (0, import_react16.useState)();
+  const [token, setToken] = (0, import_react16.useState)();
+  const [restartCounter, setRestartCounter] = (0, import_react16.useState)(0);
+  const startedRef = (0, import_react16.useRef)(false);
   const { onReady } = props;
-  (0, import_react17.useEffect)(() => {
+  (0, import_react16.useEffect)(() => {
     const abortController = new AbortController();
     async function start() {
       if (props.accountId === void 0) {
@@ -203929,7 +203924,7 @@ For more details, refer to https://developers.cloudflare.com/workers/configurati
     props.sendMetrics,
     restartCounter
   ]);
-  (0, import_react17.useEffect)(() => {
+  (0, import_react16.useEffect)(() => {
     const abortController = new AbortController();
     async function start() {
       if (props.accountId === void 0) {
@@ -204276,7 +204271,7 @@ async function getWorkerAccountAndContext(props) {
 }
 __name(getWorkerAccountAndContext, "getWorkerAccountAndContext");
 function ChooseAccount(props) {
-  return /* @__PURE__ */ import_react17.default.createElement(import_react17.default.Fragment, null, /* @__PURE__ */ import_react17.default.createElement(import_ink11.Text, { bold: true }, "Select an account from below:"), /* @__PURE__ */ import_react17.default.createElement(
+  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(import_ink10.Text, { bold: true }, "Select an account from below:"), /* @__PURE__ */ import_react16.default.createElement(
     import_ink_select_input3.default,
     {
       items: props.accounts.map((item) => ({
@@ -204329,8 +204324,8 @@ init_import_meta_url();
 var import_node_assert18 = __toESM(require("node:assert"));
 var import_node_path55 = __toESM(require("node:path"));
 var import_chokidar3 = require("chokidar");
-var import_ink12 = __toESM(require_build2());
-var import_react18 = __toESM(require_react());
+var import_ink11 = __toESM(require_build2());
+var import_react17 = __toESM(require_react());
 function useEsbuild({
   entry,
   destination,
@@ -204359,9 +204354,9 @@ function useEsbuild({
   onStart,
   defineNavigatorUserAgent
 }) {
-  const [bundle, setBundle] = (0, import_react18.useState)();
-  const { exit: exit6 } = (0, import_ink12.useApp)();
-  (0, import_react18.useEffect)(() => {
+  const [bundle, setBundle] = (0, import_react17.useState)();
+  const { exit: exit6 } = (0, import_ink11.useApp)();
+  (0, import_react17.useEffect)(() => {
     let stopWatching = void 0;
     const entryDirectory = import_node_path55.default.dirname(entry.file);
     const moduleCollector = noBundle ? noopModuleCollector : createModuleCollector({
@@ -204554,9 +204549,9 @@ __name(validateDevProps, "validateDevProps");
 
 // src/dev/dev.tsx
 function useDevRegistry(name, services, durableObjects, mode) {
-  const [workers, setWorkers] = (0, import_react19.useState)({});
-  const hasFailedToFetch = (0, import_react19.useRef)(false);
-  (0, import_react19.useEffect)(() => {
+  const [workers, setWorkers] = (0, import_react18.useState)({});
+  const hasFailedToFetch = (0, import_react18.useRef)(false);
+  (0, import_react18.useEffect)(() => {
     startWorkerRegistry().catch((err) => {
       logger.error("failed to start worker registry", err);
     });
@@ -204617,8 +204612,8 @@ function useDevRegistry(name, services, durableObjects, mode) {
 __name(useDevRegistry, "useDevRegistry");
 function DevImplementation(props) {
   validateDevProps(props);
-  const { isRawModeSupported } = (0, import_ink13.useStdin)();
-  return props.showInteractiveDevSession ?? isRawModeSupported ? /* @__PURE__ */ import_react19.default.createElement(InteractiveDevSession, { ...props }) : /* @__PURE__ */ import_react19.default.createElement(DevSession, { ...props, local: props.initialMode === "local" });
+  const { isRawModeSupported } = (0, import_ink12.useStdin)();
+  return props.showInteractiveDevSession ?? isRawModeSupported ? /* @__PURE__ */ import_react18.default.createElement(InteractiveDevSession, { ...props }) : /* @__PURE__ */ import_react18.default.createElement(DevSession, { ...props, local: props.initialMode === "local" });
 }
 __name(DevImplementation, "DevImplementation");
 var ip;
@@ -204651,17 +204646,17 @@ function InteractiveDevSession(props) {
     port = newPort;
     props.onReady?.(newIp, newPort, proxyData);
   }, "onReady");
-  return /* @__PURE__ */ import_react19.default.createElement(import_react19.default.Fragment, null, /* @__PURE__ */ import_react19.default.createElement(DevSession, { ...props, local: toggles.local, onReady }), /* @__PURE__ */ import_react19.default.createElement(import_ink13.Box, { borderStyle: "round", paddingLeft: 1, paddingRight: 1 }, /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, { bold: true }, "[b]"), /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, null, " open a browser, "), props.inspect ? /* @__PURE__ */ import_react19.default.createElement(import_react19.default.Fragment, null, /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, { bold: true }, "[d]"), /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, null, " open Devtools, ")) : null, !props.forceLocal ? /* @__PURE__ */ import_react19.default.createElement(import_react19.default.Fragment, null, /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, { bold: true }, "[l]"), /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, null, " ", toggles.local ? "turn off" : "turn on", " local mode, ")) : null, /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, { bold: true }, "[c]"), /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, null, " clear console, "), /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, { bold: true }, "[x]"), /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, null, " to exit")));
+  return /* @__PURE__ */ import_react18.default.createElement(import_react18.default.Fragment, null, /* @__PURE__ */ import_react18.default.createElement(DevSession, { ...props, local: toggles.local, onReady }), /* @__PURE__ */ import_react18.default.createElement(import_ink12.Box, { borderStyle: "round", paddingLeft: 1, paddingRight: 1 }, /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, { bold: true }, "[b]"), /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, null, " open a browser, "), props.inspect ? /* @__PURE__ */ import_react18.default.createElement(import_react18.default.Fragment, null, /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, { bold: true }, "[d]"), /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, null, " open Devtools, ")) : null, !props.forceLocal ? /* @__PURE__ */ import_react18.default.createElement(import_react18.default.Fragment, null, /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, { bold: true }, "[l]"), /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, null, " ", toggles.local ? "turn off" : "turn on", " local mode, ")) : null, /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, { bold: true }, "[c]"), /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, null, " clear console, "), /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, { bold: true }, "[x]"), /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, null, " to exit")));
 }
 __name(InteractiveDevSession, "InteractiveDevSession");
 function DevSession(props) {
-  const [devEnv] = (0, import_react19.useState)(() => new DevEnv());
-  (0, import_react19.useEffect)(() => {
+  const [devEnv] = (0, import_react18.useState)(() => new DevEnv());
+  (0, import_react18.useEffect)(() => {
     return () => {
       void devEnv.teardown();
     };
   }, [devEnv]);
-  const startDevWorkerOptions = (0, import_react19.useMemo)(
+  const startDevWorkerOptions = (0, import_react18.useMemo)(
     () => ({
       name: props.name ?? "worker",
       script: { contents: "" },
@@ -204695,16 +204690,16 @@ function DevSession(props) {
       props.liveReload
     ]
   );
-  const onBundleStart = (0, import_react19.useCallback)(() => {
+  const onBundleStart = (0, import_react18.useCallback)(() => {
     devEnv.proxy.onBundleStart({
       type: "bundleStart",
       config: startDevWorkerOptions
     });
   }, [devEnv, startDevWorkerOptions]);
-  const esbuildStartTimeoutRef = (0, import_react19.useRef)();
-  const latestReloadCompleteEvent = (0, import_react19.useRef)();
-  const bundle = (0, import_react19.useRef)();
-  const onCustomBuildEnd = (0, import_react19.useCallback)(() => {
+  const esbuildStartTimeoutRef = (0, import_react18.useRef)();
+  const latestReloadCompleteEvent = (0, import_react18.useRef)();
+  const bundle = (0, import_react18.useRef)();
+  const onCustomBuildEnd = (0, import_react18.useCallback)(() => {
     const TIMEOUT = 300;
     clearTimeout(esbuildStartTimeoutRef.current);
     esbuildStartTimeoutRef.current = setTimeout(() => {
@@ -204716,11 +204711,11 @@ function DevSession(props) {
       clearTimeout(esbuildStartTimeoutRef.current);
     };
   }, [devEnv, latestReloadCompleteEvent]);
-  const onEsbuildStart = (0, import_react19.useCallback)(() => {
+  const onEsbuildStart = (0, import_react18.useCallback)(() => {
     clearTimeout(esbuildStartTimeoutRef.current);
     onBundleStart();
   }, [esbuildStartTimeoutRef, onBundleStart]);
-  const onReloadStart = (0, import_react19.useCallback)(
+  const onReloadStart = (0, import_react18.useCallback)(
     (esbuildBundle) => {
       devEnv.proxy.onReloadStart({
         type: "reloadStart",
@@ -204738,7 +204733,7 @@ function DevSession(props) {
     props.bindings.durable_objects,
     props.local ? "local" : "remote"
   );
-  (0, import_react19.useEffect)(() => {
+  (0, import_react18.useEffect)(() => {
     devEnv.proxy.onConfigUpdate({
       type: "configUpdate",
       config: startDevWorkerOptions
@@ -204778,7 +204773,7 @@ function DevSession(props) {
       props.compatibilityFlags
     )
   });
-  (0, import_react19.useEffect)(() => {
+  (0, import_react18.useEffect)(() => {
     if (bundle.current) {
       onReloadStart(bundle.current);
     }
@@ -204823,7 +204818,7 @@ function DevSession(props) {
       props.onReady(finalIp, finalPort, proxyData);
     }
   }, "announceAndOnReady");
-  return props.local ? /* @__PURE__ */ import_react19.default.createElement(
+  return props.local ? /* @__PURE__ */ import_react18.default.createElement(
     Local,
     {
       name: props.name,
@@ -204855,7 +204850,7 @@ function DevSession(props) {
       sourceMapPath: bundle.current?.sourceMapPath,
       services: props.bindings.services
     }
-  ) : /* @__PURE__ */ import_react19.default.createElement(
+  ) : /* @__PURE__ */ import_react18.default.createElement(
     Remote,
     {
       name: props.name,
@@ -204887,9 +204882,9 @@ function DevSession(props) {
 }
 __name(DevSession, "DevSession");
 function useTmpDir(projectRoot) {
-  const [directory, setDirectory] = (0, import_react19.useState)();
+  const [directory, setDirectory] = (0, import_react18.useState)();
   const handleError = useErrorHandler();
-  (0, import_react19.useEffect)(() => {
+  (0, import_react18.useEffect)(() => {
     let dir;
     try {
       dir = getWranglerTmpDir(projectRoot, "dev");
@@ -204907,7 +204902,7 @@ function useTmpDir(projectRoot) {
 }
 __name(useTmpDir, "useTmpDir");
 function useCustomBuild(expectedEntry, build5, onStart, onEnd) {
-  (0, import_react19.useEffect)(() => {
+  (0, import_react18.useEffect)(() => {
     if (!build5.command) {
       return;
     }
@@ -204955,9 +204950,9 @@ async function findTunnelHostname() {
 }
 __name(findTunnelHostname, "findTunnelHostname");
 function useTunnel(toggle) {
-  const tunnel = (0, import_react19.useRef)();
-  const removeSignalExitListener = (0, import_react19.useRef)();
-  (0, import_react19.useEffect)(() => {
+  const tunnel = (0, import_react18.useRef)();
+  const removeSignalExitListener = (0, import_react18.useRef)();
+  (0, import_react18.useEffect)(() => {
     async function startTunnel() {
       if (toggle) {
         try {
@@ -205009,9 +205004,9 @@ function useTunnel(toggle) {
 __name(useTunnel, "useTunnel");
 function useHotkeys(props) {
   const { initial, inspectorPort, inspect: inspect2, localProtocol, forceLocal } = props;
-  const [toggles, setToggles] = (0, import_react19.useState)(initial);
-  const { exit: exit6 } = (0, import_ink13.useApp)();
-  (0, import_ink13.useInput)(
+  const [toggles, setToggles] = (0, import_react18.useState)(initial);
+  const { exit: exit6 } = (0, import_ink12.useApp)();
+  (0, import_ink12.useInput)(
     async (input, key) => {
       switch (input.toLowerCase()) {
         case "c":
@@ -205065,9 +205060,9 @@ function useHotkeys(props) {
 }
 __name(useHotkeys, "useHotkeys");
 function ErrorFallback(props) {
-  const { exit: exit6 } = (0, import_ink13.useApp)();
-  (0, import_react19.useEffect)(() => exit6(props.error));
-  return /* @__PURE__ */ import_react19.default.createElement(import_react19.default.Fragment, null, /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, null, "Something went wrong:"), /* @__PURE__ */ import_react19.default.createElement(import_ink13.Text, null, props.error.stack));
+  const { exit: exit6 } = (0, import_ink12.useApp)();
+  (0, import_react18.useEffect)(() => exit6(props.error));
+  return /* @__PURE__ */ import_react18.default.createElement(import_react18.default.Fragment, null, /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, null, "Something went wrong:"), /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, null, props.error.stack));
 }
 __name(ErrorFallback, "ErrorFallback");
 var dev_default = withErrorBoundary(DevImplementation, {
@@ -205727,7 +205722,7 @@ async function startDev(args) {
         args,
         configParam
       );
-      return /* @__PURE__ */ import_react20.default.createElement(
+      return /* @__PURE__ */ import_react19.default.createElement(
         dev_default,
         {
           name: getScriptName({ name: args.name, env: args.env }, configParam),
@@ -205787,7 +205782,7 @@ async function startDev(args) {
       );
     }
     __name(getDevReactElement, "getDevReactElement");
-    const devReactElement = (0, import_ink14.render)(await getDevReactElement(config));
+    const devReactElement = (0, import_ink13.render)(await getDevReactElement(config));
     rerender = devReactElement.rerender;
     return {
       devReactElement,
@@ -207397,7 +207392,8 @@ function unstable_getMiniflareWorkerOptions(configPath, environment) {
   if (bindings.services !== void 0) {
     bindingOptions.serviceBindings = Object.fromEntries(
       bindings.services.map((binding) => {
-        return [binding.binding, binding.service];
+        const name = binding.service === config.name ? import_miniflare18.kCurrentWorker : binding.service;
+        return [binding.binding, { name, entrypoint: binding.entrypoint }];
       })
     );
   }
@@ -207437,18 +207433,23 @@ async function getBindingsProxy(options29 = {}) {
 __name(getBindingsProxy, "getBindingsProxy");
 
 // src/cli.ts
-if (typeof jest === "undefined" && require.main === module) {
+if (typeof vitest === "undefined" && require.main === module) {
   main(hideBin(import_process6.default.argv)).catch((e3) => {
     const exitCode = e3 instanceof FatalError && e3.code || 1;
     import_process6.default.exit(exitCode);
   });
 }
+var generateASSETSBinding2 = (
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  (init_assets(), __toCommonJS(assets_exports)).default
+);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getBindingsProxy,
   getPlatformProxy,
   unstable_DevEnv,
   unstable_dev,
+  unstable_generateASSETSBinding,
   unstable_getMiniflareWorkerOptions,
   unstable_pages,
   unstable_splitSqlQuery,
@@ -208074,3 +208075,4 @@ yargs-parser/build/lib/index.js:
    * SPDX-License-Identifier: ISC
    *)
 */
+//# sourceMappingURL=cli.js.map