@cloudflare/vite-plugin 0.0.0-40040de6d → 0.0.0-40dd603b8

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.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

@@ -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,
@@ -13345,10 +13345,15 @@ import {
 import colors2 from "picocolors";
 import { globSync } from "tinyglobby";
 import "vite";
-import { unstable_getMiniflareWorkerOptions } from "wrangler";
-function getPersistence(root, persistState) {
+import {
+  experimental_pickRemoteBindings,
+  experimental_startMixedModeSession,
+  unstable_convertConfigBindingsToStartWorkerBindings,
+  unstable_getMiniflareWorkerOptions
+} from "wrangler";
+function getPersistenceRoot(root, persistState) {
   if (persistState === false) {
-    return {};
+    return;
   }
   const defaultPersistPath = ".wrangler/state";
   const persistPath = path6.resolve(
@@ -13356,14 +13361,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.`;
@@ -13470,7 +13468,7 @@ function filterTails(tails, userWorkers, log) {
     return found;
   });
 }
-function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPort) {
+async function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPort) {
   const resolvedViteConfig = viteDevServer.config;
   const entryWorkerConfig = getEntryWorkerConfig(resolvedPluginConfig);
   const assetsConfig = getAssetsConfig(
@@ -13546,53 +13544,60 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPo
       }
     }
   ];
-  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,
+            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 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(
@@ -13604,6 +13609,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) {
@@ -13613,7 +13619,7 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspectorPo
         (error) => logger.logWithLevel(LogLevel.ERROR, decoder.decode(error))
       );
     },
-    ...getPersistence(
+    defaultPersistRoot: getPersistenceRoot(
       resolvedViteConfig.root,
       resolvedPluginConfig.persistState
     ),
@@ -13747,27 +13753,37 @@ 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) => {
+      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;
+      return [
+        {
+          ...workerOptions,
+          tails: filterTails(
+            workerOptions.tails,
+            workerConfigs,
+            vitePreviewServer.config.logger.warn
+          ),
+          name: workerOptions.name ?? workerConfig.name,
+          unsafeInspectorProxy: inspectorPort !== false,
+          ...miniflareWorkerOptions.main ? getPreviewModules(miniflareWorkerOptions.main, modulesRules) : { modules: true, script: "" }
+        },
+        ...externalWorkers
+      ];
+    })
+  )).flat();
   const logger = new ViteMiniflareLogger(resolvedViteConfig);
   return {
     log: logger,
@@ -13780,11 +13796,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) {
@@ -13792,11 +13810,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);
@@ -13806,6 +13819,8 @@ var ViteMiniflareLogger = class extends Log {
         return this.logger.info(message);
     }
   }
+  logReady() {
+  }
 };
 function miniflareLogLevelFromViteLogLevel(level = "info") {
   switch (level) {
@@ -13819,6 +13834,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";
@@ -14452,22 +14485,15 @@ 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) {
@@ -14506,10 +14532,11 @@ function cloudflare2(pluginConfig = {}) {
           vitePreviewServer
         );
         const miniflare2 = new Miniflare(
-          getPreviewMiniflareOptions(
+          await getPreviewMiniflareOptions(
             vitePreviewServer,
             workerConfigs,
             pluginConfig.persistState ?? true,
+            !!pluginConfig.experimental?.mixedMode,
             inputInspectorPort
           )
         );

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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-40040de6d",
+  "version": "0.0.0-40dd603b8",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -41,11 +41,11 @@
     "tinyglobby": "^0.2.12",
     "unenv": "2.0.0-rc.17",
     "ws": "8.18.0",
-    "miniflare": "0.0.0-40040de6d",
-    "wrangler": "0.0.0-40040de6d"
+    "miniflare": "0.0.0-40dd603b8",
+    "wrangler": "0.0.0-40dd603b8"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250508.0",
+    "@cloudflare/workers-types": "^4.20250525.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-40040de6d"
+    "@cloudflare/workers-shared": "0.0.0-40dd603b8",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
     "vite": "^6.1.0",