From 26197e785d03d4d3c3380004ce5784dee8bbd3ee Mon Sep 17 00:00:00 2001 From: Ade Viankakrisna Fadlil Date: Wed, 23 Aug 2017 21:26:55 +0700 Subject: [PATCH 1/6] run npm 5.4.0 in CI --- tasks/e2e-installs.sh | 4 ++-- tasks/e2e-kitchensink.sh | 8 ++++---- tasks/e2e-simple.sh | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh index 58864263247..1fdb5000ab4 100755 --- a/tasks/e2e-installs.sh +++ b/tasks/e2e-installs.sh @@ -95,9 +95,9 @@ fi if hash npm 2>/dev/null then - # npm 5 is too buggy right now + # npm 5.0-5.3 is too buggy if [ $(npm -v | head -c 1) -eq 5 ]; then - npm i -g npm@^4.x + npm i -g npm@^5.4.0 fi; npm cache clean || npm cache verify fi diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh index ebbac271e6e..75830c740ac 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.3 is too buggy if [ $(npm -v | head -c 1) -eq 5 ]; then - npm i -g npm@^4.x + npm i -g npm@^5.4.0 fi; npm cache clean || npm cache verify fi @@ -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" diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh index 48d705eef4c..aacfb41e855 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.3 is too buggy if [ $(npm -v | head -c 1) -eq 5 ]; then - npm i -g npm@^4.x + npm i -g npm@^5.4.0 fi; npm cache clean || npm cache verify fi From 503223c0018b69e34647b497d8b27087d8f44388 Mon Sep 17 00:00:00 2001 From: Ade Viankakrisna Fadlil Date: Wed, 30 Aug 2017 00:47:30 +0700 Subject: [PATCH 2/6] run npm cache clean with --force in CI --- tasks/e2e-installs.sh | 2 +- tasks/e2e-kitchensink.sh | 2 +- tasks/e2e-simple.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh index 1fdb5000ab4..a06298f4bfe 100755 --- a/tasks/e2e-installs.sh +++ b/tasks/e2e-installs.sh @@ -99,7 +99,7 @@ then if [ $(npm -v | head -c 1) -eq 5 ]; then npm i -g npm@^5.4.0 fi; - npm cache clean || npm cache verify + npm cache clean --force || npm cache verify fi # Prevent bootstrap, we only want top-level dependencies diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh index 75830c740ac..9468e39327b 100755 --- a/tasks/e2e-kitchensink.sh +++ b/tasks/e2e-kitchensink.sh @@ -91,7 +91,7 @@ then if [ $(npm -v | head -c 1) -eq 5 ]; then npm i -g npm@^5.4.0 fi; - npm cache clean || npm cache verify + npm cache clean --force || npm cache verify fi # Prevent bootstrap, we only want top-level dependencies diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh index aacfb41e855..d09949edb26 100755 --- a/tasks/e2e-simple.sh +++ b/tasks/e2e-simple.sh @@ -90,7 +90,7 @@ then if [ $(npm -v | head -c 1) -eq 5 ]; then npm i -g npm@^5.4.0 fi; - npm cache clean || npm cache verify + npm cache clean --force || npm cache verify fi # Prevent bootstrap, we only want top-level dependencies From 9f55eec162f26187d3f585c7ae78d051329ec562 Mon Sep 17 00:00:00 2001 From: Ade Viankakrisna Fadlil Date: Wed, 30 Aug 2017 01:04:11 +0700 Subject: [PATCH 3/6] use link instead of install --- 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 9468e39327b..5dc6e44755e 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" -# Install our preset -npm install file:"$root_path"/packages/babel-preset-react-app +# Link to our preset +npm link "$root_path"/packages/babel-preset-react-app # Link to test module npm link "$temp_module_path/node_modules/test-integrity" From 93649a856c19c60d7a23d11071604ed540d3a4c5 Mon Sep 17 00:00:00 2001 From: Ade Viankakrisna Fadlil Date: Thu, 7 Sep 2017 15:41:45 +0700 Subject: [PATCH 4/6] Update e2e-installs.sh --- tasks/e2e-installs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh index a06298f4bfe..ebff7d13a7b 100755 --- a/tasks/e2e-installs.sh +++ b/tasks/e2e-installs.sh @@ -95,9 +95,9 @@ fi if hash npm 2>/dev/null then - # npm 5.0-5.3 is too buggy + # npm 5.0-5.4.0 is too buggy if [ $(npm -v | head -c 1) -eq 5 ]; then - npm i -g npm@^5.4.0 + npm i -g npm@^5.4.1 fi; npm cache clean --force || npm cache verify fi From be460db8a10701a9bfb081229ba5b6b57bf54bc1 Mon Sep 17 00:00:00 2001 From: Ade Viankakrisna Fadlil Date: Thu, 7 Sep 2017 15:42:14 +0700 Subject: [PATCH 5/6] 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 5dc6e44755e..10bdc077931 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.0-5.3 is too buggy + # npm 5.0-5.4.0 is too buggy if [ $(npm -v | head -c 1) -eq 5 ]; then - npm i -g npm@^5.4.0 + npm i -g npm@^5.4.1 fi; npm cache clean --force || npm cache verify fi From e56ac7549f14755de286c8bdff35eca4ca0c6c11 Mon Sep 17 00:00:00 2001 From: Ade Viankakrisna Fadlil Date: Thu, 7 Sep 2017 15:42:39 +0700 Subject: [PATCH 6/6] 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 d09949edb26..84d095e9496 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.0-5.3 is too buggy + # npm 5.0-5.4.0 is too buggy if [ $(npm -v | head -c 1) -eq 5 ]; then - npm i -g npm@^5.4.0 + npm i -g npm@^5.4.1 fi; npm cache clean --force || npm cache verify fi