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 CleanCSS placeholder issue #4631

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Fix CleanCSS placeholder issue #4631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d099302
add failing test
koddsson Apr 24, 2024
5d4194f
update clean-css
koddsson Apr 24, 2024
21da6de
use different placeholder for CSS minification
koddsson Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
71 changes: 27 additions & 44 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/labs/rollup-plugin-minify-html-literals/package.json
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@
"all": true
},
"dependencies": {
"clean-css": "^4.2.1",
"clean-css": "^5.3.3",
"html-minifier": "^4.0.0",
"magic-string": "^0.25.0",
"rollup-pluginutils": "^2.8.2",
Expand Down
46 changes: 31 additions & 15 deletions packages/labs/rollup-plugin-minify-html-literals/src/lib/minify-html-literals.ts
View file
Open in desktop
Expand Up @@ -294,32 +294,48 @@ export function minifyHTMLLiterals(
templates.forEach((template) => {
const minifyHTML = shouldMinify(template);
const minifyCSS = !!strategy.minifyCSS && shouldMinifyCSS(template);
if (minifyHTML || minifyCSS) {
if (minifyHTML) {
const placeholder = strategy.getPlaceholder(template.parts);
if (validate) {
validate.ensurePlaceholderValid(placeholder);
}

const combined = strategy.combineHTMLStrings(template.parts, placeholder);
let min: string;
if (minifyCSS) {
const minifyCSSOptions = (
(options as DefaultOptions).minifyOptions || {}
).minifyCSS;
if (typeof minifyCSSOptions === 'function') {
min = minifyCSSOptions(combined);
} else if (minifyCSSOptions === false) {
min = combined;
} else {
const cssOptions =
typeof minifyCSSOptions === 'object' ? minifyCSSOptions : undefined;
min = strategy.minifyCSS!(combined, cssOptions);
const min = strategy.minifyHTML(combined, options.minifyOptions);

const minParts = strategy.splitHTMLByPlaceholder(min, placeholder);
if (validate) {
validate.ensureHTMLPartsValid(template.parts, minParts);
}

template.parts.forEach((part, index) => {
if (part.start < part.end) {
// Only overwrite if the literal part has text content
ms.overwrite(part.start, part.end, minParts[index]);
}
});
} else if (minifyCSS) {
const placeholder = 'TEMPLATE_EXPRESSION';
if (validate) {
validate.ensurePlaceholderValid(placeholder);
}

const combined = strategy.combineHTMLStrings(template.parts, placeholder);
let min: string;
const minifyCSSOptions = ((options as DefaultOptions).minifyOptions || {})
.minifyCSS;
if (typeof minifyCSSOptions === 'function') {
min = minifyCSSOptions(combined);
} else if (minifyCSSOptions === false) {
min = combined;
} else {
min = strategy.minifyHTML(combined, options.minifyOptions);
const cssOptions =
typeof minifyCSSOptions === 'object' ? minifyCSSOptions : undefined;
min = strategy.minifyCSS!(combined, cssOptions);
}

const minParts = strategy.splitHTMLByPlaceholder(min, placeholder);

if (validate) {
validate.ensureHTMLPartsValid(template.parts, minParts);
}
Expand Down
6 changes: 5 additions & 1 deletion packages/labs/rollup-plugin-minify-html-literals/src/test/minify-html-literals.spec.ts
View file
Open in desktop
Expand Up @@ -86,6 +86,10 @@ describe('minify-html-literals', () => {
}

\${extra}

.footer {
margin: \${marginSize2} 0;
}
\`;
}

Expand Down Expand Up @@ -127,7 +131,7 @@ describe('minify-html-literals', () => {
}

function taggedCSSMinify(extra) {
return css\`.heading{font-size:24px}\${extra}\`;
return css\`.heading{font-size:24px}\${extra} .footer{margin:\${marginSize2} 0}\`;
}

function cssProperty(property) {
Expand Down