Skip to content

Commit

Permalink
fix(es/loader): Don't use browser versions for jsc.paths (#8548)
Browse files Browse the repository at this point in the history
**Related issue:**

 - vercel/next.js#56144
  • Loading branch information
kdy1 committed Jan 24, 2024
1 parent 098cdd3 commit fab27da
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
14 changes: 9 additions & 5 deletions crates/swc/src/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1747,12 +1747,16 @@ fn build_resolver(
}

let r = {
let r = TsConfigResolver::new(
NodeModulesResolver::without_node_modules(Default::default(), Default::default(), true),
base_url.clone(),
paths.clone(),
let r = NodeModulesResolver::without_node_modules(
swc_ecma_loader::TargetEnv::Node,
Default::default(),
true,
);
let r = CachingResolver::new(40, r);

let r = CachingResolver::new(1024, r);

let r = TsConfigResolver::new(r, base_url.clone(), paths.clone());
let r = CachingResolver::new(256, r);

let r = NodeImportResolver::with_config(
r,
Expand Down
5 changes: 3 additions & 2 deletions crates/swc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,9 @@ pub mod resolver {
}
}

type SwcImportResolver =
Arc<NodeImportResolver<CachingResolver<TsConfigResolver<NodeModulesResolver>>>>;
type SwcImportResolver = Arc<
NodeImportResolver<CachingResolver<TsConfigResolver<CachingResolver<NodeModulesResolver>>>>,
>;

/// All methods accept [Handler], which is a storage for errors.
///
Expand Down

0 comments on commit fab27da

Please sign in to comment.