From 246a087c45133f993aab58166579b68fdde1db13 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Sun, 21 Aug 2022 01:39:57 +0800 Subject: [PATCH] refactor: use `server.ssrTransform` (#9769) --- packages/vite/src/node/server/index.ts | 12 +++++++++--- packages/vite/src/node/server/transformRequest.ts | 9 +-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index ef0c1c0b30cb78..1fe2aadc926317 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -220,7 +220,8 @@ export interface ViteDevServer { ssrTransform( code: string, inMap: SourceMap | null, - url: string + url: string, + originalCode?: string ): Promise /** * Load a given URL as an instantiated module for SSR. @@ -339,8 +340,13 @@ export async function createServer( ws, moduleGraph, resolvedUrls: null, // will be set on listen - ssrTransform(code: string, inMap: SourceMap | null, url: string) { - return ssrTransform(code, inMap, url, code, server.config) + ssrTransform( + code: string, + inMap: SourceMap | null, + url: string, + originalCode = code + ) { + return ssrTransform(code, inMap, url, originalCode, server.config) }, transformRequest(url, options) { return transformRequest(url, server, options) diff --git a/packages/vite/src/node/server/transformRequest.ts b/packages/vite/src/node/server/transformRequest.ts index f3ed0f594f581a..8f962c250f22d9 100644 --- a/packages/vite/src/node/server/transformRequest.ts +++ b/packages/vite/src/node/server/transformRequest.ts @@ -16,7 +16,6 @@ import { timeFrom } from '../utils' import { checkPublicFile } from '../plugins/asset' -import { ssrTransform } from '../ssr/ssrTransform' import { getDepsOptimizer } from '../optimizer' import { injectSourcesContent } from './sourcemap' import { isFileServingAllowed } from './middlewares/static' @@ -259,13 +258,7 @@ async function loadAndTransform( } const result = ssr - ? await ssrTransform( - code, - map as SourceMap, - url, - originalCode, - server.config - ) + ? await server.ssrTransform(code, map as SourceMap, url, originalCode) : ({ code, map,