fix(vite-node): top-level throw in module is not reported properly (#6840)

vanaigr · hi-ogawa · web-flow · commit cf0cbf6a37a4 · 2024-11-05T12:25:29.000+01:00
Co-authored-by: Hiroshi Ogawa &lt;hi.ogawa.zz@gmail.com&gt;
diff --git a/packages/vite-node/src/hmr/hmr.ts b/packages/vite-node/src/hmr/hmr.ts
@@ -160,8 +160,8 @@ async function fetchUpdate(
   }
 }
 
-function warnFailedFetch(err: Error, path: string | string[]) {
-  if (!err.message.match('fetch')) {
+function warnFailedFetch(err: unknown, path: string | string[]) {
+  if (!(err instanceof Error) || !err.message.match('fetch')) {
     console.error(err)
   }
 
diff --git a/test/vite-node/src/hmr-throw.js b/test/vite-node/src/hmr-throw.js
@@ -0,0 +1,11 @@
+if (import.meta.hot) {
+  import.meta.hot.accept(() => {})
+  if (import.meta.hot.data.value == null) {
+    import.meta.hot.data.value = 0
+  }
+  else {
+    // eslint-disable-next-line no-throw-literal
+    throw 'some error'
+  }
+}
+console.error('ready')
diff --git a/test/vite-node/test/hmr.test.ts b/test/vite-node/test/hmr.test.ts
@@ -15,3 +15,16 @@ test('hmr.accept works correctly', async () => {
   await viteNode.waitForStderr('Accept')
   await viteNode.waitForStdout(`[vite-node] hot updated: ${scriptFile}`)
 })
+
+test('can handle top-level throw in self-accepting module', async () => {
+  const scriptFile = resolve(__dirname, '../src/hmr-throw.js')
+
+  const { viteNode } = await runViteNodeCli('--watch', scriptFile)
+
+  await viteNode.waitForStderr('ready')
+
+  editFile(scriptFile, content => `${content}\nconsole.error("done")`)
+
+  await viteNode.waitForStderr('some error')
+  await viteNode.waitForStderr(`[hmr] Failed to reload ${scriptFile}. This could be due to syntax errors or importing non-existent modules. (see errors above)`)
+})

Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,8 @@ async function fetchUpdate(`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
`163`		`-function warnFailedFetch(err: Error, path: string \| string[]) {`
`164`		`- if (!err.message.match('fetch')) {`
	`163`	`+function warnFailedFetch(err: unknown, path: string \| string[]) {`
	`164`	`+ if (!(err instanceof Error) \|\| !err.message.match('fetch')) {`
`165`	`165`	`console.error(err)`
`166`	`166`	`}`
`167`	`167`