Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(css): trim esbuild's minified css #13893

Merged
merged 2 commits into from
Aug 16, 2023
Merged

fix(css): trim esbuild's minified css #13893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4a6516
fix: trim esbuild's minified css
intrnl Jul 19, 2023
41c137c
fix: provide linebreak for emitted css assets
intrnl Aug 15, 2023
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
20 changes: 15 additions & 5 deletions packages/vite/src/node/plugins/css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
} else {
let content = css
if (config.build.cssMinify) {
content = await minifyCSS(content, config)
content = await minifyCSS(content, config, true)
}
code = `export default ${JSON.stringify(content)}`
}
Expand Down Expand Up @@ -1279,7 +1279,7 @@ async function finalizeCss(
css = await hoistAtRules(css)
}
if (minify && config.build.cssMinify) {
css = await minifyCSS(css, config)
css = await minifyCSS(css, config, false)
}
return css
}
Expand Down Expand Up @@ -1501,7 +1501,15 @@ async function doImportCSSReplace(
return `@import ${wrap}${await replacer(rawUrl)}${wrap}`
}

async function minifyCSS(css: string, config: ResolvedConfig) {
async function minifyCSS(
css: string,
config: ResolvedConfig,
inlined: boolean,
) {
// We want inlined CSS to not end with a linebreak, while ensuring that
// regular CSS assets do end with a linebreak.
// See https://github.com/vitejs/vite/pull/13893#issuecomment-1678628198

if (config.build.cssMinify === 'lightningcss') {
const { code, warnings } = (await importLightningCSS()).transform({
...config.css?.lightningcss,
Expand All @@ -1520,7 +1528,8 @@ async function minifyCSS(css: string, config: ResolvedConfig) {
),
)
}
return code.toString()
// LightningCSS output does not return a linebreak at the end
return code.toString() + (inlined ? '' : '\n')
}
try {
const { code, warnings } = await transform(css, {
Expand All @@ -1534,7 +1543,8 @@ async function minifyCSS(css: string, config: ResolvedConfig) {
colors.yellow(`warnings when minifying css:\n${msgs.join('\n')}`),
)
}
return code
// esbuild output does return a linebreak at the end
return inlined ? code.trimEnd() : code
} catch (e) {
if (e.errors) {
e.message = '[esbuild css minify] ' + e.message
Expand Down
2 changes: 1 addition & 1 deletion playground/glob-import/__tests__/glob-import.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const allResult = {
'/dir/baz.json': json,
'/dir/foo.css': isBuild
? {
default: '.foo{color:#00f}\n',
default: '.foo{color:#00f}',
}
: {
default: '.foo {\n color: blue;\n}\n',
Expand Down
Loading