Merge pull request #1 from tvalentius/update-upstream

Update upstream

Author: tvalentius

packages/create-react-app/package.json

@@ -25,7 +25,7 @@
     "commander": "^2.9.0",
     "cross-spawn": "^4.0.0",
     "envinfo": "3.4.2",
-    "fs-extra": "^5.0.0",
+    "fs-extra": "^1.0.0",
     "hyperquest": "^2.1.2",
     "semver": "^5.0.3",
     "tar-pack": "^3.4.0",

packages/react-scripts/config/webpack.config.prod.js

@@ -421,6 +421,7 @@ module.exports = {
     // having to parse `index.html`.
     new ManifestPlugin({
       fileName: 'asset-manifest.json',
+      publicPath: publicPath
     }),
     // Generate a service worker script that will precache, and keep up to date,
     // the HTML & assets that are part of the Webpack build.

packages/react-scripts/template/README.md

@@ -350,7 +350,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.