Skip to content

Commit fab27da

Browse files
authored
fix(es/loader): Don't use browser versions for jsc.paths (#8548)
**Related issue:** - vercel/next.js#56144
1 parent 098cdd3 commit fab27da

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

crates/swc/src/config/mod.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,12 +1747,16 @@ fn build_resolver(
17471747
}
17481748

17491749
let r = {
1750-
let r = TsConfigResolver::new(
1751-
NodeModulesResolver::without_node_modules(Default::default(), Default::default(), true),
1752-
base_url.clone(),
1753-
paths.clone(),
1750+
let r = NodeModulesResolver::without_node_modules(
1751+
swc_ecma_loader::TargetEnv::Node,
1752+
Default::default(),
1753+
true,
17541754
);
1755-
let r = CachingResolver::new(40, r);
1755+
1756+
let r = CachingResolver::new(1024, r);
1757+
1758+
let r = TsConfigResolver::new(r, base_url.clone(), paths.clone());
1759+
let r = CachingResolver::new(256, r);
17561760

17571761
let r = NodeImportResolver::with_config(
17581762
r,

crates/swc/src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,9 @@ pub mod resolver {
203203
}
204204
}
205205

206-
type SwcImportResolver =
207-
Arc<NodeImportResolver<CachingResolver<TsConfigResolver<NodeModulesResolver>>>>;
206+
type SwcImportResolver = Arc<
207+
NodeImportResolver<CachingResolver<TsConfigResolver<CachingResolver<NodeModulesResolver>>>>,
208+
>;
208209

209210
/// All methods accept [Handler], which is a storage for errors.
210211
///

0 commit comments

Comments
 (0)