swc-project/swc
1
1
Fork 0
mirror of https://github.com/swc-project/swc.git synced 2024-12-25 14:43:33 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(html/minifier): Fix smart mode (#5058)

Browse Source
This commit is contained in:
Alexander Akait 2022-06-29 15:30:28 +03:00 committed by GitHub
parent 93cd38d113
commit e9bad20898
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
58 changed files with 610 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
crates/swc_html_minifier/src/lib.rs
View File

@ -1,5 +1,7 @@
#![deny(clippy::all)]
use std::mem::take;
use once_cell::sync::Lazy;
use serde_json::Value;
use swc_atoms::{js_word, JsWord};
@ -684,10 +686,15 @@ impl Minifier {
}
}
fn remove_whitespace_from_first_text_element(&self, node: &mut Child) {
match node {
fn remove_leading_and_trailing_whitespaces(&self, children: &mut Vec<Child>) {
if let Some(last) = children.first_mut() {
match last {
Child::Text(text) => {
text.data = text.data.trim_start_matches(is_whitespace).into();
if text.data.is_empty() {
children.remove(0);
}
}
Child::Element(Element {
namespace,
@ -695,18 +702,20 @@ impl Minifier {
children,
..
}) if get_white_space(*namespace, tag_name) == WhiteSpace::Normal => {
if let Some(last) = children.first_mut() {
self.remove_whitespace_from_first_text_element(last)
}
self.remove_leading_and_trailing_whitespaces(children);
}
_ => {}
}
}
fn remove_whitespace_from_last_text_element(&self, node: &mut Child) {
match node {
if let Some(last) = children.last_mut() {
match last {
Child::Text(text) => {
text.data = text.data.trim_end_matches(is_whitespace).into();
if text.data.is_empty() {
children.pop();
}
}
Child::Element(Element {
namespace,
@ -714,15 +723,14 @@ impl Minifier {
children,
..
}) if get_white_space(*namespace, tag_name) == WhiteSpace::Normal => {
if let Some(last) = children.last_mut() {
self.remove_whitespace_from_last_text_element(last)
}
self.remove_leading_and_trailing_whitespaces(children);
}
_ => {}
}
}
}
fn get_deep_last_text_element<'a>(&self, node: &'a mut Child) -> Option<&'a mut Text> {
fn get_deep_last_text_element<'a>(&self, node: &'a Child) -> Option<&'a Text> {
match node {
Child::Text(text) => Some(text),
Child::Element(Element {
@ -731,7 +739,7 @@ impl Minifier {
children,
..
}) if get_white_space(*namespace, tag_name) == WhiteSpace::Normal => {
if let Some(last) = children.last_mut() {
if let Some(last) = children.last() {
self.get_deep_last_text_element(last)
} else {
None
@ -741,6 +749,47 @@ impl Minifier {
}
}
fn get_prev_non_comment_node<'a>(
&self,
children: &'a Vec<Child>,
index: usize,
) -> Option<&'a Child> {
let prev = children.get(index);
match prev {
Some(Child::Comment(_)) if index >= 1 => {
self.get_prev_non_comment_node(children, index - 1)
}
Some(_) => prev,
_ => None,
}
}
fn get_next_non_comment_node<'a>(
&self,
children: &'a Vec<Child>,
index: usize,
) -> Option<&'a Child> {
let next = children.get(index);
match next {
Some(Child::Comment(_)) => self.get_next_non_comment_node(children, index + 1),
Some(_) => next,
_ => None,
}
}
fn get_next_text_node<'a>(&self, children: &'a Vec<Child>, index: usize) -> Option<&'a Child> {
let next = children.get(index);
match next {
Some(Child::Text(_)) => next,
Some(Child::Element(_)) => None,
Some(_) => self.get_next_text_node(children, index + 1),
_ => None,
}
}
fn get_whitespace_minification_for_tag(
&self,
mode: &CollapseWhitespaces,
@ -818,49 +867,24 @@ impl Minifier {
}
fn minify_children(&mut self, children: &mut Vec<Child>) {
let namespace = self.current_element.as_ref().unwrap().namespace;
let tag_name = &self.current_element.as_ref().unwrap().tag_name;
let (namespace, tag_name) = match &self.current_element {
Some(element) => (element.namespace, &element.tag_name),
_ => return,
};
let mode = self
.collapse_whitespaces
.as_ref()
.map(|mode| self.get_whitespace_minification_for_tag(mode, namespace, tag_name));
let mut index = 0;
let mut cloned_children = None;
if mode.is_some() {
cloned_children = Some(children.clone());
}
let mut prev = None;
let mut next = None;
if namespace == Namespace::HTML && &**tag_name == "body" {
if let Some(first) = children.first_mut() {
self.remove_whitespace_from_first_text_element(first);
}
if let Some(last) = children.last_mut() {
self.remove_whitespace_from_last_text_element(last)
}
}
children.retain_mut(|child| {
index += 1;
if mode.is_some() {
if let Some(cloned_children) = &cloned_children {
next = cloned_children.get(index);
}
}
let result = match child {
let child_will_be_retained =
|child: &mut Child, prev: Option<&Child>, next: Option<&Child>| {
match child {
Child::Comment(comment) if self.remove_comments => {
self.is_preserved_comment(&comment.data)
}
// Always remove whitespaces from html and head elements (except nested elements),
// it should be safe
// Always remove whitespaces from html and head elements (except nested
// elements), it should be safe
Child::Text(text)
if namespace == Namespace::HTML
&& matches!(&**tag_name, "html" | "head")
@ -868,10 +892,13 @@ impl Minifier {
{
false
}
Child::Text(text) if text.data.is_empty() => false,
Child::Text(text)
if !self.descendant_of_pre
&& get_white_space(namespace, &**tag_name) == WhiteSpace::Normal =>
&& get_white_space(namespace, tag_name) == WhiteSpace::Normal
&& mode.is_some() =>
{
let mode = mode.unwrap();
let mut is_smart_left_trim = false;
let mut is_smart_right_trim = false;
@ -882,7 +909,7 @@ impl Minifier {
..
})) = &prev
{
Some(self.get_display(*namespace, &**tag_name))
Some(self.get_display(*namespace, tag_name))
} else {
None
};
@ -893,7 +920,8 @@ impl Minifier {
// `Display::Block` - `display: block flow`
// `Display::ListItem` - `display: block flow list-item`
// `Display::Table` - `display: block table`
// + internal table display (only whitespace characters allowed there)
// + internal table display (only whitespace characters allowed
// there)
Some(
Display::Block
| Display::ListItem
@ -909,18 +937,22 @@ impl Minifier {
) => true,
// Inline box
Some(Display::Inline) => {
let deep = self.get_deep_last_text_element(prev.as_mut().unwrap());
if let Some(prev) = &prev {
let deep = self.get_deep_last_text_element(prev);
if let Some(deep) = deep {
deep.data.ends_with(is_whitespace)
} else {
false
}
} else {
false
}
}
// Inline level containers and etc
Some(_) => false,
None => {
let parent_display = self.get_display(namespace, &**tag_name);
let parent_display = self.get_display(namespace, tag_name);
match parent_display {
Display::Inline => {
@ -943,7 +975,7 @@ impl Minifier {
..
})) = &next
{
Some(self.get_display(*namespace, &**tag_name))
Some(self.get_display(*namespace, tag_name))
} else {
None
};
@ -954,7 +986,8 @@ impl Minifier {
// `Display::Block` - `display: block flow`
// `Display::ListItem` - `display: block flow list-item`
// `Display::Table` - `display: block table`
// + internal table display (only whitespace characters allowed there)
// + internal table display (only whitespace characters allowed
// there)
Some(
Display::Block
| Display::ListItem
@ -970,21 +1003,20 @@ impl Minifier {
) => true,
Some(_) => false,
None => {
let parent_display = self.get_display(namespace, &**tag_name);
let parent_display = self.get_display(namespace, tag_name);
!matches!(parent_display, Display::Inline)
}
};
}
let mut value = if (mode.is_some() && mode.unwrap().trim) || is_smart_left_trim
{
let mut value = if (mode.trim) || is_smart_left_trim {
text.data.trim_start_matches(is_whitespace)
} else {
&*text.data
};
value = if (mode.is_some() && mode.unwrap().trim) || is_smart_right_trim {
value = if (mode.trim) || is_smart_right_trim {
value.trim_end_matches(is_whitespace)
} else {
value
@ -992,7 +1024,7 @@ impl Minifier {
if value.is_empty() {
false
} else if mode.is_some() && mode.unwrap().collapse {
} else if mode.collapse {
text.data = self.collapse_whitespace(value).into();
true
@ -1003,14 +1035,64 @@ impl Minifier {
}
}
_ => true,
}
};
if result && mode.is_some() {
prev = Some(child.clone());
let cloned_children = children.clone();
let mut index = 0;
let mut pending_text = vec![];
children.retain_mut(|child| {
match child {
Child::Text(text)
if self
.get_next_text_node(&cloned_children, index + 1)
.is_some()
&& !child_will_be_retained(
&mut cloned_children.get(index + 1).cloned().unwrap(),
self.get_prev_non_comment_node(&cloned_children, index),
self.get_next_non_comment_node(&cloned_children, index + 2),
) =>
{
pending_text.push(text.data.clone());
index += 1;
return false;
}
Child::Text(text) if !pending_text.is_empty() => {
let mut new_value = String::new();
for text in take(&mut pending_text) {
new_value.push_str(&text);
}
new_value.push_str(&text.data);
text.data = new_value.into();
}
_ => {}
}
let prev = if index >= 1 {
self.get_prev_non_comment_node(&cloned_children, index - 1)
} else {
None
};
let next = self.get_next_non_comment_node(&cloned_children, index + 1);
let result = child_will_be_retained(child, prev, next);
index += 1;
result
});
// Remove all leading and trailing whitespaces for the `body` element
if namespace == Namespace::HTML && tag_name == "body" {
self.remove_leading_and_trailing_whitespaces(children);
}
}
fn get_attribute_value(&self, attributes: &Vec<Attribute>, name: &str) -> Option<JsWord> {

14
crates/swc_html_minifier/tests/fixture/comment/basic/input.html
View File

@ -79,5 +79,19 @@
According to the conditional comment this is not IE 5-9<br />
<!-- <![endif]-->
</p>
<div>a <!-- test --> b <!-- test --> c</div>
<div>
a
<!-- test -->
b
<!-- test -->
c
</div>
</body>
</html>

14
crates/swc_html_minifier/tests/fixture/comment/basic/output.min.html
View File

@ -52,4 +52,18 @@
<!--[if !IE]> -->
According to the conditional comment this is not IE 5-9<br>
<!-- <![endif]-->
</p>
<div>a b c</div>
<div>
a
b
c
</div>

5
crates/swc_html_minifier/tests/fixture/comment/html/output.min.html
View File

@ -1,4 +1 @@
<!doctype html><html lang=en><title>Document</title><body>
<div>test</div>
<!doctype html><html lang=en><title>Document</title><div>test</div>

3
crates/swc_html_minifier/tests/fixture/comment/spaces/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

8
crates/swc_html_minifier/tests/fixture/comment/spaces/input.html Normal file
View File

@ -0,0 +1,8 @@
<!doctype html>
<html lang="en">
<head>
<title>Document</title>
<!-- a --> <!-- b --> <!-- c --><link>
</head>
<body><div>foo<div> baz </div> bar</div></body>
</html>

1
crates/swc_html_minifier/tests/fixture/comment/spaces/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html><html lang=en><title>Document</title><link><div>foo<div>baz</div>bar</div>

3
crates/swc_html_minifier/tests/fixture/text/angular/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

22
crates/swc_html_minifier/tests/fixture/text/angular/input.html Normal file
View File

@ -0,0 +1,22 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Document</title>
</head>
<body>
<template ngFor #hero [ngForOf]="heroes">
<hero-detail *ngIf="hero" [hero]="hero"></hero-detail>
</template>
<form (ngSubmit)="onSubmit(theForm)" #theForm="ngForm">
<div class="form-group">
<label for="name">Name</label>
<input class="form-control"
required
ngControl="firstName"
[(ngModel)]="currentHero.firstName">
</div>
<button type="submit" [disabled]="!theForm.form.valid">Submit</button>
</form>
</body>
</html>

1
crates/swc_html_minifier/tests/fixture/text/angular/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html><html lang=en><meta charset=UTF-8><title>Document</title><body><template ngfor #hero [ngforof]=heroes><hero-detail *ngif=hero [hero]=hero></hero-detail></template><form (ngsubmit)=onSubmit(theForm) #theform=ngForm><div class=form-group><label for=name>Name</label> <input class=form-control required ngcontrol=firstName [(ngmodel)]=currentHero.firstName></div><button [disabled]=!theForm.form.valid>Submit</button></form>

31
crates/swc_html_minifier/tests/fixture/text/collapse-whitespace-all/input.html
View File

@ -255,5 +255,36 @@
<div>test </div><span><span><span><span>foo <span>baz</span></span></span></span></span>
<span><span><span><span>foo <span>baz</span></span></span></span></span><div>test </div>
<div><div>
<!--test-->
</div></div>
<pre>
foo
<!-- bar -->
baz
</pre>
<div> a <input> c </div>
<div>Empty <!-- NOT --> </div>
<!--[if lte IE 6]>
<span>A</span> <span title=" sigificant whitespace ">blah blah</span>
<![endif]-->
<div> <a href="#"> <span> <b> foo </b> <i> bar </i> </span> </a> </div>
<div>a <!-- text --><!-- text --> b</div>
<div>a <!-- text --> b <!-- text --> c <!-- text --> d</div>
<div> <!-- test --> text <!-- test --></div>
<span> <!-- test --> text </span>
<span> text <!-- test --> </span>
</body>
</html>

6
crates/swc_html_minifier/tests/fixture/text/collapse-whitespace-all/output.min.html
View File

@ -25,4 +25,8 @@
test
</xmp><div>foo<a>baz</a>bar foo<a>baz</a>bar foo<a>baz</a>bar</div><div>foo<a>baz</a>bar foo<a>baz</a>bar foo<a>baz</a>bar</div><div>foo<img src=https://prettier.io/icon.png></div><div>text<img src=https://colourlex.com/wp-content/uploads/2021/02/vine-black-painted-swatch.jpg alt=test>test</div><span>test<script>console.log("test")</script>test</span><span>test<script>console.log("test")</script>test</span><div><p>blah</div><div>test<br>test</div><div>test<wbr>test</div><div>a<input>c</div><div><div>a</div><div>b</div></div><div><span>a</span><span>b</span></div><div><div>test</div><span>test</span></div><div><div>test</div><span>test</span></div><div><span>test</span><div>test</div></div><div><span>test</span><span>test</span></div><div><div>test</div><div>test</div></div><div><span>test</span><p>test<p>test<p>test</div><div><p>test<p>test<p>test</p><span>test</span></div><div><a href=test>test</a><a href=test>test</a></div><div><a href=test>test</a><a href=test>test</a></div><div><p>blah</div><div>test<button>test</button></div><div><button>test</button><button>test</button></div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div><span>foo</span></div><p>foo<img>bar<p>foo<img>bar<p>foo<img>bar<p>foo<img>bar<p>foo<wbr>bar<p>foo<br>bar<p>foo<nobr>a</nobr>bar<div> fo o </div><div> fo o </div><p><p>ab<div class=leaveAlone></div><div>foo bar</div><div class=leaveAlone><div></div><span></span>foo bar</div><div class=leaveAlone><span></span>foo bar</div><p>foo<span></span><p>foo<span></span><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo<button>test</button>foo</div><div>foo<span>foo</span>foo</div><div>foo<span>foo</span>foo</div><div><span>a</span>b<span>c</span></div><div><span>a</span>b<span>c</span></div><div><span>a</span>b<span>c</span></div><div>foo<span>baz</span></div><div>foo<span>baz</span></div><div>foo<span>baz</span></div><div>foo<span>baz</span></div><span>test</span><span><span><span><span>foo<span>baz</span></span></span></span></span><span><span><span><span>foo<span>baz</span></span></span></span></span><span>test</span><div>test</div><span><span><span><span>foo<span>baz</span></span></span></span></span><span><span><span><span>foo<span>baz</span></span></span></span></span><div>test</div>
</xmp><div>foo<a>baz</a>bar foo<a>baz</a>bar foo<a>baz</a>bar</div><div>foo<a>baz</a>bar foo<a>baz</a>bar foo<a>baz</a>bar</div><div>foo<img src=https://prettier.io/icon.png></div><div>text<img src=https://colourlex.com/wp-content/uploads/2021/02/vine-black-painted-swatch.jpg alt=test>test</div><span>test<script>console.log("test")</script>test</span><span>test<script>console.log("test")</script>test</span><div><p>blah</div><div>test<br>test</div><div>test<wbr>test</div><div>a<input>c</div><div><div>a</div><div>b</div></div><div><span>a</span><span>b</span></div><div><div>test</div><span>test</span></div><div><div>test</div><span>test</span></div><div><span>test</span><div>test</div></div><div><span>test</span><span>test</span></div><div><div>test</div><div>test</div></div><div><span>test</span><p>test<p>test<p>test</div><div><p>test<p>test<p>test</p><span>test</span></div><div><a href=test>test</a><a href=test>test</a></div><div><a href=test>test</a><a href=test>test</a></div><div><p>blah</div><div>test<button>test</button></div><div><button>test</button><button>test</button></div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo</div><div><span>foo</span></div><p>foo<img>bar<p>foo<img>bar<p>foo<img>bar<p>foo<img>bar<p>foo<wbr>bar<p>foo<br>bar<p>foo<nobr>a</nobr>bar<div> fo o </div><div> fo o </div><p><p>a b<div class=leaveAlone></div><div>foo bar</div><div class=leaveAlone><div></div><span></span>foo bar</div><div class=leaveAlone><span></span>foo bar</div><p>foo<span></span><p>foo<span></span><div>foo<button>test</button>foo</div><div>foo<button>test</button>foo<button>test</button>foo</div><div>foo<span>foo</span>foo</div><div>foo<span>foo</span>foo</div><div><span>a</span>b<span>c</span></div><div><span>a</span>b<span>c</span></div><div><span>a</span>b<span>c</span></div><div>foo<span>baz</span></div><div>foo<span>baz</span></div><div>foo<span>baz</span></div><div>foo<span>baz</span></div><span>test</span><span><span><span><span>foo<span>baz</span></span></span></span></span><span><span><span><span>foo<span>baz</span></span></span></span></span><span>test</span><div>test</div><span><span><span><span>foo<span>baz</span></span></span></span></span><span><span><span><span>foo<span>baz</span></span></span></span></span><div>test</div><div><div></div></div><pre>
foo
baz
</pre><div>a<input>c</div><div>Empty</div><!--[if lte IE 6]><span>A</span><span title=" sigificant whitespace ">blah blah</span><![endif]--><div><a href=#><span><b>foo</b><i>bar</i></span></a></div><div>a b</div><div>a b c d</div><div>text</div><span>text</span><span>text</span>

35
crates/swc_html_minifier/tests/fixture/text/collapse-whitespace-conservative/input.html
View File

@ -255,5 +255,40 @@
<div>test </div><span><span><span><span>foo <span>baz</span></span></span></span></span>
<span><span><span><span>foo <span>baz</span></span></span></span></span><div>test </div>
<div><b> foo
</b></div>
<div><div>
<!--test-->
</div></div>
<pre>
foo
<!-- bar -->
baz
</pre>
<div> a <input> c </div>
<div>Empty <!-- NOT --> </div>
<!--[if lte IE 6]>
<span>A</span> <span title=" sigificant whitespace ">blah blah</span>
<![endif]-->
<div> <a href="#"> <span> <b> foo </b> <i> bar </i> </span> </a> </div>
<div>a <!-- text --><!-- text --> b</div>
<div>a <!-- text --> b <!-- text --> c <!-- text --> d</div>
<div> <!-- test --> text <!-- test --></div>
<span> <!-- test --> text </span>
<span> text <!-- test --> </span>
</body>
</html>

6
crates/swc_html_minifier/tests/fixture/text/collapse-whitespace-conservative/output.min.html
View File

@ -25,4 +25,8 @@
test
</xmp> <div> foo <a> baz </a> bar foo <a> baz </a> bar foo <a> baz </a> bar </div> <div> foo <a> baz </a> bar foo <a> baz </a> bar foo <a> baz </a> bar </div> <div> foo <img src=https://prettier.io/icon.png> </div> <div> text <img src=https://colourlex.com/wp-content/uploads/2021/02/vine-black-painted-swatch.jpg alt=test> test </div> <span>test<script>console.log("test")</script>test</span> <span>test <script>console.log("test")</script> test</span> <div> <p>blah</p> </div> <div>test <br> test</div> <div>test <wbr> test</div> <div> a <input> c </div> <div> <div>a</div> <div>b</div> </div> <div><span> a </span> <span>b</span></div> <div><div>test</div> <span>test</span></div> <div> <div>test</div> <span>test</span> </div> <div> <span>test</span> <div>test</div> </div> <div> <span>test</span> <span>test</span> </div> <div> <div>test</div> <div>test</div> </div> <div> <span>test</span> <p>test</p> <p>test</p> <p>test</p> </div> <div> <p>test</p> <p>test</p> <p>test</p> <span>test</span> </div> <div> <a href=test> test </a> <a href=test>test</a> </div> <div> <a href=test>test</a><a href=test>test</a> </div> <div> <p>blah</p> </div> <div>test <button>test</button></div> <div><button>test</button> <button>test</button></div> <div>foo <button>test</button> foo</div> <div>foo<button>test</button>foo</div> <div>foo <button>test</button>foo</div> <div>foo<button>test</button> foo</div> <div>foo<button> test </button>foo</div> <div>foo <button> test </button>foo</div> <div>foo<button> test </button> foo</div> <div><span> foo </span></div> <p>foo <img> bar</p> <p>foo<img>bar</p> <p>foo <img>bar</p> <p>foo<img> bar</p> <p>foo <wbr> bar</p> <p>foo <br> bar</p> <p>foo <nobr>a</nobr> bar</p> <div> fo o </div> <div> fo o </div> <p></p> <p>a b</p> <div class=leaveAlone></div><div> foo bar </div> <div class=leaveAlone><div></div><span> </span> foo bar</div> <div class=leaveAlone><span> </span> foo bar</div> <p>foo <span></span></p> <p>foo<span></span></p> <div>foo <button> test </button> foo</div> <div>foo <button> test </button> foo <button> test </button> foo</div> <div> foo <span>foo</span> foo</div> <div> foo<span> foo</span>foo </div> <div> <span>a </span> b<span> c</span> </div> <div> <span>a </span> b <span> c</span> </div> <div> <span>a </span> b <span>c</span> </div> <div>foo <span> baz</span></div> <div>foo <span>baz</span></div> <div>foo<span> baz</span></div> <div>foo<span>baz</span></div> <span>test </span><span><span><span><span>foo <span>baz</span></span></span></span></span> <span><span><span><span>foo <span>baz</span></span></span></span></span><span>test </span> <div>test </div><span><span><span><span>foo <span>baz</span></span></span></span></span> <span><span><span><span>foo <span>baz</span></span></span></span></span><div>test </div>
</xmp> <div> foo <a> baz </a> bar foo <a> baz </a> bar foo <a> baz </a> bar </div> <div> foo <a> baz </a> bar foo <a> baz </a> bar foo <a> baz </a> bar </div> <div> foo <img src=https://prettier.io/icon.png> </div> <div> text <img src=https://colourlex.com/wp-content/uploads/2021/02/vine-black-painted-swatch.jpg alt=test> test </div> <span>test<script>console.log("test")</script>test</span> <span>test <script>console.log("test")</script> test</span> <div> <p>blah</p> </div> <div>test <br> test</div> <div>test <wbr> test</div> <div> a <input> c </div> <div> <div>a</div> <div>b</div> </div> <div><span> a </span> <span>b</span></div> <div><div>test</div> <span>test</span></div> <div> <div>test</div> <span>test</span> </div> <div> <span>test</span> <div>test</div> </div> <div> <span>test</span> <span>test</span> </div> <div> <div>test</div> <div>test</div> </div> <div> <span>test</span> <p>test</p> <p>test</p> <p>test</p> </div> <div> <p>test</p> <p>test</p> <p>test</p> <span>test</span> </div> <div> <a href=test> test </a> <a href=test>test</a> </div> <div> <a href=test>test</a><a href=test>test</a> </div> <div> <p>blah</p> </div> <div>test <button>test</button></div> <div><button>test</button> <button>test</button></div> <div>foo <button>test</button> foo</div> <div>foo<button>test</button>foo</div> <div>foo <button>test</button>foo</div> <div>foo<button>test</button> foo</div> <div>foo<button> test </button>foo</div> <div>foo <button> test </button>foo</div> <div>foo<button> test </button> foo</div> <div><span> foo </span></div> <p>foo <img> bar</p> <p>foo<img>bar</p> <p>foo <img>bar</p> <p>foo<img> bar</p> <p>foo <wbr> bar</p> <p>foo <br> bar</p> <p>foo <nobr>a</nobr> bar</p> <div> fo o </div> <div> fo o </div> <p></p> <p>a b</p> <div class=leaveAlone></div><div> foo bar </div> <div class=leaveAlone><div></div><span> </span> foo bar</div> <div class=leaveAlone><span> </span> foo bar</div> <p>foo <span></span></p> <p>foo<span></span></p> <div>foo <button> test </button> foo</div> <div>foo <button> test </button> foo <button> test </button> foo</div> <div> foo <span>foo</span> foo</div> <div> foo<span> foo</span>foo </div> <div> <span>a </span> b<span> c</span> </div> <div> <span>a </span> b <span> c</span> </div> <div> <span>a </span> b <span>c</span> </div> <div>foo <span> baz</span></div> <div>foo <span>baz</span></div> <div>foo<span> baz</span></div> <div>foo<span>baz</span></div> <span>test </span><span><span><span><span>foo <span>baz</span></span></span></span></span> <span><span><span><span>foo <span>baz</span></span></span></span></span><span>test </span> <div>test </div><span><span><span><span>foo <span>baz</span></span></span></span></span> <span><span><span><span>foo <span>baz</span></span></span></span></span><div>test </div> <div><b> foo </b></div> <div><div> </div></div> <pre>
foo
baz
</pre> <div> a <input> c </div> <div>Empty </div> <!--[if lte IE 6]> <span>A</span> <span title=" sigificant whitespace ">blah blah</span> <![endif]--> <div> <a href=#> <span> <b> foo </b> <i> bar </i> </span> </a> </div> <div>a b</div> <div>a b c d</div> <div> text </div> <span> text </span> <span> text </span>

31
crates/swc_html_minifier/tests/fixture/text/collapse-whitespace-smart/input.html
View File

@ -255,5 +255,36 @@
<div>test </div><span><span><span><span>foo <span>baz</span></span></span></span></span>
<span><span><span><span>foo <span>baz</span></span></span></span></span><div>test </div>
<div><div>
<!--test-->
</div></div>
<pre>
foo
<!-- bar -->
baz
</pre>
<div> a <input> c </div>
<div>Empty <!-- NOT --> </div>
<!--[if lte IE 6]>
<span>A</span> <span title=" sigificant whitespace ">blah blah</span>
<![endif]-->
<div> <a href="#"> <span> <b> foo </b> <i> bar </i> </span> </a> </div>
<div>a <!-- text --><!-- text --> b</div>
<div>a <!-- text --> b <!-- text --> c <!-- text --> d</div>
<div> <!-- test --> text <!-- test --></div>
<span> <!-- test --> text </span>
<span> text <!-- test --> </span>
</body>
</html>

6
crates/swc_html_minifier/tests/fixture/text/collapse-whitespace-smart/output.min.html
View File

@ -25,4 +25,8 @@
test
</xmp><div>foo <a>baz </a>bar foo <a>baz </a>bar foo <a>baz </a>bar</div><div>foo <a>baz </a>bar foo <a>baz </a>bar foo <a>baz </a>bar</div><div>foo <img src=https://prettier.io/icon.png></div><div>text <img src=https://colourlex.com/wp-content/uploads/2021/02/vine-black-painted-swatch.jpg alt=test> test</div><span>test<script>console.log("test")</script>test</span> <span>test <script>console.log("test")</script> test</span><div><p>blah</div><div>test <br> test</div><div>test <wbr> test</div><div>a <input> c</div><div><div>a</div><div>b</div></div><div><span> a </span><span>b</span></div><div><div>test</div><span>test</span></div><div><div>test</div><span>test</span></div><div><span>test</span><div>test</div></div><div><span>test</span> <span>test</span></div><div><div>test</div><div>test</div></div><div><span>test</span><p>test<p>test<p>test</div><div><p>test<p>test<p>test</p><span>test</span></div><div><a href=test> test </a><a href=test>test</a></div><div><a href=test>test</a><a href=test>test</a></div><div><p>blah</div><div>test <button>test</button></div><div><button>test</button> <button>test</button></div><div>foo <button>test</button> foo</div><div>foo<button>test</button>foo</div><div>foo <button>test</button>foo</div><div>foo<button>test</button> foo</div><div>foo<button>test</button>foo</div><div>foo <button>test</button>foo</div><div>foo<button>test</button> foo</div><div><span> foo </span></div><p>foo <img> bar<p>foo<img>bar<p>foo <img>bar<p>foo<img> bar<p>foo <wbr> bar<p>foo <br> bar<p>foo <nobr>a</nobr> bar<div> fo o </div><div> fo o </div><p><p>ab<div class=leaveAlone></div><div>foo bar</div><div class=leaveAlone><div></div><span> </span>foo bar</div><div class=leaveAlone><span> </span>foo bar</div><p>foo <span></span><p>foo<span></span><div>foo <button>test</button> foo</div><div>foo <button>test</button> foo <button>test</button> foo</div><div>foo <span>foo</span> foo</div><div>foo<span> foo</span>foo</div><div><span>a </span>b<span> c</span></div><div><span>a </span>b <span>c</span></div><div><span>a </span>b <span>c</span></div><div>foo <span>baz</span></div><div>foo <span>baz</span></div><div>foo<span> baz</span></div><div>foo<span>baz</span></div><span>test </span><span><span><span><span>foo <span>baz</span></span></span></span></span> <span><span><span><span>foo <span>baz</span></span></span></span></span><span>test </span><div>test</div><span><span><span><span>foo <span>baz</span></span></span></span></span> <span><span><span><span>foo <span>baz</span></span></span></span></span><div>test</div>
</xmp><div>foo <a>baz </a>bar foo <a>baz </a>bar foo <a>baz </a>bar</div><div>foo <a>baz </a>bar foo <a>baz </a>bar foo <a>baz </a>bar</div><div>foo <img src=https://prettier.io/icon.png></div><div>text <img src=https://colourlex.com/wp-content/uploads/2021/02/vine-black-painted-swatch.jpg alt=test> test</div><span>test<script>console.log("test")</script>test</span> <span>test <script>console.log("test")</script> test</span><div><p>blah</div><div>test <br> test</div><div>test <wbr> test</div><div>a <input> c</div><div><div>a</div><div>b</div></div><div><span> a </span><span>b</span></div><div><div>test</div><span>test</span></div><div><div>test</div><span>test</span></div><div><span>test</span><div>test</div></div><div><span>test</span> <span>test</span></div><div><div>test</div><div>test</div></div><div><span>test</span><p>test<p>test<p>test</div><div><p>test<p>test<p>test</p><span>test</span></div><div><a href=test> test </a><a href=test>test</a></div><div><a href=test>test</a><a href=test>test</a></div><div><p>blah</div><div>test <button>test</button></div><div><button>test</button> <button>test</button></div><div>foo <button>test</button> foo</div><div>foo<button>test</button>foo</div><div>foo <button>test</button>foo</div><div>foo<button>test</button> foo</div><div>foo<button>test</button>foo</div><div>foo <button>test</button>foo</div><div>foo<button>test</button> foo</div><div><span> foo </span></div><p>foo <img> bar<p>foo<img>bar<p>foo <img>bar<p>foo<img> bar<p>foo <wbr> bar<p>foo <br> bar<p>foo <nobr>a</nobr> bar<div> fo o </div><div> fo o </div><p><p>a b<div class=leaveAlone></div><div>foo bar</div><div class=leaveAlone><div></div><span> </span>foo bar</div><div class=leaveAlone><span> </span>foo bar</div><p>foo <span></span><p>foo<span></span><div>foo <button>test</button> foo</div><div>foo <button>test</button> foo <button>test</button> foo</div><div>foo <span>foo</span> foo</div><div>foo<span> foo</span>foo</div><div><span>a </span>b<span> c</span></div><div><span>a </span>b <span>c</span></div><div><span>a </span>b <span>c</span></div><div>foo <span>baz</span></div><div>foo <span>baz</span></div><div>foo<span> baz</span></div><div>foo<span>baz</span></div><span>test </span><span><span><span><span>foo <span>baz</span></span></span></span></span> <span><span><span><span>foo <span>baz</span></span></span></span></span><span>test </span><div>test</div><span><span><span><span>foo <span>baz</span></span></span></span></span> <span><span><span><span>foo <span>baz</span></span></span></span></span><div>test</div><div><div></div></div><pre>
foo
baz
</pre><div>a <input> c</div><div>Empty</div><!--[if lte IE 6]> <span>A</span> <span title=" sigificant whitespace ">blah blah</span><![endif]--><div><a href=#> <span><b>foo </b><i> bar </i></span></a></div><div>a b</div><div>a b c d</div><div>text</div><span> text </span><span>text </span>

3
crates/swc_html_minifier/tests/fixture/text/empty-1/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

2
crates/swc_html_minifier/tests/fixture/text/empty-1/input.html Normal file
View File

@ -0,0 +1,2 @@
<!doctype html>
<body></body>

1
crates/swc_html_minifier/tests/fixture/text/empty-1/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html>

3
crates/swc_html_minifier/tests/fixture/text/empty-2/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

2
crates/swc_html_minifier/tests/fixture/text/empty-2/input.html Normal file
View File

@ -0,0 +1,2 @@
<!doctype html>
<html><head></head><body></body></html>

1
crates/swc_html_minifier/tests/fixture/text/empty-2/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html>

3
crates/swc_html_minifier/tests/fixture/text/empty-3/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

1
crates/swc_html_minifier/tests/fixture/text/empty-3/input.html Normal file
View File

@ -0,0 +1 @@
<!doctype html> <html></html>

1
crates/swc_html_minifier/tests/fixture/text/empty-3/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html>

3
crates/swc_html_minifier/tests/fixture/text/empty-4/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

1
crates/swc_html_minifier/tests/fixture/text/empty-4/input.html Normal file
View File

@ -0,0 +1 @@
<!doctype html><html> </html>

1
crates/swc_html_minifier/tests/fixture/text/empty-4/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html>

3
crates/swc_html_minifier/tests/fixture/text/empty-5/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

1
crates/swc_html_minifier/tests/fixture/text/empty-5/input.html Normal file
View File

@ -0,0 +1 @@
<!doctype html> <html> <body> </body> </html>

1
crates/swc_html_minifier/tests/fixture/text/empty-5/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html>

3
crates/swc_html_minifier/tests/fixture/text/empty/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

2
crates/swc_html_minifier/tests/fixture/text/empty/input.html Normal file
View File

@ -0,0 +1,2 @@
<!doctype html>
<html><body></body></html>

1
crates/swc_html_minifier/tests/fixture/text/empty/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html>

3
crates/swc_html_minifier/tests/fixture/text/inline-17/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

11
crates/swc_html_minifier/tests/fixture/text/inline-17/input.html Normal file
View File

@ -0,0 +1,11 @@
<!doctype html>
<html lang="en">
<head>
<title>Document</title>
</head>
<body><span class="input-group-btn">
<button class="btn btn-default" type="button">
<span class="glyphicon glyphicon-search"></span>
</button>
</span></body>
</html>

1
crates/swc_html_minifier/tests/fixture/text/inline-17/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html><html lang=en><title>Document</title><span class=input-group-btn><button class="btn btn-default" type=button><span class="glyphicon glyphicon-search"></span></button></span>

3
crates/swc_html_minifier/tests/fixture/text/inline-18/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

11
crates/swc_html_minifier/tests/fixture/text/inline-18/input.html Normal file
View File

@ -0,0 +1,11 @@
<!doctype html>
<html lang="en">
<head>
<title>Document</title>
</head>
<body>a<span class="input-group-btn">
<button class="btn btn-default" type="button">
<span class="glyphicon glyphicon-search"></span>
</button>
</span>a</body>
</html>

1
crates/swc_html_minifier/tests/fixture/text/inline-18/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html><html lang=en><title>Document</title>a<span class=input-group-btn> <button class="btn btn-default" type=button><span class="glyphicon glyphicon-search"></span></button> </span>a

3
crates/swc_html_minifier/tests/fixture/text/inline-block-17/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

7
crates/swc_html_minifier/tests/fixture/text/inline-block-17/input.html Normal file
View File

@ -0,0 +1,7 @@
<!doctype html>
<html lang="en">
<head>
<title>Document</title>
</head>
<body><button>a</button> <button>b</button></body>
</html>

1
crates/swc_html_minifier/tests/fixture/text/inline-block-17/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html><html lang=en><title>Document</title><button>a</button> <button>b</button>

3
crates/swc_html_minifier/tests/fixture/text/inline-block-18/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

7
crates/swc_html_minifier/tests/fixture/text/inline-block-18/input.html Normal file
View File

@ -0,0 +1,7 @@
<!doctype html>
<html lang="en">
<head>
<title>Document</title>
</head>
<body><button>a</button><button>b</button></body>
</html>

1
crates/swc_html_minifier/tests/fixture/text/inline-block-18/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html><html lang=en><title>Document</title><button>a</button><button>b</button>

3
crates/swc_html_minifier/tests/fixture/text/math/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

7
crates/swc_html_minifier/tests/fixture/text/math/input.html Normal file
View File

@ -0,0 +1,7 @@
<!doctype html>
<html lang="en">
<head>
<title>Document</title>
</head>
<body><p>where <math> <mi>R</mi> </math> is the Rici tensor.</p></body>
</html>

1
crates/swc_html_minifier/tests/fixture/text/math/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html><html lang=en><title>Document</title><p>where <math><mi>R</mi> </math>is the Rici tensor.

3
crates/swc_html_minifier/tests/fixture/text/noscript-1/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

18
crates/swc_html_minifier/tests/fixture/text/noscript-1/input.html Normal file
View File

@ -0,0 +1,18 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
</head>
<body>
<div>
<span>test</span><noscript><a href="#" onclick="javascript:">External Link</a></noscript>
</div>
<div>
<span>test</span><noscript> <a href="#" onclick="javascript:">External Link</a></noscript>
</div>
</body>
</html>

1
crates/swc_html_minifier/tests/fixture/text/noscript-1/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html><html lang=en><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0"><meta http-equiv=X-UA-Compatible content="ie=edge"><title>Document</title><div><span>test</span><noscript><a href=#>External Link</a></noscript></div><div><span>test</span><noscript> <a href=#>External Link</a></noscript></div>

3
crates/swc_html_minifier/tests/fixture/text/select-1/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "conservative"
}

10
crates/swc_html_minifier/tests/fixture/text/select-1/input.html Normal file
View File

@ -0,0 +1,10 @@
<!doctype html>
<html lang="en">
<head>
<title>Document</title>
</head>
<body><span>test</span><select>
<option>foo</option>
<option>bar</option>
</select></body>
</html>

1
crates/swc_html_minifier/tests/fixture/text/select-1/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html><html lang=en><title>Document</title><span>test</span><select> <option>foo</option> <option>bar</option> </select>

3
crates/swc_html_minifier/tests/fixture/text/select/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"collapseWhitespaces": "smart"
}

10
crates/swc_html_minifier/tests/fixture/text/select/input.html Normal file
View File

@ -0,0 +1,10 @@
<!doctype html>
<html lang="en">
<head>
<title>Document</title>
</head>
<body><select>
<option>foo</option>
<option>bar</option>
</select></body>
</html>

1
crates/swc_html_minifier/tests/fixture/text/select/output.min.html Normal file
View File

@ -0,0 +1 @@
<!doctype html><html lang=en><title>Document</title><select><option>foo<option>bar</select>