From 5dfb7c1bd577fd4857bd2c44fe774680fa7a80e4 Mon Sep 17 00:00:00 2001
From: rieljdev <bulaybulay.rielj@gmail.com>
Date: Thu, 2 Oct 2025 05:57:07 +0800
Subject: [PATCH 1/3] fix(vite-plugin): move miniflare dispose directy on
 server.restart

---
 packages/vite-plugin-cloudflare/src/index.ts | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/vite-plugin-cloudflare/src/index.ts b/packages/vite-plugin-cloudflare/src/index.ts
index 9224fefa3a6e..c0bc6e2e0326 100644
--- a/packages/vite-plugin-cloudflare/src/index.ts
+++ b/packages/vite-plugin-cloudflare/src/index.ts
@@ -192,10 +192,19 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 					try {
 						restartingServer = true;
 						debuglog("From server.restart(): Restarting server...");
+						await miniflare?.dispose().catch((error) => {
+							debuglog(
+								"buildEnd: failed to dispose Miniflare instance:",
+								error
+							);
+						});
+						miniflare = undefined;
 						await restartServer();
 						debuglog("From server.restart(): Restarted server...");
 					} finally {
-						restartingServer = false;
+						setTimeout(() => {
+							restartingServer = false;
+						}, 100);
 					}
 				};
 
@@ -490,10 +499,10 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 				debuglog("buildEnd:", restartingServer ? "restarted" : "disposing");
 				if (!restartingServer) {
 					debuglog("buildEnd: disposing Miniflare instance");
-					await miniflare?.dispose().catch((error) => {
-						debuglog("buildEnd: failed to dispose Miniflare instance:", error);
-					});
-					miniflare = undefined;
+					// await miniflare?.dispose().catch((error) => {
+					// 	debuglog("buildEnd: failed to dispose Miniflare instance:", error);
+					// });
+					// miniflare = undefined;
 				}
 			},
 		},

From e542042b2b6e16b02d42b62d6e1ffd4c3254d742 Mon Sep 17 00:00:00 2001
From: rieljdev <bulaybulay.rielj@gmail.com>
Date: Thu, 2 Oct 2025 06:00:06 +0800
Subject: [PATCH 2/3] chore: updated comments and logs

---
 packages/vite-plugin-cloudflare/src/index.ts | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/vite-plugin-cloudflare/src/index.ts b/packages/vite-plugin-cloudflare/src/index.ts
index c0bc6e2e0326..9aebe95a092a 100644
--- a/packages/vite-plugin-cloudflare/src/index.ts
+++ b/packages/vite-plugin-cloudflare/src/index.ts
@@ -192,9 +192,10 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 					try {
 						restartingServer = true;
 						debuglog("From server.restart(): Restarting server...");
+						debuglog("From server.restart(): disposing Miniflare instance");
 						await miniflare?.dispose().catch((error) => {
 							debuglog(
-								"buildEnd: failed to dispose Miniflare instance:",
+								"From server.restart(): failed to dispose Miniflare instance:",
 								error
 							);
 						});
@@ -202,9 +203,7 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 						await restartServer();
 						debuglog("From server.restart(): Restarted server...");
 					} finally {
-						setTimeout(() => {
-							restartingServer = false;
-						}, 100);
+						restartingServer = false;
 					}
 				};
 
@@ -497,13 +496,6 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 				}
 
 				debuglog("buildEnd:", restartingServer ? "restarted" : "disposing");
-				if (!restartingServer) {
-					debuglog("buildEnd: disposing Miniflare instance");
-					// await miniflare?.dispose().catch((error) => {
-					// 	debuglog("buildEnd: failed to dispose Miniflare instance:", error);
-					// });
-					// miniflare = undefined;
-				}
 			},
 		},
 		// Plugin that provides a `__debug` path for debugging the Workers

From 2d6f3d8b9604d36a716a1bef35b00ff84c122432 Mon Sep 17 00:00:00 2001
From: rieljdev <bulaybulay.rielj@gmail.com>
Date: Fri, 3 Oct 2025 02:03:36 +0800
Subject: [PATCH 3/3] chore: added changeset

---
 .changeset/silent-hairs-fold.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .changeset/silent-hairs-fold.md

diff --git a/.changeset/silent-hairs-fold.md b/.changeset/silent-hairs-fold.md
new file mode 100644
index 000000000000..9f5828284ecf
--- /dev/null
+++ b/.changeset/silent-hairs-fold.md
@@ -0,0 +1,23 @@
+---
+"@cloudflare/vite-plugin": minor
+"@cloudflare/chrome-devtools-patches": patch
+"@cloudflare/devprod-status-bot": patch
+"@cloudflare/edge-preview-authenticated-proxy": patch
+"@cloudflare/eslint-config-shared": patch
+"@cloudflare/format-errors": patch
+"@cloudflare/kv-asset-handler": patch
+"@cloudflare/mock-npm-registry": patch
+"@cloudflare/playground-preview-worker": patch
+"@cloudflare/quick-edit": patch
+"@cloudflare/quick-edit-extension": patch
+"solarflare-theme": patch
+"@cloudflare/turbo-r2-archive": patch
+"@cloudflare/unenv-preset": patch
+"@vite-plugin-cloudflare/playground": patch
+"@cloudflare/workers-editor-shared": patch
+"@cloudflare/workers-playground": patch
+"@cloudflare/workers-shared": patch
+"@cloudflare/workers-tsconfig": patch
+---
+
+Moved miniflare dispose inside server.restart() instead of in the buildEnd()