@cloudflare/vite-plugin 1.54.11 → 1.55.0

package/dist/index.mjs

@@ -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-2OPNWQJ5.mjs
+var DEFAULT_COMPAT_DATE = "2026-09-17";
 function assertNever(_value) {}
 __name$6(assertNever, "assertNever");
 function mapWorkerMetadataBindings(bindings) {
@@ -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;
@@ -55728,6 +55743,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(),
@@ -56175,6 +56191,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;
@@ -72007,11 +72024,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 path2 = 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}${path2}`;
 	if (options.query) return `${url$2}${getQueryString(options.query)}`;
 	return url$2;
 }, "getUrl");
@@ -73995,7 +74012,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 +74042,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 +74080,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 +74131,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 {
@@ -74892,10 +74893,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(path2, added, removed, oldPosInc) {
+		const last = path2.lastComponent;
 		if (last && last.added === added && last.removed === removed) return {
-			oldPos: path$2.oldPos + oldPosInc,
+			oldPos: path2.oldPos + oldPosInc,
 			lastComponent: {
 				count: last.count + 1,
 				added,
@@ -74904,7 +74905,7 @@ var Diff = class {
 			}
 		};
 		return {
-			oldPos: path$2.oldPos + oldPosInc,
+			oldPos: path2.oldPos + oldPosInc,
 			lastComponent: {
 				count: 1,
 				added,
@@ -75424,6 +75425,89 @@ 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 ../workers-shared/asset-worker/src/utils/rules-engine.ts
@@ -75458,6 +75542,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 +75597,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 +81158,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.27";
 var NoDefaultValueProvided = class extends UserError {
 	constructor() {
 		super("This command cannot be run in a non-interactive context", { telemetryMessage: "remote bindings prompt default missing" });
@@ -84835,14 +84937,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 +84951,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 +85159,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 +85446,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 +85659,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 +85672,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 +85787,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")));