resolve image path in readConfig

Now wrangler/vite plugin don't have to do this themselves.

Author: emily-shen

packages/containers-shared/src/types.ts

@@ -39,9 +39,9 @@ export type InstanceTypeOrLimits =
 	| {
 			/** if undefined in config, defaults to instance_type */
 			/** disk size is defined in config in mb but normalised here to bytes */
-			disk_bytes?: number;
-			vcpu?: number;
-			memory_mib?: number;
+			disk_bytes: number;
+			vcpu: number;
+			memory_mib: number;
 	  }
 	| {
 			/** if undefined in config, defaults to "dev" */
@@ -67,7 +67,7 @@ export type SharedContainerConfig = {
 	constraints: {
 		regions?: string[];
 		cities?: string[];
-		tier?: number;
+		tier: number;
 	};
 	observability: { logsEnabled: boolean };
 } & InstanceTypeOrLimits;

packages/vite-plugin-cloudflare/src/index.ts

@@ -265,45 +265,6 @@ if (import.meta.hot) {
 								path.resolve(resolvedViteConfig.root, clientOutputDirectory)
 							),
 						};
-
-						if (workerConfig.containers?.length) {
-							workerConfig.containers = workerConfig.containers.map(
-								(container) => {
-									const baseDir = workerConfig.configPath
-										? path.dirname(workerConfig.configPath)
-										: resolvedViteConfig.root;
-									// Wrangler's config validation resolves to container.configuration.image, even though it is deprecated
-									const image =
-										container.configuration?.image ?? container.image;
-									if (isDockerfile(image, workerConfig.configPath)) {
-										const output = {
-											...container,
-											image: path.resolve(baseDir, image),
-											...(container.image_build_context
-												? {
-														image_build_context: path.resolve(
-															baseDir,
-															container.image_build_context
-														),
-													}
-												: {}),
-										};
-										// however, wrangler deploy will re-resolve the config, so we should
-										// deduplicate the container.configuration.image field in favour of
-										// the non-deprecated one when we write out the deploy config
-										delete output.configuration?.image;
-										// if we don't do this, we get a warning that container.configuration is deprecated
-										if (
-											output.configuration &&
-											Object.keys(output.configuration).length === 0
-										) {
-											delete output.configuration;
-										}
-										return output;
-									} else return container;
-								}
-							);
-						}
 					} else {
 						workerConfig.assets = undefined;
 					}
@@ -1089,17 +1050,12 @@ if (import.meta.hot) {
 		if (!config.containers?.length || config.dev.enable_containers === false) {
 			return undefined;
 		}
-		const baseDir = config.configPath
-			? path.dirname(config.configPath)
-			: resolvedViteConfig.root;
 		return config.containers.map((container) => {
 			if (isDockerfile(container.image, config.configPath)) {
-				const absoluteDockerfilePath = path.resolve(baseDir, container.image);
 				return {
-					dockerfile: absoluteDockerfilePath,
-					image_build_context: container.image_build_context
-						? path.resolve(baseDir, container.image_build_context)
-						: path.dirname(absoluteDockerfilePath),
+					dockerfile: container.image,
+					image_build_context:
+						container.image_build_context ?? path.dirname(container.image),
 					image_vars: container.image_vars,
 					class_name: container.class_name,
 					image_tag: getDevContainerImageName(