refactor: obtain HMRHandler from onUpdate callback

hi-ogawa · Feb 1, 2024 · 322c69e · 322c69e
1 parent 8b32d19
commit 322c69e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/vite-node-miniflare/src/client/vite-node.ts b/packages/vite-node-miniflare/src/client/vite-node.ts
@@ -4,6 +4,7 @@ import {
   proxyTinyRpc,
 } from "@hiogawa/tiny-rpc";
 import { tinyassert } from "@hiogawa/utils";
+import type { HMRPayload } from "vite";
 import type { ViteNodeRunnerOptions } from "vite-node";
 import { ViteNodeRunner } from "vite-node/client";
 import { installSourcemapsSupport } from "vite-node/source-map";
@@ -16,6 +17,7 @@ export interface ViteNodeMiniflareClient {
   rpc: TinyRpcProxy<ViteNodeRpc>;
   runner: ViteNodeRunner;
   runtime: ViteRuntime;
+  runtimeHMRHandler: (payload: HMRPayload) => Promise<void>;
 }
 
 export function createViteNodeClient(options: {
@@ -31,6 +33,8 @@ export function createViteNodeClient(options: {
     adapter: httpClientAdapter({ url: options.serverRpcUrl }),
   });
 
+  let runtimeHMRHandler!: (payload: HMRPayload) => Promise<void>;
+
   const runtime = new ViteRuntime(
     {
       root: options.runnerOptions.root,
@@ -47,9 +51,10 @@ export function createViteNodeClient(options: {
           send(messages) {
             console.log("[runtime.hmr.connection.send]", messages);
           },
-          // TODO: for now, we fetch HMRPayload via rpc, so nothing to register
+          // TODO: for now, we fetch HMRPayload via separate rpc, so we just grab the callback and use it later.
           onUpdate(callback) {
-            console.log("[runtime.hmr.connection.onUpdate]", callback);
+            // this is called during ViteRuntime constructor
+            runtimeHMRHandler = callback as any;
           },
         },
         logger: console,
@@ -100,7 +105,7 @@ export function createViteNodeClient(options: {
     },
   });
 
-  return { rpc, runner, runtime };
+  return { rpc, runner, runtime, runtimeHMRHandler };
 }
 
 function setupBufferPolyfill() {

diff --git a/packages/vite-node-miniflare/src/client/worker-entry.ts b/packages/vite-node-miniflare/src/client/worker-entry.ts
@@ -1,4 +1,3 @@
-import { handleHMRUpdate } from "vite/runtime";
 import {
   type ViteNodeMiniflareClient,
   createViteNodeClient,
@@ -49,7 +48,7 @@ export default {
             }
             continue;
           }
-          await handleHMRUpdate(client.runtime, payload);
+          await client.runtimeHMRHandler(payload);
         }
 
         const workerEntry = await client.runtime.executeEntrypoint(