Skip to content

fix: fix external: true merging #21164

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
sapphi-red merged 2 commits into from
Dec 1, 2025
Merged

fix: fix external: true merging #21164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d314f41
fix: fix `external: true` merging
hi-ogawa Nov 28, 2025
70d41bb
test: add unit
hi-ogawa Nov 28, 2025
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
9 changes: 6 additions & 3 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 @@ -166,21 +166,24 @@ describe('mergeConfig', () => {
})

test('handles ssr.noExternal', () => {
const baseConfig = {
const baseConfig: UserConfig = {
ssr: {
noExternal: true,
external: true,
},
}

const newConfig = {
const newConfig: UserConfig = {
ssr: {
noExternal: ['foo'],
external: ['bar'],
},
}

const mergedConfig = {
const mergedConfig: UserConfig = {
ssr: {
noExternal: true,
external: true,
},
}

Expand Down
2 changes: 1 addition & 1 deletion packages/vite/src/node/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,7 @@ function mergeConfigRecursively(
merged[key] = [].concat(existing, value)
continue
} else if (
((key === 'noExternal' &&
(((key === 'noExternal' || key === 'external') &&
(rootPath === 'ssr' || rootPath === 'resolve')) ||
(key === 'allowedHosts' && rootPath === 'server')) &&
(existing === true || value === true)
Expand Down
Loading