Upgrade jest-haste-map to v24.0.0-alpha.2

Reviewed By: jeanlauliac

Differential Revision: D10484195

fbshipit-source-id: e73002bcb8640747fcbcb8a2a17b70d05bb19898

Author: rafeca

packages/metro-core/package.json

@@ -12,7 +12,7 @@
     "cleanup-release": "test ! -e build && mv src build && mv src.real src"
   },
   "dependencies": {
-    "jest-haste-map": "23.5.0",
+    "jest-haste-map": "24.0.0-alpha.2",
     "lodash.throttle": "^4.1.1",
     "metro-resolver": "0.48.1",
     "wordwrap": "^1.0.0"

packages/metro/package.json

@@ -33,9 +33,8 @@
     "fs-extra": "^1.0.0",
     "graceful-fs": "^4.1.3",
     "image-size": "^0.6.0",
-    "jest-docblock": "23.2.0",
-    "jest-haste-map": "23.5.0",
-    "jest-worker": "23.2.0",
+    "jest-haste-map": "24.0.0-alpha.2",
+    "jest-worker": "24.0.0-alpha.2",
     "json-stable-stringify": "^1.0.1",
     "lodash.throttle": "^4.1.1",
     "merge-stream": "^1.0.1",

packages/metro/src/DeltaBundler/__tests__/traverseDependencies-integration-test.js

@@ -685,12 +685,12 @@ describe('traverseDependencies', function() {
       } catch (error) {
         expect(error.message).toEqual(
           [
-            'jest-haste-map: @providesModule naming collision:',
+            'jest-haste-map: Haste module naming collision:',
             '  Duplicate module name: index',
             '  Paths: /root/b.js collides with /root/index.js',
             '',
-            'This error is caused by a @providesModule declaration with the ' +
-              'same name across two different files.',
+            'This error is caused by `hasteImpl` returning the same ' +
+              'name for different files.',
           ].join('\n'),
         );
       }

packages/metro/src/ModuleGraph/node-haste/ModuleCache.js

@@ -34,10 +34,23 @@ module.exports = class ModuleCache {
   }
 
   getModule(path: string): Module {
-    let m = this.modules.get(path);
+    // This is hacky as hell... `ModuleGraph` handles relative paths but which
+    // start with a slash (so we can have `/js/foo.js` or even `/../foo.js`).
+    // This does not play well with `jest-haste-map`, which tries to convert
+    // paths to absolute (https://fburl.com/vbwmjsxa) causing an additional
+    // slashed to be prepended in the file path.
+    // TODO: Refactor the way metro-buck handles paths to make them either
+    // relative or absolute.
+    const normalizedPath = path.startsWith('//') ? path.substr(1) : path;
+
+    let m = this.modules.get(normalizedPath);
     if (!m) {
-      m = new Module(path, this, this.getTransformedFile(path));
-      this.modules.set(path, m);
+      m = new Module(
+        normalizedPath,
+        this,
+        this.getTransformedFile(normalizedPath),
+      );
+      this.modules.set(normalizedPath, m);
     }
     return m;
   }

packages/metro/src/ModuleGraph/node-haste/node-haste.js

@@ -58,7 +58,8 @@ const NULL_MODULE: Moduleish = {
 
 // This function maps the ModuleGraph data structure to jest-haste-map's ModuleMap
 const createModuleMap = ({files, helpers, moduleCache, sourceExts}) => {
-  const map = Object.create(null);
+  const map = new Map();
+
   files.forEach(filePath => {
     if (helpers.isNodeModulesDir(filePath)) {
       return;
@@ -76,15 +77,15 @@ const createModuleMap = ({files, helpers, moduleCache, sourceExts}) => {
     if (!(id && module && module.isHaste())) {
       return;
     }
-    if (!map[id]) {
-      map[id] = Object.create(null);
-    }
+
+    const mapModule = map.get(id) || Object.create(null);
+
     const platform =
       parsePlatformFilePath(filePath, platforms).platform || GENERIC_PLATFORM;
 
-    const existingModule = map[id][platform];
+    const existingModule = mapModule[platform];
     // 0 = Module, 1 = Package in jest-haste-map
-    map[id][platform] = [filePath, module.type === 'Package' ? 1 : 0];
+    mapModule[platform] = [filePath, module.type === 'Package' ? 1 : 0];
 
     if (existingModule && existingModule[0] !== filePath) {
       throw new Error(
@@ -98,6 +99,8 @@ const createModuleMap = ({files, helpers, moduleCache, sourceExts}) => {
         ].join('\n'),
       );
     }
+
+    map.set(id, mapModule);
   });
   return map;
 };
@@ -144,9 +147,10 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
     mainFields: options.mainFields,
     moduleCache,
     moduleMap: new ModuleMap({
-      duplicates: Object.create(null),
+      duplicates: new Map(),
       map: createModuleMap({files, helpers, moduleCache, sourceExts}),
-      mocks: Object.create(null),
+      mocks: new Map(),
+      rootDir: '',
     }),
     preferNativePlatform: true,
     resolveAsset: (dirPath, assetName, platform) =>

packages/metro/src/node-haste/DependencyGraph.js

@@ -93,6 +93,7 @@ class DependencyGraph extends EventEmitter {
       providesModuleNodeModules: config.resolver.providesModuleNodeModules,
       retainAllFiles: true,
       resetCache: config.resetCache,
+      rootDir: config.projectRoot,
       roots: config.watchFolders,
       throwOnModuleCollision: true,
       useWatchman: config.resolver.useWatchman,