From 84ea797282130a672414cb05f029fe07b3b44fe8 Mon Sep 17 00:00:00 2001
From: Giacomo Rebonato <grebonato@hubspot.com>
Date: Fri, 10 Aug 2018 11:06:52 +0100
Subject: [PATCH 1/6] Fix errors on Travis

---
 package.json             | 5 +++++
 tasks/e2e-installs.sh    | 2 +-
 tasks/e2e-kitchensink.sh | 2 +-
 tasks/e2e-simple.sh      | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index e02a51dba..8be5b1be8 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,11 @@
     "lint-staged": "^3.3.1",
     "prettier": "1.6.1"
   },
+  "jest": {
+    "verbose": true,
+    "testEnvironment": "jsdom",
+    "testURL": "http://localhost/"
+  },
   "lint-staged": {
     "*.js": [
       "prettier --trailing-comma es5 --single-quote --write",
diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh
index d1150a874..3cf57247f 100755
--- a/tasks/e2e-installs.sh
+++ b/tasks/e2e-installs.sh
@@ -75,7 +75,7 @@ root_path=$PWD
 if hash npm 2>/dev/null
 then
   npm i -g npm@latest
-  npm cache clean || npm cache verify
+  npm cache verify
 fi
 
 # Bootstrap monorepo
diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh
index 9a3f895a5..8598ab1c2 100755
--- a/tasks/e2e-kitchensink.sh
+++ b/tasks/e2e-kitchensink.sh
@@ -67,7 +67,7 @@ root_path=$PWD
 if hash npm 2>/dev/null
 then
   npm i -g npm@latest
-  npm cache clean || npm cache verify
+  npm cache verify
 fi
 
 # Bootstrap monorepo
diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh
index a1eecbaf0..1671a54f9 100755
--- a/tasks/e2e-simple.sh
+++ b/tasks/e2e-simple.sh
@@ -79,7 +79,7 @@ fi
 if hash npm 2>/dev/null
 then
   npm i -g npm@latest
-  npm cache clean || npm cache verify
+  npm cache verify
 fi
 
 # Bootstrap monorepo

From 491ae92a5888ab5f9a21409a87e16a13628ea67e Mon Sep 17 00:00:00 2001
From: Giacomo Rebonato <grebonato@hubspot.com>
Date: Fri, 10 Aug 2018 11:30:26 +0100
Subject: [PATCH 2/6] localStorage fix

---
 packages/react-error-overlay/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index fe6c7fd68..93aa7d57a 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -76,6 +76,7 @@
       "/node_modules/",
       "/fixtures/",
       "setupJest.js"
-    ]
+    ],
+    "testURL": "http://localhost/"
   }
 }

From b54b06edba1d187b4cd3fd5ae26517ceb18c67cf Mon Sep 17 00:00:00 2001
From: Giacomo Rebonato <grebonato@hubspot.com>
Date: Fri, 10 Aug 2018 11:30:36 +0100
Subject: [PATCH 3/6] Updated dependencies

---
 package.json | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 8be5b1be8..87a385ff6 100644
--- a/package.json
+++ b/package.json
@@ -17,21 +17,16 @@
     "precommit": "lint-staged"
   },
   "devDependencies": {
-    "@types/jest": "^20.0.4",
-    "@types/node": "^7.0.21",
-    "@types/react": "^15.6.1",
-    "@types/react-dom": "^15.5.0",
-    "eslint": "^4.4.1",
-    "husky": "^0.13.2",
-    "lerna": "2.6.0",
-    "lerna-changelog": "^0.6.0",
-    "lint-staged": "^3.3.1",
-    "prettier": "1.6.1"
-  },
-  "jest": {
-    "verbose": true,
-    "testEnvironment": "jsdom",
-    "testURL": "http://localhost/"
+    "@types/jest": "^23.3.1",
+    "@types/node": "^10.5.7",
+    "@types/react": "^16.4.9",
+    "@types/react-dom": "^16.0.7",
+    "eslint": "^5.3.0",
+    "husky": "^0.14.3",
+    "lerna": "^3.0.1",
+    "lerna-changelog": "^0.8.0",
+    "lint-staged": "^7.2.0",
+    "prettier": "^1.14.2"
   },
   "lint-staged": {
     "*.js": [

From cc406030feed440c20e598f65057da114aecbeb8 Mon Sep 17 00:00:00 2001
From: Giacomo Rebonato <grebonato@hubspot.com>
Date: Fri, 10 Aug 2018 11:44:08 +0100
Subject: [PATCH 4/6] Fix for localStorage

---
 packages/react-dev-utils/package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index eab07c1be..440a60776 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -60,5 +60,8 @@
   },
   "scripts": {
     "test": "jest"
+  },
+  "jest": {
+    "testURL": "http://localhost/"
   }
 }

From b40056262420dbf029dd33966cf772adc1a8b7da Mon Sep 17 00:00:00 2001
From: Giacomo Rebonato <grebonato@hubspot.com>
Date: Fri, 10 Aug 2018 11:54:11 +0100
Subject: [PATCH 5/6] Removed independent flag

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

diff --git a/tasks/publish.sh b/tasks/publish.sh
index c1cae86c2..7d6f76285 100755
--- a/tasks/publish.sh
+++ b/tasks/publish.sh
@@ -36,4 +36,4 @@ cd packages/react-error-overlay/
 npm run build:prod
 cd ../..
 # Go!
-./node_modules/.bin/lerna publish --independent "$@"
\ No newline at end of file
+./node_modules/.bin/lerna publish

From 3697681221a183790405dd5c352fe1ad611a0fbc Mon Sep 17 00:00:00 2001
From: Giacomo Rebonato <grebonato@hubspot.com>
Date: Fri, 10 Aug 2018 11:59:58 +0100
Subject: [PATCH 6/6] checkout on ci

---
 tasks/publish.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tasks/publish.sh b/tasks/publish.sh
index 7d6f76285..f81a8658e 100755
--- a/tasks/publish.sh
+++ b/tasks/publish.sh
@@ -36,4 +36,5 @@ cd packages/react-error-overlay/
 npm run build:prod
 cd ../..
 # Go!
+git checkout master
 ./node_modules/.bin/lerna publish