@cloudflare/vite-plugin 0.0.0-ab4dcff48 → 0.0.0-acd42a849

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

@@ -2072,8 +2072,8 @@ var Ve = class {
 };
 var Yn = "public, max-age=0, must-revalidate";
 function Jn(t, e, n) {
-  let r = new Headers({ "Content-Type": e, ETag: `"${t}"` });
-  return Ds(n) && r.append("Cache-Control", Yn), r;
+  let r = new Headers({ ETag: `"${t}"` });
+  return e !== void 0 && r.append("Content-Type", e), Ds(n) && r.append("Cache-Control", Yn), r;
 }
 function Ds(t) {
   return !t.headers.has("Authorization") && !t.headers.has("Range");
@@ -2280,7 +2280,7 @@ var Kn = class extends Us {
   async unstable_getByETag(t) {
     let e = await Wn(this.env.ASSETS_KV_NAMESPACE, t);
     if (!e || !e.value) throw new Error(`Requested asset ${t} exists in the asset manifest but not in the KV namespace.`);
-    return { readableStream: e.value, contentType: e.metadata?.contentType ?? "application/octet-stream" };
+    return { readableStream: e.value, contentType: e.metadata?.contentType };
   }
   async unstable_getByPathname(t) {
     let e = await this.unstable_exists(t);

package/dist/index.js

@@ -1238,6 +1238,7 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
       // Note: ssr pre-bundling is opt-in and we need to enable it by setting `noDiscovery` to false
       noDiscovery: false,
       entries: workerConfig.main,
+      exclude: [...cloudflareBuiltInModules],
       esbuildOptions: {
         platform: "neutral",
         conditions: [...defaultConditions, "development"],
@@ -1363,7 +1364,12 @@ import * as fs2 from "node:fs";
 import * as fsp from "node:fs/promises";
 import * as path3 from "node:path";
 import { fileURLToPath } from "node:url";
-import { Log, LogLevel, Response as MiniflareResponse } from "miniflare";
+import {
+  kCurrentWorker,
+  Log,
+  LogLevel,
+  Response as MiniflareResponse
+} from "miniflare";
 import "vite";
 import {
   unstable_getMiniflareWorkerOptions,
@@ -1397,11 +1403,10 @@ function getWorkerToWorkerEntrypointNamesMap(workers) {
   );
   for (const worker of workers) {
     for (const value of Object.values(worker.serviceBindings ?? {})) {
-      if (typeof value === "object" && "name" in value && typeof value.name === "string" && value.entrypoint !== void 0 && value.entrypoint !== "default") {
-        const entrypointNames = workerToWorkerEntrypointNamesMap.get(
-          value.name
-        );
-        assert4(entrypointNames, missingWorkerErrorMessage(value.name));
+      if (typeof value === "object" && "name" in value && value.entrypoint !== void 0 && value.entrypoint !== "default") {
+        const targetWorkerName = value.name === kCurrentWorker ? worker.name : value.name;
+        const entrypointNames = workerToWorkerEntrypointNamesMap.get(targetWorkerName);
+        assert4(entrypointNames, missingWorkerErrorMessage(targetWorkerName));
         entrypointNames.add(value.entrypoint);
       }
     }
@@ -8712,6 +8717,8 @@ var { env } = defineEnv({
   nodeCompat: true,
   presets: [cloudflare]
 });
+var nodeCompatExternals = new Set(env.external);
+var nodeCompatEntries = getNodeCompatEntries();
 function isNodeCompat(workerConfig) {
   if (workerConfig === void 0) {
     return false;
@@ -8735,24 +8742,6 @@ function isNodeCompat(workerConfig) {
   }
   return false;
 }
-function getNodeCompatEntries() {
-  const entries = new Set(Object.values(env.alias));
-  for (const globalInject of Object.values(env.inject)) {
-    if (typeof globalInject === "string") {
-      entries.add(globalInject);
-    } else {
-      assert6(
-        globalInject[0] !== void 0,
-        "Expected first element of globalInject to be defined"
-      );
-      entries.add(globalInject[0]);
-    }
-  }
-  for (const external of env.external) {
-    entries.delete(external);
-  }
-  return entries;
-}
 function injectGlobalCode(id, code) {
   const injectedCode = Object.entries(env.inject).map(([globalName, globalInject]) => {
     if (typeof globalInject === "string") {
@@ -8778,9 +8767,6 @@ globalThis.${globalName} = var_${globalName}.${exportName};
     map: modified.generateMap({ hires: "boundary", source: id })
   };
 }
-function getNodeCompatExternals() {
-  return env.external;
-}
 function resolveNodeJSImport(source) {
   const alias = env.alias[source];
   if (alias) {
@@ -8789,6 +8775,28 @@ function resolveNodeJSImport(source) {
       resolved: resolvePathSync(alias, { url: import.meta.url })
     };
   }
+  if (nodeCompatEntries.has(source)) {
+    return {
+      unresolved: source,
+      resolved: resolvePathSync(source, { url: import.meta.url })
+    };
+  }
+}
+function getNodeCompatEntries() {
+  const entries = new Set(Object.values(env.alias));
+  for (const globalInject of Object.values(env.inject)) {
+    if (typeof globalInject === "string") {
+      entries.add(globalInject);
+    } else {
+      assert6(
+        globalInject[0] !== void 0,
+        "Expected first element of globalInject to be defined"
+      );
+      entries.add(globalInject[0]);
+    }
+  }
+  nodeCompatExternals.forEach((external) => entries.delete(external));
+  return entries;
 }
 
 // src/plugin-config.ts
@@ -9101,9 +9109,9 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
 }
 
 // src/websockets.ts
-import ws from "ws";
+import { WebSocketServer } from "ws";
 function handleWebSocket(httpServer, fetcher, logger) {
-  const nodeWebSocket = new ws.Server({ noServer: true });
+  const nodeWebSocket = new WebSocketServer({ noServer: true });
   httpServer.on(
     "upgrade",
     async (request, socket, head) => {
@@ -9212,7 +9220,7 @@ function cloudflare2(pluginConfig = {}) {
             }
           } : void 0,
           builder: {
-            async buildApp(builder) {
+            buildApp: userConfig.builder?.buildApp ?? (async (builder) => {
               const clientEnvironment = builder.environments.client;
               const defaultHtmlPath = path7.resolve(
                 builder.config.root,
@@ -9238,7 +9246,7 @@ function cloudflare2(pluginConfig = {}) {
                   )
                 );
               }
-            }
+            })
           }
         };
       },
@@ -9461,7 +9469,7 @@ function cloudflare2(pluginConfig = {}) {
         if (isNodeCompat(getWorkerConfig2(name2))) {
           return {
             resolve: {
-              builtins: getNodeCompatExternals()
+              builtins: [...nodeCompatExternals]
             },
             optimizeDeps: {
               // This is a list of dependency entry-points that should be pre-bundled.
@@ -9469,7 +9477,8 @@ function cloudflare2(pluginConfig = {}) {
               // ready ahead the first request to the dev server.
               // Without this the dependency optimizer will try to bundle them on-the-fly in the middle of the first request,
               // which can potentially cause problems if it leads to previous pre-bundling to become stale and needing to be reloaded.
-              include: [...getNodeCompatEntries()],
+              // TODO: work out how to re-enable pre-bundling of these
+              // include: [...getNodeCompatEntries()],
               // This is a list of module specifiers that the dependency optimizer should not follow when doing import analysis.
               // In this case we provide a list of all the Node.js modules, both those built-in to workerd and those that will be polyfilled.
               // Obviously we don't want/need the optimizer to try to process modules that are built-in;
@@ -9500,7 +9509,11 @@ function cloudflare2(pluginConfig = {}) {
             this.environment.depsOptimizer,
             "depsOptimizer is required in dev mode"
           );
-          return this.resolve(result.unresolved, importer, options);
+          const { id } = this.environment.depsOptimizer.registerMissingImport(
+            result.unresolved,
+            result.resolved
+          );
+          return this.resolve(id, importer, options);
         }
         return this.resolve(result.resolved, importer, options);
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-ab4dcff48",
+  "version": "0.0.0-acd42a849",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -36,8 +36,8 @@
     "@cloudflare/unenv-preset": "1.1.1",
     "@hattip/adapter-node": "^0.0.49",
     "unenv": "2.0.0-rc.1",
-    "ws": "^8.18.0",
-    "miniflare": "0.0.0-ab4dcff48"
+    "ws": "8.18.0",
+    "miniflare": "0.0.0-acd42a849"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250214.0",
@@ -51,9 +51,9 @@
     "vite": "^6.1.0",
     "vitest": "~3.0.5",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "@cloudflare/workers-shared": "0.0.0-ab4dcff48",
+    "@cloudflare/workers-shared": "0.0.0-acd42a849",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "0.0.0-ab4dcff48"
+    "wrangler": "0.0.0-acd42a849"
   },
   "peerDependencies": {
     "vite": "^6.1.0",