From 82c1bf5c11d642d1ccf64e44c74a604b68f4d50e Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 14 Jul 2017 21:41:07 +0100
Subject: [PATCH 1/5] Run npm 5 on CI

---
 tasks/e2e-installs.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh
index 58864263247..e522f457d94 100755
--- a/tasks/e2e-installs.sh
+++ b/tasks/e2e-installs.sh
@@ -95,10 +95,6 @@ fi
 
 if hash npm 2>/dev/null
 then
-  # npm 5 is too buggy right now
-  if [ $(npm -v | head -c 1) -eq 5 ]; then
-    npm i -g npm@^4.x
-  fi;
   npm cache clean || npm cache verify
 fi
 

From 2fb54e6d81cd4c1ea25565ef4adbf440b89385b2 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 14 Jul 2017 21:42:42 +0100
Subject: [PATCH 2/5] Update e2e-kitchensink.sh

---
 tasks/e2e-kitchensink.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh
index ebbac271e6e..28651e0cb25 100755
--- a/tasks/e2e-kitchensink.sh
+++ b/tasks/e2e-kitchensink.sh
@@ -87,9 +87,9 @@ fi
 
 if hash npm 2>/dev/null
 then
-  # npm 5 is too buggy right now
+  # npm 5.0-5.2 is too buggy
   if [ $(npm -v | head -c 1) -eq 5 ]; then
-    npm i -g npm@^4.x
+    npm i -g npm@^5.3.0
   fi;
   npm cache clean || npm cache verify
 fi

From c44870397530b3da339f1f431bad252bd749107d Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 14 Jul 2017 21:42:56 +0100
Subject: [PATCH 3/5] Update e2e-simple.sh

---
 tasks/e2e-simple.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh
index 48d705eef4c..68042175c5f 100755
--- a/tasks/e2e-simple.sh
+++ b/tasks/e2e-simple.sh
@@ -86,9 +86,9 @@ fi
 
 if hash npm 2>/dev/null
 then
-  # npm 5 is too buggy right now
+  # npm 5.0-5.2 is too buggy
   if [ $(npm -v | head -c 1) -eq 5 ]; then
-    npm i -g npm@^4.x
+    npm i -g npm@^5.3.0
   fi;
   npm cache clean || npm cache verify
 fi

From 3100579b53c4e920aa3c4c82e9dec509ee8b13ed Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 14 Jul 2017 21:43:26 +0100
Subject: [PATCH 4/5] Update e2e-installs.sh

---
 tasks/e2e-installs.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh
index e522f457d94..4f07f7c2dca 100755
--- a/tasks/e2e-installs.sh
+++ b/tasks/e2e-installs.sh
@@ -95,6 +95,10 @@ fi
 
 if hash npm 2>/dev/null
 then
+  # npm 5.0-5.2 is too buggy
+  if [ $(npm -v | head -c 1) -eq 5 ]; then
+    npm i -g npm@^5.3.0
+  fi;
   npm cache clean || npm cache verify
 fi
 

From 170d1d5ea91df3ae74c652a742e5ac1e5b6001f3 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 15 Jul 2017 01:15:43 +0100
Subject: [PATCH 5/5] Update e2e-kitchensink.sh

---
 tasks/e2e-kitchensink.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh
index 28651e0cb25..2006bcb9485 100755
--- a/tasks/e2e-kitchensink.sh
+++ b/tasks/e2e-kitchensink.sh
@@ -163,8 +163,8 @@ npm install test-integrity@^2.0.1
 # Enter the app directory
 cd "$temp_app_path/test-kitchensink"
 
-# Link to our preset
-npm link "$root_path"/packages/babel-preset-react-app
+# Install our preset
+npm install file:"$root_path"/packages/babel-preset-react-app
 
 # Link to test module
 npm link "$temp_module_path/node_modules/test-integrity"