@@ -72,14 +72,14 @@ use std::{
7272} ;
7373
7474use dashmap:: { mapref:: one:: Ref , DashMap } ;
75- use file_system:: { FileSystemOptions , VirtualFileSystem } ;
75+ use file_system:: FileSystemOptions ;
7676use rustc_hash:: FxHashSet ;
7777use serde_json:: Value as JSONValue ;
7878
7979pub use crate :: {
8080 builtins:: NODEJS_BUILTINS ,
8181 error:: { JSONError , ResolveError , SpecifierError } ,
82- file_system:: { FileMetadata , FileSystem , FileSystemOs } ,
82+ file_system:: { FileMetadata , FileSystem , FileSystemOs , PnpFileSystem } ,
8383 options:: {
8484 Alias , AliasValue , EnforceExtension , ResolveOptions , Restriction , TsconfigOptions ,
8585 TsconfigReferences ,
@@ -115,7 +115,7 @@ pub type Resolver = ResolverGeneric<FileSystemOs>;
115115/// Generic implementation of the resolver, can be configured by the [FileSystem] trait
116116pub struct ResolverGeneric < Fs > {
117117 options : ResolveOptions ,
118- cache : Arc < Cache < VirtualFileSystem < Fs > > > ,
118+ cache : Arc < Cache < PnpFileSystem < Fs > > > ,
119119 #[ cfg( feature = "yarn_pnp" ) ]
120120 pnp_cache : Arc < DashMap < CachedPath , Option < pnp:: Manifest > > > ,
121121}
@@ -138,10 +138,7 @@ impl<Fs: FileSystem + Default> ResolverGeneric<Fs> {
138138
139139 Self {
140140 options : options. sanitize ( ) ,
141- cache : Arc :: new ( Cache :: new ( VirtualFileSystem :: new_with_options (
142- Fs :: default ( ) ,
143- fs_options,
144- ) ) ) ,
141+ cache : Arc :: new ( Cache :: new ( PnpFileSystem :: new_with_options ( Fs :: default ( ) , fs_options) ) ) ,
145142 #[ cfg( feature = "yarn_pnp" ) ]
146143 pnp_cache : Arc :: new ( DashMap :: default ( ) ) ,
147144 }
@@ -154,10 +151,7 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
154151
155152 Self {
156153 options : options. sanitize ( ) ,
157- cache : Arc :: new ( Cache :: new ( VirtualFileSystem :: new_with_options (
158- file_system,
159- fs_options,
160- ) ) ) ,
154+ cache : Arc :: new ( Cache :: new ( PnpFileSystem :: new_with_options ( file_system, fs_options) ) ) ,
161155 #[ cfg( feature = "yarn_pnp" ) ]
162156 pnp_cache : Arc :: new ( DashMap :: default ( ) ) ,
163157 }
0 commit comments