Merge branch 'next' into update-upstream

Author: tvalentius

.github/ISSUE_TEMPLATE.md

@@ -24,47 +24,56 @@
     You can find webpack docs at https://webpack.js.org/.
 -->
 
-
-### Can you also reproduce the problem with npm 4.x?
+### Did you try recovering your dependencies?
 
 <!--
-  Many errors, especially related to "missing modules", are due to npm bugs.
-  Which version of npm are you running? You can find out by checking:
-
-    npm -v
+  Your module tree might be corrupted, and that might be causing the issues.
+  Let's try to recover it. First, delete these files and folders in your project:
 
-  If it is 5.x, please be aware that it has more than 50 known bugs, and
-  is not guaranteed to work with Create React App.
+    * node_modules
+    * package-lock.json
+    * yarn.lock
 
-  If it's not starting with 4, try to install npm 4.x:
+  Then you need to decide which package manager you prefer to use.
+  We support both npm (https://npmjs.com) and yarn (http://yarnpkg.com/).
+  However, **they can't be used together in one project** so you need to pick one.
+  
+  If you decided to use npm, run this in your project directory:
 
-    npm install -g npm@4
-    cd your_project_directory
-    rm -rf node_modules
-    npm cache clear
+    npm install -g npm@latest
     npm install
 
-  Then try to reproduce the issue again.
-  Can you still reproduce it?
+  This should fix your project.
+  
+  If you decided to use yarn, update it first (https://yarnpkg.com/en/docs/install).
+  Then run in your project directory:
+
+    yarn
+
+  This should fix your project.
 
-  Note: Please try this even if you are using Yarn so that we know whether it's a Yarn-only bug.
+  Importantly, **if you decided to use yarn, you should never run `npm install` in the project**.
+  For example, yarn users should run `yarn add <library>` instead of `npm install <library>`.
+  Otherwise your project will break again.
+
+  Have you done all these steps and still see the issue?
+  Please paste the output of `npm --version` and/or `yarn --version` to confirm.
 -->
 
 (Write your answer here.)
 
-
 ### Which terms did you search for in User Guide?
 
 <!--
   There are a few common documented problems, such as watcher not detecting changes, or build failing.
   They are described in the Troubleshooting section of the User Guide:
 
-  https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#troubleshooting
+  https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#troubleshooting
 
   Please scan these few sections for common problems.
   Additionally, you can search the User Guide itself for something you're having issues with:
   
-  https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md
+  https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md
   
   If you didn't find the solution, please share which words you searched for.
   This helps us improve documentation for future readers who might encounter the same problem.

.travis.yml

@@ -15,11 +15,13 @@ script:
  - 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
  - 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
  - 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
+ - 'if [ $TEST_SUITE = "monorepos" ]; then tasks/e2e-monorepos.sh; fi'
 env:
   matrix:
     - TEST_SUITE=simple
     - TEST_SUITE=installs
     - TEST_SUITE=kitchensink
+    - TEST_SUITE=monorepos
 matrix:
   include:
     - node_js: 0.10

CHANGELOG-0.x.md

@@ -43,7 +43,7 @@ Please also provide a **test plan**, i.e. specify how you verified that your add
 
 ## 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.
+These packages can be found in the [`packages/`](https://github.com/facebook/create-react-app/tree/master/packages) directory.
 
 ### Overview of directory structure
 ```
@@ -55,25 +55,25 @@ packages/
   react-scripts/
 ```
 ### Package Descriptions
-#### [babel-preset-react-app](https://github.com/facebookincubator/create-react-app/tree/master/packages/babel-preset-react-app)
+#### [babel-preset-react-app](https://github.com/facebook/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)
+#### [create-react-app](https://github.com/facebook/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)
+#### [eslint-config-react-app](https://github.com/facebook/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)
+#### [react-dev-utils](https://github.com/facebook/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)
+#### [react-scripts](https://github.com/facebook/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`
+1. Clone the repo with `git clone https://github.com/facebook/create-react-app`
 
 2. Run `yarn` in the root `create-react-app` folder.
 
@@ -111,7 +111,7 @@ By default git would use `CRLF` line endings which would cause the scripts to fa
 
 ## 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.
+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/facebook/create-react-app/labels) named `tag: ...` to indicate what kind of change it is.
 2. Close the milestone.
 3. In most releases, only `react-scripts` needs to be released. If you don’t have any changes to the `packages/create-react-app` folder, you don’t need to bump its version or publish it (the publish script will publish only changed packages).
 4. Note that files in `packages/create-react-app` should be modified with extreme caution. Since it’s a global CLI, any version of `create-react-app` (global CLI) including very old ones should work with the latest version of `react-scripts`.