chore(deps): update vite

package.json

@@ -65,7 +65,7 @@
     "simple-git-hooks": "^2.9.0",
     "tsx": "^4.6.1",
     "typescript": "^5.2.2",
-    "vite": "^5.0.12",
+    "vite": "^5.1.4",
     "vitest": "workspace:*",
     "zx": "^7.2.3"
   },

packages/vite-node/src/cli.ts

@@ -131,6 +131,31 @@ async function run(files: string[], options: CliOptions = {}) {
     process.on('uncaughtException', (err) => {
       console.error(c.red('[vite-node] Failed to execute file: \n'), err)
     })
+
+    if (process.env.VITE_TEST_WATCHER_DEBUG) {
+      // manually check `watcher.getWatched()` to make sure entry files are ready
+      // since watcher.on('ready', ...) event is not reliable since 5.1.
+      // https://github.com/vitejs/vite/blob/63a39c244b08cf1f2299bc2c3cfddcb82070d05b/playground/hmr-ssr/__tests__/hmr.spec.ts#L1065
+
+      const nodePath = await import('node:path')
+
+      async function waitForWatched(files: string[]): Promise<void> {
+        while (!files.every(file => isWatched(file)))
+          await new Promise(resolve => setTimeout(resolve, 20))
+      }
+
+      function isWatched(file: string): boolean {
+        const watched = server.watcher.getWatched()
+        const resolved = nodePath.resolve(file)
+        const dir = nodePath.dirname(resolved)
+        const base = nodePath.basename(resolved)
+        return watched[dir]?.includes(base)
+      }
+
+      await waitForWatched(files)
+      // eslint-disable-next-line no-console
+      console.log('[debug] watcher is ready')
+    }
   }
 }
 

packages/vite-node/src/hmr/emitter.ts

@@ -50,12 +50,6 @@ export function viteNodeHmrPlugin(): Plugin {
         _send(payload)
         emitter.emit('message', payload)
       }
-      if (process.env.VITE_TEST_WATCHER_DEBUG) {
-        server.watcher.on('ready', () => {
-          // eslint-disable-next-line no-console
-          console.log('[debug] watcher is ready')
-        })
-      }
     },
   }
 }