finally seems to fully handle browser field from outside foo/bar resolution

Author: James Halliday

lib/async.js

@@ -69,27 +69,29 @@ module.exports = function resolve (x, opts, cb) {
             if (exts.length === 0) return cb(null, undefined, pkg);
             var file = x + exts[0];
 
-            isFile(file, function (err, ex) {
+            if (pkg) onpkg(null, pkg)
+            else loadpkg(path.dirname(file), onpkg);
+            
+            function onpkg (err, pkg_, dir) {
+                pkg = pkg_;
                 if (err) return cb(err)
-                if (!ex) return load(exts.slice(1), x, pkg)
-                if (pkg) return cb(null, file, pkg)
-                
-                loadpkg(path.dirname(file), function (err, pkg, dir) {
-                    if (err) return cb(err)
-                    if (pkg && opts.pathFilter) {
-                        var rel = path.relative(dir, file)
-                            .slice(0, -exts[0].length)
-                        ;
-                        var r = opts.pathFilter(pkg, x, rel);
-                        if (r) return load(
-                            extensions.slice(),
-                            path.resolve(dir, r),
-                            pkg
-                        );
-                    }
-                    cb(null, file, pkg)
-                });
-            });
+                if (dir && pkg && opts.pathFilter) {
+                    var rfile = path.relative(dir, file);
+                    var rel = rfile.slice(0, rfile.length - exts[0].length);
+                    var r = opts.pathFilter(pkg, x, rel);
+                    if (r) return load(
+                        [''].concat(extensions.slice()),
+                        path.resolve(dir, r),
+                        pkg
+                    );
+                }
+                isFile(file, onex);
+            }
+            function onex (err, ex) {
+                if (err) cb(err)
+                else if (!ex) load(exts.slice(1), x, pkg)
+                else cb(null, file, pkg)
+            }
         }
     }