Skip to content

Commit 12aaa58

Browse files
authored
fix: respect top-level server.preTransformRequests (#19272)
1 parent 7e6364d commit 12aaa58

File tree

2 files changed

+99
-1
lines changed

2 files changed

+99
-1
lines changed

packages/vite/src/node/__tests__/config.spec.ts

+94
Original file line numberDiff line numberDiff line change
@@ -513,3 +513,97 @@ test('config compat 3', async () => {
513513
]
514514
`)
515515
})
516+
517+
test('preTransformRequests', async () => {
518+
async function testConfig(inlineConfig: InlineConfig) {
519+
return Object.fromEntries(
520+
Object.entries(
521+
(await resolveConfig(inlineConfig, 'serve')).environments,
522+
).map(([name, e]) => [name, e.dev.preTransformRequests]),
523+
)
524+
}
525+
526+
expect(
527+
await testConfig({
528+
environments: {
529+
custom: {},
530+
customTrue: {
531+
dev: {
532+
preTransformRequests: true,
533+
},
534+
},
535+
customFalse: {
536+
dev: {
537+
preTransformRequests: false,
538+
},
539+
},
540+
},
541+
}),
542+
).toMatchInlineSnapshot(`
543+
{
544+
"client": true,
545+
"custom": false,
546+
"customFalse": false,
547+
"customTrue": true,
548+
"ssr": false,
549+
}
550+
`)
551+
552+
expect(
553+
await testConfig({
554+
server: {
555+
preTransformRequests: true,
556+
},
557+
environments: {
558+
custom: {},
559+
customTrue: {
560+
dev: {
561+
preTransformRequests: true,
562+
},
563+
},
564+
customFalse: {
565+
dev: {
566+
preTransformRequests: false,
567+
},
568+
},
569+
},
570+
}),
571+
).toMatchInlineSnapshot(`
572+
{
573+
"client": true,
574+
"custom": true,
575+
"customFalse": false,
576+
"customTrue": true,
577+
"ssr": true,
578+
}
579+
`)
580+
581+
expect(
582+
await testConfig({
583+
server: {
584+
preTransformRequests: false,
585+
},
586+
environments: {
587+
custom: {},
588+
customTrue: {
589+
dev: {
590+
preTransformRequests: true,
591+
},
592+
},
593+
customFalse: {
594+
dev: {
595+
preTransformRequests: false,
596+
},
597+
},
598+
},
599+
}),
600+
).toMatchInlineSnapshot(`
601+
{
602+
"client": false,
603+
"custom": false,
604+
"customFalse": false,
605+
"customTrue": true,
606+
"ssr": false,
607+
}
608+
`)
609+
})

packages/vite/src/node/config.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -745,12 +745,13 @@ export function resolveDevEnvironmentOptions(
745745
consumer: 'client' | 'server' | undefined,
746746
// Backward compatibility
747747
skipSsrTransform?: boolean,
748+
preTransformRequest?: boolean,
748749
): ResolvedDevEnvironmentOptions {
749750
const resolved = mergeWithDefaults(
750751
{
751752
...configDefaults.dev,
752753
sourcemapIgnoreList: isInNodeModules,
753-
preTransformRequests: consumer === 'client',
754+
preTransformRequests: preTransformRequest ?? consumer === 'client',
754755
createEnvironment:
755756
environmentName === 'client'
756757
? defaultCreateClientDevEnvironment
@@ -782,6 +783,7 @@ function resolveEnvironmentOptions(
782783
// Backward compatibility
783784
skipSsrTransform?: boolean,
784785
isSsrTargetWebworkerSet?: boolean,
786+
preTransformRequests?: boolean,
785787
): ResolvedEnvironmentOptions {
786788
const isClientEnvironment = environmentName === 'client'
787789
const consumer =
@@ -814,6 +816,7 @@ function resolveEnvironmentOptions(
814816
environmentName,
815817
consumer,
816818
skipSsrTransform,
819+
preTransformRequests,
817820
),
818821
build: resolveBuildEnvironmentOptions(
819822
options.build ?? {},
@@ -1212,6 +1215,7 @@ export async function resolveConfig(
12121215
environmentName,
12131216
config.experimental?.skipSsrTransform,
12141217
config.ssr?.target === 'webworker',
1218+
config.server?.preTransformRequests,
12151219
)
12161220
}
12171221

0 commit comments

Comments
 (0)