Merge pull request #164 from browserify/browser-resolve-2

Author: goto-bus-stop

index.js

@@ -173,6 +173,10 @@ Deps.prototype.resolve = function (id, parent, cb) {
 
         return p;
     };
+
+    // have `resolve` do all the package.json lookups,
+    // see discussion in https://github.com/browserify/browser-resolve/issues/93#issuecomment-667837808
+    parent.package = undefined;
 
     if (opts.extensions) parent.extensions = opts.extensions;
     if (opts.modules) parent.modules = opts.modules;

package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "JSONStream": "^1.0.3",
-    "browser-resolve": "^1.7.0",
+    "browser-resolve": "^2.0.0",
     "cached-path-relative": "^1.0.2",
     "concat-stream": "~1.6.0",
     "defined": "^1.0.0",

test/pkg_filter.js

@@ -10,8 +10,10 @@ test('pkg filter', function (t) {
 
     var p = mdeps({
         packageFilter: function (pkg) {
-            t.equal(pkg.main, 'one.js');
-            pkg.main = 'two.js'
+            if (pkg.name === undefined) {
+                t.equal(pkg.main, 'one.js');
+                pkg.main = 'two.js'
+            }
             return pkg;
         }
     });