Merge pull request #73 from src-code/issue-69

Fixing resolution of deep module references without a file extension

Author: defunctzombie

index.js

@@ -168,7 +168,7 @@ function build_resolve_opts(opts, base) {
     };
 
     var pathFilter = opts.pathFilter;
-    opts.pathFilter = function(info, path, relativePath) {
+    opts.pathFilter = function(info, resvPath, relativePath) {
         if (relativePath[0] != '.') {
             relativePath = './' + relativePath;
         }
@@ -186,8 +186,11 @@ function build_resolve_opts(opts, base) {
         }
 
         mappedPath = replacements[relativePath];
-        if (!mappedPath && (relativePath.lastIndexOf('.js') === relativePath.length - 3)) {
+        if (!mappedPath && path.extname(relativePath) === '') {
             mappedPath = replacements[relativePath + '.js'];
+            if (!mappedPath) {
+                mappedPath = replacements[relativePath + '.json'];
+            }
         }
         return mappedPath;
     };

test/fixtures/node_modules/module-n/browser-bar.json

@@ -99,6 +99,23 @@ test('deep module reference mapping', function(done) {
     });
 });
 
+// package.json has browser field as object
+// test that file resolves even though the file extension is omitted
+test('deep module reference mapping without file extension - .js', function(done) {
+    resolve('module-n/foo', { basedir: __dirname + '/fixtures', package: { main: 'fixtures' } }, function(err, path, pkg) {
+        assert.ifError(err);
+        assert.equal(path, require.resolve('./fixtures/node_modules/module-n/browser-foo'));
+        done();
+    });
+});
+test('deep module reference mapping without file extension - .json', function(done) {
+    resolve('module-n/bar', { basedir: __dirname + '/fixtures', package: { main: 'fixtures' } }, function(err, path, pkg) {
+        assert.ifError(err);
+        assert.equal(path, require.resolve('./fixtures/node_modules/module-n/browser-bar'));
+        done();
+    });
+});
+
 // browser field in package.json maps ./foo.js -> ./browser.js
 // when we resolve ./foo while in module-e, this mapping should take effect
 // the result is that ./foo resolves to ./browser