Merge pull request #58 from mvayngrib/alt-browser

fix pathFilter for alt browser field

Author: defunctzombie

index.js

@@ -15,7 +15,7 @@ function nodeModulesPaths (start, cb) {
     for (var i = parts.length - 1; i >= 0; i--) {
         if (parts[i] === 'node_modules') continue;
         var dir = path.join.apply(
-            path, parts.slice(0, i + 1).concat(["node_modules"])
+            path, parts.slice(0, i + 1).concat(['node_modules'])
         );
         if (!parts[0].match(/([A-Za-z]:)/)) {
             dir = '/' + dir;
@@ -170,27 +170,27 @@ function build_resolve_opts(opts, base) {
 
     var pathFilter = opts.pathFilter;
     opts.pathFilter = function(info, path, relativePath) {
-    	if(relativePath[0] != '.') {
-    		relativePath = './' + relativePath;
-    	}
-    	var mappedPath;
-    	if(pathFilter) {
-    		mappedPath = pathFilter.apply(this, arguments);
-    	}
-    	if(mappedPath) {
-    		return mappedPath;
-    	}
-    	if(!info.browser) {
-    		return;
-    	}
-
-    	if(typeof info.browser) {
-    		mappedPath = info.browser[relativePath];
-    		if(!mappedPath && (relativePath.lastIndexOf(".js") === relativePath.length-3) ) {
-    			mappedPath = info.browser[relativePath+".js"];
-    		}
-    		return mappedPath;
-    	}
+        if (relativePath[0] != '.') {
+            relativePath = './' + relativePath;
+        }
+        var mappedPath;
+        if (pathFilter) {
+            mappedPath = pathFilter.apply(this, arguments);
+        }
+        if (mappedPath) {
+            return mappedPath;
+        }
+
+        var replacements = info[browser];
+        if (!replacements) {
+            return;
+        }
+
+        mappedPath = replacements[relativePath];
+        if (!mappedPath && (relativePath.lastIndexOf('.js') === relativePath.length - 3)) {
+            mappedPath = replacements[relativePath + '.js'];
+        }
+        return mappedPath;
     };
 
     return opts;
@@ -324,4 +324,3 @@ function getReplacements(info, browser) {
 }
 
 module.exports = resolve;
-

test/fixtures/node_modules/alt-browser-field/chromeapp-direct.js

@@ -250,3 +250,16 @@ test('alt-browser field', function(done) {
         done();
     });
 });
+
+test('alt-browser deep module reference mapping', function(done) {
+    resolve('alt-browser-field/direct', {
+        basedir: __dirname + '/fixtures',
+        package: { main: 'fixtures' },
+        browser: 'chromeapp'
+    }, function(err, path, pkg) {
+        assert.ifError(err);
+        assert.equal(path, require.resolve('./fixtures/node_modules/alt-browser-field/chromeapp-direct'));
+        assert.equal(pkg.main, './chromeapp.js');
+        done();
+    });
+});