wrangler 2.12.2 → 2.12.3

package/wrangler-dist/cli.js

@@ -6857,8 +6857,8 @@ var require_dispatcher = __commonJS({
   "../../node_modules/undici/lib/dispatcher.js"(exports2, module2) {
     "use strict";
     init_import_meta_url();
-    var EventEmitter2 = require("events");
-    var Dispatcher = class extends EventEmitter2 {
+    var EventEmitter3 = require("events");
+    var Dispatcher = class extends EventEmitter3 {
       dispatch() {
         throw new Error("not implemented");
       }
@@ -24952,7 +24952,7 @@ var require_log_update = __commonJS({
       let previousLineCount = 0;
       let previousOutput = "";
       let hasHiddenCursor = false;
-      const render15 = /* @__PURE__ */ __name((str) => {
+      const render7 = /* @__PURE__ */ __name((str) => {
         if (!showCursor && !hasHiddenCursor) {
           cli_cursor_1.default.hide();
           hasHiddenCursor = true;
@@ -24965,12 +24965,12 @@ var require_log_update = __commonJS({
         stream2.write(ansi_escapes_1.default.eraseLines(previousLineCount) + output);
         previousLineCount = output.split("\n").length;
       }, "render");
-      render15.clear = () => {
+      render7.clear = () => {
         stream2.write(ansi_escapes_1.default.eraseLines(previousLineCount));
         previousOutput = "";
         previousLineCount = 0;
       };
-      render15.done = () => {
+      render7.done = () => {
         previousOutput = "";
         previousLineCount = 0;
         if (!showCursor) {
@@ -24978,7 +24978,7 @@ var require_log_update = __commonJS({
           hasHiddenCursor = false;
         }
       };
-      return render15;
+      return render7;
     }, "create");
     exports2.default = { create };
   }
@@ -36616,7 +36616,7 @@ var require_websocket2 = __commonJS({
   "../../node_modules/ws/lib/websocket.js"(exports2, module2) {
     "use strict";
     init_import_meta_url();
-    var EventEmitter2 = require("events");
+    var EventEmitter3 = require("events");
     var https2 = require("https");
     var http3 = require("http");
     var net3 = require("net");
@@ -36641,7 +36641,7 @@ var require_websocket2 = __commonJS({
     var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
     var protocolVersions = [8, 13];
     var closeTimeout = 30 * 1e3;
-    var WebSocket2 = class extends EventEmitter2 {
+    var WebSocket2 = class extends EventEmitter3 {
       constructor(address, protocols, options6) {
         super();
         this._binaryType = BINARY_TYPES[0];
@@ -37406,7 +37406,7 @@ var require_websocket_server = __commonJS({
   "../../node_modules/ws/lib/websocket-server.js"(exports2, module2) {
     "use strict";
     init_import_meta_url();
-    var EventEmitter2 = require("events");
+    var EventEmitter3 = require("events");
     var http3 = require("http");
     var https2 = require("https");
     var net3 = require("net");
@@ -37420,7 +37420,7 @@ var require_websocket_server = __commonJS({
     var RUNNING = 0;
     var CLOSING = 1;
     var CLOSED = 2;
-    var WebSocketServer2 = class extends EventEmitter2 {
+    var WebSocketServer2 = class extends EventEmitter3 {
       constructor(options6, callback) {
         super();
         options6 = {
@@ -48134,13 +48134,13 @@ var require_backend = __commonJS({
             return obj;
           }
           __name(_defineProperty11, "_defineProperty");
-          var EventEmitter2 = /* @__PURE__ */ function() {
-            function EventEmitter3() {
-              _classCallCheck5(this, EventEmitter3);
+          var EventEmitter3 = /* @__PURE__ */ function() {
+            function EventEmitter4() {
+              _classCallCheck5(this, EventEmitter4);
               _defineProperty11(this, "listenersMap", /* @__PURE__ */ new Map());
             }
-            __name(EventEmitter3, "EventEmitter");
-            _createClass5(EventEmitter3, [{
+            __name(EventEmitter4, "EventEmitter");
+            _createClass5(EventEmitter4, [{
               key: "addListener",
               value: /* @__PURE__ */ __name(function addListener(event, listener) {
                 var listeners = this.listenersMap.get(event);
@@ -48202,7 +48202,7 @@ var require_backend = __commonJS({
                 }
               }, "removeListener")
             }]);
-            return EventEmitter3;
+            return EventEmitter4;
           }();
           var lodash_throttle = __webpack_require__(15);
           var lodash_throttle_default = /* @__PURE__ */ __webpack_require__.n(lodash_throttle);
@@ -49294,7 +49294,7 @@ var require_backend = __commonJS({
               }, "get")
             }]);
             return Bridge2;
-          }(EventEmitter2);
+          }(EventEmitter3);
           var src_bridge = Bridge;
           var utils = __webpack_require__(4);
           function agent_typeof(obj) {
@@ -49868,7 +49868,7 @@ var require_backend = __commonJS({
               }, "get")
             }]);
             return Agent;
-          }(EventEmitter2);
+          }(EventEmitter3);
           function installHook(target) {
             if (target.hasOwnProperty("__REACT_DEVTOOLS_GLOBAL_HOOK__")) {
               return null;
@@ -55129,7 +55129,7 @@ var require_render = __commonJS({
     var ink_1 = __importDefault(require_ink());
     var instances_1 = __importDefault(require_instances());
     var stream_1 = require("stream");
-    var render15 = /* @__PURE__ */ __name((node, options6) => {
+    var render7 = /* @__PURE__ */ __name((node, options6) => {
       const inkOptions = Object.assign({ stdout: process.stdout, stdin: process.stdin, stderr: process.stderr, debug: false, exitOnCtrlC: true, patchConsole: true }, getOptions(options6));
       const instance = getInstance(inkOptions.stdout, () => new ink_1.default(inkOptions));
       instance.render(node);
@@ -55141,7 +55141,7 @@ var require_render = __commonJS({
         clear: instance.clear
       };
     }, "render");
-    exports2.default = render15;
+    exports2.default = render7;
     var getOptions = /* @__PURE__ */ __name((stdout = {}) => {
       if (stdout instanceof stream_1.Stream) {
         return {
@@ -55200,7 +55200,7 @@ var require_Static = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     var react_1 = __importStar(require_react());
     var Static2 = /* @__PURE__ */ __name((props) => {
-      const { items, children: render15, style: customStyle } = props;
+      const { items, children: render7, style: customStyle } = props;
       const [index, setIndex] = react_1.useState(0);
       const itemsToRender = react_1.useMemo(() => {
         return items.slice(index);
@@ -55209,7 +55209,7 @@ var require_Static = __commonJS({
         setIndex(items.length);
       }, [items.length]);
       const children = itemsToRender.map((item, itemIndex) => {
-        return render15(item, index + itemIndex);
+        return render7(item, index + itemIndex);
       });
       const style = react_1.useMemo(() => Object.assign({ position: "absolute", flexDirection: "column" }, customStyle), [customStyle]);
       return react_1.default.createElement("ink-box", {
@@ -66058,7 +66058,7 @@ var require_destroy = __commonJS({
   "../../node_modules/destroy/index.js"(exports2, module2) {
     "use strict";
     init_import_meta_url();
-    var EventEmitter2 = require("events").EventEmitter;
+    var EventEmitter3 = require("events").EventEmitter;
     var ReadStream = require("fs").ReadStream;
     var Stream = require("stream");
     var Zlib = require("zlib");
@@ -66125,7 +66125,7 @@ var require_destroy = __commonJS({
     }
     __name(hasDestroy, "hasDestroy");
     function isEventEmitter(val) {
-      return val instanceof EventEmitter2;
+      return val instanceof EventEmitter3;
     }
     __name(isEventEmitter, "isEventEmitter");
     function isFsReadStream(stream2) {
@@ -83535,7 +83535,7 @@ var require_view = __commonJS({
       }
       return path43;
     }, "lookup");
-    View.prototype.render = /* @__PURE__ */ __name(function render15(options6, callback) {
+    View.prototype.render = /* @__PURE__ */ __name(function render7(options6, callback) {
       debug('render "%s"', this.path);
       this.engine(this.path, options6, callback);
     }, "render");
@@ -86504,7 +86504,7 @@ var require_application = __commonJS({
       return this;
     }, "all");
     app.del = deprecate.function(app.delete, "app.del: Use app.delete instead");
-    app.render = /* @__PURE__ */ __name(function render15(name, options6, callback) {
+    app.render = /* @__PURE__ */ __name(function render7(name, options6, callback) {
       var cache2 = this.cache;
       var done = callback;
       var engines = this.engines;
@@ -88056,7 +88056,7 @@ var require_response2 = __commonJS({
       vary(this, field);
       return this;
     };
-    res.render = /* @__PURE__ */ __name(function render15(view, options6, callback) {
+    res.render = /* @__PURE__ */ __name(function render7(view, options6, callback) {
       var app = this.req.app;
       var done = callback;
       var opts = options6 || {};
@@ -88294,7 +88294,7 @@ var require_express = __commonJS({
     "use strict";
     init_import_meta_url();
     var bodyParser2 = require_body_parser();
-    var EventEmitter2 = require("events").EventEmitter;
+    var EventEmitter3 = require("events").EventEmitter;
     var mixin3 = require_merge_descriptors();
     var proto = require_application();
     var Route = require_route5();
@@ -88306,7 +88306,7 @@ var require_express = __commonJS({
       var app = /* @__PURE__ */ __name(function(req2, res2, next) {
         app.handle(req2, res2, next);
       }, "app");
-      mixin3(app, EventEmitter2.prototype, false);
+      mixin3(app, EventEmitter3.prototype, false);
       mixin3(app, proto, false);
       app.request = Object.create(req, {
         app: { configurable: true, enumerable: true, writable: true, value: app }
@@ -102058,7 +102058,7 @@ var require_websocket3 = __commonJS({
   "node_modules/ws/lib/websocket.js"(exports2, module2) {
     "use strict";
     init_import_meta_url();
-    var EventEmitter2 = require("events");
+    var EventEmitter3 = require("events");
     var https2 = require("https");
     var http3 = require("http");
     var net3 = require("net");
@@ -102088,7 +102088,7 @@ var require_websocket3 = __commonJS({
     var subprotocolRegex = /^[!#$%&'*+\-.0-9A-Z^_`|a-z~]+$/;
     var protocolVersions = [8, 13];
     var closeTimeout = 30 * 1e3;
-    var WebSocket2 = class extends EventEmitter2 {
+    var WebSocket2 = class extends EventEmitter3 {
       constructor(address, protocols, options6) {
         super();
         this._binaryType = BINARY_TYPES[0];
@@ -102843,7 +102843,7 @@ var require_websocket_server2 = __commonJS({
   "node_modules/ws/lib/websocket-server.js"(exports2, module2) {
     "use strict";
     init_import_meta_url();
-    var EventEmitter2 = require("events");
+    var EventEmitter3 = require("events");
     var http3 = require("http");
     var https2 = require("https");
     var net3 = require("net");
@@ -102858,7 +102858,7 @@ var require_websocket_server2 = __commonJS({
     var RUNNING = 0;
     var CLOSING = 1;
     var CLOSED = 2;
-    var WebSocketServer2 = class extends EventEmitter2 {
+    var WebSocketServer2 = class extends EventEmitter3 {
       constructor(options6, callback) {
         super();
         options6 = {
@@ -108747,7 +108747,7 @@ var require_style = __commonJS({
         render: (input) => `${input}`
       }
     });
-    var render15 = /* @__PURE__ */ __name((type) => styles[type] || styles.default, "render");
+    var render7 = /* @__PURE__ */ __name((type) => styles[type] || styles.default, "render");
     var symbols = Object.freeze({
       aborted: c.red(figures.cross),
       done: c.green(figures.tick),
@@ -108759,7 +108759,7 @@ var require_style = __commonJS({
     var item = /* @__PURE__ */ __name((expandable, expanded) => c.gray(expandable ? expanded ? figures.pointerSmall : "+" : figures.line), "item");
     module2.exports = {
       styles,
-      render: render15,
+      render: render7,
       symbols,
       symbol,
       delimiter,
@@ -108847,12 +108847,12 @@ var require_prompt = __commonJS({
     var readline = require("readline");
     var _require = require_util8();
     var action = _require.action;
-    var EventEmitter2 = require("events");
+    var EventEmitter3 = require("events");
     var _require2 = require_src8();
     var beep = _require2.beep;
     var cursor = _require2.cursor;
     var color = require_kleur();
-    var Prompt = class extends EventEmitter2 {
+    var Prompt = class extends EventEmitter3 {
       constructor(opts = {}) {
         super();
         this.firstRender = true;
@@ -111397,7 +111397,7 @@ var require_style2 = __commonJS({
       invisible: { scale: 0, render: (input) => "" },
       default: { scale: 1, render: (input) => `${input}` }
     });
-    var render15 = /* @__PURE__ */ __name((type) => styles[type] || styles.default, "render");
+    var render7 = /* @__PURE__ */ __name((type) => styles[type] || styles.default, "render");
     var symbols = Object.freeze({
       aborted: c.red(figures.cross),
       done: c.green(figures.tick),
@@ -111409,7 +111409,7 @@ var require_style2 = __commonJS({
     var item = /* @__PURE__ */ __name((expandable, expanded) => c.gray(expandable ? expanded ? figures.pointerSmall : "+" : figures.line), "item");
     module2.exports = {
       styles,
-      render: render15,
+      render: render7,
       symbols,
       symbol,
       delimiter,
@@ -111493,10 +111493,10 @@ var require_prompt2 = __commonJS({
     init_import_meta_url();
     var readline = require("readline");
     var { action } = require_util9();
-    var EventEmitter2 = require("events");
+    var EventEmitter3 = require("events");
     var { beep, cursor } = require_src8();
     var color = require_kleur();
-    var Prompt = class extends EventEmitter2 {
+    var Prompt = class extends EventEmitter3 {
       constructor(opts = {}) {
         super();
         this.firstRender = true;
@@ -119203,12 +119203,12 @@ var require_eventemitter3 = __commonJS({
         delete emitter._events[evt];
     }
     __name(clearEvent, "clearEvent");
-    function EventEmitter2() {
+    function EventEmitter3() {
       this._events = new Events();
       this._eventsCount = 0;
     }
-    __name(EventEmitter2, "EventEmitter");
-    EventEmitter2.prototype.eventNames = /* @__PURE__ */ __name(function eventNames() {
+    __name(EventEmitter3, "EventEmitter");
+    EventEmitter3.prototype.eventNames = /* @__PURE__ */ __name(function eventNames() {
       var names = [], events, name;
       if (this._eventsCount === 0)
         return names;
@@ -119221,7 +119221,7 @@ var require_eventemitter3 = __commonJS({
       }
       return names;
     }, "eventNames");
-    EventEmitter2.prototype.listeners = /* @__PURE__ */ __name(function listeners(event) {
+    EventEmitter3.prototype.listeners = /* @__PURE__ */ __name(function listeners(event) {
       var evt = prefix ? prefix + event : event, handlers = this._events[evt];
       if (!handlers)
         return [];
@@ -119232,7 +119232,7 @@ var require_eventemitter3 = __commonJS({
       }
       return ee;
     }, "listeners");
-    EventEmitter2.prototype.listenerCount = /* @__PURE__ */ __name(function listenerCount(event) {
+    EventEmitter3.prototype.listenerCount = /* @__PURE__ */ __name(function listenerCount(event) {
       var evt = prefix ? prefix + event : event, listeners = this._events[evt];
       if (!listeners)
         return 0;
@@ -119240,7 +119240,7 @@ var require_eventemitter3 = __commonJS({
         return 1;
       return listeners.length;
     }, "listenerCount");
-    EventEmitter2.prototype.emit = /* @__PURE__ */ __name(function emit(event, a1, a2, a3, a4, a5) {
+    EventEmitter3.prototype.emit = /* @__PURE__ */ __name(function emit(event, a1, a2, a3, a4, a5) {
       var evt = prefix ? prefix + event : event;
       if (!this._events[evt])
         return false;
@@ -119295,13 +119295,13 @@ var require_eventemitter3 = __commonJS({
       }
       return true;
     }, "emit");
-    EventEmitter2.prototype.on = /* @__PURE__ */ __name(function on(event, fn2, context) {
+    EventEmitter3.prototype.on = /* @__PURE__ */ __name(function on(event, fn2, context) {
       return addListener(this, event, fn2, context, false);
     }, "on");
-    EventEmitter2.prototype.once = /* @__PURE__ */ __name(function once(event, fn2, context) {
+    EventEmitter3.prototype.once = /* @__PURE__ */ __name(function once(event, fn2, context) {
       return addListener(this, event, fn2, context, true);
     }, "once");
-    EventEmitter2.prototype.removeListener = /* @__PURE__ */ __name(function removeListener(event, fn2, context, once) {
+    EventEmitter3.prototype.removeListener = /* @__PURE__ */ __name(function removeListener(event, fn2, context, once) {
       var evt = prefix ? prefix + event : event;
       if (!this._events[evt])
         return this;
@@ -119327,7 +119327,7 @@ var require_eventemitter3 = __commonJS({
       }
       return this;
     }, "removeListener");
-    EventEmitter2.prototype.removeAllListeners = /* @__PURE__ */ __name(function removeAllListeners(event) {
+    EventEmitter3.prototype.removeAllListeners = /* @__PURE__ */ __name(function removeAllListeners(event) {
       var evt;
       if (event) {
         evt = prefix ? prefix + event : event;
@@ -119339,12 +119339,12 @@ var require_eventemitter3 = __commonJS({
       }
       return this;
     }, "removeAllListeners");
-    EventEmitter2.prototype.off = EventEmitter2.prototype.removeListener;
-    EventEmitter2.prototype.addListener = EventEmitter2.prototype.on;
-    EventEmitter2.prefixed = prefix;
-    EventEmitter2.EventEmitter = EventEmitter2;
+    EventEmitter3.prototype.off = EventEmitter3.prototype.removeListener;
+    EventEmitter3.prototype.addListener = EventEmitter3.prototype.on;
+    EventEmitter3.prefixed = prefix;
+    EventEmitter3.EventEmitter = EventEmitter3;
     if ("undefined" !== typeof module2) {
-      module2.exports = EventEmitter2;
+      module2.exports = EventEmitter3;
     }
   }
 });
@@ -122216,7 +122216,7 @@ async function getPorts(options6) {
 __name(getPorts, "getPorts");
 
 // src/dev.tsx
-var import_ink16 = __toESM(require_build2());
+var import_ink13 = __toESM(require_build2());
 var import_react19 = __toESM(require_react());
 
 // src/config/index.ts
@@ -126321,7 +126321,7 @@ var ErrorBoundary = /* @__PURE__ */ function(_React$Component) {
       this.reset();
     }
   }, "componentDidUpdate");
-  _proto.render = /* @__PURE__ */ __name(function render15() {
+  _proto.render = /* @__PURE__ */ __name(function render7() {
     var error = this.state.error;
     var _this$props4 = this.props, fallbackRender = _this$props4.fallbackRender, FallbackComponent = _this$props4.FallbackComponent, fallback = _this$props4.fallback;
     if (error !== null) {
@@ -127781,7 +127781,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.12.2";
+var version = "2.12.3";
 var package_default = {
   name: "wrangler",
   version,
@@ -127847,9 +127847,10 @@ var package_default = {
     "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"
   },
   jest: {
     coverageReporters: [
@@ -139127,10 +139128,62 @@ init_import_meta_url();
 init_import_meta_url();
 var import_promises6 = __toESM(require("node:fs/promises"));
 var path25 = __toESM(require("path"));
-var import_ink5 = __toESM(require_build2());
 var import_ink_table2 = __toESM(require_dist3());
 var import_react8 = __toESM(require_react());
 
+// src/utils/render.ts
+init_import_meta_url();
+var import_events = require("events");
+var import_ink4 = __toESM(require_build2());
+function renderToString(tree) {
+  const { output, cleanup } = render(tree);
+  cleanup();
+  return output;
+}
+__name(renderToString, "renderToString");
+var LASTFRAME_UNDEFINED = "value of stdout.lastframe() is undefined";
+var OutputStream = class extends import_events.EventEmitter {
+  constructor(_originalStream) {
+    super();
+    this._originalStream = _originalStream;
+  }
+  frames = [];
+  _lastFrame;
+  get columns() {
+    return this._originalStream.columns;
+  }
+  get rows() {
+    return this._originalStream.rows;
+  }
+  write = (frame) => {
+    this.frames.push(frame);
+    this._lastFrame = frame;
+  };
+  lastFrame = () => {
+    return this._lastFrame;
+  };
+};
+__name(OutputStream, "OutputStream");
+var render = /* @__PURE__ */ __name((tree) => {
+  const stdout = new OutputStream(process.stdout);
+  const stderr = new OutputStream(process.stderr);
+  const instance = (0, import_ink4.render)(tree, {
+    stdout,
+    stderr,
+    debug: true,
+    exitOnCtrlC: false,
+    patchConsole: false
+  });
+  return {
+    output: stdout.lastFrame() || LASTFRAME_UNDEFINED,
+    stdout,
+    stderr,
+    cleanup: instance.cleanup,
+    unmount: instance.unmount,
+    frames: stdout.frames
+  };
+}, "render");
+
 // src/d1/formatTimeAgo.ts
 init_import_meta_url();
 
@@ -141849,7 +141902,6 @@ var DEFAULT_MIGRATION_TABLE = "d1_migrations";
 
 // src/d1/list.tsx
 init_import_meta_url();
-var import_ink4 = __toESM(require_build2());
 var import_ink_table = __toESM(require_dist3());
 var import_react7 = __toESM(require_react());
 function Options(d1ListYargs) {
@@ -141869,7 +141921,7 @@ async function Handler({
     logger.log(JSON.stringify(dbs, null, 2));
   } else {
     logger.log(d1BetaWarning);
-    (0, import_ink4.render)(/* @__PURE__ */ import_react7.default.createElement(import_ink_table.default, { data: dbs }));
+    logger.log(renderToString(/* @__PURE__ */ import_react7.default.createElement(import_ink_table.default, { data: dbs })));
   }
 }
 __name(Handler, "Handler");
@@ -141959,13 +142011,15 @@ var ListHandler = withConfig(
       name
     );
     const backups = await listBackups(accountId, db.uuid);
-    (0, import_ink5.render)(
-      /* @__PURE__ */ import_react8.default.createElement(
-        import_ink_table2.default,
-        {
-          data: backups,
-          columns: ["created_at", "id", "num_tables", "size"]
-        }
+    logger.log(
+      renderToString(
+        /* @__PURE__ */ import_react8.default.createElement(
+          import_ink_table2.default,
+          {
+            data: backups,
+            columns: ["created_at", "id", "num_tables", "size"]
+          }
+        )
       )
     );
   }
@@ -142005,13 +142059,15 @@ var CreateHandler = withConfig(
       name
     );
     const backup = await createBackup(accountId, db.uuid);
-    (0, import_ink5.render)(
-      /* @__PURE__ */ import_react8.default.createElement(
-        import_ink_table2.default,
-        {
-          data: [backup],
-          columns: ["created_at", "id", "num_tables", "size", "state"]
-        }
+    logger.log(
+      renderToString(
+        /* @__PURE__ */ import_react8.default.createElement(
+          import_ink_table2.default,
+          {
+            data: [backup],
+            columns: ["created_at", "id", "num_tables", "size", "state"]
+          }
+        )
       )
     );
   }
@@ -142103,7 +142159,7 @@ var getBackupResponse = /* @__PURE__ */ __name(async (accountId, uuid, backupId)
 
 // src/d1/create.tsx
 init_import_meta_url();
-var import_ink6 = __toESM(require_build2());
+var import_ink5 = __toESM(require_build2());
 var import_react9 = __toESM(require_react());
 function Options2(yargs) {
   return yargs.positional("name", {
@@ -142135,8 +142191,10 @@ async function Handler2({
     }
     throw e2;
   }
-  (0, import_ink6.render)(
-    /* @__PURE__ */ import_react9.default.createElement(import_ink6.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react9.default.createElement(import_ink6.Text, null, "\u2705 Successfully created DB '", db.name, "'!"), /* @__PURE__ */ import_react9.default.createElement(import_ink6.Text, null, "\xA0"), /* @__PURE__ */ import_react9.default.createElement(import_ink6.Text, null, "Add the following to your wrangler.toml to connect to it from a Worker:"), /* @__PURE__ */ import_react9.default.createElement(import_ink6.Text, null, "\xA0"), /* @__PURE__ */ import_react9.default.createElement(import_ink6.Text, null, "[[ d1_databases ]]"), /* @__PURE__ */ import_react9.default.createElement(import_ink6.Text, null, 'binding = "DB" # i.e. available in your Worker on env.DB'), /* @__PURE__ */ import_react9.default.createElement(import_ink6.Text, null, 'database_name = "', db.name, '"'), /* @__PURE__ */ import_react9.default.createElement(import_ink6.Text, null, 'database_id = "', db.uuid, '"'))
+  logger.log(
+    renderToString(
+      /* @__PURE__ */ import_react9.default.createElement(import_ink5.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "\u2705 Successfully created DB '", db.name, "'!"), /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "\xA0"), /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "Add the following to your wrangler.toml to connect to it from a Worker:"), /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "\xA0"), /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "[[ d1_databases ]]"), /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, 'binding = "DB" # i.e. available in your Worker on env.DB'), /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, 'database_name = "', db.name, '"'), /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, 'database_id = "', db.uuid, '"'))
+    )
   );
 }
 __name(Handler2, "Handler");
@@ -142183,7 +142241,7 @@ var import_node_fs13 = require("node:fs");
 var import_promises7 = require("node:fs/promises");
 var import_node_path22 = __toESM(require("node:path"));
 var import_chalk6 = __toESM(require_chalk());
-var import_ink7 = __toESM(require_build2());
+var import_ink6 = __toESM(require_build2());
 var import_ink_table3 = __toESM(require_dist3());
 var import_react10 = __toESM(require_react());
 
@@ -142357,16 +142415,18 @@ var Handler4 = /* @__PURE__ */ __name(async (args) => {
   if (!response)
     return;
   if (isInteractive2 && !json) {
-    (0, import_ink7.render)(
-      /* @__PURE__ */ import_react10.default.createElement(import_ink7.Static, { items: response }, (result) => {
-        if (!Array.isArray(result)) {
-          const { results, query } = result;
-          if (Array.isArray(results) && results.length > 0) {
-            const shortQuery = shorten(query, 48);
-            return /* @__PURE__ */ import_react10.default.createElement(import_react10.default.Fragment, null, shortQuery ? /* @__PURE__ */ import_react10.default.createElement(import_ink7.Text, { dimColor: true }, shortQuery) : null, /* @__PURE__ */ import_react10.default.createElement(import_ink_table3.default, { data: results }));
+    logger.log(
+      renderToString(
+        /* @__PURE__ */ import_react10.default.createElement(import_ink6.Static, { items: response }, (result) => {
+          if (!Array.isArray(result)) {
+            const { results, query } = result;
+            if (Array.isArray(results) && results.length > 0) {
+              const shortQuery = shorten(query, 48);
+              return /* @__PURE__ */ import_react10.default.createElement(import_react10.default.Fragment, null, shortQuery ? /* @__PURE__ */ import_react10.default.createElement(import_ink6.Text, { dimColor: true }, shortQuery) : null, /* @__PURE__ */ import_react10.default.createElement(import_ink_table3.default, { data: results }));
+            }
           }
-        }
-      })
+        })
+      )
     );
   } else {
     logger.loggerLevel = existingLogLevel;
@@ -142548,7 +142608,7 @@ init_import_meta_url();
 var import_node_assert11 = __toESM(require("node:assert"));
 var import_node_fs15 = __toESM(require("node:fs"));
 var import_path6 = __toESM(require("path"));
-var import_ink8 = __toESM(require_build2());
+var import_ink7 = __toESM(require_build2());
 var import_ink_table4 = __toESM(require_dist3());
 var import_react11 = __toESM(require_react());
 
@@ -142747,11 +142807,13 @@ var ApplyHandler = withConfig(
       return 0;
     });
     if (unappliedMigrations.length === 0) {
-      (0, import_ink8.render)(/* @__PURE__ */ import_react11.default.createElement(import_ink8.Text, null, "\u2705 No migrations to apply!"));
+      logger.log(renderToString(/* @__PURE__ */ import_react11.default.createElement(import_ink7.Text, null, "\u2705 No migrations to apply!")));
       return;
     }
-    (0, import_ink8.render)(
-      /* @__PURE__ */ import_react11.default.createElement(import_ink8.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react11.default.createElement(import_ink8.Text, null, "Migrations to be applied:"), /* @__PURE__ */ import_react11.default.createElement(import_ink_table4.default, { data: unappliedMigrations, columns: ["Name"] }))
+    logger.log(
+      renderToString(
+        /* @__PURE__ */ import_react11.default.createElement(import_ink7.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react11.default.createElement(import_ink7.Text, null, "Migrations to be applied:"), /* @__PURE__ */ import_react11.default.createElement(import_ink_table4.default, { data: unappliedMigrations, columns: ["Name"] }))
+      )
     );
     const ok = await confirm(
       `About to apply ${unappliedMigrations.length} migration(s)
@@ -142764,7 +142826,7 @@ Your database may not be available to serve requests during the migration, conti
         databaseInfo,
         "In non-local mode `databaseInfo` should be defined."
       );
-      (0, import_ink8.render)(/* @__PURE__ */ import_react11.default.createElement(import_ink8.Text, null, "\u{1F552} Creating backup..."));
+      logger.log(renderToString(/* @__PURE__ */ import_react11.default.createElement(import_ink7.Text, null, "\u{1F552} Creating backup...")));
       const accountId = await requireAuth({});
       await createBackup(accountId, databaseInfo.uuid);
     }
@@ -142815,21 +142877,23 @@ Your database may not be available to serve requests during the migration, conti
         ];
       }
       migration.Status = success ? "\u2705" : "\u274C";
-      (0, import_ink8.render)(
-        /* @__PURE__ */ import_react11.default.createElement(import_ink8.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react11.default.createElement(
-          import_ink_table4.default,
-          {
-            data: unappliedMigrations,
-            columns: ["Name", "Status"]
-          }
-        ), errorNotes.length > 0 && /* @__PURE__ */ import_react11.default.createElement(import_ink8.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react11.default.createElement(import_ink8.Text, null, "\xA0"), /* @__PURE__ */ import_react11.default.createElement(import_ink8.Text, null, "\u274C Migration ", migration.Name, " failed with following Errors"), /* @__PURE__ */ import_react11.default.createElement(
-          import_ink_table4.default,
-          {
-            data: errorNotes.map((err) => {
-              return { Error: err };
-            })
-          }
-        )))
+      logger.log(
+        renderToString(
+          /* @__PURE__ */ import_react11.default.createElement(import_ink7.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react11.default.createElement(
+            import_ink_table4.default,
+            {
+              data: unappliedMigrations,
+              columns: ["Name", "Status"]
+            }
+          ), errorNotes.length > 0 && /* @__PURE__ */ import_react11.default.createElement(import_ink7.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react11.default.createElement(import_ink7.Text, null, "\xA0"), /* @__PURE__ */ import_react11.default.createElement(import_ink7.Text, null, "\u274C Migration ", migration.Name, " failed with following Errors"), /* @__PURE__ */ import_react11.default.createElement(
+            import_ink_table4.default,
+            {
+              data: errorNotes.map((err) => {
+                return { Error: err };
+              })
+            }
+          )))
+        )
       );
       if (errorNotes.length > 0)
         return;
@@ -142841,7 +142905,7 @@ Your database may not be available to serve requests during the migration, conti
 init_import_meta_url();
 var import_node_fs16 = __toESM(require("node:fs"));
 var import_path7 = __toESM(require("path"));
-var import_ink9 = __toESM(require_build2());
+var import_ink8 = __toESM(require_build2());
 var import_react12 = __toESM(require_react());
 function CreateOptions2(yargs) {
   return Database(yargs).positional("message", {
@@ -142876,8 +142940,10 @@ var CreateHandler2 = withConfig(
       `-- Migration number: ${nextMigrationNumber} 	 ${new Date().toISOString()}
 `
     );
-    (0, import_ink9.render)(
-      /* @__PURE__ */ import_react12.default.createElement(import_ink9.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react12.default.createElement(import_ink9.Text, null, "\u2705 Successfully created Migration '", newMigrationName, "'!"), /* @__PURE__ */ import_react12.default.createElement(import_ink9.Text, null, "\xA0"), /* @__PURE__ */ import_react12.default.createElement(import_ink9.Text, null, "The migration is available for editing here"), /* @__PURE__ */ import_react12.default.createElement(import_ink9.Text, null, migrationsPath, "/", newMigrationName))
+    logger.log(
+      renderToString(
+        /* @__PURE__ */ import_react12.default.createElement(import_ink8.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react12.default.createElement(import_ink8.Text, null, "\u2705 Successfully created Migration '", newMigrationName, "'!"), /* @__PURE__ */ import_react12.default.createElement(import_ink8.Text, null, "\xA0"), /* @__PURE__ */ import_react12.default.createElement(import_ink8.Text, null, "The migration is available for editing here"), /* @__PURE__ */ import_react12.default.createElement(import_ink8.Text, null, migrationsPath, "/", newMigrationName))
+      )
     );
   }
 );
@@ -142892,7 +142958,7 @@ __name(pad, "pad");
 // src/d1/migrations/list.tsx
 init_import_meta_url();
 var import_path8 = __toESM(require("path"));
-var import_ink10 = __toESM(require_build2());
+var import_ink9 = __toESM(require_build2());
 var import_ink_table5 = __toESM(require_dist3());
 var import_react13 = __toESM(require_react());
 function ListOptions2(yargs) {
@@ -142942,11 +143008,13 @@ var ListHandler2 = withConfig(
       };
     });
     if (unappliedMigrations.length === 0) {
-      (0, import_ink10.render)(/* @__PURE__ */ import_react13.default.createElement(import_ink10.Text, null, "\u2705 No migrations to apply!"));
+      logger.log(renderToString(/* @__PURE__ */ import_react13.default.createElement(import_ink9.Text, null, "\u2705 No migrations to apply!")));
       return;
     }
-    (0, import_ink10.render)(
-      /* @__PURE__ */ import_react13.default.createElement(import_ink10.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react13.default.createElement(import_ink10.Text, null, "Migrations to be applied:"), /* @__PURE__ */ import_react13.default.createElement(import_ink_table5.default, { data: unappliedMigrations, columns: ["Name"] }))
+    logger.log(
+      renderToString(
+        /* @__PURE__ */ import_react13.default.createElement(import_ink9.Box, { flexDirection: "column" }, /* @__PURE__ */ import_react13.default.createElement(import_ink9.Text, null, "Migrations to be applied:"), /* @__PURE__ */ import_react13.default.createElement(import_ink_table5.default, { data: unappliedMigrations, columns: ["Name"] }))
+      )
     );
   }
 );
@@ -147030,14 +147098,13 @@ __name(createTail, "createTail");
 
 // src/pages/prompt-select-project.tsx
 init_import_meta_url();
-var import_ink12 = __toESM(require_build2());
+var import_ink10 = __toESM(require_build2());
 var import_ink_select_input2 = __toESM(require_build3());
 var import_react15 = __toESM(require_react());
 
 // src/pages/projects.tsx
 init_import_meta_url();
 var import_node_child_process5 = require("node:child_process");
-var import_ink11 = __toESM(require_build2());
 var import_ink_table6 = __toESM(require_dist3());
 var import_react14 = __toESM(require_react());
 
@@ -147157,10 +147224,7 @@ async function ListHandler3() {
   saveToConfigCache(PAGES_CONFIG_CACHE_FILENAME, {
     account_id: accountId
   });
-  const { unmount } = (0, import_ink11.render)(/* @__PURE__ */ import_react14.default.createElement(import_ink_table6.default, { data }), {
-    patchConsole: false
-  });
-  unmount();
+  logger.log(renderToString(/* @__PURE__ */ import_react14.default.createElement(import_ink_table6.default, { data })));
   await sendMetricsEvent("list pages projects");
 }
 __name(ListHandler3, "ListHandler");
@@ -147265,8 +147329,8 @@ async function promptSelectProject({
 }) {
   const projects = await listProjects({ accountId });
   return new Promise((resolve16) => {
-    const { unmount } = (0, import_ink12.render)(
-      /* @__PURE__ */ import_react15.default.createElement(import_react15.default.Fragment, null, /* @__PURE__ */ import_react15.default.createElement(import_ink12.Text, null, "Select a project:"), /* @__PURE__ */ import_react15.default.createElement(
+    const { unmount } = (0, import_ink10.render)(
+      /* @__PURE__ */ import_react15.default.createElement(import_react15.default.Fragment, null, /* @__PURE__ */ import_react15.default.createElement(import_ink10.Text, null, "Select a project:"), /* @__PURE__ */ import_react15.default.createElement(
         import_ink_select_input2.default,
         {
           items: projects.map((project) => ({
@@ -147488,7 +147552,6 @@ __name(Handler6, "Handler");
 
 // src/pages/deployments.tsx
 init_import_meta_url();
-var import_ink13 = __toESM(require_build2());
 var import_ink_table7 = __toESM(require_dist3());
 var import_react16 = __toESM(require_react());
 function ListOptions4(yargs) {
@@ -147535,10 +147598,7 @@ async function ListHandler4({ projectName }) {
   saveToConfigCache(PAGES_CONFIG_CACHE_FILENAME, {
     account_id: accountId
   });
-  const { unmount } = (0, import_ink13.render)(/* @__PURE__ */ import_react16.default.createElement(import_ink_table7.default, { data }), {
-    patchConsole: false
-  });
-  unmount();
+  logger.log(renderToString(/* @__PURE__ */ import_react16.default.createElement(import_ink_table7.default, { data })));
   await sendMetricsEvent("list pages deployments");
 }
 __name(ListHandler4, "ListHandler");
@@ -148185,7 +148245,7 @@ __name(OptimizeRoutesHandler, "OptimizeRoutesHandler");
 // src/pages/publish.tsx
 init_import_meta_url();
 var import_node_child_process7 = require("node:child_process");
-var import_ink15 = __toESM(require_build2());
+var import_ink12 = __toESM(require_build2());
 var import_ink_select_input3 = __toESM(require_build3());
 var import_react18 = __toESM(require_react());
 
@@ -148201,7 +148261,7 @@ var import_undici12 = __toESM(require_undici());
 init_import_meta_url();
 var import_promises14 = require("node:fs/promises");
 var import_node_path37 = require("node:path");
-var import_ink14 = __toESM(require_build2());
+var import_ink11 = __toESM(require_build2());
 var import_ink_spinner = __toESM(require_build4());
 var import_mime2 = __toESM(require_mime2());
 var import_minimatch = __toESM(require_minimatch2());
@@ -148746,7 +148806,7 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
   let attempts = 0;
   const getMissingHashes = /* @__PURE__ */ __name(async (skipCaching) => {
     if (skipCaching) {
-      console.debug("Force skipping cache");
+      logger.debug("Force skipping cache");
       return files.map(({ hash }) => hash);
     }
     try {
@@ -148801,9 +148861,7 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
     bucketOffset++;
   }
   let counter = fileMap.size - sortedFiles.length;
-  const { rerender, unmount } = (0, import_ink14.render)(
-    /* @__PURE__ */ import_react17.default.createElement(Progress, { done: counter, total: fileMap.size })
-  );
+  const { rerender, unmount } = renderProgress(counter, fileMap.size);
   const queue = new PQueue({ concurrency: BULK_UPLOAD_CONCURRENCY });
   for (const bucket of buckets) {
     if (bucket.files.length === 0)
@@ -148821,7 +148879,7 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
         }))
       );
       try {
-        console.debug("POST /pages/assets/upload");
+        logger.debug("POST /pages/assets/upload");
         const res = await fetchResult(`/pages/assets/upload`, {
           method: "POST",
           headers: {
@@ -148830,10 +148888,10 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
           },
           body: JSON.stringify(payload)
         });
-        console.debug("result:", res);
+        logger.debug("result:", res);
       } catch (e2) {
         if (attempts < MAX_UPLOAD_ATTEMPTS) {
-          console.debug("failed:", e2, "retrying...");
+          logger.debug("failed:", e2, "retrying...");
           await new Promise(
             (resolvePromise) => setTimeout(resolvePromise, Math.pow(2, attempts++) * 1e3)
           );
@@ -148842,7 +148900,7 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
           }
           return doUpload();
         } else {
-          console.debug("failed:", e2);
+          logger.debug("failed:", e2);
           throw e2;
         }
       }
@@ -148851,7 +148909,7 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
       () => doUpload().then(
         () => {
           counter += bucket.files.length;
-          rerender(/* @__PURE__ */ import_react17.default.createElement(Progress, { done: counter, total: fileMap.size }));
+          rerender(counter, fileMap.size);
         },
         (error) => {
           return Promise.reject(
@@ -148936,8 +148994,29 @@ function formatTime2(duration) {
   return `(${(duration / 1e3).toFixed(2)} sec)`;
 }
 __name(formatTime2, "formatTime");
+function renderProgress(done, total) {
+  if (isInteractive()) {
+    const { rerender, unmount } = (0, import_ink11.render)(
+      /* @__PURE__ */ import_react17.default.createElement(Progress, { done, total })
+    );
+    return {
+      rerender(done2, total2) {
+        rerender(/* @__PURE__ */ import_react17.default.createElement(Progress, { done: done2, total: total2 }));
+      },
+      unmount
+    };
+  } else {
+    const rerender = /* @__PURE__ */ __name((done2, total2) => {
+      logger.log(`Uploading... (${done2}/${total2})`);
+    }, "rerender");
+    rerender(done, total);
+    return { rerender, unmount() {
+    } };
+  }
+}
+__name(renderProgress, "renderProgress");
 function Progress({ done, total }) {
-  return /* @__PURE__ */ import_react17.default.createElement(import_react17.default.Fragment, null, /* @__PURE__ */ import_react17.default.createElement(import_ink14.Text, null, isInteractive() ? /* @__PURE__ */ import_react17.default.createElement(import_ink_spinner.default, { type: "earth" }) : null, ` Uploading... (${done}/${total})
+  return /* @__PURE__ */ import_react17.default.createElement(import_react17.default.Fragment, null, /* @__PURE__ */ import_react17.default.createElement(import_ink11.Text, null, isInteractive() ? /* @__PURE__ */ import_react17.default.createElement(import_ink_spinner.default, { type: "earth" }) : null, ` Uploading... (${done}/${total})
 `));
 }
 __name(Progress, "Progress");
@@ -149234,8 +149313,8 @@ var Handler9 = /* @__PURE__ */ __name(async ({
     let existingOrNew = "new";
     if (projects.length > 0) {
       existingOrNew = await new Promise((resolve16) => {
-        const { unmount } = (0, import_ink15.render)(
-          /* @__PURE__ */ import_react18.default.createElement(import_react18.default.Fragment, null, /* @__PURE__ */ import_react18.default.createElement(import_ink15.Text, null, "No project selected. Would you like to create one or use an existing project?"), /* @__PURE__ */ import_react18.default.createElement(
+        const { unmount } = (0, import_ink12.render)(
+          /* @__PURE__ */ import_react18.default.createElement(import_react18.default.Fragment, null, /* @__PURE__ */ import_react18.default.createElement(import_ink12.Text, null, "No project selected. Would you like to create one or use an existing project?"), /* @__PURE__ */ import_react18.default.createElement(
             import_ink_select_input3.default,
             {
               items: [
@@ -152218,7 +152297,7 @@ Switch out --local for ${import_chalk10.default.bold(
       );
     }
     __name(getDevReactElement, "getDevReactElement");
-    const devReactElement = (0, import_ink16.render)(await getDevReactElement(config));
+    const devReactElement = (0, import_ink13.render)(await getDevReactElement(config));
     let apiStopped = false;
     void devReactElement.waitUntilExit().then(() => {
       if (!apiStopped && typeof jest === "undefined")