@cloudflare/vite-plugin 0.0.0-d033a7da1 → 0.0.0-d0d62e6e4

package/dist/index.js

@@ -489,7 +489,7 @@ import assert10 from "node:assert";
 import * as fs5 from "node:fs";
 import * as fsp2 from "node:fs/promises";
 import * as path9 from "node:path";
-import { createRequest, sendResponse } from "@mjackson/node-fetch-server";
+import { createMiddleware } from "@hattip/adapter-node";
 import replace from "@rollup/plugin-replace";
 
 // ../../node_modules/.pnpm/@jridgewell+sourcemap-codec@1.5.0/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs
@@ -13029,6 +13029,19 @@ function toMiniflareRequest(request) {
     duplex: "half"
   });
 }
+function nodeHeadersToWebHeaders(nodeHeaders) {
+  const headers = new Headers();
+  for (const [key, value] of Object.entries(nodeHeaders)) {
+    if (typeof value === "string") {
+      headers.append(key, value);
+    } else if (Array.isArray(value)) {
+      for (const item of value) {
+        headers.append(key, item);
+      }
+    }
+  }
+  return headers;
+}
 var postfixRE = /[?#].*$/;
 function cleanUrl(url) {
   return url.replace(postfixRE, "");
@@ -14169,7 +14182,6 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 }
 
 // src/websockets.ts
-import { createHeaders } from "@mjackson/node-fetch-server";
 import { coupleWebSocket } from "miniflare";
 import { WebSocketServer } from "ws";
 function handleWebSocket(httpServer, getFetcher) {
@@ -14181,7 +14193,7 @@ function handleWebSocket(httpServer, getFetcher) {
       if (request.headers["sec-websocket-protocol"]?.startsWith("vite")) {
         return;
       }
-      const headers = createHeaders(request);
+      const headers = nodeHeadersToWebHeaders(request.headers);
       const fetcher = await getFetcher();
       const response = await fetcher(url, {
         headers,
@@ -14470,6 +14482,16 @@ function cloudflare2(pluginConfig = {}) {
           );
         }
         await initRunners(resolvedPluginConfig, viteDevServer, miniflare);
+        const middleware = createMiddleware(
+          async ({ request }) => {
+            assert10(miniflare, `Miniflare not defined`);
+            const routerWorker = await getRouterWorker(miniflare);
+            return routerWorker.fetch(toMiniflareRequest(request), {
+              redirect: "manual"
+            });
+          },
+          { alwaysCallNext: false }
+        );
         if (viteDevServer.httpServer) {
           handleWebSocket(viteDevServer.httpServer, async () => {
             assert10(miniflare, `Miniflare not defined`);
@@ -14478,24 +14500,8 @@ function cloudflare2(pluginConfig = {}) {
           });
         }
         return () => {
-          viteDevServer.middlewares.use(async (req, res, next) => {
-            try {
-              assert10(miniflare, `Miniflare not defined`);
-              const routerWorker = await getRouterWorker(miniflare);
-              const request = createRequest(req, res);
-              const response = await routerWorker.fetch(
-                toMiniflareRequest(request),
-                {
-                  redirect: "manual"
-                }
-              );
-              if (req.httpVersionMajor === 2) {
-                response.headers.delete("transfer-encoding");
-              }
-              await sendResponse(res, response);
-            } catch (error) {
-              next(error);
-            }
+          viteDevServer.middlewares.use((req, res, next) => {
+            middleware(req, res, next);
           });
         };
       },
@@ -14513,24 +14519,20 @@ function cloudflare2(pluginConfig = {}) {
             inputInspectorPort
           )
         );
+        const middleware = createMiddleware(
+          ({ request }) => {
+            return miniflare2.dispatchFetch(toMiniflareRequest(request), {
+              redirect: "manual"
+            });
+          },
+          { alwaysCallNext: false }
+        );
         handleWebSocket(
           vitePreviewServer.httpServer,
           () => miniflare2.dispatchFetch
         );
-        vitePreviewServer.middlewares.use(async (req, res, next) => {
-          try {
-            const request = createRequest(req, res);
-            const response = await miniflare2.dispatchFetch(
-              toMiniflareRequest(request),
-              { redirect: "manual" }
-            );
-            if (req.httpVersionMajor === 2) {
-              response.headers.delete("transfer-encoding");
-            }
-            await sendResponse(res, response);
-          } catch (error) {
-            next(error);
-          }
+        vitePreviewServer.middlewares.use((req, res, next) => {
+          middleware(req, res, next);
         });
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-d033a7da1",
+  "version": "0.0.0-d0d62e6e4",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -33,19 +33,19 @@
     "dist"
   ],
   "dependencies": {
-    "@cloudflare/unenv-preset": "2.3.1",
-    "@mjackson/node-fetch-server": "^0.6.1",
+    "@hattip/adapter-node": "^0.0.49",
     "@rollup/plugin-replace": "^6.0.1",
     "get-port": "^7.1.0",
     "picocolors": "^1.1.1",
     "tinyglobby": "^0.2.12",
     "unenv": "2.0.0-rc.15",
     "ws": "8.18.0",
-    "miniflare": "0.0.0-d033a7da1",
-    "wrangler": "0.0.0-d033a7da1"
+    "@cloudflare/unenv-preset": "0.0.0-d0d62e6e4",
+    "miniflare": "0.0.0-d0d62e6e4",
+    "wrangler": "0.0.0-d0d62e6e4"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250508.0",
+    "@cloudflare/workers-types": "^4.20250507.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
@@ -56,8 +56,8 @@
     "vite": "^6.1.0",
     "vitest": "~3.1.1",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/workers-shared": "0.0.0-d033a7da1"
+    "@cloudflare/workers-shared": "0.0.0-d0d62e6e4",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
     "vite": "^6.1.0",