From ce77b360a19aa8dd7dc9bf760c3156c021a87004 Mon Sep 17 00:00:00 2001
From: Fighting-Jack <574637316@qq.com>
Date: Wed, 20 Nov 2019 20:19:19 +0800
Subject: [PATCH 1/3] shrinkwrap: no need to read package.json when read
 shrinkwrap

---
 lib/install/read-shrinkwrap.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/install/read-shrinkwrap.js b/lib/install/read-shrinkwrap.js
index 7074678011127..f2e274c4cb10f 100644
--- a/lib/install/read-shrinkwrap.js
+++ b/lib/install/read-shrinkwrap.js
@@ -20,7 +20,7 @@ function readShrinkwrap (child, next) {
     // Don't read non-root lockfiles
     child.isTop && maybeReadFile('package-lock.json', child),
     child.isTop && maybeReadFile('package.json', child),
-    (shrinkwrap, lockfile, pkgJson) => {
+    (shrinkwrap, lockfile) => {
       if (shrinkwrap && lockfile) {
         log.warn('read-shrinkwrap', 'Ignoring package-lock.json because there is already an npm-shrinkwrap.json. Please use only one of the two.')
       }
@@ -31,7 +31,7 @@ function readShrinkwrap (child, next) {
       }
       child.package._shrinkwrap = parsed
     }
-  ).then(() => next(), next)
+  ).then(next, next)
 }
 
 function maybeReadFile (name, child) {

From 1d9dc555b486c9784fc17087287bc01b8eaa6008 Mon Sep 17 00:00:00 2001
From: Jack <574637316@qq.com>
Date: Thu, 21 Nov 2019 15:18:17 +0800
Subject: [PATCH 2/3] shrinkwrap: avoid to read package.json

no need to read package.json when read shrinkwrap.
---
 lib/install/read-shrinkwrap.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/install/read-shrinkwrap.js b/lib/install/read-shrinkwrap.js
index f2e274c4cb10f..eca35244e912e 100644
--- a/lib/install/read-shrinkwrap.js
+++ b/lib/install/read-shrinkwrap.js
@@ -18,8 +18,7 @@ function readShrinkwrap (child, next) {
   BB.join(
     maybeReadFile('npm-shrinkwrap.json', child),
     // Don't read non-root lockfiles
-    child.isTop && maybeReadFile('package-lock.json', child),
-    child.isTop && maybeReadFile('package.json', child),
+    child.isTop && maybeReadFile('package-lock.json', child)
     (shrinkwrap, lockfile) => {
       if (shrinkwrap && lockfile) {
         log.warn('read-shrinkwrap', 'Ignoring package-lock.json because there is already an npm-shrinkwrap.json. Please use only one of the two.')
@@ -31,7 +30,7 @@ function readShrinkwrap (child, next) {
       }
       child.package._shrinkwrap = parsed
     }
-  ).then(next, next)
+  ).then(() => next(), next)
 }
 
 function maybeReadFile (name, child) {

From 33ca61257b6f5cdf26d6fa7fac1c01ea26b59299 Mon Sep 17 00:00:00 2001
From: Jack <574637316@qq.com>
Date: Thu, 21 Nov 2019 15:24:27 +0800
Subject: [PATCH 3/3] shrinkwrap: avoid to read package.json

avoid to read package.json when read shrinkwrap.
---
 lib/install/read-shrinkwrap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/install/read-shrinkwrap.js b/lib/install/read-shrinkwrap.js
index eca35244e912e..1d9fb99c1d807 100644
--- a/lib/install/read-shrinkwrap.js
+++ b/lib/install/read-shrinkwrap.js
@@ -18,7 +18,7 @@ function readShrinkwrap (child, next) {
   BB.join(
     maybeReadFile('npm-shrinkwrap.json', child),
     // Don't read non-root lockfiles
-    child.isTop && maybeReadFile('package-lock.json', child)
+    child.isTop && maybeReadFile('package-lock.json', child),
     (shrinkwrap, lockfile) => {
       if (shrinkwrap && lockfile) {
         log.warn('read-shrinkwrap', 'Ignoring package-lock.json because there is already an npm-shrinkwrap.json. Please use only one of the two.')