Update Upstream

.eslintignore

@@ -3,3 +3,4 @@ build
 my-app*
 packages/react-scripts/template
 packages/react-scripts/fixtures
+fixtures/

.eslintrc

@@ -7,7 +7,7 @@
     "es6": true
   },
   "parserOptions": {
-    "ecmaVersion": 6
+    "ecmaVersion": 2018
   },
   "rules": {
     "no-console": "off",

.github/ISSUE_TEMPLATE.md

@@ -85,19 +85,18 @@
 ### Environment
 
 <!--
-  Please fill in all the relevant fields by running these commands in terminal.
--->
+  To help identify if a problem is specific to a platform, browser, or module version, information about your environment is required.
+  This enables the maintainers quickly reproduce the issue and give feedback.
 
-1. `node -v`: 
-2. `npm -v`:
-3. `yarn --version` (if you use Yarn):
-4. `npm ls react-scripts` (if you haven’t ejected): 
+  Run the following command in your React app's folder in terminal.
+  Note: The result is copied to your clipboard directly.
 
-Then, specify:
+  `npx create-react-app --info`
 
-1. Operating system:
-2. Browser and version (if relevant):
+  Paste the output of the command in the section below.
+-->
 
+(paste the output of the command here)
 
 ### Steps to Reproduce
 

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "trailingComma": "es5",
+  "singleQuote": true,
+  "semi": true
+}

.travis.yml

@@ -3,28 +3,33 @@ dist: trusty
 language: node_js
 node_js:
   - 8
-  - 9
+  - 10
 cache:
+  yarn: true
   directories:
-  - node_modules
-  - packages/create-react-app/node_modules
-  - packages/react-scripts/node_modules
+    - .npm
+before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
+  - export PATH="$HOME/.yarn/bin:$PATH"
 install: true
 script:
- - 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
- - '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'
+  - 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
+  - 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
+  - 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
+  - 'if [ $TEST_SUITE = "kitchensink-eject" ]; then tasks/e2e-kitchensink-eject.sh; fi'
+  - 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
+  - 'if [ $TEST_SUITE = "behavior" ]; then tasks/e2e-behavior.sh; fi'
 env:
   matrix:
     - TEST_SUITE=simple
     - TEST_SUITE=installs
     - TEST_SUITE=kitchensink
-    - TEST_SUITE=monorepos
+    - TEST_SUITE=kitchensink-eject
+    - TEST_SUITE=behavior
 matrix:
   include:
-    - node_js: 0.10
+    - os: osx
+      node_js: 8
+      env: TEST_SUITE=behavior
+    - node_js: 4
       env: TEST_SUITE=old-node
-    - node_js: 6
-      env: TEST_SUITE=kitchensink

CHANGELOG.md

@@ -1,3 +1,35 @@
+## 2.0.2 (October 1, 2018)
+
+TODO (work in progress)
+
+## 1.1.5 (August 24, 2018)
+
+* `react-scripts`
+
+  * Update the `webpack-dev-server` dependency
+
+* `react-dev-utils`
+
+  * [#4866](https://github.com/facebook/create-react-app/pull/4866) Fix a Windows-only vulnerability (`CVE-2018-6342`) in the development server ([@acdlite](https://github.com/acdlite))
+  * Update the `sockjs-client` dependency
+
+#### Committers: 1
+- Andrew Clark ([acdlite](https://github.com/acdlite))
+
+### Migrating from 1.1.4 to 1.1.5
+
+Inside any created project that has not been ejected, run:
+
+```
+npm install --save --save-exact react-scripts@1.1.5
+```
+
+or
+
+```
+yarn add --exact react-scripts@1.1.5
+```
+
 ## 1.1.4 (April 3, 2018)
 
 #### :bug: Bug Fix

CODE_OF_CONDUCT.md

@@ -1,3 +1,3 @@
 # Code of Conduct
 
-Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.facebook.com/pages/876921332402685/open-source-code-of-conduct) so that you can understand what actions will and will not be tolerated.
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.fb.com/codeofconduct/) so that you can understand what actions will and will not be tolerated.

CONTRIBUTING.md

@@ -57,7 +57,7 @@ packages/
 ### Package Descriptions
 #### [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>
+It targets platforms that React is designed to support (IE 11+) 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/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+.

README.md

@@ -36,14 +36,30 @@ Just create a project, and you’re good to go.
 
 **You’ll need to have Node >= 6 on your local development machine** (but it’s not required on the server). You can use [nvm](https://github.com/creationix/nvm#installation) (macOS/Linux) or [nvm-windows](https://github.com/coreybutler/nvm-windows#node-version-manager-nvm-for-windows) to easily switch Node versions between different projects.
 
-To create a new app, run a single command:
+To create a new app, you may choose one of the following methods:
+
+### npx
 
 ```sh
 npx create-react-app my-app
 ```
 
 *([npx](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b) comes with npm 5.2+ and higher, see [instructions for older npm versions](https://gist.github.com/gaearon/4064d3c23a77c74a3614c498a8bb1c5f))*
 
+### npm
+
+```sh
+npm init react-app my-app
+```
+*`npm init <initializer>` is available in npm 6+*
+
+### Yarn
+
+```sh
+yarn create react-app my-app
+```
+*`yarn create` is available in Yarn 0.25+*
+
 It will create a directory called `my-app` inside the current folder.<br>
 Inside that directory, it will generate the initial project structure and install the transitive dependencies:
 
@@ -54,16 +70,16 @@ my-app
 ├── package.json
 ├── .gitignore
 ├── public
-│   └── favicon.ico
-│   └── index.html
+│   ├── favicon.ico
+│   ├── index.html
 │   └── manifest.json
 └── src
-    └── App.css
-    └── App.js
-    └── App.test.js
-    └── index.css
-    └── index.js
-    └── logo.svg
+    ├── App.css
+    ├── App.js
+    ├── App.test.js
+    ├── index.css
+    ├── index.js
+    ├── logo.svg
     └── registerServiceWorker.js
 ```
 
@@ -101,7 +117,6 @@ 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>
-By default, it also [includes a service worker](https://github.com/facebook/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.
 
@@ -147,7 +162,7 @@ The [User Guide](https://github.com/facebook/create-react-app/blob/master/packag
 - [Analyzing the Bundle Size](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#analyzing-the-bundle-size)
 - [Deployment](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#deployment)
 - [Advanced Configuration](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#advanced-configuration)
-- [Troubleshooting](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#troubleshooting)
+- [Troubleshooting](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#troubleshooting-1)
 
 A copy of the user guide will be created as `README.md` in your project folder.
 
@@ -173,7 +188,7 @@ Your environment will have everything you need to build a modern single-page Rea
 * A fast interactive unit test runner with built-in support for coverage reporting.
 * A live development server that warns about common mistakes.
 * A build script to bundle JS, CSS, and images for production, with hashes and 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/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app) criteria.
+* 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/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app) criteria. (*Note: Using the service worker is opt-in as of `react-scripts@2.0.0` and higher*)
 * Hassle-free updates for the above tools with a single dependency.
 
 Check out [this guide](https://github.com/nitishdayal/cra_closer_look) for an overview of how these tools fit together.
@@ -202,6 +217,8 @@ Here’s a few common cases where you might want to try something else:
 
 * If you want to use **TypeScript**, consider using [create-react-app-typescript](https://github.com/wmonk/create-react-app-typescript).
 
+* If you want to use **Parcel** instead of **Webpack** as your bundler, consider using [create-react-app-parcel](https://github.com/sw-yx/create-react-app-parcel).
+
 * Finally, if you need **more customization**, check out [Neutrino](https://neutrino.js.org/) and its [React preset](https://neutrino.js.org/packages/react/).
 
 All of the above tools can work with little to no configuration.

appveyor.cleanup-cache.txt

@@ -2,5 +2,3 @@ Edit this file to trigger a cache rebuild.
 http://help.appveyor.com/discussions/questions/1310-delete-cache
 
 ----
-
-bump

appveyor.yml

@@ -1,37 +1,44 @@
 image: Visual Studio 2017
 
 environment:
+  APPVEYOR_SAVE_CACHE_ON_ERROR: true
+  APPVEYOR_BUILD_WORKER_CLOUD: 'GCE'
   matrix:
+    - nodejs_version: 10
+      test_suite: 'simple'
+    - nodejs_version: 10
+      test_suite: 'installs'
+    - nodejs_version: 10
+      test_suite: 'kitchensink'
+    - nodejs_version: 10
+      test_suite: 'kitchensink-eject'
     - nodejs_version: 8
-      test_suite: "simple"
+      test_suite: 'simple'
     - nodejs_version: 8
-      test_suite: "installs"
+      test_suite: 'installs'
     - nodejs_version: 8
-      test_suite: "kitchensink"
+      test_suite: 'kitchensink'
     - nodejs_version: 8
-      test_suite: "monorepos"
-    - nodejs_version: 6
-      test_suite: "simple"
-    - nodejs_version: 6
-      test_suite: "installs"
-    - nodejs_version: 6
-      test_suite: "kitchensink"
-    - nodejs_version: 6
-      test_suite: "monorepos"
+      test_suite: 'kitchensink-eject'
 cache:
-  - node_modules -> appveyor.cleanup-cache.txt
-  - packages\react-scripts\node_modules -> appveyor.cleanup-cache.txt
+  - '%APPDATA%\npm-cache -> appveyor.cleanup-cache.txt'
+  - '%LOCALAPPDATA%\Yarn\Cache -> appveyor.cleanup-cache.txt'
 
 clone_depth: 50
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - test_suite: 'installs'
 
 platform:
   - x64
 
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
+  - ps: |
+      (New-Object Net.WebClient).DownloadFile("https://nightly.yarnpkg.com/latest.msi", "$env:temp\yarn.msi")
+      cmd /c start /wait msiexec.exe /i $env:temp\yarn.msi /quiet /qn /norestart
 
 build: off
 
@@ -42,4 +49,6 @@ skip_commits:
 test_script:
   - node --version
   - npm --version
+  - yarn --version
+  - yarn cache dir
   - bash tasks/e2e-%test_suite%.sh

fixtures/output/jest.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  testEnvironment: 'node',
+  testMatch: ['**/*.test.js'],
+  setupTestFrameworkScriptFile: './setupOutputTests.js',
+};

fixtures/output/setupOutputTests.js

@@ -0,0 +1,6 @@
+beforeAll(() => {
+  jest.setTimeout(1000 * 60 * 5);
+});
+beforeEach(() => {
+  jest.setTimeout(1000 * 60 * 5);
+});