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> + ssrLoadModule(url: string): Promise> /** * Fix ssr error stacktrace. */ diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index 29f57adeb5c752..9c631110880843 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -226,10 +226,7 @@ export interface ViteDevServer { /** * Load a given URL as an instantiated module for SSR. */ - ssrLoadModule( - url: string, - opts?: { fixStacktrace?: boolean } - ): Promise> + ssrLoadModule(url: string): Promise> /** * Returns a fixed version of the given stack */ @@ -362,7 +359,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 @@ -375,13 +372,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 6a45a2b70509d0..91ca45a366d138 100644 --- a/packages/vite/src/node/ssr/__tests__/ssrModuleLoader.spec.ts +++ b/packages/vite/src/node/ssr/__tests__/ssrModuleLoader.spec.ts @@ -6,7 +6,6 @@ const THROW_MESSAGE = 'it is an expected error' test('always throw error when evaluating an wrong SSR module', async () => { const viteServer = await createServer() - const spy = jest.spyOn(console, 'error').mockImplementation(() => {}) const expectedErrors = [] for (const i of [0, 1]) { try { @@ -21,9 +20,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 8b3a423f58aeab..a5b8e8c6a34eeb 100644 --- a/packages/vite/src/node/ssr/ssrModuleLoader.ts +++ b/packages/vite/src/node/ssr/ssrModuleLoader.ts @@ -8,7 +8,6 @@ import { unwrapId, usingDynamicImport } from '../utils' -import { rebindErrorStacktrace, ssrRewriteStacktrace } from './ssrStacktrace' import { ssrExportAllKey, ssrModuleExportsKey, @@ -35,8 +34,7 @@ export async function ssrLoadModule( url: string, server: ViteDevServer, context: SSRContext = { global }, - urlStack: string[] = [], - fixStacktrace?: boolean + urlStack: string[] = [] ): Promise { 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 { const { moduleGraph } = server const mod = await moduleGraph.ensureEntryFromUrl(url, true) @@ -144,13 +135,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 { @@ -207,18 +192,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 }