status-im
/
metro
mirror of https://github.com/status-im/metro.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

metro-bundler: ModuleResolution: remove loadAsFileOrThrow 

Reviewed By: cpojer

Differential Revision: D5406612

fbshipit-source-id: bd20e1c9aa23b6988ab02c8c0459335874d7d346
This commit is contained in:
Jean Lauliac 2017-07-13 06:15:34 -07:00 committed by Facebook Github Bot
parent 392a129b56
commit bc75b94b7e
1 changed files with 26 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
packages/metro-bundler/src/node-haste/DependencyGraph/ModuleResolution.js
View File

@ -178,21 +178,11 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
package_.root,
path.relative(packageName, realModuleName),
);
return tryResolveSync(
() =>
this._loadAsFileOrThrow(
potentialModulePath,
fromModule,
toModuleName,
platform,
),
() =>
this._loadAsDirOrThrow(
potentialModulePath,
fromModule,
toModuleName,
platform,
),
return this._loadAsFileOrDirOrThrow(
potentialModulePath,
fromModule,
toModuleName,
platform,
);
}
@ -227,22 +217,11 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
if (realModuleName === false) {
return this._getEmptyModule(fromModule, toModuleName);
}
return tryResolveSync(
() =>
this._loadAsFileOrThrow(
realModuleName,
fromModule,
toModuleName,
platform,
),
() =>
this._loadAsDirOrThrow(
realModuleName,
fromModule,
toModuleName,
platform,
),
return this._loadAsFileOrDirOrThrow(
potentialModulePath,
fromModule,
toModuleName,
platform,
);
}
@ -338,21 +317,11 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
platform: string | null,
): ?TModule {
try {
return tryResolveSync(
() =>
this._loadAsFileOrThrow(
searchPath,
fromModule,
toModuleName,
platform,
),
() =>
this._loadAsDirOrThrow(
searchPath,
fromModule,
toModuleName,
platform,
),
return this._loadAsFileOrDirOrThrow(
searchPath,
fromModule,
toModuleName,
platform,
);
} catch (error) {
if (error.type !== 'UnableToResolveError') {
@ -369,31 +338,24 @@ class ModuleResolver<TModule: Moduleish, TPackage: Packageish> {
* This function is meant to be a temporary proxy for _loadAsFile until
* the callsites switch to that tracking structure.
*/
_loadAsFileOrThrow(
basePath: string,
_loadAsFileOrDirOrThrow(
potentialModulePath: string,
fromModule: TModule,
toModule: string,
toModuleName: string,
platform: string | null,
): TModule {
const dirPath = path.dirname(basePath);
const fileNameHint = path.basename(basePath);
const dirPath = path.dirname(potentialModulePath);
const fileNameHint = path.basename(potentialModulePath);
const result = this._loadAsFile(dirPath, fileNameHint, platform);
if (result.type === 'resolved') {
return result.module;
}
if (result.candidates.type === 'asset') {
const msg =
`Directory \`${dirPath}' doesn't contain asset ` +
`\`${result.candidates.name}'`;
throw new UnableToResolveError(fromModule, toModule, msg);
}
invariant(result.candidates.type === 'sources', 'invalid candidate type');
const msg =
`Could not resolve the base path \`${basePath}' into a module. The ` +
`folder \`${dirPath}' was searched for one of these files: ` +
result.candidates.fileNames.map(filePath => `\`${filePath}'`).join(', ') +
'.';
throw new UnableToResolveError(fromModule, toModule, msg);
return this._loadAsDirOrThrow(
potentialModulePath,
fromModule,
toModuleName,
platform,
);
}
_loadAsFile(