fix: packageFilter passes expected arguments

(see #202)
browserify · Nov 19, 2019 · 9f06a8f · 9f06a8f
1 parent ed46ce6
commit 9f06a8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lib/sync.js b/lib/sync.js
@@ -118,7 +118,7 @@ module.exports = function (x, options) {
         } catch (jsonErr) {}
 
         if (pkg && opts.packageFilter) {
-            pkg = opts.packageFilter(pkg, pkgfile);
+            pkg = opts.packageFilter(pkg, pkgfile, dir);
         }
 
         return { pkg: pkg, dir: dir };
@@ -133,7 +133,7 @@ module.exports = function (x, options) {
             } catch (e) {}
 
             if (pkg && opts.packageFilter) {
-                pkg = opts.packageFilter(pkg, x);
+                pkg = opts.packageFilter(pkg, pkgfile, x);
             }
 
             if (pkg && pkg.main) {

diff --git a/test/filter_sync.js b/test/filter_sync.js
@@ -7,9 +7,9 @@ test('filter', function (t) {
     var packageFilterArgs;
     var res = resolve.sync('./baz', {
         basedir: dir,
-        packageFilter: function (pkg, dir) {
+        packageFilter: function (pkg, pkgfile, dir) {
             pkg.main = 'doom'; // eslint-disable-line no-param-reassign
-            packageFilterArgs = [pkg, dir];
+            packageFilterArgs = [pkg, pkgfile, dir];
             return pkg;
         }
     });
@@ -20,7 +20,10 @@ test('filter', function (t) {
     t.equal(packageData.main, 'doom', 'package "main" was altered');
 
     var packageFile = packageFilterArgs[1];
-    t.equal(packageFile, path.join(dir, 'baz'), 'second packageFilter argument is "dir"');
+    t.equal(packageFile, path.join(dir, 'baz', 'package.json'), 'package.json path is correct');
+
+    var packageDir = packageFilterArgs[2];
+    t.equal(packageDir, path.join(dir, 'baz'), 'third packageFilter argument is "dir"');
 
     t.end();
 });