diff options
author | Rebecca Turner <me@re-becca.org> | 2016-06-24 23:43:51 +0300 |
---|---|---|
committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2016-06-27 12:46:15 +0300 |
commit | d538811fc8b920f3f36d5f21a4c23e270367ceb0 (patch) | |
tree | 11cee6c00aa843f16a71819039396f80bf6abe22 /deps/npm/lib/install/node.js | |
parent | 1db31a34948eee311abd9881bbf5d906d0cd678b (diff) |
deps: upgrade npm to 3.10.2
Contains the following npm releases:
- https://github.com/npm/npm/releases/tag/v3.9.6
- https://github.com/npm/npm/releases/tag/v3.10.0
- https://github.com/npm/npm/releases/tag/v3.10.1
- https://github.com/npm/npm/releases/tag/v3.10.2
PR-URL: https://github.com/nodejs/node/pull/7410
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/lib/install/node.js')
-rw-r--r-- | deps/npm/lib/install/node.js | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/deps/npm/lib/install/node.js b/deps/npm/lib/install/node.js index c76dc765ba4..a5b766b0549 100644 --- a/deps/npm/lib/install/node.js +++ b/deps/npm/lib/install/node.js @@ -2,11 +2,10 @@ var defaultTemplate = { package: { + version: '', dependencies: {}, devDependencies: {}, - optionalDependencies: {}, - _requiredBy: [], - _phantomChildren: {} + optionalDependencies: {} }, loaded: false, children: [], @@ -14,10 +13,13 @@ var defaultTemplate = { requires: [], missingDeps: {}, missingDevDeps: {}, + phantomChildren: {}, path: null, realpath: null, + location: null, userRequired: false, - existing: false + existing: false, + isTop: false } function isLink (node) { @@ -34,7 +36,7 @@ var create = exports.create = function (node, template) { if (node[key] != null) return node[key] = template[key] }) - if (isLink(node) || isLink(node.parent)) { + if (isLink(node.parent)) { node.isLink = true } return node @@ -48,14 +50,17 @@ function reset (node, seen) { if (seen[node.path]) return seen[node.path] = true var child = create(node) - child.package._requiredBy = child.package._requiredBy.filter(function (req) { - return req[0] === '#' - }) - child.requiredBy = [] - child.package._phantomChildren = {} + // FIXME: cleaning up after read-package-json's mess =( if (child.package._id === '@') delete child.package._id + + child.isTop = false + child.requiredBy = [] + child.requires = [] child.missingDeps = {} + child.missingDevDeps = {} + child.phantomChildren = {} + child.location = null + child.children.forEach(function (child) { reset(child, seen) }) - if (!child.package.version) child.package.version = '' } |