Merge branch 'main' into ctime3

swc-project · Mar 23, 2023 · 78b19e9 · 78b19e9
2 parents d4625e3 + d1ae6bb
commit 78b19e9
Show file tree

Hide file tree

Showing 29 changed files with 564 additions and 559 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 
 
 
+- **(css/codegen)** Preserve `raw` of numbers (#7131) ([150c2b6](https://github.com/swc-project/swc/commit/150c2b6fbaef976c6ee97438d1b9b7ffe4b210be))
+
+
 - **(es/react)** Respect `import_source` in new jsx (#7128) ([5d7acfd](https://github.com/swc-project/swc/commit/5d7acfd9cbbb9780879d0d7a046f716572a477f7))
 
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/swc_core/Cargo.toml b/crates/swc_core/Cargo.toml
@@ -6,7 +6,7 @@ edition       = "2021"
 license       = "Apache-2.0"
 name          = "swc_core"
 repository    = "https://github.com/swc-project/swc.git"
-version       = "0.69.26"
+version       = "0.69.27"
   [package.metadata.docs.rs]
   features = [
     "common_perf",
@@ -347,11 +347,11 @@ swc_bundler                      = { optional = true, version = "0.208.20", path
 swc_cached                       = { optional = true, version = "0.3.15", path = "../swc_cached" }
 swc_common                       = { optional = true, version = "0.29.38", path = "../swc_common" }
 swc_css_ast                      = { optional = true, version = "0.134.12", path = "../swc_css_ast" }
-swc_css_codegen                  = { optional = true, version = "0.144.15", path = "../swc_css_codegen" }
-swc_css_minifier                 = { optional = true, version = "0.109.16", path = "../swc_css_minifier" }
-swc_css_modules                  = { optional = true, version = "0.21.17", path = "../swc_css_modules" }
+swc_css_codegen                  = { optional = true, version = "0.144.16", path = "../swc_css_codegen" }
+swc_css_minifier                 = { optional = true, version = "0.109.17", path = "../swc_css_minifier" }
+swc_css_modules                  = { optional = true, version = "0.21.18", path = "../swc_css_modules" }
 swc_css_parser                   = { optional = true, version = "0.143.13", path = "../swc_css_parser" }
-swc_css_prefixer                 = { optional = true, version = "0.146.15", path = "../swc_css_prefixer" }
+swc_css_prefixer                 = { optional = true, version = "0.146.16", path = "../swc_css_prefixer" }
 swc_css_utils                    = { optional = true, version = "0.131.13", path = "../swc_css_utils/" }
 swc_css_visit                    = { optional = true, version = "0.133.12", path = "../swc_css_visit" }
 swc_ecma_ast                     = { optional = true, version = "0.100.4", path = "../swc_ecma_ast" }
@@ -381,7 +381,7 @@ swc_plugin_proxy                 = { optional = true, version = "0.29.4", path =
 swc_trace_macro                  = { optional = true, version = "0.1.2", path = "../swc_trace_macro" }
 testing                          = { optional = true, version = "0.31.41", path = "../testing" }
 # TODO: eventually swc_plugin_runner needs to remove default features
-swc_css_compat    = { version = "0.20.15", path = "../swc_css_compat", optional = true }
+swc_css_compat    = { version = "0.20.16", path = "../swc_css_compat", optional = true }
 swc_plugin_runner = { optional = true, version = "0.91.8", path = "../swc_plugin_runner", default-features = false }
 
 [build-dependencies]

diff --git a/crates/swc_css/Cargo.toml b/crates/swc_css/Cargo.toml
@@ -6,7 +6,7 @@ edition       = "2021"
 license       = "Apache-2.0"
 name          = "swc_css"
 repository    = "https://github.com/swc-project/swc.git"
-version       = "0.149.18"
+version       = "0.149.19"
 
   [package.metadata.docs.rs]
   all-features = true
@@ -23,11 +23,11 @@ prefixer = ["swc_css_prefixer"]
 
 [dependencies]
 swc_css_ast      = { version = "0.134.12", path = "../swc_css_ast" }
-swc_css_codegen  = { version = "0.144.15", path = "../swc_css_codegen" }
-swc_css_compat   = { version = "0.20.15", path = "../swc_css_compat", optional = true }
-swc_css_minifier = { version = "0.109.16", path = "../swc_css_minifier", optional = true }
-swc_css_modules  = { version = "0.21.17", path = "../swc_css_modules", optional = true }
+swc_css_codegen  = { version = "0.144.16", path = "../swc_css_codegen" }
+swc_css_compat   = { version = "0.20.16", path = "../swc_css_compat", optional = true }
+swc_css_minifier = { version = "0.109.17", path = "../swc_css_minifier", optional = true }
+swc_css_modules  = { version = "0.21.18", path = "../swc_css_modules", optional = true }
 swc_css_parser   = { version = "0.143.13", path = "../swc_css_parser" }
-swc_css_prefixer = { version = "0.146.15", path = "../swc_css_prefixer", optional = true }
+swc_css_prefixer = { version = "0.146.16", path = "../swc_css_prefixer", optional = true }
 swc_css_utils    = { version = "0.131.13", path = "../swc_css_utils/" }
 swc_css_visit    = { version = "0.133.12", path = "../swc_css_visit" }
diff --git a/crates/swc_css_codegen/Cargo.toml b/crates/swc_css_codegen/Cargo.toml
@@ -7,7 +7,7 @@ include       = ["Cargo.toml", "src/**/*.rs"]
 license       = "Apache-2.0"
 name          = "swc_css_codegen"
 repository    = "https://github.com/swc-project/swc.git"
-version       = "0.144.15"
+version       = "0.144.16"
 
 [lib]
 bench = false

diff --git a/crates/swc_css_codegen/src/lib.rs b/crates/swc_css_codegen/src/lib.rs
@@ -1680,6 +1680,8 @@ where
             let minified = minify_numeric(n.value);
 
             write_raw!(self, n.span, &minified);
+        } else if let Some(raw) = &n.raw {
+            write_raw!(self, n.span, raw);
         } else {
             write_raw!(self, n.span, &n.value.to_string());
         }

diff --git a/crates/swc_css_codegen/tests/fixture/function/1/output.css b/crates/swc_css_codegen/tests/fixture/function/1/output.css
@@ -1,6 +1,6 @@
 div {
   color: rgb(255, 255, 255);
-  color: rgb(255, 255, 255, 0.5);
+  color: rgb(255, 255, 255, .5);
   color: rgb(255 255 255);
-  color: rgb(255 255 255/ 0.5);
+  color: rgb(255 255 255/ .5);
 }
diff --git a/crates/swc_css_codegen/tests/fixture/packages/mvp_1_8_0/output.css b/crates/swc_css_codegen/tests/fixture/packages/mvp_1_8_0/output.css
@@ -142,7 +142,7 @@ nav ul li ul {
   display: none;
   height: auto;
   left: -2px;
-  padding: 0.5rem 1rem;
+  padding: .5rem 1rem;
   position: absolute;
   top: 1.7rem;
   white-space: nowrap;

diff --git a/crates/swc_css_codegen/tests/fixture/packages/pure_2_0_6/output.css b/crates/swc_css_codegen/tests/fixture/packages/pure_2_0_6/output.css
@@ -254,7 +254,7 @@ html {
 }
 .pure-u-1-8, 
 .pure-u-3-24 {
-  width: 12.5%;
+  width: 12.5000%;
 }
 .pure-u-1-6, 
 .pure-u-4-24 {
@@ -279,7 +279,7 @@ html {
 }
 .pure-u-3-8, 
 .pure-u-9-24 {
-  width: 37.5%;
+  width: 37.5000%;
 }
 .pure-u-2-5 {
   width: 40%;
@@ -307,7 +307,7 @@ html {
 }
 .pure-u-5-8, 
 .pure-u-15-24 {
-  width: 62.5%;
+  width: 62.5000%;
 }
 .pure-u-2-3, 
 .pure-u-16-24 {
@@ -332,7 +332,7 @@ html {
 }
 .pure-u-7-8, 
 .pure-u-21-24 {
-  width: 87.5%;
+  width: 87.5000%;
 }
 .pure-u-11-12, 
 .pure-u-22-24 {
@@ -384,7 +384,7 @@ html {
   font-family: inherit;
   font-size: 100%;
   padding: 0.5em 1em;
-  color: rgba(0, 0, 0, 0.8);
+  color: rgba(0, 0, 0, 0.80);
   border: none rgba(0, 0, 0, 0);
   background-color: #e6e6e6;
   text-decoration: none;
@@ -393,16 +393,16 @@ html {
 .pure-button-hover, 
 .pure-button:hover, 
 .pure-button:focus {
-  background-image: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(40%, rgba(0, 0, 0, 0.05)), to(rgba(0, 0, 0, 0.1)));
-  background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.1));
+  background-image: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(40%, rgba(0, 0, 0, 0.05)), to(rgba(0, 0, 0, 0.10)));
+  background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.10));
 }
 .pure-button:focus {
   outline: 0;
 }
 .pure-button-active, 
 .pure-button:active {
-  -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset, 0 0 6px rgba(0, 0, 0, 0.2) inset;
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset, 0 0 6px rgba(0, 0, 0, 0.2) inset;
+  -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset, 0 0 6px rgba(0, 0, 0, 0.20) inset;
+  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset, 0 0 6px rgba(0, 0, 0, 0.20) inset;
   border-color: #000;
 }
 .pure-button[disabled], 
@@ -412,7 +412,7 @@ html {
 .pure-button-disabled:active {
   border: none;
   background-image: none;
-  opacity: 0.4;
+  opacity: 0.40;
   cursor: not-allowed;
   -webkit-box-shadow: none;
   box-shadow: none;
@@ -845,18 +845,18 @@ a.pure-button-selected {
   white-space: nowrap;
   overflow-y: hidden;
   overflow-x: auto;
-  padding: 0.5em 0;
+  padding: .5em 0;
 }
 .pure-menu-separator, 
 .pure-menu-horizontal .pure-menu-children .pure-menu-separator {
   background-color: #ccc;
   height: 1px;
-  margin: 0.3em 0;
+  margin: .3em 0;
 }
 .pure-menu-horizontal .pure-menu-separator {
   width: 1px;
   height: 1.3em;
-  margin: 0 0.3em;
+  margin: 0 .3em;
 }
 .pure-menu-horizontal .pure-menu-children .pure-menu-separator {
   display: block;
@@ -874,10 +874,10 @@ a.pure-button-selected {
 }
 .pure-menu-link, 
 .pure-menu-heading {
-  padding: 0.5em 1em;
+  padding: .5em 1em;
 }
 .pure-menu-disabled {
-  opacity: 0.5;
+  opacity: .5;
 }
 .pure-menu-disabled .pure-menu-link:hover {
   background-color: transparent;