Skip to content

Commit 8fa30e3

Browse files
committed
chore: fix for the latest rolldown
1 parent d95a924 commit 8fa30e3

File tree

5 files changed

+10
-14
lines changed

5 files changed

+10
-14
lines changed

packages/vite/src/node/build.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,6 +1343,9 @@ const relativeUrlMechanisms: Record<
13431343
`(typeof document === 'undefined' && typeof location === 'undefined' ? ${getFileUrlFromRelativePath(
13441344
relativePath,
13451345
)} : ${getRelativeUrlFromDocument(relativePath, true)})`,
1346+
// FIXME: how to handle this?
1347+
app: (relativePath) =>
1348+
`new Error('Cannot resolve ${relativePath} in output format "app".')`,
13461349
}
13471350
/* end of copy */
13481351

packages/vite/src/node/optimizer/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
} from 'rolldown'
1616
import type { ResolvedConfig } from '../config'
1717
import {
18+
arraify,
1819
asyncFlatten,
1920
createDebugger,
2021
flattenId,
@@ -762,7 +763,7 @@ async function prepareRolldownOptimizerRun(
762763

763764
const external = [...(optimizeDeps?.exclude ?? [])]
764765

765-
const plugins = await asyncFlatten(pluginsFromConfig)
766+
const plugins = await asyncFlatten(arraify(pluginsFromConfig))
766767
if (external.length) {
767768
plugins.push(rolldownCjsExternalPlugin(external, platform))
768769
}
@@ -1070,7 +1071,7 @@ export async function extractExportsData(
10701071
// so only the entry file is being transformed.
10711072
const { plugins: pluginsFromConfig = [], ...remainingRollupOptions } =
10721073
rollupOptions
1073-
const plugins = await asyncFlatten(pluginsFromConfig)
1074+
const plugins = await asyncFlatten(arraify(pluginsFromConfig))
10741075
plugins.unshift({
10751076
name: 'externalize',
10761077
resolveId(id, importer) {

packages/vite/src/node/optimizer/scan.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ async function prepareRolldownScanner(
276276
const { plugins: pluginsFromConfig = [], ...rollupOptions } =
277277
environment.config.optimizeDeps.rollupOptions ?? {}
278278

279-
const plugins = await asyncFlatten(pluginsFromConfig)
279+
const plugins = await asyncFlatten(arraify(pluginsFromConfig))
280280

281281
plugins.push(rolldownScanPlugin(environment, deps, missing, entries))
282282

packages/vite/src/node/plugins/css.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url'
66
import postcssrc from 'postcss-load-config'
77
import type {
88
ExistingRawSourceMap,
9-
ModuleFormat,
9+
InternalModuleFormat,
1010
OutputAsset,
1111
OutputChunk,
1212
RenderedChunk,
@@ -1124,7 +1124,7 @@ export function cssAnalysisPlugin(config: ResolvedConfig): RolldownPlugin {
11241124
*/
11251125
export function getEmptyChunkReplacer(
11261126
pureCssChunkNames: string[],
1127-
outputFormat: ModuleFormat,
1127+
outputFormat: InternalModuleFormat,
11281128
): (code: string) => string {
11291129
const emptyChunkFiles = pureCssChunkNames
11301130
.map((file) => path.basename(file))

packages/vite/src/node/server/pluginContainer.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ import { TraceMap, originalPositionFor } from '@jridgewell/trace-mapping'
6262
import MagicString from 'magic-string'
6363
import type { FSWatcher } from 'dep-types/chokidar'
6464
import colors from 'picocolors'
65-
import {
66-
isCallableCompatibleBuiltinPlugin,
67-
makeBuiltinPluginCallable,
68-
} from 'rolldown/experimental'
6965
import type { Plugin } from '../plugin'
7066
import {
7167
combineSourcemaps,
@@ -142,11 +138,7 @@ export async function createEnvironmentPluginContainer(
142138
): Promise<EnvironmentPluginContainer> {
143139
const container = new EnvironmentPluginContainer(
144140
environment,
145-
plugins.map((plugin) =>
146-
isCallableCompatibleBuiltinPlugin(plugin)
147-
? makeBuiltinPluginCallable(plugin)
148-
: plugin,
149-
),
141+
plugins,
150142
watcher,
151143
)
152144
await container.resolveRollupOptions()

0 commit comments

Comments
 (0)