@cloudflare/vite-plugin 1.12.4 → 1.13.0

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

@@ -6005,6 +6005,9 @@ var ADDITIONAL_MODULE_TYPES = [
   "Data",
   "Text"
 ];
+var virtualPrefix = "virtual:cloudflare/";
+var VIRTUAL_USER_ENTRY = `${virtualPrefix}user-entry`;
+var VIRTUAL_NODEJS_COMPAT_ENTRY = `${virtualPrefix}nodejs-compat-entry`;
 var kRequestType = Symbol("kRequestType");
 
 // src/shared.ts
@@ -6015,6 +6018,7 @@ var additionalModuleGlobalRE = new RegExp(
   ADDITIONAL_MODULE_PATTERN,
   "g"
 );
+var VIRTUAL_WORKER_ENTRY = `${virtualPrefix}worker-entry`;
 
 // src/asset-workers/asset-worker.ts
 var CustomAssetWorker = class extends worker_default {

package/dist/index.js

@@ -1748,6 +1748,14 @@ var ROUTER_WORKER_NAME = "__router-worker__";
 var ASSET_WORKER_NAME = "__asset-worker__";
 var VITE_PROXY_WORKER_NAME = "__vite_proxy_worker__";
 var ASSET_WORKERS_COMPATIBILITY_DATE = "2024-10-04";
+var ENTRY_MODULE_EXTENSIONS = [
+  ".js",
+  ".mjs",
+  ".ts",
+  ".mts",
+  ".jsx",
+  ".tsx"
+];
 var ADDITIONAL_MODULE_TYPES = [
   "CompiledWasm",
   "Data",
@@ -1756,6 +1764,10 @@ var ADDITIONAL_MODULE_TYPES = [
 var PUBLIC_DIR_PREFIX = "/__vite_public_dir__";
 var DEFAULT_INSPECTOR_PORT = 9229;
 var DEBUG_PATH = "/__debug";
+var MAIN_ENTRY_NAME = "index";
+var virtualPrefix = "virtual:cloudflare/";
+var VIRTUAL_USER_ENTRY = `${virtualPrefix}user-entry`;
+var VIRTUAL_NODEJS_COMPAT_ENTRY = `${virtualPrefix}nodejs-compat-entry`;
 var kRequestType = Symbol("kRequestType");
 
 // src/additional-modules.ts
@@ -7434,6 +7446,7 @@ var additionalModuleGlobalRE = new RegExp(
   "g"
 );
 var WORKER_ENTRY_PATH_HEADER = "__VITE_WORKER_ENTRY_PATH__";
+var VIRTUAL_WORKER_ENTRY = `${virtualPrefix}worker-entry`;
 
 // src/utils.ts
 import * as path4 from "node:path";
@@ -7606,7 +7619,9 @@ function createCloudflareEnvironmentOptions({
       copyPublicDir: false,
       ssr: true,
       rollupOptions: {
-        input: workerConfig.main,
+        input: {
+          [MAIN_ENTRY_NAME]: VIRTUAL_WORKER_ENTRY
+        },
         // workerd checks the types of the exports so we need to ensure that additional exports are not added to the entry module
         preserveEntrySignatures: "strict",
         // rolldown-only option
@@ -8956,7 +8971,7 @@ import colors3 from "picocolors";
 import { globSync } from "tinyglobby";
 import "vite";
 import {
-  experimental_maybeStartOrUpdateRemoteProxySession,
+  maybeStartOrUpdateRemoteProxySession,
   unstable_convertConfigBindingsToStartWorkerBindings,
   unstable_getMiniflareWorkerOptions
 } from "wrangler";
@@ -9209,7 +9224,7 @@ async function getDevMiniflareOptions(config) {
           workerConfig
         );
         const preExistingRemoteProxySession = workerConfig.configPath ? remoteProxySessionsDataMap.get(workerConfig.configPath) : void 0;
-        const remoteProxySessionData = resolvedPluginConfig.experimental.remoteBindings ? await experimental_maybeStartOrUpdateRemoteProxySession(
+        const remoteProxySessionData = resolvedPluginConfig.experimental.remoteBindings ?? true ? await maybeStartOrUpdateRemoteProxySession(
           {
             name: workerConfig.name,
             bindings: bindings ?? {}
@@ -9230,7 +9245,7 @@ async function getDevMiniflareOptions(config) {
           resolvedPluginConfig.cloudflareEnv,
           {
             remoteProxyConnectionString: remoteProxySessionData?.session?.remoteProxyConnectionString,
-            remoteBindingsEnabled: resolvedPluginConfig.experimental.remoteBindings,
+            remoteBindingsEnabled: resolvedPluginConfig.experimental.remoteBindings ?? true,
             containerBuildId
           }
         );
@@ -9465,7 +9480,7 @@ async function getPreviewMiniflareOptions(config) {
     resolvedPluginConfig.workers.map(async (workerConfig, i) => {
       const bindings = unstable_convertConfigBindingsToStartWorkerBindings(workerConfig);
       const preExistingRemoteProxySessionData = workerConfig.configPath ? remoteProxySessionsDataMap.get(workerConfig.configPath) : void 0;
-      const remoteProxySessionData = resolvedPluginConfig.experimental.remoteBindings ? await experimental_maybeStartOrUpdateRemoteProxySession(
+      const remoteProxySessionData = resolvedPluginConfig.experimental.remoteBindings ?? true ? await maybeStartOrUpdateRemoteProxySession(
         {
           name: workerConfig.name,
           bindings: bindings ?? {}
@@ -9483,7 +9498,7 @@ async function getPreviewMiniflareOptions(config) {
         void 0,
         {
           remoteProxyConnectionString: remoteProxySessionData?.session?.remoteProxyConnectionString,
-          remoteBindingsEnabled: resolvedPluginConfig.experimental.remoteBindings,
+          remoteBindingsEnabled: resolvedPluginConfig.experimental.remoteBindings ?? true,
           containerBuildId
         }
       );
@@ -16605,17 +16620,10 @@ var NodeJsCompat = class {
   /**
    * Gets the necessary global polyfills to inject into the entry-point of the user's code.
    */
-  injectGlobalCode(id, code) {
+  injectGlobalCode() {
     const injectedCode = Array.from(this.#virtualModulePathToSpecifier.keys()).map((moduleId) => `import "${moduleId}";`).join("\n");
-    const polyfillCode = this.#env.polyfill.map((polyfillPath) => `import "${polyfillPath}";
-`).join("");
-    const modified = new MagicString(code);
-    modified.prepend(injectedCode);
-    modified.prepend(polyfillCode);
-    return {
-      code: modified.toString(),
-      map: modified.generateMap({ hires: "boundary", source: id })
-    };
+    const polyfillCode = this.#env.polyfill.map((polyfillPath) => `import "${polyfillPath}";`).join("\n");
+    return `${injectedCode}${polyfillCode}`;
   }
   /**
    * Resolves the `source` to a Node.js compat alias if possible.
@@ -16850,7 +16858,11 @@ function readWorkerConfig(configPath, env) {
     replacedByVite: /* @__PURE__ */ new Set(),
     notRelevant: /* @__PURE__ */ new Set()
   };
-  const config = unstable_readConfig2({ config: configPath, env });
+  const config = unstable_readConfig2(
+    { config: configPath, env },
+    // Preserve the original `main` value so that Vite can resolve it
+    { preserveOriginalMain: true }
+  );
   const raw = structuredClone(config);
   nullableNonApplicable.forEach((prop) => {
     if (config[prop] !== void 0) {
@@ -16983,28 +16995,29 @@ function getWorkerConfig(configPath, env, opts) {
   if (!config.main) {
     throw new Error(missingFieldErrorMessage(`'main'`, configPath, env));
   }
-  const mainStat = fs5.statSync(config.main, { throwIfNoEntry: false });
-  if (!mainStat) {
-    throw new Error(
-      `The provided Wrangler config main field (${config.main}) doesn't point to an existing file`
-    );
-  }
-  if (mainStat.isDirectory()) {
-    throw new Error(
-      `The provided Wrangler config main field (${config.main}) points to a directory, it needs to point to a file instead`
-    );
-  }
   return {
     type: "worker",
     raw,
     config: {
       ...config,
       ...requiredFields,
-      main: config.main
+      main: maybeResolveMain(config.main, configPath)
     },
     nonApplicable
   };
 }
+function maybeResolveMain(main, configPath) {
+  if (!ENTRY_MODULE_EXTENSIONS.some((extension) => main.endsWith(extension))) {
+    return main;
+  }
+  const resolvedMain = path11.resolve(path11.dirname(configPath), main);
+  if (!fs5.existsSync(resolvedMain)) {
+    throw new Error(
+      `The provided Wrangler config main field (${resolvedMain}) doesn't point to an existing file`
+    );
+  }
+  return resolvedMain;
+}
 function getValidatedWranglerConfigPath(root, requestedConfigPath, isForAuxiliaryWorker = false) {
   if (requestedConfigPath) {
     const configPath2 = path11.resolve(root, requestedConfigPath);
@@ -17332,9 +17345,6 @@ function cloudflare(pluginConfig = {}) {
           }
         };
       },
-      buildStart() {
-        workersConfigsWarningShown = false;
-      },
       // Vite `configResolved` Hook
       // see https://vite.dev/guide/api-plugin.html#configresolved
       configResolved(config) {
@@ -17346,24 +17356,35 @@ function cloudflare(pluginConfig = {}) {
           );
         }
       },
-      async transform(code, id) {
+      buildStart() {
+        workersConfigsWarningShown = false;
+      },
+      resolveId(source) {
         const workerConfig = getWorkerConfig2(this.environment.name);
         if (!workerConfig) {
           return;
         }
-        const resolvedWorkerEntry = await this.resolve(workerConfig.main);
-        if (id === resolvedWorkerEntry?.id) {
-          const modified = new MagicString(code);
-          const hmrCode = `
+        if (source === VIRTUAL_WORKER_ENTRY) {
+          return `\0${VIRTUAL_WORKER_ENTRY}`;
+        }
+        if (source === VIRTUAL_USER_ENTRY) {
+          return this.resolve(workerConfig.main);
+        }
+      },
+      load(id) {
+        if (!getWorkerConfig2(this.environment.name)) {
+          return;
+        }
+        if (id === `\0${VIRTUAL_WORKER_ENTRY}`) {
+          const entryModule = getNodeJsCompat(this.environment.name) ? VIRTUAL_NODEJS_COMPAT_ENTRY : VIRTUAL_USER_ENTRY;
+          return `
+import * as mod from "${entryModule}";
+export * from "${entryModule}";
+export default mod.default ?? {};
 if (import.meta.hot) {
-  import.meta.hot.accept();
+	import.meta.hot.accept();
 }
-						`;
-          modified.append(hmrCode);
-          return {
-            code: modified.toString(),
-            map: modified.generateMap({ hires: "boundary", source: id })
-          };
+					`;
         }
       },
       generateBundle(_, bundle) {
@@ -17371,13 +17392,17 @@ if (import.meta.hot) {
         let config;
         if (resolvedPluginConfig.type === "workers") {
           const workerConfig = resolvedPluginConfig.workers[this.environment.name];
-          const entryChunk = Object.entries(bundle).find(
-            ([_2, chunk]) => chunk.type === "chunk" && chunk.isEntry
-          );
-          if (!workerConfig || !entryChunk) {
+          if (!workerConfig) {
             return;
           }
-          workerConfig.main = entryChunk[0];
+          const entryChunk = Object.values(bundle).find(
+            (chunk) => chunk.type === "chunk" && chunk.isEntry && chunk.name === MAIN_ENTRY_NAME
+          );
+          assert12(
+            entryChunk,
+            `Expected entry chunk with name "${MAIN_ENTRY_NAME}"`
+          );
+          workerConfig.main = entryChunk.fileName;
           workerConfig.no_bundle = true;
           workerConfig.rules = [
             { type: "ESModule", globs: ["**/*.js", "**/*.mjs"] }
@@ -17816,6 +17841,9 @@ if (import.meta.hot) {
       // rather than allowing the resolve hook here to alias them to polyfills.
       enforce: "pre",
       async resolveId(source, importer, options) {
+        if (source === VIRTUAL_NODEJS_COMPAT_ENTRY) {
+          return `\0${VIRTUAL_NODEJS_COMPAT_ENTRY}`;
+        }
         const nodeJsCompat = getNodeJsCompat(this.environment.name);
         assertHasNodeJsCompat(nodeJsCompat);
         if (nodeJsCompat.isGlobalVirtualModule(source)) {
@@ -17841,19 +17869,15 @@ if (import.meta.hot) {
       load(id) {
         const nodeJsCompat = getNodeJsCompat(this.environment.name);
         assertHasNodeJsCompat(nodeJsCompat);
-        return nodeJsCompat.getGlobalVirtualModule(id);
-      },
-      async transform(code, id) {
-        const workerConfig = getWorkerConfig2(this.environment.name);
-        if (!workerConfig) {
-          return;
-        }
-        const resolvedId = await this.resolve(workerConfig.main);
-        if (id === resolvedId?.id) {
-          const nodeJsCompat = getNodeJsCompat(this.environment.name);
-          assertHasNodeJsCompat(nodeJsCompat);
-          return nodeJsCompat.injectGlobalCode(id, code);
+        if (id === `\0${VIRTUAL_NODEJS_COMPAT_ENTRY}`) {
+          return `
+${nodeJsCompat.injectGlobalCode()}
+import * as mod from "${VIRTUAL_USER_ENTRY}";
+export * from "${VIRTUAL_USER_ENTRY}";
+export default mod.default ?? {};
+					`;
         }
+        return nodeJsCompat.getGlobalVirtualModule(id);
       },
       async configureServer(viteDevServer) {
         await Promise.all(

package/dist/runner-worker/index.js

@@ -11,6 +11,9 @@ var ADDITIONAL_MODULE_TYPES = [
   "Data",
   "Text"
 ];
+var virtualPrefix = "virtual:cloudflare/";
+var VIRTUAL_USER_ENTRY = `${virtualPrefix}user-entry`;
+var VIRTUAL_NODEJS_COMPAT_ENTRY = `${virtualPrefix}nodejs-compat-entry`;
 var kRequestType = Symbol("kRequestType");
 
 // src/shared.ts
@@ -23,6 +26,7 @@ var additionalModuleGlobalRE = new RegExp(
   "g"
 );
 var WORKER_ENTRY_PATH_HEADER = "__VITE_WORKER_ENTRY_PATH__";
+var VIRTUAL_WORKER_ENTRY = `${virtualPrefix}worker-entry`;
 
 // src/runner-worker/env.ts
 function stripInternalEnv(internalEnv) {
@@ -1316,7 +1320,7 @@ async function createModuleRunner(env, webSocket) {
           Object.seal(context[ssrModuleExportsKey]);
         } catch (error) {
           if (error instanceof Error) {
-            error.message = `Error running module "${module.id}".
+            error.message = `Error running module "${module.url}".
 ${error.message}.`;
           }
           throw error;
@@ -1342,7 +1346,7 @@ async function getWorkerEntryExport(workerEntryPath2, exportName) {
   if (!moduleRunner) {
     throw new Error(`Module runner not initialized`);
   }
-  const module = await moduleRunner.import(workerEntryPath2);
+  const module = await moduleRunner.import(VIRTUAL_WORKER_ENTRY);
   const exportValue = typeof module === "object" && module !== null && exportName in module && module[exportName];
   if (!exportValue) {
     throw new Error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "1.12.4",
+  "version": "1.13.0",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -39,9 +39,9 @@
     "tinyglobby": "^0.2.12",
     "unenv": "2.0.0-rc.21",
     "ws": "8.18.0",
+    "wrangler": "4.36.0",
     "@cloudflare/unenv-preset": "2.7.3",
-    "miniflare": "4.20250906.0",
-    "wrangler": "4.35.0"
+    "miniflare": "4.20250906.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250906.0",
@@ -53,14 +53,14 @@
     "typescript": "^5.8.3",
     "vite": "7.0.0",
     "vitest": "~3.2.0",
+    "@cloudflare/mock-npm-registry": "0.0.0",
     "@cloudflare/containers-shared": "0.2.10",
     "@cloudflare/workers-shared": "0.18.8",
-    "@cloudflare/mock-npm-registry": "0.0.0",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
     "vite": "^6.1.0 || ^7.0.0",
-    "wrangler": "^4.35.0"
+    "wrangler": "^4.36.0"
   },
   "publishConfig": {
     "access": "public"