[Fix] sync/async: pass a dir into maybeUnwrapSymlink

browserify · Nov 22, 2019 · 4f2f504 · 4f2f504
1 parent ecd0672
commit 4f2f504
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/async.js b/lib/async.js
@@ -171,8 +171,9 @@ module.exports = function resolve(x, options, callback) {
         }
         if ((/[/\\]node_modules[/\\]*$/).test(dir)) return cb(null);
 
-        maybeUnwrapSymlink(path.join(dir, 'package.json'), opts, function (unwrapErr, pkgfile) {
+        maybeUnwrapSymlink(dir, opts, function (unwrapErr, pkgdir) {
             if (unwrapErr) return loadpkg(path.dirname(dir), cb);
+            var pkgfile = path.join(pkgdir, 'package.json');
             isFile(pkgfile, function (err, ex) {
                 // on err, ex is false
                 if (!ex) return loadpkg(path.dirname(dir), cb);
@@ -198,8 +199,9 @@ module.exports = function resolve(x, options, callback) {
             fpkg = opts.package;
         }
 
-        maybeUnwrapSymlink(path.join(x, 'package.json'), opts, function (unwrapErr, pkgfile) {
+        maybeUnwrapSymlink(x, opts, function (unwrapErr, pkgdir) {
             if (unwrapErr) return cb(unwrapErr);
+            var pkgfile = path.join(pkgdir, 'package.json');
             isFile(pkgfile, function (err, ex) {
                 if (err) return cb(err);
                 if (!ex) return loadAsFile(path.join(x, 'index'), fpkg, cb);

diff --git a/lib/sync.js b/lib/sync.js
@@ -105,7 +105,7 @@ module.exports = function (x, options) {
         }
         if ((/[/\\]node_modules[/\\]*$/).test(dir)) return;
 
-        var pkgfile = maybeUnwrapSymlink(path.join(dir, 'package.json'), opts);
+        var pkgfile = path.join(maybeUnwrapSymlink(dir, opts), 'package.json');
 
         if (!isFile(pkgfile)) {
             return loadpkg(path.dirname(dir));
@@ -125,7 +125,7 @@ module.exports = function (x, options) {
     }
 
     function loadAsDirectorySync(x) {
-        var pkgfile = maybeUnwrapSymlink(path.join(x, '/package.json'), opts);
+        var pkgfile = path.join(maybeUnwrapSymlink(x, opts), '/package.json');
         if (isFile(pkgfile)) {
             try {
                 var body = readFileSync(pkgfile, 'UTF8');