Merge changes from upstream v.1.1.1

CHANGELOG.md

@@ -1,3 +1,43 @@
+## 1.1.1 (February 2, 2018)
+
+#### :bug: Bug Fix
+* `react-scripts`
+  * [#4000](https://github.com/facebook/create-react-app/pull/4000) Fix escaping `$` in environment variables. ([@iansu](https://github.com/iansu))
+
+#### :nail_care: Enhancement
+* `react-scripts`
+  * [#4006](https://github.com/facebook/create-react-app/pull/4006) Add Node 9 compatibility for `fsevents`. ([@gaearon](https://github.com/gaearon))
+
+#### :memo: Documentation
+* `react-scripts`
+  * [#3971](https://github.com/facebook/create-react-app/pull/3971) Update instructions for continuous delivery with Netlify. ([@hubgit](https://github.com/hubgit))
+  * [#3894](https://github.com/facebook/create-react-app/pull/3894) Include `{json,css}` files in prettier command. ([@reyronald](https://github.com/reyronald))
+
+#### :house: Internal
+* `create-react-app`
+  * [#3853](https://github.com/facebook/create-react-app/pull/3853) pin envinfo version to 3.4.2. ([@bondz](https://github.com/bondz))
+
+#### Committers: 6
+- Alf Eaton ([hubgit](https://github.com/hubgit))
+- Bond ([bondz](https://github.com/bondz))
+- Dan Abramov ([gaearon](https://github.com/gaearon))
+- Ian Sutherland ([iansu](https://github.com/iansu))
+- Ronald Rey ([reyronald](https://github.com/reyronald))
+
+### Migrating from 1.1.0 to 1.1.1
+
+Inside any created project that has not been ejected, run:
+
+```
+npm install --save --save-exact [email protected]
+```
+
+or
+
+```
+yarn add --exact [email protected]
+```
+
 ## 1.1.0 (January 15, 2018)
 
 #### :rocket: New Feature

packages/create-react-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-react-app",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "keywords": [
     "react"
   ],
@@ -24,7 +24,7 @@
     "chalk": "^1.1.1",
     "commander": "^2.9.0",
     "cross-spawn": "^4.0.0",
-    "envinfo": "^3.8.0",
+    "envinfo": "3.4.2",
     "fs-extra": "^1.0.0",
     "hyperquest": "^2.1.2",
     "semver": "^5.0.3",

packages/react-scripts/package.json

@@ -35,7 +35,7 @@
     "chalk": "1.1.3",
     "css-loader": "0.28.7",
     "dotenv": "4.0.0",
-    "dotenv-expand": "4.0.1",
+    "dotenv-expand": "4.2.0",
     "eslint": "~4.15.0",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-import-resolver-webpack": "^0.8.1",
@@ -80,6 +80,6 @@
     "normalize.css": "^7.0.0"
   },
   "optionalDependencies": {
-    "fsevents": "1.1.2"
+    "fsevents": "^1.1.3"
   }
 }

packages/react-scripts/template/README.md

@@ -348,7 +348,7 @@ Next we add a 'lint-staged' field to the `package.json`, for example:
   "scripts": {
 ```
 
-Now, whenever you make a commit, Prettier will format the changed files automatically. You can also run `./node_modules/.bin/prettier --single-quote --write "src/**/*.{js,jsx}"` to format your entire project for the first time.
+Now, whenever you make a commit, Prettier will format the changed files automatically. You can also run `./node_modules/.bin/prettier --single-quote --write "src/**/*.{js,jsx,json,css}"` to format your entire project for the first time.
 
 Next you might want to integrate Prettier in your favorite editor. Read the section on [Editor Integration](https://prettier.io/docs/en/editors.html) on the Prettier GitHub page.
 
@@ -2264,7 +2264,8 @@ With this setup Netlify will build and deploy when you push to git or open a pul
 
 1. [Start a new netlify project](https://app.netlify.com/signup)
 2. Pick your Git hosting service and select your repository
-3. Click `Build your site`
+3. Set `yarn build` as the build command and `build` as the publish directory
+4. Click `Deploy site`
 
 **Support for client-side routing:**