sync with node-haste

Author: skevy

packager/react-packager/src/DependencyResolver/DependencyGraph/DependencyGraphHelpers.js

@@ -31,29 +31,40 @@ class DependencyGraphHelpers {
    * or examples).
    */
   _resolveHastePackages(packages) {
-    const _packagePathForPackage = ({ name, parent }, rootDir) => {
+    const packagePathForPackage = ({ name, parent }, rootDir) => {
+      let packagePath;
       if (parent) {
         if (!Array.isArray(parent)) {
           parent = [parent];
         }
         parent.push(name);
-        return path.join(rootDir, 'node_modules', parent.join(`${path.sep}node_modules${path.sep}`)) + path.sep;
+        packagePath = path.join(
+          rootDir,
+          'node_modules',
+          parent.join(path.sep + 'node_modules' + path.sep)
+        );
       } else {
-        return path.join(rootDir, 'node_modules', name) + path.sep;
+        packagePath = path.join(rootDir, 'node_modules', name);
+      }
+
+      if (packagePath[packagePath.length - 1] === path.sep) {
+        return packagePath.slice(0, -1);
+      } else {
+        return packagePath;
       }
     };
 
     return packages.reduce((hastePackages, p) => {
       this._roots.forEach(rootDir => {
-        const packagePath = _packagePathForPackage(p, rootDir);
+        const packagePath = packagePathForPackage(p, rootDir);
         try {
           const stats = fs.statSync(packagePath);
           if (stats && stats.isDirectory()) {
             hastePackages.push(packagePath);
           }
         } catch (e) {
           // if we don't find the package, let's just default to node_modules/[package name]
-          hastePackages.push(_packagePathForPackage({ name: p.name }, rootDir));
+          hastePackages.push(packagePathForPackage({ name: p.name }, rootDir));
         }
       });
       return hastePackages;
@@ -75,16 +86,13 @@ class DependencyGraphHelpers {
       return false;
     }
 
-    const isHaste = this._providesModuleNodeModuleDirs.map(dir => {
-      if (file.startsWith(dir) &&
-          !file.startsWith(path.join(dir, 'node_modules'))
+    for (let i = 0; i < this._providesModuleNodeModuleDirs.length; i++) {
+      const dir = this._providesModuleNodeModuleDirs[i];
+      if (file.startsWith(dir + path.sep) &&
+          !file.startsWith(dir + path.sep + 'node_modules')
       ) { // the file is contained in one of the haste packages
-        return true;
+        return false;
       }
-    });
-
-    if (isHaste.indexOf(true) !== -1) {
-      return false;
     }
 
     return true;

packager/react-packager/src/__mocks__/fs.js

@@ -216,9 +216,6 @@ function getToNode(filepath) {
     throw new Error('Make sure all paths are absolute.');
   }
   var node = filesystem;
-  if (parts[parts.length - 1] === '') {
-    delete parts[parts.length - 1];
-  }
   parts.slice(1).forEach(function(part) {
     if (node && node.SYMLINK) {
       node = getToNode(node.SYMLINK);