summaryrefslogtreecommitdiff
path: root/deps/npm/lib/outdated.js
diff options
context:
space:
mode:
authorKat Marchán <kzm@sykosomatic.org>2017-07-14 10:52:48 -0700
committerJames M Snell <jasnell@gmail.com>2017-07-17 08:49:02 -0700
commit24f43903b4a2f5aa73a99e6f3d4cc62d559cf94b (patch)
tree9c32bd08c43de8721e54cd846d816fbe6cdf056e /deps/npm/lib/outdated.js
parentfa73087fcf4bd14db7791120e688a0a508885b64 (diff)
downloadandroid-node-v8-24f43903b4a2f5aa73a99e6f3d4cc62d559cf94b.tar.gz
android-node-v8-24f43903b4a2f5aa73a99e6f3d4cc62d559cf94b.tar.bz2
android-node-v8-24f43903b4a2f5aa73a99e6f3d4cc62d559cf94b.zip
deps: upgrade npm to 5.3.0
PR-URL: https://github.com/nodejs/node/pull/14235 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'deps/npm/lib/outdated.js')
-rw-r--r--deps/npm/lib/outdated.js18
1 files changed, 8 insertions, 10 deletions
diff --git a/deps/npm/lib/outdated.js b/deps/npm/lib/outdated.js
index 7d5cfba86e..f2fb2df79a 100644
--- a/deps/npm/lib/outdated.js
+++ b/deps/npm/lib/outdated.js
@@ -38,21 +38,19 @@ var long = npm.config.get('long')
var mapToRegistry = require('./utils/map-to-registry.js')
var isExtraneous = require('./install/is-extraneous.js')
var computeMetadata = require('./install/deps.js').computeMetadata
+var computeVersionSpec = require('./install/deps.js').computeVersionSpec
var moduleName = require('./utils/module-name.js')
var output = require('./utils/output.js')
var ansiTrim = require('./utils/ansi-trim')
-function uniqName (item) {
- return item[0].path + '|' + item[1] + '|' + item[7]
-}
-
function uniq (list) {
+ // we maintain the array because we need an array, not iterator, return
+ // value.
var uniqed = []
- var seen = {}
+ var seen = new Set()
list.forEach(function (item) {
- var name = uniqName(item)
- if (seen[name]) return
- seen[name] = true
+ if (seen.has(item)) return
+ seen.add(item)
uniqed.push(item)
})
return uniqed
@@ -204,7 +202,7 @@ function outdated_ (args, path, tree, parentHas, depth, cb) {
var types = {}
var pkg = tree.package
- var deps = tree.children.filter(function (child) { return !isExtraneous(child) }) || []
+ var deps = tree.error ? tree.children : tree.children.filter((child) => !isExtraneous(child))
deps.forEach(function (dep) {
types[moduleName(dep)] = 'dependencies'
@@ -291,7 +289,7 @@ function outdated_ (args, path, tree, parentHas, depth, cb) {
var required = (tree.package.dependencies)[name] ||
(tree.package.optionalDependencies)[name] ||
(tree.package.devDependencies)[name] ||
- dep.package._requested && dep.package._requested.fetchSpec ||
+ computeVersionSpec(tree, dep) ||
'*'
if (!long) return shouldUpdate(args, dep, name, has, required, depth, path, cb)