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>

1 files changed, 11 insertions, 8 deletions

diff --git a/deps/npm/lib/install/save.js b/deps/npm/lib/install/save.js
index 56a4a892ad..e1a94fcff7 100644
--- a/deps/npm/lib/install/save.js
+++ b/deps/npm/lib/install/save.js
@@ -1,11 +1,9 @@
 'use strict'
 
-const BB = require('bluebird')
-
 const createShrinkwrap = require('../shrinkwrap.js').createShrinkwrap
 const deepSortObject = require('../utils/deep-sort-object.js')
 const detectIndent = require('detect-indent')
-const fs = BB.promisifyAll(require('graceful-fs'))
+const fs = require('graceful-fs')
 const iferr = require('iferr')
 const log = require('npmlog')
 const moduleName = require('../utils/module-name.js')
@@ -77,8 +75,8 @@ function savePackageJson (tree, next) {
     var toSave = getThingsToSave(tree)
     var toRemove = getThingsToRemove(tree)
     var savingTo = {}
-    toSave.forEach(function (pkg) { savingTo[pkg.save] = true })
-    toRemove.forEach(function (pkg) { savingTo[pkg.save] = true })
+    toSave.forEach(function (pkg) { if (pkg.save) savingTo[pkg.save] = true })
+    toRemove.forEach(function (pkg) { if (pkg.save) savingTo[pkg.save] = true })
 
     Object.keys(savingTo).forEach(function (save) {
       if (!tree.package[save]) tree.package[save] = {}
@@ -87,7 +85,7 @@ function savePackageJson (tree, next) {
     log.verbose('saving', toSave)
     const types = ['dependencies', 'devDependencies', 'optionalDependencies']
     toSave.forEach(function (pkg) {
-      tree.package[pkg.save][pkg.name] = pkg.spec
+      if (pkg.save) tree.package[pkg.save][pkg.name] = pkg.spec
       const movedFrom = []
       for (let saveType of types) {
         if (
@@ -109,7 +107,7 @@ function savePackageJson (tree, next) {
     })
 
     toRemove.forEach(function (pkg) {
-      delete tree.package[pkg.save][pkg.name]
+      if (pkg.save) delete tree.package[pkg.save][pkg.name]
       if (saveBundle) {
         bundle = without(bundle, pkg.name)
       }
@@ -123,7 +121,12 @@ function savePackageJson (tree, next) {
     }
 
     var json = JSON.stringify(tree.package, null, indent) + '\n'
-    writeFileAtomic(saveTarget, json, next)
+    if (json === packagejson) {
+      log.verbose('shrinkwrap', 'skipping write for package.json because there were no changes.')
+      next()
+    } else {
+      writeFileAtomic(saveTarget, json, next)
+    }
   }))
 }