diff options
author | Rebecca Turner <me@re-becca.org> | 2016-11-21 15:19:45 -0800 |
---|---|---|
committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2016-12-05 10:33:46 -0500 |
commit | c8cf71de6c56a826a10525d880c179f814a5f368 (patch) | |
tree | e9a8ca0a19f00452d28238f5f6e46540fa56cc23 /deps/npm/lib/install/inflate-shrinkwrap.js | |
parent | 0ae1684396d87bffe6bf3a4c77c30bb725bfc5d4 (diff) | |
download | android-node-v8-c8cf71de6c56a826a10525d880c179f814a5f368.tar.gz android-node-v8-c8cf71de6c56a826a10525d880c179f814a5f368.tar.bz2 android-node-v8-c8cf71de6c56a826a10525d880c179f814a5f368.zip |
deps: upgrade npm to 3.10.10
PR-URL: https://github.com/nodejs/node/pull/9847
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/lib/install/inflate-shrinkwrap.js')
-rw-r--r-- | deps/npm/lib/install/inflate-shrinkwrap.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/deps/npm/lib/install/inflate-shrinkwrap.js b/deps/npm/lib/install/inflate-shrinkwrap.js index ab1bdd1f19..b70e9576bf 100644 --- a/deps/npm/lib/install/inflate-shrinkwrap.js +++ b/deps/npm/lib/install/inflate-shrinkwrap.js @@ -45,14 +45,16 @@ function inflateShrinkwrap (topPath, tree, swdeps, finishInflating) { return inflateShrinkwrap(topPath, child, dependencies || {}, next) } else { var from = sw.from || requested.raw - return fetchPackageMetadata(requested, topPath, iferr(next, andAddShrinkwrap(from, dependencies, next))) + var optional = sw.optional + return fetchPackageMetadata(requested, topPath, iferr(next, andAddShrinkwrap(from, optional, dependencies, next))) } } } - function andAddShrinkwrap (from, dependencies, next) { + function andAddShrinkwrap (from, optional, dependencies, next) { return function (pkg) { pkg._from = from + pkg._optional = optional addShrinkwrap(pkg, iferr(next, andAddBundled(pkg, dependencies, next))) } } |