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

package/dist/index.d.ts

@@ -21,6 +21,8 @@ interface PluginConfig extends EntryWorkerConfig {
     experimental?: {
         /** Experimental support for handling the _headers and _redirects files during Vite dev mode. */
         headersAndRedirectsDevModeSupport?: boolean;
+        /** Experimental support for mixed mode (where bindings configured with `remote: true` access remote resources). */
+        mixedMode?: boolean;
     };
 }
 

package/dist/index.js

@@ -1571,6 +1571,7 @@ var ADDITIONAL_MODULE_TYPES = [
   "Text"
 ];
 var DEFAULT_INSPECTOR_PORT = 9229;
+var kRequestType = Symbol("kRequestType");
 
 // src/additional-modules.ts
 var moduleRules = [
@@ -12648,8 +12649,8 @@ function packageResolve(specifier, base, conditions) {
   let packageJsonPath = fileURLToPath$1(packageJsonUrl);
   let lastPath;
   do {
-    const stat = tryStatSync(packageJsonPath.slice(0, -13));
-    if (!stat || !stat.isDirectory()) {
+    const stat2 = tryStatSync(packageJsonPath.slice(0, -13));
+    if (!stat2 || !stat2.isDirectory()) {
       lastPath = packageJsonPath;
       packageJsonUrl = new URL$1(
         (isScoped ? "../../../../node_modules/" : "../../../node_modules/") + packageName + "/package.json",
@@ -12779,8 +12780,8 @@ function _resolve(id, options = {}) {
   }
   if (isAbsolute(id)) {
     try {
-      const stat = statSync(id);
-      if (stat.isFile()) {
+      const stat2 = statSync(id);
+      if (stat2.isFile()) {
         return pathToFileURL(id);
       }
     } catch (error) {
@@ -13010,9 +13011,6 @@ function getOutputDirectory(userConfig, environmentName) {
   const rootOutputDirectory = userConfig.build?.outDir ?? "dist";
   return userConfig.environments?.[environmentName]?.build?.outDir ?? path4.join(rootOutputDirectory, environmentName);
 }
-function getRouterWorker(miniflare2) {
-  return miniflare2.getWorker(ROUTER_WORKER_NAME);
-}
 function toMiniflareRequest(request) {
   const host = request.headers.get("Host");
   if (host) {
@@ -13257,7 +13255,7 @@ import { unstable_readConfig } from "wrangler";
 function getDeployConfigPath(root) {
   return path5.resolve(root, ".wrangler", "deploy", "config.json");
 }
-function getWorkerConfigs(root) {
+function getWorkerConfigs(root, mixedModeEnabled) {
   const deployConfigPath = getDeployConfigPath(root);
   const deployConfig = JSON.parse(
     fs2.readFileSync(deployConfigPath, "utf-8")
@@ -13270,7 +13268,10 @@ function getWorkerConfigs(root) {
       path5.dirname(deployConfigPath),
       configPath
     );
-    return unstable_readConfig({ config: resolvedConfigPath });
+    return unstable_readConfig(
+      { config: resolvedConfigPath },
+      { experimental: { mixedModeEnabled } }
+    );
   });
 }
 function getRelativePathToWorkerConfig(deployConfigDirectory, root, outputDirectory) {
@@ -13337,6 +13338,7 @@ import * as fsp from "node:fs/promises";
 import * as path6 from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import {
+  getDefaultDevRegistryPath,
   kCurrentWorker,
   Log,
   LogLevel,
@@ -13345,7 +13347,12 @@ import {
 import colors2 from "picocolors";
 import { globSync } from "tinyglobby";
 import "vite";
-import { unstable_getMiniflareWorkerOptions } from "wrangler";
+import {
+  experimental_pickRemoteBindings,
+  experimental_startMixedModeSession,
+  unstable_convertConfigBindingsToStartWorkerBindings,
+  unstable_getMiniflareWorkerOptions
+} from "wrangler";
 function getPersistenceRoot(root, persistState) {
   if (persistState === false) {
     return;
@@ -13440,30 +13447,29 @@ function getEntryWorkerConfig(resolvedPluginConfig) {
   }
   return resolvedPluginConfig.workers[resolvedPluginConfig.entryWorkerEnvironmentName];
 }
-function filterTails(tails, userWorkers, log) {
-  return tails?.filter((tailService) => {
+function logUnknownTails(tails, userWorkers, log) {
+  for (const tailService of tails ?? []) {
     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;
+      continue;
     }
     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.`
+            `Tail consumer "${name}" was not found in your config. Make sure you add it to the config or run it in another dev session if you'd like to simulate receiving tail events locally.`
           )
         )
       );
     }
-    return found;
-  });
+  }
 }
-function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPort) {
+async function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPort) {
   const resolvedViteConfig = viteDevServer.config;
   const entryWorkerConfig = getEntryWorkerConfig(resolvedPluginConfig);
   const assetsConfig = getAssetsConfig(
@@ -13514,12 +13520,14 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPo
       serviceBindings: {
         __VITE_ASSET_EXISTS__: async (request) => {
           const { pathname } = new URL(request.url);
-          const filePath = path6.join(resolvedViteConfig.root, pathname);
-          let exists;
-          try {
-            exists = fs3.statSync(filePath).isFile();
-          } catch (error) {
-            exists = false;
+          let exists = false;
+          if (pathname.endsWith(".html")) {
+            try {
+              const filePath = path6.join(resolvedViteConfig.root, pathname);
+              const stats = await fsp.stat(filePath);
+              exists = stats.isFile();
+            } catch (error) {
+            }
           }
           return MiniflareResponse.json(exists);
         },
@@ -13533,59 +13541,75 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPo
               headers: { "Content-Type": "text/html" }
             });
           } catch (error) {
-            throw new Error(`Unexpected error. Failed to load ${pathname}`);
+            throw new Error(`Unexpected error. Failed to load "${pathname}".`);
           }
         }
       }
     }
   ];
-  const workersFromConfig = resolvedPluginConfig.type === "workers" ? Object.entries(resolvedPluginConfig.workers).map(
-    ([environmentName, workerConfig]) => {
-      const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(
-        {
-          ...workerConfig,
-          assets: void 0
-        },
-        resolvedPluginConfig.cloudflareEnv
-      );
-      const { externalWorkers: externalWorkers2 } = miniflareWorkerOptions;
-      const { ratelimits, ...workerOptions } = miniflareWorkerOptions.workerOptions;
-      return {
-        externalWorkers: externalWorkers2,
-        worker: {
-          ...workerOptions,
-          name: workerOptions.name ?? workerConfig.name,
-          unsafeInspectorProxy: inspectorPort !== false,
-          modulesRoot: miniflareModulesRoot,
-          unsafeEvalBinding: "__VITE_UNSAFE_EVAL__",
-          serviceBindings: {
-            ...workerOptions.serviceBindings,
-            ...environmentName === resolvedPluginConfig.entryWorkerEnvironmentName && workerConfig.assets?.binding ? {
-              [workerConfig.assets.binding]: ASSET_WORKER_NAME
-            } : {},
-            __VITE_INVOKE_MODULE__: async (request) => {
-              const payload = await request.json();
-              const invokePayloadData = payload.data;
-              assert6(
-                invokePayloadData.name === "fetchModule",
-                `Invalid invoke event: ${invokePayloadData.name}`
-              );
-              const [moduleId] = invokePayloadData.data;
-              if (additionalModuleRE.test(moduleId)) {
-                const result2 = {
-                  externalize: moduleId,
-                  type: "module"
-                };
-                return MiniflareResponse.json({ result: result2 });
+  const workersFromConfig = resolvedPluginConfig.type === "workers" ? await Promise.all(
+    Object.entries(resolvedPluginConfig.workers).map(
+      async ([environmentName, workerConfig]) => {
+        const mixedModeSession = resolvedPluginConfig.experimental.mixedMode ? await maybeStartOrUpdateMixedModeSession(workerConfig) : void 0;
+        const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(
+          {
+            ...workerConfig,
+            assets: void 0
+          },
+          resolvedPluginConfig.cloudflareEnv,
+          {
+            mixedModeConnectionString: mixedModeSession?.mixedModeConnectionString,
+            mixedModeEnabled: resolvedPluginConfig.experimental.mixedMode
+          }
+        );
+        const { externalWorkers: externalWorkers2 } = miniflareWorkerOptions;
+        const { ratelimits, ...workerOptions } = miniflareWorkerOptions.workerOptions;
+        return {
+          externalWorkers: externalWorkers2,
+          worker: {
+            ...workerOptions,
+            name: workerOptions.name ?? workerConfig.name,
+            unsafeInspectorProxy: inspectorPort !== false,
+            unsafeDirectSockets: environmentName === resolvedPluginConfig.entryWorkerEnvironmentName ? (
+              // Expose the default entrypoint of the entry worker on the dev registry
+              [{ entrypoint: void 0, proxy: true }]
+            ) : [],
+            modulesRoot: miniflareModulesRoot,
+            unsafeEvalBinding: "__VITE_UNSAFE_EVAL__",
+            serviceBindings: {
+              ...workerOptions.serviceBindings,
+              ...environmentName === resolvedPluginConfig.entryWorkerEnvironmentName && workerConfig.assets?.binding ? {
+                [workerConfig.assets.binding]: {
+                  node: (req, res) => {
+                    req[kRequestType] = "asset";
+                    viteDevServer.middlewares(req, res);
+                  }
+                }
+              } : {},
+              __VITE_INVOKE_MODULE__: async (request) => {
+                const payload = await request.json();
+                const invokePayloadData = payload.data;
+                assert6(
+                  invokePayloadData.name === "fetchModule",
+                  `Invalid invoke event: ${invokePayloadData.name}`
+                );
+                const [moduleId] = invokePayloadData.data;
+                if (additionalModuleRE.test(moduleId)) {
+                  const result2 = {
+                    externalize: moduleId,
+                    type: "module"
+                  };
+                  return MiniflareResponse.json({ result: result2 });
+                }
+                const devEnvironment = viteDevServer.environments[environmentName];
+                const result = await devEnvironment.hot.handleInvoke(payload);
+                return MiniflareResponse.json(result);
               }
-              const devEnvironment = viteDevServer.environments[environmentName];
-              const result = await devEnvironment.hot.handleInvoke(payload);
-              return MiniflareResponse.json(result);
             }
           }
-        }
-      };
-    }
+        };
+      }
+    )
   ) : [];
   const userWorkers = workersFromConfig.map((options) => options.worker);
   const externalWorkers = workersFromConfig.flatMap(
@@ -13600,6 +13624,7 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPo
     logRequests: false,
     inspectorPort: inspectorPort === false ? void 0 : inspectorPort,
     unsafeInspectorProxy: inspectorPort !== false,
+    unsafeDevRegistryPath: getDefaultDevRegistryPath(),
     handleRuntimeStdio(stdout, stderr) {
       const decoder = new TextDecoder();
       stdout.forEach((data2) => logger.info(decoder.decode(data2)));
@@ -13653,13 +13678,13 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPo
             `export const ${className} = createWorkflowEntrypointWrapper('${className}');`
           );
         }
+        logUnknownTails(
+          workerOptions.tails,
+          userWorkers,
+          viteDevServer.config.logger.warn
+        );
         return {
           ...workerOptions,
-          tails: filterTails(
-            workerOptions.tails,
-            userWorkers,
-            viteDevServer.config.logger.warn
-          ),
           modules: [
             {
               type: "ESModule",
@@ -13741,32 +13766,48 @@ function getPreviewModules(main, modulesRules) {
     ]
   };
 }
-function getPreviewMiniflareOptions(vitePreviewServer, workerConfigs, persistState, inspectorPort) {
+async function getPreviewMiniflareOptions(vitePreviewServer, workerConfigs, persistState, mixedModeEnabled, inspectorPort) {
   const resolvedViteConfig = vitePreviewServer.config;
-  const workers = workerConfigs.flatMap((config) => {
-    const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(config);
-    const { externalWorkers } = miniflareWorkerOptions;
-    const { ratelimits, modulesRules, ...workerOptions } = miniflareWorkerOptions.workerOptions;
-    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: "" }
-      },
-      ...externalWorkers
-    ];
-  });
+  const workers = (await Promise.all(
+    workerConfigs.map(async (workerConfig, i) => {
+      const mixedModeSession = mixedModeEnabled ? await maybeStartOrUpdateMixedModeSession(workerConfig) : void 0;
+      const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(
+        workerConfig,
+        void 0,
+        {
+          mixedModeConnectionString: mixedModeSession?.mixedModeConnectionString,
+          mixedModeEnabled
+        }
+      );
+      const { externalWorkers } = miniflareWorkerOptions;
+      const { ratelimits, modulesRules, ...workerOptions } = miniflareWorkerOptions.workerOptions;
+      logUnknownTails(
+        workerOptions.tails,
+        workerConfigs,
+        vitePreviewServer.config.logger.warn
+      );
+      return [
+        {
+          ...workerOptions,
+          name: workerOptions.name ?? workerConfig.name,
+          unsafeInspectorProxy: inspectorPort !== false,
+          unsafeDirectSockets: (
+            // This exposes the default entrypoint of the entry worker on the dev registry
+            // Assuming that the first worker config to be the entry worker.
+            i === 0 ? [{ entrypoint: void 0, proxy: true }] : []
+          ),
+          ...miniflareWorkerOptions.main ? getPreviewModules(miniflareWorkerOptions.main, modulesRules) : { modules: true, script: "" }
+        },
+        ...externalWorkers
+      ];
+    })
+  )).flat();
   const logger = new ViteMiniflareLogger(resolvedViteConfig);
   return {
     log: logger,
     inspectorPort: inspectorPort === false ? void 0 : inspectorPort,
     unsafeInspectorProxy: inspectorPort !== false,
+    unsafeDevRegistryPath: getDefaultDevRegistryPath(),
     handleRuntimeStdio(stdout, stderr) {
       const decoder = new TextDecoder();
       stdout.forEach((data2) => logger.info(decoder.decode(data2)));
@@ -13812,6 +13853,24 @@ function miniflareLogLevelFromViteLogLevel(level = "info") {
       return LogLevel.NONE;
   }
 }
+var mixedModeSessionsMap = /* @__PURE__ */ new Map();
+async function maybeStartOrUpdateMixedModeSession(workerConfig) {
+  const workerRemoteBindings = experimental_pickRemoteBindings(
+    unstable_convertConfigBindingsToStartWorkerBindings(workerConfig) ?? {}
+  );
+  assert6(workerConfig.name, "Found workerConfig without a name");
+  let mixedModeSession = mixedModeSessionsMap.get(workerConfig.name);
+  if (mixedModeSession === void 0) {
+    if (Object.keys(workerRemoteBindings).length > 0) {
+      mixedModeSession = await experimental_startMixedModeSession(workerRemoteBindings);
+      mixedModeSessionsMap.set(workerConfig.name, mixedModeSession);
+    }
+  } else {
+    await mixedModeSession.updateBindings(workerRemoteBindings);
+  }
+  await mixedModeSession?.ready;
+  return mixedModeSession;
+}
 
 // src/plugin-config.ts
 import assert8 from "node:assert";
@@ -13866,12 +13925,15 @@ var nullableNonApplicable = [
   "site",
   "tsconfig"
 ];
-function readWorkerConfig(configPath, env2) {
+function readWorkerConfig(configPath, env2, mixedModeEnabled) {
   const nonApplicable = {
     replacedByVite: /* @__PURE__ */ new Set(),
     notRelevant: /* @__PURE__ */ new Set()
   };
-  const config = unstable_readConfig2({ config: configPath, env: env2 }, {});
+  const config = unstable_readConfig2(
+    { config: configPath, env: env2 },
+    { experimental: { mixedModeEnabled } }
+  );
   const raw = structuredClone(config);
   nullableNonApplicable.forEach((prop) => {
     if (config[prop] !== void 0) {
@@ -13966,11 +14028,15 @@ function isNotRelevant(configName) {
 function missingFieldErrorMessage(field, configPath, env2) {
   return `No ${field} field provided in '${configPath}'${env2 ? ` for '${env2}' environment` : ""}`;
 }
-function getWorkerConfig(configPath, env2, opts) {
+function getWorkerConfig(configPath, env2, mixedModeEnabled, opts) {
   if (opts?.visitedConfigPaths?.has(configPath)) {
     throw new Error(`Duplicate Wrangler config path found: ${configPath}`);
   }
-  const { raw, config, nonApplicable } = readWorkerConfig(configPath, env2);
+  const { raw, config, nonApplicable } = readWorkerConfig(
+    configPath,
+    env2,
+    mixedModeEnabled
+  );
   opts?.visitedConfigPaths?.add(configPath);
   if (!config.name) {
     throw new Error(missingFieldErrorMessage(`'name'`, configPath, env2));
@@ -14095,6 +14161,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
   const entryWorkerResolvedConfig = getWorkerConfig(
     entryWorkerConfigPath,
     cloudflareEnv,
+    pluginConfig.experimental?.mixedMode ?? false,
     {
       visitedConfigPaths: configPaths,
       isEntryWorker: true
@@ -14128,6 +14195,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
     const workerResolvedConfig = getWorkerConfig(
       workerConfigPath,
       cloudflareEnv,
+      pluginConfig.experimental?.mixedMode ?? false,
       {
         visitedConfigPaths: configPaths
       }
@@ -14445,28 +14513,21 @@ function cloudflare2(pluginConfig = {}) {
           pluginConfig,
           viteDevServer
         );
+        const miniflareDevOptions = await getDevMiniflareOptions(
+          resolvedPluginConfig,
+          viteDevServer,
+          inputInspectorPort
+        );
         if (!miniflare) {
-          miniflare = new Miniflare(
-            getDevMiniflareOptions(
-              resolvedPluginConfig,
-              viteDevServer,
-              inputInspectorPort
-            )
-          );
+          miniflare = new Miniflare(miniflareDevOptions);
         } else {
-          await miniflare.setOptions(
-            getDevMiniflareOptions(
-              resolvedPluginConfig,
-              viteDevServer,
-              inputInspectorPort
-            )
-          );
+          await miniflare.setOptions(miniflareDevOptions);
         }
         await initRunners(resolvedPluginConfig, viteDevServer, miniflare);
         if (viteDevServer.httpServer) {
           handleWebSocket(viteDevServer.httpServer, async () => {
             assert10(miniflare, `Miniflare not defined`);
-            const routerWorker = await getRouterWorker(miniflare);
+            const routerWorker = await miniflare.getWorker(ROUTER_WORKER_NAME);
             return routerWorker.fetch;
           });
         }
@@ -14474,14 +14535,21 @@ function cloudflare2(pluginConfig = {}) {
           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"
-                }
-              );
+              let response;
+              if (req[kRequestType] === "asset") {
+                const assetWorker = await miniflare.getWorker(ASSET_WORKER_NAME);
+                response = await assetWorker.fetch(
+                  toMiniflareRequest(request),
+                  { redirect: "manual" }
+                );
+              } else {
+                const routerWorker = await miniflare.getWorker(ROUTER_WORKER_NAME);
+                response = await routerWorker.fetch(
+                  toMiniflareRequest(request),
+                  { redirect: "manual" }
+                );
+              }
               if (req.httpVersionMajor === 2) {
                 response.headers.delete("transfer-encoding");
               }
@@ -14493,16 +14561,20 @@ function cloudflare2(pluginConfig = {}) {
         };
       },
       async configurePreviewServer(vitePreviewServer) {
-        const workerConfigs = getWorkerConfigs(vitePreviewServer.config.root);
+        const workerConfigs = getWorkerConfigs(
+          vitePreviewServer.config.root,
+          pluginConfig.experimental?.mixedMode ?? false
+        );
         const inputInspectorPort = await getInputInspectorPortOption(
           pluginConfig,
           vitePreviewServer
         );
         const miniflare2 = new Miniflare(
-          getPreviewMiniflareOptions(
+          await getPreviewMiniflareOptions(
             vitePreviewServer,
             workerConfigs,
             pluginConfig.persistState ?? true,
+            !!pluginConfig.experimental?.mixedMode,
             inputInspectorPort
           )
         );
@@ -14759,7 +14831,10 @@ function cloudflare2(pluginConfig = {}) {
         });
       },
       async configurePreviewServer(vitePreviewServer) {
-        const workerConfigs = getWorkerConfigs(vitePreviewServer.config.root);
+        const workerConfigs = getWorkerConfigs(
+          vitePreviewServer.config.root,
+          pluginConfig.experimental?.mixedMode ?? false
+        );
         if (workerConfigs.length >= 1 && pluginConfig.inspectorPort !== false) {
           addDebugToVitePrintUrls(vitePreviewServer);
         }

package/dist/runner-worker/index.js

@@ -11,6 +11,7 @@ var ADDITIONAL_MODULE_TYPES = [
   "Data",
   "Text"
 ];
+var kRequestType = Symbol("kRequestType");
 
 // src/shared.ts
 var UNKNOWN_HOST = "http://localhost";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-e39a45ffa",
+  "version": "0.0.0-e3b3ef51c",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -41,23 +41,22 @@
     "tinyglobby": "^0.2.12",
     "unenv": "2.0.0-rc.17",
     "ws": "8.18.0",
-    "miniflare": "0.0.0-e39a45ffa",
-    "wrangler": "0.0.0-e39a45ffa"
+    "miniflare": "0.0.0-e3b3ef51c",
+    "wrangler": "0.0.0-e3b3ef51c"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250525.0",
+    "@cloudflare/workers-types": "^4.20250604.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
     "mlly": "^1.7.4",
     "tsup": "8.3.0",
     "typescript": "^5.7.2",
-    "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-e39a45ffa"
+    "@cloudflare/workers-shared": "0.0.0-e3b3ef51c",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
     "vite": "^6.1.0",