1 files changed, 10 insertions, 9 deletions
diff --git a/deps/npm/node_modules/pacote/lib/finalize-manifest.js b/deps/npm/node_modules/pacote/lib/finalize-manifest.js
index 0f309ed6da..80b379898f 100644
--- a/deps/npm/node_modules/pacote/lib/finalize-manifest.js
+++ b/deps/npm/node_modules/pacote/lib/finalize-manifest.js
@@ -37,12 +37,12 @@ function finalizeManifest (pkg, spec, opts) {
   const key = finalKey(pkg, spec)
   opts = optCheck(opts)
 
-  const cachedManifest = (opts.cache && key && !opts.preferOnline && !opts.fullMetadata)
+  const cachedManifest = (opts.cache && key && !opts.preferOnline && !opts.fullMetadata && !opts.enjoyBy)
     ? cacache.get.info(opts.cache, key, opts)
     : BB.resolve(null)
 
   return cachedManifest.then(cached => {
-    if (cached && cached.metadata.manifest) {
+    if (cached && cached.metadata && cached.metadata.manifest) {
       return new Manifest(cached.metadata.manifest)
     } else {
       return tarballedProps(pkg, spec, opts).then(props => {
@@ -54,13 +54,14 @@ function finalizeManifest (pkg, spec, opts) {
         if (!opts.cache || !cacheKey) {
           return manifest
         } else {
-          opts.metadata = {
-            id: manifest._id,
-            manifest,
-            type: 'finalized-manifest'
-          }
           return cacache.put(
-            opts.cache, cacheKey, '.', opts
+            opts.cache, cacheKey, '.', {
+              metadata: {
+                id: manifest._id,
+                manifest,
+                type: 'finalized-manifest'
+              }
+            }
           ).then(() => manifest)
         }
       })
@@ -155,7 +156,7 @@ function tarballedProps (pkg, spec, opts) {
       needsShrinkwrap && jsonFromStream('npm-shrinkwrap.json', extracted),
       needsManifest && jsonFromStream('package.json', extracted),
       needsBin && getPaths(extracted),
-      needsHash && ssri.fromStream(tarStream, {algorithms: ['sha1', 'sha512']}),
+      needsHash && ssri.fromStream(tarStream, { algorithms: ['sha1', 'sha512'] }),
       needsExtract && pipe(tarStream, extracted),
       (sr, mani, paths, hash) => {
         if (needsManifest && !mani) {