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

metro: collapse name verification into getHasteName() 

Reviewed By: rafeca, mjesun

Differential Revision: D7196246

fbshipit-source-id: 425573f61148ac3a4e85bbcf4fb1033f3e560dab
This commit is contained in:
Jean Lauliac 2018-03-09 10:39:39 -08:00 committed by Facebook Github Bot
parent 091815ea81
commit de35a73798
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/metro/src/ModuleGraph/worker/transform-module.js
View File

@ -99,17 +99,15 @@ function transformModule(
let hasteID = null; let hasteID = null;
if (filename.indexOf(NODE_MODULES) === -1 && !polyfill) { if (filename.indexOf(NODE_MODULES) === -1 && !polyfill) {
hasteID = docblock.parse(docblock.extract(sourceCode)).providesModule;
if (options.hasteImplModulePath != null) { if (options.hasteImplModulePath != null) {
// eslint-disable-next-line no-useless-call // eslint-disable-next-line no-useless-call
const HasteImpl = (require.call( const HasteImpl = (require.call(
null, null,
options.hasteImplModulePath, options.hasteImplModulePath,
): HasteImpl); ): HasteImpl);
if (HasteImpl.enforceHasteNameMatches) { hasteID = HasteImpl.getHasteName(filename, sourceCode);
HasteImpl.enforceHasteNameMatches(filename, hasteID); } else {
} hasteID = docblock.parse(docblock.extract(sourceCode)).providesModule;
hasteID = HasteImpl.getHasteName(filename);
} }
} }

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

@ -66,7 +66,7 @@ type Options = {|
+watch: boolean, +watch: boolean,
|}; |};
const JEST_HASTE_MAP_CACHE_BREAKER = 2; const JEST_HASTE_MAP_CACHE_BREAKER = 3;
class DependencyGraph extends EventEmitter { class DependencyGraph extends EventEmitter {
_assetResolutionCache: AssetResolutionCache; _assetResolutionCache: AssetResolutionCache;