wrangler 0.0.0-e98613f8 → 0.0.0-e9a45766c

package/miniflare-dist/index.mjs

@@ -128,23 +128,45 @@ var init_environment_polyfills = __esm({
   }
 });
 
+// ../pages-shared/environment-polyfills/miniflare-tre.ts
+var miniflare_tre_exports = {};
+__export(miniflare_tre_exports, {
+  default: () => miniflare_tre_default
+});
+var miniflare_tre_default;
+var init_miniflare_tre = __esm({
+  "../pages-shared/environment-polyfills/miniflare-tre.ts"() {
+    init_environment_polyfills();
+    miniflare_tre_default = async () => {
+      const mf = await import("@miniflare/tre");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
+  }
+});
+
 // ../pages-shared/environment-polyfills/miniflare.ts
 var miniflare_exports = {};
-import {
-  fetch as miniflareFetch,
-  Headers as MiniflareHeaders,
-  Request as MiniflareRequest,
-  Response as MiniflareResponse
-} from "@miniflare/core";
+__export(miniflare_exports, {
+  default: () => miniflare_default
+});
+var miniflare_default;
 var init_miniflare = __esm({
   "../pages-shared/environment-polyfills/miniflare.ts"() {
     init_environment_polyfills();
-    polyfill({
-      fetch: miniflareFetch,
-      Headers: MiniflareHeaders,
-      Request: MiniflareRequest,
-      Response: MiniflareResponse
-    });
+    miniflare_default = async () => {
+      const mf = await import("@miniflare/core");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
   }
 });
 
@@ -157,6 +179,9 @@ function mergeHeaders(base, extra) {
     ...Object.fromEntries(extra.entries())
   });
 }
+function stripLeadingDoubleSlashes(location) {
+  return location.replace(/^(\/|%2F|%2f|%5C|%5c|%09|\s|\\)+(.*)/, "/$2");
+}
 var OkResponse, MovedPermanentlyResponse, FoundResponse, NotModifiedResponse, PermanentRedirectResponse, NotFoundResponse, MethodNotAllowedResponse, NotAcceptableResponse, InternalServerErrorResponse, SeeOtherResponse, TemporaryRedirectResponse;
 var init_responses = __esm({
   "../pages-shared/asset-server/responses.ts"() {
@@ -170,7 +195,12 @@ var init_responses = __esm({
       }
     };
     MovedPermanentlyResponse = class extends Response {
-      constructor(location, init) {
+      constructor(location, init, {
+        preventLeadingDoubleSlash = true
+      } = {
+        preventLeadingDoubleSlash: true
+      }) {
+        location = preventLeadingDoubleSlash ? stripLeadingDoubleSlashes(location) : location;
         super(`Redirecting to ${location}`, {
           ...init,
           status: 301,
@@ -182,7 +212,12 @@ var init_responses = __esm({
       }
     };
     FoundResponse = class extends Response {
-      constructor(location, init) {
+      constructor(location, init, {
+        preventLeadingDoubleSlash = true
+      } = {
+        preventLeadingDoubleSlash: true
+      }) {
+        location = preventLeadingDoubleSlash ? stripLeadingDoubleSlashes(location) : location;
         super(`Redirecting to ${location}`, {
           ...init,
           status: 302,
@@ -202,7 +237,12 @@ var init_responses = __esm({
       }
     };
     PermanentRedirectResponse = class extends Response {
-      constructor(location, init) {
+      constructor(location, init, {
+        preventLeadingDoubleSlash = true
+      } = {
+        preventLeadingDoubleSlash: true
+      }) {
+        location = preventLeadingDoubleSlash ? stripLeadingDoubleSlashes(location) : location;
         super(void 0, {
           ...init,
           status: 308,
@@ -256,7 +296,12 @@ ${err.stack}`;
       }
     };
     SeeOtherResponse = class extends Response {
-      constructor(location, init) {
+      constructor(location, init, {
+        preventLeadingDoubleSlash = true
+      } = {
+        preventLeadingDoubleSlash: true
+      }) {
+        location = preventLeadingDoubleSlash ? stripLeadingDoubleSlashes(location) : location;
         super(`Redirecting to ${location}`, {
           ...init,
           status: 303,
@@ -266,7 +311,12 @@ ${err.stack}`;
       }
     };
     TemporaryRedirectResponse = class extends Response {
-      constructor(location, init) {
+      constructor(location, init, {
+        preventLeadingDoubleSlash = true
+      } = {
+        preventLeadingDoubleSlash: true
+      }) {
+        location = preventLeadingDoubleSlash ? stripLeadingDoubleSlashes(location) : location;
         super(`Redirecting to ${location}`, {
           ...init,
           status: 307,
@@ -409,21 +459,35 @@ async function generateHandler({
   async function generateResponse() {
     const match = staticRedirectsMatcher() || generateRedirectsMatcher()({ request })[0];
     if (match) {
-      const { status, to } = match;
-      const destination = new URL(to, request.url);
-      const location = destination.origin === new URL(request.url).origin ? `${destination.pathname}${destination.search || search}${destination.hash}` : `${destination.href}${destination.search ? "" : search}${destination.hash}`;
-      switch (status) {
-        case 301:
-          return new MovedPermanentlyResponse(location);
-        case 303:
-          return new SeeOtherResponse(location);
-        case 307:
-          return new TemporaryRedirectResponse(location);
-        case 308:
-          return new PermanentRedirectResponse(location);
-        case 302:
-        default:
-          return new FoundResponse(location);
+      if (match.status === 200) {
+        pathname = new URL(match.to, request.url).pathname;
+      } else {
+        const { status, to } = match;
+        const destination = new URL(to, request.url);
+        const location = destination.origin === new URL(request.url).origin ? `${destination.pathname}${destination.search || search}${destination.hash}` : `${destination.href}${destination.search ? "" : search}${destination.hash}`;
+        switch (status) {
+          case 301:
+            return new MovedPermanentlyResponse(location, void 0, {
+              preventLeadingDoubleSlash: false
+            });
+          case 303:
+            return new SeeOtherResponse(location, void 0, {
+              preventLeadingDoubleSlash: false
+            });
+          case 307:
+            return new TemporaryRedirectResponse(location, void 0, {
+              preventLeadingDoubleSlash: false
+            });
+          case 308:
+            return new PermanentRedirectResponse(location, void 0, {
+              preventLeadingDoubleSlash: false
+            });
+          case 302:
+          default:
+            return new FoundResponse(location, void 0, {
+              preventLeadingDoubleSlash: false
+            });
+        }
       }
     }
     if (!request.method.match(/^(get|head)$/i)) {
@@ -652,7 +716,7 @@ async function generateHandler({
         return new HTMLRewriter().on("body", {
           element(e) {
             e.append(
-              `<!-- Cloudflare Pages Analytics --><script defer src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon='{"token": "${metadata.analytics?.token}"}'><\/script><!-- Cloudflare Pages Analytics -->`,
+              `<!-- Cloudflare Pages Analytics --><script defer src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon='{"token": "${metadata.analytics?.token}"}'></script><!-- Cloudflare Pages Analytics -->`,
               { html: true }
             );
           }
@@ -740,23 +804,23 @@ var init_handler = __esm({
 });
 
 // src/miniflare-cli/index.ts
-import { fetch } from "@miniflare/core";
 import {
   DurableObjectNamespace,
   DurableObjectStub
 } from "@miniflare/durable-objects";
+import { upgradingFetch } from "@miniflare/web-sockets";
 import {
   Log as MiniflareLog,
   LogLevel as MiniflareLogLevel,
   Miniflare,
-  Request as MiniflareRequest3,
-  Response as MiniflareResponse3
+  Request as MiniflareRequest,
+  Response as MiniflareResponse
 } from "miniflare";
 
 // ../../node_modules/yargs/lib/platform-shims/esm.mjs
 import { notStrictEqual, strictEqual } from "assert";
 
-// ../../node_modules/cliui/build/lib/index.js
+// ../../node_modules/yargs/node_modules/cliui/build/lib/index.js
 var align = {
   right: alignRight,
   center: alignCenter
@@ -767,9 +831,9 @@ var bottom = 2;
 var left = 3;
 var UI = class {
   constructor(opts) {
-    var _a;
+    var _a2;
     this.width = opts.width;
-    this.wrap = (_a = opts.wrap) !== null && _a !== void 0 ? _a : true;
+    this.wrap = (_a2 = opts.wrap) !== null && _a2 !== void 0 ? _a2 : true;
     this.rows = [];
   }
   span(...args) {
@@ -1010,7 +1074,7 @@ function cliui(opts, _mixin) {
   });
 }
 
-// ../../node_modules/cliui/build/lib/string-utils.js
+// ../../node_modules/yargs/node_modules/cliui/build/lib/string-utils.js
 var ansi = new RegExp("\x1B(?:\\[(?:\\d+[ABCDEFGJKSTm]|\\d+;\\d+[Hfm]|\\d+;\\d+;\\d+m|6n|s|u|\\?25[lh])|\\w)", "g");
 function stripAnsi(str) {
   return str.replace(ansi, "");
@@ -1031,7 +1095,7 @@ function wrap(str, width) {
   return wrapped;
 }
 
-// ../../node_modules/cliui/index.mjs
+// ../../node_modules/yargs/node_modules/cliui/index.mjs
 function ui(opts) {
   return cliui(opts, {
     stringWidth: (str) => {
@@ -1322,9 +1386,9 @@ var YargsParser = class {
       let m;
       let next;
       let value;
-      if (arg !== "--" && isUnknownOptionAsArg(arg)) {
+      if (arg !== "--" && /^-/.test(arg) && isUnknownOptionAsArg(arg)) {
         pushPositional(arg);
-      } else if (truncatedArg.match(/---+(=|$)/)) {
+      } else if (truncatedArg.match(/^---+(=|$)/)) {
         pushPositional(arg);
         continue;
       } else if (arg.match(/^--.+=/) || !configuration["short-option-groups"] && arg.match(/^-.+=/)) {
@@ -2007,9 +2071,13 @@ function stripQuotes(val) {
 
 // ../../node_modules/yargs/node_modules/yargs-parser/build/lib/index.js
 import { readFileSync } from "fs";
+var _a;
+var _b;
+var _c;
 var minNodeVersion = process && process.env && process.env.YARGS_MIN_NODE_VERSION ? Number(process.env.YARGS_MIN_NODE_VERSION) : 12;
-if (process && process.version) {
-  const major = Number(process.version.match(/v([^.]+)/)[1]);
+var nodeVersion = (_b = (_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0 ? void 0 : _a.node) !== null && _b !== void 0 ? _b : (_c = process === null || process === void 0 ? void 0 : process.version) === null || _c === void 0 ? void 0 : _c.slice(1);
+if (nodeVersion) {
+  const major = Number(nodeVersion.match(/^([^.]+)/)[1]);
   if (major < minNodeVersion) {
     throw Error(`yargs parser supports a minimum Node.js version of ${minNodeVersion}. Read our version support policy: https://github.com/yargs/yargs-parser#supported-nodejs-versions`);
   }
@@ -2072,7 +2140,9 @@ var YError = class extends Error {
   constructor(msg) {
     super(msg || "yargs error");
     this.name = "YError";
-    Error.captureStackTrace(this, YError);
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, YError);
+    }
   }
 };
 
@@ -2272,7 +2342,7 @@ try {
 } catch (e) {
   __dirname = process.cwd();
 }
-var mainFilename = __dirname.split("node_modules")[0];
+var mainFilename = __dirname.substring(0, __dirname.lastIndexOf("node_modules"));
 var esm_default = {
   assert: {
     notStrictEqual,
@@ -2657,6 +2727,7 @@ var CommandInstance = class {
     const builder = commandHandler.builder;
     let innerYargs = yargs;
     if (isCommandBuilderCallback(builder)) {
+      yargs.getInternalMethods().getUsageInstance().freeze();
       const builderOutput = builder(yargs.getInternalMethods().reset(aliases), helpOrVersionSet);
       if (isPromise(builderOutput)) {
         return builderOutput.then((output) => {
@@ -2665,6 +2736,7 @@ var CommandInstance = class {
         });
       }
     } else if (isCommandBuilderOptionDefinitions(builder)) {
+      yargs.getInternalMethods().getUsageInstance().freeze();
       innerYargs = yargs.getInternalMethods().reset(aliases);
       Object.keys(commandHandler.builder).forEach((key) => {
         innerYargs.option(key, builder[key]);
@@ -2698,15 +2770,7 @@ var CommandInstance = class {
     pc.push(c);
     return `$0 ${pc.join(" ")}`;
   }
-  applyMiddlewareAndGetResult(isDefaultCommand, commandHandler, innerArgv, currentContext, helpOnly, aliases, yargs) {
-    let positionalMap = {};
-    if (helpOnly)
-      return innerArgv;
-    if (!yargs.getInternalMethods().getHasOutput()) {
-      positionalMap = this.populatePositionals(commandHandler, innerArgv, currentContext, yargs);
-    }
-    const middlewares = this.globalMiddleware.getMiddleware().slice(0).concat(commandHandler.middlewares);
-    innerArgv = applyMiddleware(innerArgv, yargs, middlewares, true);
+  handleValidationAndGetResult(isDefaultCommand, commandHandler, innerArgv, currentContext, aliases, yargs, middlewares, positionalMap) {
     if (!yargs.getInternalMethods().getHasOutput()) {
       const validation2 = yargs.getInternalMethods().runValidation(aliases, positionalMap, yargs.parsed.error, isDefaultCommand);
       innerArgv = maybeAsyncResult(innerArgv, (result) => {
@@ -2741,6 +2805,17 @@ var CommandInstance = class {
     }
     return innerArgv;
   }
+  applyMiddlewareAndGetResult(isDefaultCommand, commandHandler, innerArgv, currentContext, helpOnly, aliases, yargs) {
+    let positionalMap = {};
+    if (helpOnly)
+      return innerArgv;
+    if (!yargs.getInternalMethods().getHasOutput()) {
+      positionalMap = this.populatePositionals(commandHandler, innerArgv, currentContext, yargs);
+    }
+    const middlewares = this.globalMiddleware.getMiddleware().slice(0).concat(commandHandler.middlewares);
+    const maybePromiseArgv = applyMiddleware(innerArgv, yargs, middlewares, true);
+    return isPromise(maybePromiseArgv) ? maybePromiseArgv.then((resolvedInnerArgv) => this.handleValidationAndGetResult(isDefaultCommand, commandHandler, resolvedInnerArgv, currentContext, aliases, yargs, middlewares, positionalMap)) : this.handleValidationAndGetResult(isDefaultCommand, commandHandler, maybePromiseArgv, currentContext, aliases, yargs, middlewares, positionalMap);
+  }
   populatePositionals(commandHandler, argv, context, yargs) {
     argv._ = argv._.slice(context.commands.length);
     const demanded = commandHandler.demanded.slice(0);
@@ -2827,12 +2902,11 @@ var CommandInstance = class {
       Object.keys(positionalMap).forEach((key) => {
         positionalKeys.push(...parsed.aliases[key]);
       });
-      const defaults = yargs.getOptions().default;
       Object.keys(parsed.argv).forEach((key) => {
         if (positionalKeys.includes(key)) {
           if (!positionalMap[key])
             positionalMap[key] = parsed.argv[key];
-          if (!Object.hasOwnProperty.call(defaults, key) && Object.hasOwnProperty.call(argv, key) && Object.hasOwnProperty.call(parsed.argv, key) && (Array.isArray(argv[key]) || Array.isArray(parsed.argv[key]))) {
+          if (!this.isInConfigs(yargs, key) && !this.isDefaulted(yargs, key) && Object.prototype.hasOwnProperty.call(argv, key) && Object.prototype.hasOwnProperty.call(parsed.argv, key) && (Array.isArray(argv[key]) || Array.isArray(parsed.argv[key]))) {
             argv[key] = [].concat(argv[key], parsed.argv[key]);
           } else {
             argv[key] = parsed.argv[key];
@@ -2841,6 +2915,14 @@ var CommandInstance = class {
       });
     }
   }
+  isDefaulted(yargs, key) {
+    const { default: defaults } = yargs.getOptions();
+    return Object.prototype.hasOwnProperty.call(defaults, key) || Object.prototype.hasOwnProperty.call(defaults, this.shim.Parser.camelCase(key));
+  }
+  isInConfigs(yargs, key) {
+    const { configObjects } = yargs.getOptions();
+    return configObjects.some((c) => Object.prototype.hasOwnProperty.call(c, key)) || configObjects.some((c) => Object.prototype.hasOwnProperty.call(c, this.shim.Parser.camelCase(key)));
+  }
   runDefaultBuilderOn(yargs) {
     if (!this.defaultCommand)
       return;
@@ -3068,13 +3150,16 @@ function usage(yargs, shim3) {
     wrapSet = true;
     wrap2 = cols;
   };
-  function getWrap() {
+  self.getWrap = () => {
+    if (shim3.getEnv("YARGS_DISABLE_WRAP")) {
+      return null;
+    }
     if (!wrapSet) {
       wrap2 = windowWidth();
       wrapSet = true;
     }
     return wrap2;
-  }
+  };
   const deferY18nLookupPrefix = "__yargsString__:";
   self.deferY18nLookup = (str) => deferY18nLookupPrefix + str;
   self.help = function help() {
@@ -3098,7 +3183,7 @@ function usage(yargs, shim3) {
         acc[key] = true;
       return acc;
     }, {}));
-    const theWrap = getWrap();
+    const theWrap = self.getWrap();
     const ui2 = shim3.cliui({
       width: theWrap,
       wrap: !!theWrap
@@ -3238,7 +3323,8 @@ function usage(yargs, shim3) {
           padding: [0, 2, 0, 2 + getIndentation(kswitch)],
           width: maxWidth(switches, theWrap) + 4
         }, desc);
-        if (extra)
+        const shouldHideOptionExtras = yargs.getInternalMethods().getUsageConfiguration()["hide-types"] === true;
+        if (extra && !shouldHideOptionExtras)
           ui2.div({ text: extra, padding: [0, 0, 0, 2], align: "right" });
         else
           ui2.div();
@@ -3499,7 +3585,7 @@ var completionZshTemplate = `#compdef {{app_name}}
 # yargs command completion script
 #
 # Installation: {{app_path}} {{completion_command}} >> ~/.zshrc
-#    or {{app_path}} {{completion_command}} >> ~/.zsh_profile on OSX.
+#    or {{app_path}} {{completion_command}} >> ~/.zprofile on OSX.
 #
 _{{app_name}}_yargs_completions()
 {
@@ -3517,7 +3603,7 @@ compdef _{{app_name}}_yargs_completions {{app_name}}
 // ../../node_modules/yargs/build/lib/completion.js
 var Completion = class {
   constructor(yargs, usage2, command2, shim3) {
-    var _a, _b, _c;
+    var _a2, _b2, _c2;
     this.yargs = yargs;
     this.usage = usage2;
     this.command = command2;
@@ -3526,7 +3612,7 @@ var Completion = class {
     this.aliases = null;
     this.customCompletionFunction = null;
     this.indexAfterLastReset = 0;
-    this.zshShell = (_c = ((_a = this.shim.getEnv("SHELL")) === null || _a === void 0 ? void 0 : _a.includes("zsh")) || ((_b = this.shim.getEnv("ZSH_NAME")) === null || _b === void 0 ? void 0 : _b.includes("zsh"))) !== null && _c !== void 0 ? _c : false;
+    this.zshShell = (_c2 = ((_a2 = this.shim.getEnv("SHELL")) === null || _a2 === void 0 ? void 0 : _a2.includes("zsh")) || ((_b2 = this.shim.getEnv("ZSH_NAME")) === null || _b2 === void 0 ? void 0 : _b2.includes("zsh"))) !== null && _c2 !== void 0 ? _c2 : false;
   }
   defaultCompletion(args, argv, current, done) {
     const handlers = this.command.getCommandHandlers();
@@ -3571,7 +3657,7 @@ var Completion = class {
       Object.keys(options.key).forEach((key) => {
         const negable = !!options.configuration["boolean-negation"] && options.boolean.includes(key);
         const isPositionalKey = positionalKeys.includes(key);
-        if (!isPositionalKey && !options.hiddenOptions.includes(key) && !this.argsContainKey(args, argv, key, negable)) {
+        if (!isPositionalKey && !options.hiddenOptions.includes(key) && !this.argsContainKey(args, key, negable)) {
           this.completeOptionKey(key, completions, current);
           if (negable && !!options.default[key])
             this.completeOptionKey(`no-${key}`, completions, current);
@@ -3636,20 +3722,22 @@ var Completion = class {
     const choices = this.getPreviousArgChoices(args);
     return choices !== void 0 && choices.length > 0;
   }
-  argsContainKey(args, argv, key, negable) {
-    if (args.indexOf(`--${key}`) !== -1)
+  argsContainKey(args, key, negable) {
+    const argsContains = (s) => args.indexOf((/^[^0-9]$/.test(s) ? "-" : "--") + s) !== -1;
+    if (argsContains(key))
       return true;
-    if (negable && args.indexOf(`--no-${key}`) !== -1)
+    if (negable && argsContains(`no-${key}`))
       return true;
     if (this.aliases) {
       for (const alias of this.aliases[key]) {
-        if (argv[alias] !== void 0)
+        if (argsContains(alias))
           return true;
       }
     }
     return false;
   }
   completeOptionKey(key, completions, current) {
+    var _a2, _b2, _c2;
     const descs = this.usage.getDescriptions();
     const startsByTwoDashes = (s) => /^--/.test(s);
     const isShortOption = (s) => /^[^0-9]$/.test(s);
@@ -3657,8 +3745,13 @@ var Completion = class {
     if (!this.zshShell) {
       completions.push(dashes + key);
     } else {
-      const desc = descs[key] || "";
-      completions.push(dashes + `${key.replace(/:/g, "\\:")}:${desc.replace("__yargsString__:", "")}`);
+      const aliasKey = (_a2 = this === null || this === void 0 ? void 0 : this.aliases) === null || _a2 === void 0 ? void 0 : _a2[key].find((alias) => {
+        const desc2 = descs[alias];
+        return typeof desc2 === "string" && desc2.length > 0;
+      });
+      const descFromAlias = aliasKey ? descs[aliasKey] : void 0;
+      const desc = (_c2 = (_b2 = descs[key]) !== null && _b2 !== void 0 ? _b2 : descFromAlias) !== null && _c2 !== void 0 ? _c2 : "";
+      completions.push(dashes + `${key.replace(/:/g, "\\:")}:${desc.replace("__yargsString__:", "").replace(/(\r\n|\n|\r)/gm, " ")}`);
     }
   }
   customCompletion(args, argv, current, done) {
@@ -3803,7 +3896,7 @@ ${customMsgs.join("\n")}` : "";
     }
   };
   self.unknownArguments = function unknownArguments(argv, aliases, positionalMap, isDefaultCommand, checkPositionals = true) {
-    var _a;
+    var _a2;
     const commandKeys = yargs.getInternalMethods().getCommandInstance().getCommands();
     const unknown = [];
     const currentContext = yargs.getInternalMethods().getContext();
@@ -3821,7 +3914,7 @@ ${customMsgs.join("\n")}` : "";
     }
     if (checkPositionals) {
       const demandedCommands = yargs.getDemandedCommands();
-      const maxNonOptDemanded = ((_a = demandedCommands._) === null || _a === void 0 ? void 0 : _a.max) || 0;
+      const maxNonOptDemanded = ((_a2 = demandedCommands._) === null || _a2 === void 0 ? void 0 : _a2.max) || 0;
       const expected = currentContext.commands.length + maxNonOptDemanded;
       if (expected < argv._.length) {
         argv._.slice(expected).forEach((key) => {
@@ -4121,6 +4214,7 @@ var _YargsInstance_strict;
 var _YargsInstance_strictCommands;
 var _YargsInstance_strictOptions;
 var _YargsInstance_usage;
+var _YargsInstance_usageConfig;
 var _YargsInstance_versionOpt;
 var _YargsInstance_validation;
 function YargsFactory(_shim) {
@@ -4144,6 +4238,7 @@ var kEmitWarning = Symbol("emitWarning");
 var kFreeze = Symbol("freeze");
 var kGetDollarZero = Symbol("getDollarZero");
 var kGetParserConfiguration = Symbol("getParserConfiguration");
+var kGetUsageConfiguration = Symbol("getUsageConfiguration");
 var kGuessLocale = Symbol("guessLocale");
 var kGuessVersion = Symbol("guessVersion");
 var kParsePositionalNumbers = Symbol("parsePositionalNumbers");
@@ -4208,6 +4303,7 @@ var YargsInstance = class {
     _YargsInstance_strictCommands.set(this, false);
     _YargsInstance_strictOptions.set(this, false);
     _YargsInstance_usage.set(this, void 0);
+    _YargsInstance_usageConfig.set(this, {});
     _YargsInstance_versionOpt.set(this, null);
     _YargsInstance_validation.set(this, void 0);
     __classPrivateFieldSet(this, _YargsInstance_shim, shim3, "f");
@@ -4317,7 +4413,7 @@ var YargsInstance = class {
     __classPrivateFieldGet(this, _YargsInstance_options, "f").key[keys] = true;
     __classPrivateFieldGet(this, _YargsInstance_globalMiddleware, "f").addCoerceMiddleware((argv, yargs) => {
       let aliases;
-      const shouldCoerce = Object.hasOwnProperty.call(argv, keys);
+      const shouldCoerce = Object.prototype.hasOwnProperty.call(argv, keys);
       if (!shouldCoerce) {
         return argv;
       }
@@ -4528,12 +4624,12 @@ var YargsInstance = class {
   async getCompletion(args, done) {
     argsert("<array> [function]", [args, done], arguments.length);
     if (!done) {
-      return new Promise((resolve5, reject) => {
+      return new Promise((resolve6, reject) => {
         __classPrivateFieldGet(this, _YargsInstance_completion, "f").getCompletion(args, (err, completions) => {
           if (err)
             reject(err);
           else
-            resolve5(completions);
+            resolve6(completions);
         });
       });
     } else {
@@ -4632,7 +4728,7 @@ var YargsInstance = class {
   }
   locale(locale) {
     argsert("[string]", [locale], arguments.length);
-    if (!locale) {
+    if (locale === void 0) {
       this[kGuessLocale]();
       return __classPrivateFieldGet(this, _YargsInstance_shim, "f").y18n.getLocale();
     }
@@ -4754,7 +4850,10 @@ var YargsInstance = class {
         this.skipValidation(key);
       }
       const desc = opt.describe || opt.description || opt.desc;
-      this.describe(key, desc);
+      const descriptions = __classPrivateFieldGet(this, _YargsInstance_usage, "f").getDescriptions();
+      if (!Object.prototype.hasOwnProperty.call(descriptions, key) || typeof desc === "string") {
+        this.describe(key, desc);
+      }
       if (opt.hidden) {
         this.hide(key);
       }
@@ -4995,6 +5094,11 @@ var YargsInstance = class {
       return this;
     }
   }
+  usageConfiguration(config) {
+    argsert("<object>", [config], arguments.length);
+    __classPrivateFieldSet(this, _YargsInstance_usageConfig, config, "f");
+    return this;
+  }
   version(opt, msg, ver) {
     const defaultVersionOpt = "version";
     argsert("[boolean|string] [string] [string]", [opt, msg, ver], arguments.length);
@@ -5028,7 +5132,7 @@ var YargsInstance = class {
     __classPrivateFieldGet(this, _YargsInstance_usage, "f").wrap(cols);
     return this;
   }
-  [(_YargsInstance_command = /* @__PURE__ */ new WeakMap(), _YargsInstance_cwd = /* @__PURE__ */ new WeakMap(), _YargsInstance_context = /* @__PURE__ */ new WeakMap(), _YargsInstance_completion = /* @__PURE__ */ new WeakMap(), _YargsInstance_completionCommand = /* @__PURE__ */ new WeakMap(), _YargsInstance_defaultShowHiddenOpt = /* @__PURE__ */ new WeakMap(), _YargsInstance_exitError = /* @__PURE__ */ new WeakMap(), _YargsInstance_detectLocale = /* @__PURE__ */ new WeakMap(), _YargsInstance_emittedWarnings = /* @__PURE__ */ new WeakMap(), _YargsInstance_exitProcess = /* @__PURE__ */ new WeakMap(), _YargsInstance_frozens = /* @__PURE__ */ new WeakMap(), _YargsInstance_globalMiddleware = /* @__PURE__ */ new WeakMap(), _YargsInstance_groups = /* @__PURE__ */ new WeakMap(), _YargsInstance_hasOutput = /* @__PURE__ */ new WeakMap(), _YargsInstance_helpOpt = /* @__PURE__ */ new WeakMap(), _YargsInstance_isGlobalContext = /* @__PURE__ */ new WeakMap(), _YargsInstance_logger = /* @__PURE__ */ new WeakMap(), _YargsInstance_output = /* @__PURE__ */ new WeakMap(), _YargsInstance_options = /* @__PURE__ */ new WeakMap(), _YargsInstance_parentRequire = /* @__PURE__ */ new WeakMap(), _YargsInstance_parserConfig = /* @__PURE__ */ new WeakMap(), _YargsInstance_parseFn = /* @__PURE__ */ new WeakMap(), _YargsInstance_parseContext = /* @__PURE__ */ new WeakMap(), _YargsInstance_pkgs = /* @__PURE__ */ new WeakMap(), _YargsInstance_preservedGroups = /* @__PURE__ */ new WeakMap(), _YargsInstance_processArgs = /* @__PURE__ */ new WeakMap(), _YargsInstance_recommendCommands = /* @__PURE__ */ new WeakMap(), _YargsInstance_shim = /* @__PURE__ */ new WeakMap(), _YargsInstance_strict = /* @__PURE__ */ new WeakMap(), _YargsInstance_strictCommands = /* @__PURE__ */ new WeakMap(), _YargsInstance_strictOptions = /* @__PURE__ */ new WeakMap(), _YargsInstance_usage = /* @__PURE__ */ new WeakMap(), _YargsInstance_versionOpt = /* @__PURE__ */ new WeakMap(), _YargsInstance_validation = /* @__PURE__ */ new WeakMap(), kCopyDoubleDash)](argv) {
+  [(_YargsInstance_command = /* @__PURE__ */ new WeakMap(), _YargsInstance_cwd = /* @__PURE__ */ new WeakMap(), _YargsInstance_context = /* @__PURE__ */ new WeakMap(), _YargsInstance_completion = /* @__PURE__ */ new WeakMap(), _YargsInstance_completionCommand = /* @__PURE__ */ new WeakMap(), _YargsInstance_defaultShowHiddenOpt = /* @__PURE__ */ new WeakMap(), _YargsInstance_exitError = /* @__PURE__ */ new WeakMap(), _YargsInstance_detectLocale = /* @__PURE__ */ new WeakMap(), _YargsInstance_emittedWarnings = /* @__PURE__ */ new WeakMap(), _YargsInstance_exitProcess = /* @__PURE__ */ new WeakMap(), _YargsInstance_frozens = /* @__PURE__ */ new WeakMap(), _YargsInstance_globalMiddleware = /* @__PURE__ */ new WeakMap(), _YargsInstance_groups = /* @__PURE__ */ new WeakMap(), _YargsInstance_hasOutput = /* @__PURE__ */ new WeakMap(), _YargsInstance_helpOpt = /* @__PURE__ */ new WeakMap(), _YargsInstance_isGlobalContext = /* @__PURE__ */ new WeakMap(), _YargsInstance_logger = /* @__PURE__ */ new WeakMap(), _YargsInstance_output = /* @__PURE__ */ new WeakMap(), _YargsInstance_options = /* @__PURE__ */ new WeakMap(), _YargsInstance_parentRequire = /* @__PURE__ */ new WeakMap(), _YargsInstance_parserConfig = /* @__PURE__ */ new WeakMap(), _YargsInstance_parseFn = /* @__PURE__ */ new WeakMap(), _YargsInstance_parseContext = /* @__PURE__ */ new WeakMap(), _YargsInstance_pkgs = /* @__PURE__ */ new WeakMap(), _YargsInstance_preservedGroups = /* @__PURE__ */ new WeakMap(), _YargsInstance_processArgs = /* @__PURE__ */ new WeakMap(), _YargsInstance_recommendCommands = /* @__PURE__ */ new WeakMap(), _YargsInstance_shim = /* @__PURE__ */ new WeakMap(), _YargsInstance_strict = /* @__PURE__ */ new WeakMap(), _YargsInstance_strictCommands = /* @__PURE__ */ new WeakMap(), _YargsInstance_strictOptions = /* @__PURE__ */ new WeakMap(), _YargsInstance_usage = /* @__PURE__ */ new WeakMap(), _YargsInstance_usageConfig = /* @__PURE__ */ new WeakMap(), _YargsInstance_versionOpt = /* @__PURE__ */ new WeakMap(), _YargsInstance_validation = /* @__PURE__ */ new WeakMap(), kCopyDoubleDash)](argv) {
     if (!argv._ || !argv["--"])
       return argv;
     argv._.push.apply(argv._, argv["--"]);
@@ -5120,6 +5224,9 @@ var YargsInstance = class {
   [kGetParserConfiguration]() {
     return __classPrivateFieldGet(this, _YargsInstance_parserConfig, "f");
   }
+  [kGetUsageConfiguration]() {
+    return __classPrivateFieldGet(this, _YargsInstance_usageConfig, "f");
+  }
   [kGuessLocale]() {
     if (!__classPrivateFieldGet(this, _YargsInstance_detectLocale, "f"))
       return;
@@ -5203,20 +5310,20 @@ var YargsInstance = class {
     return this;
   }
   [kUnfreeze]() {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a2, _b2, _c2, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const frozen = __classPrivateFieldGet(this, _YargsInstance_frozens, "f").pop();
     assertNotStrictEqual(frozen, void 0, __classPrivateFieldGet(this, _YargsInstance_shim, "f"));
     let configObjects;
-    _a = this, _b = this, _c = this, _d = this, _e = this, _f = this, _g = this, _h = this, _j = this, _k = this, _l = this, _m = this, {
+    _a2 = this, _b2 = this, _c2 = this, _d = this, _e = this, _f = this, _g = this, _h = this, _j = this, _k = this, _l = this, _m = this, {
       options: { set value(_o) {
-        __classPrivateFieldSet(_a, _YargsInstance_options, _o, "f");
+        __classPrivateFieldSet(_a2, _YargsInstance_options, _o, "f");
       } }.value,
       configObjects,
       exitProcess: { set value(_o) {
-        __classPrivateFieldSet(_b, _YargsInstance_exitProcess, _o, "f");
+        __classPrivateFieldSet(_b2, _YargsInstance_exitProcess, _o, "f");
       } }.value,
       groups: { set value(_o) {
-        __classPrivateFieldSet(_c, _YargsInstance_groups, _o, "f");
+        __classPrivateFieldSet(_c2, _YargsInstance_groups, _o, "f");
       } }.value,
       output: { set value(_o) {
         __classPrivateFieldSet(_d, _YargsInstance_output, _o, "f");
@@ -5267,6 +5374,7 @@ var YargsInstance = class {
       getLoggerInstance: this[kGetLoggerInstance].bind(this),
       getParseContext: this[kGetParseContext].bind(this),
       getParserConfiguration: this[kGetParserConfiguration].bind(this),
+      getUsageConfiguration: this[kGetUsageConfiguration].bind(this),
       getUsageInstance: this[kGetUsageInstance].bind(this),
       getValidationInstance: this[kGetValidationInstance].bind(this),
       hasParseCallback: this[kHasParseCallback].bind(this),
@@ -5570,13 +5678,13 @@ var FatalError = class extends Error {
 
 // src/miniflare-cli/assets.ts
 import { existsSync, lstatSync, readFileSync as readFileSync5 } from "node:fs";
-import { join } from "node:path";
+import { join, resolve as resolve5 } from "node:path";
 
 // ../pages-shared/metadata-generator/constants.ts
 var REDIRECTS_VERSION = 1;
 var HEADERS_VERSION = 2;
 var ANALYTICS_VERSION = 1;
-var PERMITTED_STATUS_CODES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+var PERMITTED_STATUS_CODES = /* @__PURE__ */ new Set([200, 301, 302, 303, 307, 308]);
 var HEADER_SEPARATOR = ":";
 var MAX_LINE_LENGTH = 2e3;
 var MAX_HEADER_RULES = 100;
@@ -5632,7 +5740,11 @@ function constructRedirects({
   for (const rule of redirects.rules) {
     if (!rule.from.match(SPLAT_REGEX) && !rule.from.match(PLACEHOLDER_REGEX)) {
       if (canCreateStaticRule) {
-        staticRedirects[rule.from] = { status: rule.status, to: rule.to };
+        staticRedirects[rule.from] = {
+          status: rule.status,
+          to: rule.to,
+          lineNumber: rule.lineNumber
+        };
         continue;
       } else {
         logger(
@@ -5743,6 +5855,10 @@ var validateUrl = (token, onlyRelative = false, includeSearch = false, includeHa
     onlyRelative ? "URLs should begin with a forward-slash." : 'URLs should either be relative (e.g. begin with a forward-slash), or use HTTPS (e.g. begin with "https://").'
   ];
 };
+function urlHasHost(token) {
+  const host = URL_REGEX.exec(token);
+  return Boolean(host && host.groups && host.groups.host);
+}
 
 // ../pages-shared/metadata-generator/parseHeaders.ts
 var LINE_IS_PROBABLY_A_PATH = new RegExp(/^([^\s]+:\/\/|^\/)/);
@@ -5951,7 +6067,15 @@ function parseRedirects(input) {
       invalid.push({
         line,
         lineNumber: i + 1,
-        message: `Valid status codes are 301, 302 (default), 303, 307, or 308. Got ${str_status}.`
+        message: `Valid status codes are 200, 301, 302 (default), 303, 307, or 308. Got ${str_status}.`
+      });
+      continue;
+    }
+    if (/\/\*?$/.test(from) && /\/index(.html)?$/.test(to) && !urlHasHost(to)) {
+      invalid.push({
+        line,
+        lineNumber: i + 1,
+        message: "Infinite loop detected in this rule and has been ignored. This will cause a redirect to strip `.html` or `/index` and end up triggering this rule again. Please fix or remove this rule to silence this warning."
       });
       continue;
     }
@@ -5964,6 +6088,16 @@ function parseRedirects(input) {
       continue;
     }
     seen_paths.add(from);
+    if (status === 200) {
+      if (urlHasHost(to)) {
+        invalid.push({
+          line,
+          lineNumber: i + 1,
+          message: `Proxy (200) redirects can only point to relative paths. Got ${to}`
+        });
+        continue;
+      }
+    }
     rules.push({ from, to, status, lineNumber: i + 1 });
   }
   return {
@@ -5974,14 +6108,9 @@ function parseRedirects(input) {
 
 // src/miniflare-cli/assets.ts
 var import_mime = __toESM(require_mime());
-import {
-  Response as MiniflareResponse2,
-  Request as MiniflareRequest2
-} from "@miniflare/core";
-import { upgradingFetch as miniflareFetch2 } from "@miniflare/web-sockets";
 import { watch } from "chokidar";
 
-// src/pages/hash.tsx
+// src/pages/hash.ts
 import { readFileSync as readFileSync4 } from "node:fs";
 import { extname as extname2 } from "node:path";
 import { hash as blake3hash } from "blake3-wasm";
@@ -5994,33 +6123,34 @@ var hashFile = (filepath) => {
 
 // src/miniflare-cli/assets.ts
 async function generateASSETSBinding(options) {
-  const assetsFetch = options.directory !== void 0 ? await generateAssetsFetch(options.directory, options.log) : invalidAssetsFetch;
+  const assetsFetch = options.directory !== void 0 ? await generateAssetsFetch(options.directory, options.log, options.tre) : invalidAssetsFetch;
+  const miniflare = options.tre ? await import("@miniflare/tre") : await import("@miniflare/core");
+  const Request = miniflare.Request;
+  const Response2 = miniflare.Response;
+  const fetch = options.tre ? miniflare.fetch : (await import("@miniflare/web-sockets")).upgradingFetch;
   return async function(miniflareRequest) {
     if (options.proxyPort) {
       try {
         const url = new URL(miniflareRequest.url);
         url.host = `localhost:${options.proxyPort}`;
-        const proxyRequest = new MiniflareRequest2(url, miniflareRequest);
+        const proxyRequest = new Request(url, miniflareRequest);
         if (proxyRequest.headers.get("Upgrade") === "websocket") {
           proxyRequest.headers.delete("Sec-WebSocket-Accept");
           proxyRequest.headers.delete("Sec-WebSocket-Key");
         }
-        return await miniflareFetch2(proxyRequest);
+        return await fetch(proxyRequest);
       } catch (thrown) {
         options.log.error(new Error(`Could not proxy request: ${thrown}`));
-        return new MiniflareResponse2(
-          `[wrangler] Could not proxy request: ${thrown}`,
-          {
-            status: 502
-          }
-        );
+        return new Response2(`[wrangler] Could not proxy request: ${thrown}`, {
+          status: 502
+        });
       }
     } else {
       try {
         return await assetsFetch(miniflareRequest);
       } catch (thrown) {
         options.log.error(new Error(`Could not serve static asset: ${thrown}`));
-        return new MiniflareResponse2(
+        return new Response2(
           `[wrangler] Could not serve static asset: ${thrown}`,
           { status: 502 }
         );
@@ -6028,8 +6158,12 @@ async function generateASSETSBinding(options) {
     }
   };
 }
-async function generateAssetsFetch(directory, log) {
-  await Promise.resolve().then(() => (init_miniflare(), miniflare_exports));
+async function generateAssetsFetch(directory, log, tre) {
+  directory = resolve5(directory);
+  const polyfill2 = tre ? (await Promise.resolve().then(() => (init_miniflare_tre(), miniflare_tre_exports))).default : (await Promise.resolve().then(() => (init_miniflare(), miniflare_exports))).default;
+  await polyfill2();
+  const miniflare = tre ? await import("@miniflare/tre") : await import("@miniflare/core");
+  const Request = miniflare.Request;
   const { generateHandler: generateHandler2, parseQualityWeightedList: parseQualityWeightedList2 } = await Promise.resolve().then(() => (init_handler(), handler_exports));
   const headersFile = join(directory, "_headers");
   const redirectsFile = join(directory, "_redirects");
@@ -6082,7 +6216,10 @@ async function generateAssetsFetch(directory, log) {
       xServerEnvHeader: "dev",
       logError: console.error,
       findAssetEntryForPath: async (path) => {
-        const filepath = join(directory, path);
+        const filepath = resolve5(join(directory, path));
+        if (!filepath.startsWith(directory)) {
+          return null;
+        }
         if (existsSync(filepath) && lstatSync(filepath).isFile() && !ignoredFiles.includes(filepath)) {
           const hash = hashFile(filepath);
           assetKeyEntryMap.set(hash, filepath);
@@ -6110,7 +6247,7 @@ async function generateAssetsFetch(directory, log) {
         const filepath = assetKeyEntryMap.get(assetKey);
         if (!filepath) {
           throw new Error(
-            "Could not fetch asset. Please file an issue on GitHub (https://github.com/cloudflare/wrangler2/issues/new/choose) with reproduction steps."
+            "Could not fetch asset. Please file an issue on GitHub (https://github.com/cloudflare/workers-sdk/issues/new/choose) with reproduction steps."
           );
         }
         const body = readFileSync5(filepath);
@@ -6123,7 +6260,7 @@ async function generateAssetsFetch(directory, log) {
     });
   };
   return async (input, init) => {
-    const request = new MiniflareRequest2(input, init);
+    const request = new Request(input, init);
     return await generateResponse(request);
   };
 }
@@ -6171,7 +6308,7 @@ async function main() {
   if (logLevelString === "LOG")
     logLevelString = "INFO";
   const logLevel = MiniflareLogLevel[logLevelString];
-  config.log = logLevel === MiniflareLogLevel.NONE ? new MiniflareNoOpLog() : new MiniflareLog(logLevel, config.logOptions);
+  config.log = logLevel === MiniflareLogLevel.NONE ? new MiniflareNoOpLog() : new MiniflareLog(logLevel);
   if (logLevel === MiniflareLogLevel.DEBUG) {
     console.log("MINIFLARE OPTIONS:\n", JSON.stringify(config, null, 2));
   }
@@ -6191,12 +6328,12 @@ async function main() {
         namespace.get = (id) => {
           const stub = new DurableObjectStub(factory, id);
           stub.fetch = (...reqArgs) => {
-            const requestFromArgs = new MiniflareRequest3(...reqArgs);
+            const requestFromArgs = new MiniflareRequest(...reqArgs);
             const url = new URL(requestFromArgs.url);
             url.host = host;
             if (port !== void 0)
               url.port = port.toString();
-            const request = new MiniflareRequest3(
+            const request = new MiniflareRequest(
               url.toString(),
               requestFromArgs
             );
@@ -6205,7 +6342,7 @@ async function main() {
               "x-miniflare-durable-object-id",
               id.toString()
             );
-            return fetch(request);
+            return upgradingFetch(request);
           };
           return stub;
         };
@@ -6229,7 +6366,8 @@ async function main() {
       const options = {
         log: config.log,
         proxyPort: opts.proxyPort,
-        directory: opts.directory
+        directory: opts.directory,
+        tre: false
       };
       config.serviceBindings = {
         ...config.serviceBindings,
@@ -6255,7 +6393,7 @@ async function main() {
 				}`,
         serviceBindings: {
           DO: async (request) => {
-            request = new MiniflareRequest3(request);
+            request = new MiniflareRequest(request);
             const name = request.headers.get("x-miniflare-durable-object-name");
             const idString = request.headers.get(
               "x-miniflare-durable-object-id"
@@ -6263,7 +6401,7 @@ async function main() {
             request.headers.delete("x-miniflare-durable-object-name");
             request.headers.delete("x-miniflare-durable-object-id");
             if (!name || !idString) {
-              return new MiniflareResponse3(
+              return new MiniflareResponse(
                 "[durable-object-proxy-err] Missing `x-miniflare-durable-object-name` or `x-miniflare-durable-object-id` headers.",
                 { status: 400 }
               );
@@ -6271,14 +6409,14 @@ async function main() {
             const namespace = await mf?.getDurableObjectNamespace(name);
             const id = namespace?.idFromString(idString);
             if (!id) {
-              return new MiniflareResponse3(
+              return new MiniflareResponse(
                 "[durable-object-proxy-err] Could not generate an ID. Possibly due to a mismatched DO name and ID?",
                 { status: 500 }
               );
             }
             const stub = namespace?.get(id);
             if (!stub) {
-              return new MiniflareResponse3(
+              return new MiniflareResponse(
                 "[durable-object-proxy-err] Could not generate a stub. Possibly due to a mismatched DO name and ID?",
                 { status: 500 }
               );
@@ -6306,16 +6444,3 @@ async function main() {
   }
 }
 await main();
-/**
- * @fileoverview Main entrypoint for libraries using yargs-parser in Node.js
- * CJS and ESM environments.
- *
- * @license
- * Copyright (c) 2016, Contributors
- * SPDX-License-Identifier: ISC
- */
-/**
- * @license
- * Copyright (c) 2016, Contributors
- * SPDX-License-Identifier: ISC
- */