@cloudflare/vite-plugin 1.61.0 → 1.62.0

package/dist/index.mjs

@@ -65811,7 +65811,7 @@ function resolveWorker(workerConfig, devOnly, parsedNewWorkerConfig) {
 }
 const NEW_CONFIG_FILENAME = "cloudflare.config.ts";
 const TYPES_OUTPUT_PATH = ".cloudflare/types/index.d.ts";
-const EXPERIMENTAL_CONFIG_PKG = "@cloudflare/vite-plugin/experimental-config";
+const CONFIG_PACKAGE = "cf/config";
 /**
 * Load and convert a `cloudflare.config.ts` file via `@cloudflare/config`. Returns
 * the resulting Wrangler `RawConfig`, the parsed new-config shape (for
@@ -65849,9 +65849,8 @@ async function loadNewConfig(options) {
 }
 /**
 * Write `.cloudflare/types/index.d.ts` using
-* `@cloudflare/config`'s `generateTypes`, targeting the vite-plugin's
-* `experimental-config` subpath (so users don't need a direct dependency on
-* `@cloudflare/config`).
+* `@cloudflare/config`'s `generateTypes`, targeting the public `cf/config`
+* package used by `cloudflare.config.ts`.
 *
 * When `includeRuntime` is true, appends the Workers runtime types (generated
 * from the project's compatibility date/flags) after the inference block. The
@@ -65873,7 +65872,7 @@ async function writeCloudflareTypes(options) {
 	} catch {}
 	let content = generateTypes({
 		configPath: configImportPath,
-		packageName: EXPERIMENTAL_CONFIG_PKG
+		packageName: CONFIG_PACKAGE
 	});
 	if (options.includeRuntime) {
 		const { runtimeHeader, runtimeTypes } = await generateRuntimeTypes({
@@ -80300,43 +80299,43 @@ function createContainerCleanup() {
 		}
 	};
 }
+const containerCleanupKey = Symbol("vite-plugin-cloudflare:container-cleanup");
 /**
-* Retains Container cleanup across config reloads using Vite's inline plugins.
-* The state belongs to this server, not the re-evaluated cloudflare() factory.
+* Retains Container cleanup across config reloads for one server session.
 */
 function getDevContainerCleanup(server) {
-	const pluginName = "vite-plugin-cloudflare:container-cleanup";
-	const retainedPlugin = server.config.plugins.find((plugin$1) => plugin$1.name === pluginName);
-	if (retainedPlugin?.api) return retainedPlugin.api;
-	const cleanup = createContainerCleanup();
-	const plugin = {
-		name: pluginName,
-		api: cleanup,
-		configureServer(nextServer) {
-			attachContainerCleanup(nextServer, cleanup);
-		}
-	};
-	server.config = {
-		...server.config,
-		inlineConfig: {
+	let cleanup = server.config.inlineConfig[containerCleanupKey];
+	if (!cleanup) {
+		cleanup = createContainerCleanup();
+		const inlineConfig = {
 			...server.config.inlineConfig,
-			plugins: [...server.config.inlineConfig.plugins ?? [], plugin]
-		}
-	};
+			[containerCleanupKey]: cleanup
+		};
+		server.config = {
+			...server.config,
+			inlineConfig
+		};
+	}
 	attachContainerCleanup(server, cleanup);
 	return cleanup;
 }
 function attachContainerCleanup(server, cleanup) {
+	if (server.close[containerCleanupKey] === cleanup) return;
 	const restartServer = server.restart.bind(server);
-	server.restart = (...args) => cleanup.restart(() => restartServer(...args));
+	server.restart = (...args) => cleanup.restart(async () => {
+		await restartServer(...args);
+		if (!server.config.plugins.some((plugin) => plugin.name === "vite-plugin-cloudflare:dev")) attachContainerCleanup(server, cleanup);
+	});
 	const closeServer = server.close.bind(server);
-	server.close = async () => {
+	const closeWithCleanup = async () => {
 		try {
 			await closeServer();
 		} finally {
 			if (!cleanup.isRestarting) cleanup.cleanup();
 		}
 	};
+	closeWithCleanup[containerCleanupKey] = cleanup;
+	server.close = closeWithCleanup;
 }
 
 //#endregion