deps: upgrade npm to 6.1.0

PR-URL: https://github.com/nodejs/node/pull/20190
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

1 files changed, 20 insertions, 8 deletions

diff --git a/deps/npm/node_modules/cacache/put.js b/deps/npm/node_modules/cacache/put.js
index fe1293e5e7..0b0ee14978 100644
--- a/deps/npm/node_modules/cacache/put.js
+++ b/deps/npm/node_modules/cacache/put.js
@@ -1,17 +1,31 @@
 'use strict'
 
+const figgyPudding = require('figgy-pudding')
 const index = require('./lib/entry-index')
 const memo = require('./lib/memoization')
 const write = require('./lib/content/write')
 const to = require('mississippi').to
 
+const PutOpts = figgyPudding({
+  algorithms: {
+    default: ['sha512']
+  },
+  integrity: {},
+  memoize: {},
+  metadata: {},
+  size: {},
+  tmpPrefix: {},
+  uid: {},
+  gid: {}
+})
+
 module.exports = putData
 function putData (cache, key, data, opts) {
-  opts = opts || {}
+  opts = PutOpts(opts)
   return write(cache, data, opts).then(res => {
-    // TODO - stop modifying opts
-    opts.size = res.size
-    return index.insert(cache, key, res.integrity, opts).then(entry => {
+    return index.insert(
+      cache, key, res.integrity, opts.concat({size: res.size})
+    ).then(entry => {
       if (opts.memoize) {
         memo.put(cache, entry, data, opts)
       }
@@ -22,7 +36,7 @@ function putData (cache, key, data, opts) {
 
 module.exports.stream = putStream
 function putStream (cache, key, opts) {
-  opts = opts || {}
+  opts = PutOpts(opts)
   let integrity
   let size
   const contentStream = write.stream(
@@ -45,9 +59,7 @@ function putStream (cache, key, opts) {
     })
   }, cb => {
     contentStream.end(() => {
-      // TODO - stop modifying `opts`
-      opts.size = size
-      index.insert(cache, key, integrity, opts).then(entry => {
+      index.insert(cache, key, integrity, opts.concat({size})).then(entry => {
         if (opts.memoize) {
           memo.put(cache, entry, Buffer.concat(memoData, memoTotal), opts)
         }