From 92b60e3086906cfbaed47e6919776ac9bcd38fd1 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Tue, 6 Oct 2015 16:56:51 -0700 Subject: package-id: rename into utils, from install/get-package-id PR-URL: //github.com/npm/npm/pull/9890 Fixes: #9766 --- lib/ls.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/ls.js') diff --git a/lib/ls.js b/lib/ls.js index 1854938eb..51f0b5155 100644 --- a/lib/ls.js +++ b/lib/ls.js @@ -18,7 +18,7 @@ var iferr = require('iferr') var npm = require('./npm.js') var mutateIntoLogicalTree = require('./install/mutate-into-logical-tree.js') var recalculateMetadata = require('./install/deps.js').recalculateMetadata -var getPackageId = require('./install/get-package-id.js') +var packageId = require('./utils/package-id.js') ls.usage = 'npm ls [[<@scope>/] ...]' + '\n\naliases: list, la, ll' @@ -151,7 +151,7 @@ function getLite (data, noname) { if (data.extraneous) { lite.extraneous = true lite.problems = lite.problems || [] - lite.problems.push('extraneous: ' + getPackageId(data) + ' ' + (data.path || '')) + lite.problems.push('extraneous: ' + packageId(data) + ' ' + (data.path || '')) } if (data.error && data.path !== path.resolve(npm.globalDir, '..') && @@ -174,7 +174,7 @@ function getLite (data, noname) { lite.invalid = true lite.problems = lite.problems || [] lite.problems.push('invalid: ' + - getPackageId(data) + + packageId(data) + ' ' + (data.path || '')) } @@ -182,7 +182,7 @@ function getLite (data, noname) { lite.peerInvalid = true lite.problems = lite.problems || [] lite.problems.push('peer dep not met: ' + - getPackageId(data) + + packageId(data) + ' ' + (data.path || '')) } @@ -200,7 +200,7 @@ function getLite (data, noname) { } p += d + '@' + dep.requiredBy + ', required by ' + - getPackageId(data) + packageId(data) lite.problems.push(p) return [d, { required: dep.requiredBy, missing: true }] } else if (dep.peerMissing) { -- cgit v1.2.3