File tree Expand file tree Collapse file tree 4 files changed +43
-10
lines changed Expand file tree Collapse file tree 4 files changed +43
-10
lines changed Original file line number Diff line number Diff line change @@ -123,7 +123,7 @@ notify = "6.1.1"
123
123
num_cpus = " 1.15.0"
124
124
once_cell = " 1.17.1"
125
125
owo-colors = " 3.5.0"
126
- oxc_resolver = { version = " 2.1.0 " }
126
+ oxc_resolver = " 4.2.0 "
127
127
parking_lot = " 0.12.1"
128
128
path-clean = " 1.0.1"
129
129
pathdiff = " 0.2.1"
Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ pub enum TraceError {
48
48
#[ error( "failed to read file: {0}" ) ]
49
49
FileNotFound ( AbsoluteSystemPathBuf ) ,
50
50
#[ error( transparent) ]
51
- PathEncoding ( Arc < PathError > ) ,
51
+ PathError ( Arc < PathError > ) ,
52
52
#[ error( "tracing a root file `{0}`, no parent found" ) ]
53
53
RootFile ( AbsoluteSystemPathBuf ) ,
54
54
#[ error( "failed to resolve import to `{import}` in `{file_path}`" ) ]
@@ -212,7 +212,7 @@ impl Tracer {
212
212
match resolved. into_path_buf ( ) . try_into ( ) . map_err ( Arc :: new) {
213
213
Ok ( path) => files. push ( path) ,
214
214
Err ( err) => {
215
- errors. push ( TraceError :: PathEncoding ( err) ) ;
215
+ errors. push ( TraceError :: PathError ( err) ) ;
216
216
continue ;
217
217
}
218
218
}
@@ -453,7 +453,19 @@ impl Tracer {
453
453
return ( errors, None ) ;
454
454
} ;
455
455
456
- for import in imported_files {
456
+ for mut import in imported_files {
457
+ if cfg ! ( windows) {
458
+ match import. to_realpath ( ) {
459
+ Ok ( path) => {
460
+ import = path;
461
+ }
462
+ Err ( err) => {
463
+ errors. push ( TraceError :: PathError ( Arc :: new ( err) ) ) ;
464
+ return ( errors, None ) ;
465
+ }
466
+ }
467
+ }
468
+
457
469
if shared_self
458
470
. files
459
471
. iter ( )
Original file line number Diff line number Diff line change @@ -81,7 +81,7 @@ impl From<turbo_trace::TraceError> for Diagnostic {
81
81
path : Some ( file. to_string ( ) ) ,
82
82
..Default :: default ( )
83
83
} ,
84
- turbo_trace:: TraceError :: PathEncoding ( _) => Diagnostic {
84
+ turbo_trace:: TraceError :: PathError ( _) => Diagnostic {
85
85
message,
86
86
..Default :: default ( )
87
87
} ,
You can’t perform that action at this time.
0 commit comments