Filter entry Worker config before passing to config function

Author: jamesopstad

packages/vite-plugin-cloudflare/playground/prerendering/vite.config.ts

@@ -11,9 +11,12 @@ export default defineConfig({
 			persistState: false,
 			experimental: {
 				prerenderWorker: {
-					config: {
-						name: "prerender",
-						main: "./src/prerender.ts",
+					config(_, { entryWorkerConfig }) {
+						return {
+							...entryWorkerConfig,
+							name: "prerender",
+							main: "./src/prerender.ts",
+						};
 					},
 				},
 			},

packages/vite-plugin-cloudflare/src/__tests__/resolve-plugin-config.spec.ts

@@ -212,7 +212,6 @@ describe("resolvePluginConfig - auxiliary workers", () => {
 						// Verify we receive both parameters
 						expect(userConfig).toBeDefined();
 						expect(entryWorkerConfig).toBeDefined();
-						expect(entryWorkerConfig.name).toBe("entry-worker");
 						expect(entryWorkerConfig.compatibility_date).toBe("2024-01-01");
 
 						return {

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

@@ -52,14 +52,21 @@ interface Experimental {
 	prerenderWorker?: AuxiliaryWorkerConfig;
 }
 
+type FilteredEntryWorkerConfig = Omit<
+	ResolvedAssetsOnlyConfig,
+	"topLevelName" | "name"
+>;
+
 type WorkerConfigCustomizer<TIsEntryWorker extends boolean> =
 	| Partial<WorkerConfig>
 	| ((
 			...args: TIsEntryWorker extends true
 				? [config: WorkerConfig]
 				: [
 						config: WorkerConfig,
-						{ entryWorkerConfig: ResolvedAssetsOnlyConfig },
+						{
+							entryWorkerConfig: FilteredEntryWorkerConfig;
+						},
 					]
 	  ) => Partial<WorkerConfig> | void);
 
@@ -131,6 +138,15 @@ export type ResolvedPluginConfig =
 	| WorkersResolvedConfig
 	| PreviewResolvedConfig;
 
+function filterEntryWorkerConfig(
+	config: ResolvedAssetsOnlyConfig
+): FilteredEntryWorkerConfig {
+	// eslint-disable-next-line unused-imports/no-unused-vars
+	const { topLevelName, name, ...filteredConfig } = config;
+
+	return filteredConfig;
+}
+
 export function customizeWorkerConfig(options: {
 	workerConfig: WorkerConfig;
 	configCustomizer: WorkerConfigCustomizer<false> | undefined;
@@ -158,7 +174,9 @@ export function customizeWorkerConfig(
 		typeof options.configCustomizer === "function"
 			? "entryWorkerConfig" in options
 				? options.configCustomizer(options.workerConfig, {
-						entryWorkerConfig: options.entryWorkerConfig,
+						entryWorkerConfig: filterEntryWorkerConfig(
+							options.entryWorkerConfig
+						),
 					})
 				: options.configCustomizer(options.workerConfig)
 			: options.configCustomizer;