Restart dev server when Worker exports change

Author: jamesopstad

packages/vite-plugin-cloudflare/src/plugins/dev.ts

@@ -13,6 +13,7 @@ import {
 import { getDockerPath } from "../containers";
 import { assertIsNotPreview } from "../context";
 import {
+	compareExportTypes,
 	compareWorkerNameToExportTypesMap,
 	getCurrentWorkerNameToExportTypesMap,
 } from "../export-types";
@@ -91,6 +92,39 @@ export const devPlugin = createPlugin("dev", (ctx) => {
 					);
 				}
 
+				for (const environmentName of ctx.resolvedPluginConfig.environmentNameToWorkerMap.keys()) {
+					const environment = viteDevServer.environments[environmentName];
+					assert(
+						environment,
+						`Expected environment "${environmentName}" to be defined`
+					);
+					environment.hot.on(
+						"vite-plugin-cloudflare:worker-export-types",
+						async (newExportTypes) => {
+							const workerConfig = ctx.getWorkerConfig(environmentName);
+							assert(
+								workerConfig,
+								`Expected workerConfig for environment "${environmentName}" to be defined`
+							);
+							const oldExportTypes = ctx.workerNameToExportTypesMap.get(
+								workerConfig.name
+							);
+							assert(
+								oldExportTypes,
+								`Expected export types for Worker "${workerConfig.name}" to be defined`
+							);
+							const hasChanged = compareExportTypes(
+								oldExportTypes,
+								newExportTypes
+							);
+
+							if (hasChanged) {
+								await viteDevServer.restart();
+							}
+						}
+					);
+				}
+
 				const entryWorkerConfig = ctx.entryWorkerConfig;
 				assert(entryWorkerConfig, `No entry Worker config`);
 

packages/vite-plugin-cloudflare/src/plugins/virtual-modules.ts

@@ -35,11 +35,15 @@ export const virtualModulesPlugin = createPlugin("virtual-modules", (ctx) => {
 
 				return `
 ${nodeJsCompat ? nodeJsCompat.injectGlobalCode() : ""}
+import { getExportTypes } from "${VIRTUAL_EXPORT_TYPES}";
 import * as mod from "${VIRTUAL_USER_ENTRY}";
 export * from "${VIRTUAL_USER_ENTRY}";
 export default mod.default ?? {};
 if (import.meta.hot) {
-	import.meta.hot.accept();
+	import.meta.hot.accept((module) => {
+		const exportTypes = getExportTypes(module);
+		import.meta.hot.send("vite-plugin-cloudflare:worker-export-types", exportTypes);
+	});
 }
 				`;
 			}