fixes for implicit and explicit extensions

Author: James Halliday

index.js

@@ -70,6 +70,14 @@ function find_shims_in_package(pkgJson, cur_path, shims, browser) {
         }
         shims[key] = val;
     });
+
+    [ '.js', '.json' ].forEach(function (ext) {
+        Object.keys(shims).forEach(function (key) {
+            if (!shims[key + ext]) {
+                shims[key + ext] = shims[key];
+            }
+        });
+    });
 }
 
 // paths is mutated
@@ -229,14 +237,18 @@ function resolve(id, opts, cb) {
             return cb(err);
         }
 
-        if (shims[id]) {
+        var resid = path.resolve(opts.basedir || path.dirname(opts.filename), id)
+        if (shims[id] || shims[resid]) {
+            var xid = shims[id] ? id : resid
             // if the shim was is an absolute path, it was fully resolved
-            if (shims[id][0] === '/') {
-                return cb(null, shims[id], opts.package);
+            if (shims[xid][0] === '/') {
+                return resv(shims[xid], build_resolve_opts(opts, base), function(err, full, pkg) {
+                    cb(null, full, pkg);
+                });
             }
 
             // module -> alt-module shims
-            id = shims[id];
+            id = shims[xid];
         }
 
         var modules = opts.modules || Object.create(null);