fix: more

swc-project · Jun 26, 2022 · ad5953c · ad5953c
1 parent 0f13ad1
commit ad5953c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/crates/swc_html_minifier/src/lib.rs b/crates/swc_html_minifier/src/lib.rs
@@ -435,8 +435,11 @@ impl Minifier {
                 "link" if attribute_name == "rel" => true,
                 "iframe" if attribute_name == "sandbox" => true,
                 "link"
-                    if self.element_has_attribute_with_value(element, "rel", &["icon"])
-                        && attribute_name == "sizes" =>
+                    if self.element_has_attribute_with_value(
+                        element,
+                        "rel",
+                        &["icon", "apple-touch-icon", "apple-touch-icon-precomposed"],
+                    ) && attribute_name == "sizes" =>
                 {
                     true
                 }

diff --git a/crates/swc_html_minifier/src/option.rs b/crates/swc_html_minifier/src/option.rs
@@ -37,6 +37,7 @@ pub struct MinifyOptions {
     pub preserve_comments: Option<Vec<CachedRegex>>,
     #[serde(default = "true_by_default")]
     pub minify_conditional_comments: bool,
+    /// Sorting the values of `class`, `rel`, etc. of attributes
     #[serde(default = "true_by_default")]
     pub sort_unordered_attribute_values: bool,
 }

diff --git a/crates/swc_html_minifier/tests/fixture/attribute/link/input.html b/crates/swc_html_minifier/tests/fixture/attribute/link/input.html
@@ -13,6 +13,15 @@
     <link href="basic.css" rel="stylesheet alternate" title="Basic">
     <link rel="stylesheet foo bar" href="d.css">
     <link rel="stylesheet foo bar" href="d.css" blocking="render a">
+    <link rel="icon" href="demo_icon.gif" type="image/gif" sizes="32x32 16x16">
+    <link rel="apple-touch-icon-precomposed" sizes="512x512 114x114"
+          href="apple-icon-114.png" type="image/png">
+    <link rel="apple-touch-icon" sizes="512x512 114x114"
+          href="apple-icon-114.png" type="image/png">
+    <link rel="icon" href="/favicon.ico" sizes="any"><!-- 32×32 -->
+    <link rel="icon" href="/icon.svg" type="image/svg+xml">
+    <link rel="apple-touch-icon" href="/apple-touch-icon.png"><!-- 180×180 -->
+    <link rel="manifest" href="/manifest.webmanifest">
 </head>
 <body>
 <div>test</div>

diff --git a/crates/swc_html_minifier/tests/fixture/attribute/link/output.min.html b/crates/swc_html_minifier/tests/fixture/attribute/link/output.min.html
@@ -1,5 +1,6 @@
 <!doctype html><html lang=en><title>Document</title><link rel=stylesheet href=a.css><link rel=stylesheet href=b.css><link rel=stylesheet href=b.css><link rel=stylesheet href=c.css><link rel=stylesheet href=d.css type=""><link rel=stylesheet href=d.css type=unknown/unknown><div>test</div>
 <!doctype html><html lang=en><title>Document</title><link rel=stylesheet href=a.css><link rel=stylesheet href=b.css><link rel=stylesheet href=b.css><link rel=stylesheet href=c.css><link rel=stylesheet href=d.css type=""><link rel=stylesheet href=d.css type=unknown/unknown><link href=default.css rel=stylesheet title="Default Style"><link href=fancy.css rel="alternate stylesheet" title=Fancy><link href=basic.css rel="alternate stylesheet" title=Basic><link rel="bar foo stylesheet" href=d.css><body>
 <!doctype html><html lang=en><title>Document</title><link rel=stylesheet href=a.css><link rel=stylesheet href=b.css><link rel=stylesheet href=b.css><link rel=stylesheet href=c.css><link rel=stylesheet href=d.css type=""><link rel=stylesheet href=d.css type=unknown/unknown><link href=default.css rel=stylesheet title="Default Style"><link href=fancy.css rel="alternate stylesheet" title=Fancy><link href=basic.css rel="alternate stylesheet" title=Basic><link rel="bar foo stylesheet" href=d.css><link rel="bar foo stylesheet" href=d.css blocking="a render"><body>
+<!doctype html><html lang=en><title>Document</title><link rel=stylesheet href=a.css><link rel=stylesheet href=b.css><link rel=stylesheet href=b.css><link rel=stylesheet href=c.css><link rel=stylesheet href=d.css type=""><link rel=stylesheet href=d.css type=unknown/unknown><link href=default.css rel=stylesheet title="Default Style"><link href=fancy.css rel="alternate stylesheet" title=Fancy><link href=basic.css rel="alternate stylesheet" title=Basic><link rel="bar foo stylesheet" href=d.css><link rel="bar foo stylesheet" href=d.css blocking="a render"><link rel=icon href=demo_icon.gif type=image/gif sizes="16x16 32x32"><link rel=apple-touch-icon-precomposed sizes="114x114 512x512" href=apple-icon-114.png type=image/png><link rel=apple-touch-icon sizes="114x114 512x512" href=apple-icon-114.png type=image/png><link rel=icon href=/favicon.ico sizes=any><link rel=icon href=/icon.svg type=image/svg+xml><link rel=apple-touch-icon href=/apple-touch-icon.png><link rel=manifest href=/manifest.webmanifest><body>
 <div>test</div>