Skip to content
Merged
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
16 changes: 6 additions & 10 deletions packages/vite/src/node/plugins/css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
await urlEmitQueue.run(async () =>
Promise.all(
urlEmitTasks.map(async (info) => {
info.content = await finalizeCss(info.content, true, config)
info.content = await finalizeCss(info.content, config)
}),
),
)
Expand Down Expand Up @@ -852,7 +852,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {

// wait for previous tasks as well
chunkCSS = await codeSplitEmitQueue.run(async () => {
return finalizeCss(chunkCSS!, true, config)
return finalizeCss(chunkCSS!, config)
})

// emit corresponding css file
Expand All @@ -875,7 +875,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
// But because entry chunk can be imported by dynamic import,
// we shouldn't remove the inlined CSS. (#10285)

chunkCSS = await finalizeCss(chunkCSS, true, config)
chunkCSS = await finalizeCss(chunkCSS, config)
let cssString = JSON.stringify(chunkCSS)
cssString =
renderAssetUrlInJS(this, chunk, opts, cssString)?.toString() ||
Expand Down Expand Up @@ -978,7 +978,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
// Finally, if there's any extracted CSS, we emit the asset
if (extractedCss) {
hasEmitted = true
extractedCss = await finalizeCss(extractedCss, true, config)
extractedCss = await finalizeCss(extractedCss, config)
this.emitFile({
name: getCssBundleName(),
type: 'asset',
Expand Down Expand Up @@ -1791,16 +1791,12 @@ function combineSourcemapsIfExists(
const viteHashUpdateMarker = '/*$vite$:1*/'
const viteHashUpdateMarkerRE = /\/\*\$vite\$:\d+\*\//

async function finalizeCss(
css: string,
minify: boolean,
config: ResolvedConfig,
) {
async function finalizeCss(css: string, config: ResolvedConfig) {
// hoist external @imports and @charset to the top of the CSS chunk per spec (#1845 and #6333)
if (css.includes('@import') || css.includes('@charset')) {
css = await hoistAtRules(css)
}
if (minify && config.build.cssMinify) {
if (config.build.cssMinify) {
css = await minifyCSS(css, config, false)
}
// inject an additional string to generate a different hash for https://github.com/vitejs/vite/issues/18038
Expand Down
Loading