Skip to content

Commit 2b57f2a

Browse files
manucorporatljharb
authored andcommitted
fix: packageFilter passes expected arguments
(see #202)
1 parent 13a765b commit 2b57f2a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

lib/sync.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ module.exports = function (x, options) {
118118
} catch (jsonErr) {}
119119

120120
if (pkg && opts.packageFilter) {
121-
pkg = opts.packageFilter(pkg, pkgfile);
121+
pkg = opts.packageFilter(pkg, pkgfile, dir);
122122
}
123123

124124
return { pkg: pkg, dir: dir };
@@ -133,7 +133,7 @@ module.exports = function (x, options) {
133133
} catch (e) {}
134134

135135
if (pkg && opts.packageFilter) {
136-
pkg = opts.packageFilter(pkg, x);
136+
pkg = opts.packageFilter(pkg, pkgfile, x);
137137
}
138138

139139
if (pkg && pkg.main) {

test/filter_sync.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ test('filter', function (t) {
77
var packageFilterArgs;
88
var res = resolve.sync('./baz', {
99
basedir: dir,
10-
packageFilter: function (pkg, dir) {
10+
packageFilter: function (pkg, pkgfile, dir) {
1111
pkg.main = 'doom'; // eslint-disable-line no-param-reassign
12-
packageFilterArgs = [pkg, dir];
12+
packageFilterArgs = [pkg, pkgfile, dir];
1313
return pkg;
1414
}
1515
});
@@ -20,6 +20,9 @@ test('filter', function (t) {
2020
t.equal(packageData.main, 'doom', 'package "main" was altered');
2121

2222
var packageFile = packageFilterArgs[1];
23+
t.equal(packageFile, path.join(dir, 'baz', 'package.json'), 'package.json path is correct');
24+
25+
var packageFile = packageFilterArgs[2];
2326
t.equal(packageFile, path.join(dir, 'baz'), 'second packageFilter argument is "dir"');
2427

2528
t.end();

0 commit comments

Comments
 (0)