Merge tag 'v1.10.0'

Author: ljharb

package.json

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

test/resolver.js

@@ -379,6 +379,19 @@ test('non-string "main" field in package.json', function (t) {
     });
 });
 
+test('non-string "main" field in package.json', function (t) {
+    t.plan(5);
+
+    var dir = path.join(__dirname, 'resolver');
+    resolve('./invalid_main', { basedir: dir }, function (err, res, pkg) {
+        t.ok(err, 'errors on non-string main');
+        t.equal(err.message, 'package “invalid main” `main` must be a string');
+        t.equal(err.code, 'INVALID_PACKAGE_MAIN');
+        t.equal(res, undefined, 'res is undefined');
+        t.equal(pkg, undefined, 'pkg is undefined');
+    });
+});
+
 test('browser field in package.json', function (t) {
     t.plan(3);
 

test/resolver_sync.js

@@ -298,6 +298,20 @@ test('non-string "main" field in package.json', function (t) {
     t.end();
 });
 
+test('non-string "main" field in package.json', function (t) {
+    var dir = path.join(__dirname, 'resolver');
+    try {
+        var result = resolve.sync('./invalid_main', { basedir: dir });
+        t.equal(result, undefined, 'result should not exist');
+        t.fail('should not get here');
+    } catch (err) {
+        t.ok(err, 'errors on non-string main');
+        t.equal(err.message, 'package “invalid main” `main` must be a string');
+        t.equal(err.code, 'INVALID_PACKAGE_MAIN');
+    }
+    t.end();
+});
+
 test('browser field in package.json', function (t) {
     var dir = path.join(__dirname, 'resolver');
     var res = resolve.sync('./browser_field', {