Skip to content

Commit 1d49874

Browse files
hi-ogawahi-ogawa
authored
fix: respect project resolve.conditions for externals (#9717)
1 parent 65cf4cc commit 1d49874

14 files changed

Lines changed: 207 additions & 64 deletions

File tree

‎packages/vitest/src/node/pool.ts‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,10 @@ export function createPool(ctx: Vitest): ProcessPool {
138138

139139
let execArgv = projectExecArgvs.get(project)
140140
if (!execArgv) {
141+
const conditions = resolveConditions(project)
141142
execArgv = [
142143
...options.execArgv,
144+
...conditions,
143145
...project.config.execArgv,
144146
]
145147
projectExecArgvs.set(project, execArgv)
@@ -236,36 +238,6 @@ export function createPool(ctx: Vitest): ProcessPool {
236238
}
237239

238240
function resolveOptions(ctx: Vitest) {
239-
// in addition to resolve.conditions Vite also adds production/development,
240-
// see: https://github.com/vitejs/vite/blob/af2aa09575229462635b7cbb6d248ca853057ba2/packages/vite/src/node/plugins/resolve.ts#L1056-L1080
241-
const viteMajor = Number(viteVersion.split('.')[0])
242-
243-
const potentialConditions = new Set(viteMajor >= 6
244-
? (ctx.vite.config.ssr.resolve?.conditions ?? [])
245-
: [
246-
'production',
247-
'development',
248-
...ctx.vite.config.resolve.conditions,
249-
])
250-
251-
const conditions = [...potentialConditions]
252-
.filter((condition) => {
253-
if (condition === 'production') {
254-
return ctx.vite.config.isProduction
255-
}
256-
if (condition === 'development') {
257-
return !ctx.vite.config.isProduction
258-
}
259-
return true
260-
})
261-
.map((condition) => {
262-
if (viteMajor >= 6 && condition === 'development|production') {
263-
return ctx.vite.config.isProduction ? 'production' : 'development'
264-
}
265-
return condition
266-
})
267-
.flatMap(c => ['--conditions', c])
268-
269241
// Instead of passing whole process.execArgv to the workers, pick allowed options.
270242
// Some options may crash worker, e.g. --prof, --title. nodejs/node#41103
271243
const execArgv = process.execArgv.filter(
@@ -278,7 +250,6 @@ function resolveOptions(ctx: Vitest) {
278250
const options: PoolProcessOptions = {
279251
execArgv: [
280252
...execArgv,
281-
...conditions,
282253
'--experimental-import-meta-resolve',
283254
// https://github.com/vitest-dev/vitest/issues/8896
284255
...((globalThis as any).Deno || process.versions.pnp ? [] : ['--require', suppressWarningsPath]),
@@ -295,6 +266,39 @@ function resolveOptions(ctx: Vitest) {
295266
return options
296267
}
297268

269+
function resolveConditions(project: TestProject) {
270+
// in addition to resolve.conditions Vite also adds production/development,
271+
// see: https://github.com/vitejs/vite/blob/af2aa09575229462635b7cbb6d248ca853057ba2/packages/vite/src/node/plugins/resolve.ts#L1056-L1080
272+
const viteMajor = Number(viteVersion.split('.')[0])
273+
const viteConfig = project.vite.config
274+
275+
const potentialConditions = new Set(viteMajor >= 6
276+
? (viteConfig.ssr.resolve?.conditions ?? [])
277+
: [
278+
'production',
279+
'development',
280+
...(viteConfig.resolve.conditions ?? []),
281+
])
282+
283+
return [...potentialConditions]
284+
.filter((condition) => {
285+
if (condition === 'production') {
286+
return viteConfig.isProduction
287+
}
288+
if (condition === 'development') {
289+
return !viteConfig.isProduction
290+
}
291+
return true
292+
})
293+
.map((condition) => {
294+
if (viteMajor >= 6 && condition === 'development|production') {
295+
return viteConfig.isProduction ? 'production' : 'development'
296+
}
297+
return condition
298+
})
299+
.flatMap(c => ['--conditions', c])
300+
}
301+
298302
function resolveMaxWorkers(project: TestProject) {
299303
if (project.config.maxWorkers) {
300304
return project.config.maxWorkers

‎pnpm-lock.yaml‎

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/config/deps/test-dep-conditions-indirect/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@vitest/test-dep-conditions-indirect",
2+
"name": "test-dep-conditions-indirect",
33
"type": "module",
44
"private": true,
55
"exports": {

‎test/config/deps/test-dep-conditions/indirect.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import conditionCustom from '@vitest/test-dep-conditions-indirect/custom'
2-
import conditionDevelopment from '@vitest/test-dep-conditions-indirect/development'
3-
import conditionModule from '@vitest/test-dep-conditions-indirect/module'
4-
import conditionNode from '@vitest/test-dep-conditions-indirect/node'
5-
import conditionProductioin from '@vitest/test-dep-conditions-indirect/production'
1+
import conditionCustom from 'test-dep-conditions-indirect/custom'
2+
import conditionDevelopment from 'test-dep-conditions-indirect/development'
3+
import conditionModule from 'test-dep-conditions-indirect/module'
4+
import conditionNode from 'test-dep-conditions-indirect/node'
5+
import conditionProductioin from 'test-dep-conditions-indirect/production'
66

77
export default {
88
conditionCustom,

‎test/config/deps/test-dep-conditions/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@vitest/test-dep-conditions",
2+
"name": "test-dep-conditions",
33
"type": "module",
44
"private": true,
55
"exports": {
@@ -27,6 +27,6 @@
2727
"./indirect": "./indirect.js"
2828
},
2929
"dependencies": {
30-
"@vitest/test-dep-conditions-indirect": "file:../test-dep-conditions-indirect"
30+
"test-dep-conditions-indirect": "file:../test-dep-conditions-indirect"
3131
}
3232
}

‎test/config/fixtures/conditions-projects/project-a/basic.test.js‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import { test, expect } from "vitest";
2+
import conditionCustom from "test-dep-conditions/custom";
3+
import conditionModule from "test-dep-conditions/module";
4+
import conditionNode from "test-dep-conditions/node";
5+
import conditionDevelopment from "test-dep-conditions/development";
6+
import conditionProduction from "test-dep-conditions/production";
7+
import inline from "test-dep-conditions/inline";
8+
import indirect from "test-dep-conditions/indirect";
9+
10+
import { viteVersion } from "vitest/node";
11+
const viteMajor = Number(viteVersion.split(".")[0]);
12+
13+
test("conditions", () => {
14+
expect({
15+
inline,
16+
conditionCustom,
17+
conditionModule,
18+
conditionNode,
19+
conditionDevelopment,
20+
conditionProduction,
21+
indirect,
22+
}).toEqual({
23+
inline: false,
24+
conditionCustom: true,
25+
conditionDevelopment: true,
26+
conditionModule: viteMajor <= 5,
27+
conditionNode: true,
28+
conditionProduction: false,
29+
indirect: {
30+
conditionCustom: true,
31+
conditionDevelopment: true,
32+
conditionModule: viteMajor <= 5 && inline,
33+
conditionNode: true,
34+
conditionProductioin: false,
35+
},
36+
});
37+
});

‎test/config/fixtures/conditions-projects/project-a/vitest.config.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { defaultServerConditions } from "vite";
2+
import { defineConfig } from "vitest/config";
3+
4+
export default defineConfig({
5+
define: {
6+
"import.meta.__IS_INLINE__": "true",
7+
},
8+
ssr: {
9+
resolve: {
10+
conditions: ["custom", ...defaultServerConditions.filter((c) => c !== "module")],
11+
},
12+
},
13+
});

‎test/config/fixtures/conditions-projects/project-b/basic.test.js‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import { test, expect } from "vitest";
2+
import conditionCustom from "test-dep-conditions/custom";
3+
import conditionModule from "test-dep-conditions/module";
4+
import conditionNode from "test-dep-conditions/node";
5+
import conditionDevelopment from "test-dep-conditions/development";
6+
import conditionProduction from "test-dep-conditions/production";
7+
import inline from "test-dep-conditions/inline";
8+
import indirect from "test-dep-conditions/indirect";
9+
10+
import { viteVersion } from "vitest/node";
11+
const viteMajor = Number(viteVersion.split(".")[0]);
12+
13+
test("conditions", () => {
14+
expect({
15+
inline,
16+
conditionCustom,
17+
conditionModule,
18+
conditionNode,
19+
conditionDevelopment,
20+
conditionProduction,
21+
indirect,
22+
}).toEqual({
23+
inline: false,
24+
conditionCustom: false,
25+
conditionDevelopment: true,
26+
conditionModule: viteMajor <= 5,
27+
conditionNode: true,
28+
conditionProduction: false,
29+
indirect: {
30+
conditionCustom: false,
31+
conditionDevelopment: true,
32+
conditionModule: viteMajor <= 5 && inline,
33+
conditionNode: true,
34+
conditionProductioin: false,
35+
},
36+
});
37+
});

‎test/config/fixtures/conditions-projects/project-b/vitest.config.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { defineConfig } from "vitest/config";
2+
3+
export default defineConfig({
4+
define: {
5+
"import.meta.__IS_INLINE__": "true",
6+
},
7+
});

‎test/config/fixtures/conditions-projects/vite.config.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { defineConfig } from "vitest/config";
2+
3+
export default defineConfig({
4+
test: {
5+
projects: ["project-a", "project-b"],
6+
},
7+
});

0 commit comments

Comments
 (0)