@@ -82,7 +82,7 @@ export function esbuildDepPlugin(
82
82
}
83
83
)
84
84
85
- function resolveEntry ( id : string , isEntry : boolean ) {
85
+ function resolveEntry ( id : string , isEntry : boolean , resolveDir : string ) {
86
86
const flatId = flattenId ( id )
87
87
if ( flatId in qualified ) {
88
88
return isEntry
@@ -91,23 +91,25 @@ export function esbuildDepPlugin(
91
91
namespace : 'dep'
92
92
}
93
93
: {
94
- path : path . resolve ( qualified [ flatId ] )
94
+ path : require . resolve ( flatId , {
95
+ paths : [ resolveDir ]
96
+ } )
95
97
}
96
98
}
97
99
}
98
100
99
101
build . onResolve (
100
102
{ filter : / ^ [ \w @ ] [ ^ : ] / } ,
101
- async ( { path : id , importer, kind } ) => {
103
+ async ( { path : id , importer, kind, resolveDir } ) => {
102
104
const isEntry = ! importer
103
105
// ensure esbuild uses our resolved entries
104
106
let entry
105
107
// if this is an entry, return entry namespace resolve result
106
- if ( ( entry = resolveEntry ( id , isEntry ) ) ) return entry
108
+ if ( ( entry = resolveEntry ( id , isEntry , resolveDir ) ) ) return entry
107
109
108
110
// check if this is aliased to an entry - also return entry namespace
109
111
const aliased = await _resolve ( id , undefined , true )
110
- if ( aliased && ( entry = resolveEntry ( aliased , isEntry ) ) ) {
112
+ if ( aliased && ( entry = resolveEntry ( aliased , isEntry , resolveDir ) ) ) {
111
113
return entry
112
114
}
113
115
0 commit comments