@@ -50,9 +50,9 @@ const nodePaths = NODE_PATH
50
50
: undefined ;
51
51
52
52
function parseOutQuery ( pathQithQuery : string ) {
53
- const [ path , ...queryParts ] = pathQithQuery . split ( '?' )
54
- const query = queryParts . join ( '' )
55
- return [ path , query ]
53
+ const [ path , ...queryParts ] = pathQithQuery . split ( '?' ) ;
54
+ const query = queryParts . join ( '' ) ;
55
+ return [ path , query ] ;
56
56
}
57
57
58
58
/* eslint-disable-next-line no-redeclare */
@@ -118,7 +118,7 @@ class Resolver {
118
118
const paths = options . paths ;
119
119
120
120
try {
121
- const [ nativePath , query ] = parseOutQuery ( path )
121
+ const [ nativePath , query ] = parseOutQuery ( path ) ;
122
122
const realpath = resolver ( nativePath , {
123
123
basedir : options . basedir ,
124
124
browser : options . browser ,
@@ -130,9 +130,9 @@ class Resolver {
130
130
} ) ;
131
131
132
132
return {
133
+ id : `${ realpath } ?${ query } ` ,
133
134
path : realpath ,
134
- id : `${ realpath } ?${ query } `
135
- }
135
+ } ;
136
136
} catch ( e ) {
137
137
if ( options . throwIfNotFound ) {
138
138
throw e ;
@@ -176,9 +176,9 @@ class Resolver {
176
176
const hasteModule = this . getModule ( nativeName ) ;
177
177
if ( hasteModule ) {
178
178
const resolvedPath = {
179
+ id : `haste:${ hasteModule } ?${ query } ` ,
179
180
path : hasteModule ,
180
- id : `haste:${ hasteModule } ?${ query } `
181
- }
181
+ } ;
182
182
this . _moduleNameCache . set ( key , resolvedPath ) ;
183
183
return resolvedPath ;
184
184
}
@@ -206,7 +206,10 @@ class Resolver {
206
206
207
207
if ( ! skipResolution ) {
208
208
// @ts -ignore: the "pnp" version named isn't in DefinitelyTyped
209
- const nodeModule = resolveNodeModule ( moduleName , Boolean ( process . versions . pnp ) ) ;
209
+ const nodeModule = resolveNodeModule (
210
+ moduleName ,
211
+ Boolean ( process . versions . pnp ) ,
212
+ ) ;
210
213
211
214
if ( nodeModule ) {
212
215
this . _moduleNameCache . set ( key , nodeModule ) ;
@@ -220,12 +223,12 @@ class Resolver {
220
223
const hastePackage = this . getPackage ( parts . shift ( ) ! ) ;
221
224
if ( hastePackage ) {
222
225
const requireResolve = ( name : string ) => {
223
- const path = require . resolve ( name )
226
+ const path = require . resolve ( name ) ;
224
227
return {
228
+ id : `haste:${ path } ?${ query } ` ,
225
229
path,
226
- id : `haste:${ path } ?${ query } `
227
- }
228
- }
230
+ } ;
231
+ } ;
229
232
try {
230
233
const hastePackageModule = path . join . apply (
231
234
path ,
@@ -234,7 +237,8 @@ class Resolver {
234
237
// try resolving with custom resolver first to support extensions,
235
238
// then fallback to require.resolve
236
239
const resolvedModule =
237
- resolveNodeModule ( hastePackageModule ) || requireResolve ( hastePackageModule ) ;
240
+ resolveNodeModule ( hastePackageModule ) ||
241
+ requireResolve ( hastePackageModule ) ;
238
242
this . _moduleNameCache . set ( key , resolvedModule ) ;
239
243
return resolvedModule ;
240
244
} catch ( ignoredError ) { }
@@ -454,28 +458,27 @@ class Resolver {
454
458
for ( const possibleModuleName of possibleModuleNames ) {
455
459
const updatedName = mapModuleName ( possibleModuleName ) ;
456
460
457
- const hasteModule = this . getModule ( updatedName )
461
+ const hasteModule = this . getModule ( updatedName ) ;
458
462
if ( hasteModule ) {
459
463
module = {
464
+ id : `haste:${ hasteModule } ?${ query } ` ,
460
465
path : hasteModule ,
461
- id : `haste:${ hasteModule } ?${ query } `
462
- }
463
- break
466
+ } ;
467
+ break ;
464
468
}
465
469
466
- const nodeModule =
467
- Resolver . findNodeModule ( updatedName , {
468
- basedir : dirname ,
469
- browser : this . _options . browser ,
470
- extensions,
471
- moduleDirectory,
472
- paths,
473
- resolver,
474
- rootDir : this . _options . rootDir ,
475
- } ) ;
470
+ const nodeModule = Resolver . findNodeModule ( updatedName , {
471
+ basedir : dirname ,
472
+ browser : this . _options . browser ,
473
+ extensions,
474
+ moduleDirectory,
475
+ paths,
476
+ resolver,
477
+ rootDir : this . _options . rootDir ,
478
+ } ) ;
476
479
477
480
if ( nodeModule ) {
478
- module = nodeModule
481
+ module = nodeModule ;
479
482
break ;
480
483
}
481
484
}
0 commit comments