diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh index b8f401680a9c60668076421cfcf8fd2a55bf2ea4..89702463304f241018e14170666d9f8d6313af1a 100755 --- a/tasks/e2e-installs.sh +++ b/tasks/e2e-installs.sh @@ -83,7 +83,11 @@ set -x cd .. root_path=$PWD +# Prevent lerna bootstrap, we only want top-level dependencies +cp package.json package.json.bak +grep -v "lerna bootstrap" package.json > temp && mv temp package.json npm install +mv package.json.bak package.json if [ "$USE_YARN" = "yes" ] then @@ -92,6 +96,9 @@ then yarn cache clean fi +# We removed the postinstall, so do it manually +./node_modules/.bin/lerna bootstrap --concurrency=1 + # ****************************************************************************** # First, pack and install create-react-app. # ****************************************************************************** diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh index afc36e1a36878f188a898c52089c44d0838b28f9..2c2c1eb92c5a37171913a6c4be847723a74b8443 100755 --- a/tasks/e2e-kitchensink.sh +++ b/tasks/e2e-kitchensink.sh @@ -66,7 +66,11 @@ set -x cd .. root_path=$PWD +# Prevent lerna bootstrap, we only want top-level dependencies +cp package.json package.json.bak +grep -v "lerna bootstrap" package.json > temp && mv temp package.json npm install +mv package.json.bak package.json if [ "$USE_YARN" = "yes" ] then @@ -75,6 +79,9 @@ then yarn cache clean fi +# We removed the postinstall, so do it manually +./node_modules/.bin/lerna bootstrap --concurrency=1 + # ****************************************************************************** # First, pack react-scripts and create-react-app so we can use them. # ****************************************************************************** diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh index d733656d8668202cedca378b19f43f4e804c6b66..59cccd8889894fa8a2638886489950cb6b2916ba 100755 --- a/tasks/e2e-simple.sh +++ b/tasks/e2e-simple.sh @@ -84,10 +84,8 @@ then [[ $err_output =~ You\ are\ running\ Node ]] && exit 0 || exit 1 fi -# Still use npm install instead of directly calling lerna bootstrap to test -# postinstall script functionality (one npm install should result in a working -# project) -npm install +# We removed the postinstall, so do it manually here +./node_modules/.bin/lerna bootstrap --concurrency=1 if [ "$USE_YARN" = "yes" ] then