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(html/minifier): bug with merging and removing metadata elements #6200

Merged
merged 4 commits into from Oct 19, 2022
Merged

fix(html/minifier): bug with merging and removing metadata elements #6200

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21cadee
fix(html/minifier): bug with merging and removing metadata elements
alexander-akait Oct 19, 2022
ce697f3
perf: small improve
alexander-akait Oct 19, 2022
7427d90
refactor: fix
alexander-akait Oct 19, 2022
5d973a5
Merge branch 'main' into fix-small-bug-in-html-minifier-logic
swc-bot Oct 19, 2022
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
66 changes: 49 additions & 17 deletions crates/swc_html_minifier/src/lib.rs
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@ use swc_common::{
collections::AHashMap, comments::SingleThreadedComments, sync::Lrc, EqIgnoreSpan, FileName,
FilePathMapping, Mark, SourceMap, DUMMY_SP,
};
use swc_ecma_transforms_base::perf::Items;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the imported?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

auto-insertion by IDE 😄 Not sure how it happens, Fixed

use swc_html_ast::*;
use swc_html_parser::parser::ParserConfig;
use swc_html_utils::{HTML_ELEMENTS_AND_ATTRIBUTES, SVG_ELEMENTS_AND_ATTRIBUTES};
Expand Down Expand Up @@ -1204,7 +1205,25 @@ impl Minifier<'_> {
None
}

fn empty_children(&self, children: &Vec<Child>) -> bool {
fn is_empty_metadata_element(&self, child: &Child) -> bool {
if let Child::Element(element) = child {
if (!self.is_element_displayed(element.namespace, &element.tag_name)
|| (matches!(element.namespace, Namespace::HTML | Namespace::SVG)
&& element.tag_name == js_word!("script"))
|| (element.namespace == Namespace::HTML
&& element.tag_name == js_word!("noscript")))
&& element.attributes.is_empty()
&& self.is_empty_children(&element.children)
&& element.content.is_none()
{
return true;
}
}

false
}

fn is_empty_children(&self, children: &Vec<Child>) -> bool {
for child in children {
match child {
Child::Text(text) if text.data.chars().all(is_whitespace) => {
Expand Down Expand Up @@ -1251,6 +1270,10 @@ impl Minifier<'_> {
}

fn minify_children(&mut self, children: &mut Vec<Child>) -> Vec<Child> {
if children.is_empty() {
return vec![];
}

let (namespace, tag_name) = match &self.current_element {
Some(element) => (element.namespace, &element.tag_name),
_ => {
Expand All @@ -1266,22 +1289,6 @@ impl Minifier<'_> {
Child::Comment(comment) if self.options.remove_comments => {
self.is_preserved_comment(&comment.data)
}
Child::Element(element)
if self.options.remove_empty_metadata_elements
&& (!self
.is_element_displayed(element.namespace, &element.tag_name)
|| (matches!(
element.namespace,
Namespace::HTML | Namespace::SVG
) && element.tag_name == js_word!("script"))
|| (element.namespace == Namespace::HTML
&& element.tag_name == js_word!("noscript")))
&& element.attributes.is_empty()
&& self.empty_children(&element.children)
&& element.content.is_none() =>
{
false
}
Child::Element(element)
if self.options.merge_metadata_elements
&& self.allow_elements_to_merge(prev_children.last(), element) =>
Expand Down Expand Up @@ -1601,6 +1608,31 @@ impl Minifier<'_> {
let result = child_will_be_retained(&mut child, &mut new_children, children);

if result {
if self.options.remove_redundant_attributes
&& self.is_empty_metadata_element(&child)
{
let need_continue = {
let next_element = if let Some(Child::Element(element)) = children.get(0) {
Some(element)
} else if let Some(Child::Element(element)) = children.get(1) {
Some(element)
} else {
None
};

if let Some(element) = next_element {
self.options.merge_metadata_elements
&& !self.allow_elements_to_merge(Some(&child), element)
} else {
true
}
};

if need_continue {
continue;
}
}

new_children.push(child);
}
}
Expand Down
4 changes: 4 additions & 0 deletions crates/swc_html_minifier/tests/fixture/element/style-group-2/config.json
View file
Open in desktop
@@ -0,0 +1,4 @@
{
"mergeMetadataElements": false,
"removeEmptyMetadataElements": false
}
64 changes: 64 additions & 0 deletions crates/swc_html_minifier/tests/fixture/element/style-group-2/input.html
View file
Open in desktop
@@ -0,0 +1,64 @@
<!doctype html>
<html lang="en">
<head>
<title>Document</title>
<style>
a {
color:red
}
</style><style>
b {
color:blue
}
</style>
<!-- test -->
<style>
p {
color: white;
background-color: blue;
padding: 5px;
border: 1px solid black;
}
</style>
<style>
p {
color: blue;
background-color: yellow;
}
</style>
<style media="all and (max-width: 500px)">
p {
color: blue;
background-color: yellow;
}
</style>
<style type="text/css">
.first {
color: red;
}
</style>
<style type="text/css">
.second {
color: red;
}
</style>
<style media="all">
p {
color: blue;
}
</style>
<style media="all">
p {
color: red;
}
</style>
</head>
<body>
<div>test</div>
<style>a { color: red }</style>
<style></style>
<div>test</div>
<style></style>
<style>a { color: red }</style>
</body>
</html>
4 changes: 4 additions & 0 deletions crates/swc_html_minifier/tests/fixture/element/style-group-2/output.min.html
View file
Open in desktop
@@ -0,0 +1,4 @@
<!doctype html><html lang=en><title>Document</title><style>a{color:red}</style><style>b{color:blue}</style><style>p{color:white;background-color:blue;padding:5px;border:1px solid black}</style><style>p{color:blue;background-color:yellow}</style><style media="all and (max-width:500px)">p{color:blue;background-color:yellow}</style><style>.first{color:red}</style><style>.second{color:red}</style><style media=all>p{color:blue}</style><style media=all>p{color:red}</style><div>test</div>
<style>a{color:red}</style><style></style>
<div>test</div>
<style></style><style>a{color:red}</style>
1 change: 0 additions & 1 deletion crates/swc_html_minifier/tests/fixture/element/style-group/output.min.html
View file
Open in desktop
Expand Up @@ -4,5 +4,4 @@
<div>test</div>
<style>a{color:red}</style>
<div>test</div>

<style>a{color:red}</style>