Skip to content

Commit

Permalink
fix(css/codegen): Respect raw of Str (#7078)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kdy1
kdy1 committed Mar 14, 2023
1 parent 6bf5f03 commit 7849a2d
Show file tree
Hide file tree
Showing 60 changed files with 427 additions and 403 deletions.
2 changes: 2 additions & 0 deletions crates/swc_css_codegen/src/lib.rs
View file
Expand Up @@ -1221,6 +1221,8 @@ where
let minified = minify_string(&n.value);

write_str!(self, n.span, &minified);
} else if let Some(raw) = &n.raw {
write_str!(self, n.span, raw);
} else {
let value = serialize_string(&n.value);

Expand Down
4 changes: 2 additions & 2 deletions crates/swc_css_codegen/tests/fixture/at-rules/color-profile/output.css
View file
@@ -1,7 +1,7 @@
@color-profile --swop5c {
src: url("https://example.org/SWOP2006_Coated5v2.icc");
src: url('https://example.org/SWOP2006_Coated5v2.icc');
}
@color-profile --fogra55beta {
src: url("https://example.org/2020_13.003_FOGRA55beta_CL_Profile.icc");
src: url('https://example.org/2020_13.003_FOGRA55beta_CL_Profile.icc');
prop: value;
}
4 changes: 2 additions & 2 deletions crates/swc_css_codegen/tests/fixture/at-rules/container/output.css
View file
Expand Up @@ -26,11 +26,11 @@ aside {
}
.media-object {
display: grid;
grid-template: "img" auto "content" auto/ 100%;
grid-template: 'img' auto 'content' auto/ 100%;
}
@container my-layout (inline-size > 45em) {
.media-object {
grid-template: "img content" auto/ auto 1fr;
grid-template: 'img content' auto/ auto 1fr;
}
}
@container card (inline-size > 30em) and style(--responsive: true) {
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_css_codegen/tests/fixture/at-rules/counter-style/output.css
View file
@@ -1,6 +1,6 @@
@counter-style thumbs {
system: cyclic;
symbols: "👍";
symbols: "\1F44D";
suffix: " ";
}
ul {
Expand Down
4 changes: 2 additions & 2 deletions crates/swc_css_codegen/tests/fixture/at-rules/import/1/output.css
View file
@@ -1,9 +1,9 @@
@import "custom.css";
@import 'custom.css';
@import url("chrome://communicator/skin/");
@import url("fineprint.css") print;
@import url("bluish.css") speech;
@import "common.css" screen;
@import url("landscape.css") screen and (orientation: landscape);
@import url('landscape.css') screen and (orientation: landscape);
@import url("narrow.css") handheld and (max-width: 400px);
@import "narrow.css" handheld and (max-width: 400px);
@import url("tabs.css") layer(framework);
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_css_codegen/tests/fixture/at-rules/property/output.css
View file
@@ -1,5 +1,5 @@
@property --property-name {
syntax: "<color>";
syntax: '<color>';
inherits: false;
initial-value: #c0ffee;
}
10 changes: 5 additions & 5 deletions crates/swc_css_codegen/tests/fixture/packages/bulma_0_9_3/output.css
View file
Expand Up @@ -4272,7 +4272,7 @@ fieldset[disabled] .select select:hover {
}
.breadcrumb li + li::before {
color: #b5b5b5;
content: "/";
content: "\0002f";
}
.breadcrumb ul,
.breadcrumb ol {
Expand Down Expand Up @@ -4305,16 +4305,16 @@ fieldset[disabled] .select select:hover {
font-size: 1.5rem;
}
.breadcrumb.has-arrow-separator li + li::before {
content: "→";
content: "\02192";
}
.breadcrumb.has-bullet-separator li + li::before {
content: "•";
content: "\02022";
}
.breadcrumb.has-dot-separator li + li::before {
content: "·";
content: "\000b7";
}
.breadcrumb.has-succeeds-separator li + li::before {
content: "≻";
content: "\0227B";
}
.card {
background-color: white;
Expand Down

1 comment on commit 7849a2d

@github-actions
Copy link

Choose a reason for hiding this comment

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

Benchmark

Benchmark suite Current: 7849a2d Previous: f854d51 Ratio
es/full/bugs-1 303296 ns/iter (± 5819) 362829 ns/iter (± 19163) 0.84
es/full/minify/libraries/antd 1530579256 ns/iter (± 8172046) 1771996901 ns/iter (± 24747418) 0.86
es/full/minify/libraries/d3 293107222 ns/iter (± 5798555) 359329795 ns/iter (± 18531051) 0.82
es/full/minify/libraries/echarts 1206924723 ns/iter (± 12649688) 1359615640 ns/iter (± 19000088) 0.89
es/full/minify/libraries/jquery 89860948 ns/iter (± 787278) 100872098 ns/iter (± 2860005) 0.89
es/full/minify/libraries/lodash 104167116 ns/iter (± 668083) 112584515 ns/iter (± 3516634) 0.93
es/full/minify/libraries/moment 52245996 ns/iter (± 197820) 56143773 ns/iter (± 1386286) 0.93
es/full/minify/libraries/react 18986126 ns/iter (± 157218) 21337388 ns/iter (± 779084) 0.89
es/full/minify/libraries/terser 250263573 ns/iter (± 3707878) 278341765 ns/iter (± 7633880) 0.90
es/full/minify/libraries/three 438465465 ns/iter (± 7680318) 496238802 ns/iter (± 12899179) 0.88
es/full/minify/libraries/typescript 2939200141 ns/iter (± 22624887) 3291680614 ns/iter (± 29261715) 0.89
es/full/minify/libraries/victory 622066068 ns/iter (± 15119860) 757688713 ns/iter (± 18246283) 0.82
es/full/minify/libraries/vue 128129728 ns/iter (± 1625328) 142236724 ns/iter (± 2843522) 0.90
es/full/codegen/es3 26119 ns/iter (± 75) 26191 ns/iter (± 80) 1.00
es/full/codegen/es5 26235 ns/iter (± 42) 26382 ns/iter (± 66) 0.99
es/full/codegen/es2015 26203 ns/iter (± 37) 26345 ns/iter (± 87) 0.99
es/full/codegen/es2016 26201 ns/iter (± 86) 26299 ns/iter (± 57) 1.00
es/full/codegen/es2017 26131 ns/iter (± 55) 26334 ns/iter (± 49) 0.99
es/full/codegen/es2018 26151 ns/iter (± 89) 26302 ns/iter (± 70) 0.99
es/full/codegen/es2019 26237 ns/iter (± 107) 26252 ns/iter (± 61) 1.00
es/full/codegen/es2020 26167 ns/iter (± 47) 26340 ns/iter (± 59) 0.99
es/full/all/es3 181417756 ns/iter (± 4312876) 195824665 ns/iter (± 5889318) 0.93
es/full/all/es5 170243483 ns/iter (± 3088782) 182559376 ns/iter (± 3251090) 0.93
es/full/all/es2015 135899122 ns/iter (± 2668217) 145182796 ns/iter (± 3679409) 0.94
es/full/all/es2016 134436066 ns/iter (± 1768720) 144160105 ns/iter (± 4205450) 0.93
es/full/all/es2017 132290127 ns/iter (± 1937980) 142780354 ns/iter (± 3391322) 0.93
es/full/all/es2018 127833289 ns/iter (± 1474646) 140151140 ns/iter (± 4183230) 0.91
es/full/all/es2019 125476611 ns/iter (± 446474) 139688717 ns/iter (± 6097224) 0.90
es/full/all/es2020 118390720 ns/iter (± 831530) 130429226 ns/iter (± 2251981) 0.91
es/full/parser 533921 ns/iter (± 7948) 531971 ns/iter (± 9054) 1.00
es/full/base/fixer 22409 ns/iter (± 51) 22513 ns/iter (± 65) 1.00
es/full/base/resolver_and_hygiene 83670 ns/iter (± 123) 81709 ns/iter (± 81) 1.02
serialization of ast node 124 ns/iter (± 0) 124 ns/iter (± 0) 1
serialization of serde 127 ns/iter (± 0) 127 ns/iter (± 0) 1
css/minify/libraries/bootstrap 28545319 ns/iter (± 230319) 29236158 ns/iter (± 194850) 0.98
css/visitor/compare/clone 2098324 ns/iter (± 13752) 2119251 ns/iter (± 30582) 0.99
css/visitor/compare/visit_mut_span 2283858 ns/iter (± 4392) 2322690 ns/iter (± 5677) 0.98
css/visitor/compare/visit_mut_span_panic 2346036 ns/iter (± 3674) 2384962 ns/iter (± 27421) 0.98
css/visitor/compare/fold_span 3026103 ns/iter (± 19424) 3084756 ns/iter (± 23484) 0.98
css/visitor/compare/fold_span_panic 3185206 ns/iter (± 18291) 3230277 ns/iter (± 30361) 0.99
css/lexer/bootstrap_5_1_3 5168996 ns/iter (± 7397) 5145419 ns/iter (± 7578) 1.00
css/lexer/foundation_6_7_4 4358967 ns/iter (± 5933) 4337985 ns/iter (± 4058) 1.00
css/lexer/tailwind_3_1_1 826949 ns/iter (± 600) 823792 ns/iter (± 271) 1.00
css/parser/bootstrap_5_1_3 21956766 ns/iter (± 148936) 22405290 ns/iter (± 170932) 0.98
css/parser/foundation_6_7_4 17342401 ns/iter (± 29279) 17569093 ns/iter (± 100563) 0.99
css/parser/tailwind_3_1_1 3332227 ns/iter (± 7720) 3329762 ns/iter (± 3294) 1.00
es/codegen/colors 326578 ns/iter (± 184453) 327700 ns/iter (± 185154) 1.00
es/codegen/large 1205401 ns/iter (± 615378) 1199983 ns/iter (± 627236) 1.00
es/codegen/with-parser/colors 48861 ns/iter (± 290) 48273 ns/iter (± 316) 1.01
es/codegen/with-parser/large 524311 ns/iter (± 1998) 523535 ns/iter (± 1399) 1.00
es/minify/libraries/antd 1315624438 ns/iter (± 17545679) 1579091825 ns/iter (± 24467967) 0.83
es/minify/libraries/d3 254895546 ns/iter (± 2914007) 286016567 ns/iter (± 8100275) 0.89
es/minify/libraries/echarts 1035849702 ns/iter (± 11613959) 1168057942 ns/iter (± 25291827) 0.89
es/minify/libraries/jquery 78548713 ns/iter (± 798275) 82745047 ns/iter (± 1493053) 0.95
es/minify/libraries/lodash 93150768 ns/iter (± 700531) 103529427 ns/iter (± 2825454) 0.90
es/minify/libraries/moment 45963763 ns/iter (± 357129) 49520639 ns/iter (± 2074280) 0.93
es/minify/libraries/react 17111893 ns/iter (± 110229) 19294170 ns/iter (± 1194606) 0.89
es/minify/libraries/terser 215922193 ns/iter (± 3477581) 234434579 ns/iter (± 8960927) 0.92
es/minify/libraries/three 366776665 ns/iter (± 6757027) 404043847 ns/iter (± 12118984) 0.91
es/minify/libraries/typescript 2518855769 ns/iter (± 15242938) 2773898855 ns/iter (± 25165964) 0.91
es/minify/libraries/victory 552288782 ns/iter (± 11295985) 659887296 ns/iter (± 18313615) 0.84
es/minify/libraries/vue 114661835 ns/iter (± 1336912) 121203267 ns/iter (± 2957558) 0.95
es/visitor/compare/clone 2324481 ns/iter (± 12401) 2380632 ns/iter (± 34832) 0.98
es/visitor/compare/visit_mut_span 2689133 ns/iter (± 3551) 2742246 ns/iter (± 14937) 0.98
es/visitor/compare/visit_mut_span_panic 2735480 ns/iter (± 4158) 2778673 ns/iter (± 23860) 0.98
es/visitor/compare/fold_span 3781086 ns/iter (± 10693) 3882371 ns/iter (± 17429) 0.97
es/visitor/compare/fold_span_panic 3970294 ns/iter (± 10184) 4049291 ns/iter (± 24483) 0.98
es/lexer/colors 15676 ns/iter (± 128) 15783 ns/iter (± 8) 0.99
es/lexer/angular 7661791 ns/iter (± 4619) 7714476 ns/iter (± 3530) 0.99
es/lexer/backbone 993790 ns/iter (± 1180) 999478 ns/iter (± 272) 0.99
es/lexer/jquery 5537242 ns/iter (± 8915) 5596550 ns/iter (± 4311) 0.99
es/lexer/jquery mobile 8554093 ns/iter (± 14445) 8648497 ns/iter (± 5151) 0.99
es/lexer/mootools 4396985 ns/iter (± 1943) 4433764 ns/iter (± 1656) 0.99
es/lexer/underscore 834558 ns/iter (± 365) 842963 ns/iter (± 360) 0.99
es/lexer/three 25974104 ns/iter (± 38601) 26217572 ns/iter (± 20998) 0.99
es/lexer/yui 4706686 ns/iter (± 9966) 4733599 ns/iter (± 1342) 0.99
es/parser/colors 29558 ns/iter (± 81) 29143 ns/iter (± 56) 1.01
es/parser/angular 15174420 ns/iter (± 133332) 16262931 ns/iter (± 168651) 0.93
es/parser/backbone 2232975 ns/iter (± 12435) 2242607 ns/iter (± 11163) 1.00
es/parser/jquery 12071106 ns/iter (± 150240) 12705016 ns/iter (± 75607) 0.95
es/parser/jquery mobile 18957138 ns/iter (± 190878) 20440847 ns/iter (± 257757) 0.93
es/parser/mootools 9192366 ns/iter (± 53431) 9444322 ns/iter (± 79295) 0.97
es/parser/underscore 1887307 ns/iter (± 11078) 1895760 ns/iter (± 8914) 1.00
es/parser/three 56597562 ns/iter (± 257686) 58635099 ns/iter (± 430471) 0.97
es/parser/yui 9332200 ns/iter (± 62646) 9390937 ns/iter (± 72660) 0.99
es/preset-env/usage/builtin_type 141826 ns/iter (± 33721) 141321 ns/iter (± 33797) 1.00
es/preset-env/usage/property 21198 ns/iter (± 80) 21161 ns/iter (± 125) 1.00
es/resolver/typescript 107200881 ns/iter (± 2298212) 118969330 ns/iter (± 2282912) 0.90
es/fixer/typescript 79280041 ns/iter (± 921142) 90448406 ns/iter (± 1106277) 0.88
es/hygiene/typescript 162956249 ns/iter (± 1079585) 195481189 ns/iter (± 2946311) 0.83
es/resolver_with_hygiene/typescript 308613118 ns/iter (± 1820293) 345864513 ns/iter (± 5306118) 0.89
es/visitor/base-perf/module_clone 78604 ns/iter (± 1261) 78635 ns/iter (± 915) 1.00
es/visitor/base-perf/fold_empty 88474 ns/iter (± 1074) 90714 ns/iter (± 1159) 0.98
es/visitor/base-perf/fold_noop_impl_all 89061 ns/iter (± 1352) 89942 ns/iter (± 1678) 0.99
es/visitor/base-perf/fold_noop_impl_vec 91336 ns/iter (± 1156) 91633 ns/iter (± 1323) 1.00
es/visitor/base-perf/boxing_boxed_clone 56 ns/iter (± 0) 56 ns/iter (± 0) 1
es/visitor/base-perf/boxing_unboxed_clone 53 ns/iter (± 0) 54 ns/iter (± 0) 0.98
es/visitor/base-perf/boxing_boxed 101 ns/iter (± 0) 103 ns/iter (± 0) 0.98
es/visitor/base-perf/boxing_unboxed 98 ns/iter (± 0) 98 ns/iter (± 0) 1
es/visitor/base-perf/visit_contains_this 3426 ns/iter (± 51) 3481 ns/iter (± 83) 0.98
es/base/parallel/resolver/typescript 5945099967 ns/iter (± 496486967) 5739869327 ns/iter (± 486937726) 1.04
es/base/parallel/hygiene/typescript 1989446219 ns/iter (± 33946506) 2209141166 ns/iter (± 28059995) 0.90
misc/visitors/time-complexity/time 5 99 ns/iter (± 0) 101 ns/iter (± 0) 0.98
misc/visitors/time-complexity/time 10 340 ns/iter (± 0) 357 ns/iter (± 6) 0.95
misc/visitors/time-complexity/time 15 668 ns/iter (± 0) 705 ns/iter (± 2) 0.95
misc/visitors/time-complexity/time 20 1255 ns/iter (± 10) 1315 ns/iter (± 0) 0.95
misc/visitors/time-complexity/time 40 6741 ns/iter (± 38) 6900 ns/iter (± 41) 0.98
misc/visitors/time-complexity/time 60 17342 ns/iter (± 40) 17465 ns/iter (± 48) 0.99
es/full-target/es2016 250538 ns/iter (± 255) 250498 ns/iter (± 310) 1.00
es/full-target/es2017 243427 ns/iter (± 344) 243163 ns/iter (± 295) 1.00
es/full-target/es2018 232132 ns/iter (± 560) 232275 ns/iter (± 442) 1.00
es2020_nullish_coalescing 90871 ns/iter (± 437) 91515 ns/iter (± 208) 0.99
es2020_optional_chaining 123305 ns/iter (± 548) 124310 ns/iter (± 747) 0.99
es2022_class_properties 147304 ns/iter (± 335) 147456 ns/iter (± 359) 1.00
es2018_object_rest_spread 94797 ns/iter (± 119) 95136 ns/iter (± 198) 1.00
es2019_optional_catch_binding 83919 ns/iter (± 200) 84427 ns/iter (± 198) 0.99
es2017_async_to_generator 84798 ns/iter (± 321) 85625 ns/iter (± 179) 0.99
es2016_exponentiation 88852 ns/iter (± 346) 89241 ns/iter (± 213) 1.00
es2015_arrow 92667 ns/iter (± 2409) 94009 ns/iter (± 176) 0.99
es2015_block_scoped_fn 90580 ns/iter (± 183) 91527 ns/iter (± 278) 0.99
es2015_block_scoping 168664 ns/iter (± 275) 169949 ns/iter (± 624) 0.99

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.