Call writeDeployConfig in writeBundle rather than builder.buildApp (#8079)

Author: jamesopstad

.changeset/modern-cycles-build.md

@@ -0,0 +1,7 @@
+---
+"@cloudflare/vite-plugin": patch
+---
+
+Call `writeDeployConfig` in `writeBundle` rather than `builder.buildApp`.
+
+The deploy config file is now written in the `writeBundle` hook rather than `builder.buildApp`. This ensures that the file is still written if other plugins override `builder` in the Vite config.

packages/vite-plugin-cloudflare/src/deploy-config.ts

@@ -67,42 +67,40 @@ export function writeDeployConfig(
 
 		fs.writeFileSync(deployConfigPath, JSON.stringify(deployConfig));
 	} else {
-		const workerConfigPaths = Object.fromEntries(
-			Object.keys(resolvedPluginConfig.workers).map((environmentName) => {
-				const outputDirectory =
-					resolvedViteConfig.environments[environmentName]?.build.outDir;
-
-				assert(
-					outputDirectory,
-					`Unexpected error: ${environmentName} environment output directory is undefined`
-				);
-
-				return [
-					environmentName,
-					getRelativePathToWorkerConfig(
-						deployConfigDirectory,
-						resolvedViteConfig.root,
-						outputDirectory
-					),
-				];
-			})
-		);
+		let entryWorkerConfigPath: string | undefined;
+		const auxiliaryWorkers: DeployConfig["auxiliaryWorkers"] = [];
+
+		for (const environmentName of Object.keys(resolvedPluginConfig.workers)) {
+			const outputDirectory =
+				resolvedViteConfig.environments[environmentName]?.build.outDir;
+
+			assert(
+				outputDirectory,
+				`Unexpected error: ${environmentName} environment output directory is undefined`
+			);
 
-		const { entryWorkerEnvironmentName } = resolvedPluginConfig;
-		const configPath = workerConfigPaths[entryWorkerEnvironmentName];
+			const configPath = getRelativePathToWorkerConfig(
+				deployConfigDirectory,
+				resolvedViteConfig.root,
+				outputDirectory
+			);
+
+			if (environmentName === resolvedPluginConfig.entryWorkerEnvironmentName) {
+				entryWorkerConfigPath = configPath;
+			} else {
+				auxiliaryWorkers.push({ configPath });
+			}
+		}
 
 		assert(
-			configPath,
-			`Unexpected error: ${entryWorkerEnvironmentName} environment output directory is undefined`
+			entryWorkerConfigPath,
+			`Unexpected error: entryWorkerConfigPath is undefined`
 		);
 
-		const auxiliaryWorkers = Object.entries(workerConfigPaths)
-			.filter(
-				([environmentName]) => environmentName !== entryWorkerEnvironmentName
-			)
-			.map(([_, configPath]) => ({ configPath }));
-
-		const deployConfig: DeployConfig = { configPath, auxiliaryWorkers };
+		const deployConfig: DeployConfig = {
+			configPath: entryWorkerConfigPath,
+			auxiliaryWorkers,
+		};
 
 		fs.writeFileSync(deployConfigPath, JSON.stringify(deployConfig));
 	}

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

@@ -134,8 +134,6 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 									)
 								);
 							}
-
-							writeDeployConfig(resolvedPluginConfig, resolvedViteConfig);
 						},
 					},
 				};
@@ -230,6 +228,18 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 					source: JSON.stringify(config),
 				});
 			},
+			writeBundle() {
+				// These conditions ensure the deploy config is emitted once per application build as `writeBundle` is called for each environment.
+				// If Vite introduces an additional hook that runs after the application has built then we could use that instead.
+				if (
+					this.environment.name ===
+					(resolvedPluginConfig.type === "assets-only"
+						? "client"
+						: resolvedPluginConfig.entryWorkerEnvironmentName)
+				) {
+					writeDeployConfig(resolvedPluginConfig, resolvedViteConfig);
+				}
+			},
 			handleHotUpdate(options) {
 				if (resolvedPluginConfig.configPaths.has(options.file)) {
 					options.server.restart();