Skip to content

Commit b60605c

Browse files
authored
fix(browser): preserve pre-transform request defaults (#10748)
1 parent d758b47 commit b60605c

3 files changed

Lines changed: 62 additions & 2 deletions

File tree

packages/vitest/src/node/plugins/runnerTransform.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ export function ModuleRunnerTransform(): VitePlugin {
8080
else {
8181
environment.dev.moduleRunnerTransform = true
8282
}
83-
environment.dev.preTransformRequests = false
83+
if (name !== 'client' || !browserEnabled) {
84+
environment.dev.preTransformRequests = false
85+
}
8486
environment.keepProcessEnv = true
8587
}
8688
},

packages/vitest/src/node/plugins/server.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export function VitestConfigServer(harness: PluginHarness, globalConfig?: Resolv
1818
handler() {
1919
return {
2020
server: {
21-
preTransformRequests: false,
2221
hmr: false,
2322
open: false,
2423
},
@@ -50,6 +49,9 @@ export function VitestConfigServer(harness: PluginHarness, globalConfig?: Resolv
5049
const server: ServerOptions = {
5150
...api,
5251
}
52+
if (!isBrowserEnabled) {
53+
server.preTransformRequests = false
54+
}
5355

5456
// Always disable the websocket server in middlewareMode
5557
if (!isBrowserEnabled && api.middlewareMode) {

test/e2e/test/config/browser-configs.test.ts

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,62 @@ async function config(options?: TestUserConfig & { $viteConfig?: ViteUserConfig;
5656
return resolvedProjects.filter(p => !p.hidden)
5757
}
5858

59+
async function observePreTransformRequests(options: TestUserConfig = {}) {
60+
let serverPreTransformRequests: unknown = 'unresolved'
61+
let clientPreTransformRequests: unknown = 'unresolved'
62+
const browserEnabled = !!options.browser?.enabled
63+
64+
await config({
65+
...options,
66+
$viteConfig: {
67+
plugins: [
68+
{
69+
name: 'observe-pre-transform-requests',
70+
enforce: 'post',
71+
config: {
72+
order: 'post',
73+
handler(config) {
74+
if (!!config.test?.browser?.enabled === browserEnabled) {
75+
serverPreTransformRequests = config.server?.preTransformRequests
76+
clientPreTransformRequests = config.environments?.client?.dev?.preTransformRequests
77+
}
78+
},
79+
},
80+
},
81+
],
82+
},
83+
})
84+
85+
return {
86+
client: clientPreTransformRequests,
87+
server: serverPreTransformRequests,
88+
}
89+
}
90+
91+
test('does not disable pre-transform requests in browser mode', async () => {
92+
const result = await observePreTransformRequests({
93+
browser: {
94+
enabled: true,
95+
provider: preview(),
96+
instances: [
97+
{ browser: 'chromium' },
98+
],
99+
},
100+
})
101+
102+
expect(result).toEqual({
103+
client: undefined,
104+
server: undefined,
105+
})
106+
})
107+
108+
test('disables pre-transform requests in node mode', async () => {
109+
expect(await observePreTransformRequests()).toEqual({
110+
client: false,
111+
server: false,
112+
})
113+
})
114+
59115
test('assigns names as browsers', async () => {
60116
const projects = await config({
61117
browser: {

0 commit comments

Comments
 (0)
Sponsor
SponsoredKunjungi sekarang
Promo