@@ -27,8 +27,6 @@ import type Module from '../Module';
27
27
import type ModuleCache from '../ModuleCache' ;
28
28
import type ResolutionResponse from './ResolutionResponse' ;
29
29
30
- const emptyModule = require . resolve ( './assets/empty-module.js' ) ;
31
-
32
30
type DirExistsFn = ( filePath : string ) => boolean ;
33
31
34
32
type Options = {
@@ -43,7 +41,6 @@ type Options = {
43
41
platform : string ,
44
42
platforms : Set < string > ,
45
43
preferNativePlatform : boolean ,
46
- shouldThrowOnUnresolvedErrors : ( ) => boolean ,
47
44
} ;
48
45
49
46
class ResolutionRequest {
@@ -58,7 +55,7 @@ class ResolutionRequest {
58
55
_platform: string ;
59
56
_platforms: Set < string > ;
60
57
_preferNativePlatform: boolean ;
61
- _shouldThrowOnUnresolvedErrors: ( ) => boolean ;
58
+ static emptyModule: string ;
62
59
63
60
constructor ( {
64
61
dirExists,
@@ -71,7 +68,6 @@ class ResolutionRequest {
71
68
platform,
72
69
platforms,
73
70
preferNativePlatform,
74
- shouldThrowOnUnresolvedErrors,
75
71
} : Options ) {
76
72
this . _dirExists = dirExists ;
77
73
this . _entryPath = entryPath ;
@@ -83,7 +79,6 @@ class ResolutionRequest {
83
79
this . _platform = platform ;
84
80
this . _platforms = platforms ;
85
81
this . _preferNativePlatform = preferNativePlatform ;
86
- this . _shouldThrowOnUnresolvedErrors = shouldThrowOnUnresolvedErrors ;
87
82
this . _resetResolutionCache ( ) ;
88
83
}
89
84
@@ -109,38 +104,16 @@ class ResolutionRequest {
109
104
return result ;
110
105
} ;
111
106
112
- const forgive = ( error ) => {
113
- if (
114
- error . type !== 'UnableToResolveError' ||
115
- this . _shouldThrowOnUnresolvedErrors ( this . _entryPath , this . _platform )
116
- ) {
117
- throw error ;
118
- }
119
-
120
- debug (
121
- 'Unable to resolve module %s from %s' ,
122
- toModuleName ,
123
- fromModule . path
124
- ) ;
125
- return null ;
126
- } ;
127
-
128
107
if ( ! this . _helpers . isNodeModulesDir ( fromModule . path )
129
108
&& ! ( isRelativeImport ( toModuleName ) || isAbsolutePath ( toModuleName ) ) ) {
130
109
return this . _tryResolve (
131
110
( ) => this . _resolveHasteDependency ( fromModule , toModuleName ) ,
132
111
( ) => this . _resolveNodeDependency ( fromModule , toModuleName )
133
- ) . then (
134
- cacheResult ,
135
- forgive ,
136
- ) ;
112
+ ) . then ( cacheResult ) ;
137
113
}
138
114
139
115
return this . _resolveNodeDependency ( fromModule , toModuleName )
140
- . then (
141
- cacheResult ,
142
- forgive ,
143
- ) ;
116
+ . then ( cacheResult ) ;
144
117
}
145
118
146
119
getOrderedDependencies ( {
@@ -311,7 +284,11 @@ class ResolutionRequest {
311
284
return this . _redirectRequire ( fromModule , potentialModulePath ) . then (
312
285
realModuleName => {
313
286
if ( realModuleName === false ) {
314
- return this . _loadAsFile ( emptyModule , fromModule , toModuleName ) ;
287
+ return this . _loadAsFile (
288
+ ResolutionRequest . emptyModule ,
289
+ fromModule ,
290
+ toModuleName ,
291
+ ) ;
315
292
}
316
293
317
294
return this . _tryResolve (
@@ -330,7 +307,11 @@ class ResolutionRequest {
330
307
realModuleName => {
331
308
// exclude
332
309
if ( realModuleName === false ) {
333
- return this . _loadAsFile ( emptyModule , fromModule , toModuleName ) ;
310
+ return this . _loadAsFile (
311
+ ResolutionRequest . emptyModule ,
312
+ fromModule ,
313
+ toModuleName ,
314
+ ) ;
334
315
}
335
316
336
317
if ( isRelativeImport ( realModuleName ) || isAbsolutePath ( realModuleName ) ) {
@@ -526,4 +507,6 @@ function isRelativeImport(filePath) {
526
507
return / ^ [ . ] [ . ] ? (?: [ / ] | $ ) / . test ( filePath ) ;
527
508
}
528
509
510
+ ResolutionRequest . emptyModule = require . resolve ( './assets/empty-module.js' ) ;
511
+
529
512
module . exports = ResolutionRequest ;
0 commit comments