Merge tag 'v1.0.7' into zeal

This merge is much more complicated than it should have been.  Apparently, the parent project spun off a 0.9.x branch around 0.9.2 or so and never merged it back into master.  Thus, there are a signficant number of changes here that resulted from conflicts between their branches.

In this commit, I modified our `lint` script to match the changes made upstream in the other scripts.

This commit merges some of our customizations in, but not all yet.  I'll add those back in later commits.

In particular:
* I haven't added Sass and CSS modules support back into the Webpack configuration files.

* I haven't added back the changes needed to resolve imports from the `client` directory.

* I haven't added back the changes needed to configure the public path in dev mode; the `start` script was refactored heavily, so we need to figure out how to do what we need to do.

* I haven't added back the changes needed to keep the browser from automatically opening.

Author: randycoulman

.eslintrc

@@ -11,6 +11,7 @@
   },
   "rules": {
     "no-console": "off",
-    "strict": ["error", "global"]
+    "strict": ["error", "global"],
+    "curly": "warn"
   }
 }

.travis.yml

@@ -1,7 +1,6 @@
 ---
 language: node_js
 node_js:
-  - 4
   - 6
   - 7
 cache:
@@ -25,5 +24,7 @@ matrix:
   include:
     - node_js: 0.10
       env: TEST_SUITE=simple
-    - node_js: 6
-      env: USE_YARN=yes TEST_SUITE=simple
+# There's a weird Yarn/Lerna bug related to prerelease versions.
+# TODO: reenable after we ship 1.0.
+#    - node_js: 6
+#      env: USE_YARN=yes TEST_SUITE=simple

CHANGELOG-0.x.md

@@ -41,6 +41,36 @@ Please **ask first** if somebody else is already working on this or the core dev
 
 Please also provide a **test plan**, i.e. specify how you verified that your addition works.
 
+## Folder Structure of Create React App
+`create-react-app` is a monorepo, meaning it is divided into independent sub-packages.<br>
+These packages can be found in the [`packages/`](https://github.com/facebookincubator/create-react-app/tree/master/packages) directory.
+
+### Overview of directory structure
+```
+packages/
+  babel-preset-react-app/
+  create-react-app/
+  eslint-config-react-app/
+  react-dev-utils/
+  react-scripts/
+```
+### Package Descriptions
+#### [babel-preset-react-app](https://github.com/facebookincubator/create-react-app/tree/master/packages/babel-preset-react-app)
+This package is a babel preset intended to be used with `react-scripts`.<br>
+It targets platforms that React is designed to support (IE 9+) and enables experimental features used heavily at Facebook.<br>
+This package is enabled by default for all `create-react-app` scaffolded applications.
+#### [create-react-app](https://github.com/facebookincubator/create-react-app/tree/master/packages/create-react-app)
+The global CLI command code can be found in this directory, and shouldn't often be changed. It should run on Node 0.10+.
+#### [eslint-config-react-app](https://github.com/facebookincubator/create-react-app/tree/master/packages/eslint-config-react-app)
+This package contains a conservative set of rules focused on making errors apparent and enforces no style rules.<br>
+This package is enabled by default for all `create-react-app` scaffolded applications.
+#### [react-dev-utils](https://github.com/facebookincubator/create-react-app/tree/master/packages/react-dev-utils)
+This package contains utilities used for `react-scripts` and sister packages.<br>
+Its main purpose is to conceal code which the user shouldn't be burdened with upon ejecting.
+#### [react-scripts](https://github.com/facebookincubator/create-react-app/tree/master/packages/react-scripts)
+This package is the heart of the project, which contains the scripts for setting up the development server, building production builds, configuring all software used, etc.<br>
+All functionality must be retained (and configuration given to the user) if they choose to eject.
+
 ## Setting Up a Local Copy
 
 1. Clone the repo with `git clone https://github.com/facebookincubator/create-react-app`
@@ -58,6 +88,8 @@ cd my-app
 
 and then run `npm start` or `npm run build`.
 
+*Note: if you are using yarn, we suggest that you use `yarn install --no-lockfile` instead of the bare `yarn` or `yarn install` because we [intentionally](https://github.com/facebookincubator/create-react-app/pull/2014#issuecomment-300811661) do not ignore or add yarn.lock to our repo.*
+
 ## Cutting a Release
 
 1. Tag all merged pull requests that go into the release with the relevant milestone. Each merged PR should also be labeled with one of the [labels](https://github.com/facebookincubator/create-react-app/labels) named `tag: ...` to indicate what kind of change it is.

CHANGELOG.md

@@ -0,0 +1,8 @@
+<!--
+Thank you for sending the PR!
+If you changed any code, there are just two more things to do:
+
+* Provide us with clear instructions on how you verified your changes work. Bonus points for screenshots!
+
+Happy contributing!
+-->

CONTRIBUTING.md

@@ -8,7 +8,7 @@ Create React apps with no build configuration.
 Create React App works on macOS, Windows, and Linux.<br>
 If something doesn’t work please [file an issue](https://github.com/facebookincubator/create-react-app/issues/new).
 
-## tl;dr
+## Quick Overview
 
 ```sh
 npm install -g create-react-app
@@ -23,6 +23,13 @@ When you’re ready to deploy to production, create a minified bundle with `npm
 
 <img src='https://camo.githubusercontent.com/506a5a0a33aebed2bf0d24d3999af7f582b31808/687474703a2f2f692e696d6775722e636f6d2f616d794e66434e2e706e67' width='600' alt='npm start'>
 
+### Get Started Immediately
+
+You **don’t** need to install or configure tools like Webpack or Babel.<br>
+They are preconfigured and hidden so that you can focus on the code.
+
+Just create a project, and you’re good to go.
+
 ## Getting Started
 
 ### Installation
@@ -33,11 +40,9 @@ Install it once globally:
 npm install -g create-react-app
 ```
 
-**You’ll need to have Node >= 4 on your machine**.
-
-**We strongly recommend to use Node >= 6 and npm >= 3 for faster installation speed and better disk usage.** You can use [nvm](https://github.com/creationix/nvm#usage) to easily switch Node versions between different projects.
+**You’ll need to have Node >= 6 on your machine**. You can use [nvm](https://github.com/creationix/nvm#usage) to easily switch Node versions between different projects.
 
-**This tool doesn’t assume a Node backend**. The Node installation is only required for the build tools that rely on it locally, such as Webpack and Babel.
+**This tool doesn’t assume a Node backend**. The Node installation is only required for Create React App itself.
 
 ### Creating an App
 
@@ -60,13 +65,15 @@ my-app/
   public/
     favicon.ico
     index.html
+    manifest.json
   src/
     App.css
     App.js
     App.test.js
     index.css
     index.js
     logo.svg
+    registerServiceWorker.js
 ```
 
 No configuration or complicated folder structures, just the files you need to build your app.<br>
@@ -85,7 +92,7 @@ You will see the build errors and lint warnings in the console.
 ### `npm test` or `yarn test`
 
 Runs the test watcher in an interactive mode.<br>
-By default, runs tests related to files changes since the last commit.
+By default, runs tests related to files changed since the last commit.
 
 [Read more about testing.](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#running-tests)
 
@@ -95,7 +102,9 @@ Builds the app for production to the `build` folder.<br>
 It correctly bundles React in production mode and optimizes the build for the best performance.
 
 The build is minified and the filenames include the hashes.<br>
-Your app is ready to be deployed!
+By default, it also [includes a service worker](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app) so that your app loads from local cache on future visits.
+
+Your app is ready to be deployed.
 
 ## User Guide
 
@@ -111,10 +120,11 @@ The [User Guide](https://github.com/facebookincubator/create-react-app/blob/mast
 - [Changing the Page `<title>`](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#changing-the-page-title)
 - [Installing a Dependency](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#installing-a-dependency)
 - [Importing a Component](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#importing-a-component)
+- [Code Splitting](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#code-splitting)
 - [Adding a Stylesheet](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-a-stylesheet)
 - [Post-Processing CSS](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#post-processing-css)
 - [Adding a CSS Preprocessor (Sass, Less etc.)](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-a-css-preprocessor-sass-less-etc)
-- [Adding Images and Fonts](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-images-and-fonts)
+- [Adding Images, Fonts, and Files](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-images-fonts-and-files)
 - [Using the `public` Folder](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#using-the-public-folder)
 - [Using Global Variables](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#using-global-variables)
 - [Adding Bootstrap](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-bootstrap)
@@ -127,7 +137,6 @@ The [User Guide](https://github.com/facebookincubator/create-react-app/blob/mast
 - [Generating Dynamic `<meta>` Tags on the Server](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#generating-dynamic-meta-tags-on-the-server)
 - [Pre-Rendering into Static HTML Files](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#pre-rendering-into-static-html-files)
 - [Running Tests](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#running-tests)
-- [Developing Components in Isolation](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#developing-components-in-isolation)
 - [Making a Progressive Web App](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app)
 - [Deployment](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#deployment)
 - [Advanced Configuration](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#advanced-configuration)
@@ -143,7 +152,7 @@ Please refer to the [User Guide](https://github.com/facebookincubator/create-rea
 
 * **One Dependency:** There is just one build dependency. It uses Webpack, Babel, ESLint, and other amazing projects, but provides a cohesive curated experience on top of them.
 
-* **Convention over Configuration:** You don't need to configure anything by default. Reasonably good configuration of both development and production builds is handled for you so you can focus on writing code.
+* **No Configuration Required:** You don't need to configure anything. Reasonably good configuration of both development and production builds is handled for you so you can focus on writing code.
 
 * **No Lock-In:** You can “eject” to a custom setup at any time. Run a single command, and all the configuration and build dependencies will be moved directly into your project, so you can pick up right where you left off.
 
@@ -157,6 +166,7 @@ Please refer to the [User Guide](https://github.com/facebookincubator/create-rea
 * Import CSS and image files directly from JavaScript.
 * Autoprefixed CSS, so you don’t need `-webkit` or other prefixes.
 * A `build` script to bundle JS, CSS, and images for production, with sourcemaps.
+* An offline-first [service worker](https://developers.google.com/web/fundamentals/getting-started/primers/service-workers) and a [web app manifest](https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/), meeting all the [Progressive Web App](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app) criteria.
 
 **The feature set is intentionally limited**. It doesn’t support advanced features such as server rendering or CSS modules. The tool is also **non-configurable** because it is hard to provide a cohesive experience and easy updates across a set of tools when the user can tweak anything.
 
@@ -202,6 +212,11 @@ All of them are transitive dependencies of the provided npm package.
 
 We'd love to have your helping hand on `create-react-app`! See [CONTRIBUTING.md](CONTRIBUTING.md) for more information on what we're looking for and how to get started.
 
+## React Native
+
+Looking for something similar, but for React Native?<br>
+Check out [Create React Native App](https://github.com/react-community/create-react-native-app/).
+
 ## Acknowledgements
 
 We are grateful to the authors of existing related projects for their ideas and collaboration:
@@ -231,7 +246,7 @@ Notable alternatives also include:
 * [aik](https://github.com/d4rkr00t/aik)
 * [react-app](https://github.com/kriasoft/react-app)
 * [dev-toolkit](https://github.com/stoikerty/dev-toolkit)
-* [tarec](https://github.com/geowarin/tarec)
+* [sku](https://github.com/seek-oss/sku)
 
 You can also use module bundlers like [webpack](http://webpack.github.io) and [Browserify](http://browserify.org/) directly.<br>
 React documentation includes [a walkthrough](https://facebook.github.io/react/docs/package-management.html) on this topic.

PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,5 @@
+image: Visual Studio 2017
+
 environment:
   matrix:
     - nodejs_version: 7
@@ -12,12 +14,6 @@ environment:
       test_suite: "installs"
     - nodejs_version: 6
       test_suite: "kitchensink"
-    - nodejs_version: 4
-      test_suite: "simple"
-    - nodejs_version: 4
-      test_suite: "installs"
-    - nodejs_version: 4
-      test_suite: "kitchensink"
 
 cache:
   - node_modules -> appveyor.cleanup-cache.txt
@@ -32,6 +28,8 @@ platform:
   - x64
 
 install:
+  # TODO: Remove after https://github.com/appveyor/ci/issues/1426 is fixed
+  - set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
   - ps: Install-Product node $env:nodejs_version $env:platform
 
 build: off

README.md

@@ -5,14 +5,25 @@
     "changelog": "lerna-changelog",
     "create-react-app": "tasks/cra.sh",
     "e2e": "tasks/e2e-simple.sh",
-    "postinstall": "lerna bootstrap",
+    "postinstall": "lerna bootstrap && cd packages/react-error-overlay/ && npm run build:prod",
     "publish": "tasks/release.sh",
     "start": "node packages/react-scripts/scripts/start.js",
-    "test": "node packages/react-scripts/scripts/test.js --env=jsdom"
+    "test": "node packages/react-scripts/scripts/test.js --env=jsdom",
+    "format": "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'",
+    "precommit": "lint-staged"
   },
   "devDependencies": {
-    "eslint": "3.16.1",
+    "eslint": "3.19.0",
+    "husky": "^0.13.2",
     "lerna": "2.0.0-beta.38",
-    "lerna-changelog": "^0.2.3"
+    "lerna-changelog": "^0.2.3",
+    "lint-staged": "^3.3.1",
+    "prettier": "^0.21.0"
+  },
+  "lint-staged": {
+    "*.js": [
+      "prettier --trailing-comma es5 --single-quote --write",
+      "git add"
+    ]
   }
 }