diff --git a/packages/plugin-legacy/src/index.ts b/packages/plugin-legacy/src/index.ts index 3555d6448cf888..76fc25ac78cbd4 100644 --- a/packages/plugin-legacy/src/index.ts +++ b/packages/plugin-legacy/src/index.ts @@ -234,8 +234,9 @@ function viteLegacyPlugin(options: Options = {}): Plugin[] { if (options.modernTargets) { // Package is ESM only - const { default: browserslistToEsbuild } = - await import('browserslist-to-esbuild') + const { default: browserslistToEsbuild } = await import( + 'browserslist-to-esbuild' + ) config.build.target = browserslistToEsbuild(options.modernTargets) } else { config.build.target = modernTargetsEsbuild @@ -453,15 +454,15 @@ function viteLegacyPlugin(options: Options = {}): Plugin[] { } } - const { rollupOptions } = config.build - const { output } = rollupOptions + const { rolldownOptions } = config.build + const { output } = rolldownOptions if (Array.isArray(output)) { - rollupOptions.output = [ + rolldownOptions.output = [ ...output.map(createLegacyOutput), ...(genModern ? output : []), ] } else { - rollupOptions.output = [ + rolldownOptions.output = [ createLegacyOutput(output), ...(genModern ? [output || {}] : []), ] @@ -858,7 +859,7 @@ async function buildPolyfillChunk( minify, assetsDir, sourcemap, - rollupOptions: { + rolldownOptions: { input: { polyfills: polyfillId, }, diff --git a/packages/vite/src/node/__tests__/build.spec.ts b/packages/vite/src/node/__tests__/build.spec.ts index c45d14ae6a50c1..268424a281860f 100644 --- a/packages/vite/src/node/__tests__/build.spec.ts +++ b/packages/vite/src/node/__tests__/build.spec.ts @@ -216,7 +216,7 @@ describe('build', () => { entry: ['foo.js', 'bar.js'], formats: ['es'], }, - rollupOptions: { + rolldownOptions: { external: 'external', }, write: false, @@ -338,7 +338,7 @@ describe('resolveBuildOutputs', () => { const resolveBuild = () => resolveBuildOutputs(outputs, libOptions, logger) expect(resolveBuild).toThrowError( - /Entries in "build\.rollupOptions\.output" must specify "name"/, + /Entries in "build\.rolldownOptions\.output" must specify "name"/, ) }) @@ -349,7 +349,7 @@ describe('resolveBuildOutputs', () => { const resolveBuild = () => resolveBuildOutputs(outputs, libOptions, logger) expect(resolveBuild).toThrowError( - /Entries in "build\.rollupOptions\.output" must specify "name"/, + /Entries in "build\.rolldownOptions\.output" must specify "name"/, ) }) }) @@ -676,7 +676,7 @@ describe('resolveBuildOutputs', () => { ).toEqual([{ name: 'A' }]) expect(log.warn).toHaveBeenLastCalledWith( colors.yellow( - `"build.lib.formats" will be ignored because "build.rollupOptions.output" is already an array format.`, + `"build.lib.formats" will be ignored because "build.rolldownOptions.output" is already an array format.`, ), ) }) @@ -688,7 +688,7 @@ describe('resolveBuildOutputs', () => { build: { ssr: true, ssrEmitAssets: true, - rollupOptions: { + rolldownOptions: { input: { index: '/entry', }, @@ -716,7 +716,7 @@ describe('resolveBuildOutputs', () => { build: { ssr: true, emitAssets: true, - rollupOptions: { + rolldownOptions: { input: { index: '/entry', }, @@ -746,7 +746,7 @@ describe('resolveBuildOutputs', () => { ssr: { build: { ssr: true, - rollupOptions: { + rolldownOptions: { input: { index: '/entry', }, @@ -767,7 +767,7 @@ describe('resolveBuildOutputs', () => { custom: { build: { ssr: true, - rollupOptions: { + rolldownOptions: { input: { index: '/entry', }, @@ -788,7 +788,7 @@ test('default sharedConfigBuild true on build api', async () => { logLevel: 'warn', build: { ssr: true, - rollupOptions: { + rolldownOptions: { input: { index: '/entry', }, @@ -817,7 +817,7 @@ test.for([true, false])( client: { build: { outDir: './dist/client', - rollupOptions: { + rolldownOptions: { input: '/entry.js', }, }, @@ -825,7 +825,7 @@ test.for([true, false])( ssr: { build: { outDir: './dist/server', - rollupOptions: { + rolldownOptions: { input: '/entry.js', }, }, @@ -834,7 +834,7 @@ test.for([true, false])( build: { minify: true, outDir: './dist/custom1', - rollupOptions: { + rolldownOptions: { input: '/entry.js', }, }, @@ -843,7 +843,7 @@ test.for([true, false])( build: { minify: false, outDir: './dist/custom2', - rollupOptions: { + rolldownOptions: { input: '/entry.js', }, }, @@ -876,7 +876,7 @@ test('sharedConfigBuild and emitAssets', async () => { build: { outDir: './dist/client', emitAssets: true, - rollupOptions: { + rolldownOptions: { input: '/entry.js', }, }, @@ -885,7 +885,7 @@ test('sharedConfigBuild and emitAssets', async () => { build: { outDir: './dist/ssr', emitAssets: true, - rollupOptions: { + rolldownOptions: { input: '/entry.js', }, }, @@ -894,7 +894,7 @@ test('sharedConfigBuild and emitAssets', async () => { build: { outDir: './dist/custom', emitAssets: true, - rollupOptions: { + rolldownOptions: { input: '/entry.js', }, }, @@ -937,7 +937,7 @@ test.skip('adjust worker build error for worker.format', async () => { await build({ root: resolve(__dirname, 'fixtures/worker-dynamic'), build: { - rollupOptions: { + rolldownOptions: { input: { index: '/main.js', }, @@ -968,7 +968,7 @@ describe('onRollupLog', () => { logLevel: 'info', build: { write: false, - rollupOptions: { + rolldownOptions: { ...options, logLevel: 'debug', }, @@ -1115,7 +1115,7 @@ test('watch rebuild manifest', async (ctx) => { environments: { client: { build: { - rollupOptions: { + rolldownOptions: { input: '/entry.js', }, }, diff --git a/packages/vite/src/node/__tests__/config.spec.ts b/packages/vite/src/node/__tests__/config.spec.ts index d886a35053ff33..7d643d37076f28 100644 --- a/packages/vite/src/node/__tests__/config.spec.ts +++ b/packages/vite/src/node/__tests__/config.spec.ts @@ -313,26 +313,26 @@ describe('mergeConfig', () => { ).toThrowError('Cannot merge config in form of callback') }) - test('handles `rollupOptions`', () => { + test('handles `rolldownOptions`', () => { const baseConfig = defineConfig({ build: { - rollupOptions: { + rolldownOptions: { treeshake: false, }, }, worker: { - rollupOptions: { + rolldownOptions: { treeshake: false, }, }, optimizeDeps: { - rollupOptions: { + rolldownOptions: { treeshake: false, }, }, ssr: { optimizeDeps: { - rollupOptions: { + rolldownOptions: { treeshake: false, }, }, @@ -341,21 +341,21 @@ describe('mergeConfig', () => { const newConfig = defineConfig({ build: { - rollupOptions: { + rolldownOptions: { output: { minifyInternalExports: true, }, }, }, worker: { - rollupOptions: { + rolldownOptions: { output: { minifyInternalExports: true, }, }, }, optimizeDeps: { - rollupOptions: { + rolldownOptions: { output: { minifyInternalExports: true, }, @@ -363,7 +363,7 @@ describe('mergeConfig', () => { }, ssr: { optimizeDeps: { - rollupOptions: { + rolldownOptions: { output: { minifyInternalExports: true, }, diff --git a/packages/vite/src/node/__tests__/dev.spec.ts b/packages/vite/src/node/__tests__/dev.spec.ts index 8cc6f16b304bb1..9b633100d923a0 100644 --- a/packages/vite/src/node/__tests__/dev.spec.ts +++ b/packages/vite/src/node/__tests__/dev.spec.ts @@ -5,7 +5,7 @@ import type { ViteDevServer } from '..' import { promiseWithResolvers } from '../../shared/utils' describe('resolveBuildEnvironmentOptions in dev', () => { - test('build.rollupOptions should not have input in lib', async () => { + test('build.rolldownOptions should not have input in lib', async () => { const config = await resolveConfig( { build: { @@ -17,7 +17,7 @@ describe('resolveBuildEnvironmentOptions in dev', () => { 'serve', ) - expect(config.build.rollupOptions).not.toHaveProperty('input') + expect(config.build.rolldownOptions).not.toHaveProperty('input') }) }) diff --git a/packages/vite/src/node/__tests__/environment.spec.ts b/packages/vite/src/node/__tests__/environment.spec.ts index 0d0bc70d8d6c69..9e0aa485b5cc6c 100644 --- a/packages/vite/src/node/__tests__/environment.spec.ts +++ b/packages/vite/src/node/__tests__/environment.spec.ts @@ -33,7 +33,7 @@ describe('custom environment conditions', () => { import.meta.dirname, 'fixtures/test-dep-conditions/dist/ssr', ), - rollupOptions: { + rolldownOptions: { input: { index: '@vitejs/test-dep-conditions' }, }, }, @@ -50,7 +50,7 @@ describe('custom environment conditions', () => { import.meta.dirname, 'fixtures/test-dep-conditions/dist/worker', ), - rollupOptions: { + rolldownOptions: { input: { index: '@vitejs/test-dep-conditions' }, }, }, @@ -67,7 +67,7 @@ describe('custom environment conditions', () => { import.meta.dirname, 'fixtures/test-dep-conditions/dist/custom1', ), - rollupOptions: { + rolldownOptions: { input: { index: '@vitejs/test-dep-conditions' }, }, }, @@ -84,7 +84,7 @@ describe('custom environment conditions', () => { import.meta.dirname, 'fixtures/test-dep-conditions/dist/custom1_2', ), - rollupOptions: { + rolldownOptions: { input: { index: '@vitejs/test-dep-conditions' }, }, }, diff --git a/packages/vite/src/node/__tests__/plugins/index.spec.ts b/packages/vite/src/node/__tests__/plugins/index.spec.ts index b682c8be7dda37..14aa568548e7a8 100644 --- a/packages/vite/src/node/__tests__/plugins/index.spec.ts +++ b/packages/vite/src/node/__tests__/plugins/index.spec.ts @@ -9,7 +9,7 @@ const getConfigWithPlugin = ( configFile: false, server: { middlewareMode: true, ws: false }, optimizeDeps: { noDiscovery: true, include: [] }, - build: { rollupOptions: { input }, write: false }, + build: { rolldownOptions: { input }, write: false }, plugins, logLevel: 'silent', } diff --git a/packages/vite/src/node/__tests__/plugins/modulePreloadPolyfill/modulePreloadPolyfill.spec.ts b/packages/vite/src/node/__tests__/plugins/modulePreloadPolyfill/modulePreloadPolyfill.spec.ts index 6eb0c1598b113d..feafe4849f3914 100644 --- a/packages/vite/src/node/__tests__/plugins/modulePreloadPolyfill/modulePreloadPolyfill.spec.ts +++ b/packages/vite/src/node/__tests__/plugins/modulePreloadPolyfill/modulePreloadPolyfill.spec.ts @@ -8,7 +8,7 @@ const buildProject = ({ format = 'es' as ModuleFormat } = {}) => logLevel: 'silent', build: { write: false, - rollupOptions: { + rolldownOptions: { input: 'main.js', output: { format, diff --git a/packages/vite/src/node/__tests__/resolve.spec.ts b/packages/vite/src/node/__tests__/resolve.spec.ts index 4c5465b00833ef..e4a377cf831d81 100644 --- a/packages/vite/src/node/__tests__/resolve.spec.ts +++ b/packages/vite/src/node/__tests__/resolve.spec.ts @@ -285,7 +285,7 @@ describe('file url', () => { build: { ssr: true, outDir: 'dist/basic', - rollupOptions: { + rolldownOptions: { input: { index: fileUrl.href }, }, }, @@ -300,7 +300,7 @@ describe('file url', () => { build: { ssr: true, outDir: 'dist/virtual', - rollupOptions: { + rolldownOptions: { input: { index: 'virtual:test-dep/static' }, }, }, diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index 372de581d98db2..9d9927fd6a89e7 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -256,7 +256,7 @@ export interface BuildEnvironmentOptions { lib?: LibraryOptions | false /** * Produce SSR oriented build. Note this requires specifying SSR entry via - * `rollupOptions.input`. + * `rolldownOptions.input`. * @default false */ ssr?: boolean | string @@ -509,7 +509,7 @@ export async function resolveBuildPlugins(config: ResolvedConfig): Promise<{ async (environment) => ( await asyncFlatten( - arraify(environment.config.build.rollupOptions.plugins), + arraify(environment.config.build.rolldownOptions.plugins), ) ).filter(Boolean) as Plugin[], ), @@ -573,7 +573,7 @@ function resolveRolldownOptions( const resolve = (p: string) => path.resolve(root, p) const input = libOptions - ? options.rollupOptions.input || + ? options.rolldownOptions.input || (typeof libOptions.entry === 'string' ? resolve(libOptions.entry) : Array.isArray(libOptions.entry) @@ -586,11 +586,11 @@ function resolveRolldownOptions( )) : typeof options.ssr === 'string' ? resolve(options.ssr) - : options.rollupOptions.input || resolve('index.html') + : options.rolldownOptions.input || resolve('index.html') if (ssr && typeof input === 'string' && input.endsWith('.html')) { throw new Error( - `rollupOptions.input should not be an html file when building for SSR. ` + + `rolldownOptions.input should not be an html file when building for SSR. ` + `Please specify a dedicated SSR entry.`, ) } @@ -603,7 +603,7 @@ function resolveRolldownOptions( : Object.values(input) if (inputs.some((input) => input.endsWith('.css'))) { throw new Error( - `When "build.cssCodeSplit: false" is set, "rollupOptions.input" should not include CSS files.`, + `When "build.cssCodeSplit: false" is set, "rolldownOptions.input" should not include CSS files.`, ) } } @@ -615,48 +615,48 @@ function resolveRolldownOptions( injectEnvironmentToHooks(environment, chunkMetadataMap, p), ) - const rollupOptions: RolldownOptions = { + const rolldownOptions: RolldownOptions = { preserveEntrySignatures: ssr ? 'allow-extension' : libOptions ? 'strict' : false, // cache: options.watch ? undefined : false, - ...options.rollupOptions, - output: options.rollupOptions.output, + ...options.rolldownOptions, + output: options.rolldownOptions.output, input, plugins, - external: options.rollupOptions.external, + external: options.rolldownOptions.external, onLog(level, log) { onRollupLog(level, log, environment) }, transform: { target: options.target === false ? undefined : options.target, - ...options.rollupOptions.transform, + ...options.rolldownOptions.transform, define: { - ...options.rollupOptions.transform?.define, + ...options.rolldownOptions.transform?.define, // disable builtin process.env.NODE_ENV replacement as it is handled by the define plugin 'process.env.NODE_ENV': 'process.env.NODE_ENV', }, }, // TODO: remove this and enable rolldown's CSS support later moduleTypes: { - ...options.rollupOptions.moduleTypes, + ...options.rolldownOptions.moduleTypes, '.css': 'js', }, experimental: { - ...options.rollupOptions.experimental, + ...options.rolldownOptions.experimental, viteMode: true, }, optimization: { inlineConst: - typeof options.rollupOptions.optimization?.inlineConst === 'boolean' - ? options.rollupOptions.optimization.inlineConst + typeof options.rolldownOptions.optimization?.inlineConst === 'boolean' + ? options.rolldownOptions.optimization.inlineConst : { mode: 'smart', - ...options.rollupOptions.optimization?.inlineConst, + ...options.rolldownOptions.optimization?.inlineConst, }, - ...options.rollupOptions.optimization, + ...options.rolldownOptions.optimization, }, } @@ -668,21 +668,21 @@ function resolveRolldownOptions( // @ts-expect-error See https://github.com/vitejs/vite/issues/5812#issuecomment-984345618 if (output.output) { logger.warn( - `You've set "rollupOptions.output.output" in your config. ` + + `You've set "rolldownOptions.output.output" in your config. ` + `This is deprecated and will override all Vite.js default output options. ` + - `Please use "rollupOptions.output" instead.`, + `Please use "rolldownOptions.output" instead.`, ) } if (output.file) { throw new Error( - `Vite does not support "rollupOptions.output.file". ` + - `Please use "rollupOptions.output.dir" and "rollupOptions.output.entryFileNames" instead.`, + `Vite does not support "rolldownOptions.output.file". ` + + `Please use "rolldownOptions.output.dir" and "rolldownOptions.output.entryFileNames" instead.`, ) } if (output.sourcemap) { logger.warnOnce( colors.yellow( - `Vite does not support "rollupOptions.output.sourcemap". ` + + `Vite does not support "rolldownOptions.output.sourcemap". ` + `Please use "build.sourcemap" instead.`, ), ) @@ -756,18 +756,18 @@ function resolveRolldownOptions( // resolve lib mode outputs const outputs = resolveBuildOutputs( - options.rollupOptions.output, + options.rolldownOptions.output, libOptions, logger, ) if (Array.isArray(outputs)) { - rollupOptions.output = outputs.map(buildOutputOptions) + rolldownOptions.output = outputs.map(buildOutputOptions) } else { - rollupOptions.output = buildOutputOptions(outputs) + rolldownOptions.output = buildOutputOptions(outputs) } - return rollupOptions + return rolldownOptions } /** @@ -791,7 +791,10 @@ async function buildEnvironment( let startTime: number | undefined try { const chunkMetadataMap = new ChunkMetadataMap() - const rollupOptions = resolveRolldownOptions(environment, chunkMetadataMap) + const rolldownOptions = resolveRolldownOptions( + environment, + chunkMetadataMap, + ) // watch file changes with rollup if (options.watch) { @@ -800,7 +803,7 @@ async function buildEnvironment( const resolvedOutDirs = getResolvedOutDirs( root, options.outDir, - options.rollupOptions.output, + options.rolldownOptions.output, ) const emptyOutDir = resolveEmptyOutDir( options.emptyOutDir, @@ -811,7 +814,7 @@ async function buildEnvironment( const resolvedChokidarOptions = resolveChokidarOptions( { // @ts-expect-error chokidar option does not exist in rolldown but used for backward compat - ...(rollupOptions.watch || {}).chokidar, + ...(rolldownOptions.watch || {}).chokidar, // @ts-expect-error chokidar option does not exist in rolldown but used for backward compat ...options.watch.chokidar, }, @@ -822,9 +825,9 @@ async function buildEnvironment( const { watch } = await import('rolldown') const watcher = watch({ - ...rollupOptions, + ...rolldownOptions, watch: { - ...rollupOptions.watch, + ...rolldownOptions.watch, ...options.watch, notify: convertToNotifyOptions(resolvedChokidarOptions), }, @@ -851,10 +854,10 @@ async function buildEnvironment( // write or generate files with rolldown const { rolldown } = await import('rolldown') startTime = Date.now() - bundle = await rolldown(rollupOptions) + bundle = await rolldown(rolldownOptions) const res: RolldownOutput[] = [] - for (const output of arraify(rollupOptions.output!)) { + for (const output of arraify(rolldownOptions.output!)) { res.push(await bundle[options.write ? 'write' : 'generate'](output)) } for (const output of res) { @@ -867,7 +870,7 @@ async function buildEnvironment( logger.info( `${colors.green(`✓ built in ${displayTime(Date.now() - startTime)}`)}`, ) - return Array.isArray(rollupOptions.output) ? res : res[0] + return Array.isArray(rolldownOptions.output) ? res : res[0] } catch (e) { enhanceRollupError(e) clearLine() @@ -1023,7 +1026,7 @@ export function resolveBuildOutputs( if (libOptions.formats) { logger.warn( colors.yellow( - '"build.lib.formats" will be ignored because "build.rollupOptions.output" is already an array format.', + '"build.lib.formats" will be ignored because "build.rolldownOptions.output" is already an array format.', ), ) } @@ -1034,7 +1037,7 @@ export function resolveBuildOutputs( !output.name ) { throw new Error( - 'Entries in "build.rollupOptions.output" must specify "name" when the format is "umd" or "iife".', + 'Entries in "build.rolldownOptions.output" must specify "name" when the format is "umd" or "iife".', ) } }) @@ -1076,7 +1079,7 @@ export function onRollupLog( `[vite]: Rolldown failed to resolve import "${exporter}" from "${id}".\n` + `This is most likely unintended because it can break your application at runtime.\n` + `If you do want to externalize this module explicitly add it to\n` + - `\`build.rollupOptions.external\``, + `\`build.rolldownOptions.external\``, ) } } @@ -1124,8 +1127,8 @@ export function onRollupLog( } clearLine() - const userOnLog = environment.config.build.rollupOptions?.onLog - const userOnWarn = environment.config.build.rollupOptions?.onwarn + const userOnLog = environment.config.build.rolldownOptions?.onLog + const userOnWarn = environment.config.build.rolldownOptions?.onwarn if (userOnLog) { if (userOnWarn) { const normalizedUserOnWarn = normalizeUserOnWarn(userOnWarn, viteLog) diff --git a/packages/vite/src/node/cli.ts b/packages/vite/src/node/cli.ts index ecfd3bc75da267..8f701540c63ecb 100644 --- a/packages/vite/src/node/cli.ts +++ b/packages/vite/src/node/cli.ts @@ -309,8 +309,8 @@ cli ) .option( '--minify [minifier]', - `[boolean | "terser" | "esbuild"] enable/disable minification, ` + - `or specify minifier to use (default: esbuild)`, + `[boolean | "terser" | "oxc" | "esbuild"] enable/disable minification, ` + + `or specify minifier to use (default: oxc)`, ) .option('--manifest [name]', `[boolean | string] emit build manifest json`) .option('--ssrManifest [name]', `[boolean | string] emit ssr manifest json`) diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index c23f4bd996503c..ec171e9da15625 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -790,7 +790,7 @@ const configDefaults = Object.freeze({ worker: { format: 'iife', plugins: (): never[] => [], - // rollupOptions + // rolldownOptions }, optimizeDeps: { include: [], @@ -1737,8 +1737,8 @@ export async function resolveConfig( } = { format: config.worker?.format || 'iife', plugins: createWorkerPlugins, - rollupOptions: config.worker?.rollupOptions || {}, - rolldownOptions: config.worker?.rolldownOptions, // will be set by setupRollupOptionCompat if undefined + rolldownOptions: config.worker?.rolldownOptions || {}, + rollupOptions: config.worker?.rollupOptions, // will be set by setupRollupOptionCompat if undefined } setupRollupOptionCompat(resolvedWorkerOptions, 'worker') @@ -1986,7 +1986,7 @@ export async function resolveConfig( // Check if all assetFileNames have the same reference. // If not, display a warn for user. - const outputOption = config.build?.rollupOptions?.output ?? [] + const outputOption = config.build?.rolldownOptions?.output ?? [] // Use isArray to narrow its type to array if (Array.isArray(outputOption)) { const assetFileNamesList = outputOption.map( @@ -2000,7 +2000,7 @@ export async function resolveConfig( if (hasDifferentReference) { resolved.logger.warn( colors.yellow(` -assetFileNames isn't equal for every build.rollupOptions.output. A single pattern across all outputs is supported by Vite. +assetFileNames isn't equal for every build.rolldownOptions.output. A single pattern across all outputs is supported by Vite. `), ) } diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts index 9dbb835c069f5f..eaf01bfec6a28d 100644 --- a/packages/vite/src/node/optimizer/index.ts +++ b/packages/vite/src/node/optimizer/index.ts @@ -168,7 +168,7 @@ export interface DepOptimizationConfig { export type DepOptimizationOptions = DepOptimizationConfig & { /** * By default, Vite will crawl your `index.html` to detect dependencies that - * need to be pre-bundled. If `build.rollupOptions.input` is specified, Vite + * need to be pre-bundled. If `build.rolldownOptions.input` is specified, Vite * will crawl those entry points instead. * * If neither of these fit your needs, you can specify custom entries using diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts index 59df4e909fb413..238152d22a53b5 100644 --- a/packages/vite/src/node/optimizer/scan.ts +++ b/packages/vite/src/node/optimizer/scan.ts @@ -130,7 +130,7 @@ export function scanImports(environment: ScanEnvironment): { if (!config.optimizeDeps.entries && !config.optimizeDeps.include) { environment.logger.warn( colors.yellow( - '(!) Could not auto-determine entry point from rollupOptions or html files ' + + '(!) Could not auto-determine entry point from rolldownOptions or html files ' + 'and there are no explicit optimizeDeps.include patterns. ' + 'Skipping dependency pre-bundling.', ), @@ -195,7 +195,7 @@ async function computeEntries(environment: ScanEnvironment) { let entries: string[] = [] const explicitEntryPatterns = environment.config.optimizeDeps.entries - const buildInput = environment.config.build.rollupOptions.input + const buildInput = environment.config.build.rolldownOptions.input if (explicitEntryPatterns) { entries = await globEntries(explicitEntryPatterns, environment) @@ -214,7 +214,7 @@ async function computeEntries(environment: ScanEnvironment) { )?.id if (id === undefined) { throw new Error( - `failed to resolve rollupOptions.input value: ${JSON.stringify(p)}.`, + `failed to resolve rolldownOptions.input value: ${JSON.stringify(p)}.`, ) } return id @@ -226,7 +226,7 @@ async function computeEntries(environment: ScanEnvironment) { } else if (isObject(buildInput)) { entries = await Promise.all(Object.values(buildInput).map(resolvePath)) } else { - throw new Error('invalid rollupOptions.input value.') + throw new Error('invalid rolldownOptions.input value.') } } else { entries = await globEntries('**/*.html', environment) diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 3f321fd551d5b1..2d650c783073c3 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -401,9 +401,9 @@ export function cssPlugin(config: ResolvedConfig): Plugin { return [url, resolved] } if (config.command === 'build') { - const isExternal = config.build.rollupOptions.external + const isExternal = config.build.rolldownOptions.external ? resolveUserExternal( - config.build.rollupOptions.external, + config.build.rolldownOptions.external, decodedUrl, // use URL as id since id could not be resolved id, false, @@ -467,11 +467,11 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin { let hasEmitted = false let chunkCSSMap: Map - const rollupOptionsOutput = config.build.rollupOptions.output + const rolldownOptionsOutput = config.build.rolldownOptions.output const assetFileNames = ( - Array.isArray(rollupOptionsOutput) - ? rollupOptionsOutput[0] - : rollupOptionsOutput + Array.isArray(rolldownOptionsOutput) + ? rolldownOptionsOutput[0] + : rolldownOptionsOutput )?.assetFileNames const getCssAssetDirname = (cssAssetName: string) => { const cssAssetNameDir = path.dirname(cssAssetName) diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts index 02305b45387c38..4ae35ba746819a 100644 --- a/packages/vite/src/node/plugins/html.ts +++ b/packages/vite/src/node/plugins/html.ts @@ -444,7 +444,9 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin { // for each encountered asset url, rewrite original html so that it // references the post-build location, ignoring empty attributes and // attributes that directly reference named output. - const namedOutput = Object.keys(config.build.rollupOptions.input || {}) + const namedOutput = Object.keys( + config.build.rolldownOptions.input || {}, + ) const processAssetUrl = async (url: string, shouldInline?: boolean) => { if ( url !== '' && // Empty attribute diff --git a/packages/vite/src/node/plugins/manifest.ts b/packages/vite/src/node/plugins/manifest.ts index 59a23d99dd8ed6..c34914044dcc19 100644 --- a/packages/vite/src/node/plugins/manifest.ts +++ b/packages/vite/src/node/plugins/manifest.ts @@ -294,7 +294,7 @@ export function manifestPlugin(config: ResolvedConfig): Plugin { } state.outputCount++ - const output = buildOptions.rollupOptions.output + const output = buildOptions.rolldownOptions.output const outputLength = Array.isArray(output) ? output.length : 1 if (state.outputCount >= outputLength) { this.emitFile({ diff --git a/packages/vite/src/node/plugins/prepareOutDir.ts b/packages/vite/src/node/plugins/prepareOutDir.ts index 9ee4b3c4b9419c..f03bf4d5dc48eb 100644 --- a/packages/vite/src/node/plugins/prepareOutDir.ts +++ b/packages/vite/src/node/plugins/prepareOutDir.ts @@ -28,7 +28,7 @@ export function prepareOutDirPlugin(): Plugin { const resolvedOutDirs = getResolvedOutDirs( root, options.outDir, - options.rollupOptions.output, + options.rolldownOptions.output, ) const emptyOutDir = resolveEmptyOutDir( options.emptyOutDir, diff --git a/packages/vite/src/node/plugins/reporter.ts b/packages/vite/src/node/plugins/reporter.ts index f5ba407619ff24..75ea1a8a81af6f 100644 --- a/packages/vite/src/node/plugins/reporter.ts +++ b/packages/vite/src/node/plugins/reporter.ts @@ -284,7 +284,7 @@ export function buildReporterPlugin(config: ResolvedConfig): Plugin { colors.yellow( `\n(!) Some chunks are larger than ${chunkLimit} kB after minification. Consider:\n` + `- Using dynamic import() to code-split the application\n` + - `- Use build.rollupOptions.output.manualChunks to improve chunking: https://rollupjs.org/configuration-options/#output-manualchunks\n` + + `- Use build.rolldownOptions.output.advancedChunks to improve chunking: https://rolldown.rs/options/output-advanced-chunks\n` + `- Adjust chunk size limit for this warning via build.chunkSizeWarningLimit.`, ), ) diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts index e311b93fd27168..48592181b9d4a6 100644 --- a/packages/vite/src/node/plugins/worker.ts +++ b/packages/vite/src/node/plugins/worker.ts @@ -183,14 +183,14 @@ async function bundleWorkerEntry( // bundle the file as entry to support imports const { rolldown } = await import('rolldown') - const { plugins, rollupOptions, format } = config.worker + const { plugins, rolldownOptions, format } = config.worker const workerConfig = await plugins(newBundleChain) const workerEnvironment = new BuildEnvironment('client', workerConfig) // TODO: should this be 'worker'? await workerEnvironment.init() const chunkMetadataMap = new ChunkMetadataMap() const bundle = await rolldown({ - ...rollupOptions, + ...rolldownOptions, input, plugins: workerEnvironment.plugins.map((p) => injectEnvironmentToHooks(workerEnvironment, chunkMetadataMap, p), @@ -201,14 +201,14 @@ async function bundleWorkerEntry( // TODO: remove this and enable rolldown's CSS support later moduleTypes: { '.css': 'js', - ...rollupOptions.moduleTypes, + ...rolldownOptions.moduleTypes, }, preserveEntrySignatures: false, }) let result: RolldownOutput let watchedFiles: string[] | undefined try { - const workerOutputConfig = config.worker.rollupOptions.output + const workerOutputConfig = config.worker.rolldownOptions.output const workerConfig = workerOutputConfig ? Array.isArray(workerOutputConfig) ? workerOutputConfig[0] || {} diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index 06a8ff27773cd0..b2bbf406346e4f 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -469,7 +469,7 @@ export async function _createServer( const resolvedOutDirs = getResolvedOutDirs( config.root, config.build.outDir, - config.build.rollupOptions.output, + config.build.rolldownOptions.output, ) const emptyOutDir = resolveEmptyOutDir( config.build.emptyOutDir, diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts index f653a00b8811f7..7344d5f27fce66 100644 --- a/packages/vite/src/node/server/pluginContainer.ts +++ b/packages/vite/src/node/server/pluginContainer.ts @@ -161,7 +161,7 @@ export async function createEnvironmentPluginContainer< watcher, autoStart, ) - await container.resolveRollupOptions() + await container.resolveRolldownOptions() return container } @@ -174,7 +174,7 @@ export type SkipInformation = { class EnvironmentPluginContainer { private _pluginContextMap = new Map() - private _resolvedRollupOptions?: InputOptions + private _resolvedRolldownOptions?: InputOptions private _processesing = new Set>() private _seenResolves: Record = {} @@ -273,12 +273,12 @@ class EnvironmentPluginContainer { } get options(): InputOptions { - return this._resolvedRollupOptions! + return this._resolvedRolldownOptions! } - async resolveRollupOptions(): Promise { - if (!this._resolvedRollupOptions) { - let options = this.environment.config.build.rollupOptions + async resolveRolldownOptions(): Promise { + if (!this._resolvedRolldownOptions) { + let options = this.environment.config.build.rolldownOptions for (const optionsHook of this.getSortedPluginHooks('options')) { if (this._closed) { throwClosedServerError() @@ -288,9 +288,9 @@ class EnvironmentPluginContainer { optionsHook.call(this.minimalContext, options), )) || options } - this._resolvedRollupOptions = options + this._resolvedRolldownOptions = options } - return this._resolvedRollupOptions + return this._resolvedRolldownOptions } private _getPluginContext(plugin: Plugin) { diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts index 5aafdb29dcd9e5..8ca0df38a8377d 100644 --- a/packages/vite/src/node/utils.ts +++ b/packages/vite/src/node/utils.ts @@ -1238,7 +1238,7 @@ const rollupOptionsDeprecationCall = (() => { const method = process.env.VITE_DEPRECATION_TRACE ? 'trace' : 'warn' // eslint-disable-next-line no-console console[method]( - '`optimizeDeps.rollupOptions` / `ssr.optimizeDeps.rollupOptions` is deprecated. ' + + '`optimizeDeps.rolldownOptions` / `ssr.optimizeDeps.rollupOptions` is deprecated. ' + 'Use `optimizeDeps.rolldownOptions` instead. Note that this option may be set by a plugin. ' + (method === 'trace' ? 'Showing trace because VITE_DEPRECATION_TRACE is set.' diff --git a/playground/assets/vite.config-encoded-base.js b/playground/assets/vite.config-encoded-base.js index 70e86eeb90eb37..9a9cc37a1b1831 100644 --- a/playground/assets/vite.config-encoded-base.js +++ b/playground/assets/vite.config-encoded-base.js @@ -18,7 +18,7 @@ export default defineConfig({ watch: null, minify: false, assetsInlineLimit: 0, - rollupOptions: { + rolldownOptions: { output: { entryFileNames: 'entries/[name].js', chunkFileNames: 'chunks/[name]-[hash].js', diff --git a/playground/assets/vite.config-relative-base.js b/playground/assets/vite.config-relative-base.js index dabaedb26136b3..e0b2b2d03e7d0e 100644 --- a/playground/assets/vite.config-relative-base.js +++ b/playground/assets/vite.config-relative-base.js @@ -10,7 +10,7 @@ export default defineConfig(({ isPreview }) => ({ watch: null, minify: false, assetsInlineLimit: 0, - rollupOptions: { + rolldownOptions: { output: { entryFileNames: 'entries/[name].js', chunkFileNames: 'chunks/[name]-[hash].js', diff --git a/playground/assets/vite.config-runtime-base.js b/playground/assets/vite.config-runtime-base.js index 5113ccebc68c3d..8fbed84bcdb860 100644 --- a/playground/assets/vite.config-runtime-base.js +++ b/playground/assets/vite.config-runtime-base.js @@ -15,7 +15,7 @@ export default defineConfig({ watch: null, minify: false, assetsInlineLimit: 0, - rollupOptions: { + rolldownOptions: { output: { entryFileNames: 'entries/[name].js', chunkFileNames: 'chunks/[name]-[hash].js', diff --git a/playground/assets/vite.config-url-base.js b/playground/assets/vite.config-url-base.js index 14d24feae4298d..93f905f6abceb2 100644 --- a/playground/assets/vite.config-url-base.js +++ b/playground/assets/vite.config-url-base.js @@ -17,7 +17,7 @@ export default defineConfig({ watch: null, minify: false, assetsInlineLimit: 0, - rollupOptions: { + rolldownOptions: { output: { entryFileNames: 'entries/[name].js', chunkFileNames: 'chunks/[name]-[hash].js', diff --git a/playground/backend-integration/vite.config.js b/playground/backend-integration/vite.config.js index 7560c31541ac22..0c6ce057c1563c 100644 --- a/playground/backend-integration/vite.config.js +++ b/playground/backend-integration/vite.config.js @@ -41,7 +41,7 @@ function BackendIntegrationExample() { build: { manifest: true, outDir, - rollupOptions: { + rolldownOptions: { input: Object.fromEntries(entrypoints), }, }, diff --git a/playground/css-codesplit-cjs/vite.config.js b/playground/css-codesplit-cjs/vite.config.js index 0c8a0cbf562a4b..d0b1bf2955093a 100644 --- a/playground/css-codesplit-cjs/vite.config.js +++ b/playground/css-codesplit-cjs/vite.config.js @@ -5,7 +5,7 @@ export default defineConfig({ build: { outDir: './dist', manifest: true, - rollupOptions: { + rolldownOptions: { input: { main: resolve(__dirname, './index.html'), other: resolve(__dirname, './other.js'), diff --git a/playground/css-codesplit/vite.config.js b/playground/css-codesplit/vite.config.js index 0d3d006e4dda7f..bc7b8a923827f7 100644 --- a/playground/css-codesplit/vite.config.js +++ b/playground/css-codesplit/vite.config.js @@ -4,7 +4,7 @@ import { defineConfig } from 'vite' export default defineConfig({ build: { manifest: true, - rollupOptions: { + rolldownOptions: { input: { main: resolve(__dirname, './index.html'), other: resolve(__dirname, './other.js'), diff --git a/playground/css-no-codesplit/vite.config.js b/playground/css-no-codesplit/vite.config.js index f48d875832b928..4b7720554a40be 100644 --- a/playground/css-no-codesplit/vite.config.js +++ b/playground/css-no-codesplit/vite.config.js @@ -4,7 +4,7 @@ import { defineConfig } from 'vite' export default defineConfig({ build: { cssCodeSplit: false, - rollupOptions: { + rolldownOptions: { input: { index: resolve(__dirname, './index.html'), sub: resolve(__dirname, './sub.html'), diff --git a/playground/css/vite.config-relative-base.js b/playground/css/vite.config-relative-base.js index 451ca7090d023a..8b3656c8f64309 100644 --- a/playground/css/vite.config-relative-base.js +++ b/playground/css/vite.config-relative-base.js @@ -10,7 +10,7 @@ export default defineConfig(({ isPreview }) => ({ watch: null, minify: false, assetsInlineLimit: 0, - rollupOptions: { + rolldownOptions: { output: { entryFileNames: 'entries/[name].js', chunkFileNames: 'chunks/[name]-[hash].js', diff --git a/playground/css/vite.config-same-file-name.js b/playground/css/vite.config-same-file-name.js index f8e88d23b973be..75f4ab214a0148 100644 --- a/playground/css/vite.config-same-file-name.js +++ b/playground/css/vite.config-same-file-name.js @@ -6,7 +6,7 @@ export default defineConfig({ build: { ...baseConfig.build, outDir: 'dist/same-file-name', - rollupOptions: { + rolldownOptions: { output: { entryFileNames: '[name].js', chunkFileNames: '[name].[hash].js', diff --git a/playground/css/vite.config-sass-modern-compiler-build.js b/playground/css/vite.config-sass-modern-compiler-build.js index 412be2815eb339..35950a8041b012 100644 --- a/playground/css/vite.config-sass-modern-compiler-build.js +++ b/playground/css/vite.config-sass-modern-compiler-build.js @@ -4,7 +4,7 @@ import { defineConfig } from 'vite' export default defineConfig({ build: { outDir: 'dist/sass-modern-compiler-build', - rollupOptions: { + rolldownOptions: { input: { entry1: path.join( import.meta.dirname, diff --git a/playground/css/vite.config.js b/playground/css/vite.config.js index 993ed630670f56..c9f9c75719bcbd 100644 --- a/playground/css/vite.config.js +++ b/playground/css/vite.config.js @@ -39,7 +39,7 @@ export default defineConfig({ ], build: { cssTarget: 'chrome61', - rollupOptions: { + rolldownOptions: { input: { index: path.resolve(__dirname, './index.html'), treeshakeScoped: path.resolve( diff --git a/playground/dynamic-import-inline/vite.config.js b/playground/dynamic-import-inline/vite.config.js index 2d69e108f59e01..fa7b47f81c53ce 100644 --- a/playground/dynamic-import-inline/vite.config.js +++ b/playground/dynamic-import-inline/vite.config.js @@ -9,7 +9,7 @@ export default defineConfig({ }, build: { sourcemap: true, - rollupOptions: { + rolldownOptions: { output: { inlineDynamicImports: true, }, diff --git a/playground/environment-react-ssr/vite.config.ts b/playground/environment-react-ssr/vite.config.ts index 7803dc15ae9016..feb370e9bddab7 100644 --- a/playground/environment-react-ssr/vite.config.ts +++ b/playground/environment-react-ssr/vite.config.ts @@ -50,7 +50,7 @@ export default defineConfig((env) => ({ }, build: { outDir: 'dist/server', - rollupOptions: { + rolldownOptions: { input: { index: '/src/entry-server', }, diff --git a/playground/external/vite.config.js b/playground/external/vite.config.js index d79decb009ca6d..a43ac5d748ccc0 100644 --- a/playground/external/vite.config.js +++ b/playground/external/vite.config.js @@ -28,7 +28,7 @@ export default defineConfig({ }, build: { minify: false, - rollupOptions: { + rolldownOptions: { external: ['vue', 'slash3', 'slash5'], transform: { inject: { diff --git a/playground/fs-serve/root/vite.config-base.js b/playground/fs-serve/root/vite.config-base.js index 1dd2f99b9f9124..495efa2566e0fa 100644 --- a/playground/fs-serve/root/vite.config-base.js +++ b/playground/fs-serve/root/vite.config-base.js @@ -7,7 +7,7 @@ const BASE = '/base/' export default defineConfig({ base: BASE, build: { - rollupOptions: { + rolldownOptions: { input: { main: path.resolve(__dirname, 'src/index.html'), }, diff --git a/playground/fs-serve/root/vite.config-deny.js b/playground/fs-serve/root/vite.config-deny.js index 11698cef800ec3..a4d51384f9a3b4 100644 --- a/playground/fs-serve/root/vite.config-deny.js +++ b/playground/fs-serve/root/vite.config-deny.js @@ -4,7 +4,7 @@ import svgVirtualModulePlugin from './svgVirtualModulePlugin' export default defineConfig({ build: { - rollupOptions: { + rolldownOptions: { input: { main: path.resolve(__dirname, 'src/index.html'), }, diff --git a/playground/fs-serve/root/vite.config.js b/playground/fs-serve/root/vite.config.js index ac4eaac97c1d61..91a8721db5eeca 100644 --- a/playground/fs-serve/root/vite.config.js +++ b/playground/fs-serve/root/vite.config.js @@ -4,7 +4,7 @@ import svgVirtualModulePlugin from './svgVirtualModulePlugin' export default defineConfig({ build: { - rollupOptions: { + rolldownOptions: { input: { main: path.resolve(__dirname, 'src/index.html'), }, diff --git a/playground/glob-import/vite.config.ts b/playground/glob-import/vite.config.ts index 99317f08a0031e..19f3ad98bb9254 100644 --- a/playground/glob-import/vite.config.ts +++ b/playground/glob-import/vite.config.ts @@ -24,7 +24,7 @@ export default defineConfig({ }, build: { sourcemap: true, - rollupOptions: { + rolldownOptions: { output: { // manualChunks(id) { // if (id.includes('foo.css')) { diff --git a/playground/html/__tests__/html.spec.ts b/playground/html/__tests__/html.spec.ts index 635b028db44e75..376e6de6226c13 100644 --- a/playground/html/__tests__/html.spec.ts +++ b/playground/html/__tests__/html.spec.ts @@ -123,7 +123,7 @@ describe('main', () => { }) test.runIf(isBuild)( - 'external paths by rollupOptions.external works', + 'external paths by rolldownOptions.external works', async () => { expect(await page.textContent('.external-path-by-rollup-options')).toBe( 'works', @@ -426,7 +426,7 @@ describe('relative input', () => { await page.goto(viteTestUrl + '/relative-input.html') }) - test('passing relative path to rollupOptions.input works', async () => { + test('passing relative path to rolldownOptions.input works', async () => { await expect.poll(() => page.textContent('.relative-input')).toBe('OK') }) }) diff --git a/playground/html/index.html b/playground/html/index.html index 37554e86e7cd76..1fde1920743e09 100644 --- a/playground/html/index.html +++ b/playground/html/index.html @@ -15,6 +15,6 @@

Hello

- External path by rollupOptions.external (build only): + External path by rolldownOptions.external (build only):
diff --git a/playground/html/vite.config.js b/playground/html/vite.config.js index 11e433128074c3..9eb1af84b73f74 100644 --- a/playground/html/vite.config.js +++ b/playground/html/vite.config.js @@ -4,7 +4,7 @@ import { defineConfig } from 'vite' export default defineConfig({ base: './', build: { - rollupOptions: { + rolldownOptions: { input: { main: resolve(__dirname, 'index.html'), nested: resolve(__dirname, 'nested/index.html'), diff --git a/playground/js-sourcemap/after-preload-dynamic-hashbang.js b/playground/js-sourcemap/after-preload-dynamic-hashbang.js index 918cdeff7932a4..f5cc79cbc76757 100644 --- a/playground/js-sourcemap/after-preload-dynamic-hashbang.js +++ b/playground/js-sourcemap/after-preload-dynamic-hashbang.js @@ -1,4 +1,4 @@ -// hashbang is injected via rollupOptions.output.banner +// hashbang is injected via rolldownOptions.output.banner import('./dynamic/dynamic-foo') diff --git a/playground/js-sourcemap/vite.config.js b/playground/js-sourcemap/vite.config.js index 320a385bc074c9..5a0276f0a89308 100644 --- a/playground/js-sourcemap/vite.config.js +++ b/playground/js-sourcemap/vite.config.js @@ -9,7 +9,7 @@ export default defineConfig({ ], build: { sourcemap: true, - rollupOptions: { + rolldownOptions: { output: { // manualChunks(name) { // if (name.endsWith('after-preload-dynamic.js')) { diff --git a/playground/legacy/vite.config-custom-filename.js b/playground/legacy/vite.config-custom-filename.js index a4d14c8415d8fd..e4fa773933cac3 100644 --- a/playground/legacy/vite.config-custom-filename.js +++ b/playground/legacy/vite.config-custom-filename.js @@ -6,7 +6,7 @@ export default defineConfig({ build: { manifest: true, minify: false, - rollupOptions: { + rolldownOptions: { output: { entryFileNames: `assets/[name].js`, chunkFileNames: `assets/[name].js`, diff --git a/playground/legacy/vite.config-multiple-output.js b/playground/legacy/vite.config-multiple-output.js index ae4d7d530adc8e..049c5b8ad01a61 100644 --- a/playground/legacy/vite.config-multiple-output.js +++ b/playground/legacy/vite.config-multiple-output.js @@ -6,7 +6,7 @@ export default defineConfig({ build: { manifest: true, minify: false, - rollupOptions: { + rolldownOptions: { output: [ { assetFileNames() { diff --git a/playground/legacy/vite.config-no-polyfills-no-systemjs.js b/playground/legacy/vite.config-no-polyfills-no-systemjs.js index 388ee5a3ba71a4..7f103e97931e2a 100644 --- a/playground/legacy/vite.config-no-polyfills-no-systemjs.js +++ b/playground/legacy/vite.config-no-polyfills-no-systemjs.js @@ -19,7 +19,7 @@ export default defineConfig(({ isPreview }) => ({ build: { outDir: 'dist/no-polyfills-no-systemjs', - rollupOptions: { + rolldownOptions: { input: { index: path.resolve(__dirname, 'no-polyfills-no-systemjs.html'), }, diff --git a/playground/legacy/vite.config-no-polyfills.js b/playground/legacy/vite.config-no-polyfills.js index a33a34aa20e556..6657990c336633 100644 --- a/playground/legacy/vite.config-no-polyfills.js +++ b/playground/legacy/vite.config-no-polyfills.js @@ -18,7 +18,7 @@ export default defineConfig(({ isPreview }) => ({ build: { outDir: 'dist/no-polyfills', - rollupOptions: { + rolldownOptions: { input: { index: path.resolve(__dirname, 'no-polyfills.html'), }, diff --git a/playground/legacy/vite.config-watch.js b/playground/legacy/vite.config-watch.js index 48d57f3e988edc..30c10fdf9551e6 100644 --- a/playground/legacy/vite.config-watch.js +++ b/playground/legacy/vite.config-watch.js @@ -6,7 +6,7 @@ export default defineConfig({ plugins: [legacy()], build: { manifest: true, - rollupOptions: { + rolldownOptions: { input: { 'style-only-entry': resolve(__dirname, 'style-only-entry.css'), }, diff --git a/playground/legacy/vite.config.js b/playground/legacy/vite.config.js index d07d295a0a27d8..20e48c3d47bfb3 100644 --- a/playground/legacy/vite.config.js +++ b/playground/legacy/vite.config.js @@ -17,7 +17,7 @@ export default defineConfig({ manifest: true, sourcemap: true, assetsInlineLimit: 100, // keep SVG as assets URL - rollupOptions: { + rolldownOptions: { input: { index: path.resolve(__dirname, 'index.html'), nested: path.resolve(__dirname, 'nested/index.html'), diff --git a/playground/lib/vite.config.js b/playground/lib/vite.config.js index 8961efc72fb6cd..5be97f86fb3127 100644 --- a/playground/lib/vite.config.js +++ b/playground/lib/vite.config.js @@ -15,7 +15,7 @@ export default defineConfig({ // - object rest spread // - optional chaining target: 'chrome46', - rollupOptions: { + rolldownOptions: { output: { legalComments: 'inline', banner: `/*!\nMayLib\n*/`, diff --git a/playground/lib/vite.multiple-output.config.js b/playground/lib/vite.multiple-output.config.js index e986221ad6ca9b..03c896486a3be9 100644 --- a/playground/lib/vite.multiple-output.config.js +++ b/playground/lib/vite.multiple-output.config.js @@ -16,7 +16,7 @@ export default defineConfig({ name: 'MyLib', }, outDir: 'dist/multiple-output', - rollupOptions: { + rolldownOptions: { // due to playground-temp, the `dir` needs to be relative to the resolvedRoot output: [ { diff --git a/playground/minify/vite.config.js b/playground/minify/vite.config.js index a23f2bc8147c0a..8013c4b67ecc99 100644 --- a/playground/minify/vite.config.js +++ b/playground/minify/vite.config.js @@ -8,7 +8,7 @@ export default defineConfig({ build: { minify: 'esbuild', cssMinify: 'esbuild', - rollupOptions: { + rolldownOptions: { output: { legalComments: 'none', }, diff --git a/playground/multiple-entrypoints/vite.config.js b/playground/multiple-entrypoints/vite.config.js index 3202cebc0ce4aa..8499417a1df178 100644 --- a/playground/multiple-entrypoints/vite.config.js +++ b/playground/multiple-entrypoints/vite.config.js @@ -5,7 +5,7 @@ export default defineConfig({ build: { outDir: './dist', emptyOutDir: true, - rollupOptions: { + rolldownOptions: { preserveEntrySignatures: 'strict', input: { a0: resolve(__dirname, 'entrypoints/a0.js'), diff --git a/playground/preload/vite.config-preload-disabled.js b/playground/preload/vite.config-preload-disabled.js index 4ae19be2a3b482..99b5af0efbdd76 100644 --- a/playground/preload/vite.config-preload-disabled.js +++ b/playground/preload/vite.config-preload-disabled.js @@ -12,7 +12,7 @@ export default defineConfig({ passes: 3, }, }, - rollupOptions: { + rolldownOptions: { output: { // manualChunks(id) { // if (id.includes('chunk.js')) { diff --git a/playground/preload/vite.config-resolve-deps.js b/playground/preload/vite.config-resolve-deps.js index 5ef2a82147ae01..4c470bcf6eebe6 100644 --- a/playground/preload/vite.config-resolve-deps.js +++ b/playground/preload/vite.config-resolve-deps.js @@ -12,7 +12,7 @@ export default defineConfig({ passes: 3, }, }, - rollupOptions: { + rolldownOptions: { output: { // manualChunks(id) { // if (id.includes('chunk.js')) { diff --git a/playground/preload/vite.config.ts b/playground/preload/vite.config.ts index 0c27f0ab75c1ca..18f5b5445c7116 100644 --- a/playground/preload/vite.config.ts +++ b/playground/preload/vite.config.ts @@ -12,7 +12,7 @@ export default defineConfig({ passes: 3, }, }, - rollupOptions: { + rolldownOptions: { output: { // manualChunks(id) { // if (id.includes('chunk.js')) { diff --git a/playground/ssr-noexternal/vite.config.js b/playground/ssr-noexternal/vite.config.js index 1109bddd187001..06379eb1f1c93f 100644 --- a/playground/ssr-noexternal/vite.config.js +++ b/playground/ssr-noexternal/vite.config.js @@ -12,7 +12,7 @@ export default defineConfig({ build: { target: 'esnext', minify: false, - rollupOptions: { + rolldownOptions: { external: ['@vitejs/test-external-cjs'], }, }, diff --git a/playground/worker/vite.config-es.js b/playground/worker/vite.config-es.js index 095d55f1562bc7..c73a4483664b5f 100644 --- a/playground/worker/vite.config-es.js +++ b/playground/worker/vite.config-es.js @@ -11,7 +11,7 @@ export default defineConfig({ worker: { format: 'es', plugins: () => [workerPluginTestPlugin()], - rollupOptions: { + rolldownOptions: { output: { assetFileNames: 'assets/worker_asset-[name]-[hash].[ext]', chunkFileNames: 'assets/worker_chunk-[name]-[hash].js', @@ -23,7 +23,7 @@ export default defineConfig({ outDir: 'dist/es', assetsInlineLimit: (filePath) => filePath.endsWith('.svg') ? false : undefined, - rollupOptions: { + rolldownOptions: { output: { assetFileNames: 'assets/[name]-[hash].[ext]', chunkFileNames: 'assets/[name]-[hash].js', diff --git a/playground/worker/vite.config-iife.js b/playground/worker/vite.config-iife.js index 289a53a36a101f..3e892a0d61b97d 100644 --- a/playground/worker/vite.config-iife.js +++ b/playground/worker/vite.config-iife.js @@ -11,7 +11,7 @@ export default defineConfig({ worker: { format: 'iife', plugins: () => [workerPluginTestPlugin()], - rollupOptions: { + rolldownOptions: { output: { assetFileNames: 'assets/worker_asset-[name]-[hash].[ext]', chunkFileNames: 'assets/worker_chunk-[name]-[hash].js', @@ -25,7 +25,7 @@ export default defineConfig({ assetsInlineLimit: (filePath) => filePath.endsWith('.svg') ? false : undefined, manifest: true, - rollupOptions: { + rolldownOptions: { output: { assetFileNames: 'assets/[name]-[hash].[ext]', chunkFileNames: 'assets/[name]-[hash].js', @@ -40,7 +40,7 @@ export default defineConfig({ config() { return { worker: { - rollupOptions: { + rolldownOptions: { output: { entryFileNames: 'assets/worker_entry-[name].js', }, diff --git a/playground/worker/vite.config-relative-base-iife.js b/playground/worker/vite.config-relative-base-iife.js index 657d7b3094acf6..85bad6b2c29fd2 100644 --- a/playground/worker/vite.config-relative-base-iife.js +++ b/playground/worker/vite.config-relative-base-iife.js @@ -11,7 +11,7 @@ export default defineConfig(({ isPreview }) => ({ worker: { format: 'iife', plugins: () => [workerPluginTestPlugin()], - rollupOptions: { + rolldownOptions: { output: { assetFileNames: 'worker-assets/worker_asset-[name]-[hash].[ext]', chunkFileNames: 'worker-chunks/worker_chunk-[name]-[hash].js', @@ -23,7 +23,7 @@ export default defineConfig(({ isPreview }) => ({ outDir: 'dist/relative-base-iife', assetsInlineLimit: (filePath) => filePath.endsWith('.svg') ? false : undefined, - rollupOptions: { + rolldownOptions: { output: { assetFileNames: 'other-assets/[name]-[hash].[ext]', chunkFileNames: 'chunks/[name]-[hash].js', diff --git a/playground/worker/vite.config-relative-base.js b/playground/worker/vite.config-relative-base.js index f4f22cc12e0cd9..dd16cce40384d1 100644 --- a/playground/worker/vite.config-relative-base.js +++ b/playground/worker/vite.config-relative-base.js @@ -11,7 +11,7 @@ export default defineConfig(({ isPreview }) => ({ worker: { format: 'es', plugins: () => [workerPluginTestPlugin()], - rollupOptions: { + rolldownOptions: { output: { assetFileNames: 'worker-assets/worker_asset-[name]-[hash].[ext]', chunkFileNames: 'worker-chunks/worker_chunk-[name]-[hash].js', @@ -23,7 +23,7 @@ export default defineConfig(({ isPreview }) => ({ outDir: 'dist/relative-base', assetsInlineLimit: (filePath) => filePath.endsWith('.svg') ? false : undefined, - rollupOptions: { + rolldownOptions: { output: { assetFileNames: 'other-assets/[name]-[hash].[ext]', chunkFileNames: 'chunks/[name]-[hash].js', diff --git a/playground/worker/worker-sourcemap-config.js b/playground/worker/worker-sourcemap-config.js index 2c4e40e78d2a5a..df8685a14a1156 100644 --- a/playground/worker/worker-sourcemap-config.js +++ b/playground/worker/worker-sourcemap-config.js @@ -25,7 +25,7 @@ export default (sourcemap) => { worker: { format: 'iife', plugins: () => [workerPluginTestPlugin()], - rollupOptions: { + rolldownOptions: { output: { assetFileNames: 'assets/[name]-worker_asset[hash].[ext]', chunkFileNames: 'assets/[name]-worker_chunk[hash].js', @@ -38,7 +38,7 @@ export default (sourcemap) => { assetsInlineLimit: (filePath) => filePath.endsWith('.svg') ? false : undefined, sourcemap: sourcemap, - rollupOptions: { + rolldownOptions: { output: { assetFileNames: 'assets/[name]-[hash].[ext]', chunkFileNames: 'assets/[name]-[hash].js',