diff options
| author | Rebecca Turner <me@re-becca.org> | 2017-04-12 21:47:49 -0700 |
|---|---|---|
| committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2017-04-25 10:52:01 -0400 |
| commit | 00842604483e4c2e622dfdb3a97440e07646158f (patch) | |
| tree | f3346902636a44b6037652523767636bf7e4f2c9 /deps/npm/lib/install/deps.js | |
| parent | 061c5da010e0d249379618382a499840d38247b8 (diff) | |
| download | android-node-v8-00842604483e4c2e622dfdb3a97440e07646158f.tar.gz android-node-v8-00842604483e4c2e622dfdb3a97440e07646158f.tar.bz2 android-node-v8-00842604483e4c2e622dfdb3a97440e07646158f.zip | |
deps: upgrade npm to 4.5.0
PR-URL: https://github.com/nodejs/node/pull/12480
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/lib/install/deps.js')
| -rw-r--r-- | deps/npm/lib/install/deps.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/npm/lib/install/deps.js b/deps/npm/lib/install/deps.js index a31976a50d..d1feb6cd4b 100644 --- a/deps/npm/lib/install/deps.js +++ b/deps/npm/lib/install/deps.js @@ -462,7 +462,7 @@ function addDependency (name, versionSpec, tree, log, done) { } })) } else { - fetchPackageMetadata(req, packageRelativePath(tree), log.newItem('fetchMetadata'), iferr(next, function (pkg) { + fetchPackageMetadata(req, packageRelativePath(tree), {tracker: log.newItem('fetchMetadata')}, iferr(next, function (pkg) { resolveWithNewModule(pkg, tree, log, next) })) } @@ -547,7 +547,7 @@ function resolveWithNewModule (pkg, tree, log, next) { if (tree.parent && parent !== tree) updatePhantomChildren(tree.parent, child) if (hasBundled) { - inflateBundled(child, child.children) + inflateBundled(child, child, child.children) } if (pkg._shrinkwrap && pkg._shrinkwrap.dependencies) { |