fix: reuse mod.ssrError

TrickyPi · Mar 7, 2022 · 458c4c5 · 458c4c5
1 parent 2e5a438
commit 458c4c5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/packages/vite/src/node/server/moduleGraph.ts b/packages/vite/src/node/server/moduleGraph.ts
@@ -31,6 +31,7 @@ export class ModuleNode {
   transformResult: TransformResult | null = null
   ssrTransformResult: TransformResult | null = null
   ssrModule: Record<string, any> | null = null
+  ssrError: Error | null = null
   lastHMRTimestamp = 0
 
   constructor(url: string) {

diff --git a/packages/vite/src/node/ssr/__tests__/ssrModuleLoader.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrModuleLoader.spec.ts
@@ -17,9 +17,7 @@ test('always throw error when evaluating an wrong SSR module', async () => {
   }
   await viteServer.close()
   expect(expectedErrors).toHaveLength(2)
-  expectedErrors.forEach((error) => {
-    expect(error?.message).toContain(THROW_MESSAGE)
-  })
+  expect(expectedErrors[0]).toBe(expectedErrors[1])
   expect(spy).toBeCalledTimes(2)
   spy.mock.calls.forEach(([info]) => {
     expect(info).toContain('Error when evaluating SSR module')

diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts
@@ -77,6 +77,10 @@ async function instantiateModule(
   const { moduleGraph } = server
   const mod = await moduleGraph.ensureEntryFromUrl(url, true)
 
+  if (mod.ssrError) {
+    throw mod.ssrError
+  }
+
   if (mod.ssrModule) {
     return mod.ssrModule
   }
@@ -202,7 +206,7 @@ async function instantiateModule(
       ssrExportAll
     )
   } catch (e) {
-    mod.ssrModule = null
+    mod.ssrError = e
     if (e.stack && fixStacktrace !== false) {
       const stacktrace = ssrRewriteStacktrace(e.stack, moduleGraph)
       rebindErrorStacktrace(e, stacktrace)