diff --git a/packages/metro/src/ModuleGraph/worker/transform-module.js b/packages/metro/src/ModuleGraph/worker/transform-module.js index c08143ee..78ea3364 100644 --- a/packages/metro/src/ModuleGraph/worker/transform-module.js +++ b/packages/metro/src/ModuleGraph/worker/transform-module.js @@ -99,17 +99,15 @@ function transformModule( let hasteID = null; if (filename.indexOf(NODE_MODULES) === -1 && !polyfill) { - hasteID = docblock.parse(docblock.extract(sourceCode)).providesModule; if (options.hasteImplModulePath != null) { // eslint-disable-next-line no-useless-call const HasteImpl = (require.call( null, options.hasteImplModulePath, ): HasteImpl); - if (HasteImpl.enforceHasteNameMatches) { - HasteImpl.enforceHasteNameMatches(filename, hasteID); - } - hasteID = HasteImpl.getHasteName(filename); + hasteID = HasteImpl.getHasteName(filename, sourceCode); + } else { + hasteID = docblock.parse(docblock.extract(sourceCode)).providesModule; } } diff --git a/packages/metro/src/node-haste/DependencyGraph.js b/packages/metro/src/node-haste/DependencyGraph.js index bac24616..077a3319 100644 --- a/packages/metro/src/node-haste/DependencyGraph.js +++ b/packages/metro/src/node-haste/DependencyGraph.js @@ -66,7 +66,7 @@ type Options = {| +watch: boolean, |}; -const JEST_HASTE_MAP_CACHE_BREAKER = 2; +const JEST_HASTE_MAP_CACHE_BREAKER = 3; class DependencyGraph extends EventEmitter { _assetResolutionCache: AssetResolutionCache;