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

metro: ModuleResolution: do not allow recursive package directories 

Reviewed By: davidaurelio

Differential Revision: D6612113

fbshipit-source-id: 8b688cb3eed5cc76b07f471ecc98e22e765583ad
This commit is contained in:
Jean Lauliac 2017-12-24 03:06:11 -08:00 committed by Facebook Github Bot
parent 9ff46c13e3
commit 6adc4cccd2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,7 @@ type FileCandidates =
* a module name as directory. * a module name as directory.
*/ */
type DirCandidates = type DirCandidates =
| {|+type: 'package', +dir: DirCandidates, +file: FileCandidates|} | {|+type: 'package', +index: FileCandidates, +file: FileCandidates|}
| {|+type: 'index', +file: FileCandidates|}; | {|+type: 'index', +file: FileCandidates|};
type FileAndDirCandidates = {|+dir: DirCandidates, +file: FileCandidates|}; type FileAndDirCandidates = {|+dir: DirCandidates, +file: FileCandidates|};
@ -477,13 +477,13 @@ function resolvePackage(
if (fileResult.type === 'resolved') { if (fileResult.type === 'resolved') {
return fileResult; return fileResult;
} }
const dirResult = resolveDir(context, mainPrefixPath, platform); const indexResult = resolveFile(context, mainPrefixPath, 'index', platform);
if (dirResult.type === 'resolved') { if (indexResult.type === 'resolved') {
return dirResult; return indexResult;
} }
return failedFor({ return failedFor({
type: 'package', type: 'package',
dir: dirResult.candidates, index: indexResult.candidates,
file: fileResult.candidates, file: fileResult.candidates,
}); });
} }