Merge tag 'v1.7.1'

Author: ljharb

lib/sync.js

@@ -88,7 +88,7 @@ module.exports = function (x, options) {
         } catch (jsonErr) {}
 
         if (pkg && opts.packageFilter) {
-            pkg = opts.packageFilter(pkg, pkgfile);
+            pkg = opts.packageFilter(pkg, dir);
         }
 
         return { pkg: pkg, dir: dir };

package.json

@@ -1,7 +1,7 @@
 {
   "name": "resolve",
   "description": "resolve like require.resolve() on behalf of files asynchronously and synchronously",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/browserify/resolve.git"

readme.markdown

@@ -60,6 +60,8 @@ options are:
 * opts.isFile - function to asynchronously test whether a file exists
 
 * `opts.packageFilter(pkg, pkgfile)` - transform the parsed package.json contents before looking at the "main" field
+  * pkg - package data
+  * pkgfile - path to package.json
 
 * `opts.pathFilter(pkg, path, relativePath)` - transform a path within a package
   * pkg - package data
@@ -111,7 +113,9 @@ options are:
 
 * opts.isFile - function to synchronously test whether a file exists
 
-* `opts.packageFilter(pkg, pkgfile)` - transform the parsed package.json contents before looking at the "main" field
+* `opts.packageFilter(pkg, dir)` - transform the parsed package.json contents before looking at the "main" field
+  * pkg - package data
+  * dir - directory for package.json (Note: the second argument will change to "pkgfile" in v2)
 
 * `opts.pathFilter(pkg, path, relativePath)` - transform a path within a package
   * pkg - package data

test/filter.js

@@ -3,17 +3,32 @@ var test = require('tape');
 var resolve = require('../');
 
 test('filter', function (t) {
-    t.plan(2);
+    t.plan(4);
     var dir = path.join(__dirname, 'resolver');
+    var packageFilterArgs;
     resolve('./baz', {
         basedir: dir,
-        packageFilter: function (pkg) {
+        packageFilter: function (pkg, pkgfile) {
             pkg.main = 'doom';
+            packageFilterArgs = [pkg, pkgfile];
             return pkg;
         }
     }, function (err, res, pkg) {
         if (err) t.fail(err);
-        t.equal(res, path.join(dir, 'baz/doom.js'));
-        t.equal(pkg.main, 'doom');
+
+        t.equal(res, path.join(dir, 'baz/doom.js'), 'changing the package "main" works');
+
+        var packageData = packageFilterArgs[0];
+        t.equal(pkg, packageData, 'first packageFilter argument is "pkg"');
+        t.equal(packageData.main, 'doom', 'package "main" was altered');
+
+        var packageFile = packageFilterArgs[1];
+        t.equal(
+            packageFile,
+            path.join(dir, 'baz/package.json'),
+            'second packageFilter argument is "pkgfile"'
+        );
+
+        t.end();
     });
 });

test/filter_sync.js

@@ -4,13 +4,23 @@ var resolve = require('../');
 
 test('filter', function (t) {
     var dir = path.join(__dirname, 'resolver');
+    var packageFilterArgs;
     var res = resolve.sync('./baz', {
         basedir: dir,
-        packageFilter: function (pkg) {
+        packageFilter: function (pkg, dir) {
             pkg.main = 'doom';
+            packageFilterArgs = [pkg, dir];
             return pkg;
         }
     });
-    t.equal(res, path.join(dir, 'baz/doom.js'));
+
+    t.equal(res, path.join(dir, 'baz/doom.js'), 'changing the package "main" works');
+
+    var packageData = packageFilterArgs[0];
+    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.end();
 });