chore: finish up replacing fetchModule with invoke (#145)

examples/browser-cli/src/cli.ts

@@ -7,7 +7,8 @@ import {
   createServer,
   parseAstAsync,
 } from "vite";
-import type { FetchFunction, ModuleRunner } from "vite/module-runner";
+import type { ModuleRunner } from "vite/module-runner";
+import { vitePluginFetchModuleServer } from "../../web-worker/src/lib/fetch-module-server";
 
 const headless = !process.env["CLI_HEADED"];
 const extension = process.env["CLI_EXTENSION"] ?? "tsx";
@@ -185,25 +186,4 @@ function vitePluginBrowserRunner(): Plugin {
   };
 }
 
-// https://github.com/vitejs/vite/discussions/18191
-function vitePluginFetchModuleServer(): Plugin {
-  return {
-    name: vitePluginFetchModuleServer.name,
-    configureServer(server) {
-      server.middlewares.use(async (req, res, next) => {
-        const url = new URL(req.url ?? "/", "https://any.local");
-        if (url.pathname === "/@vite/fetchModule") {
-          const [name, ...args] = JSON.parse(url.searchParams.get("payload")!);
-          const result = await server.environments[name]!.fetchModule(
-            ...(args as Parameters<FetchFunction>),
-          );
-          res.end(JSON.stringify(result));
-          return;
-        }
-        next();
-      });
-    },
-  };
-}
-
 main();

examples/browser-cli/src/runner.ts

@@ -1,16 +1,13 @@
-import {
-  ESModulesEvaluator,
-  type FetchFunction,
-  ModuleRunner,
-} from "vite/module-runner";
+import { ESModulesEvaluator, ModuleRunner } from "vite/module-runner";
+import { fetchClientFetchModule } from "../../web-worker/src/lib/fetch-module-client";
 
 export async function start(options: { root: string }) {
   const runner = new ModuleRunner(
     {
       root: options.root,
       sourcemapInterceptor: false,
       transport: {
-        fetchModule: fetchModuleFetchClient("custom"),
+        invoke: fetchClientFetchModule("custom"),
       },
       hmr: false,
     },
@@ -19,15 +16,3 @@ export async function start(options: { root: string }) {
 
   return runner;
 }
-
-// https://github.com/vitejs/vite/discussions/18191
-function fetchModuleFetchClient(environmentName: string): FetchFunction {
-  return async (...args) => {
-    const payload = JSON.stringify([environmentName, ...args]);
-    const response = await fetch(
-      "/@vite/fetchModule?" + new URLSearchParams({ payload }),
-    );
-    const result = response.json();
-    return result as any;
-  };
-}

examples/web-worker-rsc/src/lib/runner.ts

@@ -1,5 +1,5 @@
 import { ESModulesEvaluator, ModuleRunner } from "vite/module-runner";
-import { fetchClientFetchModule } from "./fetch-module-client";
+import { fetchClientFetchModule } from "../../../web-worker/src/lib/fetch-module-client";
 
 export function createFetchRunner(options: {
   root: string;
@@ -10,7 +10,7 @@ export function createFetchRunner(options: {
       root: options.root,
       sourcemapInterceptor: false,
       transport: {
-        fetchModule: fetchClientFetchModule(options.environmentName),
+        invoke: fetchClientFetchModule(options.environmentName),
       },
       hmr: false,
     },

examples/web-worker-rsc/vite.config.ts

@@ -1,7 +1,7 @@
 import react from "@vitejs/plugin-react";
 import { defineConfig } from "vite";
+import { vitePluginFetchModuleServer } from "../web-worker/src/lib/fetch-module-server";
 import { vitePluginWorkerEnvironment } from "../web-worker/vite.config";
-import { vitePluginFetchModuleServer } from "./src/lib/fetch-module-server";
 
 export default defineConfig((_env) => ({
   clearScreen: false,

examples/web-worker/src/lib/fetch-module-client.ts

@@ -1,10 +1,12 @@
-import type { FetchFunction } from "vite";
+import type { ModuleRunnerTransport } from "vite/module-runner";
 
-export function fetchClientFetchModule(environmentName: string): FetchFunction {
-  return async (...args) => {
-    const payload = JSON.stringify([environmentName, ...args]);
+export function fetchClientFetchModule(
+  environmentName: string,
+): ModuleRunnerTransport["invoke"] {
+  return async (payload) => {
+    const data = JSON.stringify([environmentName, payload]);
     const response = await fetch(
-      "/@vite/fetchModule?" + new URLSearchParams({ payload }),
+      "/@vite/invoke?" + new URLSearchParams({ data }),
     );
     const result = response.json();
     return result as any;

examples/web-worker/src/lib/fetch-module-server.ts

@@ -1,16 +1,15 @@
-import type { FetchFunction, Plugin } from "vite";
+import { type Plugin } from "vite";
 
 export function vitePluginFetchModuleServer(): Plugin {
   return {
     name: vitePluginFetchModuleServer.name,
     configureServer(server) {
       server.middlewares.use(async (req, res, next) => {
         const url = new URL(req.url ?? "/", "https://any.local");
-        if (url.pathname === "/@vite/fetchModule") {
-          const [name, ...args] = JSON.parse(url.searchParams.get("payload")!);
-          const result = await server.environments[name]!.fetchModule(
-            ...(args as Parameters<FetchFunction>),
-          );
+        if (url.pathname === "/@vite/invoke") {
+          const [name, payload] = JSON.parse(url.searchParams.get("data")!);
+          const devEnv = server.environments[name]!;
+          const result = await devEnv.hot.handleInvoke(payload);
           res.end(JSON.stringify(result));
           return;
         }

examples/web-worker/src/lib/runner.ts

@@ -10,7 +10,7 @@ export function createFetchRunner(options: {
       root: options.root,
       sourcemapInterceptor: false,
       transport: {
-        fetchModule: fetchClientFetchModule(options.environmentName),
+        invoke: fetchClientFetchModule(options.environmentName),
       },
       hmr: false,
     },