Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 41 additions & 1 deletion packages/vite/src/node/__tests__/config.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { InlineConfig, PluginOption } from '..'
import type { UserConfig, UserConfigExport } from '../config'
import { defineConfig, loadConfigFromFile, resolveConfig } from '../config'
import { resolveEnvPrefix } from '../env'
import { mergeConfig } from '../utils'
import { hasBothRollupOptionsAndRolldownOptions, mergeConfig } from '../utils'
import { createLogger } from '../logger'

describe('mergeConfig', () => {
Expand Down Expand Up @@ -560,6 +560,46 @@ describe('mergeConfig', () => {
expect(downOutput.hashCharacters).toBe('base36')
})

test('hasBothRollupOptionsAndRolldownOptions returns false when only rollupOptions is set', () => {
// When mergeConfig is called with only rollupOptions in the override,
// setupRollupOptionCompat creates a proxy where rollupOptions === rolldownOptions.
// hasBothRollupOptionsAndRolldownOptions should return false in this case
// to avoid false positive warnings.
const baseConfig = defineConfig({
build: {}, // Need existing build object for recursive merge to happen
})
const newConfig = defineConfig({
build: {
rollupOptions: {
treeshake: false,
},
},
})
const mergedConfig: UserConfig = mergeConfig(baseConfig, newConfig)

expect(mergedConfig.build!.rollupOptions).toBeDefined()
expect(mergedConfig.build!.rolldownOptions).toBeDefined()
expect(mergedConfig.build!.rollupOptions).toBe(
mergedConfig.build!.rolldownOptions,
)

expect(hasBothRollupOptionsAndRolldownOptions(mergedConfig)).toBe(false)
})

test('hasBothRollupOptionsAndRolldownOptions returns true when both are explicitly set to different values', () => {
const config = defineConfig({
build: {
rollupOptions: {
treeshake: false,
},
rolldownOptions: {
platform: 'neutral',
},
},
})
expect(hasBothRollupOptionsAndRolldownOptions(config)).toBe(true)
})

test('rollupOptions/rolldownOptions.platform', async () => {
const testRollupOptions = await resolveConfig(
{
Expand Down
4 changes: 3 additions & 1 deletion packages/vite/src/node/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,9 @@ export function hasBothRollupOptionsAndRolldownOptions(
if (
opt != null &&
opt.rollupOptions != null &&
opt.rolldownOptions != null
opt.rolldownOptions != null &&
// Check they are not just proxy values created by setupRollupOptionCompat
opt.rollupOptions !== opt.rolldownOptions
) {
return true
}
Expand Down