@cloudflare/vite-plugin 0.0.0-e2f5756c2 → 0.0.0-e39a45ffa

package/dist/runner-worker/index.js

@@ -5,23 +5,31 @@ import {
   WorkflowEntrypoint
 } from "cloudflare:workers";
 
+// src/constants.ts
+var ADDITIONAL_MODULE_TYPES = [
+  "CompiledWasm",
+  "Data",
+  "Text"
+];
+
 // 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("|")})__(.*?)__CLOUDFLARE_MODULE__`;
+var additionalModuleRE = new RegExp(ADDITIONAL_MODULE_PATTERN);
+var additionalModuleGlobalRE = new RegExp(
+  ADDITIONAL_MODULE_PATTERN,
+  "g"
+);
+var VITE_DEV_METADATA_HEADER = "__VITE_DEV_METADATA__";
 
 // src/runner-worker/env.ts
 function stripInternalEnv(internalEnv) {
-  const {
-    __VITE_ROOT__,
-    __VITE_ENTRY_PATH__,
-    __VITE_INVOKE_MODULE__,
-    __VITE_UNSAFE_EVAL__,
-    ...userEnv
-  } = internalEnv;
+  const { __VITE_INVOKE_MODULE__, __VITE_UNSAFE_EVAL__, ...userEnv } = internalEnv;
   return userEnv;
 }
 
-// ../../node_modules/.pnpm/vite@6.0.7_@types+node@18.19.59_jiti@2.4.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";
@@ -1352,7 +1360,7 @@ function exportAll(exports, sourceModule) {
 
 // src/runner-worker/module-runner.ts
 var moduleRunner;
-async function createModuleRunner(env, webSocket) {
+async function createModuleRunner(env, webSocket, viteRoot) {
   if (moduleRunner) {
     throw new Error("Runner already initialized");
   }
@@ -1364,7 +1372,7 @@ async function createModuleRunner(env, webSocket) {
   });
   moduleRunner = new ModuleRunner(
     {
-      root: env.__VITE_ROOT__,
+      root: viteRoot,
       sourcemapInterceptor: "prepareStackTrace",
       transport: {
         ...transport,
@@ -1386,13 +1394,6 @@ async function createModuleRunner(env, webSocket) {
     },
     {
       async runInlinedModule(context, transformed, module) {
-        if (module.file.includes("/node_modules") && !module.file.includes("/node_modules/.vite")) {
-          throw new Error(
-            `[Error] Trying to import non-prebundled module (only prebundled modules are allowed): ${module.id}
-
-(have you excluded the module via \`optimizeDeps.exclude\`?)`
-          );
-        }
         const codeDefinition = `'use strict';async (${Object.keys(context).join(
           ","
         )})=>{{`;
@@ -1409,12 +1410,14 @@ async function createModuleRunner(env, webSocket) {
         }
       },
       async runExternalModule(filepath) {
-        if (filepath.includes("/node_modules") && !filepath.includes("/node_modules/.vite")) {
-          throw new Error(
-            `[Error] Trying to import non-prebundled module (only prebundled modules are allowed): ${filepath}
-
-(have you externalized the module via \`resolve.external\`?)`
-          );
+        if (filepath === "cloudflare:workers") {
+          const originalCloudflareWorkersModule = await import("cloudflare:workers");
+          return Object.seal({
+            ...originalCloudflareWorkersModule,
+            env: stripInternalEnv(
+              originalCloudflareWorkersModule.env
+            )
+          });
         }
         filepath = filepath.replace(/^file:\/\//, "");
         return import(filepath);
@@ -1432,22 +1435,24 @@ 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 = "";
 function getRpcProperty(ctor, instance, key) {
   const prototypeHasKey = Reflect.has(ctor.prototype, key);
   if (!prototypeHasKey) {
@@ -1480,7 +1485,6 @@ function getRpcPropertyCallableThenable(key, property) {
   return fn;
 }
 async function getWorkerEntrypointRpcProperty(entrypoint, key) {
-  const entryPath = this.env.__VITE_ENTRY_PATH__;
   const ctor = await getWorkerEntryExport(
     entryPath,
     entrypoint
@@ -1510,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(
@@ -1525,14 +1529,27 @@ function createWorkerEntrypointWrapper(entrypoint) {
   }
   for (const key of WORKER_ENTRYPOINT_KEYS) {
     Wrapper.prototype[key] = async function(arg) {
-      const entryPath = this.env.__VITE_ENTRY_PATH__;
       if (key === "fetch") {
         const request = arg;
         const url = new URL(request.url);
+        let webSocket;
         if (url.pathname === INIT_PATH) {
-          const { 0: client, 1: server } = new WebSocketPair();
-          createModuleRunner(this.env, server);
-          return new Response(null, { status: 101, webSocket: client });
+          try {
+            const viteDevMetadata = getViteDevMetadata(request);
+            entryPath = viteDevMetadata.entryPath;
+            const { 0: client, 1: server } = new WebSocketPair();
+            webSocket = client;
+            await createModuleRunner(this.env, server, viteDevMetadata.root);
+          } catch (e) {
+            return new Response(
+              e instanceof Error ? e.message : JSON.stringify(e),
+              { status: 500 }
+            );
+          }
+          return new Response(null, {
+            status: 101,
+            webSocket
+          });
         }
       }
       const entrypointValue = await getWorkerEntryExport(entryPath, entrypoint);
@@ -1572,7 +1589,6 @@ function createWorkerEntrypointWrapper(entrypoint) {
 var kInstance = Symbol("kInstance");
 var kEnsureInstance = Symbol("kEnsureInstance");
 async function getDurableObjectRpcProperty(className, key) {
-  const entryPath = this.env.__VITE_ENTRY_PATH__;
   const { ctor, instance } = await this[kEnsureInstance]();
   if (!(instance instanceof DurableObject)) {
     throw new TypeError(
@@ -1596,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(
@@ -1609,7 +1625,6 @@ function createDurableObjectWrapper(className) {
       });
     }
     async [kEnsureInstance]() {
-      const entryPath = this.env.__VITE_ENTRY_PATH__;
       const ctor = await getWorkerEntryExport(
         entryPath,
         className
@@ -1631,7 +1646,6 @@ function createDurableObjectWrapper(className) {
   }
   for (const key of DURABLE_OBJECT_KEYS) {
     Wrapper.prototype[key] = async function(...args) {
-      const entryPath = this.env.__VITE_ENTRY_PATH__;
       const { instance } = await this[kEnsureInstance]();
       const maybeFn = instance[key];
       if (typeof maybeFn !== "function") {
@@ -1649,7 +1663,6 @@ function createWorkflowEntrypointWrapper(className) {
   }
   for (const key of WORKFLOW_ENTRYPOINT_KEYS) {
     Wrapper.prototype[key] = async function(...args) {
-      const entryPath = this.env.__VITE_ENTRY_PATH__;
       const ctor = await getWorkerEntryExport(
         entryPath,
         className
@@ -1672,6 +1685,34 @@ function createWorkflowEntrypointWrapper(className) {
   }
   return Wrapper;
 }
+function getViteDevMetadata(request) {
+  const viteDevMetadataHeader = request.headers.get(VITE_DEV_METADATA_HEADER);
+  if (viteDevMetadataHeader === null) {
+    throw new Error(
+      "Unexpected internal error, vite dev metadata header not set"
+    );
+  }
+  let parsedViteDevMetadataHeader;
+  try {
+    parsedViteDevMetadataHeader = JSON.parse(viteDevMetadataHeader);
+  } catch {
+    throw new Error(
+      `Unexpected internal error, vite dev metadata header JSON parsing failed, value = ${viteDevMetadataHeader}`
+    );
+  }
+  const { root, entryPath: entryPath2 } = parsedViteDevMetadataHeader;
+  if (root === void 0) {
+    throw new Error(
+      "Unexpected internal error, vite dev metadata header doesn't contain a root value"
+    );
+  }
+  if (entryPath2 === void 0) {
+    throw new Error(
+      "Unexpected internal error, vite dev metadata header doesn't contain an entryPath value"
+    );
+  }
+  return { root, entryPath: entryPath2 };
+}
 export {
   createDurableObjectWrapper,
   createWorkerEntrypointWrapper,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-e2f5756c2",
+  "version": "0.0.0-e39a45ffa",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -33,26 +33,35 @@
     "dist"
   ],
   "dependencies": {
-    "@hattip/adapter-node": "^0.0.49",
-    "unenv": "npm:unenv-nightly@2.0.0-20241218-183400-5d6aec3",
-    "ws": "^8.18.0",
-    "miniflare": "0.0.0-e2f5756c2"
+    "@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.17",
+    "ws": "8.18.0",
+    "miniflare": "0.0.0-e39a45ffa",
+    "wrangler": "0.0.0-e39a45ffa"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20241230.0",
+    "@cloudflare/workers-types": "^4.20250525.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
-    "tsup": "^8.3.0",
+    "mlly": "^1.7.4",
+    "tsup": "8.3.0",
     "typescript": "^5.7.2",
-    "vite": "^6.0.7",
-    "wrangler": "0.0.0-e2f5756c2",
+    "undici": "^5.28.5",
+    "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-e2f5756c2"
+    "@cloudflare/workers-shared": "0.0.0-e39a45ffa"
   },
   "peerDependencies": {
-    "vite": "^6.0.7",
-    "wrangler": "^3.101.0"
+    "vite": "^6.1.0",
+    "wrangler": "^3.101.0 || ^4.0.0"
   },
   "publishConfig": {
     "access": "public"
@@ -63,8 +72,10 @@
   "scripts": {
     "build": "tsup",
     "check:type": "tsc --build",
-    "test": "vitest",
-    "test:ci": "vitest run",
-    "watch": "tsup --watch"
+    "dev": "tsup --watch",
+    "test": "vitest run",
+    "test:ci": "pnpm test",
+    "test:e2e": "vitest run -c e2e/vitest.config.ts",
+    "test:watch": "vitest"
   }
 }