@cloudflare/vite-plugin 0.0.0-9c15b6ea2 → 0.0.0-9cee4b0c9

package/dist/asset-workers/asset-worker.js

@@ -2476,7 +2476,7 @@ var ADDITIONAL_MODULE_TYPES = [
 
 // src/shared.ts
 var UNKNOWN_HOST = "http://localhost";
-var ADDITIONAL_MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${ADDITIONAL_MODULE_TYPES.join("|")})__(.*?)__`;
+var ADDITIONAL_MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${ADDITIONAL_MODULE_TYPES.join("|")})__(.*?)__CLOUDFLARE_MODULE__`;
 var additionalModuleRE = new RegExp(ADDITIONAL_MODULE_PATTERN);
 var additionalModuleGlobalRE = new RegExp(
   ADDITIONAL_MODULE_PATTERN,

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 { createMiddleware } from "@hattip/adapter-node";
+import { createRequest, sendResponse } from "@mjackson/node-fetch-server";
 import replace from "@rollup/plugin-replace";
 
 // ../../node_modules/.pnpm/@jridgewell+sourcemap-codec@1.5.0/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs
@@ -1589,7 +1589,7 @@ function matchAdditionalModule(source) {
   return null;
 }
 function createModuleReference(type, id) {
-  return `__CLOUDFLARE_MODULE__${type}__${id}__`;
+  return `__CLOUDFLARE_MODULE__${type}__${id}__CLOUDFLARE_MODULE__`;
 }
 
 // src/asset-config.ts
@@ -12993,7 +12993,7 @@ var NodeJsCompatWarnings = class {
 // src/shared.ts
 var UNKNOWN_HOST = "http://localhost";
 var INIT_PATH = "/__vite_plugin_cloudflare_init__";
-var ADDITIONAL_MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${ADDITIONAL_MODULE_TYPES.join("|")})__(.*?)__`;
+var ADDITIONAL_MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${ADDITIONAL_MODULE_TYPES.join("|")})__(.*?)__CLOUDFLARE_MODULE__`;
 var additionalModuleRE = new RegExp(ADDITIONAL_MODULE_PATTERN);
 var additionalModuleGlobalRE = new RegExp(
   ADDITIONAL_MODULE_PATTERN,
@@ -13029,19 +13029,6 @@ 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, "");
@@ -14182,6 +14169,7 @@ 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) {
@@ -14193,7 +14181,7 @@ function handleWebSocket(httpServer, getFetcher) {
       if (request.headers["sec-websocket-protocol"]?.startsWith("vite")) {
         return;
       }
-      const headers = nodeHeadersToWebHeaders(request.headers);
+      const headers = createHeaders(request);
       const fetcher = await getFetcher();
       const response = await fetcher(url, {
         headers,
@@ -14482,16 +14470,6 @@ 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`);
@@ -14500,8 +14478,24 @@ function cloudflare2(pluginConfig = {}) {
           });
         }
         return () => {
-          viteDevServer.middlewares.use((req, res, next) => {
-            middleware(req, res, next);
+          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);
+            }
           });
         };
       },
@@ -14519,20 +14513,24 @@ 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((req, res, next) => {
-          middleware(req, res, next);
+        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);
+          }
         });
       }
     },

package/dist/runner-worker/index.js

@@ -15,7 +15,7 @@ var ADDITIONAL_MODULE_TYPES = [
 // src/shared.ts
 var UNKNOWN_HOST = "http://localhost";
 var INIT_PATH = "/__vite_plugin_cloudflare_init__";
-var ADDITIONAL_MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${ADDITIONAL_MODULE_TYPES.join("|")})__(.*?)__`;
+var ADDITIONAL_MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${ADDITIONAL_MODULE_TYPES.join("|")})__(.*?)__CLOUDFLARE_MODULE__`;
 var additionalModuleRE = new RegExp(ADDITIONAL_MODULE_PATTERN);
 var additionalModuleGlobalRE = new RegExp(
   ADDITIONAL_MODULE_PATTERN,
@@ -29,7 +29,7 @@ function stripInternalEnv(internalEnv) {
   return userEnv;
 }
 
-// ../../node_modules/.pnpm/vite@6.1.0_@types+node@18.19.76_jiti@2.4.2_lightningcss@1.29.2/node_modules/vite/dist/node/module-runner.js
+// ../../node_modules/.pnpm/vite@6.1.0_@types+node@20.17.32_jiti@2.4.2_lightningcss@1.29.2/node_modules/vite/dist/node/module-runner.js
 var VALID_ID_PREFIX = "/@id/";
 var NULL_BYTE_PLACEHOLDER = "__x00__";
 var SOURCEMAPPING_URL = "sourceMa";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-9c15b6ea2",
+  "version": "0.0.0-9cee4b0c9",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -33,19 +33,19 @@
     "dist"
   ],
   "dependencies": {
-    "@hattip/adapter-node": "^0.0.49",
+    "@cloudflare/unenv-preset": "2.3.2",
+    "@mjackson/node-fetch-server": "^0.6.1",
     "@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",
+    "unenv": "2.0.0-rc.17",
     "ws": "8.18.0",
-    "@cloudflare/unenv-preset": "0.0.0-9c15b6ea2",
-    "wrangler": "0.0.0-9c15b6ea2",
-    "miniflare": "0.0.0-9c15b6ea2"
+    "miniflare": "0.0.0-9cee4b0c9",
+    "wrangler": "0.0.0-9cee4b0c9"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250428.0",
+    "@cloudflare/workers-types": "^4.20250508.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
@@ -56,7 +56,7 @@
     "vite": "^6.1.0",
     "vitest": "~3.1.1",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "@cloudflare/workers-shared": "0.0.0-9c15b6ea2",
+    "@cloudflare/workers-shared": "0.0.0-9cee4b0c9",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {