From d1f37d98abc9b89771a9582b7657f7cf2d7a5d85 Mon Sep 17 00:00:00 2001
From: Ryan Sullivan <ryansully@users.noreply.github.com>
Date: Fri, 2 Jun 2017 06:05:25 -0700
Subject: [PATCH 01/10] Update Travis CI Node versions in User Guide (#2454)

Removed Node v4 (CRA only supports Node >= 6)
---
 packages/react-scripts/template/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 080329cffad..7db9aef8833 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -1244,7 +1244,6 @@ Popular CI servers already set the environment variable `CI` by default but you
 ```
 language: node_js
 node_js:
-  - 4
   - 6
 cache:
   directories:

From e898215b7ffcc436306e209227fcf393d134fe69 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Sun, 4 Jun 2017 14:14:16 +0200
Subject: [PATCH 02/10] re-add storybook && update the documentation and links
 (#2331)

* re-add storybook && update the documentation and links

* Change to new documentation domain
---
 packages/react-scripts/template/README.md | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 7db9aef8833..955026ac0fc 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -1321,30 +1321,30 @@ If you use [Visual Studio Code](https://code.visualstudio.com), there is a [Jest
 
 ![VS Code Jest Preview](https://cloud.githubusercontent.com/assets/49038/20795349/a032308a-b7c8-11e6-9b34-7eeac781003f.png)
 
-<!--
 ## Developing Components in Isolation
 
 Usually, in an app, you have a lot of UI components, and each of them has many different states.
 For an example, a simple button component could have following states:
 
-* With a text label.
-* With an emoji.
+* In a regular state, with a text label.
 * In the disabled mode.
+* In a loading state.
 
 Usually, it’s hard to see these states without running a sample app or some examples.
 
-Create React App doesn’t include any tools for this by default, but you can easily add [React Storybook](https://github.com/kadirahq/react-storybook) to your project. **It is a third-party tool that lets you develop components and see all their states in isolation from your app**.
+Create React App doesn’t include any tools for this by default, but you can easily add [Storybook for React](https://storybook.js.org) ([source](https://github.com/storybooks/storybook)) to your project. **It is a third-party tool that lets you develop components and see all their states in isolation from your app**.
 
-![React Storybook Demo](http://i.imgur.com/7CIAWpB.gif)
+![Storybook for React Demo](http://i.imgur.com/7CIAWpB.gif)
 
-You can also deploy your Storybook as a static app. This way, everyone in your team can view and review different states of UI components without starting a backend server or creating an account in your app.
+A storybook can also be deployed as a static app.
+This way, everyone in your team can view and review different states of UI components without starting a backend server or creating an account in your app.
 
-**Here’s how to setup your app with Storybook:**
+### Setup your app with Storybook
 
 First, install the following npm package globally:
 
 ```sh
-npm install -g getstorybook
+npm install -g @storybook/cli
 ```
 
 Then, run the following command inside your app’s directory:
@@ -1358,10 +1358,9 @@ After that, follow the instructions on the screen.
 Learn more about React Storybook:
 
 * Screencast: [Getting Started with React Storybook](https://egghead.io/lessons/react-getting-started-with-react-storybook)
-* [GitHub Repo](https://github.com/kadirahq/react-storybook)
-* [Documentation](https://storybooks.js.org/docs/react-storybook/basics/introduction/)
-* [Snapshot Testing](https://github.com/kadirahq/storyshots) with React Storybook
--->
+* [GitHub Repo](https://github.com/storybooks/storybook)
+* [Documentation](https://storybook.js.org/docs/react-storybook/basics/introduction/)
+* [Snapshot Testing UI](https://github.com/storybooks/storybook/tree/master/addons/storyshots) with Storybook + addon/storyshot
 
 ## Making a Progressive Web App
 

From b264b8de33cb3a76d30cfc228a7a3a4218603157 Mon Sep 17 00:00:00 2001
From: bryankang <bryankang@users.noreply.github.com>
Date: Mon, 5 Jun 2017 18:36:13 -0500
Subject: [PATCH 03/10] Prioritize index.css over the implicit App.css (#2470)

---
 packages/react-scripts/template/src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/template/src/index.js b/packages/react-scripts/template/src/index.js
index 53c768842ca..fae3e3500cf 100644
--- a/packages/react-scripts/template/src/index.js
+++ b/packages/react-scripts/template/src/index.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import './index.css';
 import App from './App';
 import registerServiceWorker from './registerServiceWorker';
-import './index.css';
 
 ReactDOM.render(<App />, document.getElementById('root'));
 registerServiceWorker();

From c78c1fae6282d4eb0ba6b844e91e49097c0073ea Mon Sep 17 00:00:00 2001
From: Zac Kwan <Zaccc123@users.noreply.github.com>
Date: Tue, 6 Jun 2017 21:06:39 +0800
Subject: [PATCH 04/10] Added NamedModulesPlugin in webpack.config.dev.js
 (#2458)

* Added NamedModulesPlugin in webpack.config.dev.js

* Update webpack.config.dev.js
---
 packages/react-scripts/config/webpack.config.dev.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index adf92f5b124..55d3b6ad74c 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -249,6 +249,8 @@ module.exports = {
       inject: true,
       template: paths.appHtml,
     }),
+    // Add module names to factory functions so they appear in browser profiler.
+    new webpack.NamedModulesPlugin(),
     // Makes some environment variables available to the JS code, for example:
     // if (process.env.NODE_ENV === 'development') { ... }. See `./env.js`.
     new webpack.DefinePlugin(env.stringified),

From dc4ce606ef8b4c97aec0c80c20f8116e9795bb21 Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Tue, 6 Jun 2017 14:02:27 -0400
Subject: [PATCH 05/10] Unscope detect-port (#2483)

Resolves #2481
---
 packages/react-dev-utils/WebpackDevServerUtils.js | 2 +-
 packages/react-dev-utils/package.json             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-dev-utils/WebpackDevServerUtils.js b/packages/react-dev-utils/WebpackDevServerUtils.js
index 51a0feb56f3..9c03af40dd8 100644
--- a/packages/react-dev-utils/WebpackDevServerUtils.js
+++ b/packages/react-dev-utils/WebpackDevServerUtils.js
@@ -13,7 +13,7 @@ const fs = require('fs');
 const path = require('path');
 const url = require('url');
 const chalk = require('chalk');
-const detect = require('@timer/detect-port');
+const detect = require('detect-port-alt');
 const inquirer = require('inquirer');
 const clearConsole = require('./clearConsole');
 const formatWebpackMessages = require('./formatWebpackMessages');
diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index 46f3a92033a..9a7a61119ab 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -33,12 +33,12 @@
     "webpackHotDevClient.js"
   ],
   "dependencies": {
-    "@timer/detect-port": "1.1.3",
     "address": "1.0.1",
     "anser": "1.3.0",
     "babel-code-frame": "6.22.0",
     "chalk": "1.1.3",
     "cross-spawn": "4.0.2",
+    "detect-port-alt": "1.1.3",
     "escape-string-regexp": "1.0.5",
     "filesize": "3.3.0",
     "gzip-size": "3.0.0",

From 9438c5bbc12ec5dd261a2afd73c53214cb3016df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislas=20Ormi=C3=A8res?= <laruiss@gmail.com>
Date: Wed, 7 Jun 2017 16:43:22 +0200
Subject: [PATCH 06/10] Update webpack links to point to webpack 2 (#2492)

* Update README.md to make links to webpack point to webpack.js.org instead
  insteade of webpack 1 webpack.githup.io
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8cd74f24f86..06a2fbf4df9 100644
--- a/README.md
+++ b/README.md
@@ -199,7 +199,7 @@ Some of them might get added in the future if they are stable, are useful to maj
 The tools used by Create React App are subject to change.
 Currently it is a thin layer on top of many amazing community projects, such as:
 
-* [webpack](https://webpack.github.io/) with [webpack-dev-server](https://github.com/webpack/webpack-dev-server), [html-webpack-plugin](https://github.com/ampedandwired/html-webpack-plugin) and [style-loader](https://github.com/webpack/style-loader)
+* [webpack](https://webpack.js.org/) with [webpack-dev-server](https://github.com/webpack/webpack-dev-server), [html-webpack-plugin](https://github.com/ampedandwired/html-webpack-plugin) and [style-loader](https://github.com/webpack/style-loader)
 * [Babel](http://babeljs.io/) with ES6 and extensions used by Facebook (JSX, [object spread](https://github.com/sebmarkbage/ecmascript-rest-spread/commits/master), [class properties](https://github.com/jeffmo/es-class-public-fields))
 * [Autoprefixer](https://github.com/postcss/autoprefixer)
 * [ESLint](http://eslint.org/)
@@ -248,5 +248,5 @@ Notable alternatives also include:
 * [dev-toolkit](https://github.com/stoikerty/dev-toolkit)
 * [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>
+You can also use module bundlers like [webpack](http://webpack.js.org) and [Browserify](http://browserify.org/) directly.<br>
 React documentation includes [a walkthrough](https://facebook.github.io/react/docs/package-management.html) on this topic.

From 054778f4dbae58a875fb44385f1a578fba49b578 Mon Sep 17 00:00:00 2001
From: Glenn Reyes <glenn@glennreyes.com>
Date: Wed, 7 Jun 2017 16:44:46 +0200
Subject: [PATCH 07/10] chore(templates): Move GitHub templates to hidden
 .github folder (#2489)

---
 ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md               | 0
 PULL_REQUEST_TEMPLATE.md => .github/PULL_REQUEST_TEMPLATE.md | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md (100%)
 rename PULL_REQUEST_TEMPLATE.md => .github/PULL_REQUEST_TEMPLATE.md (100%)

diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE.md
diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md

From cccd855fc84e3342c9539dff0150dd1c648746e6 Mon Sep 17 00:00:00 2001
From: Alexandre Nicastro <kryndex@gmail.com>
Date: Thu, 8 Jun 2017 03:41:29 -0300
Subject: [PATCH 08/10] Fix minor docs typo (#2500)

---
 packages/react-scripts/template/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 955026ac0fc..a794c615c1f 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -1082,7 +1082,7 @@ The watcher includes an interactive command-line interface with the ability to r
 
 ### Version Control Integration
 
-By default, when you run `npm test`, Jest will only run the tests related to files changed since the last commit. This is an optimization designed to make your tests runs fast regardless of how many tests you have. However it assumes that you don’t often commit the code that doesn’t pass the tests.
+By default, when you run `npm test`, Jest will only run the tests related to files changed since the last commit. This is an optimization designed to make your tests run fast regardless of how many tests you have. However it assumes that you don’t often commit the code that doesn’t pass the tests.
 
 Jest will always explicitly mention that it only ran tests related to the files changed since the last commit. You can also press `a` in the watch mode to force Jest to run all tests.
 

From 9b3cf2f57dae310d077b9f3da6a57691b3a4605b Mon Sep 17 00:00:00 2001
From: Michael Shilman <shilman@users.noreply.github.com>
Date: Mon, 12 Jun 2017 15:15:26 +1200
Subject: [PATCH 09/10] Fix link to Storybook docs (#2521)

---
 packages/react-scripts/template/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index a794c615c1f..6439e9dbd8f 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -1359,7 +1359,7 @@ Learn more about React Storybook:
 
 * Screencast: [Getting Started with React Storybook](https://egghead.io/lessons/react-getting-started-with-react-storybook)
 * [GitHub Repo](https://github.com/storybooks/storybook)
-* [Documentation](https://storybook.js.org/docs/react-storybook/basics/introduction/)
+* [Documentation](https://storybook.js.org/basics/introduction/)
 * [Snapshot Testing UI](https://github.com/storybooks/storybook/tree/master/addons/storyshots) with Storybook + addon/storyshot
 
 ## Making a Progressive Web App

From 67f6163b0d86a2980fbaba5ec931fa27abad2f99 Mon Sep 17 00:00:00 2001
From: Khang Lu <lulephuckhang@gmail.com>
Date: Tue, 13 Jun 2017 03:19:12 +1000
Subject: [PATCH 10/10] Simplify flow init docs (#2522)

- Call `npm run flow --init` won't create a .flowconfig file, it should be `npm run flow init`
---
 packages/react-scripts/template/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 6439e9dbd8f..de8e5b44ab8 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -690,7 +690,7 @@ To add Flow to a Create React App project, follow these steps:
 
 1. Run `npm install --save-dev flow-bin` (or `yarn add --dev flow-bin`).
 2. Add `"flow": "flow"` to the `scripts` section of your `package.json`.
-3. Run `npm run flow -- init` (or `yarn flow -- init`) to create a [`.flowconfig` file](https://flowtype.org/docs/advanced-configuration.html) in the root directory.
+3. Run `npm run flow init` (or `yarn flow init`) to create a [`.flowconfig` file](https://flowtype.org/docs/advanced-configuration.html) in the root directory.
 4. Add `// @flow` to any files you want to type check (for example, to `src/App.js`).
 
 Now you can run `npm run flow` (or `yarn flow`) to check the files for type errors.