fix: don't throw unhandled error, if import was caught (#2494)

* fix: don't throw unhandled error, if import was caught

* chore: add more tests

packages/vite-node/src/client.ts

@@ -180,11 +180,12 @@ export class ViteNodeRunner {
     const promise = this.directRequest(id, fsPath, callstack)
     Object.assign(mod, { promise, evaluated: false })
 
-    promise.finally(() => {
+    try {
+      return await promise
+    }
+    finally {
       mod.evaluated = true
-    })
-
-    return await promise
+    }
   }
 
   /** @internal */
@@ -272,7 +273,7 @@ export class ViteNodeRunner {
       throw new Error(`[vite-node] Failed to load ${id}`)
 
     const file = cleanUrl(resolvedId || fsPath)
-    // console.log('file', file)
+
     // disambiguate the `<UNIT>:/` on windows: see nodejs/node#31710
     const url = pathToFileURL(file).href
     const meta = { url }

test/core/test/imports.test.ts

@@ -53,3 +53,11 @@ test('dynamic import has null prototype', async () => {
 
   expect(Object.getPrototypeOf(stringTimeoutMod)).toBe(null)
 })
+
+test('dynamic import throws an error', async () => {
+  const path = './some-unknown-path'
+  const imported = import(path)
+  await expect(imported).rejects.toThrowError(/Failed to load/)
+  // @ts-expect-error path does not exist
+  await expect(() => import('./some-unknown-path')).rejects.toThrowError(/Failed to load/)
+})