Fix e2e test

Author: gaearon

tasks/clean_pack.sh

@@ -11,9 +11,9 @@ cd "$(dirname "$0")"
 
 function cleanup {
   echo 'Cleaning up.'
-  cd $initial_path
+  cd $root_path
   # Uncomment when snapshot testing is enabled by default:
-  # rm ../template/src/__snapshots__/App.test.js.snap
+  # rm ./template/src/__snapshots__/App.test.js.snap
   rm -rf $temp_cli_path $temp_app_path
 }
 
@@ -40,20 +40,36 @@ trap 'set +x; handle_exit' SIGQUIT SIGTERM SIGINT SIGKILL SIGHUP
 # Echo every command being executed
 set -x
 
-# `tasks/clean_pack.sh` the two directories to make sure they are valid npm modules
-initial_path=$PWD
-
+# Go to root
 cd ..
+root_path=$PWD
+
+# Create a temporary clean folder that contains production only code.
+# Do not overwrite any files in the current folder.
+clean_path=`mktemp -d 2>/dev/null || mktemp -d -t 'clean_path'`
+
+# Copy some of the project files to the temporary folder.
+# Exclude folders that definitely won’t be part of the package from processing.
+# We will strip the dev-only code there, `npm pack`, and copy the package back.
+rsync -av --exclude='.git' --exclude=$clean_path\
+  --exclude='node_modules' --exclude='build'\
+  './' $clean_path  >/dev/null
+cd $clean_path
+
+# Now remove all the code relevant to development of Create React App.
+files="$(find -L . -name "*.js" -type f)"
+for file in $files; do
+  sed -i.bak '/\/\/ @remove-on-publish-begin/,/\/\/ @remove-on-publish-end/d' $file
+  rm $file.bak
+done
 
 # A hacky way to avoid bundling dependencies.
 # Packing with them enabled takes too much memory, and Travis crashes.
-# End to end script is meant to run on Travis so it's not a big deal.
-# If you run it locally, you'll need to `git checkout -- package.json`.
 perl -i -p0e 's/bundledDependencies.*?]/bundledDependencies": []/s' package.json
 
 # Pack react-scripts
 npm install
-scripts_path=$PWD/`tasks/clean_pack.sh`
+scripts_path=$clean_path/`npm pack`
 
 # Lint
 ./node_modules/.bin/eslint --ignore-path .gitignore ./

tasks/e2e.sh

@@ -38,13 +38,13 @@ clean_path=`mktemp -d 2>/dev/null || mktemp -d -t 'clean_path'`
 
 # Copy some of the project files to the temporary folder.
 # Exclude folders that definitely won’t be part of the package from processing.
-# We will strip the dev-only code there, and then copy files back.
+# We will strip the dev-only code there, and publish from it.
 rsync -av --exclude='.git' --exclude=$clean_path\
   --exclude='node_modules' --exclude='build'\
   './' $clean_path  >/dev/null
+cd $clean_path
 
 # Now remove all the code relevant to development of Create React App.
-cd $clean_path
 files="$(find -L . -name "*.js" -type f)"
 for file in $files; do
   sed -i.bak '/\/\/ @remove-on-publish-begin/,/\/\/ @remove-on-publish-end/d' $file