Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: use server.ssrTransform #9769

Merged
merged 1 commit into from Aug 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions packages/vite/src/node/server/index.ts
Expand Up @@ -220,7 +220,8 @@ export interface ViteDevServer {
ssrTransform(
code: string,
inMap: SourceMap | null,
url: string
url: string,
originalCode?: string
): Promise<TransformResult | null>
/**
* Load a given URL as an instantiated module for SSR.
Expand Down Expand Up @@ -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)
Expand Down
9 changes: 1 addition & 8 deletions packages/vite/src/node/server/transformRequest.ts
Expand Up @@ -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'
Expand Down Expand Up @@ -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,
Expand Down