From a29b8c14f9d62ce011354d07889e14fa4b6cb225 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 28 Jun 2017 13:59:40 +0100
Subject: [PATCH 01/11] Test Node 8 on Travis

We still test Node 7 on AppVeyor
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2c60bc2674b..b08d2bf6b25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
 language: node_js
 node_js:
   - 6
-  - 7
+  - 8
 cache:
   directories:
   - node_modules

From a0091d976e33a4c6e713648454d5d725ef06a82d Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 28 Jun 2017 15:09:07 +0100
Subject: [PATCH 02/11] Update e2e-installs.sh

---
 tasks/e2e-installs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh
index 8f4789ff0c7..fb1b6c075e0 100755
--- a/tasks/e2e-installs.sh
+++ b/tasks/e2e-installs.sh
@@ -104,7 +104,7 @@ fi
 
 if hash npm 2>/dev/null
 then
-  npm cache clean
+  npm cache clean || npm cache verify
 fi
 
 # Prevent lerna bootstrap, we only want top-level dependencies

From f270d9e7eb40c42fbf2c31ac2f5522a4b9cf664a Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 28 Jun 2017 15:09:24 +0100
Subject: [PATCH 03/11] Update e2e-kitchensink.sh

---
 tasks/e2e-kitchensink.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh
index fcd687e4b0d..bb65df4d868 100755
--- a/tasks/e2e-kitchensink.sh
+++ b/tasks/e2e-kitchensink.sh
@@ -87,7 +87,7 @@ fi
 
 if hash npm 2>/dev/null
 then
-  npm cache clean
+  npm cache clean || npm cache verify
 fi
 
 # Prevent lerna bootstrap, we only want top-level dependencies

From 6ddf3e4b40efe2e2981c3ee37a611edaa35d88aa Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 28 Jun 2017 15:09:33 +0100
Subject: [PATCH 04/11] Update e2e-simple.sh

---
 tasks/e2e-simple.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh
index 163bec0818a..580ab0d71d1 100755
--- a/tasks/e2e-simple.sh
+++ b/tasks/e2e-simple.sh
@@ -86,7 +86,7 @@ fi
 
 if hash npm 2>/dev/null
 then
-  npm cache clean
+  npm cache clean || npm cache verify
 fi
 
 # Prevent lerna bootstrap, we only want top-level dependencies

From 125bcf96aa8fce07a037121df1ed3dda34fa36dc Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 28 Jun 2017 18:11:08 +0100
Subject: [PATCH 05/11] 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 fb1b6c075e0..00b654be3a3 100755
--- a/tasks/e2e-installs.sh
+++ b/tasks/e2e-installs.sh
@@ -105,6 +105,10 @@ fi
 if hash npm 2>/dev/null
 then
   npm cache clean || npm cache verify
+  # npm 5 versions before 5.0.4 are way too buggy
+  if [ $(npm -v | head -c 1) -lt 5 ]; then
+    npm i -g npm@^5.0.4
+  fi;
 fi
 
 # Prevent lerna bootstrap, we only want top-level dependencies

From 7cb1e48539378850bf865ec701216349bbccf7fc Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 28 Jun 2017 18:11:17 +0100
Subject: [PATCH 06/11] Update e2e-kitchensink.sh

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

diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh
index bb65df4d868..3a09902c2f6 100755
--- a/tasks/e2e-kitchensink.sh
+++ b/tasks/e2e-kitchensink.sh
@@ -87,6 +87,10 @@ fi
 
 if hash npm 2>/dev/null
 then
+  # npm 5 versions before 5.0.4 are way too buggy
+  if [ $(npm -v | head -c 1) -lt 5 ]; then
+    npm i -g npm@^5.0.4
+  fi;
   npm cache clean || npm cache verify
 fi
 

From f291ea6848ca6eae1b1277f3adefee619a340a72 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 28 Jun 2017 18:11:41 +0100
Subject: [PATCH 07/11] Update e2e-installs.sh

---
 tasks/e2e-installs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh
index 00b654be3a3..da6c187cb18 100755
--- a/tasks/e2e-installs.sh
+++ b/tasks/e2e-installs.sh
@@ -104,11 +104,11 @@ fi
 
 if hash npm 2>/dev/null
 then
-  npm cache clean || npm cache verify
   # npm 5 versions before 5.0.4 are way too buggy
   if [ $(npm -v | head -c 1) -lt 5 ]; then
     npm i -g npm@^5.0.4
   fi;
+  npm cache clean || npm cache verify
 fi
 
 # Prevent lerna bootstrap, we only want top-level dependencies

From 995f028c7e2578f09e9995ffda2df98bbf0f155e Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 28 Jun 2017 18:11:55 +0100
Subject: [PATCH 08/11] Update e2e-simple.sh

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

diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh
index 580ab0d71d1..edda58d8d95 100755
--- a/tasks/e2e-simple.sh
+++ b/tasks/e2e-simple.sh
@@ -86,6 +86,10 @@ fi
 
 if hash npm 2>/dev/null
 then
+  # npm 5 versions before 5.0.4 are way too buggy
+  if [ $(npm -v | head -c 1) -lt 5 ]; then
+    npm i -g npm@^5.0.4
+  fi;
   npm cache clean || npm cache verify
 fi
 

From d8363da617c527628d9afa1021d7f7b24064e456 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 28 Jun 2017 19:16:40 +0100
Subject: [PATCH 09/11] Update e2e-simple.sh

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

diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh
index edda58d8d95..cdcf4a63d9a 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 versions before 5.0.4 are way too buggy
-  if [ $(npm -v | head -c 1) -lt 5 ]; then
-    npm i -g npm@^5.0.4
+  # 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 f584cfa71e58766b4a08633c1e5597a7540159cf Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 28 Jun 2017 19:16:45 +0100
Subject: [PATCH 10/11] Update e2e-kitchensink.sh

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

diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh
index 3a09902c2f6..7f97fdc440c 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 versions before 5.0.4 are way too buggy
-  if [ $(npm -v | head -c 1) -lt 5 ]; then
-    npm i -g npm@^5.0.4
+  # 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 72357270e32f43caf4804531cb831d73f4d70b60 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 28 Jun 2017 19:16:47 +0100
Subject: [PATCH 11/11] Update e2e-installs.sh

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

diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh
index da6c187cb18..e9612112cfe 100755
--- a/tasks/e2e-installs.sh
+++ b/tasks/e2e-installs.sh
@@ -104,9 +104,9 @@ fi
 
 if hash npm 2>/dev/null
 then
-  # npm 5 versions before 5.0.4 are way too buggy
-  if [ $(npm -v | head -c 1) -lt 5 ]; then
-    npm i -g npm@^5.0.4
+  # 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