fix: bugs

swc-project · Dec 13, 2022 · 53c066a · 53c066a
1 parent 13d74db
commit 53c066a
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 15 deletions.
diff --git a/crates/swc_atoms/words.txt b/crates/swc_atoms/words.txt
@@ -798,6 +798,7 @@ code
 codebase
 col
 colgroup
+collection
 color
 color-index
 color-mix
@@ -893,6 +894,7 @@ ellipse
 else
 em
 embed
+embedded-opentype
 empty-cells
 encoding
 end
@@ -1424,6 +1426,7 @@ onwebkitanimationstart
 onwebkittransitionend
 onwheel
 opacity
+opentype
 optgroup
 option
 or
@@ -1790,6 +1793,7 @@ translateZ
 transparent
 tref
 true
+truetype
 try
 tspan
 tt
@@ -1838,6 +1842,8 @@ widows
 width
 will-change
 with
+woff
+woff2
 word-break
 word-spacing
 word-wrap

diff --git a/crates/swc_css_prefixer/data/prefixes_and_browsers.json b/crates/swc_css_prefixer/data/prefixes_and_browsers.json
@@ -3891,5 +3891,21 @@
       "firefox": "69",
       "samsung": "11.2"
     }
+  ],
+  "font-face-format-ident": [
+    {
+      "chrome": "4",
+      "edge": "12",
+      "firefox": "2",
+      "samsung": "4",
+      "ios": "3.2",
+      "opera": "10",
+      "safari": "3.1",
+      "ie": "6"
+    },
+    {
+      "safari": "3.2",
+      "ios": "4.3"
+    }
   ]
 }
diff --git a/crates/swc_css_prefixer/src/prefixer.rs b/crates/swc_css_prefixer/src/prefixer.rs
@@ -1,11 +1,10 @@
 #![allow(clippy::match_like_matches_macro)]
-
 use core::f64::consts::PI;
 use std::mem::take;
 
 use once_cell::sync::Lazy;
 use preset_env_base::{query::targets_to_versions, version::Version, BrowserData, Versions};
-use swc_atoms::js_word;
+use swc_atoms::{js_word, JsWord};
 use swc_common::{
     collections::{AHashMap, AHashSet},
     EqIgnoreSpan, DUMMY_SP,
@@ -265,7 +264,7 @@ impl VisitMut for ImageSetFunctionReplacerOnLegacyVariant<'_> {
     fn visit_mut_function(&mut self, n: &mut Function) {
         let old_in_function = self.in_function;
 
-        self.in_function = true;
+        self.in_function = n.name.value.eq_str_ignore_ascii_case(self.from);
 
         n.visit_mut_children_with(self);
 
@@ -515,9 +514,9 @@ where
     node.visit_mut_with(&mut MediaFeatureResolutionReplacerOnLegacyVariant { from, to });
 }
 
-pub struct FontFaceFormat {}
+pub struct FontFaceFormatOldSyntax {}
 
-impl VisitMut for FontFaceFormat {
+impl VisitMut for FontFaceFormatOldSyntax {
     fn visit_mut_function(&mut self, n: &mut Function) {
         n.visit_mut_children_with(self);
 
@@ -530,8 +529,22 @@ impl VisitMut for FontFaceFormat {
         }
 
         if let Some(ComponentValue::Ident(box ident)) = n.value.get(0) {
+            let new_value: JsWord = ident.value.clone().to_ascii_lowercase();
+            let new_value = match new_value {
+                js_word!("woff")
+                | js_word!("truetype")
+                | js_word!("opentype")
+                | js_word!("woff2")
+                | js_word!("embedded-opentype")
+                | js_word!("collection")
+                | js_word!("svg") => new_value,
+                _ => {
+                    return;
+                }
+            };
+
             let new_value = Str {
-                value: ident.value.clone(),
+                value: new_value,
                 span: ident.span,
                 raw: None,
             };
@@ -541,11 +554,11 @@ impl VisitMut for FontFaceFormat {
     }
 }
 
-pub fn font_face_format<N>(node: &mut N)
+pub fn font_face_format_old_syntax<N>(node: &mut N)
 where
-    N: VisitMutWith<FontFaceFormat>,
+    N: VisitMutWith<FontFaceFormatOldSyntax>,
 {
-    node.visit_mut_with(&mut FontFaceFormat {});
+    node.visit_mut_with(&mut FontFaceFormatOldSyntax {});
 }
 
 macro_rules! to_ident {
@@ -3090,10 +3103,10 @@ impl VisitMut for Prefixer {
                 add_declaration!(Prefix::Moz, "-moz-border-radius-bottomleft", None);
             }
 
-            "src" => {
+            "src" if should_prefix("font-face-format-ident", self.env, true) => {
                 let mut new_declaration = n.clone();
 
-                font_face_format(&mut new_declaration);
+                font_face_format_old_syntax(&mut new_declaration);
 
                 if n.value != new_declaration.value {
                     self.added_declarations.push(Box::new(new_declaration));

diff --git a/crates/swc_css_prefixer/tests/fixture/font-face-format/input.css b/crates/swc_css_prefixer/tests/fixture/font-face-format/input.css
@@ -17,3 +17,12 @@
 @font-face {
     src: format("woff");
 }
+
+@font-face {
+    src: url(a) format("woff"), url(b) format(svg);
+}
+
+@font-face {
+    src: url(a) format("woff"), url(b) format("svg");
+}
+
diff --git a/crates/swc_css_prefixer/tests/fixture/font-face-format/output.css b/crates/swc_css_prefixer/tests/fixture/font-face-format/output.css
@@ -11,10 +11,16 @@
   src: format(woff), format(truetype), format(opentype), format(woff2), format(embedded-opentype), format(collection), format(svg);
 }
 @Font-face{
-  src: FORMAT("WOFF");
+  src: FORMAT("woff");
   src: FORMAT(WOFF);
 }
 @font-face{
-  src: format(url("woff"));
   src: format("woff");
 }
+@font-face{
+  src: url(a) format("woff"), url(b) format("svg");
+  src: url(a) format("woff"), url(b) format(svg);
+}
+@font-face{
+  src: url(a) format("woff"), url(b) format("svg");
+}
diff --git a/crates/swc_css_prefixer/tests/fixture/font-face-format/output.defaults-not-ie-11.css b/crates/swc_css_prefixer/tests/fixture/font-face-format/output.defaults-not-ie-11.css
@@ -11,10 +11,16 @@
   src: format(woff), format(truetype), format(opentype), format(woff2), format(embedded-opentype), format(collection), format(svg);
 }
 @Font-face{
-  src: FORMAT("WOFF");
+  src: FORMAT("woff");
   src: FORMAT(WOFF);
 }
 @font-face{
-  src: format(url("woff"));
   src: format("woff");
 }
+@font-face{
+  src: url(a) format("woff"), url(b) format("svg");
+  src: url(a) format("woff"), url(b) format(svg);
+}
+@font-face{
+  src: url(a) format("woff"), url(b) format("svg");
+}
diff --git a/crates/swc_css_prefixer/tests/fixture/image-set/input.css b/crates/swc_css_prefixer/tests/fixture/image-set/input.css
@@ -36,4 +36,12 @@ h1 {
 
 .broken {
     content: image-set('foo@1x.png' 1x, "foo@2x.png" 2x) "test";
+}
+
+a {
+    background-image: image-set("foo@1x.png" 1x, url(foo@2x.png) 2x);
+}
+
+a {
+    background-image: image-set(url(foo@1x.png) 1x, unknown("foo@2x.png") 2x);
 }
diff --git a/crates/swc_css_prefixer/tests/fixture/image-set/output.css b/crates/swc_css_prefixer/tests/fixture/image-set/output.css
@@ -43,3 +43,11 @@ h1 {
   content: -webkit-image-set(url("foo@1x.png") 1x, url("foo@2x.png") 2x) "test";
   content: image-set('foo@1x.png' 1x, "foo@2x.png" 2x) "test";
 }
+a {
+  background-image: -webkit-image-set(url("foo@1x.png") 1x, url(foo@2x.png) 2x);
+  background-image: image-set("foo@1x.png" 1x, url(foo@2x.png) 2x);
+}
+a {
+  background-image: -webkit-image-set(url(foo@1x.png) 1x, unknown("foo@2x.png") 2x);
+  background-image: image-set(url(foo@1x.png) 1x, unknown("foo@2x.png") 2x);
+}
diff --git a/crates/swc_css_prefixer/tests/fixture/image-set/output.defaults-not-ie-11.css b/crates/swc_css_prefixer/tests/fixture/image-set/output.defaults-not-ie-11.css
@@ -40,3 +40,11 @@ h1 {
   content: -webkit-image-set(url("foo@1x.png") 1x, url("foo@2x.png") 2x) "test";
   content: image-set('foo@1x.png' 1x, "foo@2x.png" 2x) "test";
 }
+a {
+  background-image: -webkit-image-set(url("foo@1x.png") 1x, url(foo@2x.png) 2x);
+  background-image: image-set("foo@1x.png" 1x, url(foo@2x.png) 2x);
+}
+a {
+  background-image: -webkit-image-set(url(foo@1x.png) 1x, unknown("foo@2x.png") 2x);
+  background-image: image-set(url(foo@1x.png) 1x, unknown("foo@2x.png") 2x);
+}