No longer call next in server middleware. (#8080)

Author: jamesopstad

.changeset/stale-zoos-drop.md

@@ -0,0 +1,7 @@
+---
+"@cloudflare/vite-plugin": minor
+---
+
+No longer call `next` in server middleware.
+
+This is so that the Cloudflare plugin can override subsequent dev middleware for framework integrations.

packages/vite-plugin-cloudflare/playground/hot-channel/vite.config.ts

@@ -4,7 +4,6 @@ import { defineConfig } from "vite";
 
 export default defineConfig({
 	plugins: [
-		cloudflare({ persistState: false }),
 		{
 			name: "test-plugin",
 			configureServer(viteDevServer) {
@@ -22,5 +21,6 @@ export default defineConfig({
 				};
 			},
 		},
+		cloudflare({ persistState: false }),
 	],
 });

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

@@ -161,6 +161,7 @@ export function createCloudflareEnvironmentOptions(
 		optimizeDeps: {
 			// Note: ssr pre-bundling is opt-in and we need to enable it by setting `noDiscovery` to false
 			noDiscovery: false,
+			entries: workerConfig.main,
 			exclude: [
 				...cloudflareBuiltInModules,
 				// we have to exclude all node modules to work in dev-mode not just the unenv externals...

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

@@ -267,11 +267,14 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 					miniflare
 				);
 
-				const middleware = createMiddleware(({ request }) => {
-					return entryWorker.fetch(toMiniflareRequest(request), {
-						redirect: "manual",
-					}) as any;
-				});
+				const middleware = createMiddleware(
+					({ request }) => {
+						return entryWorker.fetch(toMiniflareRequest(request), {
+							redirect: "manual",
+						}) as any;
+					},
+					{ alwaysCallNext: false }
+				);
 
 				handleWebSocket(
 					viteDevServer.httpServer,
@@ -293,11 +296,14 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 					)
 				);
 
-				const middleware = createMiddleware(({ request }) => {
-					return miniflare.dispatchFetch(toMiniflareRequest(request), {
-						redirect: "manual",
-					}) as any;
-				});
+				const middleware = createMiddleware(
+					({ request }) => {
+						return miniflare.dispatchFetch(toMiniflareRequest(request), {
+							redirect: "manual",
+						}) as any;
+					},
+					{ alwaysCallNext: false }
+				);
 
 				handleWebSocket(
 					vitePreviewServer.httpServer,