Skip to content
Open
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
49 changes: 49 additions & 0 deletions packages/vite/src/node/__tests__/build.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1087,6 +1087,55 @@ test('chunkImportMap per environment with shared plugins', async () => {
expect(entry.code).toContain(JSON.stringify(cssSpecifier.slice(1)))
})

test('cssMinify per environment with shared plugins', async () => {
const root = resolve(dirname, 'fixtures/shared-plugins/css-minify')
const builder = await createBuilder({
root,
logLevel: 'warn',
environments: {
client: {
build: {
cssMinify: false,
write: false,
rolldownOptions: {
input: '/entry.js',
},
},
},
custom: {
consumer: 'client',
build: {
write: false,
rolldownOptions: {
input: '/entry.js',
},
},
},
},
builder: {
sharedPlugins: true,
},
})

const findCss = (output: RolldownOutput) =>
(
output.output.find(
(o): o is OutputAsset =>
o.type === 'asset' && o.fileName.endsWith('.css'),
)!.source as string
).trim()

const client = (await builder.build(
builder.environments.client,
)) as RolldownOutput
const custom = (await builder.build(
builder.environments.custom,
)) as RolldownOutput

expect(findCss(client)).toContain('\n')
expect(findCss(custom)).not.toContain('\n')
})

test('chunkImportMap is emitted when emitAssets is false', async () => {
const root = resolve(dirname, 'fixtures/shared-plugins/chunk-import-map')
const builder = await createBuilder({
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import './style.css'

console.log('test')
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.foo {
color: red;
}

.bar {
color: blue;
}
26 changes: 20 additions & 6 deletions packages/vite/src/node/plugins/css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -644,8 +644,13 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
code = modulesCode
} else if (inlined) {
let content = css
if (config.build.cssMinify) {
content = await minifyCSS(content, config, true, id)
if (this.environment.config.build.cssMinify) {
content = await minifyCSS(
content,
this.environment.config,
true,
id,
)
}
code = `export default ${JSON.stringify(content)}`
} else {
Expand Down Expand Up @@ -839,7 +844,10 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
await urlEmitQueue.run(async () =>
Promise.all(
urlEmitTasks.map(async (info) => {
info.content = await finalizeCss(info.content, config)
info.content = await finalizeCss(
info.content,
this.environment.config,
)
}),
),
)
Expand Down Expand Up @@ -924,7 +932,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {

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

// emit corresponding css file
Expand Down Expand Up @@ -952,7 +960,10 @@ 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, config)
chunkCSS = await finalizeCss(
chunkCSS,
this.environment.config,
)
let cssString = JSON.stringify(chunkCSS)
cssString =
renderAssetUrlInJS(
Expand Down Expand Up @@ -1060,7 +1071,10 @@ 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, config)
extractedCss = await finalizeCss(
extractedCss,
this.environment.config,
)
this.emitFile({
name: getCssBundleName(),
type: 'asset',
Expand Down
Loading