Skip to content

Commit b1fd7bd

Browse files
cpojerFacebook Github Bot
authored and
Facebook Github Bot
committed
kill shouldThrowOnUnresolvedErrors option
Summary: Removes the `shouldThrowOnUnresolvedErrors` option, as now it is only ever `() => true` Reviewed By: davidaurelio Differential Revision: D4237711 fbshipit-source-id: 9460f0f0c50dc0d08d17cb7bdeb995825f7051f3
1 parent 4902a03 commit b1fd7bd

File tree

5 files changed

+172
-222
lines changed

5 files changed

+172
-222
lines changed

packager/react-packager/src/ModuleGraph/node-haste/node-haste.js

-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ type ResolveOptions = {|
3737
|};
3838

3939
const platforms = new Set(defaults.platforms);
40-
const returnTrue = () => true;
4140

4241
exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
4342
const {
@@ -87,7 +86,6 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
8786
platform,
8887
platforms,
8988
preferNativePlatform: true,
90-
shouldThrowOnUnresolvedErrors: returnTrue,
9189
});
9290
}
9391

packager/react-packager/src/Resolver/index.js

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ class Resolver {
9898
preferNativePlatform: true,
9999
watch: opts.watch,
100100
cache: opts.cache,
101-
shouldThrowOnUnresolvedErrors: () => true,
102101
transformCode: opts.transformCode,
103102
transformCacheKey: opts.transformCacheKey,
104103
extraNodeModules: opts.extraNodeModules,

packager/react-packager/src/node-haste/DependencyGraph/ResolutionRequest.js

+15-32
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import type Module from '../Module';
2727
import type ModuleCache from '../ModuleCache';
2828
import type ResolutionResponse from './ResolutionResponse';
2929

30-
const emptyModule = require.resolve('./assets/empty-module.js');
31-
3230
type DirExistsFn = (filePath: string) => boolean;
3331

3432
type Options = {
@@ -43,7 +41,6 @@ type Options = {
4341
platform: string,
4442
platforms: Set<string>,
4543
preferNativePlatform: boolean,
46-
shouldThrowOnUnresolvedErrors: () => boolean,
4744
};
4845

4946
class ResolutionRequest {
@@ -58,7 +55,7 @@ class ResolutionRequest {
5855
_platform: string;
5956
_platforms: Set<string>;
6057
_preferNativePlatform: boolean;
61-
_shouldThrowOnUnresolvedErrors: () => boolean;
58+
static emptyModule: string;
6259

6360
constructor({
6461
dirExists,
@@ -71,7 +68,6 @@ class ResolutionRequest {
7168
platform,
7269
platforms,
7370
preferNativePlatform,
74-
shouldThrowOnUnresolvedErrors,
7571
}: Options) {
7672
this._dirExists = dirExists;
7773
this._entryPath = entryPath;
@@ -83,7 +79,6 @@ class ResolutionRequest {
8379
this._platform = platform;
8480
this._platforms = platforms;
8581
this._preferNativePlatform = preferNativePlatform;
86-
this._shouldThrowOnUnresolvedErrors = shouldThrowOnUnresolvedErrors;
8782
this._resetResolutionCache();
8883
}
8984

@@ -109,38 +104,16 @@ class ResolutionRequest {
109104
return result;
110105
};
111106

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-
128107
if (!this._helpers.isNodeModulesDir(fromModule.path)
129108
&& !(isRelativeImport(toModuleName) || isAbsolutePath(toModuleName))) {
130109
return this._tryResolve(
131110
() => this._resolveHasteDependency(fromModule, toModuleName),
132111
() => this._resolveNodeDependency(fromModule, toModuleName)
133-
).then(
134-
cacheResult,
135-
forgive,
136-
);
112+
).then(cacheResult);
137113
}
138114

139115
return this._resolveNodeDependency(fromModule, toModuleName)
140-
.then(
141-
cacheResult,
142-
forgive,
143-
);
116+
.then(cacheResult);
144117
}
145118

146119
getOrderedDependencies({
@@ -311,7 +284,11 @@ class ResolutionRequest {
311284
return this._redirectRequire(fromModule, potentialModulePath).then(
312285
realModuleName => {
313286
if (realModuleName === false) {
314-
return this._loadAsFile(emptyModule, fromModule, toModuleName);
287+
return this._loadAsFile(
288+
ResolutionRequest.emptyModule,
289+
fromModule,
290+
toModuleName,
291+
);
315292
}
316293

317294
return this._tryResolve(
@@ -330,7 +307,11 @@ class ResolutionRequest {
330307
realModuleName => {
331308
// exclude
332309
if (realModuleName === false) {
333-
return this._loadAsFile(emptyModule, fromModule, toModuleName);
310+
return this._loadAsFile(
311+
ResolutionRequest.emptyModule,
312+
fromModule,
313+
toModuleName,
314+
);
334315
}
335316

336317
if (isRelativeImport(realModuleName) || isAbsolutePath(realModuleName)) {
@@ -526,4 +507,6 @@ function isRelativeImport(filePath) {
526507
return /^[.][.]?(?:[/]|$)/.test(filePath);
527508
}
528509

510+
ResolutionRequest.emptyModule = require.resolve('./assets/empty-module.js');
511+
529512
module.exports = ResolutionRequest;

0 commit comments

Comments
 (0)