wrangler 2.1.2 → 2.1.4

package/wrangler-dist/cli.js

@@ -2262,7 +2262,7 @@ var require_request = __commonJS({
       channels.trailers = { hasSubscribers: false };
       channels.error = { hasSubscribers: false };
     }
-    var Request = class {
+    var Request2 = class {
       constructor(origin, {
         path: path30,
         method,
@@ -2467,7 +2467,7 @@ var require_request = __commonJS({
 `;
       }
     }
-    module2.exports = Request;
+    module2.exports = Request2;
   }
 });
 
@@ -3238,7 +3238,7 @@ var require_client = __commonJS({
     var assert12 = require("assert");
     var net3 = require("net");
     var util2 = require_util();
-    var Request = require_request();
+    var Request2 = require_request();
     var DispatcherBase = require_dispatcher_base();
     var RedirectHandler = require_redirect();
     var {
@@ -3447,7 +3447,7 @@ var require_client = __commonJS({
           handler2 = new RedirectHandler(this, maxRedirections, opts, handler2);
         }
         const origin = opts.origin || this[kUrl].origin;
-        const request = new Request(origin, opts, handler2);
+        const request = new Request2(origin, opts, handler2);
         this[kQueue].push(request);
         if (this[kResuming]) {
         } else if (util2.bodyLength(request.body) == null && util2.isIterable(request.body)) {
@@ -7910,7 +7910,7 @@ var require_request2 = __commonJS({
     var requestFinalizer = new FinalizationRegistry(({ signal, abort: abort2 }) => {
       signal.removeEventListener("abort", abort2);
     });
-    var Request = class {
+    var Request2 = class {
       constructor(input, init = {}) {
         if (input === kInit) {
           return;
@@ -7942,7 +7942,7 @@ var require_request2 = __commonJS({
           request = makeRequest({ urlList: [parsedURL] });
           fallbackMode = "cors";
         } else {
-          assert12(input instanceof Request);
+          assert12(input instanceof Request2);
           request = input[kState];
           signal = input[kSignal];
         }
@@ -8124,7 +8124,7 @@ var require_request2 = __commonJS({
             fillHeaders(this[kHeaders], headers);
           }
         }
-        const inputBody = input instanceof Request ? input[kState].body : null;
+        const inputBody = input instanceof Request2 ? input[kState].body : null;
         if ((init.body !== void 0 && init.body != null || inputBody != null) && (request.method === "GET" || request.method === "HEAD")) {
           throw new TypeError("Request with GET/HEAD method cannot have body.");
         }
@@ -8172,31 +8172,31 @@ var require_request2 = __commonJS({
         return this.constructor.name;
       }
       get method() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kState].method;
       }
       get url() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kState].url.toString();
       }
       get headers() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kHeaders];
       }
       get destination() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kState].destination;
       }
       get referrer() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         if (this[kState].referrer === "no-referrer") {
@@ -8208,13 +8208,13 @@ var require_request2 = __commonJS({
         return this[kState].referrer.toString();
       }
       get referrerPolicy() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kState].referrerPolicy;
       }
       get mode() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kState].mode;
@@ -8223,56 +8223,56 @@ var require_request2 = __commonJS({
         return this[kState].credentials;
       }
       get cache() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kState].cache;
       }
       get redirect() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kState].redirect;
       }
       get integrity() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kState].integrity;
       }
       get keepalive() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kState].keepalive;
       }
       get isReloadNavigation() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kState].reloadNavigation;
       }
       get isHistoryNavigation() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kState].historyNavigation;
       }
       get signal() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         return this[kSignal];
       }
       clone() {
-        if (!(this instanceof Request)) {
+        if (!(this instanceof Request2)) {
           throw new TypeError("Illegal invocation");
         }
         if (this.bodyUsed || this.body?.locked) {
           throw new TypeError("unusable");
         }
         const clonedRequest = cloneRequest(this[kState]);
-        const clonedRequestObject = new Request(kInit);
+        const clonedRequestObject = new Request2(kInit);
         clonedRequestObject[kState] = clonedRequest;
         clonedRequestObject[kRealm] = this[kRealm];
         clonedRequestObject[kHeaders] = new Headers2();
@@ -8295,7 +8295,7 @@ var require_request2 = __commonJS({
         return clonedRequestObject;
       }
     };
-    mixinBody(Request);
+    mixinBody(Request2);
     function makeRequest(init) {
       const request = {
         method: "GET",
@@ -8346,7 +8346,7 @@ var require_request2 = __commonJS({
       }
       return newRequest;
     }
-    Object.defineProperties(Request.prototype, {
+    Object.defineProperties(Request2.prototype, {
       method: kEnumerableProperty,
       url: kEnumerableProperty,
       headers: kEnumerableProperty,
@@ -8355,13 +8355,13 @@ var require_request2 = __commonJS({
       signal: kEnumerableProperty
     });
     webidl.converters.Request = webidl.interfaceConverter(
-      Request
+      Request2
     );
     webidl.converters.RequestInfo = function(V) {
       if (typeof V === "string") {
         return webidl.converters.USVString(V);
       }
-      if (V instanceof Request) {
+      if (V instanceof Request2) {
         return webidl.converters.Request(V);
       }
       return webidl.converters.USVString(V);
@@ -8463,7 +8463,7 @@ var require_request2 = __commonJS({
         converter: webidl.converters.any
       }
     ]);
-    module2.exports = { Request, makeRequest };
+    module2.exports = { Request: Request2, makeRequest };
   }
 });
 
@@ -8719,7 +8719,7 @@ var require_fetch = __commonJS({
       makeResponse
     } = require_response();
     var { Headers: Headers2 } = require_headers();
-    var { Request, makeRequest } = require_request2();
+    var { Request: Request2, makeRequest } = require_request2();
     var zlib = require("zlib");
     var {
       matchRequestIntegrity,
@@ -8803,7 +8803,7 @@ var require_fetch = __commonJS({
       const p = createDeferredPromise();
       let requestObject;
       try {
-        requestObject = new Request(input, init);
+        requestObject = new Request2(input, init);
       } catch (e2) {
         p.reject(e2);
         return p.promise;
@@ -138674,7 +138674,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.1.2";
+var version = "2.1.4";
 var package_default = {
   name: "wrangler",
   version,
@@ -139940,7 +139940,7 @@ function useLocalWorker({
   port,
   inspectorPort,
   rules,
-  enableLocalPersistence,
+  localPersistencePath,
   liveReload,
   ip,
   crons,
@@ -139955,7 +139955,6 @@ function useLocalWorker({
   const local = (0, import_react3.useRef)();
   const removeSignalExitListener = (0, import_react3.useRef)();
   const [inspectorUrl, setInspectorUrl] = (0, import_react3.useState)();
-  const localPersistencePath = enableLocalPersistence ? import_node_path13.default.join(process.cwd(), "wrangler-local-state") : null;
   (0, import_react3.useEffect)(() => {
     if (bindings.services && bindings.services.length > 0) {
       logger.warn(
@@ -141662,7 +141661,19 @@ async function createPreviewSession(account, ctx, abortSignal) {
     void 0,
     abortSignal
   );
-  const { inspector_websocket, prewarm, token } = await (await (0, import_undici5.fetch)(exchange_url, { signal: abortSignal })).json();
+  logger.debug(`-- START EXCHANGE API REQUEST: GET ${exchange_url}`);
+  logger.debug("-- END EXCHANGE API REQUEST");
+  const exchangeResponse = await (0, import_undici5.fetch)(exchange_url, { signal: abortSignal });
+  const bodyText = await exchangeResponse.text();
+  logger.debug(
+    "-- START EXCHANGE API RESPONSE:",
+    exchangeResponse.statusText,
+    exchangeResponse.status
+  );
+  logger.debug("HEADERS:", JSON.stringify(exchangeResponse.headers, null, 2));
+  logger.debug("RESPONSE:", bodyText);
+  logger.debug("-- END EXCHANGE API RESPONSE");
+  const { inspector_websocket, prewarm, token } = parseJSON(bodyText);
   const { host } = new import_node_url9.URL(inspector_websocket);
   const query = `cf_workers_preview_token=${token}`;
   return {
@@ -143193,7 +143204,7 @@ function DevSession(props) {
     ip: props.ip,
     rules: props.rules,
     inspectorPort: props.inspectorPort,
-    enableLocalPersistence: props.enableLocalPersistence,
+    localPersistencePath: props.localPersistencePath,
     liveReload: props.liveReload,
     crons: props.crons,
     localProtocol: props.localProtocol,
@@ -143476,7 +143487,7 @@ async function startDevServer(props) {
       ip: props.ip,
       rules: props.rules,
       inspectorPort: props.inspectorPort,
-      enableLocalPersistence: props.enableLocalPersistence,
+      localPersistencePath: props.localPersistencePath,
       liveReload: props.liveReload,
       crons: props.crons,
       localProtocol: props.localProtocol,
@@ -143576,7 +143587,7 @@ async function startLocalServer({
   port,
   inspectorPort,
   rules,
-  enableLocalPersistence,
+  localPersistencePath,
   liveReload,
   ip,
   crons,
@@ -143594,7 +143605,6 @@ async function startLocalServer({
   const setInspectorUrl = (url3) => {
     inspectorUrl = url3;
   };
-  const localPersistencePath = enableLocalPersistence ? path20.join(process.cwd(), "wrangler-local-state") : null;
   const abortController = new AbortController();
   async function startLocalWorker() {
     if (!bundle || !format4)
@@ -143850,6 +143860,8 @@ async function fromDashMessagePrompt(deploySource) {
       `You are about to publish a Workers Service that was last published via the Cloudflare Dashboard.
 		Edits that have been made via the dashboard will be overridden by your local code and config.`
     );
+    if (!isInteractive() || CI.isCI())
+      return true;
     return await confirm("Would you like to continue?");
   }
 }
@@ -147982,6 +147994,8 @@ ${err2.message ?? err2}`
     "package.json"
   );
   let shouldCreatePackageJson = false;
+  let shouldCreateTests = false;
+  let newWorkerTestType = "jest";
   if (!pathToPackageJson) {
     shouldCreatePackageJson = yesFlag || await confirm("No package.json found. Would you like to create one?");
     if (shouldCreatePackageJson) {
@@ -148069,28 +148083,18 @@ ${err2.message ?? err2}`
     pathToPackageJson
   );
   const shouldWritePackageJsonScripts = !packageJsonContent.scripts?.start && !packageJsonContent.scripts?.publish && shouldCreatePackageJson;
-  async function installPackages(shouldRunInstall, depsToInstall) {
-    if (depsToInstall.length > 0) {
-      const formatter = new Intl.ListFormat("en", {
-        style: "long",
-        type: "conjunction"
-      });
-      await packageManager.addDevDeps(...depsToInstall);
-      const versionlessPackages = depsToInstall.map(
-        (dep) => dep === `wrangler@${version}` ? "wrangler" : dep
-      );
-      logger.log(
-        `\u2728 Installed ${formatter.format(
-          versionlessPackages
-        )} into devDependencies`
-      );
-    } else {
-      if (shouldRunInstall) {
-        await packageManager.install();
-      }
+  async function writePackageJsonScriptsAndUpdateWranglerToml({
+    isWritingScripts,
+    isAddingTests,
+    testRunner,
+    isCreatingWranglerToml,
+    packagePath,
+    scriptPath,
+    extraToml
+  }) {
+    if (isAddingTests && !testRunner) {
+      logger.error("testRunner is required if isAddingTests");
     }
-  }
-  async function writePackageJsonScriptsAndUpdateWranglerToml(isWritingScripts, isCreatingWranglerToml, packagePath, scriptPath, extraToml) {
     if (isCreatingWranglerToml) {
       const parsedWranglerToml = parseTOML(
         readFileSync5(wranglerTomlDestination)
@@ -148104,6 +148108,7 @@ ${err2.message ?? err2}`
       fs7.writeFileSync(wranglerTomlDestination, import_toml4.default.stringify(newToml));
     }
     const isNamedWorker = isCreatingWranglerToml && import_node_path18.default.dirname(packagePath) !== process.cwd();
+    const isAddingTestScripts = isAddingTests && !packageJsonContent.scripts?.test;
     if (isWritingScripts) {
       await (0, import_promises7.writeFile)(
         packagePath,
@@ -148113,7 +148118,8 @@ ${err2.message ?? err2}`
             scripts: {
               ...packageJsonContent.scripts,
               start: isCreatingWranglerToml ? `wrangler dev` : `wrangler dev ${scriptPath}`,
-              deploy: isCreatingWranglerToml ? `wrangler publish` : `wrangler publish ${scriptPath}`
+              deploy: isCreatingWranglerToml ? `wrangler publish` : `wrangler publish ${scriptPath}`,
+              ...isAddingTestScripts && { test: testRunner }
             }
           },
           null,
@@ -148124,6 +148130,9 @@ ${err2.message ?? err2}`
         `
 To start developing your Worker, run \`${isNamedWorker ? `cd ${args.name} && ` : ""}npm start\``
       );
+      if (isAddingTestScripts) {
+        instructions.push(`To start testing your Worker, run \`npm test\``);
+      }
       instructions.push(
         `To publish your Worker to the Internet, run \`npm run deploy\``
       );
@@ -148137,45 +148146,6 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       );
     }
   }
-  async function getNewWorkerType(newWorkerFilename) {
-    return select(
-      `Would you like to create a Worker at ${newWorkerFilename}?`,
-      [
-        {
-          value: "none",
-          label: "None"
-        },
-        {
-          value: "fetch",
-          label: "Fetch handler"
-        },
-        {
-          value: "scheduled",
-          label: "Scheduled handler"
-        }
-      ],
-      1
-    );
-  }
-  function getNewWorkerTemplate(lang, workerType) {
-    const templates = {
-      "js-fetch": "new-worker.js",
-      "js-scheduled": "new-worker-scheduled.js",
-      "ts-fetch": "new-worker.ts",
-      "ts-scheduled": "new-worker-scheduled.ts"
-    };
-    return templates[`${lang}-${workerType}`];
-  }
-  function getNewWorkerToml(workerType) {
-    if (workerType === "scheduled") {
-      return {
-        triggers: {
-          crons: ["1 * * * *"]
-        }
-      };
-    }
-    return {};
-  }
   if (isTypescriptProject) {
     if (!fs7.existsSync(import_node_path18.default.join(creationDirectory, "./src/index.ts"))) {
       const newWorkerFilename = import_node_path18.default.relative(
@@ -148203,16 +148173,16 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
           import_node_path18.default.join(creationDirectory, "./src/index.ts"),
           dashScript
         );
-        await writePackageJsonScriptsAndUpdateWranglerToml(
-          shouldWritePackageJsonScripts,
-          justCreatedWranglerToml,
-          pathToPackageJson,
-          "src/index.ts",
-          await getWorkerConfig(accountId, fromDashScriptName, {
+        await writePackageJsonScriptsAndUpdateWranglerToml({
+          isWritingScripts: shouldWritePackageJsonScripts,
+          isCreatingWranglerToml: justCreatedWranglerToml,
+          packagePath: pathToPackageJson,
+          scriptPath: "src/index.ts",
+          extraToml: await getWorkerConfig(accountId, fromDashScriptName, {
             defaultEnvironment,
             environments: serviceMetaData.environments
           })
-        );
+        });
       } else {
         const newWorkerType = yesFlag ? "fetch" : await getNewWorkerType(newWorkerFilename);
         if (newWorkerType !== "none") {
@@ -148230,13 +148200,13 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
               import_node_path18.default.join(creationDirectory, "./src/index.ts")
             )}`
           );
-          await writePackageJsonScriptsAndUpdateWranglerToml(
-            shouldWritePackageJsonScripts,
-            justCreatedWranglerToml,
-            pathToPackageJson,
-            "src/index.ts",
-            getNewWorkerToml(newWorkerType)
-          );
+          await writePackageJsonScriptsAndUpdateWranglerToml({
+            isWritingScripts: shouldWritePackageJsonScripts,
+            isCreatingWranglerToml: justCreatedWranglerToml,
+            packagePath: pathToPackageJson,
+            scriptPath: "src/index.ts",
+            extraToml: getNewWorkerToml(newWorkerType)
+          });
         }
       }
     }
@@ -148267,16 +148237,16 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
           import_node_path18.default.join(creationDirectory, "./src/index.js"),
           dashScript
         );
-        await writePackageJsonScriptsAndUpdateWranglerToml(
-          shouldWritePackageJsonScripts,
-          justCreatedWranglerToml,
-          pathToPackageJson,
-          "src/index.ts",
-          await getWorkerConfig(accountId, fromDashScriptName, {
+        await writePackageJsonScriptsAndUpdateWranglerToml({
+          isWritingScripts: shouldWritePackageJsonScripts,
+          isCreatingWranglerToml: justCreatedWranglerToml,
+          packagePath: pathToPackageJson,
+          scriptPath: "src/index.ts",
+          extraToml: await getWorkerConfig(accountId, fromDashScriptName, {
             defaultEnvironment,
             environments: serviceMetaData.environments
           })
-        );
+        });
       } else {
         const newWorkerType = yesFlag ? "fetch" : await getNewWorkerType(newWorkerFilename);
         if (newWorkerType !== "none") {
@@ -148294,19 +148264,45 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
               import_node_path18.default.join(creationDirectory, "./src/index.js")
             )}`
           );
-          await writePackageJsonScriptsAndUpdateWranglerToml(
-            shouldWritePackageJsonScripts,
-            justCreatedWranglerToml,
-            pathToPackageJson,
-            "src/index.js",
-            getNewWorkerToml(newWorkerType)
-          );
+          shouldCreateTests = yesFlag || await confirm("Would you like us to write your first test?");
+          if (shouldCreateTests) {
+            newWorkerTestType = await getNewWorkerTestType();
+            devDepsToInstall.push(newWorkerTestType);
+            await (0, import_promises7.writeFile)(
+              import_node_path18.default.join(creationDirectory, "./src/index.test.js"),
+              readFileSync5(
+                import_node_path18.default.join(
+                  getBasePath(),
+                  `templates/init-tests/test-${newWorkerTestType}-new-worker.js`
+                )
+              )
+            );
+            logger.log(
+              `\u2728 Created ${import_node_path18.default.relative(
+                process.cwd(),
+                import_node_path18.default.join(creationDirectory, "./src/index.test.js")
+              )}`
+            );
+          }
+          await writePackageJsonScriptsAndUpdateWranglerToml({
+            isWritingScripts: shouldWritePackageJsonScripts,
+            isAddingTests: shouldCreateTests,
+            testRunner: newWorkerTestType,
+            isCreatingWranglerToml: justCreatedWranglerToml,
+            packagePath: pathToPackageJson,
+            scriptPath: "src/index.js",
+            extraToml: getNewWorkerToml(newWorkerType)
+          });
         }
       }
     }
   }
   try {
-    await installPackages(shouldRunPackageManagerInstall, devDepsToInstall);
+    await installPackages(
+      shouldRunPackageManagerInstall,
+      devDepsToInstall,
+      packageManager
+    );
   } catch (e2) {
     logger.error(e2 instanceof Error ? e2.message : e2);
     instructions.push(
@@ -148315,6 +148311,82 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
   }
   instructions.forEach((instruction) => logger.log(instruction));
 }
+async function installPackages(shouldRunInstall, depsToInstall, packageManager) {
+  if (depsToInstall.length > 0) {
+    const formatter = new Intl.ListFormat("en", {
+      style: "long",
+      type: "conjunction"
+    });
+    await packageManager.addDevDeps(...depsToInstall);
+    const versionlessPackages = depsToInstall.map(
+      (dep) => dep === `wrangler@${version}` ? "wrangler" : dep
+    );
+    logger.log(
+      `\u2728 Installed ${formatter.format(
+        versionlessPackages
+      )} into devDependencies`
+    );
+  } else {
+    if (shouldRunInstall) {
+      await packageManager.install();
+    }
+  }
+}
+async function getNewWorkerType(newWorkerFilename) {
+  return select(
+    `Would you like to create a Worker at ${newWorkerFilename}?`,
+    [
+      {
+        value: "none",
+        label: "None"
+      },
+      {
+        value: "fetch",
+        label: "Fetch handler"
+      },
+      {
+        value: "scheduled",
+        label: "Scheduled handler"
+      }
+    ],
+    1
+  );
+}
+async function getNewWorkerTestType() {
+  return select(
+    `Which test runner would you like to use?`,
+    [
+      {
+        value: "vitest",
+        label: "Vitest"
+      },
+      {
+        value: "jest",
+        label: "Jest"
+      }
+    ],
+    1
+  );
+}
+function getNewWorkerTemplate(lang, workerType) {
+  const templates = {
+    "js-fetch": "new-worker.js",
+    "js-scheduled": "new-worker-scheduled.js",
+    "ts-fetch": "new-worker.ts",
+    "ts-scheduled": "new-worker-scheduled.ts"
+  };
+  return templates[`${lang}-${workerType}`];
+}
+function getNewWorkerToml(workerType) {
+  if (workerType === "scheduled") {
+    return {
+      triggers: {
+        crons: ["1 * * * *"]
+      }
+    };
+  }
+  return {};
+}
 async function findPath(isolatedInit, cwd2, basename4) {
   if (isolatedInit) {
     return fs7.existsSync(import_node_path18.default.resolve(cwd2, basename4)) ? import_node_path18.default.resolve(cwd2, basename4) : void 0;
@@ -149726,9 +149798,19 @@ function Options2(yargs) {
       choices: ["http", "https"]
     },
     "experimental-enable-local-persistence": {
+      describe: "Enable persistence for local mode (deprecated, use --persist)",
       type: "boolean",
-      default: false,
-      describe: "Enable persistence for this session (only for local mode)"
+      deprecated: true,
+      hidden: true
+    },
+    persist: {
+      describe: "Enable persistence for local mode, using default path: .wrangler/state",
+      type: "boolean"
+    },
+    "persist-to": {
+      describe: "Specify directory to use for local persistence (implies --persist)",
+      type: "string",
+      requiresArg: true
     },
     "node-compat": {
       describe: "Enable node.js compatibility",
@@ -149759,7 +149841,9 @@ var Handler2 = async ({
   r2: r2s = [],
   "live-reload": liveReload,
   "local-protocol": localProtocol,
-  "experimental-enable-local-persistence": experimentalEnableLocalPersistence,
+  experimentalEnableLocalPersistence,
+  persist,
+  persistTo,
   "node-compat": nodeCompat,
   config,
   _: [_pages, _dev, ...remaining]
@@ -149790,6 +149874,13 @@ var Handler2 = async ({
   } else {
     directory = (0, import_node_path26.resolve)(directory);
   }
+  if (experimentalEnableLocalPersistence) {
+    logger.warn(
+      `--experimental-enable-local-persistence is deprecated.
+Move any existing data to .wrangler/state and use --persist, or
+use --persist-to=./wrangler-local-state to keep using the old path.`
+    );
+  }
   let scriptReadyResolve;
   const scriptReadyPromise = new Promise(
     (promiseResolve) => scriptReadyResolve = promiseResolve
@@ -149928,7 +150019,8 @@ var Handler2 = async ({
         directory
       },
       forceLocal: true,
-      experimentalEnableLocalPersistence,
+      persist,
+      persistTo,
       showInteractiveDevSession: void 0,
       inspect: true,
       logLevel: "error",
@@ -153822,7 +153914,7 @@ ${shouldDo}`);
         }
       }
       const url3 = !secretBulkArgs.env || isLegacyEnv(config) ? `/accounts/${accountId}/workers/scripts/${scriptName}/secrets` : `/accounts/${accountId}/workers/services/${scriptName}/environments/${secretBulkArgs.env}/secrets`;
-      await Promise.allSettled(
+      const bulkOutcomes = await Promise.all(
         Object.entries(content).map(async ([key2, value]) => {
           return fetchResult(url3, {
             method: "PUT",
@@ -153834,15 +153926,24 @@ ${shouldDo}`);
             })
           }).then(() => {
             logger.log(`\u2728 Successfully created secret for key: ${key2}`);
+            return true;
           }).catch((e2) => {
             logger.error(
               `\u{1F6A8} Error uploading secret for key: ${key2}:
 										${e2.message}`
             );
+            return false;
           });
         })
       );
-      return logger.log("\u2728 Finished processing secrets JSON file");
+      const successes = bulkOutcomes.filter((outcome) => outcome).length;
+      const failures = bulkOutcomes.length - successes;
+      logger.log("");
+      logger.log("Finished processing secrets JSON file:");
+      logger.log(`\u2728 ${successes} secrets successfully uploaded`);
+      if (failures > 0) {
+        logger.log(`\u{1F6A8} ${failures} secrets failed to upload`);
+      }
     }
   );
   wrangler.command(
@@ -154848,8 +154949,17 @@ function devOptions(yargs) {
     describe: "Enable node.js compatibility",
     type: "boolean"
   }).option("experimental-enable-local-persistence", {
-    describe: "Enable persistence for this session (only for local mode)",
+    describe: "Enable persistence for local mode (deprecated, use --persist)",
+    type: "boolean",
+    deprecated: true,
+    hidden: true
+  }).option("persist", {
+    describe: "Enable persistence for local mode, using default path: .wrangler/state",
     type: "boolean"
+  }).option("persist-to", {
+    describe: "Specify directory to use for local persistence (implies --persist)",
+    type: "string",
+    requiresArg: true
   }).option("live-reload", {
     hidden: true,
     type: "boolean"
@@ -154904,7 +155014,8 @@ async function startDev(args) {
       routes,
       getLocalPort,
       getInspectorPort,
-      cliDefines
+      cliDefines,
+      localPersistencePath
     } = await validateDevServerSettings(args, config);
     await sendMetricsEvent(
       "run dev",
@@ -154940,7 +155051,7 @@ async function startDev(args) {
         upstreamProtocol,
         localProtocol: args.localProtocol || configParam.dev.local_protocol,
         localUpstream: args["local-upstream"] || host,
-        enableLocalPersistence: args.experimentalEnableLocalPersistence || false,
+        localPersistencePath,
         liveReload: args.liveReload || false,
         accountId: configParam.account_id || getAccountFromCache()?.id,
         assetPaths,
@@ -154998,7 +155109,8 @@ async function startApiDev(args) {
     routes,
     getLocalPort,
     getInspectorPort,
-    cliDefines
+    cliDefines,
+    localPersistencePath
   } = await validateDevServerSettings(args, config);
   await sendMetricsEvent(
     "run dev (api)",
@@ -155031,7 +155143,7 @@ async function startApiDev(args) {
       upstreamProtocol,
       localProtocol: args.localProtocol || configParam.dev.local_protocol,
       localUpstream: args["local-upstream"] || host,
-      enableLocalPersistence: args.experimentalEnableLocalPersistence || false,
+      localPersistencePath,
       liveReload: args.liveReload || false,
       accountId: configParam.account_id || getAccountFromCache()?.id,
       assetPaths,
@@ -155161,6 +155273,14 @@ async function validateDevServerSettings(args, config) {
       "Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details."
     );
   }
+  if (args.experimentalEnableLocalPersistence) {
+    logger.warn(
+      `--experimental-enable-local-persistence is deprecated.
+Move any existing data to .wrangler/state and use --persist, or
+use --persist-to=./wrangler-local-state to keep using the old path.`
+    );
+  }
+  const localPersistencePath = args.persistTo ? import_node_path33.default.resolve(process.cwd(), args.persistTo) : args.persist ? import_node_path33.default.resolve(config.configPath || process.cwd(), ".wrangler/state") : null;
   const cliDefines = args.define?.reduce((collectDefines, d) => {
     const [key2, ...value] = d.split(":");
     collectDefines[key2] = value.join("");
@@ -155175,7 +155295,8 @@ async function validateDevServerSettings(args, config) {
     zoneId,
     host,
     routes,
-    cliDefines
+    cliDefines,
+    localPersistencePath
   };
 }
 async function getBindingsAndAssetPaths(args, configParam) {
@@ -155291,9 +155412,16 @@ unstable_dev()'s behaviour will likely change in future releases`
       }).then((devServer) => {
         resolve14({
           stop: devServer.stop,
-          fetch: async (init) => {
-            const urlToFetch = `http://${readyAddress}:${readyPort}/`;
-            return await (0, import_undici11.fetch)(urlToFetch, init);
+          fetch: async (input, init) => {
+            return await (0, import_undici11.fetch)(
+              ...parseRequestInput(
+                readyAddress,
+                readyPort,
+                input,
+                init,
+                options?.localProtocol
+              )
+            );
           },
           waitUntilExit: async () => {
             return;
@@ -155322,9 +155450,16 @@ unstable_dev()'s behaviour will likely change in future releases`
       }).then((devServer) => {
         resolve14({
           stop: devServer.stop,
-          fetch: async (init) => {
-            const urlToFetch = `http://${readyAddress}:${readyPort}/`;
-            return await (0, import_undici11.fetch)(urlToFetch, init);
+          fetch: async (input, init) => {
+            return await (0, import_undici11.fetch)(
+              ...parseRequestInput(
+                readyAddress,
+                readyPort,
+                input,
+                init,
+                options?.localProtocol
+              )
+            );
           },
           waitUntilExit: devServer.devReactElement.waitUntilExit
         });
@@ -155332,6 +155467,22 @@ unstable_dev()'s behaviour will likely change in future releases`
     });
   }
 }
+function parseRequestInput(readyAddress, readyPort, input, init, protocol = "http") {
+  if (input instanceof import_undici11.Request) {
+    return [input, void 0];
+  } else if (input instanceof URL) {
+    input = `${protocol}://${readyAddress}:${readyPort}${input.pathname}`;
+  } else if (typeof input === "string") {
+    try {
+      input = `${protocol}://${readyAddress}:${readyPort}${new URL(input).pathname}`;
+    } catch {
+      input = `${protocol}://${readyAddress}:${readyPort}${input}`;
+    }
+  } else {
+    input = `${protocol}://${readyAddress}:${readyPort}`;
+  }
+  return [input, init];
+}
 
 // src/cli.ts
 if (typeof jest === "undefined" && require.main) {