shrinkwrap: Only include requires when something was required

iarna · zkat · commit 901bef0e1ea8 · 2017-07-05T14:58:42.000-07:00
PR-URL: #17508 Credit: @iarna Reviewed-By: @zkat
diff --git a/lib/install/inflate-shrinkwrap.js b/lib/install/inflate-shrinkwrap.js
@@ -27,7 +27,7 @@ module.exports = function (tree, swdeps, opts, finishInflating) {
     return finishInflating()
   }
   tree.loaded = false
-  tree.hasRequiresFromLock = Object.keys(swdeps).every((d) => swdeps[d].requires)
+  tree.hasRequiresFromLock = Object.keys(swdeps).some((d) => swdeps[d].requires)
   return inflateShrinkwrap(tree.path, tree, swdeps, opts).then(
     () => finishInflating(),
     finishInflating
diff --git a/lib/shrinkwrap.js b/lib/shrinkwrap.js
@@ -127,11 +127,13 @@ function shrinkwrapDeps (deps, top, tree, seen) {
     }
     if (childIsOnlyDev) pkginfo.dev = true
     if (isOptional(child)) pkginfo.optional = true
-    pkginfo.requires = {}
-    child.requires.sort((a, b) => moduleName(a).localeCompare(moduleName(b))).forEach((required) => {
-      var requested = required.package._requested || getRequested(required) || {}
-      pkginfo.requires[moduleName(required)] = childVersion(top, required, requested)
-    })
+    if (child.requires.length) {
+      pkginfo.requires = {}
+      child.requires.sort((a, b) => moduleName(a).localeCompare(moduleName(b))).forEach((required) => {
+        var requested = required.package._requested || getRequested(required) || {}
+        pkginfo.requires[moduleName(required)] = childVersion(top, required, requested)
+      })
+    }
     if (child.children.length) {
       pkginfo.dependencies = {}
       shrinkwrapDeps(pkginfo.dependencies, top, child, seen)

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ module.exports = function (tree, swdeps, opts, finishInflating) {`
`27`	`27`	`return finishInflating()`
`28`	`28`	`}`
`29`	`29`	`tree.loaded = false`
`30`		`- tree.hasRequiresFromLock = Object.keys(swdeps).every((d) => swdeps[d].requires)`
	`30`	`+ tree.hasRequiresFromLock = Object.keys(swdeps).some((d) => swdeps[d].requires)`
`31`	`31`	`return inflateShrinkwrap(tree.path, tree, swdeps, opts).then(`
`32`	`32`	`() => finishInflating(),`
`33`	`33`	`finishInflating`