Skip to content

fix: merge environments.ssr.resolve with root ssr config #18857

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Dec 2, 2024
Merged

fix: merge environments.ssr.resolve with root ssr config #18857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f834627
fix: merge `environments.ssr.resolve` with root `ssr` config
hi-ogawa Dec 2, 2024
746aed7
test: add test
hi-ogawa Dec 2, 2024
0aae189
test: more test
hi-ogawa Dec 2, 2024
e686c7d
fix: merge back client too
hi-ogawa Dec 2, 2024
767a2c1
test: check reverse
hi-ogawa Dec 2, 2024
b820b48
Merge branch 'main' into fix-merge-root-ssr-resvole-with-environment
hi-ogawa Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 122 additions & 0 deletions packages/vite/src/node/__tests__/config.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,3 +359,125 @@ describe('resolveConfig', () => {
await resolveConfig({ root: './inc?ud#s', customLogger: logger }, 'build')
})
})

test('config compat 1', async () => {
const config = await resolveConfig(
{
resolve: {
conditions: ['client1'],
},
ssr: {
resolve: {
conditions: ['ssr1'],
},
},
plugins: [
{
name: 'test',
config() {
return {
environments: {
client: {
resolve: {
conditions: ['client2'],
},
},
ssr: {
resolve: {
conditions: ['ssr2'],
},
},
},
}
},
},
],
},
'serve',
)
expect(config.resolve.conditions).toMatchInlineSnapshot(`
[
"client1",
"client2",
]
`)
expect(config.environments.client.resolve.conditions).toMatchInlineSnapshot(`
[
"client1",
"client2",
]
`)
expect(config.ssr.resolve?.conditions).toMatchInlineSnapshot(`
[
"ssr1",
"ssr2",
]
`)
expect(config.environments.ssr.resolve?.conditions).toMatchInlineSnapshot(`
[
"ssr1",
"ssr2",
]
`)
})

test('config compat 2', async () => {
const config = await resolveConfig(
{
environments: {
client: {
resolve: {
conditions: ['client1'],
},
},
ssr: {
resolve: {
conditions: ['ssr1'],
},
},
},
plugins: [
{
name: 'test',
config() {
return {
resolve: {
conditions: ['client2'],
},
ssr: {
resolve: {
conditions: ['ssr2'],
},
},
}
},
},
],
},
'serve',
)
expect(config.resolve.conditions).toMatchInlineSnapshot(`
[
"client2",
"client1",
]
`)
expect(config.environments.client.resolve.conditions).toMatchInlineSnapshot(`
[
"client2",
"client1",
]
`)
expect(config.ssr.resolve?.conditions).toMatchInlineSnapshot(`
[
"ssr2",
"ssr1",
]
`)
expect(config.environments.ssr.resolve?.conditions).toMatchInlineSnapshot(`
[
"ssr2",
"ssr1",
]
`)
})
22 changes: 15 additions & 7 deletions packages/vite/src/node/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,13 +1083,16 @@ export async function resolveConfig(
configEnvironmentsSsr.optimizeDeps ?? {},
)

configEnvironmentsSsr.resolve ??= {}
configEnvironmentsSsr.resolve.conditions ??= config.ssr?.resolve?.conditions
configEnvironmentsSsr.resolve.externalConditions ??=
config.ssr?.resolve?.externalConditions
configEnvironmentsSsr.resolve.mainFields ??= config.ssr?.resolve?.mainFields
configEnvironmentsSsr.resolve.external ??= config.ssr?.external
configEnvironmentsSsr.resolve.noExternal ??= config.ssr?.noExternal
configEnvironmentsSsr.resolve = mergeConfig(
{
conditions: config.ssr?.resolve?.conditions,
externalConditions: config.ssr?.resolve?.externalConditions,
mainFields: config.ssr?.resolve?.mainFields,
external: config.ssr?.external,
noExternal: config.ssr?.noExternal,
} satisfies EnvironmentResolveOptions,
configEnvironmentsSsr.resolve ?? {},
)
}

if (config.build?.ssrEmitAssets !== undefined) {
Expand Down Expand Up @@ -1146,6 +1149,11 @@ export async function resolveConfig(
config.ssr?.target === 'webworker',
)

// Backward compatibility: merge config.environments.client.resolve back into config.resolve
config.resolve ??= {}
config.resolve.conditions = config.environments.client.resolve?.conditions
config.resolve.mainFields = config.environments.client.resolve?.mainFields

const resolvedDefaultResolve = resolveResolveOptions(config.resolve, logger)

const resolvedEnvironments: Record<string, ResolvedEnvironmentOptions> = {}
Expand Down