Skip to content

fix(vite-plugin-cloudflare): allow "invoke" other than fetchModule #11123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesopstad merged 3 commits into from
Oct 31, 2025
Merged

fix(vite-plugin-cloudflare): allow "invoke" other than fetchModule #11123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf4a21e
fix(vite-plugin-cloudflare): allow "invoke" other than `fetchModule`
sapphi-red Oct 29, 2025
fd03de5
chore: add changeset
sapphi-red Oct 29, 2025
78a5394
refactor: remove unused `FetchFunctionOptions`
sapphi-red Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/dry-women-cry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cloudflare/vite-plugin": patch
---

Fix Vite 7.2 compatibility.
17 changes: 17 additions & 0 deletions packages/vite-plugin-cloudflare/src/cloudflare-environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import assert from "node:assert";
import * as util from "node:util";
import * as vite from "vite";
import { additionalModuleRE } from "./plugins/additional-modules";
import { VIRTUAL_WORKER_ENTRY } from "./plugins/virtual-modules";
import {
INIT_PATH,
Expand All @@ -17,6 +18,7 @@ import type {
ReplaceWorkersTypes,
WebSocket,
} from "miniflare";
import type { FetchFunctionOptions } from "vite/module-runner";

export const MAIN_ENTRY_NAME = "index";

Expand Down Expand Up @@ -121,6 +123,21 @@ export class CloudflareDevEnvironment extends vite.DevEnvironment {
webSocket.accept();
this.#webSocketContainer.webSocket = webSocket;
}

override async fetchModule(
id: string,
importer?: string,
options?: FetchFunctionOptions
): Promise<vite.FetchResult> {
// Additional modules (CompiledWasm, Data, Text)
if (additionalModuleRE.test(id)) {
return {
externalize: id,
type: "module",
};
}
return super.fetchModule(id, importer, options);
}
}

export const cloudflareBuiltInModules = [
Expand Down
26 changes: 0 additions & 26 deletions packages/vite-plugin-cloudflare/src/miniflare-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ import type {
WorkerdStructuredLog,
WorkerOptions,
} from "miniflare";
import type { FetchFunctionOptions } from "vite/module-runner";
import type {
Binding,
RemoteProxySession,
Expand Down Expand Up @@ -506,36 +505,11 @@ export async function getDevMiniflareOptions(config: {
__VITE_INVOKE_MODULE__: async (request) => {
const payload =
(await request.json()) as vite.CustomPayload;
const invokePayloadData = payload.data as {
id: string;
name: string;
data: [string, string, FetchFunctionOptions];
};

assert(
invokePayloadData.name === "fetchModule",
`Invalid invoke event: ${invokePayloadData.name}`
);

const [moduleId] = invokePayloadData.data;

// Additional modules (CompiledWasm, Data, Text)
if (additionalModuleRE.test(moduleId)) {
const result = {
externalize: moduleId,
type: "module",
} satisfies vite.FetchResult;

return MiniflareResponse.json({ result });
}

const devEnvironment = viteDevServer.environments[
environmentName
] as CloudflareDevEnvironment;

const result =
await devEnvironment.hot.handleInvoke(payload);

return MiniflareResponse.json(result);
},
},
Expand Down
Loading