msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

fix: minify inject CSS in prod mode (#14006)

Browse Source 
When CSS is externalized we rightfully rely on the following tooling chain to properly minify CSS. When we inject the CSS however, that tooling won't be able to do that, so we gotta do it ourselves.
This PR brings back most of that logic that existed in Svelte 4. Fixes #13716
pull/14032/head
Simon H 2 months ago committed by GitHub
parent e487f61262
commit 0106204982
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 90 additions and 33 deletions
Show Stats Download Patch File Download Diff File

5
.changeset/red-berries-watch.md
Unescape View File

@ -0,0 +1,5 @@
---
'svelte': patch
---
fix: minify inject CSS in prod mode

93
packages/svelte/src/compiler/phases/3-transform/css/index.js
Unescape View File

@ -11,6 +11,7 @@ import { dev } from '../../../state.js';
* @typedef {{
* code: MagicString;
* hash: string;
* minify: boolean;
* selector: string;
* keyframes: string[];
* specificity: {
@ -32,6 +33,7 @@ export function render_stylesheet(source, analysis, options) {
const state = {
code,
hash: analysis.css.hash,
minify: analysis.inject_styles && !options.dev,
selector: `.${analysis.css.hash}`,
keyframes: analysis.css.keyframes,
specificity: {
@ -45,6 +47,9 @@ export function render_stylesheet(source, analysis, options) {
code.remove(0, ast.content.start);
code.remove(/** @type {number} */ (ast.content.end), source.length);
if (state.minify) {
remove_preceeding_whitespace(ast.content.end, state);
}
const css = {
code: code.toString(),
@ -116,22 +121,47 @@ const visitors = {
index++;
}
} else if (state.minify) {
remove_preceeding_whitespace(node.start, state);
// Don't minify whitespace in custom properties, since some browsers (Chromium < 99)
// treat --foo: ; and --foo:; differently
if (!node.property.startsWith('--')) {
let start = node.start + node.property.length + 1;
let end = start;
while (/\s/.test(state.code.original[end])) end++;
if (end > start) state.code.remove(start, end);
}
}
},
Rule(node, { state, next, visit }) {
if (state.minify) {
remove_preceeding_whitespace(node.start, state);
remove_preceeding_whitespace(node.block.end - 1, state);
}
// keep empty rules in dev, because it's convenient to
// see them in devtools
if (!dev && is_empty(node)) {
state.code.prependRight(node.start, '/* (empty) ');
state.code.appendLeft(node.end, '*/');
escape_comment_close(node, state.code);
if (state.minify) {
state.code.remove(node.start, node.end);
} else {
state.code.prependRight(node.start, '/* (empty) ');
state.code.appendLeft(node.end, '*/');
escape_comment_close(node, state.code);
}
return;
}
if (!is_used(node)) {
state.code.prependRight(node.start, '/* (unused) ');
state.code.appendLeft(node.end, '*/');
escape_comment_close(node, state.code);
if (state.minify) {
state.code.remove(node.start, node.end);
} else {
state.code.prependRight(node.start, '/* (unused) ');
state.code.appendLeft(node.end, '*/');
escape_comment_close(node, state.code);
}
return;
}
@ -141,11 +171,16 @@ const visitors = {
if (selector.children.length === 1 && selector.children[0].selectors.length === 1) {
// `:global {...}`
state.code.prependRight(node.start, '/* ');
state.code.appendLeft(node.block.start + 1, '*/');
if (state.minify) {
state.code.remove(node.start, node.block.start + 1);
state.code.remove(node.block.end - 1, node.end);
} else {
state.code.prependRight(node.start, '/* ');
state.code.appendLeft(node.block.start + 1, '*/');
state.code.prependRight(node.block.end - 1, '/*');
state.code.appendLeft(node.block.end, '*/');
state.code.prependRight(node.block.end - 1, '/*');
state.code.appendLeft(node.block.end, '*/');
}
// don't recurse into selector or body
return;
@ -162,7 +197,8 @@ const visitors = {
// Only add comments if we're not inside a complex selector that itself is unused
if (!path.find((n) => n.type === 'ComplexSelector' && !n.metadata.used)) {
let pruning = false;
let last = node.children[0].start;
let prune_start = node.children[0].start;
let last = prune_start;
for (let i = 0; i < node.children.length; i += 1) {
const selector = node.children[i];
@ -172,12 +208,20 @@ const visitors = {
let i = selector.start;
while (state.code.original[i] !== ',') i--;
state.code.overwrite(i, i + 1, '*/');
} else {
if (i === 0) {
state.code.prependRight(selector.start, '/* (unused) ');
if (state.minify) {
state.code.remove(prune_start, i + 1);
} else {
state.code.overwrite(last, selector.start, ' /* (unused) ');
state.code.overwrite(i, i + 1, '*/');
}
} else {
prune_start = selector.start;
if (!state.minify) {
if (i === 0) {
state.code.prependRight(selector.start, '/* (unused) ');
} else {
state.code.overwrite(last, selector.start, ' /* (unused) ');
}
}
}
@ -188,7 +232,11 @@ const visitors = {
}
if (pruning) {
state.code.appendLeft(last, '*/');
if (state.minify) {
state.code.remove(prune_start, last);
} else {
state.code.appendLeft(last, '*/');
}
}
}
@ -320,6 +368,17 @@ const visitors = {
}
};
/**
* Walk backwards until we find a non-whitespace character
* @param {number} end
* @param {State} state
*/
function remove_preceeding_whitespace(end, state) {
let start = end;
while (/\s/.test(state.code.original[start - 1])) start--;
if (start < end) state.code.remove(start, end);
}
/** @param {Css.Rule} rule */
function is_empty(rule) {
if (rule.metadata.is_global_block) {

5
packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/Nested.svelte
Unescape View File

@ -6,4 +6,9 @@
.bar {
color: red;
}
.unused {
.also-unused {
color: green;
}
}
</style>

2
packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected.html
Unescape View File

@ -1 +1 @@
<!--[--><div class="bar svelte-ievf05">bar</div><!----> <div class="foo svelte-sg04hs">foo</div><!--]-->
<!--[--><div class="bar svelte-1fs6vx">bar</div><!----> <div class="foo svelte-sg04hs">foo</div><!--]-->

6
packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected_head.html
Unescape View File

@ -1,5 +1 @@
<style id="svelte-ievf05">
.bar.svelte-ievf05 {
color: red;
}
</style>
<style id="svelte-1fs6vx">.bar.svelte-1fs6vx {color:red;}</style>

6
packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected_head.html
Unescape View File

@ -1,5 +1 @@
<style id="svelte-sg04hs">
.foo.svelte-sg04hs {
color: red;
}
</style>
<style id="svelte-sg04hs">.foo.svelte-sg04hs {color:red;}</style>

6
packages/svelte/tests/server-side-rendering/samples/css/_expected_head.html
Unescape View File

@ -1,5 +1 @@
<style id="svelte-sg04hs">
.foo.svelte-sg04hs {
color: red;
}
</style>
<style id="svelte-sg04hs">.foo.svelte-sg04hs {color:red;}</style>
Write Preview
Loading…
Cancel
Save