wrangler 0.0.0-fa8e5232 → 0.0.0-fb0db827

package/bin/wrangler.js

@@ -20,7 +20,7 @@ function runWrangler() {
 		// Note Volta and nvm are also recommended in the official docs:
 		// https://developers.cloudflare.com/workers/get-started/guide#2-install-the-workers-cli
 		console.error(
-			`Wrangler requires at least node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}. Please update your version of node.js.
+			`Wrangler requires at least Node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}. Please update your version of Node.js.
 
 Consider using a Node.js version manager such as https://volta.sh/ or https://github.com/nvm-sh/nvm.`
 		);

package/miniflare-dist/index.mjs

@@ -783,11 +783,11 @@ 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,
@@ -799,7 +799,7 @@ import {
 // ../../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
@@ -810,9 +810,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) {
@@ -1053,7 +1053,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, "");
@@ -1074,7 +1074,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) => {
@@ -1365,9 +1365,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(/^-.+=/)) {
@@ -2050,9 +2050,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`);
   }
@@ -2115,7 +2119,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);
+    }
   }
 };
 
@@ -2315,7 +2321,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,
@@ -2700,6 +2706,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) => {
@@ -2708,6 +2715,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]);
@@ -2741,15 +2749,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) => {
@@ -2784,6 +2784,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);
@@ -2870,12 +2881,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];
@@ -2884,6 +2894,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;
@@ -3111,13 +3129,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() {
@@ -3141,7 +3162,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
@@ -3281,7 +3302,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();
@@ -3542,7 +3564,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()
 {
@@ -3560,7 +3582,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;
@@ -3569,7 +3591,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();
@@ -3614,7 +3636,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);
@@ -3679,20 +3701,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);
@@ -3700,8 +3724,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) {
@@ -3846,7 +3875,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();
@@ -3864,7 +3893,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) => {
@@ -4164,6 +4193,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) {
@@ -4187,6 +4217,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");
@@ -4251,6 +4282,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");
@@ -4360,7 +4392,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;
       }
@@ -4675,7 +4707,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();
     }
@@ -4797,7 +4829,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);
       }
@@ -5038,6 +5073,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);
@@ -5071,7 +5111,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["--"]);
@@ -5163,6 +5203,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;
@@ -5246,20 +5289,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");
@@ -5310,6 +5353,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),
@@ -6053,7 +6097,7 @@ async function generateASSETSBinding(options) {
   const miniflare = options.tre ? await import("@miniflare/tre") : await import("@miniflare/core");
   const Request = miniflare.Request;
   const Response2 = miniflare.Response;
-  const fetch2 = options.tre ? miniflare.fetch : (await import("@miniflare/web-sockets")).upgradingFetch;
+  const fetch = options.tre ? miniflare.fetch : (await import("@miniflare/web-sockets")).upgradingFetch;
   return async function(miniflareRequest) {
     if (options.proxyPort) {
       try {
@@ -6064,7 +6108,7 @@ async function generateASSETSBinding(options) {
           proxyRequest.headers.delete("Sec-WebSocket-Accept");
           proxyRequest.headers.delete("Sec-WebSocket-Key");
         }
-        return await fetch2(proxyRequest);
+        return await fetch(proxyRequest);
       } catch (thrown) {
         options.log.error(new Error(`Could not proxy request: ${thrown}`));
         return new Response2(`[wrangler] Could not proxy request: ${thrown}`, {
@@ -6230,7 +6274,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));
   }
@@ -6264,7 +6308,7 @@ async function main() {
               "x-miniflare-durable-object-id",
               id.toString()
             );
-            return fetch(request);
+            return upgradingFetch(request);
           };
           return stub;
         };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "0.0.0-fa8e5232",
+	"version": "0.0.0-fb0db827",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -63,9 +63,11 @@
 		"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
 		"prepublishOnly": "SOURCEMAPS=false npm run build",
 		"start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-		"test": "npm run assert-git-version && jest --silent=false --verbose=true --forceExit",
+		"test": "npm run assert-git-version && jest",
 		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
-		"test:ci": "npm run test -- --verbose=true --coverage"
+		"test:ci": "npm run test -- --coverage",
+		"test:debug": "npm run test -- --silent=false --verbose=true",
+		"test:e2e": "vitest --no-threads ./e2e"
 	},
 	"jest": {
 		"coverageReporters": [
@@ -82,7 +84,7 @@
 		"setupFilesAfterEnv": [
 			"<rootDir>/src/__tests__/jest.setup.ts"
 		],
-		"testRegex": ".*.(test|spec)\\.[jt]sx?$",
+		"testRegex": "src/__tests__/.*\\.(test|spec)\\.[jt]sx?$",
 		"testTimeout": 30000,
 		"transform": {
 			"^.+\\.c?(t|j)sx?$": [
@@ -100,13 +102,13 @@
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
-		"@miniflare/core": "2.12.0",
-		"@miniflare/d1": "2.12.0",
-		"@miniflare/durable-objects": "2.12.0",
+		"@miniflare/core": "2.13.0",
+		"@miniflare/d1": "2.13.0",
+		"@miniflare/durable-objects": "2.13.0",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.16.3",
-		"miniflare": "2.12.0",
+		"miniflare": "2.13.0",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -118,7 +120,7 @@
 		"@cloudflare/workers-types": "^4.20221111.1",
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
-		"@miniflare/tre": "^3.0.0-next.8",
+		"@miniflare/tre": "3.0.0-next.12",
 		"@types/better-sqlite3": "^7.6.0",
 		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",
@@ -174,13 +176,16 @@
 		"remove-accents-esm": "^0.0.1",
 		"semiver": "^1.1.0",
 		"serve-static": "^1.15.0",
+		"shellac": "^0.7.3",
 		"signal-exit": "^3.0.7",
+		"strip-ansi": "^7.0.1",
 		"supports-color": "^9.2.2",
 		"timeago.js": "^4.0.2",
 		"tmp-promise": "^3.0.3",
 		"ts-dedent": "^2.2.0",
-		"undici": "5.11.0",
+		"undici": "5.20.0",
 		"update-check": "^1.5.4",
+		"vitest": "^0.29.2",
 		"ws": "^8.5.0",
 		"xdg-app-paths": "^7.3.0",
 		"yargs": "^17.4.1",

package/src/__tests__/api-devregistry.test.ts

@@ -0,0 +1,121 @@
+import { fetch } from "undici";
+import { unstable_dev } from "../api";
+
+jest.unmock("undici");
+
+/**
+ * a huge caveat to how testing multi-worker scripts works:
+ * you can't shutdown the first worker you spun up, or it'll kill the devRegistry
+ */
+describe("multi-worker testing", () => {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	let childWorker: any;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	let parentWorker: any;
+
+	beforeAll(async () => {
+		childWorker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{
+				config: "src/__tests__/helpers/worker-scripts/child-wrangler.toml",
+				experimental: {
+					disableExperimentalWarning: true,
+				},
+			}
+		);
+		parentWorker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/parent-worker.js",
+			{
+				config: "src/__tests__/helpers/worker-scripts/parent-wrangler.toml",
+				experimental: {
+					disableExperimentalWarning: true,
+				},
+			}
+		);
+	});
+
+	afterAll(async () => {
+		await childWorker.stop();
+		await parentWorker.stop();
+	});
+
+	it("parentWorker and childWorker should be added devRegistry", async () => {
+		const resp = await fetch("http://localhost:6284/workers");
+		if (resp) {
+			const parsedResp = (await resp.json()) as {
+				parent: unknown;
+				child: unknown;
+			};
+			expect(parsedResp.parent).toBeTruthy();
+			expect(parsedResp.child).toBeTruthy();
+		}
+	});
+
+	it("childWorker should return Hello World itself", async () => {
+		const resp = await childWorker.fetch();
+		if (resp) {
+			const text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
+		}
+	});
+
+	it("parentWorker should return Hello World by invoking the child worker", async () => {
+		const resp = await parentWorker.fetch();
+		if (resp) {
+			const parsedResp = await resp.text();
+			expect(parsedResp).toEqual("Parent worker sees: Hello World!");
+		}
+	});
+
+	it("should be able to stop and start the server with no warning logs", async () => {
+		// Spy on all the console methods
+		let logs = "";
+		(["debug", "info", "log", "warn", "error"] as const).forEach((method) =>
+			jest
+				.spyOn(console, method)
+				.mockImplementation((...args: unknown[]) => (logs += `\n${args}`))
+		);
+
+		// Spy on the std out that is written to by Miniflare 2
+		jest
+			.spyOn(process.stdout, "write")
+			.mockImplementation((chunk: unknown) => ((logs += `\n${chunk}`), true));
+
+		async function startWorker() {
+			return await unstable_dev(
+				"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+				{
+					// We need the wrangler.toml config to specify a Worker name
+					// otherwise unstable_dev will not register the worker with the DevRegistry
+					config: "src/__tests__/helpers/worker-scripts/child-wrangler.toml",
+					// We need debug logs because this is where the message is written if registering the worker fails.
+					logLevel: "debug",
+					experimental: {
+						disableExperimentalWarning: true,
+					},
+				}
+			);
+		}
+
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		let worker: any;
+		try {
+			worker = await startWorker();
+
+			// Stop the worker and start it again
+			await worker.stop();
+			await new Promise((r) => setTimeout(r, 2000));
+
+			worker = await startWorker();
+
+			const resp = await worker.fetch();
+			expect(resp).not.toBe(undefined);
+
+			expect(logs).not.toMatch(
+				/Failed to register worker in local service registry/
+			);
+		} finally {
+			await worker?.stop();
+		}
+	}, 10000);
+});