From 9719fd2fa8fd97899c54712a238091e8fd1c57b2 Mon Sep 17 00:00:00 2001 From: dcodeIO Date: Wed, 18 Jan 2017 03:14:43 +0100 Subject: [PATCH] CLI: Reuse module paths when looking up cli dependencies, see #648 --- cli/util.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cli/util.js b/cli/util.js index 377b479c8..89fc9f67e 100644 --- a/cli/util.js +++ b/cli/util.js @@ -71,15 +71,10 @@ exports.inspect = function inspect(object, indent) { return sb.join("\n"); }; -var paths = [ - path.resolve(__dirname, "..", "node_modules"), - path.resolve(__dirname, "node_modules") -]; - function modExists(name, version) { - for (var i = 0; i < paths.length; ++i) { + for (var i = 0; i < module.paths.length; ++i) { try { - var pkg = JSON.parse(fs.readFileSync(path.join(paths[i], name, "package.json"))); + var pkg = JSON.parse(fs.readFileSync(path.join(module.paths[i], name, "package.json"))); return semver ? semver.satisfies(pkg.version, version) : parseInt(pkg.version, 10) === parseInt(version.replace(/^[\^~]/, ""), 10); // used for semver only