From 800aef60011dac911eb5f3eb1c401a5e208e8fca Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 2 May 2022 13:42:03 -0700
Subject: [PATCH] chore: do not fixStacktrace

---
 docs/guide/api-javascript.md                  |  5 +--
 packages/vite/src/node/server/index.ts        | 15 ++------
 .../ssr/__tests__/ssrModuleLoader.spec.ts     |  5 ---
 packages/vite/src/node/ssr/ssrModuleLoader.ts | 35 +++----------------
 4 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/docs/guide/api-javascript.md b/docs/guide/api-javascript.md
index 0128be26bd92ba..2e6ad32fc70764 100644
--- a/docs/guide/api-javascript.md
+++ b/docs/guide/api-javascript.md
@@ -92,10 +92,7 @@ interface ViteDevServer {
   /**
    * Load a given URL as an instantiated module for SSR.
    */
-  ssrLoadModule(
-    url: string,
-    options?: { fixStacktrace?: boolean }
-  ): Promise<Record<string, any>>
+  ssrLoadModule(url: string): Promise<Record<string, any>>
   /**
    * Fix ssr error stacktrace.
    */
diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
index 4dafb7fc99b335..0a8c2a6166a390 100644
--- a/packages/vite/src/node/server/index.ts
+++ b/packages/vite/src/node/server/index.ts
@@ -199,10 +199,7 @@ export interface ViteDevServer {
   /**
    * Load a given URL as an instantiated module for SSR.
    */
-  ssrLoadModule(
-    url: string,
-    opts?: { fixStacktrace?: boolean }
-  ): Promise<Record<string, any>>
+  ssrLoadModule(url: string): Promise<Record<string, any>>
   /**
    * Returns a fixed version of the given stack
    */
@@ -323,7 +320,7 @@ export async function createServer(
       return transformRequest(url, server, options)
     },
     transformIndexHtml: null!, // to be immediately set
-    async ssrLoadModule(url, opts?: { fixStacktrace?: boolean }) {
+    async ssrLoadModule(url) {
       if (!server._ssrExternals) {
         let knownImports: string[] = []
         const optimizedDeps = server._optimizedDeps
@@ -336,13 +333,7 @@ export async function createServer(
         }
         server._ssrExternals = resolveSSRExternal(config, knownImports)
       }
-      return ssrLoadModule(
-        url,
-        server,
-        undefined,
-        undefined,
-        opts?.fixStacktrace
-      )
+      return ssrLoadModule(url, server, undefined, undefined)
     },
     ssrFixStacktrace(e) {
       if (e.stack) {
diff --git a/packages/vite/src/node/ssr/__tests__/ssrModuleLoader.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrModuleLoader.spec.ts
index 4b494524d45c72..20fa1f6103ac33 100644
--- a/packages/vite/src/node/ssr/__tests__/ssrModuleLoader.spec.ts
+++ b/packages/vite/src/node/ssr/__tests__/ssrModuleLoader.spec.ts
@@ -22,9 +22,4 @@ test('always throw error when evaluating an wrong SSR module', async () => {
   expectedErrors.forEach((error) => {
     expect(error?.message).toContain(THROW_MESSAGE)
   })
-  expect(spy).toBeCalledTimes(1)
-  const [firstParameter] = spy.mock.calls[0]
-  expect(firstParameter).toContain('Error when evaluating SSR module')
-  expect(firstParameter).toContain(THROW_MESSAGE)
-  spy.mockClear()
 })
diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts
index c552d5431881eb..0eac3655c2ffe5 100644
--- a/packages/vite/src/node/ssr/ssrModuleLoader.ts
+++ b/packages/vite/src/node/ssr/ssrModuleLoader.ts
@@ -20,7 +20,6 @@ import {
   ssrImportMetaKey,
   ssrModuleExportsKey
 } from './ssrTransform'
-import { rebindErrorStacktrace, ssrRewriteStacktrace } from './ssrStacktrace'
 
 interface SSRContext {
   global: typeof globalThis
@@ -35,8 +34,7 @@ export async function ssrLoadModule(
   url: string,
   server: ViteDevServer,
   context: SSRContext = { global },
-  urlStack: string[] = [],
-  fixStacktrace?: boolean
+  urlStack: string[] = []
 ): Promise<SSRModule> {
   url = unwrapId(url).replace(NULL_BYTE_PLACEHOLDER, '\0')
 
@@ -49,13 +47,7 @@ export async function ssrLoadModule(
     return pending
   }
 
-  const modulePromise = instantiateModule(
-    url,
-    server,
-    context,
-    urlStack,
-    fixStacktrace
-  )
+  const modulePromise = instantiateModule(url, server, context, urlStack)
   pendingModules.set(url, modulePromise)
   modulePromise
     .catch(() => {
@@ -71,8 +63,7 @@ async function instantiateModule(
   url: string,
   server: ViteDevServer,
   context: SSRContext = { global },
-  urlStack: string[] = [],
-  fixStacktrace?: boolean
+  urlStack: string[] = []
 ): Promise<SSRModule> {
   const { moduleGraph } = server
   const mod = await moduleGraph.ensureEntryFromUrl(url, true)
@@ -143,13 +134,7 @@ async function instantiateModule(
       if (pendingDeps.length === 1) {
         pendingImports.set(url, pendingDeps)
       }
-      const mod = await ssrLoadModule(
-        dep,
-        server,
-        context,
-        urlStack,
-        fixStacktrace
-      )
+      const mod = await ssrLoadModule(dep, server, context, urlStack)
       if (pendingDeps.length === 1) {
         pendingImports.delete(url)
       } else {
@@ -206,18 +191,6 @@ async function instantiateModule(
     )
   } catch (e) {
     mod.ssrError = e
-    if (e.stack && fixStacktrace !== false) {
-      const stacktrace = ssrRewriteStacktrace(e.stack, moduleGraph)
-      rebindErrorStacktrace(e, stacktrace)
-      server.config.logger.error(
-        `Error when evaluating SSR module ${url}:\n${stacktrace}`,
-        {
-          timestamp: true,
-          clear: server.config.clearScreen,
-          error: e
-        }
-      )
-    }
     throw e
   }