From 540cb4bb8e581857fae5615ff05e1cecade6e9d2 Mon Sep 17 00:00:00 2001
From: Amjad Masad <amasad@fb.com>
Date: Mon, 23 Mar 2015 15:12:34 -0700
Subject: [PATCH] [react-packager] Default to index.js from main if it's a dir

---
 .../__tests__/DependencyGraph-test.js         | 63 +++++++++++++++++++
 .../haste/DependencyGraph/index.js            |  6 ++
 2 files changed, 69 insertions(+)

diff --git a/packager/react-packager/src/DependencyResolver/haste/DependencyGraph/__tests__/DependencyGraph-test.js b/packager/react-packager/src/DependencyResolver/haste/DependencyGraph/__tests__/DependencyGraph-test.js
index bbdb06417..8ebe9c5a6 100644
--- a/packager/react-packager/src/DependencyResolver/haste/DependencyGraph/__tests__/DependencyGraph-test.js
+++ b/packager/react-packager/src/DependencyResolver/haste/DependencyGraph/__tests__/DependencyGraph-test.js
@@ -166,6 +166,69 @@ describe('DependencyGraph', function() {
       });
     });
 
+    pit('should default main package to index.js', function() {
+      var root = '/root';
+      fs.__setMockFilesystem({
+        'root': {
+          'index.js': 'require("aPackage")',
+          'aPackage': {
+            'package.json': JSON.stringify({
+              name: 'aPackage',
+            }),
+            'index.js': 'lol',
+          }
+        }
+      });
+
+      var dgraph = new DependencyGraph({
+        roots: [root],
+        fileWatcher: fileWatcher
+      });
+      return dgraph.load().then(function() {
+        expect(dgraph.getOrderedDependencies('/root/index.js'))
+          .toEqual([
+            {id: '/root/index.js', path: '/root/index.js', dependencies: ['aPackage']},
+            { id: 'aPackage/index',
+              path: '/root/aPackage/index.js',
+              dependencies: []
+            },
+          ]);
+      });
+    });
+
+    pit('should default use index.js if main is a dir', function() {
+      var root = '/root';
+      fs.__setMockFilesystem({
+        'root': {
+          'index.js': 'require("aPackage")',
+          'aPackage': {
+            'package.json': JSON.stringify({
+              name: 'aPackage',
+              main: 'lib',
+            }),
+            lib: {
+              'index.js': 'lol',
+            },
+          }
+        }
+      });
+
+      var dgraph = new DependencyGraph({
+        roots: [root],
+        fileWatcher: fileWatcher
+      });
+      return dgraph.load().then(function() {
+        expect(dgraph.getOrderedDependencies('/root/index.js'))
+          .toEqual([
+            {id: '/root/index.js', path: '/root/index.js', dependencies: ['aPackage']},
+            { id: 'aPackage/lib/index',
+              path: '/root/aPackage/lib/index.js',
+              dependencies: []
+            },
+          ]);
+      });
+    });
+
     pit('should ignore malformed packages', function() {
       var root = '/root';
       fs.__setMockFilesystem({
diff --git a/packager/react-packager/src/DependencyResolver/haste/DependencyGraph/index.js b/packager/react-packager/src/DependencyResolver/haste/DependencyGraph/index.js
index 14139159f..4622864d2 100644
--- a/packager/react-packager/src/DependencyResolver/haste/DependencyGraph/index.js
+++ b/packager/react-packager/src/DependencyResolver/haste/DependencyGraph/index.js
@@ -184,6 +184,12 @@ DependecyGraph.prototype.resolveDependency = function(
     var main = packageJson.main || 'index';
     modulePath = withExtJs(path.join(packageJson._root, main));
     dep = this._graph[modulePath];
+
+    // Some packages use just a dir and rely on an index.js inside that dir.
+    if (dep == null) {
+      dep = this._graph[path.join(packageJson._root, main, 'index.js')];
+    }
+
     if (dep == null) {
       throw new Error(
         'Cannot find package main file for package: ' + packageJson._root