@cloudflare/vite-plugin 1.57.2 → 1.58.0

package/dist/index.mjs

@@ -136,7 +136,7 @@ function createFatalError$1(message, isJson, options) {
 __name$6(createFatalError$1, "createFatalError");
 
 //#endregion
-//#region ../workers-utils/dist/chunk-JTB7VJSC.mjs
+//#region ../workers-utils/dist/chunk-IKXB77SR.mjs
 function hasKnownExportType(entry) {
 	const type = entry?.type;
 	return type === "durable-object" || type === "worker";
@@ -1440,114 +1440,7 @@ function applyEdits(text, edits) {
 	return text;
 }
 __name$6(applyEdits, "applyEdits");
-function getLineColFromPtr$1(string$3, ptr) {
-	let lines = string$3.slice(0, ptr).split(/\r\n|\n|\r/g);
-	return [lines.length, lines.pop().length + 1];
-}
-__name$6(getLineColFromPtr$1, "getLineColFromPtr");
-function makeCodeBlock$1(string$3, line, column) {
-	let lines = string$3.split(/\r\n|\n|\r/g);
-	let codeblock = "";
-	let numberLen = (Math.log10(line + 1) | 0) + 1;
-	for (let i$1 = line - 1; i$1 <= line + 1; i$1++) {
-		let l = lines[i$1 - 1];
-		if (!l) continue;
-		codeblock += i$1.toString().padEnd(numberLen, " ");
-		codeblock += ":  ";
-		codeblock += l;
-		codeblock += "\n";
-		if (i$1 === line) {
-			codeblock += " ".repeat(numberLen + column + 2);
-			codeblock += "^\n";
-		}
-	}
-	return codeblock;
-}
-__name$6(makeCodeBlock$1, "makeCodeBlock");
-var TomlError$1 = class extends Error {
-	static {
-		__name$6(this, "TomlError");
-	}
-	line;
-	column;
-	codeblock;
-	constructor(message, options) {
-		const [line, column] = getLineColFromPtr$1(options.toml, options.ptr);
-		const codeblock = makeCodeBlock$1(options.toml, line, column);
-		super(`Invalid TOML document: ${message}
-
-${codeblock}`, options);
-		this.line = line;
-		this.column = column;
-		this.codeblock = codeblock;
-	}
-};
-function isEscaped$1(str, ptr) {
-	let i$1 = 0;
-	while (str[ptr - ++i$1] === "\\");
-	return --i$1 && i$1 % 2;
-}
-__name$6(isEscaped$1, "isEscaped");
-function indexOfNewline$1(str, start = 0, end = str.length) {
-	let idx = str.indexOf("\n", start);
-	if (str[idx - 1] === "\r") idx--;
-	return idx <= end ? idx : -1;
-}
-__name$6(indexOfNewline$1, "indexOfNewline");
-function skipComment$1(str, ptr) {
-	for (let i$1 = ptr; i$1 < str.length; i$1++) {
-		let c$1 = str[i$1];
-		if (c$1 === "\n") return i$1;
-		if (c$1 === "\r" && str[i$1 + 1] === "\n") return i$1 + 1;
-		if (c$1 < " " && c$1 !== "	" || c$1 === "") throw new TomlError$1("control characters are not allowed in comments", {
-			toml: str,
-			ptr
-		});
-	}
-	return str.length;
-}
-__name$6(skipComment$1, "skipComment");
-function skipVoid$1(str, ptr, banNewLines, banComments) {
-	let c$1;
-	while ((c$1 = str[ptr]) === " " || c$1 === "	" || !banNewLines && (c$1 === "\n" || c$1 === "\r" && str[ptr + 1] === "\n")) ptr++;
-	return banComments || c$1 !== "#" ? ptr : skipVoid$1(str, skipComment$1(str, ptr), banNewLines);
-}
-__name$6(skipVoid$1, "skipVoid");
-function skipUntil$1(str, ptr, sep$1, end, banNewLines = false) {
-	if (!end) {
-		ptr = indexOfNewline$1(str, ptr);
-		return ptr < 0 ? str.length : ptr;
-	}
-	for (let i$1 = ptr; i$1 < str.length; i$1++) {
-		let c$1 = str[i$1];
-		if (c$1 === "#") i$1 = indexOfNewline$1(str, i$1);
-		else if (c$1 === sep$1) return i$1 + 1;
-		else if (c$1 === end || banNewLines && (c$1 === "\n" || c$1 === "\r" && str[i$1 + 1] === "\n")) return i$1;
-	}
-	throw new TomlError$1("cannot find end of structure", {
-		toml: str,
-		ptr
-	});
-}
-__name$6(skipUntil$1, "skipUntil");
-function getStringEnd$1(str, seek) {
-	let first = str[seek];
-	let target$1 = first === str[seek + 1] && str[seek + 1] === str[seek + 2] ? str.slice(seek, seek + 3) : first;
-	seek += target$1.length - 1;
-	do
-		seek = str.indexOf(target$1, ++seek);
-	while (seek > -1 && first !== "'" && isEscaped$1(str, seek));
-	if (seek > -1) {
-		seek += target$1.length;
-		if (target$1.length > 1) {
-			if (str[seek] === first) seek++;
-			if (str[seek] === first) seek++;
-		}
-	}
-	return seek;
-}
-__name$6(getStringEnd$1, "getStringEnd");
-var DATE_TIME_RE$1 = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}:\d{2}(?:\.\d+)?)?(Z|[-+]\d{2}:\d{2})?$/i;
+var DATE_TIME_RE$1 = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}(?::\d{2}(?:\.\d+)?)?)?(Z|[-+]\d{2}:\d{2})?$/i;
 var TomlDate$1 = class _TomlDate extends Date {
 	static {
 		__name$6(this, "TomlDate");
@@ -1631,305 +1524,380 @@ var TomlDate$1 = class _TomlDate extends Date {
 		return date$3;
 	}
 };
+function getLineColFromPtr$1(string$3, ptr) {
+	let lines = string$3.slice(0, ptr).split(/\r\n|\n|\r/g);
+	return [lines.length, lines.pop().length + 1];
+}
+__name$6(getLineColFromPtr$1, "getLineColFromPtr");
+function makeCodeBlock$1(string$3, line, column) {
+	let lines = string$3.split(/\r\n|\n|\r/g);
+	let codeblock = "";
+	let numberLen = (Math.log10(line + 1) | 0) + 1;
+	for (let i$1 = line - 1; i$1 <= line + 1; i$1++) {
+		let l = lines[i$1 - 1];
+		if (!l) continue;
+		codeblock += i$1.toString().padEnd(numberLen, " ");
+		codeblock += ":  ";
+		codeblock += l;
+		codeblock += "\n";
+		if (i$1 === line) {
+			codeblock += " ".repeat(numberLen + column + 2);
+			codeblock += "^\n";
+		}
+	}
+	return codeblock;
+}
+__name$6(makeCodeBlock$1, "makeCodeBlock");
+var TomlError$1 = class extends Error {
+	static {
+		__name$6(this, "TomlError");
+	}
+	line;
+	column;
+	codeblock;
+	constructor(message, options) {
+		const [line, column] = getLineColFromPtr$1(options.toml, options.ptr);
+		const codeblock = makeCodeBlock$1(options.toml, line, column);
+		super(`Invalid TOML document: ${message}
+
+${codeblock}`, options);
+		this.line = line;
+		this.column = column;
+		this.codeblock = codeblock;
+	}
+};
+function indexOfNewline$1(str, start = 0) {
+	let idx = str.indexOf("\n", start);
+	if (str.charCodeAt(idx - 1) === 13) idx--;
+	return idx;
+}
+__name$6(indexOfNewline$1, "indexOfNewline");
+function skipComment$1(ctx) {
+	for (; ctx.p < ctx.s.length; ctx.p++) {
+		let c$1 = ctx.s.charCodeAt(ctx.p);
+		if (c$1 === 10) break;
+		if (c$1 === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10) {
+			ctx.p++;
+			break;
+		}
+		if (c$1 < 32 && c$1 !== 9 || c$1 === 127) throw new TomlError$1("control characters are not allowed in comments", {
+			toml: ctx.s,
+			ptr: ctx.p
+		});
+	}
+}
+__name$6(skipComment$1, "skipComment");
+function skipVoid$1(ctx, banNewLines, banComments) {
+	let c$1;
+	while (1) {
+		while ((c$1 = ctx.s.charCodeAt(ctx.p)) === 32 || c$1 === 9 || !banNewLines && (c$1 === 10 || c$1 === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10)) ctx.p++;
+		if (banComments || c$1 !== 35) break;
+		skipComment$1(ctx);
+	}
+}
+__name$6(skipVoid$1, "skipVoid");
+function skipUntil$1(ctx, sep$1, end) {
+	let ptr = ctx.p;
+	if (!end) {
+		ptr = indexOfNewline$1(ctx.s, ptr);
+		ctx.p = ptr < 0 ? ctx.s.length : ptr;
+		return;
+	}
+	for (; ctx.p < ctx.s.length; ctx.p++) {
+		let c$1 = ctx.s.charCodeAt(ctx.p);
+		if (c$1 === 35) skipComment$1(ctx);
+		else if (c$1 === end || c$1 === sep$1) return;
+	}
+	throw new TomlError$1("cannot find end of structure", {
+		toml: ctx.s,
+		ptr
+	});
+}
+__name$6(skipUntil$1, "skipUntil");
 var INT_REGEX$1 = /^((0x[0-9a-fA-F](_?[0-9a-fA-F])*)|(([+-]|0[ob])?\d(_?\d)*))$/;
 var FLOAT_REGEX$1 = /^[+-]?\d(_?\d)*(\.\d(_?\d)*)?([eE][+-]?\d(_?\d)*)?$/;
 var LEADING_ZERO$1 = /^[+-]?0[0-9_]/;
-var ESCAPE_REGEX$1 = /^[0-9a-f]{4,8}$/i;
-var ESC_MAP$1 = {
-	b: "\b",
-	t: "	",
-	n: "\n",
-	f: "\f",
-	r: "\r",
-	"\"": "\"",
-	"\\": "\\"
-};
-function parseString$1(str, ptr = 0, endPtr = str.length) {
-	let isLiteral = str[ptr] === "'";
-	let isMultiline = str[ptr++] === str[ptr] && str[ptr] === str[ptr + 1];
+function parseString$1(ctx) {
+	let start = ctx.p;
+	let c$1 = ctx.s.charCodeAt(ctx.p++);
+	let first = c$1;
+	let isLiteral = c$1 === 39;
+	let isMultiline = c$1 === ctx.s.charCodeAt(ctx.p) && c$1 === ctx.s.charCodeAt(ctx.p + 1);
 	if (isMultiline) {
-		endPtr -= 2;
-		if (str[ptr += 2] === "\r") ptr++;
-		if (str[ptr] === "\n") ptr++;
+		if ((c$1 = ctx.s.charCodeAt(ctx.p += 2)) === 10) ctx.p++;
+		else if (c$1 === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10) ctx.p += 2;
 	}
-	let tmp = 0;
-	let isEscape;
 	let parsed = "";
-	let sliceStart = ptr;
-	while (ptr < endPtr - 1) {
-		let c$1 = str[ptr++];
-		if (c$1 === "\n" || c$1 === "\r" && str[ptr] === "\n") {
-			if (!isMultiline) throw new TomlError$1("newlines are not allowed in strings", {
-				toml: str,
-				ptr: ptr - 1
-			});
-		} else if (c$1 < " " && c$1 !== "	" || c$1 === "") throw new TomlError$1("control characters are not allowed in strings", {
-			toml: str,
-			ptr: ptr - 1
-		});
-		if (isEscape) {
-			isEscape = false;
-			if (c$1 === "u" || c$1 === "U") {
-				let code = str.slice(ptr, ptr += c$1 === "u" ? 4 : 8);
-				if (!ESCAPE_REGEX$1.test(code)) throw new TomlError$1("invalid unicode escape", {
-					toml: str,
-					ptr: tmp
-				});
-				try {
-					parsed += String.fromCodePoint(parseInt(code, 16));
-				} catch {
-					throw new TomlError$1("invalid unicode escape", {
-						toml: str,
-						ptr: tmp
-					});
-				}
-			} else if (isMultiline && (c$1 === "\n" || c$1 === " " || c$1 === "	" || c$1 === "\r")) {
-				ptr = skipVoid$1(str, ptr - 1, true);
-				if (str[ptr] !== "\n" && str[ptr] !== "\r") throw new TomlError$1("invalid escape: only line-ending whitespace may be escaped", {
-					toml: str,
-					ptr: tmp
+	let sliceStart = ctx.p;
+	let state = 0;
+	for (; ctx.p < ctx.s.length; ctx.p++) {
+		c$1 = ctx.s.charCodeAt(ctx.p);
+		if (isMultiline && (c$1 === 10 || c$1 === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10)) state = state && 3;
+		else if (c$1 < 32 && c$1 !== 9 || c$1 === 127) throw new TomlError$1("control characters are not allowed in strings", {
+			toml: ctx.s,
+			ptr: ctx.p
+		});
+		else if ((!state || state === 3) && c$1 === first && (!isMultiline || ctx.s.charCodeAt(ctx.p + 1) === first && ctx.s.charCodeAt(ctx.p + 2) === first)) {
+			if (isMultiline) {
+				if (ctx.s.charCodeAt(ctx.p + 3) === first) ctx.p++;
+				if (ctx.s.charCodeAt(ctx.p + 3) === first) ctx.p++;
+			}
+			if (!state) parsed += ctx.s.slice(sliceStart, ctx.p);
+			ctx.p += isMultiline ? 3 : 1;
+			return parsed;
+		} else if (!state) {
+			if (!isLiteral && c$1 === 92) {
+				parsed += ctx.s.slice(sliceStart, sliceStart = ctx.p);
+				state = 1;
+			}
+		} else if (state === 1) if (c$1 === 120 || c$1 === 117 || c$1 === 85) {
+			let value = 0;
+			let len = c$1 === 120 ? 2 : c$1 === 117 ? 4 : 8;
+			for (let j$1 = 0; j$1 < len; j$1++, ctx.p++) {
+				let hex$1 = ctx.s.charCodeAt(ctx.p + 1);
+				let digit = hex$1 >= 48 && hex$1 <= 57 ? hex$1 - 48 : hex$1 >= 65 && hex$1 <= 70 ? hex$1 - 65 + 10 : hex$1 >= 97 && hex$1 <= 102 ? hex$1 - 97 + 10 : -1;
+				if (digit < 0) throw new TomlError$1("invalid non-hex character in unicode escape", {
+					toml: ctx.s,
+					ptr: ctx.p + 1
 				});
-				ptr = skipVoid$1(str, ptr);
-			} else if (c$1 in ESC_MAP$1) parsed += ESC_MAP$1[c$1];
+				value = value << 4 | digit;
+			}
+			if (value < 0 || value > 1114111 || value >= 55296 && value <= 57343) throw new TomlError$1("invalid unicode escape", {
+				toml: ctx.s,
+				ptr: ctx.p
+			});
+			parsed += String.fromCodePoint(value);
+			sliceStart = ctx.p + 1;
+			state = 0;
+		} else if (c$1 === 32 || c$1 === 9) state = 2;
+		else {
+			if (c$1 === 98) parsed += "\b";
+			else if (c$1 === 116) parsed += "	";
+			else if (c$1 === 110) parsed += "\n";
+			else if (c$1 === 102) parsed += "\f";
+			else if (c$1 === 114) parsed += "\r";
+			else if (c$1 === 101) parsed += "\x1B";
+			else if (c$1 === 34) parsed += "\"";
+			else if (c$1 === 92) parsed += "\\";
 			else throw new TomlError$1("unrecognized escape sequence", {
-				toml: str,
-				ptr: tmp
+				toml: ctx.s,
+				ptr: ctx.p
+			});
+			sliceStart = ctx.p + 1;
+			state = 0;
+		}
+		else if (c$1 !== 32 && c$1 !== 9) {
+			if (state === 2) throw new TomlError$1("invalid escape: only line-ending whitespace may be escaped", {
+				toml: ctx.s,
+				ptr: sliceStart
 			});
-			sliceStart = ptr;
-		} else if (!isLiteral && c$1 === "\\") {
-			tmp = ptr - 1;
-			isEscape = true;
-			parsed += str.slice(sliceStart, tmp);
+			state = !isLiteral && c$1 === 92 ? 1 : 0;
+			sliceStart = ctx.p;
 		}
 	}
-	return parsed + str.slice(sliceStart, endPtr - 1);
+	throw new TomlError$1("unfinished string", {
+		toml: ctx.s,
+		ptr: start
+	});
 }
 __name$6(parseString$1, "parseString");
-function parseValue$1(value, toml, ptr, integersAsBigInt) {
-	if (value === "true") return true;
-	if (value === "false") return false;
+function sliceAndTrimEndOf$1(ctx, start, end) {
+	let value = ctx.s.slice(start, end);
+	let commentIdx = value.indexOf("#");
+	if (commentIdx > 0) {
+		skipComment$1({
+			s: value,
+			p: commentIdx
+		});
+		value = value.slice(0, commentIdx);
+	}
+	return value.trimEnd();
+}
+__name$6(sliceAndTrimEndOf$1, "sliceAndTrimEndOf");
+function parseValue$1(ctx, integersAsBigInt, end) {
+	let ptr = ctx.p;
+	let err = {
+		toml: ctx.s,
+		ptr
+	};
+	skipUntil$1(ctx, 44, end);
+	let value = sliceAndTrimEndOf$1(ctx, ptr, ctx.p);
+	if (!value) throw new TomlError$1("incomplete declaration: value expected", err);
 	if (value === "-inf") return -Infinity;
 	if (value === "inf" || value === "+inf") return Infinity;
 	if (value === "nan" || value === "+nan" || value === "-nan") return NaN;
 	if (value === "-0") return integersAsBigInt ? 0n : 0;
 	let isInt = INT_REGEX$1.test(value);
 	if (isInt || FLOAT_REGEX$1.test(value)) {
-		if (LEADING_ZERO$1.test(value)) throw new TomlError$1("leading zeroes are not allowed", {
-			toml,
-			ptr
-		});
+		if (LEADING_ZERO$1.test(value)) throw new TomlError$1("leading zeroes are not allowed", err);
 		value = value.replace(/_/g, "");
 		let numeric$1 = +value;
-		if (isNaN(numeric$1)) throw new TomlError$1("invalid number", {
-			toml,
-			ptr
-		});
+		if (isNaN(numeric$1)) throw new TomlError$1("invalid number", err);
 		if (isInt) {
-			if ((isInt = !Number.isSafeInteger(numeric$1)) && !integersAsBigInt) throw new TomlError$1("integer value cannot be represented losslessly", {
-				toml,
-				ptr
-			});
+			if ((isInt = !Number.isSafeInteger(numeric$1)) && !integersAsBigInt) throw new TomlError$1("integer value cannot be represented losslessly", err);
 			if (isInt || integersAsBigInt === true) numeric$1 = BigInt(value);
 		}
 		return numeric$1;
 	}
 	const date$3 = new TomlDate$1(value);
-	if (!date$3.isValid()) throw new TomlError$1("invalid value", {
-		toml,
-		ptr
-	});
+	if (!date$3.isValid()) throw new TomlError$1("invalid value", err);
 	return date$3;
 }
 __name$6(parseValue$1, "parseValue");
-function sliceAndTrimEndOf$1(str, startPtr, endPtr, allowNewLines) {
-	let value = str.slice(startPtr, endPtr);
-	let commentIdx = value.indexOf("#");
-	if (commentIdx > -1) {
-		skipComment$1(str, commentIdx);
-		value = value.slice(0, commentIdx);
-	}
-	let trimmed = value.trimEnd();
-	if (!allowNewLines) {
-		let newlineIdx = value.indexOf("\n", trimmed.length);
-		if (newlineIdx > -1) throw new TomlError$1("newlines are not allowed in inline tables", {
-			toml: str,
-			ptr: startPtr + newlineIdx
+function extractValue$1(ctx, end, integersAsBigInt) {
+	let ptr = ctx.p;
+	let c$1 = ctx.s.charCodeAt(ptr);
+	if (c$1 === 91 || c$1 === 123) {
+		if (!ctx.d--) throw new TomlError$1("document contains excessively nested structures. aborting.", {
+			toml: ctx.s,
+			ptr
 		});
+		let value = c$1 === 91 ? parseArray$1(ctx, integersAsBigInt) : parseInlineTable$1(ctx, integersAsBigInt);
+		ctx.d++;
+		return value;
 	}
-	return [trimmed, commentIdx];
-}
-__name$6(sliceAndTrimEndOf$1, "sliceAndTrimEndOf");
-function extractValue$1(str, ptr, end, depth$1, integersAsBigInt) {
-	if (depth$1 === 0) throw new TomlError$1("document contains excessively nested structures. aborting.", {
-		toml: str,
-		ptr
-	});
-	let c$1 = str[ptr];
-	if (c$1 === "[" || c$1 === "{") {
-		let [value, endPtr2] = c$1 === "[" ? parseArray$1(str, ptr, depth$1, integersAsBigInt) : parseInlineTable$1(str, ptr, depth$1, integersAsBigInt);
-		let newPtr = end ? skipUntil$1(str, endPtr2, ",", end) : endPtr2;
-		if (endPtr2 - newPtr && end === "}") {
-			let nextNewLine = indexOfNewline$1(str, endPtr2, newPtr);
-			if (nextNewLine > -1) throw new TomlError$1("newlines are not allowed in inline tables", {
-				toml: str,
-				ptr: nextNewLine
-			});
-		}
-		return [value, newPtr];
-	}
-	let endPtr;
-	if (c$1 === "\"" || c$1 === "'") {
-		endPtr = getStringEnd$1(str, ptr);
-		let parsed = parseString$1(str, ptr, endPtr);
-		if (end) {
-			endPtr = skipVoid$1(str, endPtr, end !== "]");
-			if (str[endPtr] && str[endPtr] !== "," && str[endPtr] !== end && str[endPtr] !== "\n" && str[endPtr] !== "\r") throw new TomlError$1("unexpected character encountered", {
-				toml: str,
-				ptr: endPtr
-			});
-			endPtr += +(str[endPtr] === ",");
-		}
-		return [parsed, endPtr];
+	if (c$1 === 34 || c$1 === 39) return parseString$1(ctx);
+	if (c$1 === 116) {
+		if (ctx.s.charCodeAt(++ctx.p) !== 114 || ctx.s.charCodeAt(++ctx.p) !== 117 || ctx.s.charCodeAt(++ctx.p) !== 101) throw new TomlError$1("invalid value", {
+			toml: ctx.s,
+			ptr
+		});
+		ctx.p++;
+		return true;
 	}
-	endPtr = skipUntil$1(str, ptr, ",", end);
-	let slice = sliceAndTrimEndOf$1(str, ptr, endPtr - +(str[endPtr - 1] === ","), end === "]");
-	if (!slice[0]) throw new TomlError$1("incomplete key-value declaration: no value specified", {
-		toml: str,
-		ptr
-	});
-	if (end && slice[1] > -1) {
-		endPtr = skipVoid$1(str, ptr + slice[1]);
-		endPtr += +(str[endPtr] === ",");
+	if (c$1 === 102) {
+		if (ctx.s.charCodeAt(++ctx.p) !== 97 || ctx.s.charCodeAt(++ctx.p) !== 108 || ctx.s.charCodeAt(++ctx.p) !== 115 || ctx.s.charCodeAt(++ctx.p) !== 101) throw new TomlError$1("invalid value", {
+			toml: ctx.s,
+			ptr
+		});
+		ctx.p++;
+		return false;
 	}
-	return [parseValue$1(slice[0], str, ptr, integersAsBigInt), endPtr];
+	return parseValue$1(ctx, integersAsBigInt, end);
 }
 __name$6(extractValue$1, "extractValue");
 var KEY_PART_RE$1 = /^[a-zA-Z0-9-_]+[ \t]*$/;
-function parseKey$1(str, ptr, end = "=") {
-	let dot = ptr - 1;
+function parseKey$1(ctx, end = "=") {
+	let start = ctx.p;
+	let dot = start - 1;
 	let parsed = [];
-	let endPtr = str.indexOf(end, ptr);
+	let endPtr = ctx.s.indexOf(end, start);
 	if (endPtr < 0) throw new TomlError$1("incomplete key-value: cannot find end of key", {
-		toml: str,
-		ptr
+		toml: ctx.s,
+		ptr: start
 	});
 	do {
-		let c$1 = str[ptr = ++dot];
-		if (c$1 !== " " && c$1 !== "	") if (c$1 === "\"" || c$1 === "'") {
-			if (c$1 === str[ptr + 1] && c$1 === str[ptr + 2]) throw new TomlError$1("multiline strings are not allowed in keys", {
-				toml: str,
-				ptr
+		let c$1 = ctx.s.charCodeAt(ctx.p = ++dot);
+		if (c$1 !== 32 && c$1 !== 9) if (c$1 === 34 || c$1 === 39) {
+			if (c$1 === ctx.s.charCodeAt(ctx.p + 1) && c$1 === ctx.s.charCodeAt(ctx.p + 2)) throw new TomlError$1("multiline strings are not allowed in keys", {
+				toml: ctx.s,
+				ptr: ctx.p
 			});
-			let eos = getStringEnd$1(str, ptr);
-			if (eos < 0) throw new TomlError$1("unfinished string encountered", {
-				toml: str,
-				ptr
-			});
-			dot = str.indexOf(".", eos);
-			let strEnd = str.slice(eos, dot < 0 || dot > endPtr ? endPtr : dot);
+			let part = parseString$1(ctx);
+			dot = ctx.s.indexOf(".", ctx.p);
+			let strEnd = ctx.s.slice(ctx.p, dot < 0 || dot > endPtr ? endPtr : dot);
 			let newLine = indexOfNewline$1(strEnd);
 			if (newLine > -1) throw new TomlError$1("newlines are not allowed in keys", {
-				toml: str,
-				ptr: ptr + dot + newLine
+				toml: ctx.s,
+				ptr: newLine
 			});
 			if (strEnd.trimStart()) throw new TomlError$1("found extra tokens after the string part", {
-				toml: str,
-				ptr: eos
+				toml: ctx.s,
+				ptr: ctx.p
 			});
-			if (endPtr < eos) {
-				endPtr = str.indexOf(end, eos);
+			if (endPtr < ctx.p) {
+				endPtr = ctx.s.indexOf(end, ctx.p);
 				if (endPtr < 0) throw new TomlError$1("incomplete key-value: cannot find end of key", {
-					toml: str,
-					ptr
+					toml: ctx.s,
+					ptr: start
 				});
 			}
-			parsed.push(parseString$1(str, ptr, eos));
+			parsed.push(part);
 		} else {
-			dot = str.indexOf(".", ptr);
-			let part = str.slice(ptr, dot < 0 || dot > endPtr ? endPtr : dot);
+			dot = ctx.s.indexOf(".", ctx.p);
+			let part = ctx.s.slice(ctx.p, dot < 0 || dot > endPtr ? endPtr : dot);
 			if (!KEY_PART_RE$1.test(part)) throw new TomlError$1("only letter, numbers, dashes and underscores are allowed in keys", {
-				toml: str,
-				ptr
+				toml: ctx.s,
+				ptr: ctx.p
 			});
 			parsed.push(part.trimEnd());
 		}
 	} while (dot + 1 && dot < endPtr);
-	return [parsed, skipVoid$1(str, endPtr + 1, true, true)];
+	ctx.p = endPtr + 1;
+	skipVoid$1(ctx, true, true);
+	return parsed;
 }
 __name$6(parseKey$1, "parseKey");
-function parseInlineTable$1(str, ptr, depth$1, integersAsBigInt) {
+function parseInlineTable$1(ctx, integersAsBigInt) {
 	let res = {};
 	let seen = /* @__PURE__ */ new Set();
 	let c$1;
-	let comma$1 = 0;
-	ptr++;
-	while ((c$1 = str[ptr++]) !== "}" && c$1) {
-		let err = {
-			toml: str,
-			ptr: ptr - 1
-		};
-		if (c$1 === "\n") throw new TomlError$1("newlines are not allowed in inline tables", err);
-		else if (c$1 === "#") throw new TomlError$1("inline tables cannot contain comments", err);
-		else if (c$1 === ",") throw new TomlError$1("expected key-value, found comma", err);
-		else if (c$1 !== " " && c$1 !== "	") {
-			let k;
-			let t$5 = res;
-			let hasOwn$1 = false;
-			let [key, keyEndPtr] = parseKey$1(str, ptr - 1);
-			for (let i$1 = 0; i$1 < key.length; i$1++) {
-				if (i$1) t$5 = hasOwn$1 ? t$5[k] : t$5[k] = {};
-				k = key[i$1];
-				if ((hasOwn$1 = Object.hasOwn(t$5, k)) && (typeof t$5[k] !== "object" || seen.has(t$5[k]))) throw new TomlError$1("trying to redefine an already defined value", {
-					toml: str,
-					ptr
-				});
-				if (!hasOwn$1 && k === "__proto__") Object.defineProperty(t$5, k, {
-					enumerable: true,
-					configurable: true,
-					writable: true
-				});
-			}
-			if (hasOwn$1) throw new TomlError$1("trying to redefine an already defined value", {
-				toml: str,
-				ptr
+	ctx.p++;
+	while (ctx.p < ctx.s.length) {
+		skipVoid$1(ctx);
+		if ((c$1 = ctx.s.charCodeAt(ctx.p)) === 125) {
+			ctx.p++;
+			return res;
+		}
+		let k;
+		let t$5 = res;
+		let hasOwn$1 = false;
+		let p$2 = ctx.p;
+		let key = parseKey$1(ctx);
+		for (let i$1 = 0; i$1 < key.length; i$1++) {
+			if (i$1) t$5 = hasOwn$1 ? t$5[k] : t$5[k] = {};
+			k = key[i$1];
+			if ((hasOwn$1 = Object.hasOwn(t$5, k)) && (typeof t$5[k] !== "object" || seen.has(t$5[k]))) throw new TomlError$1("trying to redefine an already defined value", {
+				toml: ctx.s,
+				ptr: p$2
+			});
+			if (!hasOwn$1 && k === "__proto__") Object.defineProperty(t$5, k, {
+				enumerable: true,
+				configurable: true,
+				writable: true
 			});
-			let [value, valueEndPtr] = extractValue$1(str, keyEndPtr, "}", depth$1 - 1, integersAsBigInt);
-			seen.add(value);
-			t$5[k] = value;
-			ptr = valueEndPtr;
-			comma$1 = str[ptr - 1] === "," ? ptr - 1 : 0;
 		}
+		if (hasOwn$1) throw new TomlError$1("trying to redefine an already defined value", {
+			toml: ctx.s,
+			ptr: ctx.p
+		});
+		let value = extractValue$1(ctx, 125, integersAsBigInt);
+		seen.add(t$5[k] = value);
+		skipVoid$1(ctx);
+		if ((c$1 = ctx.s.charCodeAt(ctx.p++)) === 125) return res;
+		if (c$1 !== 44) throw new TomlError$1("expected comma or end of structure", {
+			toml: ctx.s,
+			ptr: ctx.p - 1
+		});
 	}
-	if (comma$1) throw new TomlError$1("trailing commas are not allowed in inline tables", {
-		toml: str,
-		ptr: comma$1
+	throw new TomlError$1("unfinished table encountered", {
+		toml: ctx.s,
+		ptr: ctx.p
 	});
-	if (!c$1) throw new TomlError$1("unfinished table encountered", {
-		toml: str,
-		ptr
-	});
-	return [res, ptr];
 }
 __name$6(parseInlineTable$1, "parseInlineTable");
-function parseArray$1(str, ptr, depth$1, integersAsBigInt) {
+function parseArray$1(ctx, integersAsBigInt) {
 	let res = [];
 	let c$1;
-	ptr++;
-	while ((c$1 = str[ptr++]) !== "]" && c$1) if (c$1 === ",") throw new TomlError$1("expected value, found comma", {
-		toml: str,
-		ptr: ptr - 1
-	});
-	else if (c$1 === "#") ptr = skipComment$1(str, ptr);
-	else if (c$1 !== " " && c$1 !== "	" && c$1 !== "\n" && c$1 !== "\r") {
-		let e = extractValue$1(str, ptr - 1, "]", depth$1 - 1, integersAsBigInt);
-		res.push(e[0]);
-		ptr = e[1];
-	}
-	if (!c$1) throw new TomlError$1("unfinished array encountered", {
-		toml: str,
-		ptr
+	ctx.p++;
+	while (ctx.p < ctx.s.length) {
+		skipVoid$1(ctx);
+		if ((c$1 = ctx.s.charCodeAt(ctx.p)) === 93) {
+			ctx.p++;
+			return res;
+		}
+		res.push(extractValue$1(ctx, 93, integersAsBigInt));
+		skipVoid$1(ctx);
+		if ((c$1 = ctx.s.charCodeAt(ctx.p++)) === 93) return res;
+		if (c$1 !== 44) throw new TomlError$1("expected comma or end of structure", {
+			toml: ctx.s,
+			ptr: ctx.p - 1
+		});
+	}
+	throw new TomlError$1("unfinished array encountered", {
+		toml: ctx.s,
+		ptr: ctx.p
 	});
-	return [res, ptr];
 }
 __name$6(parseArray$1, "parseArray");
 function peekTable$1(key, table, meta$3, type) {
@@ -1999,46 +1967,51 @@ function peekTable$1(key, table, meta$3, type) {
 }
 __name$6(peekTable$1, "peekTable");
 function parse3(toml, { maxDepth = 1e3, integersAsBigInt } = {}) {
+	let ctx = {
+		s: toml,
+		p: 0,
+		d: maxDepth
+	};
 	let res = {};
 	let meta$3 = {};
+	let tmp;
 	let tbl = res;
 	let m = meta$3;
-	for (let ptr = skipVoid$1(toml, 0); ptr < toml.length;) {
-		if (toml[ptr] === "[") {
-			let isTableArray = toml[++ptr] === "[";
-			let k = parseKey$1(toml, ptr += +isTableArray, "]");
+	skipVoid$1(ctx);
+	while (ctx.p < toml.length) {
+		if (toml.charCodeAt(ctx.p) === 91) {
+			let isTableArray = toml.charCodeAt(++ctx.p) === 91;
+			tmp = ctx.p += +isTableArray;
+			let k = parseKey$1(ctx, "]");
 			if (isTableArray) {
-				if (toml[k[1] - 1] !== "]") throw new TomlError$1("expected end of table declaration", {
+				if (toml.charCodeAt(ctx.p - 1) !== 93) throw new TomlError$1("expected end of table declaration", {
 					toml,
-					ptr: k[1] - 1
+					ptr: ctx.p - 1
 				});
-				k[1]++;
+				ctx.p++;
 			}
-			let p$2 = peekTable$1(k[0], res, meta$3, isTableArray ? 2 : 1);
+			let p$2 = peekTable$1(k, res, meta$3, isTableArray ? 2 : 1);
 			if (!p$2) throw new TomlError$1("trying to redefine an already defined table or value", {
 				toml,
-				ptr
+				ptr: tmp
 			});
 			m = p$2[2];
 			tbl = p$2[1];
-			ptr = k[1];
 		} else {
-			let k = parseKey$1(toml, ptr);
-			let p$2 = peekTable$1(k[0], tbl, m, 0);
+			tmp = ctx.p;
+			let p$2 = peekTable$1(parseKey$1(ctx), tbl, m, 0);
 			if (!p$2) throw new TomlError$1("trying to redefine an already defined table or value", {
 				toml,
-				ptr
+				ptr: tmp
 			});
-			let v = extractValue$1(toml, k[1], void 0, maxDepth, integersAsBigInt);
-			p$2[1][p$2[0]] = v[0];
-			ptr = v[1];
+			p$2[1][p$2[0]] = extractValue$1(ctx, void 0, integersAsBigInt);
 		}
-		ptr = skipVoid$1(toml, ptr, true);
-		if (toml[ptr] && toml[ptr] !== "\n" && toml[ptr] !== "\r") throw new TomlError$1("each key-value declaration must be followed by an end-of-line", {
+		skipVoid$1(ctx, true);
+		if (ctx.p < toml.length && (tmp = toml.charCodeAt(ctx.p)) !== 10 && tmp !== 13) throw new TomlError$1("each key-value declaration must be followed by an end-of-line", {
 			toml,
-			ptr
+			ptr: ctx.p
 		});
-		ptr = skipVoid$1(toml, ptr);
+		skipVoid$1(ctx);
 	}
 	return res;
 }
@@ -2048,7 +2021,8 @@ function extendedTypeOf$1(obj) {
 	let type = typeof obj;
 	if (type === "object") {
 		if (Array.isArray(obj)) return "array";
-		if (obj instanceof Date) return "date";
+		if (typeof obj?.getUTCDate === "function" && obj instanceof Date) return "date";
+		if (globalThis.Temporal && typeof obj?.since === "function" && (obj instanceof Temporal.Instant || obj instanceof Temporal.PlainDate || obj instanceof Temporal.PlainDateTime || obj instanceof Temporal.PlainTime || obj instanceof Temporal.ZonedDateTime)) return "temporal";
 	}
 	return type;
 }
@@ -2062,23 +2036,31 @@ function formatString$1(s) {
 	return JSON.stringify(s).replace(/\x7f/g, "\\u007f");
 }
 __name$6(formatString$1, "formatString");
+function stringifyTemporal$1(temporal) {
+	return temporal.toString({
+		calendarName: "never",
+		timeZoneName: "never"
+	});
+}
+__name$6(stringifyTemporal$1, "stringifyTemporal");
 function stringifyValue$1(val, type, depth$1, numberAsFloat) {
 	if (depth$1 === 0) throw new Error("Could not stringify the object: maximum object depth exceeded");
-	if (type === "number") {
-		if (isNaN(val)) return "nan";
-		if (val === Infinity) return "inf";
-		if (val === -Infinity) return "-inf";
-		if (numberAsFloat && Number.isInteger(val)) return val.toFixed(1);
-		return val.toString();
-	}
-	if (type === "bigint" || type === "boolean") return val.toString();
-	if (type === "string") return formatString$1(val);
-	if (type === "date") {
-		if (isNaN(val.getTime())) throw new TypeError("cannot serialize invalid date");
-		return val.toISOString();
-	}
-	if (type === "object") return stringifyInlineTable$1(val, depth$1, numberAsFloat);
-	if (type === "array") return stringifyArray$1(val, depth$1, numberAsFloat);
+	switch (type) {
+		case "number":
+			if (isNaN(val)) return "nan";
+			if (val === Infinity) return "inf";
+			if (val === -Infinity) return "-inf";
+			if (Number.isInteger(val) && (numberAsFloat || !Number.isSafeInteger(val))) return val.toFixed(1);
+		case "bigint":
+		case "boolean": return val.toString();
+		case "string": return formatString$1(val);
+		case "date":
+			if (isNaN(val.getTime())) throw new TypeError("cannot serialize invalid date");
+			return val.toISOString();
+		case "object": return stringifyInlineTable$1(val, depth$1, numberAsFloat);
+		case "array": return stringifyArray$1(val, depth$1, numberAsFloat);
+		case "temporal": return stringifyTemporal$1(val);
+	}
 }
 __name$6(stringifyValue$1, "stringifyValue");
 function stringifyInlineTable$1(obj, depth$1, numberAsFloat) {
@@ -56736,7 +56718,7 @@ var import_dist = (/* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/ts-d
 	exports$1.dedent = dedent$1$1;
 }) }))();
 /**
-* Generate the content for worker-configuration.d.ts
+* Generate the content for a Worker types declaration file.
 *
 * @example
 * ```typescript
@@ -56744,10 +56726,10 @@ var import_dist = (/* @__PURE__ */ __commonJS$1({ "../../node_modules/.pnpm/ts-d
 * import { writeFileSync } from "node:fs";
 *
 * const content = generateTypes({
-*   configPath: "./cloudflare.config.ts",
+*   configPath: "../../cloudflare.config.ts",
 * });
 *
-* writeFileSync("worker-configuration.d.ts", content);
+* writeFileSync(".cloudflare/types/index.d.ts", content);
 * ```
 */
 function generateTypes({ configPath, packageName = "@cloudflare/config" }) {
@@ -65424,7 +65406,6 @@ async function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 		const result = await loadNewConfig({
 			root,
 			mode: viteEnv.mode,
-			command: viteEnv.command,
 			types: resolvedNewConfig.types
 		});
 		configPath = result.configPath;
@@ -65555,7 +65536,7 @@ function resolveWorker(workerConfig, devOnly, parsedNewWorkerConfig) {
 	};
 }
 const NEW_CONFIG_FILENAME = "cloudflare.config.ts";
-const TYPES_OUTPUT_FILENAME = "worker-configuration.d.ts";
+const TYPES_OUTPUT_PATH = ".cloudflare/types/index.d.ts";
 const EXPERIMENTAL_CONFIG_PKG = "@cloudflare/vite-plugin/experimental-config";
 /**
 * Load and convert a `cloudflare.config.ts` file via `@cloudflare/config`. Returns
@@ -65564,9 +65545,8 @@ const EXPERIMENTAL_CONFIG_PKG = "@cloudflare/vite-plugin/experimental-config";
 * file, and the set of files imported while resolving the config (for
 * watch-mode).
 *
-* When `types.generate` is true, also writes `worker-configuration.d.ts` next
-* to the config when the generated content differs from what's already on disk.
-* Type generation only runs in dev.
+* When `types.generate` is true, also writes `.cloudflare/types/index.d.ts`
+* when the generated content differs from what's already on disk.
 */
 async function loadNewConfig(options) {
 	const configPath = path.resolve(options.root, NEW_CONFIG_FILENAME);
@@ -65579,7 +65559,7 @@ async function loadNewConfig(options) {
 	const worker = result.data.worker;
 	if (worker === void 0) throw new Error(`\`${NEW_CONFIG_FILENAME}\` must define a Worker using the \`worker\` property.`);
 	const rawConfig = convertToWranglerConfig(result.data);
-	if (options.command === "serve" && options.types.generate) await writeWorkerConfigurationDts({
+	if (options.types.generate) await writeCloudflareTypes({
 		root: options.root,
 		configPath,
 		includeRuntime: options.types.includeRuntime,
@@ -65594,7 +65574,7 @@ async function loadNewConfig(options) {
 	};
 }
 /**
-* Write `worker-configuration.d.ts` to the project root using
+* Write `.cloudflare/types/index.d.ts` using
 * `@cloudflare/config`'s `generateTypes`, targeting the vite-plugin's
 * `experimental-config` subpath (so users don't need a direct dependency on
 * `@cloudflare/config`).
@@ -65608,15 +65588,17 @@ async function loadNewConfig(options) {
 * check and the diff-before-write (only writes if content differs, to avoid
 * touching mtimes unnecessarily).
 */
-async function writeWorkerConfigurationDts(options) {
-	const outputPath = path.resolve(options.root, TYPES_OUTPUT_FILENAME);
-	const relativeConfigPath = "./" + path.relative(options.root, options.configPath);
+async function writeCloudflareTypes(options) {
+	const outputPath = path.resolve(options.root, TYPES_OUTPUT_PATH);
+	const outputDir = path.dirname(outputPath);
+	const relativeConfigPath = vite.normalizePath(path.relative(outputDir, options.configPath));
+	const configImportPath = relativeConfigPath.startsWith(".") ? relativeConfigPath : `./${relativeConfigPath}`;
 	let existingContent;
 	try {
 		existingContent = await fsp.readFile(outputPath, "utf8");
 	} catch {}
 	let content = generateTypes({
-		configPath: relativeConfigPath,
+		configPath: configImportPath,
 		packageName: EXPERIMENTAL_CONFIG_PKG
 	});
 	if (options.includeRuntime) {
@@ -65627,7 +65609,10 @@ async function writeWorkerConfigurationDts(options) {
 		});
 		content += `\n${runtimeHeader}\n${RUNTIME_TYPES_MARKER}\n${runtimeTypes}`;
 	}
-	if (existingContent !== content) await fsp.writeFile(outputPath, content);
+	if (existingContent !== content) {
+		await fsp.mkdir(outputDir, { recursive: true });
+		await fsp.writeFile(outputPath, content);
+	}
 }
 
 //#endregion
@@ -80003,6 +79988,79 @@ const generateStaticRoutingRuleMatcher = (rules) => ({ request: request$2 }) =>
 	return false;
 };
 
+//#endregion
+//#region src/container-cleanup.ts
+/** Owns Container cleanup for one server session, including failed attempts. */
+function createContainerCleanup() {
+	const pendingImages = /* @__PURE__ */ new Map();
+	let restarting = false;
+	function cleanupContainerImages() {
+		for (const [dockerPath, imageTags] of pendingImages) if (cleanupContainers(dockerPath, imageTags)) pendingImages.delete(dockerPath);
+		if (pendingImages.size === 0) process.off("exit", cleanupContainerImages);
+	}
+	return {
+		cleanup: cleanupContainerImages,
+		get isRestarting() {
+			return restarting;
+		},
+		async restart(action) {
+			if (restarting) return action();
+			cleanupContainerImages();
+			restarting = true;
+			try {
+				await action();
+			} finally {
+				restarting = false;
+			}
+		},
+		track(dockerPath, imageTags) {
+			const tags = new Set([...pendingImages.get(dockerPath) ?? [], ...imageTags]);
+			if (tags.size === 0) return;
+			pendingImages.set(dockerPath, tags);
+			process.off("exit", cleanupContainerImages);
+			process.on("exit", cleanupContainerImages);
+		}
+	};
+}
+/**
+* Retains Container cleanup across config reloads using Vite's inline plugins.
+* The state belongs to this server, not the re-evaluated cloudflare() factory.
+*/
+function getDevContainerCleanup(server) {
+	const pluginName = "vite-plugin-cloudflare:container-cleanup";
+	const retainedPlugin = server.config.plugins.find((plugin$1) => plugin$1.name === pluginName);
+	if (retainedPlugin?.api) return retainedPlugin.api;
+	const cleanup = createContainerCleanup();
+	const plugin = {
+		name: pluginName,
+		api: cleanup,
+		configureServer(nextServer) {
+			attachContainerCleanup(nextServer, cleanup);
+		}
+	};
+	server.config = {
+		...server.config,
+		inlineConfig: {
+			...server.config.inlineConfig,
+			plugins: [...server.config.inlineConfig.plugins ?? [], plugin]
+		}
+	};
+	attachContainerCleanup(server, cleanup);
+	return cleanup;
+}
+function attachContainerCleanup(server, cleanup) {
+	const restartServer = server.restart.bind(server);
+	server.restart = (...args) => cleanup.restart(() => restartServer(...args));
+	const closeServer = server.close.bind(server);
+	server.close = async () => {
+		try {
+			await closeServer();
+		} finally {
+			if (!cleanup.isRestarting) cleanup.cleanup();
+		}
+	};
+}
+
 //#endregion
 //#region src/containers.ts
 /**
@@ -80032,20 +80090,15 @@ function normalizeContainerImageUris(containerOptions, accountId, complianceConf
 	} : option);
 }
 /**
-* Prepares each Worker's Container images with that Worker's registry account
-* and compliance settings.
+* Prepares the sidecar and each Worker's Container images with that Worker's
+* registry account and compliance settings, including Workers whose images
+* are selected at start time.
 *
 * @param args - Planned images, Docker executable, and Vite logger.
 * @returns No value.
 */
 async function prepareContainerImagesForVite(args) {
-	const optionsByWorkerConfig = /* @__PURE__ */ new Map();
-	for (const { containerOptions, workerConfig } of args.containerTagToOptionsMap.values()) {
-		const options = optionsByWorkerConfig.get(workerConfig) ?? [];
-		options.push(containerOptions);
-		optionsByWorkerConfig.set(workerConfig, options);
-	}
-	for (const [workerConfig, plannedOptions] of optionsByWorkerConfig) {
+	for (const [workerConfig, plannedOptions] of args.containerOptionsByWorker) {
 		let containerOptions = plannedOptions;
 		if (containerOptions.some((options) => "image_uri" in options && isCloudflareRegistryImage(options.image_uri, workerConfig))) {
 			const apiToken = process.env.CLOUDFLARE_API_TOKEN;
@@ -80082,7 +80135,7 @@ var __name$1 = (target$1, value) => __defProp$1(target$1, "name", {
 });
 
 //#endregion
-//#region ../workers-auth/dist/chunk-LQW53VED.mjs
+//#region ../workers-auth/dist/chunk-4CJO23DA.mjs
 var import_undici$2 = require_undici();
 var hasWarnedAboutDeprecatedV1ApiToken = false;
 function readStoredAuthState(options) {
@@ -81571,114 +81624,7 @@ function getProfileForDirectoryFromBindings(startDir, bindings) {
 	}
 }
 __name$1(getProfileForDirectoryFromBindings, "getProfileForDirectoryFromBindings");
-function getLineColFromPtr(string$3, ptr) {
-	let lines = string$3.slice(0, ptr).split(/\r\n|\n|\r/g);
-	return [lines.length, lines.pop().length + 1];
-}
-__name$1(getLineColFromPtr, "getLineColFromPtr");
-function makeCodeBlock(string$3, line, column) {
-	let lines = string$3.split(/\r\n|\n|\r/g);
-	let codeblock = "";
-	let numberLen = (Math.log10(line + 1) | 0) + 1;
-	for (let i$1 = line - 1; i$1 <= line + 1; i$1++) {
-		let l = lines[i$1 - 1];
-		if (!l) continue;
-		codeblock += i$1.toString().padEnd(numberLen, " ");
-		codeblock += ":  ";
-		codeblock += l;
-		codeblock += "\n";
-		if (i$1 === line) {
-			codeblock += " ".repeat(numberLen + column + 2);
-			codeblock += "^\n";
-		}
-	}
-	return codeblock;
-}
-__name$1(makeCodeBlock, "makeCodeBlock");
-var TomlError = class extends Error {
-	static {
-		__name$1(this, "TomlError");
-	}
-	line;
-	column;
-	codeblock;
-	constructor(message, options) {
-		const [line, column] = getLineColFromPtr(options.toml, options.ptr);
-		const codeblock = makeCodeBlock(options.toml, line, column);
-		super(`Invalid TOML document: ${message}
-
-${codeblock}`, options);
-		this.line = line;
-		this.column = column;
-		this.codeblock = codeblock;
-	}
-};
-function isEscaped(str, ptr) {
-	let i$1 = 0;
-	while (str[ptr - ++i$1] === "\\");
-	return --i$1 && i$1 % 2;
-}
-__name$1(isEscaped, "isEscaped");
-function indexOfNewline(str, start = 0, end = str.length) {
-	let idx = str.indexOf("\n", start);
-	if (str[idx - 1] === "\r") idx--;
-	return idx <= end ? idx : -1;
-}
-__name$1(indexOfNewline, "indexOfNewline");
-function skipComment(str, ptr) {
-	for (let i$1 = ptr; i$1 < str.length; i$1++) {
-		let c$1 = str[i$1];
-		if (c$1 === "\n") return i$1;
-		if (c$1 === "\r" && str[i$1 + 1] === "\n") return i$1 + 1;
-		if (c$1 < " " && c$1 !== "	" || c$1 === "") throw new TomlError("control characters are not allowed in comments", {
-			toml: str,
-			ptr
-		});
-	}
-	return str.length;
-}
-__name$1(skipComment, "skipComment");
-function skipVoid(str, ptr, banNewLines, banComments) {
-	let c$1;
-	while ((c$1 = str[ptr]) === " " || c$1 === "	" || !banNewLines && (c$1 === "\n" || c$1 === "\r" && str[ptr + 1] === "\n")) ptr++;
-	return banComments || c$1 !== "#" ? ptr : skipVoid(str, skipComment(str, ptr), banNewLines);
-}
-__name$1(skipVoid, "skipVoid");
-function skipUntil(str, ptr, sep$1, end, banNewLines = false) {
-	if (!end) {
-		ptr = indexOfNewline(str, ptr);
-		return ptr < 0 ? str.length : ptr;
-	}
-	for (let i$1 = ptr; i$1 < str.length; i$1++) {
-		let c$1 = str[i$1];
-		if (c$1 === "#") i$1 = indexOfNewline(str, i$1);
-		else if (c$1 === sep$1) return i$1 + 1;
-		else if (c$1 === end || banNewLines && (c$1 === "\n" || c$1 === "\r" && str[i$1 + 1] === "\n")) return i$1;
-	}
-	throw new TomlError("cannot find end of structure", {
-		toml: str,
-		ptr
-	});
-}
-__name$1(skipUntil, "skipUntil");
-function getStringEnd(str, seek) {
-	let first = str[seek];
-	let target$1 = first === str[seek + 1] && str[seek + 1] === str[seek + 2] ? str.slice(seek, seek + 3) : first;
-	seek += target$1.length - 1;
-	do
-		seek = str.indexOf(target$1, ++seek);
-	while (seek > -1 && first !== "'" && isEscaped(str, seek));
-	if (seek > -1) {
-		seek += target$1.length;
-		if (target$1.length > 1) {
-			if (str[seek] === first) seek++;
-			if (str[seek] === first) seek++;
-		}
-	}
-	return seek;
-}
-__name$1(getStringEnd, "getStringEnd");
-var DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}:\d{2}(?:\.\d+)?)?(Z|[-+]\d{2}:\d{2})?$/i;
+var DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}(?::\d{2}(?:\.\d+)?)?)?(Z|[-+]\d{2}:\d{2})?$/i;
 var TomlDate = class _TomlDate extends Date {
 	static {
 		__name$1(this, "TomlDate");
@@ -81762,305 +81708,380 @@ var TomlDate = class _TomlDate extends Date {
 		return date$3;
 	}
 };
+function getLineColFromPtr(string$3, ptr) {
+	let lines = string$3.slice(0, ptr).split(/\r\n|\n|\r/g);
+	return [lines.length, lines.pop().length + 1];
+}
+__name$1(getLineColFromPtr, "getLineColFromPtr");
+function makeCodeBlock(string$3, line, column) {
+	let lines = string$3.split(/\r\n|\n|\r/g);
+	let codeblock = "";
+	let numberLen = (Math.log10(line + 1) | 0) + 1;
+	for (let i$1 = line - 1; i$1 <= line + 1; i$1++) {
+		let l = lines[i$1 - 1];
+		if (!l) continue;
+		codeblock += i$1.toString().padEnd(numberLen, " ");
+		codeblock += ":  ";
+		codeblock += l;
+		codeblock += "\n";
+		if (i$1 === line) {
+			codeblock += " ".repeat(numberLen + column + 2);
+			codeblock += "^\n";
+		}
+	}
+	return codeblock;
+}
+__name$1(makeCodeBlock, "makeCodeBlock");
+var TomlError = class extends Error {
+	static {
+		__name$1(this, "TomlError");
+	}
+	line;
+	column;
+	codeblock;
+	constructor(message, options) {
+		const [line, column] = getLineColFromPtr(options.toml, options.ptr);
+		const codeblock = makeCodeBlock(options.toml, line, column);
+		super(`Invalid TOML document: ${message}
+
+${codeblock}`, options);
+		this.line = line;
+		this.column = column;
+		this.codeblock = codeblock;
+	}
+};
+function indexOfNewline(str, start = 0) {
+	let idx = str.indexOf("\n", start);
+	if (str.charCodeAt(idx - 1) === 13) idx--;
+	return idx;
+}
+__name$1(indexOfNewline, "indexOfNewline");
+function skipComment(ctx) {
+	for (; ctx.p < ctx.s.length; ctx.p++) {
+		let c$1 = ctx.s.charCodeAt(ctx.p);
+		if (c$1 === 10) break;
+		if (c$1 === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10) {
+			ctx.p++;
+			break;
+		}
+		if (c$1 < 32 && c$1 !== 9 || c$1 === 127) throw new TomlError("control characters are not allowed in comments", {
+			toml: ctx.s,
+			ptr: ctx.p
+		});
+	}
+}
+__name$1(skipComment, "skipComment");
+function skipVoid(ctx, banNewLines, banComments) {
+	let c$1;
+	while (1) {
+		while ((c$1 = ctx.s.charCodeAt(ctx.p)) === 32 || c$1 === 9 || !banNewLines && (c$1 === 10 || c$1 === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10)) ctx.p++;
+		if (banComments || c$1 !== 35) break;
+		skipComment(ctx);
+	}
+}
+__name$1(skipVoid, "skipVoid");
+function skipUntil(ctx, sep$1, end) {
+	let ptr = ctx.p;
+	if (!end) {
+		ptr = indexOfNewline(ctx.s, ptr);
+		ctx.p = ptr < 0 ? ctx.s.length : ptr;
+		return;
+	}
+	for (; ctx.p < ctx.s.length; ctx.p++) {
+		let c$1 = ctx.s.charCodeAt(ctx.p);
+		if (c$1 === 35) skipComment(ctx);
+		else if (c$1 === end || c$1 === sep$1) return;
+	}
+	throw new TomlError("cannot find end of structure", {
+		toml: ctx.s,
+		ptr
+	});
+}
+__name$1(skipUntil, "skipUntil");
 var INT_REGEX = /^((0x[0-9a-fA-F](_?[0-9a-fA-F])*)|(([+-]|0[ob])?\d(_?\d)*))$/;
 var FLOAT_REGEX = /^[+-]?\d(_?\d)*(\.\d(_?\d)*)?([eE][+-]?\d(_?\d)*)?$/;
 var LEADING_ZERO = /^[+-]?0[0-9_]/;
-var ESCAPE_REGEX = /^[0-9a-f]{4,8}$/i;
-var ESC_MAP = {
-	b: "\b",
-	t: "	",
-	n: "\n",
-	f: "\f",
-	r: "\r",
-	"\"": "\"",
-	"\\": "\\"
-};
-function parseString(str, ptr = 0, endPtr = str.length) {
-	let isLiteral = str[ptr] === "'";
-	let isMultiline = str[ptr++] === str[ptr] && str[ptr] === str[ptr + 1];
+function parseString(ctx) {
+	let start = ctx.p;
+	let c$1 = ctx.s.charCodeAt(ctx.p++);
+	let first = c$1;
+	let isLiteral = c$1 === 39;
+	let isMultiline = c$1 === ctx.s.charCodeAt(ctx.p) && c$1 === ctx.s.charCodeAt(ctx.p + 1);
 	if (isMultiline) {
-		endPtr -= 2;
-		if (str[ptr += 2] === "\r") ptr++;
-		if (str[ptr] === "\n") ptr++;
+		if ((c$1 = ctx.s.charCodeAt(ctx.p += 2)) === 10) ctx.p++;
+		else if (c$1 === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10) ctx.p += 2;
 	}
-	let tmp = 0;
-	let isEscape;
 	let parsed = "";
-	let sliceStart = ptr;
-	while (ptr < endPtr - 1) {
-		let c$1 = str[ptr++];
-		if (c$1 === "\n" || c$1 === "\r" && str[ptr] === "\n") {
-			if (!isMultiline) throw new TomlError("newlines are not allowed in strings", {
-				toml: str,
-				ptr: ptr - 1
-			});
-		} else if (c$1 < " " && c$1 !== "	" || c$1 === "") throw new TomlError("control characters are not allowed in strings", {
-			toml: str,
-			ptr: ptr - 1
-		});
-		if (isEscape) {
-			isEscape = false;
-			if (c$1 === "u" || c$1 === "U") {
-				let code = str.slice(ptr, ptr += c$1 === "u" ? 4 : 8);
-				if (!ESCAPE_REGEX.test(code)) throw new TomlError("invalid unicode escape", {
-					toml: str,
-					ptr: tmp
-				});
-				try {
-					parsed += String.fromCodePoint(parseInt(code, 16));
-				} catch {
-					throw new TomlError("invalid unicode escape", {
-						toml: str,
-						ptr: tmp
-					});
-				}
-			} else if (isMultiline && (c$1 === "\n" || c$1 === " " || c$1 === "	" || c$1 === "\r")) {
-				ptr = skipVoid(str, ptr - 1, true);
-				if (str[ptr] !== "\n" && str[ptr] !== "\r") throw new TomlError("invalid escape: only line-ending whitespace may be escaped", {
-					toml: str,
-					ptr: tmp
+	let sliceStart = ctx.p;
+	let state = 0;
+	for (; ctx.p < ctx.s.length; ctx.p++) {
+		c$1 = ctx.s.charCodeAt(ctx.p);
+		if (isMultiline && (c$1 === 10 || c$1 === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10)) state = state && 3;
+		else if (c$1 < 32 && c$1 !== 9 || c$1 === 127) throw new TomlError("control characters are not allowed in strings", {
+			toml: ctx.s,
+			ptr: ctx.p
+		});
+		else if ((!state || state === 3) && c$1 === first && (!isMultiline || ctx.s.charCodeAt(ctx.p + 1) === first && ctx.s.charCodeAt(ctx.p + 2) === first)) {
+			if (isMultiline) {
+				if (ctx.s.charCodeAt(ctx.p + 3) === first) ctx.p++;
+				if (ctx.s.charCodeAt(ctx.p + 3) === first) ctx.p++;
+			}
+			if (!state) parsed += ctx.s.slice(sliceStart, ctx.p);
+			ctx.p += isMultiline ? 3 : 1;
+			return parsed;
+		} else if (!state) {
+			if (!isLiteral && c$1 === 92) {
+				parsed += ctx.s.slice(sliceStart, sliceStart = ctx.p);
+				state = 1;
+			}
+		} else if (state === 1) if (c$1 === 120 || c$1 === 117 || c$1 === 85) {
+			let value = 0;
+			let len = c$1 === 120 ? 2 : c$1 === 117 ? 4 : 8;
+			for (let j$1 = 0; j$1 < len; j$1++, ctx.p++) {
+				let hex$1 = ctx.s.charCodeAt(ctx.p + 1);
+				let digit = hex$1 >= 48 && hex$1 <= 57 ? hex$1 - 48 : hex$1 >= 65 && hex$1 <= 70 ? hex$1 - 65 + 10 : hex$1 >= 97 && hex$1 <= 102 ? hex$1 - 97 + 10 : -1;
+				if (digit < 0) throw new TomlError("invalid non-hex character in unicode escape", {
+					toml: ctx.s,
+					ptr: ctx.p + 1
 				});
-				ptr = skipVoid(str, ptr);
-			} else if (c$1 in ESC_MAP) parsed += ESC_MAP[c$1];
+				value = value << 4 | digit;
+			}
+			if (value < 0 || value > 1114111 || value >= 55296 && value <= 57343) throw new TomlError("invalid unicode escape", {
+				toml: ctx.s,
+				ptr: ctx.p
+			});
+			parsed += String.fromCodePoint(value);
+			sliceStart = ctx.p + 1;
+			state = 0;
+		} else if (c$1 === 32 || c$1 === 9) state = 2;
+		else {
+			if (c$1 === 98) parsed += "\b";
+			else if (c$1 === 116) parsed += "	";
+			else if (c$1 === 110) parsed += "\n";
+			else if (c$1 === 102) parsed += "\f";
+			else if (c$1 === 114) parsed += "\r";
+			else if (c$1 === 101) parsed += "\x1B";
+			else if (c$1 === 34) parsed += "\"";
+			else if (c$1 === 92) parsed += "\\";
 			else throw new TomlError("unrecognized escape sequence", {
-				toml: str,
-				ptr: tmp
+				toml: ctx.s,
+				ptr: ctx.p
+			});
+			sliceStart = ctx.p + 1;
+			state = 0;
+		}
+		else if (c$1 !== 32 && c$1 !== 9) {
+			if (state === 2) throw new TomlError("invalid escape: only line-ending whitespace may be escaped", {
+				toml: ctx.s,
+				ptr: sliceStart
 			});
-			sliceStart = ptr;
-		} else if (!isLiteral && c$1 === "\\") {
-			tmp = ptr - 1;
-			isEscape = true;
-			parsed += str.slice(sliceStart, tmp);
+			state = !isLiteral && c$1 === 92 ? 1 : 0;
+			sliceStart = ctx.p;
 		}
 	}
-	return parsed + str.slice(sliceStart, endPtr - 1);
+	throw new TomlError("unfinished string", {
+		toml: ctx.s,
+		ptr: start
+	});
 }
 __name$1(parseString, "parseString");
-function parseValue(value, toml, ptr, integersAsBigInt) {
-	if (value === "true") return true;
-	if (value === "false") return false;
+function sliceAndTrimEndOf(ctx, start, end) {
+	let value = ctx.s.slice(start, end);
+	let commentIdx = value.indexOf("#");
+	if (commentIdx > 0) {
+		skipComment({
+			s: value,
+			p: commentIdx
+		});
+		value = value.slice(0, commentIdx);
+	}
+	return value.trimEnd();
+}
+__name$1(sliceAndTrimEndOf, "sliceAndTrimEndOf");
+function parseValue(ctx, integersAsBigInt, end) {
+	let ptr = ctx.p;
+	let err = {
+		toml: ctx.s,
+		ptr
+	};
+	skipUntil(ctx, 44, end);
+	let value = sliceAndTrimEndOf(ctx, ptr, ctx.p);
+	if (!value) throw new TomlError("incomplete declaration: value expected", err);
 	if (value === "-inf") return -Infinity;
 	if (value === "inf" || value === "+inf") return Infinity;
 	if (value === "nan" || value === "+nan" || value === "-nan") return NaN;
 	if (value === "-0") return integersAsBigInt ? 0n : 0;
 	let isInt = INT_REGEX.test(value);
 	if (isInt || FLOAT_REGEX.test(value)) {
-		if (LEADING_ZERO.test(value)) throw new TomlError("leading zeroes are not allowed", {
-			toml,
-			ptr
-		});
+		if (LEADING_ZERO.test(value)) throw new TomlError("leading zeroes are not allowed", err);
 		value = value.replace(/_/g, "");
 		let numeric$1 = +value;
-		if (isNaN(numeric$1)) throw new TomlError("invalid number", {
-			toml,
-			ptr
-		});
+		if (isNaN(numeric$1)) throw new TomlError("invalid number", err);
 		if (isInt) {
-			if ((isInt = !Number.isSafeInteger(numeric$1)) && !integersAsBigInt) throw new TomlError("integer value cannot be represented losslessly", {
-				toml,
-				ptr
-			});
+			if ((isInt = !Number.isSafeInteger(numeric$1)) && !integersAsBigInt) throw new TomlError("integer value cannot be represented losslessly", err);
 			if (isInt || integersAsBigInt === true) numeric$1 = BigInt(value);
 		}
 		return numeric$1;
 	}
 	const date$3 = new TomlDate(value);
-	if (!date$3.isValid()) throw new TomlError("invalid value", {
-		toml,
-		ptr
-	});
+	if (!date$3.isValid()) throw new TomlError("invalid value", err);
 	return date$3;
 }
 __name$1(parseValue, "parseValue");
-function sliceAndTrimEndOf(str, startPtr, endPtr, allowNewLines) {
-	let value = str.slice(startPtr, endPtr);
-	let commentIdx = value.indexOf("#");
-	if (commentIdx > -1) {
-		skipComment(str, commentIdx);
-		value = value.slice(0, commentIdx);
-	}
-	let trimmed = value.trimEnd();
-	if (!allowNewLines) {
-		let newlineIdx = value.indexOf("\n", trimmed.length);
-		if (newlineIdx > -1) throw new TomlError("newlines are not allowed in inline tables", {
-			toml: str,
-			ptr: startPtr + newlineIdx
+function extractValue(ctx, end, integersAsBigInt) {
+	let ptr = ctx.p;
+	let c$1 = ctx.s.charCodeAt(ptr);
+	if (c$1 === 91 || c$1 === 123) {
+		if (!ctx.d--) throw new TomlError("document contains excessively nested structures. aborting.", {
+			toml: ctx.s,
+			ptr
 		});
+		let value = c$1 === 91 ? parseArray(ctx, integersAsBigInt) : parseInlineTable(ctx, integersAsBigInt);
+		ctx.d++;
+		return value;
 	}
-	return [trimmed, commentIdx];
-}
-__name$1(sliceAndTrimEndOf, "sliceAndTrimEndOf");
-function extractValue(str, ptr, end, depth$1, integersAsBigInt) {
-	if (depth$1 === 0) throw new TomlError("document contains excessively nested structures. aborting.", {
-		toml: str,
-		ptr
-	});
-	let c$1 = str[ptr];
-	if (c$1 === "[" || c$1 === "{") {
-		let [value, endPtr2] = c$1 === "[" ? parseArray(str, ptr, depth$1, integersAsBigInt) : parseInlineTable(str, ptr, depth$1, integersAsBigInt);
-		let newPtr = end ? skipUntil(str, endPtr2, ",", end) : endPtr2;
-		if (endPtr2 - newPtr && end === "}") {
-			let nextNewLine = indexOfNewline(str, endPtr2, newPtr);
-			if (nextNewLine > -1) throw new TomlError("newlines are not allowed in inline tables", {
-				toml: str,
-				ptr: nextNewLine
-			});
-		}
-		return [value, newPtr];
-	}
-	let endPtr;
-	if (c$1 === "\"" || c$1 === "'") {
-		endPtr = getStringEnd(str, ptr);
-		let parsed = parseString(str, ptr, endPtr);
-		if (end) {
-			endPtr = skipVoid(str, endPtr, end !== "]");
-			if (str[endPtr] && str[endPtr] !== "," && str[endPtr] !== end && str[endPtr] !== "\n" && str[endPtr] !== "\r") throw new TomlError("unexpected character encountered", {
-				toml: str,
-				ptr: endPtr
-			});
-			endPtr += +(str[endPtr] === ",");
-		}
-		return [parsed, endPtr];
+	if (c$1 === 34 || c$1 === 39) return parseString(ctx);
+	if (c$1 === 116) {
+		if (ctx.s.charCodeAt(++ctx.p) !== 114 || ctx.s.charCodeAt(++ctx.p) !== 117 || ctx.s.charCodeAt(++ctx.p) !== 101) throw new TomlError("invalid value", {
+			toml: ctx.s,
+			ptr
+		});
+		ctx.p++;
+		return true;
 	}
-	endPtr = skipUntil(str, ptr, ",", end);
-	let slice = sliceAndTrimEndOf(str, ptr, endPtr - +(str[endPtr - 1] === ","), end === "]");
-	if (!slice[0]) throw new TomlError("incomplete key-value declaration: no value specified", {
-		toml: str,
-		ptr
-	});
-	if (end && slice[1] > -1) {
-		endPtr = skipVoid(str, ptr + slice[1]);
-		endPtr += +(str[endPtr] === ",");
+	if (c$1 === 102) {
+		if (ctx.s.charCodeAt(++ctx.p) !== 97 || ctx.s.charCodeAt(++ctx.p) !== 108 || ctx.s.charCodeAt(++ctx.p) !== 115 || ctx.s.charCodeAt(++ctx.p) !== 101) throw new TomlError("invalid value", {
+			toml: ctx.s,
+			ptr
+		});
+		ctx.p++;
+		return false;
 	}
-	return [parseValue(slice[0], str, ptr, integersAsBigInt), endPtr];
+	return parseValue(ctx, integersAsBigInt, end);
 }
 __name$1(extractValue, "extractValue");
 var KEY_PART_RE = /^[a-zA-Z0-9-_]+[ \t]*$/;
-function parseKey(str, ptr, end = "=") {
-	let dot = ptr - 1;
+function parseKey(ctx, end = "=") {
+	let start = ctx.p;
+	let dot = start - 1;
 	let parsed = [];
-	let endPtr = str.indexOf(end, ptr);
+	let endPtr = ctx.s.indexOf(end, start);
 	if (endPtr < 0) throw new TomlError("incomplete key-value: cannot find end of key", {
-		toml: str,
-		ptr
+		toml: ctx.s,
+		ptr: start
 	});
 	do {
-		let c$1 = str[ptr = ++dot];
-		if (c$1 !== " " && c$1 !== "	") if (c$1 === "\"" || c$1 === "'") {
-			if (c$1 === str[ptr + 1] && c$1 === str[ptr + 2]) throw new TomlError("multiline strings are not allowed in keys", {
-				toml: str,
-				ptr
-			});
-			let eos = getStringEnd(str, ptr);
-			if (eos < 0) throw new TomlError("unfinished string encountered", {
-				toml: str,
-				ptr
+		let c$1 = ctx.s.charCodeAt(ctx.p = ++dot);
+		if (c$1 !== 32 && c$1 !== 9) if (c$1 === 34 || c$1 === 39) {
+			if (c$1 === ctx.s.charCodeAt(ctx.p + 1) && c$1 === ctx.s.charCodeAt(ctx.p + 2)) throw new TomlError("multiline strings are not allowed in keys", {
+				toml: ctx.s,
+				ptr: ctx.p
 			});
-			dot = str.indexOf(".", eos);
-			let strEnd = str.slice(eos, dot < 0 || dot > endPtr ? endPtr : dot);
+			let part = parseString(ctx);
+			dot = ctx.s.indexOf(".", ctx.p);
+			let strEnd = ctx.s.slice(ctx.p, dot < 0 || dot > endPtr ? endPtr : dot);
 			let newLine = indexOfNewline(strEnd);
 			if (newLine > -1) throw new TomlError("newlines are not allowed in keys", {
-				toml: str,
-				ptr: ptr + dot + newLine
+				toml: ctx.s,
+				ptr: newLine
 			});
 			if (strEnd.trimStart()) throw new TomlError("found extra tokens after the string part", {
-				toml: str,
-				ptr: eos
+				toml: ctx.s,
+				ptr: ctx.p
 			});
-			if (endPtr < eos) {
-				endPtr = str.indexOf(end, eos);
+			if (endPtr < ctx.p) {
+				endPtr = ctx.s.indexOf(end, ctx.p);
 				if (endPtr < 0) throw new TomlError("incomplete key-value: cannot find end of key", {
-					toml: str,
-					ptr
+					toml: ctx.s,
+					ptr: start
 				});
 			}
-			parsed.push(parseString(str, ptr, eos));
+			parsed.push(part);
 		} else {
-			dot = str.indexOf(".", ptr);
-			let part = str.slice(ptr, dot < 0 || dot > endPtr ? endPtr : dot);
+			dot = ctx.s.indexOf(".", ctx.p);
+			let part = ctx.s.slice(ctx.p, dot < 0 || dot > endPtr ? endPtr : dot);
 			if (!KEY_PART_RE.test(part)) throw new TomlError("only letter, numbers, dashes and underscores are allowed in keys", {
-				toml: str,
-				ptr
+				toml: ctx.s,
+				ptr: ctx.p
 			});
 			parsed.push(part.trimEnd());
 		}
 	} while (dot + 1 && dot < endPtr);
-	return [parsed, skipVoid(str, endPtr + 1, true, true)];
+	ctx.p = endPtr + 1;
+	skipVoid(ctx, true, true);
+	return parsed;
 }
 __name$1(parseKey, "parseKey");
-function parseInlineTable(str, ptr, depth$1, integersAsBigInt) {
+function parseInlineTable(ctx, integersAsBigInt) {
 	let res = {};
 	let seen = /* @__PURE__ */ new Set();
 	let c$1;
-	let comma$1 = 0;
-	ptr++;
-	while ((c$1 = str[ptr++]) !== "}" && c$1) {
-		let err = {
-			toml: str,
-			ptr: ptr - 1
-		};
-		if (c$1 === "\n") throw new TomlError("newlines are not allowed in inline tables", err);
-		else if (c$1 === "#") throw new TomlError("inline tables cannot contain comments", err);
-		else if (c$1 === ",") throw new TomlError("expected key-value, found comma", err);
-		else if (c$1 !== " " && c$1 !== "	") {
-			let k;
-			let t$5 = res;
-			let hasOwn$1 = false;
-			let [key, keyEndPtr] = parseKey(str, ptr - 1);
-			for (let i$1 = 0; i$1 < key.length; i$1++) {
-				if (i$1) t$5 = hasOwn$1 ? t$5[k] : t$5[k] = {};
-				k = key[i$1];
-				if ((hasOwn$1 = Object.hasOwn(t$5, k)) && (typeof t$5[k] !== "object" || seen.has(t$5[k]))) throw new TomlError("trying to redefine an already defined value", {
-					toml: str,
-					ptr
-				});
-				if (!hasOwn$1 && k === "__proto__") Object.defineProperty(t$5, k, {
-					enumerable: true,
-					configurable: true,
-					writable: true
-				});
-			}
-			if (hasOwn$1) throw new TomlError("trying to redefine an already defined value", {
-				toml: str,
-				ptr
+	ctx.p++;
+	while (ctx.p < ctx.s.length) {
+		skipVoid(ctx);
+		if ((c$1 = ctx.s.charCodeAt(ctx.p)) === 125) {
+			ctx.p++;
+			return res;
+		}
+		let k;
+		let t$5 = res;
+		let hasOwn$1 = false;
+		let p$2 = ctx.p;
+		let key = parseKey(ctx);
+		for (let i$1 = 0; i$1 < key.length; i$1++) {
+			if (i$1) t$5 = hasOwn$1 ? t$5[k] : t$5[k] = {};
+			k = key[i$1];
+			if ((hasOwn$1 = Object.hasOwn(t$5, k)) && (typeof t$5[k] !== "object" || seen.has(t$5[k]))) throw new TomlError("trying to redefine an already defined value", {
+				toml: ctx.s,
+				ptr: p$2
+			});
+			if (!hasOwn$1 && k === "__proto__") Object.defineProperty(t$5, k, {
+				enumerable: true,
+				configurable: true,
+				writable: true
 			});
-			let [value, valueEndPtr] = extractValue(str, keyEndPtr, "}", depth$1 - 1, integersAsBigInt);
-			seen.add(value);
-			t$5[k] = value;
-			ptr = valueEndPtr;
-			comma$1 = str[ptr - 1] === "," ? ptr - 1 : 0;
 		}
+		if (hasOwn$1) throw new TomlError("trying to redefine an already defined value", {
+			toml: ctx.s,
+			ptr: ctx.p
+		});
+		let value = extractValue(ctx, 125, integersAsBigInt);
+		seen.add(t$5[k] = value);
+		skipVoid(ctx);
+		if ((c$1 = ctx.s.charCodeAt(ctx.p++)) === 125) return res;
+		if (c$1 !== 44) throw new TomlError("expected comma or end of structure", {
+			toml: ctx.s,
+			ptr: ctx.p - 1
+		});
 	}
-	if (comma$1) throw new TomlError("trailing commas are not allowed in inline tables", {
-		toml: str,
-		ptr: comma$1
-	});
-	if (!c$1) throw new TomlError("unfinished table encountered", {
-		toml: str,
-		ptr
+	throw new TomlError("unfinished table encountered", {
+		toml: ctx.s,
+		ptr: ctx.p
 	});
-	return [res, ptr];
 }
 __name$1(parseInlineTable, "parseInlineTable");
-function parseArray(str, ptr, depth$1, integersAsBigInt) {
+function parseArray(ctx, integersAsBigInt) {
 	let res = [];
 	let c$1;
-	ptr++;
-	while ((c$1 = str[ptr++]) !== "]" && c$1) if (c$1 === ",") throw new TomlError("expected value, found comma", {
-		toml: str,
-		ptr: ptr - 1
-	});
-	else if (c$1 === "#") ptr = skipComment(str, ptr);
-	else if (c$1 !== " " && c$1 !== "	" && c$1 !== "\n" && c$1 !== "\r") {
-		let e = extractValue(str, ptr - 1, "]", depth$1 - 1, integersAsBigInt);
-		res.push(e[0]);
-		ptr = e[1];
-	}
-	if (!c$1) throw new TomlError("unfinished array encountered", {
-		toml: str,
-		ptr
+	ctx.p++;
+	while (ctx.p < ctx.s.length) {
+		skipVoid(ctx);
+		if ((c$1 = ctx.s.charCodeAt(ctx.p)) === 93) {
+			ctx.p++;
+			return res;
+		}
+		res.push(extractValue(ctx, 93, integersAsBigInt));
+		skipVoid(ctx);
+		if ((c$1 = ctx.s.charCodeAt(ctx.p++)) === 93) return res;
+		if (c$1 !== 44) throw new TomlError("expected comma or end of structure", {
+			toml: ctx.s,
+			ptr: ctx.p - 1
+		});
+	}
+	throw new TomlError("unfinished array encountered", {
+		toml: ctx.s,
+		ptr: ctx.p
 	});
-	return [res, ptr];
 }
 __name$1(parseArray, "parseArray");
 function peekTable(key, table, meta$3, type) {
@@ -82130,46 +82151,51 @@ function peekTable(key, table, meta$3, type) {
 }
 __name$1(peekTable, "peekTable");
 function parse$2(toml, { maxDepth = 1e3, integersAsBigInt } = {}) {
+	let ctx = {
+		s: toml,
+		p: 0,
+		d: maxDepth
+	};
 	let res = {};
 	let meta$3 = {};
+	let tmp;
 	let tbl = res;
 	let m = meta$3;
-	for (let ptr = skipVoid(toml, 0); ptr < toml.length;) {
-		if (toml[ptr] === "[") {
-			let isTableArray = toml[++ptr] === "[";
-			let k = parseKey(toml, ptr += +isTableArray, "]");
+	skipVoid(ctx);
+	while (ctx.p < toml.length) {
+		if (toml.charCodeAt(ctx.p) === 91) {
+			let isTableArray = toml.charCodeAt(++ctx.p) === 91;
+			tmp = ctx.p += +isTableArray;
+			let k = parseKey(ctx, "]");
 			if (isTableArray) {
-				if (toml[k[1] - 1] !== "]") throw new TomlError("expected end of table declaration", {
+				if (toml.charCodeAt(ctx.p - 1) !== 93) throw new TomlError("expected end of table declaration", {
 					toml,
-					ptr: k[1] - 1
+					ptr: ctx.p - 1
 				});
-				k[1]++;
+				ctx.p++;
 			}
-			let p$2 = peekTable(k[0], res, meta$3, isTableArray ? 2 : 1);
+			let p$2 = peekTable(k, res, meta$3, isTableArray ? 2 : 1);
 			if (!p$2) throw new TomlError("trying to redefine an already defined table or value", {
 				toml,
-				ptr
+				ptr: tmp
 			});
 			m = p$2[2];
 			tbl = p$2[1];
-			ptr = k[1];
 		} else {
-			let k = parseKey(toml, ptr);
-			let p$2 = peekTable(k[0], tbl, m, 0);
+			tmp = ctx.p;
+			let p$2 = peekTable(parseKey(ctx), tbl, m, 0);
 			if (!p$2) throw new TomlError("trying to redefine an already defined table or value", {
 				toml,
-				ptr
+				ptr: tmp
 			});
-			let v = extractValue(toml, k[1], void 0, maxDepth, integersAsBigInt);
-			p$2[1][p$2[0]] = v[0];
-			ptr = v[1];
+			p$2[1][p$2[0]] = extractValue(ctx, void 0, integersAsBigInt);
 		}
-		ptr = skipVoid(toml, ptr, true);
-		if (toml[ptr] && toml[ptr] !== "\n" && toml[ptr] !== "\r") throw new TomlError("each key-value declaration must be followed by an end-of-line", {
+		skipVoid(ctx, true);
+		if (ctx.p < toml.length && (tmp = toml.charCodeAt(ctx.p)) !== 10 && tmp !== 13) throw new TomlError("each key-value declaration must be followed by an end-of-line", {
 			toml,
-			ptr
+			ptr: ctx.p
 		});
-		ptr = skipVoid(toml, ptr);
+		skipVoid(ctx);
 	}
 	return res;
 }
@@ -82179,7 +82205,8 @@ function extendedTypeOf(obj) {
 	let type = typeof obj;
 	if (type === "object") {
 		if (Array.isArray(obj)) return "array";
-		if (obj instanceof Date) return "date";
+		if (typeof obj?.getUTCDate === "function" && obj instanceof Date) return "date";
+		if (globalThis.Temporal && typeof obj?.since === "function" && (obj instanceof Temporal.Instant || obj instanceof Temporal.PlainDate || obj instanceof Temporal.PlainDateTime || obj instanceof Temporal.PlainTime || obj instanceof Temporal.ZonedDateTime)) return "temporal";
 	}
 	return type;
 }
@@ -82193,23 +82220,31 @@ function formatString(s) {
 	return JSON.stringify(s).replace(/\x7f/g, "\\u007f");
 }
 __name$1(formatString, "formatString");
+function stringifyTemporal(temporal) {
+	return temporal.toString({
+		calendarName: "never",
+		timeZoneName: "never"
+	});
+}
+__name$1(stringifyTemporal, "stringifyTemporal");
 function stringifyValue(val, type, depth$1, numberAsFloat) {
 	if (depth$1 === 0) throw new Error("Could not stringify the object: maximum object depth exceeded");
-	if (type === "number") {
-		if (isNaN(val)) return "nan";
-		if (val === Infinity) return "inf";
-		if (val === -Infinity) return "-inf";
-		if (numberAsFloat && Number.isInteger(val)) return val.toFixed(1);
-		return val.toString();
-	}
-	if (type === "bigint" || type === "boolean") return val.toString();
-	if (type === "string") return formatString(val);
-	if (type === "date") {
-		if (isNaN(val.getTime())) throw new TypeError("cannot serialize invalid date");
-		return val.toISOString();
-	}
-	if (type === "object") return stringifyInlineTable(val, depth$1, numberAsFloat);
-	if (type === "array") return stringifyArray(val, depth$1, numberAsFloat);
+	switch (type) {
+		case "number":
+			if (isNaN(val)) return "nan";
+			if (val === Infinity) return "inf";
+			if (val === -Infinity) return "-inf";
+			if (Number.isInteger(val) && (numberAsFloat || !Number.isSafeInteger(val))) return val.toFixed(1);
+		case "bigint":
+		case "boolean": return val.toString();
+		case "string": return formatString(val);
+		case "date":
+			if (isNaN(val.getTime())) throw new TypeError("cannot serialize invalid date");
+			return val.toISOString();
+		case "object": return stringifyInlineTable(val, depth$1, numberAsFloat);
+		case "array": return stringifyArray(val, depth$1, numberAsFloat);
+		case "temporal": return stringifyTemporal(val);
+	}
 }
 __name$1(stringifyValue, "stringifyValue");
 function stringifyInlineTable(obj, depth$1, numberAsFloat) {
@@ -83038,7 +83073,7 @@ function scrubEncryptedCredentials(options) {
 __name$1(scrubEncryptedCredentials, "scrubEncryptedCredentials");
 
 //#endregion
-//#region ../workers-auth/dist/chunk-T63LVVAX.mjs
+//#region ../workers-auth/dist/chunk-A6F4WXCF.mjs
 function createPreferences(getConfigPath) {
 	function getUserPreferencesPath() {
 		return path__default.resolve(getConfigPath(), "preferences.json");
@@ -84192,7 +84227,7 @@ function getCfConfigPath() {
 	});
 }
 __name$1(getCfConfigPath, "getCfConfigPath");
-var CF_REGISTERED_SCOPES = [
+var CF_CLIENT_REGISTERED_SCOPES = [
 	"access:read",
 	"access:write",
 	"account:read",
@@ -84668,102 +84703,21 @@ var CF_REGISTERED_SCOPES = [
 	"zone.read",
 	"zone.write"
 ];
-var DefaultScopeKeys$1 = [...[
-	"openid",
-	"offline",
-	"user:read",
-	"account:read",
-	"access:read",
-	"access:write",
-	"agw:read",
-	"agw:run",
-	"agw:write",
-	"ai:read",
-	"ai:write",
-	"ai-search:read",
-	"ai-search:run",
-	"ai-search:write",
-	"aiaudit:read",
-	"aiaudit:write",
-	"aig:read",
-	"aig:write",
-	"auditlogs:read",
-	"browser:read",
-	"browser:write",
-	"cfone:read",
-	"cfone:write",
-	"cloudchamber:write",
-	"connectivity:admin",
-	"connectivity:bind",
-	"connectivity:read",
-	"constellation:write",
-	"containers:write",
-	"d1:write",
-	"dex:read",
-	"dex:write",
-	"dns_analytics:read",
-	"dns_records:edit",
-	"dns_records:read",
-	"dns_settings:read",
-	"email_routing:write",
-	"email_sending:write",
-	"firstpartytags:write",
-	"images:read",
-	"images:write",
-	"lb:edit",
-	"lb:read",
-	"logpush:read",
-	"logpush:write",
-	"mcp_portals:read",
-	"mcp_portals:write",
-	"notebook-examples:read",
-	"notification:read",
-	"notification:write",
-	"pages:read",
-	"pages:write",
-	"pipelines:read",
-	"pipelines:setup",
-	"pipelines:write",
-	"query_cache:write",
-	"queues:write",
-	"r2_catalog:write",
-	"radar:read",
-	"rag:read",
-	"rag:write",
-	"registrar:read",
-	"registrar:write",
-	"secrets_store:read",
-	"secrets_store:write",
-	"sso-connector:read",
-	"sso-connector:write",
-	"ssl_certs:write",
-	"tag.write",
-	"teams:pii",
-	"teams:read",
-	"teams:secure_location",
-	"teams:write",
-	"url_scanner:read",
-	"url_scanner:write",
-	"vectorize:write",
-	"workers:read",
-	"workers:write",
-	"workers_builds:read",
-	"workers_builds:write",
-	"workers_deployments:read",
-	"workers_kv:write",
-	"workers_observability:read",
-	"workers_observability:write",
-	"workers_observability_telemetry:write",
-	"workers_routes:write",
-	"workers_scripts:write",
-	"workers_tail:read",
-	"zone:read"
-]];
+var CF_UNGRANTABLE_SCOPE_SET = new Set([
+	"billing:read",
+	"billing:write",
+	"email_routing:read",
+	"email_sending:read",
+	"notebook-managed:read",
+	"oauth_account_ssl_and_certificates_write"
+]);
+var CF_REQUESTABLE_SCOPES = CF_CLIENT_REGISTERED_SCOPES.filter((scope) => !CF_UNGRANTABLE_SCOPE_SET.has(scope));
+var DefaultScopeKeys$1 = [...CF_REQUESTABLE_SCOPES];
 function setLoginScopeKeys$1(scopes) {
 	DefaultScopeKeys$1 = scopes;
 }
 __name$1(setLoginScopeKeys$1, "setLoginScopeKeys");
-var CF_SCOPE_SET = new Set(CF_REGISTERED_SCOPES);
+var CF_SCOPE_SET = new Set(CF_REQUESTABLE_SCOPES);
 function validateScopeKeys$1(scopes) {
 	return scopes.every((scope) => CF_SCOPE_SET.has(scope));
 }
@@ -85634,7 +85588,7 @@ __name(createWorkerUploadForm, "createWorkerUploadForm");
 //#endregion
 //#region ../remote-bindings/dist/index.mjs
 var import_undici = require_undici();
-var version$2 = "0.0.30";
+var version$2 = "0.0.32";
 var NoDefaultValueProvided = class extends UserError {
 	constructor() {
 		super("This command cannot be run in a non-interactive context", { telemetryMessage: "remote bindings prompt default missing" });
@@ -89396,7 +89350,7 @@ async function getDevMiniflareOptions(ctx, viteDevServer) {
 			}
 		}
 	];
-	const containerTagToOptionsMap = /* @__PURE__ */ new Map();
+	const containerOptionsByWorker = /* @__PURE__ */ new Map();
 	let containerEngine;
 	const workersFromConfig = resolvedPluginConfig.type === "workers" ? await Promise.all([...resolvedPluginConfig.environmentNameToWorkerMap].map(async ([environmentName, worker]) => {
 		const bindings = wrangler.unstable_convertConfigBindingsToStartWorkerBindings(worker.config);
@@ -89413,13 +89367,13 @@ async function getDevMiniflareOptions(ctx, viteDevServer) {
 		if (worker.config.containers?.length && worker.config.dev.enable_containers) {
 			containerEngine = resolveDockerHost(getDockerPath());
 			containerBuildId = generateContainerBuildId();
+			containerOptionsByWorker.set(worker.config, createContainerDevPlan({
+				containers: worker.config.containers,
+				exports: worker.config.exports,
+				containerBuildId,
+				configPath: worker.config.configPath
+			})?.containerOptions ?? []);
 		}
-		const containerPlan = worker.config.dev.enable_containers ? createContainerDevPlan({
-			containers: worker.config.containers,
-			exports: worker.config.exports,
-			containerBuildId,
-			configPath: worker.config.configPath
-		}) : void 0;
 		const miniflareWorkerOptions = wrangler.unstable_getMiniflareWorkerOptions({
 			...worker.config,
 			assets: void 0
@@ -89427,10 +89381,6 @@ async function getDevMiniflareOptions(ctx, viteDevServer) {
 			remoteProxyConnectionString: remoteProxySessionData?.session?.remoteProxyConnectionString,
 			containerBuildId
 		});
-		for (const option of containerPlan?.containerOptions ?? []) containerTagToOptionsMap.set(option.image_tag, {
-			containerOptions: option,
-			workerConfig: worker.config
-		});
 		const { externalWorkers: externalWorkers$1 } = miniflareWorkerOptions;
 		const workerOptions = miniflareWorkerOptions.workerOptions;
 		if (workerOptions.browserRendering && getBrowserRenderingHeadfulFromEnv()) workerOptions.browserRendering.headful = true;
@@ -89551,7 +89501,7 @@ async function getDevMiniflareOptions(ctx, viteDevServer) {
 				}
 			}
 		}),
-		containerTagToOptionsMap
+		containerOptionsByWorker
 	};
 }
 function getPreviewModules(main, modulesRules) {
@@ -89617,7 +89567,7 @@ function getModulesFromManifest(bundle) {
 async function getPreviewMiniflareOptions(ctx, vitePreviewServer) {
 	const inputInspectorPort = await getInputInspectorPort(ctx, vitePreviewServer);
 	const { resolvedPluginConfig, resolvedViteConfig } = ctx;
-	const containerTagToOptionsMap = /* @__PURE__ */ new Map();
+	const containerOptionsByWorker = /* @__PURE__ */ new Map();
 	let containerEngine;
 	const workers = (await Promise.all(resolvedPluginConfig.workers.map(async (previewWorker) => {
 		const workerConfig = previewWorker.config;
@@ -89635,21 +89585,17 @@ async function getPreviewMiniflareOptions(ctx, vitePreviewServer) {
 		if (workerConfig.containers?.length && workerConfig.dev.enable_containers) {
 			containerEngine = resolveDockerHost(getDockerPath());
 			containerBuildId = generateContainerBuildId();
+			containerOptionsByWorker.set(workerConfig, createContainerDevPlan({
+				containers: workerConfig.containers,
+				exports: workerConfig.exports,
+				containerBuildId,
+				configPath: workerConfig.configPath
+			})?.containerOptions ?? []);
 		}
-		const containerPlan = workerConfig.dev.enable_containers ? createContainerDevPlan({
-			containers: workerConfig.containers,
-			exports: workerConfig.exports,
-			containerBuildId,
-			configPath: workerConfig.configPath
-		}) : void 0;
 		const miniflareWorkerOptions = wrangler.unstable_getMiniflareWorkerOptions(workerConfig, void 0, {
 			remoteProxyConnectionString: remoteProxySessionData?.session?.remoteProxyConnectionString,
 			containerBuildId
 		});
-		for (const option of containerPlan?.containerOptions ?? []) containerTagToOptionsMap.set(option.image_tag, {
-			containerOptions: option,
-			workerConfig
-		});
 		const { externalWorkers } = miniflareWorkerOptions;
 		const { modulesRules,...sourcelessWorkerOptions } = miniflareWorkerOptions.workerOptions;
 		const workerOptions = sourcelessWorkerOptions;
@@ -89686,7 +89632,7 @@ async function getPreviewMiniflareOptions(ctx, vitePreviewServer) {
 			containerEngine,
 			workers
 		}),
-		containerTagToOptionsMap
+		containerOptionsByWorker
 	};
 }
 /**
@@ -89828,136 +89774,121 @@ function hasSandboxOrigin(origin) {
 //#endregion
 //#region src/plugins/dev.ts
 var import_picocolors$2 = /* @__PURE__ */ __toESM$2(require_picocolors(), 1);
-let exitCallback$2 = () => {};
-process.on("exit", () => {
-	exitCallback$2();
-});
 /**
 * Plugin to provide core development functionality
 */
 const devPlugin = createPlugin("dev", (ctx) => {
-	let containerImageTags = /* @__PURE__ */ new Set();
-	return {
-		buildEnd() {
-			if (ctx.resolvedViteConfig.command === "serve" && ctx.isRestartingDevServer && containerImageTags.size) cleanupContainers(getDockerPath(), containerImageTags);
-		},
-		async configureServer(viteDevServer) {
-			assertIsNotPreview(ctx);
-			const initialOptions = await getDevMiniflareOptions(ctx, viteDevServer);
-			let containerTagToOptionsMap = initialOptions.containerTagToOptionsMap;
-			await ctx.startOrUpdateMiniflare(initialOptions.miniflareOptions);
-			const closeServer = viteDevServer.close.bind(viteDevServer);
-			viteDevServer.close = async () => {
-				try {
-					await closeServer();
-				} finally {
-					if (!ctx.isRestartingDevServer) {
-						if (containerImageTags.size) cleanupContainers(getDockerPath(), containerImageTags);
-						try {
-							await ctx.disposeMiniflare();
-						} catch (error$2) {
-							debuglog("Failed to dispose Miniflare instance:", error$2);
-						}
-					}
-				}
-			};
-			if (viteDevServer.httpServer) viteDevServer.httpServer.on("listening", () => {
-				const addr = viteDevServer.httpServer?.address();
-				if (typeof addr === "object" && addr !== null) {
-					const serverConfig = viteDevServer.config.server;
-					ctx.miniflare.publicUrl = buildPublicUrl({
-						hostname: typeof serverConfig.host === "string" ? serverConfig.host : void 0,
-						port: addr.port,
-						secure: !!serverConfig.https
-					});
+	return { async configureServer(viteDevServer) {
+		assertIsNotPreview(ctx);
+		const containerCleanup = getDevContainerCleanup(viteDevServer);
+		const initialOptions = await getDevMiniflareOptions(ctx, viteDevServer);
+		let containerOptionsByWorker = initialOptions.containerOptionsByWorker;
+		await ctx.startOrUpdateMiniflare(initialOptions.miniflareOptions);
+		const closeServer = viteDevServer.close.bind(viteDevServer);
+		viteDevServer.close = async () => {
+			try {
+				await closeServer();
+			} finally {
+				if (!ctx.isRestartingDevServer) try {
+					await ctx.disposeMiniflare();
+				} catch (error$2) {
+					debuglog("Failed to dispose Miniflare instance:", error$2);
 				}
-			});
-			if (ctx.resolvedPluginConfig.type === "workers") {
-				debuglog("Initializing the Vite module runners");
+			}
+		};
+		if (viteDevServer.httpServer) viteDevServer.httpServer.on("listening", () => {
+			const addr = viteDevServer.httpServer?.address();
+			if (typeof addr === "object" && addr !== null) {
+				const serverConfig = viteDevServer.config.server;
+				ctx.miniflare.publicUrl = buildPublicUrl({
+					hostname: typeof serverConfig.host === "string" ? serverConfig.host : void 0,
+					port: addr.port,
+					secure: !!serverConfig.https
+				});
+			}
+		});
+		if (ctx.resolvedPluginConfig.type === "workers") {
+			debuglog("Initializing the Vite module runners");
+			await initRunners(ctx.resolvedPluginConfig, viteDevServer, ctx.miniflare);
+			const currentWorkerNameToExportTypesMap = await getCurrentWorkerNameToExportTypesMap(ctx.resolvedPluginConfig, viteDevServer, ctx.miniflare);
+			if (compareWorkerNameToExportTypesMaps(ctx.workerNameToExportTypesMap, currentWorkerNameToExportTypesMap)) {
+				ctx.setWorkerNameToExportTypesMap(currentWorkerNameToExportTypesMap);
+				const updatedOptions = await getDevMiniflareOptions(ctx, viteDevServer);
+				containerOptionsByWorker = updatedOptions.containerOptionsByWorker;
+				await ctx.startOrUpdateMiniflare(updatedOptions.miniflareOptions);
 				await initRunners(ctx.resolvedPluginConfig, viteDevServer, ctx.miniflare);
-				const currentWorkerNameToExportTypesMap = await getCurrentWorkerNameToExportTypesMap(ctx.resolvedPluginConfig, viteDevServer, ctx.miniflare);
-				if (compareWorkerNameToExportTypesMaps(ctx.workerNameToExportTypesMap, currentWorkerNameToExportTypesMap)) {
-					ctx.setWorkerNameToExportTypesMap(currentWorkerNameToExportTypesMap);
-					const updatedOptions = await getDevMiniflareOptions(ctx, viteDevServer);
-					containerTagToOptionsMap = updatedOptions.containerTagToOptionsMap;
-					await ctx.startOrUpdateMiniflare(updatedOptions.miniflareOptions);
-					await initRunners(ctx.resolvedPluginConfig, viteDevServer, ctx.miniflare);
-				}
-				for (const environmentName of ctx.resolvedPluginConfig.environmentNameToWorkerMap.keys()) {
-					const environment = viteDevServer.environments[environmentName];
-					assert2(environment, `Expected environment "${environmentName}" to be defined`);
-					environment.hot.on("vite-plugin-cloudflare:worker-export-types", async (newExportTypes) => {
-						const workerConfig = ctx.getWorkerConfig(environmentName);
-						assert2(workerConfig, `Expected workerConfig for environment "${environmentName}" to be defined`);
-						const oldExportTypes = ctx.workerNameToExportTypesMap.get(workerConfig.name);
-						assert2(oldExportTypes, `Expected export types for Worker "${workerConfig.name}" to be defined`);
-						if (compareExportTypes(oldExportTypes, newExportTypes)) {
-							viteDevServer.config.logger.info(import_picocolors$2.default.dim(import_picocolors$2.default.yellow("Worker exports have changed. Restarting dev server.")));
-							await viteDevServer.restart();
-						}
-					});
-				}
-				const entryWorkerConfig = ctx.entryWorkerConfig;
-				assert2(entryWorkerConfig, `No entry Worker config`);
-				const entryWorkerName = entryWorkerConfig.name;
-				if (viteDevServer.httpServer) handleWebSocket(viteDevServer.httpServer, ctx.miniflare, entryWorkerName);
-				const staticRouting = entryWorkerConfig.assets?.run_worker_first === true ? { user_worker: ["/*"] } : ctx.resolvedPluginConfig.staticRouting;
-				if (staticRouting) {
-					const excludeRulesMatcher = generateStaticRoutingRuleMatcher(staticRouting.asset_worker ?? []);
-					const includeRulesMatcher = generateStaticRoutingRuleMatcher(staticRouting.user_worker);
-					const userWorkerHandler = createRequestHandler(async (request$2) => {
-						request$2.headers.set(CoreHeaders.ROUTE_OVERRIDE, entryWorkerName);
-						return ctx.miniflare.dispatchFetch(request$2, { redirect: "manual" });
-					});
-					viteDevServer.middlewares.use(async function cloudflarePreMiddleware(req, res, next) {
-						assert2(req.url, `req.url not defined`);
-						const request$2 = new Request(new URL(req.url, UNKNOWN_HOST));
-						if (req[kRequestType] === "asset") next();
-						else if (excludeRulesMatcher({ request: request$2 })) {
-							req[kRequestType] = "asset";
-							next();
-						} else if (includeRulesMatcher({ request: request$2 })) userWorkerHandler(req, res, next);
-						else next();
-					});
-				}
-				if (containerTagToOptionsMap.size) {
-					viteDevServer.config.logger.info(import_picocolors$2.default.dim(import_picocolors$2.default.yellow("∷ Building container images for local development...\n")));
-					await prepareContainerImagesForVite({
-						dockerPath: getDockerPath(),
-						containerTagToOptionsMap,
-						logger: viteDevServer.config.logger
-					});
-					containerImageTags = new Set(containerTagToOptionsMap.keys());
-					viteDevServer.config.logger.info(import_picocolors$2.default.dim(import_picocolors$2.default.yellow("\n⚡️ Containers successfully built. To rebuild your containers during development, restart the Vite dev server (r + enter).")));
-					exitCallback$2 = () => {
-						if (containerImageTags.size) cleanupContainers(getDockerPath(), containerImageTags);
-					};
-				}
 			}
-			return () => {
-				if (!satisfiesMinimumViteVersion("7.0.0")) {
-					const middlewareStack = viteDevServer.middlewares.stack;
-					const preMiddlewareIndex = middlewareStack.findIndex((middleware) => "name" in middleware.handle && middleware.handle.name === "cloudflarePreMiddleware");
-					if (preMiddlewareIndex !== -1) {
-						const [preMiddleware] = middlewareStack.splice(preMiddlewareIndex, 1);
-						assert2(preMiddleware, "Failed to remove cloudflarePreMiddleware from stack");
-						const cachedTransformMiddlewareIndex = middlewareStack.findIndex((middleware) => "name" in middleware.handle && middleware.handle.name === "viteCachedTransformMiddleware");
-						assert2(cachedTransformMiddlewareIndex !== -1, "Failed to find viteCachedTransformMiddleware");
-						middlewareStack.splice(cachedTransformMiddlewareIndex, 0, preMiddleware);
-					}
-				}
-				viteDevServer.middlewares.use(createRequestHandler(async (request$2, req) => {
-					if (req[kRequestType] === "asset") {
-						request$2.headers.set(CoreHeaders.ROUTE_OVERRIDE, ASSET_WORKER_NAME);
-						return ctx.miniflare.dispatchFetch(request$2, { redirect: "manual" });
-					} else {
-						request$2.headers.set(CoreHeaders.ROUTE_OVERRIDE, ROUTER_WORKER_NAME);
-						return ctx.miniflare.dispatchFetch(request$2, { redirect: "manual" });
+			for (const environmentName of ctx.resolvedPluginConfig.environmentNameToWorkerMap.keys()) {
+				const environment = viteDevServer.environments[environmentName];
+				assert2(environment, `Expected environment "${environmentName}" to be defined`);
+				environment.hot.on("vite-plugin-cloudflare:worker-export-types", async (newExportTypes) => {
+					const workerConfig = ctx.getWorkerConfig(environmentName);
+					assert2(workerConfig, `Expected workerConfig for environment "${environmentName}" to be defined`);
+					const oldExportTypes = ctx.workerNameToExportTypesMap.get(workerConfig.name);
+					assert2(oldExportTypes, `Expected export types for Worker "${workerConfig.name}" to be defined`);
+					if (compareExportTypes(oldExportTypes, newExportTypes)) {
+						viteDevServer.config.logger.info(import_picocolors$2.default.dim(import_picocolors$2.default.yellow("Worker exports have changed. Restarting dev server.")));
+						await viteDevServer.restart();
 					}
-				}));
-			};
+				});
+			}
+			const entryWorkerConfig = ctx.entryWorkerConfig;
+			assert2(entryWorkerConfig, `No entry Worker config`);
+			const entryWorkerName = entryWorkerConfig.name;
+			if (viteDevServer.httpServer) handleWebSocket(viteDevServer.httpServer, ctx.miniflare, entryWorkerName);
+			const staticRouting = entryWorkerConfig.assets?.run_worker_first === true ? { user_worker: ["/*"] } : ctx.resolvedPluginConfig.staticRouting;
+			if (staticRouting) {
+				const excludeRulesMatcher = generateStaticRoutingRuleMatcher(staticRouting.asset_worker ?? []);
+				const includeRulesMatcher = generateStaticRoutingRuleMatcher(staticRouting.user_worker);
+				const userWorkerHandler = createRequestHandler(async (request$2) => {
+					request$2.headers.set(CoreHeaders.ROUTE_OVERRIDE, entryWorkerName);
+					return ctx.miniflare.dispatchFetch(request$2, { redirect: "manual" });
+				});
+				viteDevServer.middlewares.use(async function cloudflarePreMiddleware(req, res, next) {
+					assert2(req.url, `req.url not defined`);
+					const request$2 = new Request(new URL(req.url, UNKNOWN_HOST));
+					if (req[kRequestType] === "asset") next();
+					else if (excludeRulesMatcher({ request: request$2 })) {
+						req[kRequestType] = "asset";
+						next();
+					} else if (includeRulesMatcher({ request: request$2 })) userWorkerHandler(req, res, next);
+					else next();
+				});
+			}
+			if (containerOptionsByWorker.size) {
+				viteDevServer.config.logger.info(import_picocolors$2.default.dim(import_picocolors$2.default.yellow("∷ Building container images for local development...\n")));
+				await prepareContainerImagesForVite({
+					dockerPath: getDockerPath(),
+					containerOptionsByWorker,
+					logger: viteDevServer.config.logger
+				});
+				containerCleanup.track(getDockerPath(), [...containerOptionsByWorker.values()].flatMap((options) => options.map(({ image_tag }) => image_tag)));
+				viteDevServer.config.logger.info(import_picocolors$2.default.dim(import_picocolors$2.default.yellow("\n⚡️ Containers successfully built. To rebuild your containers during development, restart the Vite dev server (r + enter).")));
+			}
 		}
-	};
+		return () => {
+			if (!satisfiesMinimumViteVersion("7.0.0")) {
+				const middlewareStack = viteDevServer.middlewares.stack;
+				const preMiddlewareIndex = middlewareStack.findIndex((middleware) => "name" in middleware.handle && middleware.handle.name === "cloudflarePreMiddleware");
+				if (preMiddlewareIndex !== -1) {
+					const [preMiddleware] = middlewareStack.splice(preMiddlewareIndex, 1);
+					assert2(preMiddleware, "Failed to remove cloudflarePreMiddleware from stack");
+					const cachedTransformMiddlewareIndex = middlewareStack.findIndex((middleware) => "name" in middleware.handle && middleware.handle.name === "viteCachedTransformMiddleware");
+					assert2(cachedTransformMiddlewareIndex !== -1, "Failed to find viteCachedTransformMiddleware");
+					middlewareStack.splice(cachedTransformMiddlewareIndex, 0, preMiddleware);
+				}
+			}
+			viteDevServer.middlewares.use(createRequestHandler(async (request$2, req) => {
+				if (req[kRequestType] === "asset") {
+					request$2.headers.set(CoreHeaders.ROUTE_OVERRIDE, ASSET_WORKER_NAME);
+					return ctx.miniflare.dispatchFetch(request$2, { redirect: "manual" });
+				} else {
+					request$2.headers.set(CoreHeaders.ROUTE_OVERRIDE, ROUTER_WORKER_NAME);
+					return ctx.miniflare.dispatchFetch(request$2, { redirect: "manual" });
+				}
+			}));
+		};
+	} };
 });
 
 //#endregion
@@ -90025,16 +89956,16 @@ const nodeJsCompatPlugin = createPlugin("nodejs-compat", (ctx) => {
 		}
 	};
 });
-let exitCallback$1 = () => {};
+let exitCallback = () => {};
 process.on("exit", () => {
-	exitCallback$1();
+	exitCallback();
 });
 /**
 * Plugin to warn if Node.js APIs are used without enabling the `nodejs_compat` compatibility flag
 */
 const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx) => {
 	const nodeJsCompatWarningsMap = /* @__PURE__ */ new Map();
-	exitCallback$1 = () => {
+	exitCallback = () => {
 		for (const nodeJsCompatWarnings of nodeJsCompatWarningsMap.values()) nodeJsCompatWarnings.renderWarnings();
 	};
 	return {
@@ -90233,21 +90164,23 @@ const triggerHandlersPlugin = createPlugin("trigger-handlers", (ctx) => {
 //#endregion
 //#region src/plugins/preview.ts
 var import_picocolors$1 = /* @__PURE__ */ __toESM$2(require_picocolors(), 1);
-let exitCallback = () => {};
-process.on("exit", () => {
-	exitCallback();
-});
 /**
 * Plugin to provide core preview functionality
 */
 const previewPlugin = createPlugin("preview", (ctx) => {
 	return { async configurePreviewServer(vitePreviewServer) {
 		assertIsPreview(ctx);
+		const dockerPath = getDockerPath();
+		const containerCleanup = createContainerCleanup();
 		const closePreviewServer = vitePreviewServer.close.bind(vitePreviewServer);
 		vitePreviewServer.close = async () => {
-			await Promise.all([ctx.disposeMiniflare(), closePreviewServer()]);
+			try {
+				await Promise.all([ctx.disposeMiniflare(), closePreviewServer()]);
+			} finally {
+				containerCleanup.cleanup();
+			}
 		};
-		const { miniflareOptions, containerTagToOptionsMap } = await getPreviewMiniflareOptions(ctx, vitePreviewServer);
+		const { miniflareOptions, containerOptionsByWorker } = await getPreviewMiniflareOptions(ctx, vitePreviewServer);
 		await ctx.startOrUpdateMiniflare(miniflareOptions);
 		if (vitePreviewServer.httpServer) vitePreviewServer.httpServer.on("listening", () => {
 			const addr = vitePreviewServer.httpServer?.address();
@@ -90260,19 +90193,15 @@ const previewPlugin = createPlugin("preview", (ctx) => {
 				});
 			}
 		});
-		if (containerTagToOptionsMap.size) {
-			const dockerPath = getDockerPath();
+		if (containerOptionsByWorker.size) {
 			vitePreviewServer.config.logger.info(import_picocolors$1.default.dim(import_picocolors$1.default.yellow("∷ Building container images for local preview...\n")));
 			await prepareContainerImagesForVite({
 				dockerPath,
-				containerTagToOptionsMap,
+				containerOptionsByWorker,
 				logger: vitePreviewServer.config.logger
 			});
-			const containerImageTags = new Set(containerTagToOptionsMap.keys());
+			containerCleanup.track(dockerPath, [...containerOptionsByWorker.values()].flatMap((options) => options.map(({ image_tag }) => image_tag)));
 			vitePreviewServer.config.logger.info(import_picocolors$1.default.dim(import_picocolors$1.default.yellow("\n⚡️ Containers successfully built.\n")));
-			exitCallback = () => {
-				if (containerImageTags.size) cleanupContainers(dockerPath, containerImageTags);
-			};
 		}
 		handleWebSocket(vitePreviewServer.httpServer, ctx.miniflare);
 		vitePreviewServer.middlewares.use(createRequestHandler((request$2) => {