Revert #92, use resolve's preserveSymlinks option

Author: goto-bus-stop

index.js

@@ -206,7 +206,7 @@ function build_resolve_opts(opts, base) {
     return opts;
 }
 
-function resolve(id, opts, callback) {
+function resolve(id, opts, cb) {
 
     // opts.filename
     // opts.paths
@@ -216,24 +216,6 @@ function resolve(id, opts, callback) {
     opts = opts || {};
     opts.filename = opts.filename || '';
 
-    var cb = function(err, path, pkg) {
-        fs.stat(path, function(notPath) {
-            if (notPath) {
-                callback(err, path, pkg);
-            }
-            else {
-                fs.realpath(path, function(notReal, real) {
-                    if (notReal) {
-                        callback(err, path, pkg);
-                    }
-                    else {
-                        callback(err, real, pkg);
-                    }
-                });
-            }
-        });
-    }
-
     var base = path.dirname(opts.filename);
 
     if (opts.basedir) {

test/modules.js

@@ -332,7 +332,7 @@ test('respect symlinks', function (done) {
     //     - node_modules
     //       - symlink to x
     //
-    resolve('linked', { paths: [ fixtures_dir + '/linker/node_modules' ] }, function(err, path, pkg) {
+    resolve('linked', { paths: [ fixtures_dir + '/linker/node_modules' ], preserveSymlinks: false }, function(err, path, pkg) {
         assert.ifError(err);
         assert.equal(path, require.resolve('./fixtures/linked/index'));
         done();