Merge pull request #72 from mtth/empty-relative-path

Expand skipped paths.

Author: defunctzombie

index.js

@@ -51,24 +51,23 @@ function find_shims_in_package(pkgJson, cur_path, shims, browser) {
 
     // http://nodejs.org/api/modules.html#modules_loading_from_node_modules_folders
     Object.keys(replacements).forEach(function(key) {
+        var val;
         if (replacements[key] === false) {
-            return shims[key] = __dirname + '/empty.js';
+            val = __dirname + '/empty.js';
         }
-
-        var val = replacements[key];
-
-        // if target is a relative path, then resolve
-        // otherwise we assume target is a module
-        if (val[0] === '.') {
-            val = path.resolve(cur_path, val);
+        else {
+            val = replacements[key];
+            // if target is a relative path, then resolve
+            // otherwise we assume target is a module
+            if (val[0] === '.') {
+                val = path.resolve(cur_path, val);
+            }
         }
 
-        // if does not begin with / ../ or ./ then it is a module
-        if (key[0] !== '/' && key[0] !== '.') {
-            return shims[key] = val;
+        if (key[0] === '/' || key[0] === '.') {
+            // if begins with / ../ or ./ then we must resolve to a full path
+            key = path.resolve(cur_path, key);
         }
-
-        key = path.resolve(cur_path, key);
         shims[key] = val;
     });
 }

test/false.js

@@ -22,3 +22,14 @@ test('false module', function(done) {
     });
 });
 
+test('false expand path', function(done) {
+    var parent = {
+        filename: fixtures_dir + '/node_modules/module-m/lib/index.js'
+    };
+
+    resolve('./hide', parent, function(err, p, pkg) {
+        assert.ifError(err);
+        assert.equal(p, path.normalize(__dirname + '/../empty.js'));
+        done();
+    });
+});