diff --git a/.gitignore b/.gitignore index 3f28aa1557..967dd6bc39 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ rules_nodejs-*.tar.gz /internal/e2e/*/bazel-* /internal/npm_install/test/package/* node_modules +!/internal/npm_install/test/golden/node_modules examples/vendored_node/node-v10.12.0-linux-x64 examples/vendored_node/node-v10.12.0-linux-x64.tar.xz examples/vendored_node/yarn-v1.10.0 diff --git a/scripts/clean_all.sh b/scripts/clean_all.sh index 0dd4d40241..d77d9805be 100755 --- a/scripts/clean_all.sh +++ b/scripts/clean_all.sh @@ -11,9 +11,7 @@ cd ${RULES_NODEJS_DIR} echo_and_run() { echo "+ $@" ; "$@" ; } echo_and_run rm -rf ./dist -echo_and_run rm -rf ./node_modules -echo_and_run rm -rf ./examples/program/node_modules -echo_and_run rm -rf ./internal/npm_install/test/package/node_modules +echo_and_run rm -rf `find . -type d -name node_modules -prune -not -path "./internal/npm_install/test/golden/node_modules"` echo_and_run bazel clean --expunge @@ -30,7 +28,7 @@ ${RULES_NODEJS_DIR}/scripts/clean_packages_all.sh if [[ -e 'WORKSPACE' ]] ; then printf "\n\nCleaning /internal/e2e/${subDir}\n" echo_and_run bazel clean --expunge - echo_and_run rm -rf node_modules + echo_and_run rm -rf `find . -type d -name node_modules -prune` fi ) done diff --git a/scripts/clean_e2e.sh b/scripts/clean_e2e.sh index a5bc104caa..37750a07f3 100755 --- a/scripts/clean_e2e.sh +++ b/scripts/clean_e2e.sh @@ -19,6 +19,6 @@ for e2eTest in ${E2E_TESTS[@]} ; do printf "\n\nCleaning e2e test ${e2eTest}\n" ${RULES_NODEJS_DIR}/scripts/unlink_deps.sh echo_and_run bazel clean --expunge - echo_and_run rm -rf node_modules + echo_and_run rm -rf `find . -type d -name node_modules -prune` ) done diff --git a/scripts/clean_examples.sh b/scripts/clean_examples.sh index 305f280408..ff143ad9ca 100755 --- a/scripts/clean_examples.sh +++ b/scripts/clean_examples.sh @@ -19,6 +19,6 @@ for example in ${EXAMPLES[@]} ; do printf "\n\nCleaning example ${example}\n" ${RULES_NODEJS_DIR}/scripts/unlink_deps.sh echo_and_run bazel clean --expunge - echo_and_run rm -rf node_modules + echo_and_run rm -rf `find . -type d -name node_modules -prune` ) done diff --git a/scripts/clean_packages.sh b/scripts/clean_packages.sh index 169f50e348..08de46cbff 100755 --- a/scripts/clean_packages.sh +++ b/scripts/clean_packages.sh @@ -19,6 +19,6 @@ for package in ${PACKAGES[@]} ; do printf "\n\nCleaning package ${package}\n" ${RULES_NODEJS_DIR}/scripts/unlink_deps.sh echo_and_run bazel clean --expunge - echo_and_run rm -rf node_modules + echo_and_run rm -rf `find . -type d -name node_modules -prune` ) done