@cloudflare/vite-plugin 0.0.0-7749f42c3 → 0.0.0-781924bb9

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
@@ -1558,7 +1558,7 @@ var MagicString = class _MagicString {
 
 // src/index.ts
 import { Miniflare } from "miniflare";
-import colors2 from "picocolors";
+import colors3 from "picocolors";
 import * as vite7 from "vite";
 
 // src/constants.ts
@@ -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, "");
@@ -13355,12 +13342,13 @@ import {
   LogLevel,
   Response as MiniflareResponse
 } from "miniflare";
+import colors2 from "picocolors";
 import { globSync } from "tinyglobby";
 import "vite";
 import { unstable_getMiniflareWorkerOptions } from "wrangler";
-function getPersistence(root, persistState) {
+function getPersistenceRoot(root, persistState) {
   if (persistState === false) {
-    return {};
+    return;
   }
   const defaultPersistPath = ".wrangler/state";
   const persistPath = path6.resolve(
@@ -13368,14 +13356,7 @@ function getPersistence(root, persistState) {
     typeof persistState === "object" ? persistState.path : defaultPersistPath,
     "v3"
   );
-  return {
-    cachePersist: path6.join(persistPath, "cache"),
-    d1Persist: path6.join(persistPath, "d1"),
-    durableObjectsPersist: path6.join(persistPath, "do"),
-    kvPersist: path6.join(persistPath, "kv"),
-    r2Persist: path6.join(persistPath, "r2"),
-    workflowsPersist: path6.join(persistPath, "workflows")
-  };
+  return persistPath;
 }
 function missingWorkerErrorMessage(workerName) {
   return `${workerName} does not match a worker name.`;
@@ -13459,6 +13440,29 @@ function getEntryWorkerConfig(resolvedPluginConfig) {
   }
   return resolvedPluginConfig.workers[resolvedPluginConfig.entryWorkerEnvironmentName];
 }
+function filterTails(tails, userWorkers, log) {
+  return tails?.filter((tailService) => {
+    let name;
+    if (typeof tailService === "string") {
+      name = tailService;
+    } else if (typeof tailService === "object" && "name" in tailService && typeof tailService.name === "string") {
+      name = tailService.name;
+    } else {
+      return true;
+    }
+    const found = userWorkers.some((w) => w.name === name);
+    if (!found) {
+      log(
+        colors2.dim(
+          colors2.yellow(
+            `Tail consumer "${name}" was not found in your config. Make sure you add it if you'd like to simulate receiving tail events locally.`
+          )
+        )
+      );
+    }
+    return found;
+  });
+}
 function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPort) {
   const resolvedViteConfig = viteDevServer.config;
   const entryWorkerConfig = getEntryWorkerConfig(resolvedPluginConfig);
@@ -13593,6 +13597,7 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPo
   const logger = new ViteMiniflareLogger(resolvedViteConfig);
   return {
     log: logger,
+    logRequests: false,
     inspectorPort: inspectorPort === false ? void 0 : inspectorPort,
     unsafeInspectorProxy: inspectorPort !== false,
     handleRuntimeStdio(stdout, stderr) {
@@ -13602,7 +13607,7 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPo
         (error) => logger.logWithLevel(LogLevel.ERROR, decoder.decode(error))
       );
     },
-    ...getPersistence(
+    defaultPersistRoot: getPersistenceRoot(
       resolvedViteConfig.root,
       resolvedPluginConfig.persistState
     ),
@@ -13650,6 +13655,11 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPo
         }
         return {
           ...workerOptions,
+          tails: filterTails(
+            workerOptions.tails,
+            userWorkers,
+            viteDevServer.config.logger.warn
+          ),
           modules: [
             {
               type: "ESModule",
@@ -13740,6 +13750,11 @@ function getPreviewMiniflareOptions(vitePreviewServer, workerConfigs, persistSta
     return [
       {
         ...workerOptions,
+        tails: filterTails(
+          workerOptions.tails,
+          workerConfigs,
+          vitePreviewServer.config.logger.warn
+        ),
         name: workerOptions.name ?? config.name,
         unsafeInspectorProxy: inspectorPort !== false,
         ...miniflareWorkerOptions.main ? getPreviewModules(miniflareWorkerOptions.main, modulesRules) : { modules: true, script: "" }
@@ -13759,11 +13774,13 @@ function getPreviewMiniflareOptions(vitePreviewServer, workerConfigs, persistSta
         (error) => logger.logWithLevel(LogLevel.ERROR, decoder.decode(error))
       );
     },
-    ...getPersistence(resolvedViteConfig.root, persistState),
+    defaultPersistRoot: getPersistenceRoot(
+      resolvedViteConfig.root,
+      persistState
+    ),
     workers
   };
 }
-var removedMessages = [/^Ready on http/, /^Updated and ready on http/];
 var ViteMiniflareLogger = class extends Log {
   logger;
   constructor(config) {
@@ -13771,11 +13788,6 @@ var ViteMiniflareLogger = class extends Log {
     this.logger = config.logger;
   }
   logWithLevel(level, message) {
-    for (const removedMessage of removedMessages) {
-      if (removedMessage.test(message)) {
-        return;
-      }
-    }
     switch (level) {
       case LogLevel.ERROR:
         return this.logger.error(message);
@@ -13785,6 +13797,8 @@ var ViteMiniflareLogger = class extends Log {
         return this.logger.info(message);
     }
   }
+  logReady() {
+  }
 };
 function miniflareLogLevelFromViteLogLevel(level = "info") {
   switch (level) {
@@ -14148,6 +14162,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) {
@@ -14159,7 +14174,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,
@@ -14426,10 +14441,6 @@ function cloudflare2(pluginConfig = {}) {
         }
       },
       async configureServer(viteDevServer) {
-        assert10(
-          viteDevServer.httpServer,
-          "Unexpected error: No Vite HTTP server"
-        );
         const inputInspectorPort = await getInputInspectorPortOption(
           pluginConfig,
           viteDevServer
@@ -14452,24 +14463,32 @@ function cloudflare2(pluginConfig = {}) {
           );
         }
         await initRunners(resolvedPluginConfig, viteDevServer, miniflare);
-        const middleware = createMiddleware(
-          async ({ request }) => {
+        if (viteDevServer.httpServer) {
+          handleWebSocket(viteDevServer.httpServer, async () => {
             assert10(miniflare, `Miniflare not defined`);
             const routerWorker = await getRouterWorker(miniflare);
-            return routerWorker.fetch(toMiniflareRequest(request), {
-              redirect: "manual"
-            });
-          },
-          { alwaysCallNext: false }
-        );
-        handleWebSocket(viteDevServer.httpServer, async () => {
-          assert10(miniflare, `Miniflare not defined`);
-          const routerWorker = await getRouterWorker(miniflare);
-          return routerWorker.fetch;
-        });
+            return routerWorker.fetch;
+          });
+        }
         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);
+            }
           });
         };
       },
@@ -14487,20 +14506,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);
+          }
         });
       }
     },
@@ -14839,7 +14862,7 @@ async function getInputInspectorPortOption(pluginConfig, viteServer) {
   const inputInspectorPort = pluginConfig.inspectorPort ?? await getFirstAvailablePort(DEFAULT_INSPECTOR_PORT);
   if (pluginConfig.inspectorPort === void 0 && inputInspectorPort !== DEFAULT_INSPECTOR_PORT) {
     viteServer.config.logger.warn(
-      colors2.dim(
+      colors3.dim(
         `Default inspector port ${DEFAULT_INSPECTOR_PORT} not available, using ${inputInspectorPort} instead
 `
       )

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";
@@ -1435,20 +1435,21 @@ async function getWorkerEntryExport(path, entrypoint) {
 }
 
 // src/runner-worker/index.ts
+var IGNORED_KEYS = ["self", "tailStream"];
 var WORKER_ENTRYPOINT_KEYS = [
   "fetch",
+  "queue",
   "tail",
+  "test",
   "trace",
-  "scheduled",
-  "queue",
-  "test"
+  "scheduled"
 ];
 var DURABLE_OBJECT_KEYS = [
-  "fetch",
   "alarm",
-  "webSocketMessage",
+  "fetch",
   "webSocketClose",
-  "webSocketError"
+  "webSocketError",
+  "webSocketMessage"
 ];
 var WORKFLOW_ENTRYPOINT_KEYS = ["run"];
 var entryPath = "";
@@ -1513,7 +1514,7 @@ function createWorkerEntrypointWrapper(entrypoint) {
           if (value !== void 0) {
             return value;
           }
-          if (key === "self" || typeof key === "symbol" || DURABLE_OBJECT_KEYS.includes(key)) {
+          if (typeof key === "symbol" || IGNORED_KEYS.includes(key) || DURABLE_OBJECT_KEYS.includes(key)) {
             return;
           }
           const property = getWorkerEntrypointRpcProperty.call(
@@ -1611,7 +1612,7 @@ function createDurableObjectWrapper(className) {
           if (value !== void 0) {
             return value;
           }
-          if (key === "self" || typeof key === "symbol" || WORKER_ENTRYPOINT_KEYS.includes(key)) {
+          if (typeof key === "symbol" || IGNORED_KEYS.includes(key) || WORKER_ENTRYPOINT_KEYS.includes(key)) {
             return;
           }
           const property = getDurableObjectRpcProperty.call(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-7749f42c3",
+  "version": "0.0.0-781924bb9",
   "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-7749f42c3",
-    "miniflare": "0.0.0-7749f42c3",
-    "wrangler": "0.0.0-7749f42c3"
+    "miniflare": "0.0.0-781924bb9",
+    "wrangler": "0.0.0-781924bb9"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250422.0",
+    "@cloudflare/workers-types": "^4.20250525.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-7749f42c3",
+    "@cloudflare/workers-shared": "0.0.0-781924bb9",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {