wrangler 2.0.24 → 2.0.25

package/wrangler-dist/cli.js

@@ -129850,7 +129850,7 @@ init_import_meta_url();
 
 // src/dev.tsx
 init_import_meta_url();
-var import_node_path29 = __toESM(require("node:path"));
+var import_node_path30 = __toESM(require("node:path"));
 var import_chokidar4 = require("chokidar");
 
 // ../../node_modules/get-port/index.js
@@ -131085,7 +131085,7 @@ function normalizeAndValidateMainField(configPath, rawMain, deprecatedUpload) {
 }
 function normalizeAndValidateDev(diagnostics, rawDev) {
   const {
-    ip = "localhost",
+    ip = "0.0.0.0",
     port,
     inspector_port,
     local_protocol = "http",
@@ -133987,7 +133987,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.0.24";
+var version = "2.0.25";
 var package_default = {
   name: "wrangler",
   version,
@@ -134741,10 +134741,7 @@ function useInspector(props) {
                           if (pos && pos.line != null) {
                             const convertedFnName = pos.name || functionName || "";
                             exceptionLines.push(
-                              `    at ${convertedFnName} (${pos.source?.replace(
-                                `${mapContent.sourceRoot}/`,
-                                ""
-                              )}:${pos.line}:${pos.column})`
+                              `    at ${convertedFnName} (${pos.source}:${pos.line}:${pos.column})`
                             );
                           }
                         }
@@ -135237,7 +135234,9 @@ function useLocalWorker({
   format: format4,
   compatibilityDate,
   compatibilityFlags,
+  usageModel,
   bindings,
+  workerDefinitions,
   assetPaths,
   port,
   inspectorPort,
@@ -135265,6 +135264,14 @@ function useLocalWorker({
       );
     }
   }, [bindings.services]);
+  (0, import_react3.useEffect)(() => {
+    const externalDurableObjects = (bindings.durable_objects?.bindings || []).filter((binding) => binding.script_name);
+    if (externalDurableObjects.length > 0) {
+      logger.warn(
+        "\u2394 Support for external Durable Objects in local mode is experimental and may change."
+      );
+    }
+  }, [bindings.durable_objects?.bindings]);
   (0, import_react3.useEffect)(() => {
     const abortController = new AbortController();
     async function startLocalWorker() {
@@ -135315,6 +135322,8 @@ function useLocalWorker({
         }
       }
       const upstream = typeof localUpstream === "string" ? `${localProtocol}://${localUpstream}` : void 0;
+      const internalDurableObjects = (bindings.durable_objects?.bindings || []).filter((binding) => !binding.script_name);
+      const externalDurableObjects = (bindings.durable_objects?.bindings || []).filter((binding) => binding.script_name);
       const options = {
         name: workerName,
         port,
@@ -135329,12 +135338,34 @@ function useLocalWorker({
         })),
         compatibilityDate,
         compatibilityFlags,
+        usageModel,
         kvNamespaces: bindings.kv_namespaces?.map((kv) => kv.binding),
         r2Buckets: bindings.r2_buckets?.map((r2) => r2.binding),
         durableObjects: Object.fromEntries(
-          (bindings.durable_objects?.bindings ?? []).map(
-            (value) => [value.name, value.class_name]
-          )
+          internalDurableObjects.map((binding) => [
+            binding.name,
+            binding.class_name
+          ])
+        ),
+        externalDurableObjects: Object.fromEntries(
+          externalDurableObjects.map((binding) => {
+            const service = workerDefinitions[binding.script_name];
+            if (!service)
+              return [binding.name, void 0];
+            const name = service.durableObjects.find(
+              (durableObject) => durableObject.className === binding.class_name
+            )?.name;
+            if (!name)
+              return [binding.name, void 0];
+            return [
+              binding.name,
+              {
+                name,
+                host: service.durableObjectsHost,
+                port: service.durableObjectsPort
+              }
+            ];
+          }).filter(([_2, details]) => !!details)
         ),
         ...localPersistencePath ? {
           cachePersist: import_node_path12.default.join(localPersistencePath, "cache"),
@@ -135384,14 +135415,23 @@ function useLocalWorker({
         execArgv: nodeOptions,
         stdio: "pipe"
       });
-      child.on("message", async (message) => {
-        if (message === "ready") {
+      child.on("message", async (messageString) => {
+        const message = JSON.parse(messageString);
+        if (message.ready) {
           if (workerName) {
             await registerWorker(workerName, {
               protocol: localProtocol,
               mode: "local",
               port,
-              host: ip
+              host: ip,
+              durableObjects: internalDurableObjects.map((binding) => ({
+                name: binding.name,
+                className: binding.class_name
+              })),
+              ...message.durableObjectsPort ? {
+                durableObjectsHost: ip,
+                durableObjectsPort: message.durableObjectsPort
+              } : {}
             });
           }
           onReady?.();
@@ -135460,8 +135500,10 @@ function useLocalWorker({
     bindings.r2_buckets,
     bindings.vars,
     bindings.services,
+    workerDefinitions,
     compatibilityDate,
     compatibilityFlags,
+    usageModel,
     localPersistencePath,
     liveReload,
     assetPaths,
@@ -137629,7 +137671,7 @@ async function bundleWorker(entry, destination, options) {
     format: entry.format === "modules" ? "esm" : "iife",
     target: "es2020",
     sourcemap: true,
-    sourceRoot: entryDirectory,
+    sourceRoot: destination,
     minify,
     metafile: true,
     conditions: ["worker", "browser"],
@@ -137841,6 +137883,7 @@ function useEsbuild({
   noBundle,
   workerDefinitions,
   services,
+  durableObjects,
   firstPartyWorkerDevFacade
 }) {
   const [bundle, setBundle] = (0, import_react7.useState)();
@@ -137940,6 +137983,7 @@ function useEsbuild({
     define2,
     assets,
     services,
+    durableObjects,
     workerDefinitions,
     firstPartyWorkerDevFacade
   ]);
@@ -137972,7 +138016,7 @@ function validateDevProps(props) {
 }
 
 // src/dev/dev.tsx
-function useDevRegistry(name, services, mode) {
+function useDevRegistry(name, services, durableObjects, mode) {
   const [workers, setWorkers] = (0, import_react8.useState)({});
   (0, import_react8.useEffect)(() => {
     startWorkerRegistry().catch((err2) => {
@@ -137981,12 +138025,13 @@ function useDevRegistry(name, services, mode) {
     const serviceNames = (services || []).map(
       (serviceBinding) => serviceBinding.service
     );
+    const durableObjectServices = (durableObjects || { bindings: [] }).bindings.map((durableObjectBinding) => durableObjectBinding.script_name);
     const interval2 = mode === "local" ? setInterval(() => {
       getRegisteredWorkers().then(
         (workerDefinitions) => {
           const filteredWorkers = Object.fromEntries(
             Object.entries(workerDefinitions || {}).filter(
-              ([key2, _value]) => serviceNames.includes(key2)
+              ([key2, _value]) => serviceNames.includes(key2) || durableObjectServices.includes(key2)
             )
           );
           setWorkers((prevWorkers) => {
@@ -138026,7 +138071,7 @@ function useDevRegistry(name, services, mode) {
         }
       );
     };
-  }, [name, services, mode]);
+  }, [name, services, durableObjects, mode]);
   return workers;
 }
 function DevImplementation(props) {
@@ -138078,6 +138123,7 @@ function DevSession(props) {
   const workerDefinitions = useDevRegistry(
     props.name,
     props.bindings.services,
+    props.bindings.durable_objects,
     props.local ? "local" : "remote"
   );
   const bundle = useEsbuild({
@@ -138097,6 +138143,7 @@ function DevSession(props) {
     assets: props.assetsConfig,
     workerDefinitions,
     services: props.bindings.services,
+    durableObjects: props.bindings.durable_objects || { bindings: [] },
     firstPartyWorkerDevFacade: props.firstPartyWorker
   });
   return props.local ? /* @__PURE__ */ import_react8.default.createElement(Local, {
@@ -138105,7 +138152,9 @@ function DevSession(props) {
     format: props.entry.format,
     compatibilityDate: props.compatibilityDate,
     compatibilityFlags: props.compatibilityFlags,
+    usageModel: props.usageModel,
     bindings: props.bindings,
+    workerDefinitions,
     assetPaths: props.assetPaths,
     port: props.port,
     ip: props.ip,
@@ -138678,7 +138727,7 @@ async function getZoneIdFromHost(host) {
 // src/index.tsx
 init_import_meta_url();
 var fs11 = __toESM(require("node:fs"));
-var import_node_path28 = __toESM(require("node:path"));
+var import_node_path29 = __toESM(require("node:path"));
 var stream = __toESM(require("node:stream"));
 var import_node_string_decoder = require("node:string_decoder");
 var import_promises12 = require("node:timers/promises");
@@ -142708,7 +142757,7 @@ init_import_meta_url();
 init_import_meta_url();
 var import_node_fs10 = require("node:fs");
 var import_node_os8 = require("node:os");
-var import_node_path23 = require("node:path");
+var import_node_path24 = require("node:path");
 
 // src/paths.ts
 init_import_meta_url();
@@ -142731,6 +142780,8 @@ var MAX_UPLOAD_ATTEMPTS = 5;
 var MAX_CHECK_MISSING_ATTEMPTS = 5;
 var SECONDS_TO_WAIT_FOR_PROXY = 5;
 var isInPagesCI = !!process.env.CF_PAGES;
+var MAX_FUNCTIONS_ROUTES_RULES = 100;
+var ROUTES_SPEC_VERSION = 1;
 
 // src/pages/functions/buildPlugin.ts
 init_import_meta_url();
@@ -142755,6 +142806,10 @@ function buildPlugin({
     bundle: true,
     format: "esm",
     target: "esnext",
+    loader: {
+      ".html": "text",
+      ".txt": "text"
+    },
     outfile,
     minify,
     sourcemap,
@@ -142878,6 +142933,10 @@ function buildWorker({
     bundle: true,
     format: "esm",
     target: "esnext",
+    loader: {
+      ".html": "text",
+      ".txt": "text"
+    },
     outfile,
     minify,
     sourcemap,
@@ -143265,6 +143324,85 @@ export const routes = [
   ]`;
 }
 
+// src/pages/functions/routes-transformation.ts
+init_import_meta_url();
+var import_node_path23 = require("node:path");
+
+// src/pages/functions/routes-consolidation.ts
+init_import_meta_url();
+function consolidateRoutes(routes) {
+  const routesMap = /* @__PURE__ */ new Map();
+  for (const route of routes) {
+    routesMap.set(route, true);
+  }
+  for (const route of routes.filter((r) => r.endsWith("/*"))) {
+    if (routesMap.has(route)) {
+      const routeTrimmed = route.substring(0, route.length - 1);
+      for (const nextRoute of routesMap.keys()) {
+        if (nextRoute !== route && nextRoute.startsWith(routeTrimmed)) {
+          routesMap.delete(nextRoute);
+        }
+      }
+    }
+  }
+  return Array.from(routesMap.keys());
+}
+
+// src/pages/functions/routes-transformation.ts
+function convertRoutesToGlobPatterns(routes) {
+  const convertedRoutes = routes.map(({ routePath, middleware }) => {
+    const globbedRoutePath = routePath.replace(/:\w+\*?.*/, "*");
+    if (typeof middleware === "string" || Array.isArray(middleware) && middleware.length > 0) {
+      if (!globbedRoutePath.endsWith("*")) {
+        return toUrlPath((0, import_node_path23.join)(globbedRoutePath, "*"));
+      }
+    }
+    return toUrlPath(globbedRoutePath);
+  });
+  return Array.from(new Set(convertedRoutes));
+}
+function convertRoutesToRoutesJSONSpec(routes) {
+  const reversedRoutes = [...routes].reverse();
+  const include = convertRoutesToGlobPatterns(reversedRoutes);
+  return optimizeRoutesJSONSpec({
+    version: ROUTES_SPEC_VERSION,
+    include,
+    exclude: []
+  });
+}
+function optimizeRoutesJSONSpec(spec) {
+  const optimizedSpec = { ...spec };
+  let consolidatedRoutes = consolidateRoutes(optimizedSpec.include);
+  if (consolidatedRoutes.length > MAX_FUNCTIONS_ROUTES_RULES) {
+    consolidatedRoutes = ["/*"];
+  }
+  consolidatedRoutes.sort((a, b) => compareRoutes2(b, a));
+  optimizedSpec.include = consolidatedRoutes;
+  return optimizedSpec;
+}
+function compareRoutes2(routeA, routeB) {
+  function parseRoutePath(routePath) {
+    return routePath.slice(1).split("/").filter(Boolean);
+  }
+  const segmentsA = parseRoutePath(routeA);
+  const segmentsB = parseRoutePath(routeB);
+  if (segmentsA.length !== segmentsB.length) {
+    return segmentsB.length - segmentsA.length;
+  }
+  for (let i2 = 0; i2 < segmentsA.length; i2++) {
+    const isWildcardA = segmentsA[i2].includes("*");
+    const isWildcardB = segmentsB[i2].includes("*");
+    if (isWildcardA && !isWildcardB)
+      return 1;
+    if (!isWildcardA && isWildcardB)
+      return -1;
+  }
+  return routeA.localeCompare(routeB);
+}
+function isRoutesJSONSpec(data) {
+  return typeof data === "object" && data && "version" in data && typeof data.version === "number" && data.version === ROUTES_SPEC_VERSION && Array.isArray(data.include) && Array.isArray(data.exclude) || false;
+}
+
 // src/pages/utils.ts
 init_import_meta_url();
 var RUNNING_BUILDERS = [];
@@ -143291,6 +143429,10 @@ function Options(yargs) {
       type: "string",
       description: "The location for the output config file"
     },
+    "output-routes-path": {
+      type: "string",
+      description: "The location for the output _routes.json file"
+    },
     minify: {
       type: "boolean",
       default: false,
@@ -143331,14 +143473,15 @@ function Options(yargs) {
 var Handler = async ({
   directory,
   outfile,
-  "output-config-path": outputConfigPath,
+  outputConfigPath,
+  outputRoutesPath: routesOutputPath,
   minify,
   sourcemap,
   fallbackService,
   watch: watch5,
   plugin,
-  "build-output-directory": buildOutputDirectory,
-  "node-compat": nodeCompat
+  buildOutputDirectory,
+  nodeCompat
 }) => {
   if (!isInPagesCI) {
     logger.log(pagesBetaWarning);
@@ -143348,7 +143491,7 @@ var Handler = async ({
       "Enabling node.js compatibility mode for builtins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details."
     );
   }
-  buildOutputDirectory ??= (0, import_node_path23.dirname)(outfile);
+  buildOutputDirectory ??= (0, import_node_path24.dirname)(outfile);
   await buildFunctions({
     outfile,
     outputConfigPath,
@@ -143359,7 +143502,8 @@ var Handler = async ({
     watch: watch5,
     plugin,
     buildOutputDirectory,
-    nodeCompat
+    nodeCompat,
+    routesOutputPath
   });
   await sendMetricsEvent("build pages functions");
 };
@@ -143374,17 +143518,22 @@ async function buildFunctions({
   onEnd,
   plugin = false,
   buildOutputDirectory,
+  routesOutputPath,
   nodeCompat
 }) {
   RUNNING_BUILDERS.forEach(
     (runningBuilder) => runningBuilder.stop && runningBuilder.stop()
   );
-  const routesModule = (0, import_node_path23.join)((0, import_node_os8.tmpdir)(), `./functionsRoutes-${Math.random()}.mjs`);
+  const routesModule = (0, import_node_path24.join)((0, import_node_os8.tmpdir)(), `./functionsRoutes-${Math.random()}.mjs`);
   const baseURL = toUrlPath("/");
   const config = await generateConfigFromFileTree({
     baseDir: functionsDirectory,
     baseURL
   });
+  if (config.routes && routesOutputPath) {
+    const routesJSON = convertRoutesToRoutesJSONSpec(config.routes);
+    (0, import_node_fs10.writeFileSync)(routesOutputPath, JSON.stringify(routesJSON, null, 2));
+  }
   if (outputConfigPath) {
     (0, import_node_fs10.writeFileSync)(
       outputConfigPath,
@@ -143523,10 +143672,16 @@ async function CreateHandler({
     } catch (err2) {
       isGitDir = false;
     }
+    if (isGitDir) {
+      try {
+        productionBranch = (0, import_node_child_process4.execSync)(`git rev-parse --abbrev-ref HEAD`).toString().trim();
+      } catch (err2) {
+      }
+    }
     productionBranch = await prompt(
       "Enter the production branch name:",
       "text",
-      isGitDir ? (0, import_node_child_process4.execSync)(`git rev-parse --abbrev-ref HEAD`).toString().trim() : "production"
+      productionBranch ?? "production"
     );
   }
   if (!productionBranch) {
@@ -143564,9 +143719,7 @@ function ListOptions2(yargs) {
     }
   }).epilogue(pagesBetaWarning);
 }
-async function ListHandler2({
-  projectName
-}) {
+async function ListHandler2({ projectName }) {
   const config = getConfigCache(PAGES_CONFIG_CACHE_FILENAME);
   const accountId = await requireAuth(config);
   projectName ??= config.project_name;
@@ -143630,8 +143783,12 @@ init_import_meta_url();
 var import_node_child_process5 = require("node:child_process");
 var import_node_fs11 = require("node:fs");
 var import_node_os9 = require("node:os");
-var import_node_path24 = require("node:path");
+var import_node_path25 = require("node:path");
 var import_chokidar3 = require("chokidar");
+var import_esbuild6 = require("esbuild");
+var DURABLE_OBJECTS_BINDING_REGEXP = new RegExp(
+  /^(?<binding>[^=]+)=(?<className>[^@\s]+)(@(?<scriptName>.*)$)?$/
+);
 function Options2(yargs) {
   return yargs.positional("directory", {
     type: "string",
@@ -143647,11 +143804,20 @@ function Options2(yargs) {
       default: true,
       description: "Run on my machine"
     },
+    ip: {
+      type: "string",
+      default: "0.0.0.0",
+      description: "The IP address to listen on"
+    },
     port: {
       type: "number",
       default: 8788,
       description: "The port to listen on (serve from)"
     },
+    "inspector-port": {
+      type: "number",
+      describe: "Port for devtools to connect to"
+    },
     proxy: {
       type: "number",
       description: "The port to proxy (where the static assets are served)"
@@ -143668,14 +143834,18 @@ function Options2(yargs) {
     },
     kv: {
       type: "array",
-      description: "KV namespace to bind",
+      description: "KV namespace to bind (--kv KV_BINDING)",
       alias: "k"
     },
     do: {
       type: "array",
-      description: "Durable Object to bind (NAME=CLASS)",
+      description: "Durable Object to bind (--do NAME=CLASS)",
       alias: "o"
     },
+    r2: {
+      type: "array",
+      description: "R2 bucket to bind (--r2 R2_BINDING)"
+    },
     "live-reload": {
       type: "boolean",
       default: false,
@@ -143706,12 +143876,15 @@ function Options2(yargs) {
 var Handler2 = async ({
   local,
   directory,
+  ip,
   port,
+  "inspector-port": inspectorPort,
   proxy: requestedProxyPort,
   "script-path": singleWorkerScriptPath,
   binding: bindings = [],
   kv: kvs = [],
   do: durableObjects = [],
+  r2: r2s = [],
   "live-reload": liveReload,
   "local-protocol": localProtocol,
   "experimental-enable-local-persistence": experimentalEnableLocalPersistence,
@@ -143743,7 +143916,7 @@ var Handler2 = async ({
     if (proxyPort === void 0)
       return void 0;
   } else {
-    directory = (0, import_node_path24.resolve)(directory);
+    directory = (0, import_node_path25.resolve)(directory);
   }
   let scriptReadyResolve;
   const scriptReadyPromise = new Promise(
@@ -143751,7 +143924,7 @@ var Handler2 = async ({
   );
   let scriptPath;
   if (usingFunctions) {
-    const outfile = (0, import_node_path24.join)((0, import_node_os9.tmpdir)(), `./functionsWorker-${Math.random()}.js`);
+    const outfile = (0, import_node_path25.join)((0, import_node_os9.tmpdir)(), `./functionsWorker-${Math.random()}.js`);
     scriptPath = outfile;
     if (nodeCompat) {
       console.warn(
@@ -143789,17 +143962,37 @@ var Handler2 = async ({
     });
   } else {
     scriptReadyResolve();
-    scriptPath = directory !== void 0 ? (0, import_node_path24.join)(directory, singleWorkerScriptPath) : singleWorkerScriptPath;
+    scriptPath = directory !== void 0 ? (0, import_node_path25.join)(directory, singleWorkerScriptPath) : singleWorkerScriptPath;
     if (!(0, import_node_fs11.existsSync)(scriptPath)) {
       logger.log("No functions. Shimming...");
-      scriptPath = (0, import_node_path24.resolve)(__dirname, "../templates/pages-shim.ts");
+      scriptPath = (0, import_node_path25.resolve)(__dirname, "../templates/pages-shim.ts");
+    } else {
+      const runBuild = async () => {
+        try {
+          await (0, import_esbuild6.build)({
+            entryPoints: [scriptPath],
+            write: false,
+            plugins: [blockWorkerJsImports]
+          });
+        } catch {
+        }
+      };
+      await runBuild();
+      (0, import_chokidar3.watch)([scriptPath], {
+        persistent: true,
+        ignoreInitial: true
+      }).on("all", async () => {
+        await runBuild();
+      });
     }
   }
   await scriptReadyPromise;
   const { stop, waitUntilExit } = await unstable_dev(
     scriptPath,
     {
+      ip,
       port,
+      inspectorPort,
       watch: true,
       localProtocol,
       liveReload,
@@ -143813,11 +144006,22 @@ var Handler2 = async ({
         id: ""
       })),
       durableObjects: durableObjects.map((durableObject) => {
-        const [name, class_name] = durableObject.toString().split("=");
+        const { binding, className, scriptName } = DURABLE_OBJECTS_BINDING_REGEXP.exec(durableObject.toString())?.groups || {};
+        if (!binding || !className) {
+          logger.warn(
+            "Could not parse Durable Object binding:",
+            durableObject.toString()
+          );
+          return;
+        }
         return {
-          name,
-          class_name
+          name: binding,
+          class_name: className,
+          script_name: scriptName
         };
+      }).filter(Boolean),
+      r2: r2s.map((binding) => {
+        return { binding: binding.toString(), bucket_name: "" };
       }),
       enablePagesAssetsServiceBinding: {
         proxyPort,
@@ -143950,13 +144154,25 @@ async function spawnProxyProcess({
   }
   return port;
 }
+var blockWorkerJsImports = {
+  name: "block-worker-js-imports",
+  setup(build6) {
+    build6.onResolve({ filter: /.*/g }, (_args) => {
+      logger.error(
+        `_worker.js is importing from another file. This will throw an error if deployed.
+You should bundle your Worker or remove the import if it is unused.`
+      );
+      return null;
+    });
+  }
+};
 
 // src/pages/publish.tsx
 init_import_meta_url();
 var import_node_child_process6 = require("node:child_process");
 var import_node_fs12 = require("node:fs");
 var import_node_os10 = require("node:os");
-var import_node_path26 = require("node:path");
+var import_node_path27 = require("node:path");
 var import_node_process7 = require("node:process");
 var import_ink9 = __toESM(require_build2());
 var import_ink_select_input4 = __toESM(require_build3());
@@ -143966,7 +144182,7 @@ var import_undici9 = __toESM(require_undici());
 // src/pages/upload.tsx
 init_import_meta_url();
 var import_promises11 = require("node:fs/promises");
-var import_node_path25 = require("node:path");
+var import_node_path26 = require("node:path");
 var import_blake3_wasm = require("blake3-wasm");
 var import_ink8 = __toESM(require_build2());
 var import_ink_spinner = __toESM(require_build5());
@@ -144513,7 +144729,7 @@ var Handler3 = async ({
     jwt: process.env.CF_PAGES_UPLOAD_JWT
   });
   if (outputManifestPath) {
-    await (0, import_promises11.mkdir)((0, import_node_path25.dirname)(outputManifestPath), { recursive: true });
+    await (0, import_promises11.mkdir)((0, import_node_path26.dirname)(outputManifestPath), { recursive: true });
     await (0, import_promises11.writeFile)(outputManifestPath, JSON.stringify(manifest));
   }
   logger.log(`\u2728 Upload complete!`);
@@ -144532,16 +144748,17 @@ var upload = async (args) => {
     "_worker.js",
     "_redirects",
     "_headers",
+    "_routes.json",
     ".DS_Store",
     "node_modules",
     ".git"
   ];
-  const directory = (0, import_node_path25.resolve)(args.directory);
+  const directory = (0, import_node_path26.resolve)(args.directory);
   const walk = async (dir, fileMap2 = /* @__PURE__ */ new Map(), startingDir = dir) => {
     const files2 = await (0, import_promises11.readdir)(dir);
     await Promise.all(
       files2.map(async (file) => {
-        const filepath = (0, import_node_path25.join)(dir, file);
+        const filepath = (0, import_node_path26.join)(dir, file);
         const filestat = await (0, import_promises11.stat)(filepath);
         if (IGNORE_LIST.includes(file)) {
           return;
@@ -144552,10 +144769,10 @@ var upload = async (args) => {
         if (filestat.isDirectory()) {
           fileMap2 = await walk(filepath, fileMap2, startingDir);
         } else {
-          const name = (0, import_node_path25.relative)(startingDir, filepath).split(import_node_path25.sep).join("/");
+          const name = (0, import_node_path26.relative)(startingDir, filepath).split(import_node_path26.sep).join("/");
           const fileContent = await (0, import_promises11.readFile)(filepath);
           const base64Content = fileContent.toString("base64");
-          const extension = (0, import_node_path25.extname)((0, import_node_path25.basename)(name)).substring(1);
+          const extension = (0, import_node_path26.extname)((0, import_node_path26.basename)(name)).substring(1);
           if (filestat.size > 25 * 1024 * 1024) {
             throw new FatalError(
               `Error: Pages only supports files up to ${prettyBytes(
@@ -144945,15 +145162,17 @@ To silence this warning, pass in --commit-dirty=true`
     }
   }
   let builtFunctions = void 0;
-  const functionsDirectory = (0, import_node_path26.join)((0, import_node_process7.cwd)(), "functions");
+  const functionsDirectory = (0, import_node_path27.join)((0, import_node_process7.cwd)(), "functions");
+  const routesOutputPath = (0, import_node_path27.join)((0, import_node_os10.tmpdir)(), `_routes-${Math.random()}.json`);
   if ((0, import_node_fs12.existsSync)(functionsDirectory)) {
-    const outfile = (0, import_node_path26.join)((0, import_node_os10.tmpdir)(), `./functionsWorker-${Math.random()}.js`);
+    const outfile = (0, import_node_path27.join)((0, import_node_os10.tmpdir)(), `./functionsWorker-${Math.random()}.js`);
     await new Promise(
       (resolve13) => buildFunctions({
         outfile,
         functionsDirectory,
         onEnd: () => resolve13(null),
-        buildOutputDirectory: (0, import_node_path26.dirname)(outfile)
+        buildOutputDirectory: (0, import_node_path27.dirname)(outfile),
+        routesOutputPath
       })
     );
     builtFunctions = (0, import_node_fs12.readFileSync)(outfile, "utf-8");
@@ -144973,17 +145192,21 @@ To silence this warning, pass in --commit-dirty=true`
   if (commitDirty !== void 0) {
     formData.append("commit_dirty", commitDirty);
   }
-  let _headers, _redirects, _workerJS;
+  let _headers, _redirects, _routes, _workerJS;
   try {
-    _headers = (0, import_node_fs12.readFileSync)((0, import_node_path26.join)(directory, "_headers"), "utf-8");
+    _headers = (0, import_node_fs12.readFileSync)((0, import_node_path27.join)(directory, "_headers"), "utf-8");
   } catch {
   }
   try {
-    _redirects = (0, import_node_fs12.readFileSync)((0, import_node_path26.join)(directory, "_redirects"), "utf-8");
+    _redirects = (0, import_node_fs12.readFileSync)((0, import_node_path27.join)(directory, "_redirects"), "utf-8");
   } catch {
   }
   try {
-    _workerJS = (0, import_node_fs12.readFileSync)((0, import_node_path26.join)(directory, "_worker.js"), "utf-8");
+    _routes = (0, import_node_fs12.readFileSync)(routesOutputPath, "utf-8");
+  } catch {
+  }
+  try {
+    _workerJS = (0, import_node_fs12.readFileSync)((0, import_node_path27.join)(directory, "_worker.js"), "utf-8");
   } catch {
   }
   if (_headers) {
@@ -144992,10 +145215,32 @@ To silence this warning, pass in --commit-dirty=true`
   if (_redirects) {
     formData.append("_redirects", new import_undici9.File([_redirects], "_redirects"));
   }
+  if (_routes) {
+    formData.append("_routes.json", new import_undici9.File([_routes], "_routes.json"));
+  }
   if (builtFunctions) {
     formData.append("_worker.js", new import_undici9.File([builtFunctions], "_worker.js"));
   } else if (_workerJS) {
     formData.append("_worker.js", new import_undici9.File([_workerJS], "_worker.js"));
+    try {
+      const routesPath = (0, import_node_path27.join)(directory, "_routes.json");
+      const advancedModeRoutesString = (0, import_node_fs12.readFileSync)(routesPath, "utf-8");
+      const advancedModeRoutes = JSON.parse(advancedModeRoutesString);
+      if (!isRoutesJSONSpec(advancedModeRoutes)) {
+        throw new FatalError(
+          "Invalid _routes.json file found at:" + routesPath,
+          1
+        );
+      }
+      _routes = JSON.stringify(optimizeRoutesJSONSpec(advancedModeRoutes));
+      logger.warn(
+        `\u{1F6A8} _routes.json is an experimental feature and is subject to change. Don't use unless you really must!`
+      );
+    } catch (e2) {
+      if (e2 instanceof FatalError) {
+        throw e2;
+      }
+    }
   }
   const deploymentResponse = await fetchResult(
     `/accounts/${accountId}/pages/projects/${projectName}/deployments`,
@@ -145105,7 +145350,7 @@ function previewHandler() {
 init_import_meta_url();
 var import_node_assert9 = __toESM(require("node:assert"));
 var import_node_fs13 = require("node:fs");
-var import_node_path27 = __toESM(require("node:path"));
+var import_node_path28 = __toESM(require("node:path"));
 var import_node_url11 = require("node:url");
 var import_tmp_promise3 = __toESM(require_tmp_promise());
 
@@ -145338,7 +145583,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
   );
   if (props.outDir) {
     (0, import_node_fs13.mkdirSync)(props.outDir, { recursive: true });
-    const readmePath = import_node_path27.default.join(props.outDir, "README.md");
+    const readmePath = import_node_path28.default.join(props.outDir, "README.md");
     (0, import_node_fs13.writeFileSync)(
       readmePath,
       `This folder contains the built output assets for the worker "${scriptName}" generated at ${new Date().toISOString()}.`
@@ -145377,7 +145622,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       const destinationDir = typeof destination === "string" ? destination : destination.path;
       (0, import_node_fs13.mkdirSync)(destinationDir, { recursive: true });
       (0, import_node_fs13.writeFileSync)(
-        import_node_path27.default.join(destinationDir, import_node_path27.default.basename(props.entry.file)),
+        import_node_path28.default.join(destinationDir, import_node_path28.default.basename(props.entry.file)),
         (0, import_node_fs13.readFileSync)(props.entry.file, "utf-8")
       );
     }
@@ -145458,7 +145703,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
     const worker = {
       name: scriptName,
       main: {
-        name: import_node_path27.default.basename(resolvedEntryPointPath),
+        name: import_node_path28.default.basename(resolvedEntryPointPath),
         content,
         type: bundleType
       },
@@ -145470,7 +145715,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       usage_model: config.usage_model
     };
     void printBundleSize(
-      { name: import_node_path27.default.basename(resolvedEntryPointPath), content },
+      { name: import_node_path28.default.basename(resolvedEntryPointPath), content },
       modules
     );
     const withoutStaticAssets = {
@@ -146376,6 +146621,12 @@ async function putR2Object(accountId, bucketName, objectName, object, options) {
     }
   );
 }
+async function deleteR2Object(accountId, bucketName, objectName) {
+  await fetchR2Objects(
+    `/accounts/${accountId}/r2/buckets/${bucketName}/objects/${objectName}`,
+    { method: "DELETE" }
+  );
+}
 
 // src/tail/index.ts
 init_import_meta_url();
@@ -146468,7 +146719,7 @@ function prettyPrintLogs(data) {
     ).toLocaleString();
     const outcome = prettifyOutcome(eventMessage.outcome);
     logger.log(`"${cronPattern}" @ ${datetime} - ${outcome}`);
-  } else {
+  } else if (isRequestEvent(eventMessage.event)) {
     const requestMethod = eventMessage.event?.request.method.toUpperCase();
     const url3 = eventMessage.event?.request.url;
     const outcome = prettifyOutcome(eventMessage.outcome);
@@ -146476,6 +146727,16 @@ function prettyPrintLogs(data) {
     logger.log(
       url3 ? `${requestMethod} ${url3} - ${outcome} @ ${datetime}` : `[missing request] - ${outcome} @ ${datetime}`
     );
+  } else if (isAlarmEvent(eventMessage.event)) {
+    const outcome = prettifyOutcome(eventMessage.outcome);
+    const datetime = new Date(
+      eventMessage.event.scheduledTime
+    ).toLocaleString();
+    logger.log(`Alarm @ ${datetime} - ${outcome}`);
+  } else {
+    const outcome = prettifyOutcome(eventMessage.outcome);
+    const datetime = new Date(eventMessage.eventTimestamp).toLocaleString();
+    logger.log(`Unknown Event - ${outcome} @ ${datetime}`);
   }
   if (eventMessage.logs.length > 0) {
     eventMessage.logs.forEach(({ level, message }) => {
@@ -146491,9 +146752,15 @@ function prettyPrintLogs(data) {
 function jsonPrintLogs(data) {
   console.log(JSON.stringify(JSON.parse(data.toString()), null, 2));
 }
+function isRequestEvent(event) {
+  return Boolean(event && "request" in event);
+}
 function isScheduledEvent(event) {
   return Boolean(event && "cron" in event);
 }
+function isAlarmEvent(event) {
+  return Boolean(event && "scheduledTime" in event && !("cron" in event));
+}
 function prettifyOutcome(outcome) {
   switch (outcome) {
     case "ok":
@@ -147097,7 +147364,7 @@ function createCLIParser(argv) {
     },
     async (args) => {
       await printWranglerBanner();
-      const configPath = args.config || args.script && findWranglerToml(import_node_path28.default.dirname(args.script));
+      const configPath = args.config || args.script && findWranglerToml(import_node_path29.default.dirname(args.script));
       const config = readConfig(configPath, args);
       const entry = await getEntry(args, config, "publish");
       await sendMetricsEvent(
@@ -148066,8 +148333,8 @@ Expected an array of strings.
       return r2ObjectYargs.command(
         "get <objectPath>",
         "Fetch an object from an R2 bucket",
-        (yargs) => {
-          return yargs.positional("objectPath", {
+        (Objectyargs) => {
+          return Objectyargs.positional("objectPath", {
             describe: "The source object path in the form of {bucket}/{key}",
             type: "string"
           }).option("file", {
@@ -148083,12 +148350,15 @@ Expected an array of strings.
             type: "boolean"
           });
         },
-        async (args) => {
-          const config = readConfig(args.config, args);
+        async (objectGetYargs) => {
+          const config = readConfig(
+            objectGetYargs.config,
+            objectGetYargs
+          );
           const accountId = await requireAuth(config);
-          const { objectPath, pipe } = args;
+          const { objectPath, pipe } = objectGetYargs;
           const { bucket, key: key2 } = bucketAndKeyFromObjectPath(objectPath);
-          let file = args.file;
+          let file = objectGetYargs.file;
           if (!file && !pipe) {
             file = key2;
           }
@@ -148109,8 +148379,8 @@ Expected an array of strings.
       ).command(
         "put <objectPath>",
         "Create an object in an R2 bucket",
-        (yargs) => {
-          return yargs.positional("objectPath", {
+        (Objectyargs) => {
+          return Objectyargs.positional("objectPath", {
             describe: "The destination object path in the form of {bucket}/{key}",
             type: "string"
           }).option("file", {
@@ -148156,11 +148426,14 @@ Expected an array of strings.
             type: "string"
           });
         },
-        async (args) => {
+        async (objectPutYargs) => {
           await printWranglerBanner();
-          const config = readConfig(args.config, args);
+          const config = readConfig(
+            objectPutYargs.config,
+            objectPutYargs
+          );
           const accountId = await requireAuth(config);
-          const { objectPath, file, pipe, ...options } = args;
+          const { objectPath, file, pipe, ...options } = objectPutYargs;
           const { bucket, key: key2 } = bucketAndKeyFromObjectPath(objectPath);
           if (!file && !pipe) {
             throw new CommandLineArgsError(
@@ -148197,6 +148470,25 @@ Expected an array of strings.
           });
           logger.log("Upload complete.");
         }
+      ).command(
+        "delete <objectPath>",
+        "Delete an object in an R2 bucket",
+        (objectDeleteYargs) => {
+          return objectDeleteYargs.positional("objectPath", {
+            describe: "The destination object path in the form of {bucket}/{key}",
+            type: "string"
+          });
+        },
+        async (args) => {
+          const { objectPath } = args;
+          await printWranglerBanner();
+          const config = readConfig(args.config, args);
+          const accountId = await requireAuth(config);
+          const { bucket, key: key2 } = bucketAndKeyFromObjectPath(objectPath);
+          logger.log(`Deleting object "${key2}" from bucket "${bucket}".`);
+          await deleteR2Object(accountId, bucket, key2);
+          logger.log("Delete complete.");
+        }
       );
     }).command("bucket", "Manage R2 buckets", (r2BucketYargs) => {
       r2BucketYargs.command(
@@ -148449,9 +148741,9 @@ function devOptions(yargs) {
     type: "boolean",
     default: true
   }).option("ip", {
-    describe: "IP address to listen on, defaults to `localhost`",
+    describe: "IP address to listen on",
     type: "string",
-    requiresArg: true
+    default: "0.0.0.0"
   }).option("port", {
     describe: "Port to listen on",
     type: "number"
@@ -148559,7 +148851,7 @@ async function startDev(args) {
       logger.loggerLevel = args.logLevel === "none" ? "error" : args.logLevel;
     }
     await printWranglerBanner();
-    const configPath = args.config || args.script && findWranglerToml(import_node_path29.default.dirname(args.script));
+    const configPath = args.config || args.script && findWranglerToml(import_node_path30.default.dirname(args.script));
     let config = readConfig(configPath, args);
     if (config.configPath) {
       watcher = (0, import_chokidar4.watch)(config.configPath, {
@@ -148567,7 +148859,7 @@ async function startDev(args) {
       }).on("change", async (_event) => {
         config = readConfig(configPath, args);
         if (config.configPath) {
-          logger.log(`${import_node_path29.default.basename(config.configPath)} changed...`);
+          logger.log(`${import_node_path30.default.basename(config.configPath)} changed...`);
           rerender(await getDevReactElement(config));
         }
       });
@@ -148657,7 +148949,8 @@ async function startDev(args) {
       const bindings = await getBindings(configParam, {
         kv: args.kv,
         vars: args.vars,
-        durableObjects: args.durableObjects
+        durableObjects: args.durableObjects,
+        r2: args.r2
       });
       const maskedVars = { ...bindings.vars };
       for (const key2 of Object.keys(maskedVars)) {
@@ -148703,7 +148996,7 @@ async function startDev(args) {
         assetsConfig: config.assets,
         port: args.port || config.dev.port || await getLocalPort(),
         ip: args.ip || config.dev.ip,
-        inspectorPort: args["inspector-port"] || config.dev.inspector_port || await getInspectorPort(),
+        inspectorPort: args.inspectorPort || config.dev.inspector_port || await getInspectorPort(),
         isWorkersSite: Boolean(args.site || config.site),
         compatibilityDate: getDevCompatibilityDate(
           config,
@@ -148780,19 +149073,22 @@ async function getBindings(configParam, args) {
         ...args.durableObjects || []
       ]
     },
-    r2_buckets: configParam.r2_buckets?.map(
-      ({ binding, preview_bucket_name, bucket_name: _bucket_name }) => {
-        if (!preview_bucket_name) {
-          throw new Error(
-            `In development, you should use a separate r2 bucket than the one you'd use in production. Please create a new r2 bucket with "wrangler r2 bucket create <name>" and add its name as preview_bucket_name to the r2_buckets "${binding}" in your wrangler.toml`
-          );
+    r2_buckets: [
+      ...configParam.r2_buckets?.map(
+        ({ binding, preview_bucket_name, bucket_name: _bucket_name }) => {
+          if (!preview_bucket_name) {
+            throw new Error(
+              `In development, you should use a separate r2 bucket than the one you'd use in production. Please create a new r2 bucket with "wrangler r2 bucket create <name>" and add its name as preview_bucket_name to the r2_buckets "${binding}" in your wrangler.toml`
+            );
+          }
+          return {
+            binding,
+            bucket_name: preview_bucket_name
+          };
         }
-        return {
-          binding,
-          bucket_name: preview_bucket_name
-        };
-      }
-    ),
+      ) || [],
+      ...args.r2 || []
+    ],
     worker_namespaces: configParam.worker_namespaces,
     services: configParam.services,
     unsafe: configParam.unsafe?.bindings,