Merge branch 'master' into master

Author: gaearon

appveyor.cleanup-cache.txt

@@ -0,0 +1,6 @@
+Edit this file to trigger a cache rebuild.
+http://help.appveyor.com/discussions/questions/1310-delete-cache
+
+----
+Just testing if this works.
+Hello, world.

appveyor.yml

@@ -14,8 +14,8 @@ environment:
       test_suite: "kitchensink"
 
 cache:
-  - node_modules
-  - packages\react-scripts\node_modules
+  - node_modules -> appveyor.cleanup-cache.txt
+  - packages\react-scripts\node_modules -> appveyor.cleanup-cache.txt
 
 clone_depth: 50
 

package.json

@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "babel-eslint": "7.1.0",
-    "eslint": "3.8.1",
+    "eslint": "3.16.1",
     "eslint-config-react-app": "0.5.1",
     "eslint-plugin-flowtype": "2.21.0",
     "eslint-plugin-import": "2.0.1",

packages/eslint-config-react-app/README.md

@@ -17,7 +17,7 @@ If you want to use this ESLint configuration in a project not built with Create
 First, install this package, ESLint and the necessary plugins.
 
   ```sh
-  npm install --save-dev eslint-config-react-app [email protected] eslint@3.8.1 [email protected] [email protected] [email protected] [email protected]
+  npm install --save-dev eslint-config-react-app [email protected] eslint@3.16.1 [email protected] [email protected] [email protected] [email protected]
   ```
 
 Then create a file named `.eslintrc` with following contents in the root folder of your project:

packages/eslint-config-react-app/index.js

@@ -134,7 +134,8 @@ module.exports = {
     'no-unused-vars': ['warn', {
       vars: 'local',
       varsIgnorePattern: '^_',
-      args: 'none'
+      args: 'none',
+      ignoreRestSiblings: true,
     }],
     'no-use-before-define': ['warn', 'nofunc'],
     'no-useless-computed-key': 'warn',

packages/eslint-config-react-app/package.json

@@ -12,7 +12,7 @@
   ],
   "peerDependencies": {
     "babel-eslint": "^7.0.0",
-    "eslint": "^3.8.1",
+    "eslint": "^3.16.1",
     "eslint-plugin-flowtype": "^2.21.0",
     "eslint-plugin-import": "^2.0.1",
     "eslint-plugin-jsx-a11y": "^2.2.3",

packages/react-dev-utils/openBrowser.js

@@ -17,7 +17,7 @@ function openBrowser(url) {
   // Attempt to honor this environment variable.
   // It is specific to the operating system.
   // See https://github.com/sindresorhus/opn#app for documentation.
-  const browser = process.env.BROWSER;
+  let browser = process.env.BROWSER;
 
   // Special case: BROWSER="none" will prevent opening completely.
   if (browser === 'none') {
@@ -50,6 +50,14 @@ function openBrowser(url) {
     }
   }
 
+  // Another special case: on OS X, check if BROWSER has been set to "open".
+  // In this case, instead of passing `open` to `opn` (which won't work),
+  // just ignore it (thus ensuring the intended behavior, i.e. opening the system browser):
+  // https://github.com/facebookincubator/create-react-app/pull/1690#issuecomment-283518768
+  if (process.platform === 'darwin' && browser === 'open') {
+    browser = undefined;
+  }
+  
   // Fallback to opn
   // (It will always open new tab)
   try {

packages/react-scripts/package.json

@@ -37,7 +37,7 @@
     "css-loader": "0.26.1",
     "detect-port": "1.0.1",
     "dotenv": "2.0.0",
-    "eslint": "3.8.1",
+    "eslint": "3.16.1",
     "eslint-config-react-app": "^0.5.2",
     "eslint-loader": "1.6.3",
     "eslint-plugin-flowtype": "2.21.0",

packages/react-scripts/template/README.md

@@ -1250,6 +1250,17 @@ This is because when there is a fresh page load for a `/todos/42`, the server lo
  });
 ```
 
+If you’re using [Apache](https://httpd.apache.org/), you need to create a `.htaccess` file in the `public` folder that looks like this:
+
+```
+    Options -MultiViews
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ index.html [QSA,L]
+```
+
+It will get copied to the `build` folder when you run `npm run build`.
+
 Now requests to `/todos/42` will be handled correctly both in development and in production.
 
 ### Building for Relative Paths
@@ -1478,7 +1489,27 @@ When you build the project, Create React App will place the `public` folder cont
 
 ### Now
 
-See [this example](https://github.com/xkawi/create-react-app-now) for a zero-configuration single-command deployment with [now](https://zeit.co/now).
+[now](https://zeit.co/now) offers a zero-configuration single-command deployment.
+
+1. Install the `now` command-line tool either via the recommended [desktop tool](https://zeit.co/download) or via node with `npm install -g now`.
+
+2. Install `serve` by running `npm install --save serve`.
+
+3. Add this line to `scripts` in `package.json`:
+    
+    ```
+    "now-start": "serve build/",
+    ```
+    
+4. Run `now` from your project directory. You will see a **now.sh** URL in your output like this:
+    
+    ```
+    > Ready! https://your-project-dirname-tpspyhtdtk.now.sh (copied to clipboard)
+    ```
+    
+    Paste that URL into your browser when the build is complete, and you will see your deployed app.
+
+Details are available in [this article.](https://zeit.co/blog/now-static)
 
 ### S3 and CloudFront
 

tasks/cra.sh

@@ -52,7 +52,7 @@ root_path=$PWD
 # ******************************************************************************
 
 # Install all our packages
-$root_path/node_modules/.bin/lerna bootstrap
+"$root_path"/node_modules/.bin/lerna bootstrap
 
 cd packages/react-scripts
 
@@ -61,10 +61,10 @@ cp package.json package.json.orig
 
 # Replace own dependencies (those in the `packages` dir) with the local paths
 # of those packages.
-node $root_path/tasks/replace-own-deps.js
+node "$root_path"/tasks/replace-own-deps.js
 
 # Finally, pack react-scripts
-scripts_path=$root_path/packages/react-scripts/`npm pack`
+scripts_path="$root_path"/packages/react-scripts/`npm pack`
 
 # Restore package.json
 rm package.json
@@ -79,8 +79,8 @@ mv package.json.orig package.json
 yarn cache clean || true
 
 # Go back to the root directory and run the command from here
-cd $root_path
-node packages/create-react-app/index.js --scripts-version=$scripts_path "$@"
+cd "$root_path"
+node packages/create-react-app/index.js --scripts-version="$scripts_path" "$@"
 
 # Cleanup
 cleanup