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

refactor(html/minifier): Support stable rust #8380

Merged
merged 3 commits into from
Dec 4, 2023
Merged

refactor(html/minifier): Support stable rust #8380

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88d94c7
refactor(html/minifier): Support stable rust
magic-akari Dec 4, 2023
b81093c
chore: clean code
magic-akari Dec 4, 2023
b122d08
Merge branch 'main' into html/minifier/stable-rs
swc-bot Dec 4, 2023
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
36 changes: 16 additions & 20 deletions crates/swc_html_minifier/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![deny(clippy::all)]
#![feature(box_patterns)]

use std::{borrow::Cow, cmp::Ordering, mem::take};

Expand Down Expand Up @@ -2271,32 +2270,29 @@ impl Minifier<'_> {
let swc_css_ast::Stylesheet { rules, .. } = &stylesheet;

// Because CSS is grammar free, protect for fails
if let Some(swc_css_ast::Rule::QualifiedRule(box swc_css_ast::QualifiedRule {
block,
..
})) = rules.first()
{
swc_css_codegen::Emit::emit(&mut gen, &block).unwrap();

minified = minified[1..minified.len() - 1].to_string();
} else {
let Some(swc_css_ast::Rule::QualifiedRule(qualified_rule)) = rules.first() else {
return None;
}
};

let swc_css_ast::QualifiedRule { block, .. } = &**qualified_rule;

swc_css_codegen::Emit::emit(&mut gen, &block).unwrap();

minified = minified[1..minified.len() - 1].to_string();
}
CssMinificationMode::MediaQueryList => {
let swc_css_ast::Stylesheet { rules, .. } = &stylesheet;

// Because CSS is grammar free, protect for fails
if let Some(swc_css_ast::Rule::AtRule(box swc_css_ast::AtRule {
prelude, ..
})) = rules.first()
{
swc_css_codegen::Emit::emit(&mut gen, &prelude).unwrap();

minified = minified.trim().to_string();
} else {
let Some(swc_css_ast::Rule::AtRule(at_rule)) = rules.first() else {
return None;
}
};

let swc_css_ast::AtRule { prelude, .. } = &**at_rule;

swc_css_codegen::Emit::emit(&mut gen, &prelude).unwrap();

minified = minified.trim().to_string();
}
}

Expand Down