deps: upgrade npm to 5.8.0

PR-URL: https://github.com/nodejs/node/pull/19560
Fixes: https://github.com/nodejs/node/issues/19271
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>

2 files changed, 14 insertions, 3 deletions

diff --git a/deps/npm/node_modules/cacache/lib/content/read.js b/deps/npm/node_modules/cacache/lib/content/read.js
index b09ad5cb40..7a4da3beb8 100644
--- a/deps/npm/node_modules/cacache/lib/content/read.js
+++ b/deps/npm/node_modules/cacache/lib/content/read.js
@@ -95,6 +95,16 @@ function pickContentSri (cache, integrity) {
     return BB.any(sri[sri.pickAlgorithm()].map(meta => {
       return pickContentSri(cache, meta)
     }))
+    .catch(err => {
+      if ([].some.call(err, e => e.code === 'ENOENT')) {
+        throw Object.assign(
+          new Error('No matching content found for ' + sri.toString()),
+          {code: 'ENOENT'}
+        )
+      } else {
+        throw err[0]
+      }
+    })
   }
 }
 
diff --git a/deps/npm/node_modules/cacache/lib/entry-index.js b/deps/npm/node_modules/cacache/lib/entry-index.js
index face0fe79c..fe1cd06457 100644
--- a/deps/npm/node_modules/cacache/lib/entry-index.js
+++ b/deps/npm/node_modules/cacache/lib/entry-index.js
@@ -116,9 +116,10 @@ function lsStream (cache) {
         }, new Map())
 
         return getKeyToEntry.then(reduced => {
-          return Array.from(reduced.values()).map(
-            entry => stream.push(formatEntry(cache, entry))
-          )
+          for (let entry of reduced.values()) {
+            const formatted = formatEntry(cache, entry)
+            formatted && stream.push(formatted)
+          }
         }).catch({code: 'ENOENT'}, nop)
       })
     })