Resolve JSON files from extensionless parameters

Fixes browserify#19
SLaks · May 10, 2013 · bcdb541 · qfox · Sep 8, 2014 · bcdb541
1 parent 790cdf5
commit bcdb541
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 1 deletion.
diff --git a/lib/sync.js b/lib/sync.js
@@ -13,7 +13,7 @@ module.exports = function (x, opts) {
     };
     var readFileSync = opts.readFileSync || fs.readFileSync;
 
-    var extensions = opts.extensions || [ '.js' ];
+    var extensions = opts.extensions || [ '.js', '.json' ];
     var y = opts.basedir
         || path.dirname(require.cache[__filename].parent.filename)
     ;

diff --git a/test/resolver.js b/test/resolver.js
@@ -20,6 +20,25 @@ test('async foo', function (t) {
     });
 });
 
+test('async JSON', function (t) {
+    t.plan(3);
+    var dir = __dirname + '/resolver';
+
+    resolve('./box', { basedir : dir }, function (err, res) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/box.json');
+    });
+
+    resolve('./box.json', { basedir : dir }, function (err, res) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/box.json');
+    });
+
+    resolve('box', { basedir : dir }, function (err) {
+        t.equal(err.message, "Cannot find module 'box'");
+    });
+});
+
 test('bar', function (t) {
     t.plan(2);
     var dir = __dirname + '/resolver';

diff --git a/test/resolver/box.json b/test/resolver/box.json
@@ -0,0 +1 @@
+1
diff --git a/test/resolver_sync.js b/test/resolver_sync.js
@@ -21,6 +21,26 @@ test('foo', function (t) {
     t.end();
 });
 
+test('JSON', function (t) {
+    var dir = __dirname + '/resolver';
+
+    t.equal(
+        resolve.sync('./box', { basedir: dir }),
+        dir + '/box.json'
+    );
+
+    t.equal(
+        resolve.sync('./box.json', { basedir: dir }),
+        dir + '/box.json'
+    );
+
+    t.throws(function () {
+        resolve.sync('box', { basedir : dir });
+    });
+
+    t.end();
+});
+
 test('bar', function (t) {
     var dir = __dirname + '/resolver';