Skip to content

Commit

Permalink
fix(es): Enable resolver if jsc.baseUrl is specified (#7998)
Browse files Browse the repository at this point in the history 
**Related issue:**

 - Closes #7990
  • Loading branch information
@kdy1
kdy1 committed Sep 24, 2023
1 parent 489797f commit f374ad9
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions crates/swc/src/config/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1587,13 +1587,14 @@ impl ModuleConfig {
config: Option<ModuleConfig>,
available_features: FeatureFlag,
) -> Box<dyn swc_ecma_visit::Fold + 'cmt> {
let skip_resolver = base_url.as_os_str().is_empty() && paths.is_empty();

let base = match base {
FileName::Real(v) if !paths.is_empty() => {
FileName::Real(v) if !skip_resolver => {
FileName::Real(v.canonicalize().unwrap_or_else(|_| v.to_path_buf()))
}
_ => base.clone(),
};
let skip_resolver = base_url.as_os_str().is_empty() && paths.is_empty();

match config {
None => {
Expand Down

1 comment on commit f374ad9

@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: f374ad9 Previous: 4d777ee Ratio
es/full/bugs-1 293552 ns/iter (± 6825) 283240 ns/iter (± 7254) 1.04
es/full/minify/libraries/antd 1306377147 ns/iter (± 5472389) 1296888030 ns/iter (± 13059408) 1.01
es/full/minify/libraries/d3 275046135 ns/iter (± 1954536) 269135674 ns/iter (± 8073816) 1.02
es/full/minify/libraries/echarts 1036811585 ns/iter (± 6322032) 1030946492 ns/iter (± 4831296) 1.01
es/full/minify/libraries/jquery 83704918 ns/iter (± 108235) 83643992 ns/iter (± 121682) 1.00
es/full/minify/libraries/lodash 96725772 ns/iter (± 252292) 96553814 ns/iter (± 231185) 1.00
es/full/minify/libraries/moment 49482003 ns/iter (± 52191) 49393130 ns/iter (± 80265) 1.00
es/full/minify/libraries/react 17913875 ns/iter (± 17722) 17891753 ns/iter (± 68805) 1.00
es/full/minify/libraries/terser 215942917 ns/iter (± 682956) 215076483 ns/iter (± 487305) 1.00
es/full/minify/libraries/three 382573841 ns/iter (± 1413844) 379500770 ns/iter (± 1689192) 1.01
es/full/minify/libraries/typescript 2618712391 ns/iter (± 7326268) 2611459704 ns/iter (± 8794086) 1.00
es/full/minify/libraries/victory 560406056 ns/iter (± 2834930) 555289440 ns/iter (± 1072699) 1.01
es/full/minify/libraries/vue 118715984 ns/iter (± 317889) 118549009 ns/iter (± 288783) 1.00
es/full/codegen/es3 34660 ns/iter (± 146) 33117 ns/iter (± 104) 1.05
es/full/codegen/es5 34739 ns/iter (± 172) 33090 ns/iter (± 131) 1.05
es/full/codegen/es2015 34522 ns/iter (± 143) 33182 ns/iter (± 124) 1.04
es/full/codegen/es2016 34748 ns/iter (± 83) 33181 ns/iter (± 130) 1.05
es/full/codegen/es2017 34722 ns/iter (± 50) 33021 ns/iter (± 47) 1.05
es/full/codegen/es2018 34675 ns/iter (± 78) 33059 ns/iter (± 70) 1.05
es/full/codegen/es2019 34708 ns/iter (± 120) 33108 ns/iter (± 109) 1.05
es/full/codegen/es2020 34699 ns/iter (± 123) 33041 ns/iter (± 105) 1.05
es/full/all/es3 169383833 ns/iter (± 721764) 170099877 ns/iter (± 1195318) 1.00
es/full/all/es5 160125474 ns/iter (± 904295) 161228901 ns/iter (± 993254) 0.99
es/full/all/es2015 119614949 ns/iter (± 625762) 120218999 ns/iter (± 1305778) 0.99
es/full/all/es2016 118854468 ns/iter (± 505098) 119877490 ns/iter (± 1083904) 0.99
es/full/all/es2017 117495624 ns/iter (± 638372) 118158402 ns/iter (± 1418573) 0.99
es/full/all/es2018 115843801 ns/iter (± 956547) 115648685 ns/iter (± 1046126) 1.00
es/full/all/es2019 115920218 ns/iter (± 647243) 115548679 ns/iter (± 927669) 1.00
es/full/all/es2020 111650714 ns/iter (± 922413) 111699163 ns/iter (± 617339) 1.00
es/full/parser 489634 ns/iter (± 6226) 489365 ns/iter (± 5482) 1.00
es/full/base/fixer 19788 ns/iter (± 161) 20000 ns/iter (± 350) 0.99
es/full/base/resolver_and_hygiene 81961 ns/iter (± 198) 79810 ns/iter (± 171) 1.03
serialization of serde 299 ns/iter (± 0) 292 ns/iter (± 1) 1.02
css/minify/libraries/bootstrap 28177692 ns/iter (± 85813) 28702854 ns/iter (± 44832) 0.98
css/visitor/compare/clone 1648220 ns/iter (± 5036) 1658890 ns/iter (± 3192) 0.99
css/visitor/compare/visit_mut_span 1772518 ns/iter (± 2520) 1792290 ns/iter (± 5764) 0.99
css/visitor/compare/visit_mut_span_panic 1859227 ns/iter (± 5126) 1862530 ns/iter (± 5461) 1.00
css/visitor/compare/fold_span 2578936 ns/iter (± 9817) 2582462 ns/iter (± 9925) 1.00
css/visitor/compare/fold_span_panic 2766172 ns/iter (± 17633) 2778904 ns/iter (± 9362) 1.00
css/lexer/bootstrap_5_1_3 4481426 ns/iter (± 3728) 4417824 ns/iter (± 2944) 1.01
css/lexer/foundation_6_7_4 3770026 ns/iter (± 2720) 3729092 ns/iter (± 1704) 1.01
css/lexer/tailwind_3_1_1 714686 ns/iter (± 347) 710483 ns/iter (± 408) 1.01
css/parser/bootstrap_5_1_3 18876605 ns/iter (± 38484) 19294308 ns/iter (± 31077) 0.98
css/parser/foundation_6_7_4 15082635 ns/iter (± 9312) 15349917 ns/iter (± 23549) 0.98
css/parser/tailwind_3_1_1 2945426 ns/iter (± 6443) 2930985 ns/iter (± 1693) 1.00
es/codegen/colors 726509 ns/iter (± 396235) 728131 ns/iter (± 396683) 1.00
es/codegen/large 3133282 ns/iter (± 1661616) 3140778 ns/iter (± 1666760) 1.00
es/codegen/with-parser/colors 45784 ns/iter (± 212) 45635 ns/iter (± 566) 1.00
es/codegen/with-parser/large 491523 ns/iter (± 1384) 493846 ns/iter (± 567) 1.00
es/minify/libraries/antd 1121476543 ns/iter (± 8253898) 1130360904 ns/iter (± 4179013) 0.99
es/minify/libraries/d3 237150045 ns/iter (± 340147) 238278105 ns/iter (± 316502) 1.00
es/minify/libraries/echarts 884520093 ns/iter (± 4594801) 885626532 ns/iter (± 1930322) 1.00
es/minify/libraries/jquery 73166920 ns/iter (± 162527) 73296836 ns/iter (± 146269) 1.00
es/minify/libraries/lodash 86751578 ns/iter (± 350386) 86931852 ns/iter (± 206022) 1.00
es/minify/libraries/moment 43434102 ns/iter (± 155304) 43603566 ns/iter (± 54507) 1.00
es/minify/libraries/react 16020031 ns/iter (± 20186) 16073564 ns/iter (± 40473) 1.00
es/minify/libraries/terser 185116156 ns/iter (± 375099) 185073348 ns/iter (± 388583) 1.00
es/minify/libraries/three 318479399 ns/iter (± 990098) 318865624 ns/iter (± 1340933) 1.00
es/minify/libraries/typescript 2215717565 ns/iter (± 10738100) 2226914408 ns/iter (± 7853767) 0.99
es/minify/libraries/victory 463531919 ns/iter (± 1090321) 467215028 ns/iter (± 1625987) 0.99
es/minify/libraries/vue 105782218 ns/iter (± 107360) 106117817 ns/iter (± 279455) 1.00
es/visitor/compare/clone 1971666 ns/iter (± 2162) 1984341 ns/iter (± 11036) 0.99
es/visitor/compare/visit_mut_span 2328279 ns/iter (± 4447) 2321145 ns/iter (± 3886) 1.00
es/visitor/compare/visit_mut_span_panic 2362204 ns/iter (± 3616) 2368963 ns/iter (± 2585) 1.00
es/visitor/compare/fold_span 3400907 ns/iter (± 6290) 3420873 ns/iter (± 10195) 0.99
es/visitor/compare/fold_span_panic 3565861 ns/iter (± 5182) 3531160 ns/iter (± 8429) 1.01
es/lexer/colors 13154 ns/iter (± 12) 13129 ns/iter (± 69) 1.00
es/lexer/angular 6117060 ns/iter (± 5373) 6082539 ns/iter (± 27162) 1.01
es/lexer/backbone 793721 ns/iter (± 1399) 790861 ns/iter (± 2448) 1.00
es/lexer/jquery 4492175 ns/iter (± 9795) 4480271 ns/iter (± 11093) 1.00
es/lexer/jquery mobile 6852671 ns/iter (± 2025) 6827525 ns/iter (± 8624) 1.00
es/lexer/mootools 3571059 ns/iter (± 9285) 3541648 ns/iter (± 2573) 1.01
es/lexer/underscore 664624 ns/iter (± 809) 660445 ns/iter (± 2560) 1.01
es/lexer/three 21367964 ns/iter (± 12889) 21303476 ns/iter (± 26449) 1.00
es/lexer/yui 3821564 ns/iter (± 1742) 3801815 ns/iter (± 1645) 1.01
es/parser/colors 27125 ns/iter (± 633) 27433 ns/iter (± 59) 0.99
es/parser/angular 13461242 ns/iter (± 67156) 13642420 ns/iter (± 63125) 0.99
es/parser/backbone 1968295 ns/iter (± 8467) 1998844 ns/iter (± 8229) 0.98
es/parser/jquery 10794743 ns/iter (± 31748) 10890298 ns/iter (± 46957) 0.99
es/parser/jquery mobile 16504569 ns/iter (± 58329) 16717955 ns/iter (± 53104) 0.99
es/parser/mootools 8308914 ns/iter (± 14836) 8404599 ns/iter (± 13437) 0.99
es/parser/underscore 1694839 ns/iter (± 10749) 1726729 ns/iter (± 9525) 0.98
es/parser/three 46133111 ns/iter (± 136020) 46980362 ns/iter (± 134006) 0.98
es/parser/yui 8206119 ns/iter (± 27047) 8347608 ns/iter (± 66983) 0.98
es/preset-env/usage/builtin_type 136340 ns/iter (± 32102) 136532 ns/iter (± 32308) 1.00
es/preset-env/usage/property 17182 ns/iter (± 59) 16930 ns/iter (± 40) 1.01
es/resolver/typescript 89472515 ns/iter (± 1006854) 88782878 ns/iter (± 1400300) 1.01
es/fixer/typescript 63820888 ns/iter (± 248943) 63927277 ns/iter (± 1144102) 1.00
es/hygiene/typescript 129745748 ns/iter (± 507399) 130305792 ns/iter (± 828110) 1.00
es/resolver_with_hygiene/typescript 240447449 ns/iter (± 636516) 239742106 ns/iter (± 1079473) 1.00
es/visitor/base-perf/module_clone 58817 ns/iter (± 207) 58500 ns/iter (± 387) 1.01
es/visitor/base-perf/fold_empty 63527 ns/iter (± 233) 62664 ns/iter (± 281) 1.01
es/visitor/base-perf/fold_noop_impl_all 63130 ns/iter (± 760) 63211 ns/iter (± 282) 1.00
es/visitor/base-perf/fold_noop_impl_vec 63251 ns/iter (± 250) 63169 ns/iter (± 250) 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 41 ns/iter (± 0) 40 ns/iter (± 0) 1.02
es/visitor/base-perf/boxing_boxed 109 ns/iter (± 0) 105 ns/iter (± 0) 1.04
es/visitor/base-perf/boxing_unboxed 77 ns/iter (± 0) 75 ns/iter (± 0) 1.03
es/visitor/base-perf/visit_empty 0 ns/iter (± 0) 0 ns/iter (± 0) NaN
es/visitor/base-perf/visit_contains_this 2531 ns/iter (± 12) 2540 ns/iter (± 17) 1.00
es/base/parallel/resolver/typescript 4396654612 ns/iter (± 303804904) 3883603621 ns/iter (± 256419883) 1.13
es/base/parallel/hygiene/typescript 1450786205 ns/iter (± 6942120) 1434465689 ns/iter (± 16512604) 1.01
misc/visitors/time-complexity/time 5 150 ns/iter (± 0) 133 ns/iter (± 7) 1.13
misc/visitors/time-complexity/time 10 439 ns/iter (± 2) 411 ns/iter (± 0) 1.07
misc/visitors/time-complexity/time 15 798 ns/iter (± 1) 788 ns/iter (± 2) 1.01
misc/visitors/time-complexity/time 20 1284 ns/iter (± 7) 1282 ns/iter (± 5) 1.00
misc/visitors/time-complexity/time 40 4340 ns/iter (± 51) 4357 ns/iter (± 8) 1.00
misc/visitors/time-complexity/time 60 8998 ns/iter (± 14) 8986 ns/iter (± 12) 1.00
es/full-target/es2016 237639 ns/iter (± 734) 235573 ns/iter (± 677) 1.01
es/full-target/es2017 223442 ns/iter (± 332) 222295 ns/iter (± 788) 1.01
es/full-target/es2018 211999 ns/iter (± 333) 210633 ns/iter (± 576) 1.01
es2020_nullish_coalescing 71784 ns/iter (± 407) 71153 ns/iter (± 329) 1.01
es2020_optional_chaining 78841 ns/iter (± 184) 77231 ns/iter (± 148) 1.02
es2022_class_properties 117898 ns/iter (± 440) 115695 ns/iter (± 252) 1.02
es2018_object_rest_spread 76208 ns/iter (± 411) 74636 ns/iter (± 201) 1.02
es2019_optional_catch_binding 67750 ns/iter (± 135) 65249 ns/iter (± 300) 1.04
es2017_async_to_generator 65022 ns/iter (± 256) 64873 ns/iter (± 165) 1.00
es2016_exponentiation 69909 ns/iter (± 185) 69587 ns/iter (± 242) 1.00
es2015_arrow 72991 ns/iter (± 209) 72921 ns/iter (± 418) 1.00
es2015_block_scoped_fn 70584 ns/iter (± 305) 68986 ns/iter (± 193) 1.02
es2015_block_scoping 126219 ns/iter (± 444) 123616 ns/iter (± 343) 1.02

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

Please sign in to comment.