Update Tests For CI

Author: wmonk

.travis.yml

@@ -2,27 +2,10 @@
 dist: trusty
 language: node_js
 node_js:
-  - 8
   - 9
 cache:
   directories:
   - node_modules
-  - packages/create-react-app/node_modules
-  - packages/react-scripts/node_modules
 install: true
 script:
- - 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
- - 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
- - 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
- # Disabled for the moment, since it requires additional work to be done.
- # - 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
-env:
-  matrix:
-    - TEST_SUITE=simple
-    - TEST_SUITE=kitchensink
-    # See comment above
-    # - TEST_SUITE=installs
-matrix:
-  include:
-    - node_js: 6
-      env: TEST_SUITE=kitchensink
+ - 'tasks/e2e-simple.sh'

tasks/cra.js

@@ -0,0 +1,109 @@
+#!/usr/bin/env node
+/**
+ * Copyright (c) 2015-present, Facebook, Inc. 
+ * 
+ * This source code is licensed under the MIT license found in the 
+ * LICENSE file in the root directory of this source tree. 
+ */
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const cp = require('child_process');
+
+const cleanup = () => {
+  console.log('Cleaning up.');
+  // Uncomment when snapshot testing is enabled by default:
+  // rm ./template/src/__snapshots__/App.test.js.snap
+};
+
+const handleExit = () => {
+  cleanup();
+  console.log('Exiting without error.');
+  process.exit();
+};
+
+const handleError = e => {
+  console.error('ERROR! An error was encountered while executing\n', e);
+  cleanup();
+  console.log('Exiting with error.');
+  process.exit(1);
+};
+
+process.on('SIGINT', handleExit);
+process.on('uncaughtException', handleError);
+
+// ******************************************************************************
+// Pack react- scripts so we can verify they work.
+// ******************************************************************************
+
+const rootDir = path.join(__dirname, '..');
+const reactScriptsDir = path.join(rootDir, 'packages', 'react-scripts');
+const packageJsonPath = path.join(reactScriptsDir, 'package.json');
+const packageJsonOrigPath = path.join(reactScriptsDir, 'package.json.orig');
+
+// Install all our packages
+const lernaPath = path.join(rootDir, 'node_modules', '.bin', 'lerna');
+cp.execSync(`${lernaPath} bootstrap`, {
+  cwd: rootDir,
+  stdio: 'inherit',
+});
+
+// Save package.json because we're going to touch it
+fs.writeFileSync(packageJsonOrigPath, fs.readFileSync(packageJsonPath));
+
+// Replace own dependencies (those in the`packages` dir) with the local paths
+// of those packages
+const replaceOwnDepsPath = path.join(__dirname, 'replace-own-deps.js');
+cp.execSync(`node ${replaceOwnDepsPath}`, { stdio: 'inherit' });
+
+// Finally, pack react-scripts
+// Don't redirect stdio as we want to capture the output that will be returned
+// from execSync(). In this case it will be the .tgz filename.
+const scriptsFileName = cp
+  .execSync(`npm pack`, { cwd: reactScriptsDir })
+  .toString()
+  .trim();
+const scriptsPath = path.join(
+  rootDir,
+  'packages',
+  'react-scripts',
+  scriptsFileName
+);
+
+// Restore package.json
+fs.unlinkSync(packageJsonPath);
+fs.writeFileSync(packageJsonPath, fs.readFileSync(packageJsonOrigPath));
+fs.unlinkSync(packageJsonOrigPath);
+
+// ******************************************************************************
+// Now that we have packed them, call the global CLI.
+// ******************************************************************************
+
+// If Yarn is installed, clean its cache because it may have cached react-scripts
+try {
+  cp.execSync('yarn cache clean');
+} catch (e) {
+  // We can safely ignore this as the user doesn't have yarn installed
+}
+
+const args = process.argv.slice(2);
+
+// Now run the CRA command
+const craScriptPath = path.join(
+  rootDir,
+  'packages',
+  'create-react-app',
+  'index.js'
+);
+cp.execSync(
+  `node ${craScriptPath} --scripts-version="${scriptsPath}" ${args.join(' ')}`,
+  {
+    cwd: rootDir,
+    stdio: 'inherit',
+  }
+);
+
+// Cleanup
+handleExit();

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 verify
+  npm cache clean || npm cache verify
 fi
 
 # Bootstrap monorepo

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 verify
+  npm cache clean || npm cache verify
 fi
 
 # Bootstrap monorepo

tasks/e2e-old-node.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+# Copyright (c) 2015-present, Facebook, Inc.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+# ******************************************************************************
+# This is an end-to-end test intended to run on CI.
+# You can also run it locally but it's slow.
+# ******************************************************************************
+
+# Start in tasks/ even if run from root directory
+cd "$(dirname "$0")"
+
+temp_app_path=`mktemp -d 2>/dev/null || mktemp -d -t 'temp_app_path'`
+
+function cleanup {
+  echo 'Cleaning up.'
+  cd "$root_path"
+  rm -rf $temp_app_path
+}
+
+# Error messages are redirected to stderr
+function handle_error {
+  echo "$(basename $0): ERROR! An error was encountered executing line $1." 1>&2;
+  cleanup
+  echo 'Exiting with error.' 1>&2;
+  exit 1
+}
+
+function handle_exit {
+  cleanup
+  echo 'Exiting without error.' 1>&2;
+  exit
+}
+
+# Exit the script with a helpful error message when any error is encountered
+trap 'set +x; handle_error $LINENO $BASH_COMMAND' ERR
+
+# Cleanup before exit on any termination signal
+trap 'set +x; handle_exit' SIGQUIT SIGTERM SIGINT SIGKILL SIGHUP
+
+# Echo every command being executed
+set -x
+
+# Go to root
+cd ..
+root_path=$PWD
+
+# We need to install create-react-app deps to test it
+cd "$root_path"/packages/create-react-app
+npm install
+cd "$root_path"
+
+# If the node version is < 6, the script should just give an error.
+cd $temp_app_path
+err_output=`node "$root_path"/packages/create-react-app/index.js test-node-version 2>&1 > /dev/null || echo ''`
+[[ $err_output =~ You\ are\ running\ Node ]] && exit 0 || exit 1
+
+# Cleanup
+cleanup

tasks/e2e-simple.sh

@@ -63,23 +63,10 @@ set -x
 cd ..
 root_path=$PWD
 
-# Make sure we don't introduce accidental references to PATENTS.
-EXPECTED='packages/react-error-overlay/fixtures/bundle.mjs
-packages/react-error-overlay/fixtures/bundle.mjs.map
-packages/react-error-overlay/fixtures/bundle_u.mjs
-packages/react-error-overlay/fixtures/bundle_u.mjs.map
-tasks/e2e-simple.sh'
-ACTUAL=$(git grep -l PATENTS)
-if [ "$EXPECTED" != "$ACTUAL" ]; then
-  echo "PATENTS crept into some new files?"
-  diff -u <(echo "$EXPECTED") <(echo "$ACTUAL") || true
-  exit 1
-fi
-
 if hash npm 2>/dev/null
 then
   npm i -g npm@latest
-  npm cache verify
+  npm cache clean || npm cache verify
 fi
 
 # Bootstrap monorepo
@@ -98,48 +85,14 @@ yarn config set registry "$custom_registry_url"
 # Login so we can publish packages
 npx [email protected] -u user -p password -e [email protected] -r "$custom_registry_url" --quotes
 
-# Lint own code
-./node_modules/.bin/eslint --max-warnings 0 packages/babel-preset-react-app/
-./node_modules/.bin/eslint --max-warnings 0 packages/create-react-app/
-./node_modules/.bin/eslint --max-warnings 0 packages/eslint-config-react-app/
-./node_modules/.bin/eslint --max-warnings 0 packages/react-dev-utils/
-./node_modules/.bin/eslint --max-warnings 0 packages/react-scripts/
-cd packages/react-error-overlay/
-./node_modules/.bin/eslint --max-warnings 0 src/
-yarn test
-
 if [ $APPVEYOR != 'True' ]; then
   # Flow started hanging on AppVeyor after we moved to Yarn Workspaces :-(
   yarn flow
 fi
 
-cd ../..
-cd packages/react-dev-utils/
-yarn test
-cd ../..
-
 # ******************************************************************************
-# First, test the create-react-app development environment.
-# This does not affect our users but makes sure we can develop it.
+# Publish to local registry
 # ******************************************************************************
-
-# Test local build command
-yarn build
-# Check for expected output
-exists build/*.html
-exists build/static/js/*.js
-exists build/static/css/*.css
-exists build/static/media/*.svg
-exists build/favicon.ico
-
-# Run tests with CI flag
-CI=true yarn test
-# Uncomment when snapshot testing is enabled by default:
-# exists template/src/__snapshots__/App.test.js.snap
-
-# Test local start command
-yarn start --smoke-test
-
 git clean -df
 ./tasks/publish.sh --yes --force-publish=* --skip-git --cd-version=prerelease --exact --npm-tag=latest
 
@@ -151,13 +104,10 @@ git clean -df
 cd $temp_app_path
 npx create-react-app test-app --scripts-version=react-scripts-ts
 
-# TODO: verify we installed prerelease
-
 # ******************************************************************************
 # Now that we used create-react-app to create an app depending on react-scripts,
 # let's make sure all npm scripts are in the working state.
 # ******************************************************************************
-
 function verify_env_url {
   # Backup package.json because we're going to make it dirty
   cp package.json package.json.orig
@@ -286,4 +236,4 @@ verify_env_url
 verify_module_scope
 
 # Cleanup
-cleanup
+cleanup