@cloudflare/vite-plugin 1.54.11 → 1.56.0

package/dist/index.mjs

@@ -16,7 +16,7 @@ import net from "node:net";
 import http from "node:http";
 import events, { EventEmitter } from "node:events";
 import { Buffer as Buffer$1 } from "node:buffer";
-import crypto$1, { createCipheriv, createDecipheriv, createHash, randomBytes, randomUUID, webcrypto } from "node:crypto";
+import crypto2, { createCipheriv, createDecipheriv, createHash, randomBytes, randomUUID, webcrypto } from "node:crypto";
 import { AsyncLocalStorage } from "node:async_hooks";
 import * as fsp from "node:fs/promises";
 import fs, { constants as constants$1 } from "node:fs/promises";
@@ -2614,8 +2614,8 @@ function formatConfigSnippet(snippet, configPath, formatted = true) {
 __name$6(formatConfigSnippet, "formatConfigSnippet");
 
 //#endregion
-//#region ../workers-utils/dist/chunk-YZWVNJ5I.mjs
-var DEFAULT_COMPAT_DATE = "2026-09-16";
+//#region ../workers-utils/dist/chunk-S6ZAI5DC.mjs
+var DEFAULT_COMPAT_DATE = "2026-09-18";
 function assertNever(_value) {}
 __name$6(assertNever, "assertNever");
 function mapWorkerMetadataBindings(bindings) {
@@ -15573,7 +15573,7 @@ var require_snapshot_utils = /* @__PURE__ */ __commonJS$2({ "../../node_modules/
 			match: new Set(matchHeaders$1.map((header) => caseSensitive ? header : header.toLowerCase()))
 		};
 	}
-	const crypto$4 = runtimeFeatures$5.has("crypto") ? __require$2("node:crypto") : null;
+	const crypto$3 = runtimeFeatures$5.has("crypto") ? __require$2("node:crypto") : null;
 	/**
 	* @callback HashIdFunction
 	* @param {string} value - The value to hash
@@ -15583,7 +15583,7 @@ var require_snapshot_utils = /* @__PURE__ */ __commonJS$2({ "../../node_modules/
 	* Generates a hash for a given value
 	* @type {HashIdFunction}
 	*/
-	const hashId$1 = crypto$4?.hash ? (value) => crypto$4.hash("sha256", value, "base64url") : (value) => Buffer.from(value).toString("base64url");
+	const hashId$1 = crypto$3?.hash ? (value) => crypto$3.hash("sha256", value, "base64url") : (value) => Buffer.from(value).toString("base64url");
 	/**
 	* @typedef {(url: string) => boolean} IsUrlExcluded Checks if a URL matches any of the exclude patterns
 	*/
@@ -21153,10 +21153,10 @@ var require_subresource_integrity = /* @__PURE__ */ __commonJS$2({ "../../node_m
 		["sha512", 2]
 	]);
 	/** @type {import('node:crypto')} */
-	let crypto$3;
+	let crypto$2;
 	if (runtimeFeatures$3.has("crypto")) {
-		crypto$3 = __require$2("node:crypto");
-		const cryptoHashes = crypto$3.getHashes();
+		crypto$2 = __require$2("node:crypto");
+		const cryptoHashes = crypto$2.getHashes();
 		if (cryptoHashes.length === 0) validSRIHashAlgorithmTokenSet.clear();
 		for (const algorithm of validSRIHashAlgorithmTokenSet.keys()) if (cryptoHashes.includes(algorithm) === false) validSRIHashAlgorithmTokenSet.delete(algorithm);
 	} else validSRIHashAlgorithmTokenSet.clear();
@@ -21254,7 +21254,7 @@ var require_subresource_integrity = /* @__PURE__ */ __commonJS$2({ "../../node_m
 	* @returns {string}
 	*/
 	const applyAlgorithmToBytes = (algorithm, bytes) => {
-		return crypto$3.hash(algorithm, bytes, "base64");
+		return crypto$2.hash(algorithm, bytes, "base64");
 	};
 	/**
 	* Compares two base64 strings, allowing for base64url
@@ -23838,7 +23838,7 @@ var require_connection = /* @__PURE__ */ __commonJS$2({ "../../node_modules/.pnp
 	const { WebsocketFrameSend: WebsocketFrameSend$4 } = require_frame();
 	const assert$3 = __require$2("node:assert");
 	const { runtimeFeatures } = require_runtime_features();
-	const crypto$2 = runtimeFeatures.has("crypto") ? __require$2("node:crypto") : null;
+	const crypto$1 = runtimeFeatures.has("crypto") ? __require$2("node:crypto") : null;
 	let warningEmitted = false;
 	/**
 	* @see https://websockets.spec.whatwg.org/#concept-websocket-establish
@@ -23862,7 +23862,7 @@ var require_connection = /* @__PURE__ */ __commonJS$2({ "../../node_modules/.pnp
 			useURLCredentials: true
 		});
 		if (options.headers) request$2.headersList = getHeadersList(new Headers$2(options.headers));
-		const keyValue = crypto$2.randomBytes(16).toString("base64");
+		const keyValue = crypto$1.randomBytes(16).toString("base64");
 		request$2.headersList.append("sec-websocket-key", keyValue, true);
 		request$2.headersList.append("sec-websocket-version", "13", true);
 		for (const protocol of protocols) request$2.headersList.append("sec-websocket-protocol", protocol, true);
@@ -23898,7 +23898,7 @@ var require_connection = /* @__PURE__ */ __commonJS$2({ "../../node_modules/.pnp
 					failWebsocketConnection$3(handler, 1002, "Server did not set Connection header to \"upgrade\".");
 					return;
 				}
-				if (response.headersList.get("Sec-WebSocket-Accept") !== crypto$2.hash("sha1", keyValue + uid, "base64")) {
+				if (response.headersList.get("Sec-WebSocket-Accept") !== crypto$1.hash("sha1", keyValue + uid, "base64")) {
 					failWebsocketConnection$3(handler, 1002, "Incorrect hash received in Sec-WebSocket-Accept header.");
 					return;
 				}
@@ -44103,19 +44103,34 @@ var validateObservability = /* @__PURE__ */ __name$6((diagnostics, field, value)
 			key: "traces.enabled",
 			value: val.traces?.enabled,
 			type: "boolean"
+		},
+		{
+			key: "issues.enabled",
+			value: val.issues?.enabled,
+			type: "boolean"
 		}
 	]) && isValid;
 	isValid = validateOptionalProperty(diagnostics, field, "head_sampling_rate", val.head_sampling_rate, "number") && isValid;
 	isValid = validateOptionalProperty(diagnostics, field, "redact_query_string", val.redact_query_string, "boolean") && isValid;
+	const issuesIsObject = val.issues === void 0 || val.issues !== null && typeof val.issues === "object" && !Array.isArray(val.issues);
+	if (!issuesIsObject) {
+		diagnostics.errors.push(`"${field}.issues" should be an object but got ${JSON.stringify(val.issues)}.`);
+		isValid = false;
+	}
 	isValid = validateOptionalProperty(diagnostics, field, "logs", val.logs, "object") && isValid;
 	isValid = validateOptionalProperty(diagnostics, field, "traces", val.traces, "object") && isValid;
 	isValid = validateAdditionalProperties(diagnostics, field, Object.keys(val), [
 		"enabled",
 		"head_sampling_rate",
 		"redact_query_string",
+		"issues",
 		"logs",
 		"traces"
 	]) && isValid;
+	if (val.issues !== void 0 && issuesIsObject) {
+		isValid = validateOptionalProperty(diagnostics, `${field}.issues`, "enabled", val.issues.enabled, "boolean") && isValid;
+		isValid = validateAdditionalProperties(diagnostics, `${field}.issues`, Object.keys(val.issues), ["enabled"]) && isValid;
+	}
 	if (typeof val.logs === "object") {
 		isValid = validateOptionalProperty(diagnostics, field, "logs.enabled", val.logs.enabled, "boolean") && isValid;
 		isValid = validateOptionalProperty(diagnostics, field, "logs.head_sampling_rate", val.logs.head_sampling_rate, "number") && isValid;
@@ -44342,6 +44357,7 @@ var BINDING_LOCAL_SUPPORT = {
 	pipeline: "local-and-remote",
 	service: "local-and-remote",
 	queue: "local-and-remote",
+	flagship: "local-and-remote",
 	vectorize: "remote",
 	mtls_certificate: "remote",
 	dispatch_namespace: "remote",
@@ -44350,7 +44366,6 @@ var BINDING_LOCAL_SUPPORT = {
 	ai_search_namespace: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
 	media: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
 	artifacts: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
-	flagship: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
 	vpc_service: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
 	vpc_network: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
 	agent_memory: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator"
@@ -45065,12 +45080,12 @@ function printBindings(bindings, options) {
 			mode: getMode({ isSimulatedLocally: true })
 		};
 	}));
-	if (flagship.length > 0) output.push(...flagship.map(({ binding, app_id }) => {
+	if (flagship.length > 0) output.push(...flagship.map(({ binding, app_id, remote }) => {
 		return {
 			name: binding,
 			type: getBindingTypeFriendlyName("flagship"),
 			value: app_id,
-			mode: getMode({ isSimulatedLocally: !context.remoteBindingsDisabled ? false : void 0 })
+			mode: getMode({ isSimulatedLocally: context.remoteBindingsDisabled || !remote })
 		};
 	}));
 	if (services.length > 0) output.push(...services.map(({ binding, service, entrypoint, remote, dev }) => {
@@ -48153,10 +48168,14 @@ async function assertWranglerVersion() {
 * delegate uses to force the experimental Build Output Specification on by default.
 */
 const FORCE_BUILD_OUTPUT_ENV_VAR = "CLOUDFLARE_VITE_FORCE_BUILD_OUTPUT";
+const PREVIEW_BUILD_ENV_VAR = "CLOUDFLARE_VITE_PREVIEW_BUILD";
 /** Whether `cf-vite build` has forced the Build Output Specification on. */
 function isForcedBuildOutput() {
 	return process.env[FORCE_BUILD_OUTPUT_ENV_VAR] === "true";
 }
+function isPreviewBuild() {
+	return process.env[PREVIEW_BUILD_ENV_VAR] === "true";
+}
 
 //#endregion
 //#region ../../node_modules/.pnpm/@remix-run+node-fetch-server@0.8.0/node_modules/@remix-run/node-fetch-server/dist/node-fetch-server.js
@@ -55609,14 +55628,14 @@ const ContainerObservabilityBaseSchema = strictObject({
 	enabled: boolean().optional(),
 	logs: strictObject({ enabled: boolean().optional() }).optional()
 });
-const ContainerObservabilitySchema = union([ContainerObservabilityBaseSchema.extend({ targetInstancePercentage: number().min(0).max(100).optional() }), ContainerObservabilityBaseSchema.extend({ targetInstanceCount: number().int().nonnegative().optional() })]);
+const StandardContainerObservabilitySchema = union([ContainerObservabilityBaseSchema.extend({ targetInstancePercentage: number().min(0).max(100).optional() }), ContainerObservabilityBaseSchema.extend({ targetInstanceCount: number().int().nonnegative().optional() })]);
 const BaseContainerSchema = strictObject({
 	type: literal$1("container"),
 	name: string().min(1),
-	observability: ContainerObservabilitySchema.optional(),
 	unsafe: record(string(), unknown()).optional()
 });
 const StandardContainerBaseSchema = BaseContainerSchema.extend({
+	observability: StandardContainerObservabilitySchema.optional(),
 	maxInstances: number().int().nonnegative().default(20),
 	instanceType: union([_enum([
 		"basic",
@@ -55663,7 +55682,10 @@ const StandardContainerBaseSchema = BaseContainerSchema.extend({
 		activeGracePeriod: number().nonnegative().optional()
 	}).optional()
 });
-const DurableObjectContainerBaseSchema = BaseContainerSchema.extend({ schedulingPolicy: literal$1("durable-object") });
+const DurableObjectContainerBaseSchema = BaseContainerSchema.extend({
+	schedulingPolicy: literal$1("durable-object"),
+	observability: ContainerObservabilityBaseSchema.optional()
+});
 /**
 * Input Container schema — validates user-authored `cloudflare.config.ts`
 * Container exports. Dockerfiles are built by the consuming build tool.
@@ -55728,6 +55750,7 @@ const ObservabilitySchema = strictObject({
 	enabled: boolean().optional(),
 	headSamplingRate: number().optional(),
 	redactQueryString: boolean().optional(),
+	issues: strictObject({ enabled: boolean().optional() }).optional(),
 	logs: strictObject({
 		enabled: boolean().optional(),
 		headSamplingRate: number().optional(),
@@ -55850,9 +55873,12 @@ const InputSettingsSchema = strictObject({
 });
 /**
 * Output settings schema — the shape of the top-level `config.json` in the
-* Build Output Specification. Adds the `mode` the build was produced in.
+* Build Output Specification. Adds the build mode and Preview intent.
 */
-const OutputSettingsSchema = InputSettingsSchema.extend({ mode: string().optional() });
+const OutputSettingsSchema = InputSettingsSchema.extend({
+	isPreview: boolean().optional(),
+	mode: string().optional()
+});
 const DEFAULT_EXPORT_NAME = "default";
 const SETTINGS_EXPORT_NAME = "settings";
 const SUPPORTED_EXPORT_TYPES = new Set([
@@ -56098,10 +56124,14 @@ function convertToWranglerConfig(workerConfig, settingsConfig, containerExports
 	return result;
 }
 function convertContainer(container) {
-	if (container.schedulingPolicy === "durable-object") throw new UserError$1("Durable Object-managed Containers are not currently supported by `convertToWranglerConfig()`.", { telemetryMessage: false });
 	const converted = { name: container.name };
 	if (container.observability !== void 0) converted.observability = convertContainerObservability(container.observability);
 	if (container.unsafe !== void 0) converted.unsafe = container.unsafe;
+	if (container.schedulingPolicy === "durable-object") {
+		converted.scheduling_policy = "durable_object";
+		if (container.images !== void 0) converted.images = Object.fromEntries(Object.entries(container.images).map(([name, image]) => [name, convertDurableObjectContainerImage(image)]));
+		return converted;
+	}
 	converted.image = "dockerfile" in container.image ? container.image.dockerfile : container.image.reference;
 	converted.max_instances = container.maxInstances;
 	if ("dockerfile" in container.image) {
@@ -56130,6 +56160,13 @@ function convertContainer(container) {
 	}
 	return converted;
 }
+function convertDurableObjectContainerImage(image) {
+	if ("reference" in image) return { image: image.reference };
+	const converted = { dockerfile: image.dockerfile };
+	if (image.buildContext !== void 0) converted.build_context = image.buildContext;
+	if (image.buildVars !== void 0) converted.build_vars = image.buildVars;
+	return converted;
+}
 function convertContainerObservability(observability) {
 	const converted = {};
 	if (observability.enabled !== void 0) converted.enabled = observability.enabled;
@@ -56175,6 +56212,7 @@ function convertObservability(observability) {
 	if (observability.enabled !== void 0) out.enabled = observability.enabled;
 	if (observability.headSamplingRate !== void 0) out.head_sampling_rate = observability.headSamplingRate;
 	if (observability.redactQueryString !== void 0) out.redact_query_string = observability.redactQueryString;
+	if (observability.issues !== void 0) out.issues = { enabled: observability.issues.enabled };
 	if (observability.logs !== void 0) {
 		const logs = {};
 		const { logs: src$1 } = observability;
@@ -56793,6 +56831,15 @@ const CROSS_WORKER_BINDING_TYPES = new Set([
 	"worker",
 	"workflow"
 ]);
+/**
+* Selects the Container exports from a validated project configuration.
+*
+* @param config - Validated exports keyed by their JavaScript export names.
+* @returns Container configurations keyed by those same export names.
+*/
+function getContainerConfigExports(config$2) {
+	return Object.fromEntries(Object.entries(config$2).filter((entry) => entry[1]?.type === "container"));
+}
 function isRecord(value) {
 	return typeof value === "object" && value !== null;
 }
@@ -57424,20 +57471,31 @@ async function writeWorkerConfig({ root, config: config$2, manifest, directoryNa
 	await fsp.writeFile(getWorkerConfigPath(root, directoryName), JSON.stringify(outputConfig));
 }
 /**
+* Write an output Container `config.json` to the Build Output Specification
+* tree.
+*
+* Local Dockerfiles must already have been built and represented by a
+* `localReference` in the output config.
+*/
+async function writeContainerConfig({ root, config: config$2, directoryName }) {
+	await fsp.mkdir(getContainerDir(root, directoryName), { recursive: true });
+	await fsp.writeFile(getContainerConfigPath(root, directoryName), JSON.stringify(config$2));
+}
+/**
 * Write the top-level `config.json` to the Build Output Specification tree.
 *
-* Holds the project-level settings shared by every Worker: those declared by
-* the `settings` export, including the `mode`, which is supplied at build time
-* rather than declared. Always written, even when there are no declared
-* settings and no mode: the result then degrades to `{ "type": "settings" }`.
+* Holds the project settings shared by every Worker, plus the build mode and
+* whether the build is for a Preview. Always written, even without declared
+* settings or a mode.
 *
 * `mode` is omitted when undefined, which is the case for Wrangler builds that
 * selected no mode (Vite always resolves one).
 */
-async function writeSettingsConfig(root, settings, mode) {
+async function writeSettingsConfig(root, settings, mode, isPreview = false) {
 	const outputConfig = {
 		...settings,
 		type: "settings",
+		...isPreview ? { isPreview: true } : {},
 		...mode !== void 0 ? { mode } : {}
 	};
 	const configPath = getSettingsConfigPath(root);
@@ -57629,10 +57687,10 @@ function parseJson(contents, configPath) {
 * single-element array.
 */
 async function readBuildOutputWorkers(root) {
-	const { workers, settings } = await readBuildOutput(root);
+	const { workers, settings, containers } = await readBuildOutput(root);
 	const worker = workers[DEFAULT_WORKER_DIRECTORY_NAME];
 	const { manifest,...inputShape } = worker.config;
-	const { config: config$2, diagnostics } = normalizeAndValidateConfig(convertToWranglerConfig(inputShape, settings), void 0, void 0, {}, true);
+	const { config: config$2, diagnostics } = normalizeAndValidateConfig(convertToWranglerConfig(inputShape, settings, Object.values(containers).map(({ config: config$3 }) => convertOutputContainerToInput(config$3))), void 0, void 0, { enableContainers: false }, true);
 	if (diagnostics.hasWarnings()) console.warn(diagnostics.renderWarnings());
 	if (diagnostics.hasErrors()) throw new Error(diagnostics.renderErrors());
 	if (worker.assetsDir) config$2.assets = {
@@ -57654,6 +57712,19 @@ async function readBuildOutputWorkers(root) {
 		bundle
 	}];
 }
+function convertOutputContainerToInput(config$2) {
+	if (config$2.schedulingPolicy === "durable-object") {
+		const { images: _images,...container } = config$2;
+		return container;
+	}
+	return {
+		...config$2,
+		image: convertOutputContainerImage(config$2.image)
+	};
+}
+function convertOutputContainerImage(image) {
+	return { reference: "reference" in image ? image.reference : image.localReference };
+}
 
 //#endregion
 //#region src/deploy-config.ts
@@ -64381,8 +64452,8 @@ function readWorkerConfig(configPath, env$3) {
 * validation pipeline as on-disk Wrangler config files, then apply the
 * Vite-specific sanitization.
 */
-function readWorkerConfigFromRaw(rawConfig) {
-	const { config: config$2, diagnostics } = normalizeAndValidateConfig(rawConfig, void 0, void 0, {}, true);
+function readWorkerConfigFromRaw(rawConfig, configPath) {
+	const { config: config$2, diagnostics } = normalizeAndValidateConfig(rawConfig, configPath, configPath, {}, true);
 	if (diagnostics.hasWarnings()) console.warn(diagnostics.renderWarnings());
 	if (diagnostics.hasErrors()) throw new Error(diagnostics.renderErrors());
 	return processNormalizedWorkerConfig(config$2);
@@ -64581,7 +64652,7 @@ function resolveWorkerConfig(options) {
 	let workerConfig;
 	let raw;
 	let nonApplicable;
-	if (options.rawConfigOverride) ({raw, config: workerConfig, nonApplicable} = readWorkerConfigFromRaw(options.rawConfigOverride));
+	if (options.rawConfigOverride) ({raw, config: workerConfig, nonApplicable} = readWorkerConfigFromRaw(options.rawConfigOverride, options.rawConfigPath));
 	else if (options.configPath) ({raw, config: workerConfig, nonApplicable} = readWorkerConfigFromFile(options.configPath, options.env, { visitedConfigPaths: options.visitedConfigPaths }));
 	else {
 		workerConfig = { ...wrangler.unstable_defaultWranglerConfig };
@@ -64670,7 +64741,8 @@ async function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 		env: cloudflareEnv,
 		configCustomizer: resolvedNewConfig ? void 0 : pluginConfig.config,
 		visitedConfigPaths: configPaths,
-		rawConfigOverride
+		rawConfigOverride,
+		rawConfigPath: resolvedNewConfig ? configPath : void 0
 	});
 	const environmentNameToWorkerMap = /* @__PURE__ */ new Map();
 	const environmentNameToChildEnvironmentNamesMap = /* @__PURE__ */ new Map();
@@ -64801,11 +64873,14 @@ const EXPERIMENTAL_CONFIG_PKG = "@cloudflare/vite-plugin/experimental-config";
 async function loadNewConfig(options) {
 	const configPath = path.resolve(options.root, NEW_CONFIG_FILENAME);
 	if (!fs$1.existsSync(configPath)) throw new Error(`\`experimental.newConfig\` is enabled but no \`${NEW_CONFIG_FILENAME}\` was found at ${configPath}.`);
-	const { result, dependencies } = await loadAndValidateConfig(configPath, { mode: options.mode });
+	const { result, dependencies } = await loadAndValidateConfig(configPath, {
+		isPreview: isPreviewBuild(),
+		mode: options.mode
+	});
 	if (!result.success) throw new Error(`Invalid \`${NEW_CONFIG_FILENAME}\`:\n${result.error.message}`);
 	const worker = result.data.default?.type === "worker" ? result.data.default : void 0;
 	if (worker === void 0) throw new Error(`\`${NEW_CONFIG_FILENAME}\` must have a default worker export.`);
-	const rawConfig = convertToWranglerConfig(worker, result.data.settings?.type === "settings" ? result.data.settings : void 0);
+	const rawConfig = convertToWranglerConfig(worker, result.data.settings?.type === "settings" ? result.data.settings : void 0, Object.values(getContainerConfigExports(result.data)));
 	if (options.command === "serve" && options.types.generate) await writeWorkerConfigurationDts({
 		root: options.root,
 		configPath,
@@ -66719,7 +66794,7 @@ const buildOutputPlugin = createPlugin("build-output", (ctx) => {
 		if (ctx.resolvedPluginConfig.type === "preview") return;
 		const settingsExport = ctx.resolvedPluginConfig.parsedNewConfig?.settings;
 		const settings = settingsExport?.type === "settings" ? settingsExport : void 0;
-		await writeSettingsConfig(ctx.resolvedViteConfig.root, settings, ctx.resolvedViteConfig.mode);
+		await writeSettingsConfig(ctx.resolvedViteConfig.root, settings, ctx.resolvedViteConfig.mode, isPreviewBuild());
 	}
 });
 /**
@@ -68918,392 +68993,6 @@ function removeAssetsField(entryWorkerBuildDirectory) {
 	fs$1.writeFileSync(entryWorkerConfigPath, JSON.stringify(workerConfig));
 }
 
-//#endregion
-//#region src/dev-vars.ts
-/**
-* Gets any variables with which to augment the Worker config in preview mode.
-*
-* Calls `unstable_getVarsForDev` with the current Cloudflare environment to get local dev variables from the .dev.vars/.env/process.env.
-* When `secrets` is defined in the Worker config, only declared secrets are loaded.
-*/
-function getLocalDevVarsForPreview(config$2, cloudflareEnv) {
-	const dotDevDotVars = wrangler.unstable_getVarsForDev(config$2.configPath, void 0, {}, cloudflareEnv, false, config$2.secrets);
-	const dotDevDotVarsEntries = Array.from(Object.entries(dotDevDotVars));
-	if (dotDevDotVarsEntries.length > 0) return dotDevDotVarsEntries.map(([key, { value }]) => {
-		return `${key}=${quoteForDotenv(value?.toString() ?? "")}\n`;
-	}).join("");
-}
-/**
-* Quote a value so that wrangler reads it back unchanged when it parses
-* `dist/<env>/.dev.vars` at preview time.
-*
-* Strategy: To quote the string pick the first quote character that does not
-* appear in the value (single → backtick → double). Throw if a value cannot
-* be losslessly serialized rather than silently corrupting it.
-*
-* @internal exported for tests
-*/
-function quoteForDotenv(value) {
-	if (!value.includes("'")) return `'${value}'`;
-	if (!value.includes("`")) return `\`${value}\``;
-	if (!value.includes("\"") && !/[\\\n\r]/.test(value)) return `"${value}"`;
-	throw new Error("Unable to serialize value to .dev.vars: contains every supported quote character or unsafe escape sequence.");
-}
-/**
-* Returns `true` if the `changedFile` matches a `.dev.vars` or `.env` file.
-*/
-function hasLocalDevVarsFileChanged({ configPaths, cloudflareEnv }, changedFilePath) {
-	return [...configPaths].some((configPath) => {
-		const configDir = path.dirname(configPath);
-		return [
-			".dev.vars",
-			".env",
-			...cloudflareEnv ? [`.dev.vars.${cloudflareEnv}`, `.env.${cloudflareEnv}`] : []
-		].some((localDevFile) => changedFilePath === path.join(configDir, localDevFile));
-	});
-}
-
-//#endregion
-//#region src/vite-config.ts
-const NODE_BUILTIN_SET = new Set([...builtinModules, ...builtinModules.filter((m) => !m.startsWith("node:")).map((m) => `node:${m}`)]);
-function isOnlyNodeBuiltins(external) {
-	if (!Array.isArray(external)) return false;
-	return external.every((entry) => typeof entry === "string" && NODE_BUILTIN_SET.has(entry));
-}
-/**
-* Throws an error if Worker environments include configuration options that are incompatible with the plugin.
-*/
-function validateWorkerEnvironmentOptions(resolvedPluginConfig, resolvedViteConfig) {
-	const disallowedEnvironmentOptionsMap = /* @__PURE__ */ new Map();
-	for (const environmentName of resolvedPluginConfig.environmentNameToWorkerMap.keys()) {
-		const environmentOptions = resolvedViteConfig.environments[environmentName];
-		assert2(environmentOptions, `Missing environment config for "${environmentName}"`);
-		const { resolve: resolve$4 } = environmentOptions;
-		const disallowedEnvironmentOptions = {};
-		if ((resolve$4.external === true || Array.isArray(resolve$4.external) && resolve$4.external.length > 0) && !isOnlyNodeBuiltins(resolve$4.external)) disallowedEnvironmentOptions.resolveExternal = resolve$4.external;
-		if (Object.keys(disallowedEnvironmentOptions).length) disallowedEnvironmentOptionsMap.set(environmentName, disallowedEnvironmentOptions);
-	}
-	if (disallowedEnvironmentOptionsMap.size) {
-		const errorMessage = `The following environment options are incompatible with the Cloudflare Vite plugin:\n${[...disallowedEnvironmentOptionsMap].map(([environmentName, disallowedEnvironmentOptions]) => disallowedEnvironmentOptions.resolveExternal && `	- "${environmentName}" environment: \`resolve.external\`: ${JSON.stringify(disallowedEnvironmentOptions.resolveExternal)}\n`).join("")}To resolve this issue, avoid setting \`resolve.external\` in your Cloudflare Worker environments.\n`;
-		throw new Error(errorMessage);
-	}
-}
-
-//#endregion
-//#region src/plugins/wrangler-watch-ignore.ts
-const WRANGLER_STATE_WATCH_IGNORE = "**/.wrangler/**";
-/**
-* Keep Miniflare persistence writes out of Vite's file watcher without
-* replacing any ignore patterns the user already configured.
-*
-* @param userIgnored - Existing `server.watch.ignored` patterns, if any
-* @returns Ignore patterns that always include `.wrangler` directories
-*/
-function withWranglerStateIgnored(userIgnored) {
-	if (userIgnored == null) return WRANGLER_STATE_WATCH_IGNORE;
-	if (Array.isArray(userIgnored)) return [...userIgnored, WRANGLER_STATE_WATCH_IGNORE];
-	return [userIgnored, WRANGLER_STATE_WATCH_IGNORE];
-}
-/**
-* Merge `.wrangler` into Vite's `server.watch` config.
-*
-* Returns `null` when the user disabled watching with `server.watch: null`,
-* so this plugin does not turn the watcher back on.
-*
-* @param userWatch - The user's `server.watch` value from Vite config
-* @returns `null` when watching is disabled, otherwise a watch object whose
-*   `ignored` list includes `.wrangler` directories
-*/
-function getServerWatchConfig(userWatch) {
-	if (userWatch === null) return null;
-	return {
-		...userWatch,
-		ignored: withWranglerStateIgnored(userWatch?.ignored)
-	};
-}
-
-//#endregion
-//#region src/plugins/config.ts
-/**
-* Plugin to handle configuration and config file watching
-*/
-const configPlugin = createPlugin("config", (ctx) => {
-	return {
-		config(userConfig, env$3) {
-			if (ctx.resolvedPluginConfig.type === "preview") return { appType: "custom" };
-			if (!ctx.hasShownWorkerConfigWarnings) {
-				ctx.setHasShownWorkerConfigWarnings(true);
-				const workerConfigWarnings = getWarningForWorkersConfigs(ctx.resolvedPluginConfig.rawConfigs);
-				if (workerConfigWarnings) console.warn(workerConfigWarnings);
-			}
-			return {
-				appType: "custom",
-				server: {
-					allowedHosts: getAllowedHosts(ctx.getTunnelHostnames(), userConfig.server?.allowedHosts),
-					watch: getServerWatchConfig(userConfig.server?.watch),
-					fs: { deny: [...[
-						".env",
-						".env.*",
-						".npmrc",
-						".yarnrc",
-						".yarnrc.yml",
-						"*.{crt,pem,key,pfx,p12,p8,jks}",
-						"**/.git/**",
-						".dev.vars",
-						".dev.vars.*",
-						"**/.wrangler/**"
-					], ...Array.from(ctx.resolvedPluginConfig.configPaths, (configPath) => normalizePath(configPath))] }
-				},
-				environments: getEnvironmentsConfig(ctx, userConfig, env$3.mode),
-				builder: { buildApp: userConfig.builder?.buildApp ?? createBuildApp(ctx.resolvedPluginConfig) }
-			};
-		},
-		async configResolved(resolvedViteConfig) {
-			ctx.setResolvedViteConfig(resolvedViteConfig);
-			if (ctx.resolvedPluginConfig.type === "preview") return;
-			validateWorkerEnvironmentOptions(ctx.resolvedPluginConfig, ctx.resolvedViteConfig);
-			if (ctx.resolvedPluginConfig.experimental.newConfig?.cfBuildOutput) {
-				forceBuildOutputDirs(ctx.resolvedPluginConfig, ctx.resolvedViteConfig);
-				if (ctx.resolvedViteConfig.command === "build") await cleanBuildOutputDir(ctx.resolvedViteConfig.root);
-			}
-		},
-		buildStart() {
-			ctx.setHasShownWorkerConfigWarnings(false);
-		},
-		configureServer(viteDevServer) {
-			let restartInFlight = false;
-			const configChangedHandler = async (changedFilePath) => {
-				assertIsNotPreview(ctx);
-				if (restartInFlight) return;
-				if (ctx.resolvedPluginConfig.configPaths.has(changedFilePath) || hasLocalDevVarsFileChanged(ctx.resolvedPluginConfig, changedFilePath) || hasAssetsConfigChanged(ctx.resolvedPluginConfig, ctx.resolvedViteConfig, changedFilePath)) {
-					debuglog("Config changed: " + changedFilePath);
-					restartInFlight = true;
-					debuglog("Restarting dev server and aborting previous setup");
-					try {
-						await viteDevServer.restart();
-					} finally {
-						restartInFlight = false;
-					}
-				}
-			};
-			viteDevServer.watcher.on("change", configChangedHandler);
-		},
-		buildApp: {
-			order: "post",
-			async handler(builder) {
-				if (ctx.resolvedPluginConfig.type !== "workers") return;
-				const workerEnvironments = [...ctx.resolvedPluginConfig.environmentNameToWorkerMap.entries()].filter(([_, worker]) => !resolveDevOnly(worker.devOnly)).map(([environmentName]) => {
-					const environment = builder.environments[environmentName];
-					assert2(environment, `"${environmentName}" environment not found`);
-					return environment;
-				});
-				await Promise.all(workerEnvironments.filter((environment) => !environment.isBuilt).map((environment) => builder.build(environment)));
-				const { entryWorkerEnvironmentName } = ctx.resolvedPluginConfig;
-				const entryWorkerEnvironment = builder.environments[entryWorkerEnvironmentName];
-				assert2(entryWorkerEnvironment, `No "${entryWorkerEnvironmentName}" environment`);
-				const cfBuildOutput = ctx.resolvedPluginConfig.experimental.newConfig?.cfBuildOutput === true;
-				if (entryWorkerEnvironment.isBuilt) {
-					if (!builder.environments.client?.isBuilt && !cfBuildOutput) removeAssetsField(path.resolve(builder.config.root, entryWorkerEnvironment.config.build.outDir));
-				} else {
-					const clientEnvironment = builder.environments.client;
-					assert2(clientEnvironment, "No \"client\" environment");
-					if (!clientEnvironment.isBuilt) throw new Error("If `assetsOnly` is set to `true`, the client environment must be built");
-					if (cfBuildOutput) {
-						const entryWorkerNewConfig = ctx.getWorkerNewConfig(entryWorkerEnvironmentName);
-						assert2(entryWorkerNewConfig, `No config found for "${entryWorkerEnvironmentName}" environment`);
-						await writeWorkerConfig({
-							root: builder.config.root,
-							config: entryWorkerNewConfig
-						});
-					} else {
-						const entryWorkerConfig = ctx.getWorkerConfig(entryWorkerEnvironmentName);
-						assert2(entryWorkerConfig, `No config found for "${entryWorkerEnvironmentName}" environment`);
-						const outputConfig = {
-							...entryWorkerConfig,
-							main: void 0,
-							assets: {
-								...entryWorkerConfig.assets,
-								directory: ".",
-								binding: void 0
-							}
-						};
-						if (outputConfig.unsafe && Object.keys(outputConfig.unsafe).length === 0) outputConfig.unsafe = void 0;
-						fs$1.writeFileSync(path.resolve(builder.config.root, clientEnvironment.config.build.outDir, "wrangler.json"), JSON.stringify(outputConfig));
-						writeDeployConfig(ctx.resolvedPluginConfig, ctx.resolvedViteConfig, true);
-					}
-				}
-			}
-		}
-	};
-});
-/**
-* Generates the environment configuration for all Worker environments.
-*/
-function getEnvironmentsConfig(ctx, userConfig, mode) {
-	assertIsNotPreview(ctx);
-	if (!ctx.resolvedPluginConfig.environmentNameToWorkerMap.size) return;
-	return {
-		...Object.fromEntries([...ctx.resolvedPluginConfig.environmentNameToWorkerMap].flatMap(([environmentName, worker]) => {
-			const childEnvironmentNames = ctx.resolvedPluginConfig.environmentNameToChildEnvironmentNamesMap.get(environmentName) ?? [];
-			const sharedOptions = {
-				workerConfig: worker.config,
-				userConfig,
-				mode,
-				hasNodeJsCompat: ctx.getNodeJsCompat(environmentName) !== void 0
-			};
-			const isEntryWorker = environmentName === ctx.resolvedPluginConfig.prerenderWorkerEnvironmentName || ctx.resolvedPluginConfig.type === "workers" && environmentName === ctx.resolvedPluginConfig.entryWorkerEnvironmentName;
-			return [[environmentName, createCloudflareEnvironmentOptions({
-				...sharedOptions,
-				environmentName,
-				isEntryWorker,
-				isParentEnvironment: true
-			})], ...childEnvironmentNames.map((childEnvironmentName) => [childEnvironmentName, createCloudflareEnvironmentOptions({
-				...sharedOptions,
-				environmentName: childEnvironmentName,
-				isEntryWorker: false,
-				isParentEnvironment: false
-			})])];
-		})),
-		client: {
-			build: { outDir: getOutputDirectory(userConfig, "client") },
-			optimizeDeps: { exclude: [...cloudflareBuiltInModules] }
-		}
-	};
-}
-/**
-* When the Build Output Specification is enabled,
-* force every Worker environment's and the client environment's `build.outDir`
-* to the spec-mandated location.
-*
-* Runs after Vite's merge in `configResolved`, so it overrides any
-* user-supplied `build.outDir`
-*/
-function forceBuildOutputDirs(resolvedPluginConfig, resolvedViteConfig) {
-	if (!resolvedPluginConfig.experimental.newConfig?.cfBuildOutput) return;
-	const { root } = resolvedViteConfig;
-	if (resolvedPluginConfig.type === "workers") {
-		const entryName = resolvedPluginConfig.entryWorkerEnvironmentName;
-		const entryEnvironment = resolvedViteConfig.environments[entryName];
-		if (entryEnvironment) entryEnvironment.build.outDir = getWorkerBundleDir(root);
-	}
-	const clientEnvironment = resolvedViteConfig.environments.client;
-	if (clientEnvironment) clientEnvironment.build.outDir = getWorkerAssetsDir(root);
-}
-function getAllowedHosts(tunnelHostnames, userAllowedHosts) {
-	if (tunnelHostnames.length === 0 || userAllowedHosts === true) return userAllowedHosts;
-	return Array.from(new Set([...userAllowedHosts ?? [], ...tunnelHostnames]));
-}
-
-//#endregion
-//#region src/debug.ts
-var import_picocolors$3 = /* @__PURE__ */ __toESM$1(require_picocolors(), 1);
-const DEBUG_PATH = "/__debug";
-const DEFAULT_INSPECTOR_PORT = 9229;
-/**
-* Gets the inspector port option that should be passed to Miniflare based on the user's plugin config
-*/
-async function getInputInspectorPort(ctx, viteServer) {
-	if (ctx.resolvedPluginConfig.inspectorPort === void 0 || ctx.resolvedPluginConfig.inspectorPort === 0) {
-		const resolvedInspectorPort = await ctx.getResolvedInspectorPort();
-		if (resolvedInspectorPort !== null) return resolvedInspectorPort;
-	}
-	const inputInspectorPort = ctx.resolvedPluginConfig.inspectorPort ?? await getFirstAvailablePort(DEFAULT_INSPECTOR_PORT);
-	if (ctx.resolvedPluginConfig.inspectorPort === void 0 && inputInspectorPort !== DEFAULT_INSPECTOR_PORT) viteServer.config.logger.warn(import_picocolors$3.default.dim(`Default inspector port ${DEFAULT_INSPECTOR_PORT} not available, using ${inputInspectorPort} instead\n`));
-	return inputInspectorPort;
-}
-function getFirstAvailablePort(start) {
-	return getPorts({ port: portNumbers(start, 65535) });
-}
-/**
-* Modifies the URL printing logic to also include a URL that developers can use to open DevTools to debug their Worker(s)
-*/
-function addDebugToVitePrintUrls(server) {
-	const originalPrintUrls = server.printUrls;
-	server.printUrls = () => {
-		originalPrintUrls();
-		const localUrl = server.resolvedUrls?.local[0];
-		if (localUrl) {
-			const { protocol, hostname: hostname$1, port } = new URL(localUrl);
-			const colorDebugUrl = (url$2) => import_picocolors$3.default.dim(import_picocolors$3.default.yellow(url$2.replace(/:(\d+)\//, (_, portNumber) => `:${import_picocolors$3.default.bold(portNumber)}/`)));
-			server.config.logger.info(`  ${import_picocolors$3.default.green("➜")}  ${import_picocolors$3.default.bold("Debug")}:   ${colorDebugUrl(`${protocol}//${hostname$1}:${port}${DEBUG_PATH}`)}`);
-		}
-	};
-}
-/**
-* Generate HTML that comprises a single script that:
-*  - redirects the page to the DevTools for debugging the first available Worker
-*  - opens tabs to the DevTools for all the remaining workers if any
-*
-* Note: this works based on the Miniflare inspector proxy logic (where Workers are available via
-* their names)
-*/
-function getDebugPathHtml(workerNames, inspectorPort) {
-	assert2(workerNames.length >= 1, "no workers present to debug");
-	const workerDevtoolsUrls = workerNames.map((workerName) => {
-		const localhost = `localhost:${inspectorPort}/${workerName}`;
-		return `https://devtools.devprod.cloudflare.dev/js_app?${new URLSearchParams({
-			theme: "systemPreferred",
-			debugger: "true",
-			ws: localhost,
-			domain: workerName
-		})}`;
-	});
-	return `
-		<script>
-			const workerUrls = ${JSON.stringify(workerDevtoolsUrls)};
-			const [firstUrl, ...rest] = workerUrls;
-			for (const workerUrl of rest) {
-				// open new tabs for the devtools of the various workers
-				window.open(workerUrl);
-			}
-			// redirect the current tab to the devtools of the first worker
-			window.location.replace(firstUrl);
-		<\/script>
-    `;
-}
-
-//#endregion
-//#region src/plugins/debug.ts
-/**
-* Plugin to provide a `/__debug` path for debugging Workers
-*/
-const debugPlugin = createPlugin("debug", (ctx) => {
-	return {
-		enforce: "pre",
-		configureServer(viteDevServer) {
-			assertIsNotPreview(ctx);
-			if (!!process.env.VSCODE_INSPECTOR_OPTIONS) return;
-			if (ctx.resolvedPluginConfig.type === "workers" && ctx.resolvedPluginConfig.inspectorPort !== false) addDebugToVitePrintUrls(viteDevServer);
-			const workerNames = ctx.resolvedPluginConfig.type === "workers" ? [...ctx.resolvedPluginConfig.environmentNameToWorkerMap.values()].map((worker) => worker.config.name) : [];
-			viteDevServer.middlewares.use(DEBUG_PATH, async (_, res, next) => {
-				const resolvedInspectorPort = await ctx.getResolvedInspectorPort();
-				if (resolvedInspectorPort) {
-					const html = getDebugPathHtml(workerNames, resolvedInspectorPort);
-					res.setHeader("Content-Type", "text/html");
-					res.end(html);
-				} else next();
-			});
-		},
-		async configurePreviewServer(vitePreviewServer) {
-			assertIsPreview(ctx);
-			if (!!process.env.VSCODE_INSPECTOR_OPTIONS) return;
-			if (ctx.resolvedPluginConfig.workers.length >= 1 && ctx.resolvedPluginConfig.inspectorPort !== false) addDebugToVitePrintUrls(vitePreviewServer);
-			const workerNames = ctx.resolvedPluginConfig.workers.map((worker) => {
-				assert2(worker.config.name, "Expected the Worker to have a name");
-				return worker.config.name;
-			});
-			vitePreviewServer.middlewares.use(DEBUG_PATH, async (_, res, next) => {
-				const resolvedInspectorPort = await ctx.getResolvedInspectorPort();
-				if (resolvedInspectorPort) {
-					const html = getDebugPathHtml(workerNames, resolvedInspectorPort);
-					res.setHeader("Content-Type", "text/html");
-					res.end(html);
-				} else next();
-			});
-		}
-	};
-});
-
 //#endregion
 //#region ../cli/dist/colors.mjs
 const { white, gray, dim, hidden, bold, cyanBright, bgCyan } = source_default;
@@ -72007,11 +71696,11 @@ var getQueryString = /* @__PURE__ */ __name$2((params) => {
 }, "getQueryString");
 var getUrl = /* @__PURE__ */ __name$2((config$2, options) => {
 	const encoder$1 = config$2.ENCODE_PATH || encodeURI;
-	const path$2 = options.url.replace("{api-version}", config$2.VERSION).replace(/{(.*?)}/g, (substring, group) => {
+	const path3 = options.url.replace("{api-version}", config$2.VERSION).replace(/{(.*?)}/g, (substring, group) => {
 		if (options.path?.hasOwnProperty(group)) return encoder$1(String(options.path[group]));
 		return substring;
 	});
-	const url$2 = `${config$2.BASE}${path$2}`;
+	const url$2 = `${config$2.BASE}${path3}`;
 	if (options.query) return `${url$2}${getQueryString(options.query)}`;
 	return url$2;
 }, "getUrl");
@@ -73995,7 +73684,7 @@ async function checkExposedPorts(dockerPath, options) {
 	if (await dockerImageInspect(dockerPath, {
 		imageTag: options.image_tag,
 		formatString: "{{ len .Config.ExposedPorts }}"
-	}) === "0") throw new UserError(`The container "${options.class_name}" does not expose any ports. In your Dockerfile, please expose any ports you intend to connect to.
+	}) === "0") throw new UserError(`The container "${options.image_name === void 0 ? options.class_name : `${options.class_name}.${options.image_name}`}" does not expose any ports. In your Dockerfile, please expose any ports you intend to connect to.
 For additional information please see: https://developers.cloudflare.com/containers/local-dev/#exposing-ports.
 `, { telemetryMessage: false });
 }
@@ -74025,31 +73714,6 @@ function resolveDockerHost(dockerPath) {
 	return process.platform === "win32" ? "//./pipe/docker_engine" : "unix:///var/run/docker.sock";
 }
 __name$2(resolveDockerHost, "resolveDockerHost");
-async function getImageRepoTags(dockerPath, imageTag) {
-	try {
-		return (await dockerImageInspect(dockerPath, {
-			imageTag,
-			formatString: "{{ range .RepoTags }}{{ . }}\n{{ end }}"
-		})).split("\n").filter((tag) => tag.trim() !== "");
-	} catch {
-		return [];
-	}
-}
-__name$2(getImageRepoTags, "getImageRepoTags");
-async function cleanupDuplicateImageTags(dockerPath, imageTag) {
-	try {
-		const repoTags = await getImageRepoTags(dockerPath, imageTag);
-		const currentBuildId = getImageTag(imageTag);
-		const tagsToRemove = repoTags.filter((tag) => tag.startsWith("cloudflare-dev") && getImageTag(tag) !== currentBuildId);
-		if (tagsToRemove.length > 0) runDockerCmdWithOutput(dockerPath, ["rmi", ...tagsToRemove]);
-	} catch {}
-}
-__name$2(cleanupDuplicateImageTags, "cleanupDuplicateImageTags");
-function getImageTag(imageTag) {
-	const tagSeparatorIndex = imageTag.lastIndexOf(":");
-	return tagSeparatorIndex === -1 ? void 0 : imageTag.slice(tagSeparatorIndex + 1);
-}
-__name$2(getImageTag, "getImageTag");
 var DEFAULT_CONTAINER_EGRESS_INTERCEPTOR_IMAGE = "cloudflare/proxy-everything:3cb1195@sha256:0ef6716c52430096900b150d84a3302057d6cd2319dae7987128c85d0733e3c8";
 function getEgressInterceptorPlatform() {
 	return process.env.MINIFLARE_CONTAINER_EGRESS_IMAGE_PLATFORM;
@@ -74088,6 +73752,7 @@ async function pullImage(dockerPath, options, logger2, complianceConfig) {
 			options.image_uri,
 			options.image_tag
 		]);
+		return { aborted: aborted$2 };
 	});
 	return {
 		abort: /* @__PURE__ */ __name$2(() => {
@@ -74138,17 +73803,25 @@ async function prepareContainerImagesForDev(args) {
 					pull.abort();
 				}, "abort")
 			});
-			await pull.ready;
+			const pullResult = await pull.ready;
+			aborted$2 ||= pullResult.aborted;
 			onContainerImagePreparationEnd({ containerOptions: options });
 		}
-		if (!aborted$2) {
-			await cleanupDuplicateImageTags(dockerPath, options.image_tag);
-			await checkExposedPorts(dockerPath, options);
-		}
+		if (aborted$2) break;
+		await checkExposedPorts(dockerPath, options);
 	}
 	if (!aborted$2) await pullEgressInterceptorImage(dockerPath);
+	return { aborted: aborted$2 };
 }
 __name$2(prepareContainerImagesForDev, "prepareContainerImagesForDev");
+function isCloudflareRegistryImage(image, complianceConfig) {
+	let url$2;
+	try {
+		url$2 = new URL(`http://${image}`);
+	} catch {}
+	return url$2 === void 0 || !url$2.host.match(/[:.]/) && url$2.hostname !== "localhost" || url$2.hostname === getCloudflareContainerRegistry(complianceConfig);
+}
+__name$2(isCloudflareRegistryImage, "isCloudflareRegistryImage");
 function resolveImageName(accountId, image, complianceConfig) {
 	let url$2;
 	try {
@@ -74348,6 +74021,11 @@ async function getContainerAccount(accountId, complianceConfig) {
 	return await fetchResult$1(complianceConfig ?? {}, `/accounts/${accountId}/containers/me`);
 }
 __name$2(getContainerAccount, "getContainerAccount");
+var MAX_DOCKER_REPOSITORY_NAME_LENGTH = 255;
+function normalizeContainerImageRepositoryName(value) {
+	return value.toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/[._-]+/g, (separators) => separators === "." || separators === "_" || separators === "__" || /^-+$/.test(separators) ? separators : "-").replace(/^[._-]+|[._-]+$/g, "").slice(0, MAX_DOCKER_REPOSITORY_NAME_LENGTH).replace(/[._-]+$/g, "") || "container";
+}
+__name$2(normalizeContainerImageRepositoryName, "normalizeContainerImageRepositoryName");
 function isDockerfileContainerConfig(container) {
 	return "dockerfile" in container;
 }
@@ -74590,7 +74268,7 @@ async function buildAndMaybePush(args, pathToDocker, push, containerConfig, veri
 }
 __name$2(buildAndMaybePush, "buildAndMaybePush");
 async function buildContainerImage(containerConfig, pathToDocker, verifyDockerIsRunning) {
-	const localTag = `${getContainerImageRepositoryName(containerConfig)}:wrangler-${crypto$1.randomUUID()}`;
+	const localTag = `${getContainerImageRepositoryName(containerConfig)}:wrangler-${crypto2.randomUUID()}`;
 	logger$1.log("Building image", localTag);
 	try {
 		await (await startContainerBuild({
@@ -74728,6 +74406,157 @@ async function dockerBuild(dockerPath, options) {
 	};
 }
 __name$2(dockerBuild, "dockerBuild");
+var BUILD_OUTPUT_IMAGE_NAMESPACE = "cloudflare-build";
+var DOCKER_REPOSITORY_NAME_LENGTH = 255;
+async function buildAndWriteContainerOutput(options) {
+	const containers = Object.entries(options.containers);
+	await cleanupPreviousBuildOutputImageTags({
+		root: options.root,
+		pathToDocker: options.pathToDocker
+	});
+	const buildId = createBuildId();
+	const localTags = /* @__PURE__ */ new Set();
+	try {
+		const dockerfileCount = countDockerfiles(containers);
+		if (dockerfileCount > 0) await verifyDockerInstalled({
+			dockerPath: options.pathToDocker,
+			operation: "building the project",
+			imageNoun: dockerfileCount === 1 ? "the configured image" : "the configured images"
+		});
+		const outputConfigs = [];
+		try {
+			for (const [directoryName, config$2] of containers) outputConfigs.push({
+				root: options.root,
+				directoryName,
+				config: await buildContainerOutputConfig({
+					config: config$2,
+					root: options.root,
+					pathToDocker: options.pathToDocker,
+					buildId,
+					localTags
+				})
+			});
+		} catch (error$2) {
+			throwBuildError(error$2);
+		}
+		for (const outputConfig of outputConfigs) await writeContainerConfig(outputConfig);
+	} catch (error$2) {
+		await Promise.allSettled([cleanBuildOutputDir(options.root), cleanupBuiltImages(Array.from(localTags, (localTag) => ({ localTag })), options.pathToDocker)]);
+		throw error$2;
+	}
+}
+__name$2(buildAndWriteContainerOutput, "buildAndWriteContainerOutput");
+async function buildContainerOutputConfig(options) {
+	if (options.config.schedulingPolicy === "durable-object") {
+		if (options.config.images === void 0) return {
+			...options.config,
+			images: void 0
+		};
+		const images = {};
+		for (const [imageName, image2] of Object.entries(options.config.images)) images[imageName] = await buildContainerImage2({
+			image: image2,
+			repositoryName: `${options.config.name}-${imageName}`,
+			root: options.root,
+			pathToDocker: options.pathToDocker,
+			buildId: options.buildId,
+			localTags: options.localTags
+		});
+		return {
+			...options.config,
+			images
+		};
+	}
+	const image = await buildContainerImage2({
+		image: options.config.image,
+		repositoryName: options.config.name,
+		root: options.root,
+		pathToDocker: options.pathToDocker,
+		buildId: options.buildId,
+		localTags: options.localTags
+	});
+	return {
+		...options.config,
+		image
+	};
+}
+__name$2(buildContainerOutputConfig, "buildContainerOutputConfig");
+async function buildContainerImage2(options) {
+	if ("reference" in options.image) return { reference: options.image.reference };
+	const pathToDockerfile = path__default.resolve(options.root, options.image.dockerfile);
+	const localTag = createBuildOutputImageTag({
+		root: options.root,
+		repositoryName: options.repositoryName,
+		buildId: options.buildId
+	});
+	if (options.localTags.has(localTag)) throw new UserError(`Container image name ${JSON.stringify(options.repositoryName)} conflicts with another image after Docker name normalization.`, { telemetryMessage: "container build output image name conflict" });
+	await (await startContainerBuild({
+		build: {
+			tag: localTag,
+			pathToDockerfile,
+			buildContext: options.image.buildContext === void 0 ? path__default.dirname(pathToDockerfile) : path__default.resolve(options.root, options.image.buildContext),
+			args: options.image.buildVars,
+			platform: "linux/amd64"
+		},
+		pathToDocker: options.pathToDocker,
+		verifyDockerIsRunning: false
+	})).ready;
+	options.localTags.add(localTag);
+	return { localReference: localTag };
+}
+__name$2(buildContainerImage2, "buildContainerImage");
+function createBuildOutputImageTag(options) {
+	const repositoryPrefix = getBuildOutputImageRepositoryPrefix(options.root);
+	const maxNameLength = DOCKER_REPOSITORY_NAME_LENGTH - repositoryPrefix.length;
+	return `${repositoryPrefix}${normalizeContainerImageRepositoryName(options.repositoryName).slice(0, maxNameLength).replace(/[._-]+$/g, "")}:${options.buildId}`;
+}
+__name$2(createBuildOutputImageTag, "createBuildOutputImageTag");
+async function cleanupPreviousBuildOutputImageTags(options) {
+	const repositoryPrefix = getBuildOutputImageRepositoryPrefix(options.root);
+	let existingTags;
+	try {
+		const output = runDockerCmdWithOutput(options.pathToDocker, [
+			"image",
+			"ls",
+			"--filter",
+			`reference=${repositoryPrefix}*`,
+			"--format",
+			"{{.Repository}}:{{.Tag}}"
+		]);
+		existingTags = output === "" ? [] : output.split(/\r?\n/);
+	} catch {
+		return;
+	}
+	if (existingTags.length > 0) await cleanupBuiltImages(existingTags.map((localTag) => ({ localTag })), options.pathToDocker);
+}
+__name$2(cleanupPreviousBuildOutputImageTags, "cleanupPreviousBuildOutputImageTags");
+function getBuildOutputImageRepositoryPrefix(root) {
+	return `${BUILD_OUTPUT_IMAGE_NAMESPACE}/${shortHash(path__default.resolve(root))}/`;
+}
+__name$2(getBuildOutputImageRepositoryPrefix, "getBuildOutputImageRepositoryPrefix");
+function shortHash(value) {
+	return crypto2.createHash("sha256").update(value).digest("hex").slice(0, 12);
+}
+__name$2(shortHash, "shortHash");
+function createBuildId() {
+	return crypto2.randomUUID().replaceAll("-", "").slice(0, 12);
+}
+__name$2(createBuildId, "createBuildId");
+function countDockerfiles(containers) {
+	let count = 0;
+	for (const [, config$2] of containers) if (config$2.schedulingPolicy === "durable-object") count += Object.values(config$2.images ?? {}).filter((image) => "dockerfile" in image).length;
+	else if ("dockerfile" in config$2.image) count++;
+	return count;
+}
+__name$2(countDockerfiles, "countDockerfiles");
+function throwBuildError(error$2) {
+	if (error$2 instanceof UserError) throw error$2;
+	if (error$2 instanceof Error) throw new UserError(error$2.message, {
+		cause: error$2,
+		telemetryMessage: "container build image operation failed"
+	});
+	throw new UserError("An unknown error occurred", { telemetryMessage: "container build unknown error" });
+}
+__name$2(throwBuildError, "throwBuildError");
 var Diff = class {
 	static {
 		__name$2(this, "Diff");
@@ -74892,10 +74721,10 @@ var Diff = class {
 	print(options = { contextLines: 3 }) {
 		log$1(this.toString(options));
 	}
-	#addToPath(path$2, added, removed, oldPosInc) {
-		const last = path$2.lastComponent;
+	#addToPath(path3, added, removed, oldPosInc) {
+		const last = path3.lastComponent;
 		if (last && last.added === added && last.removed === removed) return {
-			oldPos: path$2.oldPos + oldPosInc,
+			oldPos: path3.oldPos + oldPosInc,
 			lastComponent: {
 				count: last.count + 1,
 				added,
@@ -74904,7 +74733,7 @@ var Diff = class {
 			}
 		};
 		return {
-			oldPos: path$2.oldPos + oldPosInc,
+			oldPos: path3.oldPos + oldPosInc,
 			lastComponent: {
 				count: 1,
 				added,
@@ -75424,6 +75253,495 @@ var configRolloutStepsToAPI = /* @__PURE__ */ __name$2((rolloutSteps) => {
 		return { steps: output };
 	}
 }, "configRolloutStepsToAPI");
+var MAX_NAMED_IMAGE_SLUG_LENGTH = 255 - MF_DEV_CONTAINER_PREFIX.length - 1;
+var IMAGE_ID_HASH_LENGTH = 12;
+function getNamedContainerImageTag(className, imageName, containerBuildId) {
+	const identity = `${className}\0${imageName}`;
+	const classSlug = getDockerRepositorySlug(className);
+	const imageSlug = getDockerRepositorySlug(imageName);
+	const identityHash = createHash("sha256").update(identity).digest("hex").slice(0, IMAGE_ID_HASH_LENGTH);
+	return getDevContainerImageName(`${`${classSlug || "container"}-${imageSlug || "image"}`.slice(0, MAX_NAMED_IMAGE_SLUG_LENGTH - identityHash.length - 1).replace(/-+$/g, "")}-${identityHash}`, containerBuildId);
+}
+__name$2(getNamedContainerImageTag, "getNamedContainerImageTag");
+function getDockerRepositorySlug(value) {
+	return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+}
+__name$2(getDockerRepositorySlug, "getDockerRepositorySlug");
+function requireContainerBuildId(containerBuildId) {
+	if (containerBuildId === void 0) throw new Error("Build ID should be set when a Container image requires preparation");
+	return containerBuildId;
+}
+__name$2(requireContainerBuildId, "requireContainerBuildId");
+function createContainerDevPlan(options) {
+	const { containers, exports: exports$1, containerBuildId, configPath } = options;
+	if (!containers?.length) return;
+	const containerOptions = [];
+	const containerRuntimeOptions = /* @__PURE__ */ new Map();
+	const durableObjectContainerAppsByName = new Map(getResolvedDurableObjectContainerApps(containers, exports$1).map((container) => [container.name, container]));
+	for (const container of containers) {
+		if (isDurableObjectContainerApp(container)) {
+			const resolvedContainer = durableObjectContainerAppsByName.get(container.name);
+			if (resolvedContainer === void 0) throw new Error(`Expected Durable Object-managed Container "${container.name}" to be resolved`);
+			const className2 = resolvedContainer.class_name;
+			const namedOptions = [];
+			const baseDir$1 = configPath ? path__default.dirname(configPath) : process.cwd();
+			for (const [imageName, image] of Object.entries(container.images ?? {})) {
+				const imageTag2 = getNamedContainerImageTag(className2, imageName, requireContainerBuildId(containerBuildId));
+				if (image.dockerfile !== void 0) {
+					const dockerfile = path__default.resolve(baseDir$1, image.dockerfile);
+					namedOptions.push({
+						dockerfile,
+						image_build_context: image.build_context === void 0 ? path__default.dirname(dockerfile) : path__default.resolve(baseDir$1, image.build_context),
+						image_vars: image.build_vars,
+						class_name: className2,
+						image_name: imageName,
+						image_tag: imageTag2
+					});
+				} else namedOptions.push({
+					image_uri: image.image,
+					class_name: className2,
+					image_name: imageName,
+					image_tag: imageTag2
+				});
+			}
+			containerOptions.push(...namedOptions);
+			const images = namedOptions.map(({ image_name, image_tag }) => ({
+				name: image_name,
+				image: image_tag
+			}));
+			containerRuntimeOptions.set(className2, images.length === 0 ? {} : { images });
+			continue;
+		}
+		if (container.image === void 0) continue;
+		const className = resolveContainerClassName(container, exports$1);
+		if (className === void 0) continue;
+		const imageTag = getDevContainerImageName(className, requireContainerBuildId(containerBuildId));
+		containerRuntimeOptions.set(className, { imageName: imageTag });
+		if (isDockerfile(container.image, configPath)) containerOptions.push({
+			dockerfile: container.image,
+			image_build_context: container.image_build_context ?? path__default.dirname(container.image),
+			image_vars: container.image_vars,
+			class_name: className,
+			image_tag: imageTag
+		});
+		else containerOptions.push({
+			image_uri: container.image,
+			class_name: className,
+			image_tag: imageTag
+		});
+	}
+	return containerOptions.length === 0 && containerRuntimeOptions.size === 0 ? void 0 : {
+		containerOptions,
+		containerRuntimeOptions
+	};
+}
+__name$2(createContainerDevPlan, "createContainerDevPlan");
+
+//#endregion
+//#region src/build-output-containers.ts
+/**
+* Build and write the Container portion of the Build Output Specification.
+*
+* @param resolvedPluginConfig - The resolved Cloudflare Vite plugin config.
+* @param root - The Vite project root and Build Output root.
+*/
+async function buildOutputContainers(resolvedPluginConfig, root) {
+	if (resolvedPluginConfig.type === "preview" || resolvedPluginConfig.experimental.newConfig?.cfBuildOutput !== true) return;
+	const config$2 = resolvedPluginConfig.parsedNewConfig;
+	if (config$2 === void 0) return;
+	await buildAndWriteContainerOutput({
+		containers: getContainerConfigExports(config$2),
+		root,
+		pathToDocker: getDockerPath$1()
+	});
+}
+
+//#endregion
+//#region src/dev-vars.ts
+/**
+* Gets any variables with which to augment the Worker config in preview mode.
+*
+* Calls `unstable_getVarsForDev` with the current Cloudflare environment to get local dev variables from the .dev.vars/.env/process.env.
+* When `secrets` is defined in the Worker config, only declared secrets are loaded.
+*/
+function getLocalDevVarsForPreview(config$2, cloudflareEnv) {
+	const dotDevDotVars = wrangler.unstable_getVarsForDev(config$2.configPath, void 0, {}, cloudflareEnv, false, config$2.secrets);
+	const dotDevDotVarsEntries = Array.from(Object.entries(dotDevDotVars));
+	if (dotDevDotVarsEntries.length > 0) return dotDevDotVarsEntries.map(([key, { value }]) => {
+		return `${key}=${quoteForDotenv(value?.toString() ?? "")}\n`;
+	}).join("");
+}
+/**
+* Quote a value so that wrangler reads it back unchanged when it parses
+* `dist/<env>/.dev.vars` at preview time.
+*
+* Strategy: To quote the string pick the first quote character that does not
+* appear in the value (single → backtick → double). Throw if a value cannot
+* be losslessly serialized rather than silently corrupting it.
+*
+* @internal exported for tests
+*/
+function quoteForDotenv(value) {
+	if (!value.includes("'")) return `'${value}'`;
+	if (!value.includes("`")) return `\`${value}\``;
+	if (!value.includes("\"") && !/[\\\n\r]/.test(value)) return `"${value}"`;
+	throw new Error("Unable to serialize value to .dev.vars: contains every supported quote character or unsafe escape sequence.");
+}
+/**
+* Returns `true` if the `changedFile` matches a `.dev.vars` or `.env` file.
+*/
+function hasLocalDevVarsFileChanged({ configPaths, cloudflareEnv }, changedFilePath) {
+	return [...configPaths].some((configPath) => {
+		const configDir = path.dirname(configPath);
+		return [
+			".dev.vars",
+			".env",
+			...cloudflareEnv ? [`.dev.vars.${cloudflareEnv}`, `.env.${cloudflareEnv}`] : []
+		].some((localDevFile) => changedFilePath === path.join(configDir, localDevFile));
+	});
+}
+
+//#endregion
+//#region src/vite-config.ts
+const NODE_BUILTIN_SET = new Set([...builtinModules, ...builtinModules.filter((m) => !m.startsWith("node:")).map((m) => `node:${m}`)]);
+function isOnlyNodeBuiltins(external) {
+	if (!Array.isArray(external)) return false;
+	return external.every((entry) => typeof entry === "string" && NODE_BUILTIN_SET.has(entry));
+}
+/**
+* Throws an error if Worker environments include configuration options that are incompatible with the plugin.
+*/
+function validateWorkerEnvironmentOptions(resolvedPluginConfig, resolvedViteConfig) {
+	const disallowedEnvironmentOptionsMap = /* @__PURE__ */ new Map();
+	for (const environmentName of resolvedPluginConfig.environmentNameToWorkerMap.keys()) {
+		const environmentOptions = resolvedViteConfig.environments[environmentName];
+		assert2(environmentOptions, `Missing environment config for "${environmentName}"`);
+		const { resolve: resolve$4 } = environmentOptions;
+		const disallowedEnvironmentOptions = {};
+		if ((resolve$4.external === true || Array.isArray(resolve$4.external) && resolve$4.external.length > 0) && !isOnlyNodeBuiltins(resolve$4.external)) disallowedEnvironmentOptions.resolveExternal = resolve$4.external;
+		if (Object.keys(disallowedEnvironmentOptions).length) disallowedEnvironmentOptionsMap.set(environmentName, disallowedEnvironmentOptions);
+	}
+	if (disallowedEnvironmentOptionsMap.size) {
+		const errorMessage = `The following environment options are incompatible with the Cloudflare Vite plugin:\n${[...disallowedEnvironmentOptionsMap].map(([environmentName, disallowedEnvironmentOptions]) => disallowedEnvironmentOptions.resolveExternal && `	- "${environmentName}" environment: \`resolve.external\`: ${JSON.stringify(disallowedEnvironmentOptions.resolveExternal)}\n`).join("")}To resolve this issue, avoid setting \`resolve.external\` in your Cloudflare Worker environments.\n`;
+		throw new Error(errorMessage);
+	}
+}
+
+//#endregion
+//#region src/plugins/wrangler-watch-ignore.ts
+const WRANGLER_STATE_WATCH_IGNORE = "**/.wrangler/**";
+/**
+* Keep Miniflare persistence writes out of Vite's file watcher without
+* replacing any ignore patterns the user already configured.
+*
+* @param userIgnored - Existing `server.watch.ignored` patterns, if any
+* @returns Ignore patterns that always include `.wrangler` directories
+*/
+function withWranglerStateIgnored(userIgnored) {
+	if (userIgnored == null) return WRANGLER_STATE_WATCH_IGNORE;
+	if (Array.isArray(userIgnored)) return [...userIgnored, WRANGLER_STATE_WATCH_IGNORE];
+	return [userIgnored, WRANGLER_STATE_WATCH_IGNORE];
+}
+/**
+* Merge `.wrangler` into Vite's `server.watch` config.
+*
+* Returns `null` when the user disabled watching with `server.watch: null`,
+* so this plugin does not turn the watcher back on.
+*
+* @param userWatch - The user's `server.watch` value from Vite config
+* @returns `null` when watching is disabled, otherwise a watch object whose
+*   `ignored` list includes `.wrangler` directories
+*/
+function getServerWatchConfig(userWatch) {
+	if (userWatch === null) return null;
+	return {
+		...userWatch,
+		ignored: withWranglerStateIgnored(userWatch?.ignored)
+	};
+}
+
+//#endregion
+//#region src/plugins/config.ts
+/**
+* Plugin to handle configuration and config file watching
+*/
+const configPlugin = createPlugin("config", (ctx) => {
+	return {
+		config(userConfig, env$3) {
+			if (ctx.resolvedPluginConfig.type === "preview") return { appType: "custom" };
+			if (!ctx.hasShownWorkerConfigWarnings) {
+				ctx.setHasShownWorkerConfigWarnings(true);
+				const workerConfigWarnings = getWarningForWorkersConfigs(ctx.resolvedPluginConfig.rawConfigs);
+				if (workerConfigWarnings) console.warn(workerConfigWarnings);
+			}
+			return {
+				appType: "custom",
+				server: {
+					allowedHosts: getAllowedHosts(ctx.getTunnelHostnames(), userConfig.server?.allowedHosts),
+					watch: getServerWatchConfig(userConfig.server?.watch),
+					fs: { deny: [...[
+						".env",
+						".env.*",
+						".npmrc",
+						".yarnrc",
+						".yarnrc.yml",
+						"*.{crt,pem,key,pfx,p12,p8,jks}",
+						"**/.git/**",
+						".dev.vars",
+						".dev.vars.*",
+						"**/.wrangler/**"
+					], ...Array.from(ctx.resolvedPluginConfig.configPaths, (configPath) => normalizePath(configPath))] }
+				},
+				environments: getEnvironmentsConfig(ctx, userConfig, env$3.mode),
+				builder: { buildApp: userConfig.builder?.buildApp ?? createBuildApp(ctx.resolvedPluginConfig) }
+			};
+		},
+		async configResolved(resolvedViteConfig) {
+			ctx.setResolvedViteConfig(resolvedViteConfig);
+			if (ctx.resolvedPluginConfig.type === "preview") return;
+			validateWorkerEnvironmentOptions(ctx.resolvedPluginConfig, ctx.resolvedViteConfig);
+			if (ctx.resolvedPluginConfig.experimental.newConfig?.cfBuildOutput) {
+				forceBuildOutputDirs(ctx.resolvedPluginConfig, ctx.resolvedViteConfig);
+				if (ctx.resolvedViteConfig.command === "build") await cleanBuildOutputDir(ctx.resolvedViteConfig.root);
+			}
+		},
+		buildStart() {
+			ctx.setHasShownWorkerConfigWarnings(false);
+		},
+		configureServer(viteDevServer) {
+			let restartInFlight = false;
+			const configChangedHandler = async (changedFilePath) => {
+				assertIsNotPreview(ctx);
+				if (restartInFlight) return;
+				if (ctx.resolvedPluginConfig.configPaths.has(changedFilePath) || hasLocalDevVarsFileChanged(ctx.resolvedPluginConfig, changedFilePath) || hasAssetsConfigChanged(ctx.resolvedPluginConfig, ctx.resolvedViteConfig, changedFilePath)) {
+					debuglog("Config changed: " + changedFilePath);
+					restartInFlight = true;
+					debuglog("Restarting dev server and aborting previous setup");
+					try {
+						await viteDevServer.restart();
+					} finally {
+						restartInFlight = false;
+					}
+				}
+			};
+			viteDevServer.watcher.on("change", configChangedHandler);
+		},
+		buildApp: {
+			order: "post",
+			async handler(builder) {
+				if (ctx.resolvedPluginConfig.type !== "workers") return;
+				const workerEnvironments = [...ctx.resolvedPluginConfig.environmentNameToWorkerMap.entries()].filter(([_, worker]) => !resolveDevOnly(worker.devOnly)).map(([environmentName]) => {
+					const environment = builder.environments[environmentName];
+					assert2(environment, `"${environmentName}" environment not found`);
+					return environment;
+				});
+				await Promise.all(workerEnvironments.filter((environment) => !environment.isBuilt).map((environment) => builder.build(environment)));
+				const { entryWorkerEnvironmentName } = ctx.resolvedPluginConfig;
+				const entryWorkerEnvironment = builder.environments[entryWorkerEnvironmentName];
+				assert2(entryWorkerEnvironment, `No "${entryWorkerEnvironmentName}" environment`);
+				const cfBuildOutput = ctx.resolvedPluginConfig.experimental.newConfig?.cfBuildOutput === true;
+				if (entryWorkerEnvironment.isBuilt) {
+					if (!builder.environments.client?.isBuilt && !cfBuildOutput) removeAssetsField(path.resolve(builder.config.root, entryWorkerEnvironment.config.build.outDir));
+				} else {
+					const clientEnvironment = builder.environments.client;
+					assert2(clientEnvironment, "No \"client\" environment");
+					if (!clientEnvironment.isBuilt) throw new Error("If `assetsOnly` is set to `true`, the client environment must be built");
+					if (cfBuildOutput) {
+						const entryWorkerNewConfig = ctx.getWorkerNewConfig(entryWorkerEnvironmentName);
+						assert2(entryWorkerNewConfig, `No config found for "${entryWorkerEnvironmentName}" environment`);
+						await writeWorkerConfig({
+							root: builder.config.root,
+							config: entryWorkerNewConfig
+						});
+					} else {
+						const entryWorkerConfig = ctx.getWorkerConfig(entryWorkerEnvironmentName);
+						assert2(entryWorkerConfig, `No config found for "${entryWorkerEnvironmentName}" environment`);
+						const outputConfig = {
+							...entryWorkerConfig,
+							main: void 0,
+							assets: {
+								...entryWorkerConfig.assets,
+								directory: ".",
+								binding: void 0
+							}
+						};
+						if (outputConfig.unsafe && Object.keys(outputConfig.unsafe).length === 0) outputConfig.unsafe = void 0;
+						fs$1.writeFileSync(path.resolve(builder.config.root, clientEnvironment.config.build.outDir, "wrangler.json"), JSON.stringify(outputConfig));
+						writeDeployConfig(ctx.resolvedPluginConfig, ctx.resolvedViteConfig, true);
+					}
+				}
+				await buildOutputContainers(ctx.resolvedPluginConfig, builder.config.root);
+			}
+		}
+	};
+});
+/**
+* Generates the environment configuration for all Worker environments.
+*/
+function getEnvironmentsConfig(ctx, userConfig, mode) {
+	assertIsNotPreview(ctx);
+	if (!ctx.resolvedPluginConfig.environmentNameToWorkerMap.size) return;
+	return {
+		...Object.fromEntries([...ctx.resolvedPluginConfig.environmentNameToWorkerMap].flatMap(([environmentName, worker]) => {
+			const childEnvironmentNames = ctx.resolvedPluginConfig.environmentNameToChildEnvironmentNamesMap.get(environmentName) ?? [];
+			const sharedOptions = {
+				workerConfig: worker.config,
+				userConfig,
+				mode,
+				hasNodeJsCompat: ctx.getNodeJsCompat(environmentName) !== void 0
+			};
+			const isEntryWorker = environmentName === ctx.resolvedPluginConfig.prerenderWorkerEnvironmentName || ctx.resolvedPluginConfig.type === "workers" && environmentName === ctx.resolvedPluginConfig.entryWorkerEnvironmentName;
+			return [[environmentName, createCloudflareEnvironmentOptions({
+				...sharedOptions,
+				environmentName,
+				isEntryWorker,
+				isParentEnvironment: true
+			})], ...childEnvironmentNames.map((childEnvironmentName) => [childEnvironmentName, createCloudflareEnvironmentOptions({
+				...sharedOptions,
+				environmentName: childEnvironmentName,
+				isEntryWorker: false,
+				isParentEnvironment: false
+			})])];
+		})),
+		client: {
+			build: { outDir: getOutputDirectory(userConfig, "client") },
+			optimizeDeps: { exclude: [...cloudflareBuiltInModules] }
+		}
+	};
+}
+/**
+* When the Build Output Specification is enabled,
+* force every Worker environment's and the client environment's `build.outDir`
+* to the spec-mandated location.
+*
+* Runs after Vite's merge in `configResolved`, so it overrides any
+* user-supplied `build.outDir`
+*/
+function forceBuildOutputDirs(resolvedPluginConfig, resolvedViteConfig) {
+	if (!resolvedPluginConfig.experimental.newConfig?.cfBuildOutput) return;
+	const { root } = resolvedViteConfig;
+	if (resolvedPluginConfig.type === "workers") {
+		const entryName = resolvedPluginConfig.entryWorkerEnvironmentName;
+		const entryEnvironment = resolvedViteConfig.environments[entryName];
+		if (entryEnvironment) entryEnvironment.build.outDir = getWorkerBundleDir(root);
+	}
+	const clientEnvironment = resolvedViteConfig.environments.client;
+	if (clientEnvironment) clientEnvironment.build.outDir = getWorkerAssetsDir(root);
+}
+function getAllowedHosts(tunnelHostnames, userAllowedHosts) {
+	if (tunnelHostnames.length === 0 || userAllowedHosts === true) return userAllowedHosts;
+	return Array.from(new Set([...userAllowedHosts ?? [], ...tunnelHostnames]));
+}
+
+//#endregion
+//#region src/debug.ts
+var import_picocolors$3 = /* @__PURE__ */ __toESM$1(require_picocolors(), 1);
+const DEBUG_PATH = "/__debug";
+const DEFAULT_INSPECTOR_PORT = 9229;
+/**
+* Gets the inspector port option that should be passed to Miniflare based on the user's plugin config
+*/
+async function getInputInspectorPort(ctx, viteServer) {
+	if (ctx.resolvedPluginConfig.inspectorPort === void 0 || ctx.resolvedPluginConfig.inspectorPort === 0) {
+		const resolvedInspectorPort = await ctx.getResolvedInspectorPort();
+		if (resolvedInspectorPort !== null) return resolvedInspectorPort;
+	}
+	const inputInspectorPort = ctx.resolvedPluginConfig.inspectorPort ?? await getFirstAvailablePort(DEFAULT_INSPECTOR_PORT);
+	if (ctx.resolvedPluginConfig.inspectorPort === void 0 && inputInspectorPort !== DEFAULT_INSPECTOR_PORT) viteServer.config.logger.warn(import_picocolors$3.default.dim(`Default inspector port ${DEFAULT_INSPECTOR_PORT} not available, using ${inputInspectorPort} instead\n`));
+	return inputInspectorPort;
+}
+function getFirstAvailablePort(start) {
+	return getPorts({ port: portNumbers(start, 65535) });
+}
+/**
+* Modifies the URL printing logic to also include a URL that developers can use to open DevTools to debug their Worker(s)
+*/
+function addDebugToVitePrintUrls(server) {
+	const originalPrintUrls = server.printUrls;
+	server.printUrls = () => {
+		originalPrintUrls();
+		const localUrl = server.resolvedUrls?.local[0];
+		if (localUrl) {
+			const { protocol, hostname: hostname$1, port } = new URL(localUrl);
+			const colorDebugUrl = (url$2) => import_picocolors$3.default.dim(import_picocolors$3.default.yellow(url$2.replace(/:(\d+)\//, (_, portNumber) => `:${import_picocolors$3.default.bold(portNumber)}/`)));
+			server.config.logger.info(`  ${import_picocolors$3.default.green("➜")}  ${import_picocolors$3.default.bold("Debug")}:   ${colorDebugUrl(`${protocol}//${hostname$1}:${port}${DEBUG_PATH}`)}`);
+		}
+	};
+}
+/**
+* Generate HTML that comprises a single script that:
+*  - redirects the page to the DevTools for debugging the first available Worker
+*  - opens tabs to the DevTools for all the remaining workers if any
+*
+* Note: this works based on the Miniflare inspector proxy logic (where Workers are available via
+* their names)
+*/
+function getDebugPathHtml(workerNames, inspectorPort) {
+	assert2(workerNames.length >= 1, "no workers present to debug");
+	const workerDevtoolsUrls = workerNames.map((workerName) => {
+		const localhost = `localhost:${inspectorPort}/${workerName}`;
+		return `https://devtools.devprod.cloudflare.dev/js_app?${new URLSearchParams({
+			theme: "systemPreferred",
+			debugger: "true",
+			ws: localhost,
+			domain: workerName
+		})}`;
+	});
+	return `
+		<script>
+			const workerUrls = ${JSON.stringify(workerDevtoolsUrls)};
+			const [firstUrl, ...rest] = workerUrls;
+			for (const workerUrl of rest) {
+				// open new tabs for the devtools of the various workers
+				window.open(workerUrl);
+			}
+			// redirect the current tab to the devtools of the first worker
+			window.location.replace(firstUrl);
+		<\/script>
+    `;
+}
+
+//#endregion
+//#region src/plugins/debug.ts
+/**
+* Plugin to provide a `/__debug` path for debugging Workers
+*/
+const debugPlugin = createPlugin("debug", (ctx) => {
+	return {
+		enforce: "pre",
+		configureServer(viteDevServer) {
+			assertIsNotPreview(ctx);
+			if (!!process.env.VSCODE_INSPECTOR_OPTIONS) return;
+			if (ctx.resolvedPluginConfig.type === "workers" && ctx.resolvedPluginConfig.inspectorPort !== false) addDebugToVitePrintUrls(viteDevServer);
+			const workerNames = ctx.resolvedPluginConfig.type === "workers" ? [...ctx.resolvedPluginConfig.environmentNameToWorkerMap.values()].map((worker) => worker.config.name) : [];
+			viteDevServer.middlewares.use(DEBUG_PATH, async (_, res, next) => {
+				const resolvedInspectorPort = await ctx.getResolvedInspectorPort();
+				if (resolvedInspectorPort) {
+					const html = getDebugPathHtml(workerNames, resolvedInspectorPort);
+					res.setHeader("Content-Type", "text/html");
+					res.end(html);
+				} else next();
+			});
+		},
+		async configurePreviewServer(vitePreviewServer) {
+			assertIsPreview(ctx);
+			if (!!process.env.VSCODE_INSPECTOR_OPTIONS) return;
+			if (ctx.resolvedPluginConfig.workers.length >= 1 && ctx.resolvedPluginConfig.inspectorPort !== false) addDebugToVitePrintUrls(vitePreviewServer);
+			const workerNames = ctx.resolvedPluginConfig.workers.map((worker) => {
+				assert2(worker.config.name, "Expected the Worker to have a name");
+				return worker.config.name;
+			});
+			vitePreviewServer.middlewares.use(DEBUG_PATH, async (_, res, next) => {
+				const resolvedInspectorPort = await ctx.getResolvedInspectorPort();
+				if (resolvedInspectorPort) {
+					const html = getDebugPathHtml(workerNames, resolvedInspectorPort);
+					res.setHeader("Content-Type", "text/html");
+					res.end(html);
+				} else next();
+			});
+		}
+	};
+});
 
 //#endregion
 //#region ../workers-shared/asset-worker/src/utils/rules-engine.ts
@@ -75458,6 +75776,54 @@ function configureContainerPull(accountId, apiToken, complianceConfig) {
 	configureOpenAPIForContainerPull(accountId, apiToken, getCloudflareApiBaseUrl(complianceConfig ?? COMPLIANCE_REGION_CONFIG_UNKNOWN));
 }
 /**
+* Qualifies managed-registry image references with the selected Cloudflare
+* account before Docker pulls them.
+*
+* @param containerOptions - Planned Container images.
+* @param accountId - Cloudflare account ID that owns managed-registry images.
+* @param complianceConfig - Compliance configuration used to select the managed registry.
+* @returns Container options with managed-registry image references qualified.
+*/
+function normalizeContainerImageUris(containerOptions, accountId, complianceConfig) {
+	return containerOptions.map((option) => "image_uri" in option && isCloudflareRegistryImage(option.image_uri, complianceConfig) ? {
+		...option,
+		image_uri: resolveImageName(accountId, option.image_uri, complianceConfig)
+	} : option);
+}
+/**
+* Prepares each Worker's Container images with that Worker's registry account
+* and compliance settings.
+*
+* @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) {
+		let containerOptions = plannedOptions;
+		if (containerOptions.some((options) => "image_uri" in options && isCloudflareRegistryImage(options.image_uri, workerConfig))) {
+			const apiToken = process.env.CLOUDFLARE_API_TOKEN;
+			const accountId = workerConfig.account_id ?? process.env.CLOUDFLARE_ACCOUNT_ID;
+			if (!apiToken || !accountId) throw new UserError("To use images from the Cloudflare-managed registry with the Vite plugin, set the CLOUDFLARE_API_TOKEN and CLOUDFLARE_ACCOUNT_ID environment variables.\nThe API token requires Containers:Edit and Workers Scripts:Edit permissions.\nAlternatively, use a Dockerfile that references the image via FROM.", { telemetryMessage: false });
+			configureContainerPull(accountId, apiToken, workerConfig);
+			containerOptions = normalizeContainerImageUris(containerOptions, accountId, workerConfig);
+		}
+		await prepareContainerImagesForDev({
+			dockerPath: args.dockerPath,
+			containerOptions,
+			onContainerImagePreparationStart: () => {},
+			onContainerImagePreparationEnd: () => {},
+			logger: args.logger,
+			complianceConfig: workerConfig
+		});
+	}
+}
+/**
 * Returns the path to the Docker executable as defined by the
 * `WRANGLER_DOCKER_BIN` environment variable, or the default value
 * `"docker"`
@@ -75465,36 +75831,6 @@ function configureContainerPull(accountId, apiToken, complianceConfig) {
 function getDockerPath() {
 	return process.env["WRANGLER_DOCKER_BIN"] || "docker";
 }
-/**
-* @returns Container options suitable for building or pulling images,
-* with image tag set to well-known dev format, or undefined if
-* containers are not enabled or not configured. Containers that are
-* configured but resolve to no Durable Object class are dropped, so the
-* result may also be an empty array. Both mean there is nothing to build
-* or pull, and callers treat them alike.
-*/
-function getContainerOptions(options) {
-	const { containersConfig, exports: exports$1, containerBuildId, configPath } = options;
-	if (!containersConfig?.length) return;
-	return containersConfig.map((container) => {
-		if (isDurableObjectContainerApp(container) || container.image === void 0) return;
-		const className = resolveContainerClassName(container, exports$1);
-		if (className === void 0) return;
-		const image_tag = getDevContainerImageName(className, containerBuildId);
-		if (isDockerfile(container.image, configPath)) return {
-			dockerfile: container.image,
-			image_build_context: container.image_build_context ?? path__default.dirname(container.image),
-			image_vars: container.image_vars,
-			class_name: className,
-			image_tag
-		};
-		else return {
-			image_uri: container.image,
-			class_name: className,
-			image_tag
-		};
-	}).filter((container) => container !== void 0);
-}
 
 //#endregion
 //#region ../workers-auth/dist/chunk-O6YSETKJ.mjs
@@ -81056,7 +81392,7 @@ __name(createWorkerUploadForm, "createWorkerUploadForm");
 //#endregion
 //#region ../remote-bindings/dist/index.mjs
 var import_undici = require_undici();
-var version$2 = "0.0.26";
+var version$2 = "0.0.28";
 var NoDefaultValueProvided = class extends UserError {
 	constructor() {
 		super("This command cannot be run in a non-interactive context", { telemetryMessage: "remote bindings prompt default missing" });
@@ -81340,7 +81676,7 @@ async function getOrRegisterWorkersDevSubdomain(complianceConfig, account, abort
 	} catch (error$2) {
 		if (!(error$2 instanceof APIError) || error$2.code !== 10007) throw error$2;
 	}
-	const subdomain = crypto$1.randomBytes(4).toString("hex");
+	const subdomain = crypto2.randomBytes(4).toString("hex");
 	return (await fetchResult(complianceConfig, account, resource, {
 		method: "PUT",
 		body: JSON.stringify({ subdomain })
@@ -84835,14 +85171,13 @@ async function getDevMiniflareOptions(ctx, viteDevServer) {
 		if (worker.config.containers?.length && worker.config.dev.enable_containers) {
 			containerEngine = resolveDockerHost(getDockerPath());
 			containerBuildId = generateContainerBuildId();
-			const options = getContainerOptions({
-				containersConfig: worker.config.containers,
-				exports: worker.config.exports,
-				containerBuildId,
-				configPath: worker.config.configPath
-			});
-			for (const option of options ?? []) containerTagToOptionsMap.set(option.image_tag, option);
 		}
+		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
@@ -84850,6 +85185,10 @@ 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;
@@ -85054,18 +85393,21 @@ async function getPreviewMiniflareOptions(ctx, vitePreviewServer) {
 		if (workerConfig.containers?.length && workerConfig.dev.enable_containers) {
 			containerEngine = resolveDockerHost(getDockerPath());
 			containerBuildId = generateContainerBuildId();
-			const options = getContainerOptions({
-				containersConfig: workerConfig.containers,
-				exports: workerConfig.exports,
-				containerBuildId,
-				configPath: workerConfig.configPath
-			});
-			for (const option of options ?? []) containerTagToOptionsMap.set(option.image_tag, option);
 		}
+		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;
@@ -85338,19 +85680,10 @@ const devPlugin = createPlugin("dev", (ctx) => {
 				}
 				if (containerTagToOptionsMap.size) {
 					viteDevServer.config.logger.info(import_picocolors$2.default.dim(import_picocolors$2.default.yellow("∷ Building container images for local development...\n")));
-					if ([...containerTagToOptionsMap.values()].some((opts) => "image_uri" in opts && new URL(`http://${opts.image_uri}`).hostname === getCloudflareContainerRegistry(ctx.entryWorkerConfig))) {
-						const apiToken = process.env.CLOUDFLARE_API_TOKEN;
-						const accountId = ctx.entryWorkerConfig?.account_id ?? process.env.CLOUDFLARE_ACCOUNT_ID;
-						if (!apiToken || !accountId) throw new UserError("To use images from the Cloudflare-managed registry with the Vite plugin, set the CLOUDFLARE_API_TOKEN and CLOUDFLARE_ACCOUNT_ID environment variables.\nThe API token requires Containers:Edit and Workers Scripts:Edit permissions.\nAlternatively, use a Dockerfile that references the image via FROM.", { telemetryMessage: false });
-						configureContainerPull(accountId, apiToken, ctx.entryWorkerConfig);
-					}
-					await prepareContainerImagesForDev({
+					await prepareContainerImagesForVite({
 						dockerPath: getDockerPath(),
-						containerOptions: [...containerTagToOptionsMap.values()],
-						onContainerImagePreparationStart: () => {},
-						onContainerImagePreparationEnd: () => {},
-						logger: viteDevServer.config.logger,
-						complianceConfig: ctx.entryWorkerConfig
+						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).")));
@@ -85560,6 +85893,7 @@ const outputConfigPlugin = createPlugin("output-config", (ctx) => {
 function getOutputConfig({ inputWorkerConfig, workerOutputDirectory, resolvedViteConfig, entryFileName, includeAssets }) {
 	const sourceConfigDirectory = inputWorkerConfig.configPath ? path.dirname(inputWorkerConfig.configPath) : resolvedViteConfig.root;
 	const outputDirectory = path.resolve(resolvedViteConfig.root, workerOutputDirectory);
+	const rebasePathToOutput = (sourcePath) => vite.normalizePath(path.relative(outputDirectory, path.resolve(sourceConfigDirectory, sourcePath)) || ".");
 	return {
 		...inputWorkerConfig,
 		main: entryFileName,
@@ -85572,10 +85906,23 @@ function getOutputConfig({ inputWorkerConfig, workerOutputDirectory, resolvedVit
 			...inputWorkerConfig.assets,
 			directory: getAssetsDirectory(workerOutputDirectory, resolvedViteConfig)
 		} : void 0,
+		containers: inputWorkerConfig.containers?.map((container) => {
+			if (container.images === void 0) return container;
+			return {
+				...container,
+				images: Object.fromEntries(Object.entries(container.images).map(([name, image]) => {
+					if (image.dockerfile === void 0) return [name, image];
+					return [name, {
+						dockerfile: rebasePathToOutput(image.dockerfile),
+						...image.build_context === void 0 ? {} : { build_context: rebasePathToOutput(image.build_context) },
+						...image.build_vars === void 0 ? {} : { build_vars: image.build_vars }
+					}];
+				}))
+			};
+		}),
 		d1_databases: inputWorkerConfig.d1_databases.map((database) => {
 			const sourceMigrationsDir = database.migrations_dir ?? "migrations";
-			const sourceMigrationsPath = path.resolve(sourceConfigDirectory, sourceMigrationsDir);
-			const outputMigrationsDir = vite.normalizePath(path.relative(outputDirectory, sourceMigrationsPath) || ".");
+			const outputMigrationsDir = rebasePathToOutput(sourceMigrationsDir);
 			return {
 				...database,
 				migrations_dir: outputMigrationsDir,
@@ -85674,19 +86021,10 @@ const previewPlugin = createPlugin("preview", (ctx) => {
 		if (containerTagToOptionsMap.size) {
 			const dockerPath = getDockerPath();
 			vitePreviewServer.config.logger.info(import_picocolors$1.default.dim(import_picocolors$1.default.yellow("∷ Building container images for local preview...\n")));
-			if ([...containerTagToOptionsMap.values()].some((opts) => "image_uri" in opts && new URL(`http://${opts.image_uri}`).hostname === getCloudflareContainerRegistry(ctx.allWorkerConfigs[0]))) {
-				const apiToken = process.env.CLOUDFLARE_API_TOKEN;
-				const accountId = ctx.allWorkerConfigs[0]?.account_id ?? process.env.CLOUDFLARE_ACCOUNT_ID;
-				if (!apiToken || !accountId) throw new UserError("To use images from the Cloudflare-managed registry with the Vite plugin, set the CLOUDFLARE_API_TOKEN and CLOUDFLARE_ACCOUNT_ID environment variables.\nThe API token requires Containers:Edit and Workers Scripts:Edit permissions.\nAlternatively, use a Dockerfile that references the image via FROM.", { telemetryMessage: false });
-				configureContainerPull(accountId, apiToken, ctx.allWorkerConfigs[0]);
-			}
-			await prepareContainerImagesForDev({
-				dockerPath: getDockerPath(),
-				containerOptions: [...containerTagToOptionsMap.values()],
-				onContainerImagePreparationStart: () => {},
-				onContainerImagePreparationEnd: () => {},
-				logger: vitePreviewServer.config.logger,
-				complianceConfig: ctx.allWorkerConfigs[0]
+			await prepareContainerImagesForVite({
+				dockerPath,
+				containerTagToOptionsMap,
+				logger: vitePreviewServer.config.logger
 			});
 			const containerImageTags = new Set(containerTagToOptionsMap.keys());
 			vitePreviewServer.config.logger.info(import_picocolors$1.default.dim(import_picocolors$1.default.yellow("\n⚡️ Containers successfully built.\n")));