Merge branch 'master' into next

Author: taion

.travis.yml

@@ -6,9 +6,9 @@ cache:
   directories:
   - node_modules
 before_install:
-  - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+- export CHROME_BIN=chromium-browser
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
 after_success:
 - cat ./coverage/lcov.info | ./node_modules/codecov.io/bin/codecov.io.js
 - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

CHANGES.md

@@ -14,6 +14,17 @@
 [#3446]: https://github.com/reactjs/react-router/pull/3446
 
 
+## [v2.6.0]
+> Jul 18, 2016
+
+- **Feature:** Add `prevState` as argument to `onLeave` hooks ([#3616])
+- **Bugfix:** Fix when the `<Link>` `onClick` invariant runs ([#3636])
+
+[v2.6.0]: https://github.com/reactjs/react-router/compare/v2.5.2...v2.6.0
+[#3616]: https://github.com/reactjs/react-router/pull/3616
+[#3636]: https://github.com/reactjs/react-router/pull/3636
+
+
 ## [v2.5.2]
 > Jul 1, 2016
 

docs/API.md

@@ -94,7 +94,7 @@ A `<Link>` can know when the route it links to is active and automatically apply
 
 #### Props
 ##### `to`
-A [location descriptor](https://github.com/ReactJSTraining/history/blob/master/docs/Glossary.md#locationdescriptor). Usually this is a string or an object, with the following semantics:
+A [location descriptor](https://github.com/ReactTraining/history/blob/master/docs/Glossary.md#locationdescriptor). Usually this is a string or an object, with the following semantics:
 
 * If it's a string it represents the absolute path to link to, e.g. `/users/123` (relative paths are not supported).
 * If it's an object it can have four keys:
@@ -591,9 +591,9 @@ For more details, please see the [histories guide](/docs/guides/Histories.md).
 `useRouterHistory` is a `history` enhancer that configures a given `createHistory` factory to work with React Router. This allows using custom histories in addition to the bundled singleton histories.
 
 It also pre-enhances the history with the
-[useQueries](https://github.com/ReactJSTraining/history/blob/master/docs/QuerySupport.md)
+[useQueries](https://github.com/ReactTraining/history/blob/master/docs/QuerySupport.md)
 and
-[useBasename](https://github.com/ReactJSTraining/history/blob/master/docs/BasenameSupport.md)
+[useBasename](https://github.com/ReactTraining/history/blob/master/docs/BasenameSupport.md)
 enhancers from `history`
 
 #### Example

docs/guides/Histories.md

@@ -139,11 +139,11 @@ render(
 
 If you'd like to further customize the history options or use other
 enhancers from
-[history](https://github.com/ReactJSTraining/history/) you can use
+[history](https://github.com/ReactTraining/history/) you can use
 `useRouterHistory`.
 
 Be aware that `useRouterHistory` already pre-enhances your history
-factory with the [useQueries](https://github.com/ReactJSTraining/history/blob/master/docs/QuerySupport.md) and [useBasename](https://github.com/ReactJSTraining/history/blob/master/docs/BasenameSupport.md) enhancers from `history`.
+factory with the [useQueries](https://github.com/ReactTraining/history/blob/master/docs/QuerySupport.md) and [useBasename](https://github.com/ReactTraining/history/blob/master/docs/BasenameSupport.md) enhancers from `history`.
 
 ### Examples:
 

karma.conf.js

@@ -1,12 +1,11 @@
-/*eslint no-console: 0*/
-var webpack = require('webpack')
-var path = require('path')
+const webpack = require('webpack')
+const path = require('path')
 
-module.exports = function (config) {
+module.exports = config => {
   if (process.env.RELEASE)
     config.singleRun = true
 
-  var customLaunchers = {
+  const customLaunchers = {
     // Browsers to run on BrowserStack.
     BS_Chrome: {
       base: 'BrowserStack',
@@ -29,14 +28,14 @@ module.exports = function (config) {
       browser: 'safari',
       browser_version: '9.0'
     },
-    BS_MobileSafari: {
+    BS_MobileSafari8: {
       base: 'BrowserStack',
       os: 'ios',
       os_version: '8.3',
       browser: 'iphone',
       real_mobile: false
     },
-    BS_MobileSafari: {
+    BS_MobileSafari9: {
       base: 'BrowserStack',
       os: 'ios',
       os_version: '9.1',
@@ -65,29 +64,12 @@ module.exports = function (config) {
     }
   }
 
-  var isCi = process.env.CONTINUOUS_INTEGRATION === 'true'
-  var runCoverage = process.env.COVERAGE === 'true' || isCi
-
-  var coverageLoaders = []
-  var coverageReporters = []
-
-  if (runCoverage) {
-    coverageLoaders.push({
-      test: /\.js$/,
-      include: path.resolve('modules/'),
-      exclude: /__tests__/,
-      loader: 'isparta'
-    })
-
-    coverageReporters.push('coverage')
-  }
-
   config.set({
     customLaunchers: customLaunchers,
 
     browsers: [ 'Chrome' ],
     frameworks: [ 'mocha' ],
-    reporters: [ 'mocha' ].concat(coverageReporters),
+    reporters: [ 'mocha', 'coverage' ],
 
     files: [
       'tests.webpack.js'
@@ -98,11 +80,17 @@ module.exports = function (config) {
     },
 
     webpack: {
-      devtool: 'inline-source-map',
+      devtool: 'cheap-module-inline-source-map',
       module: {
         loaders: [
-          { test: /\.js$/, exclude: /node_modules/, loader: 'babel' }
-        ].concat(coverageLoaders)
+          { test: /\.js$/, exclude: /node_modules/, loader: 'babel' },
+          {
+            test: /\.js$/,
+            include: path.resolve('modules/'),
+            exclude: /__tests__/,
+            loader: 'isparta'
+          }
+        ]
       },
       plugins: [
         new webpack.DefinePlugin({
@@ -132,7 +120,7 @@ module.exports = function (config) {
     config.captureTimeout = 120000
 
     if (process.env.TRAVIS) {
-      var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'
+      const buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'
 
       config.browserStack = {
         username: process.env.BROWSER_STACK_USERNAME,

modules/Link.js

@@ -68,38 +68,28 @@ const Link = React.createClass({
   },
 
   handleClick(event) {
+    if (this.props.onClick)
+      this.props.onClick(event)
+
+    if (event.defaultPrevented)
+      return
+
     invariant(
       this.context.router,
-      '<Link>s rendered outside of a router context cannot handle clicks.'
+      '<Link>s rendered outside of a router context cannot navigate.'
     )
 
-    let allowTransition = true
-
-    if (this.props.onClick)
-      this.props.onClick(event)
-
     if (isModifiedEvent(event) || !isLeftClickEvent(event))
       return
 
-    if (event.defaultPrevented === true)
-      allowTransition = false
-
-    // If target prop is set (e.g. to "_blank") let browser handle link.
+    // If target prop is set (e.g. to "_blank"), let browser handle link.
     /* istanbul ignore if: untestable with Karma */
-    if (this.props.target) {
-      if (!allowTransition)
-        event.preventDefault()
-
+    if (this.props.target)
       return
-    }
 
     event.preventDefault()
 
-    if (allowTransition) {
-      const { to } = this.props
-
-      this.context.router.push(to)
-    }
+    this.context.router.push(this.props.to)
   },
 
   render() {

modules/__tests__/shouldWarn.js

@@ -1,5 +1,3 @@
-/*eslint no-console: 0*/
-
 export default function shouldWarn(about) {
-  console.error.expected.push(about)
+  console.error.expected.push(about) // eslint-disable-line no-console
 }

package.json

@@ -20,7 +20,7 @@
     "build-es": "rimraf es6 && cross-env BABEL_ENV=es babel ./modules -d es6 --ignore '__tests__'",
     "build-umd": "cross-env BABEL_ENV=cjs NODE_ENV=development webpack modules/index.js umd/ReactRouter.js",
     "build-min": "cross-env BABEL_ENV=cjs NODE_ENV=production webpack -p modules/index.js umd/ReactRouter.min.js",
-    "lint": "eslint modules examples",
+    "lint": "eslint modules examples *.js",
     "start": "cross-env BABEL_ENV=cjs node examples/server.js",
     "test": "npm run lint && npm run test-node && npm run test-browser",
     "test-browser": "cross-env BABEL_ENV=cjs karma start",
@@ -44,7 +44,7 @@
   "devDependencies": {
     "babel-cli": "^6.10.1",
     "babel-core": "^6.10.4",
-    "babel-eslint": "^6.1.0",
+    "babel-eslint": "^6.1.2",
     "babel-loader": "^6.2.4",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-dev-expression": "^0.2.1",
@@ -56,33 +56,33 @@
     "babel-register": "^6.9.0",
     "bundle-loader": "^0.5.4",
     "codecov.io": "^0.1.6",
-    "coveralls": "^2.11.9",
-    "cross-env": "^1.0.8",
+    "coveralls": "^2.11.11",
+    "cross-env": "^2.0.0",
     "css-loader": "^0.23.1",
-    "eslint": "^3.0.0",
+    "eslint": "^3.0.1",
     "eslint-config-rackt": "^1.1.1",
     "eslint-plugin-react": "^5.2.2",
     "expect": "^1.20.2",
     "express": "^4.14.0",
     "express-urlrewrite": "^1.2.0",
     "gzip-size": "^3.0.0",
     "isparta-loader": "^2.0.0",
-    "karma": "^1.1.0",
+    "karma": "^1.1.1",
     "karma-browserstack-launcher": "^1.0.1",
     "karma-chrome-launcher": "^1.0.1",
-    "karma-coverage": "^1.0.0",
+    "karma-coverage": "^1.1.0",
     "karma-mocha": "^1.1.1",
     "karma-mocha-reporter": "^2.0.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
     "mocha": "^2.5.3",
     "pretty-bytes": "^3.0.1",
     "qs": "^6.2.0",
-    "react": "^15.2.0",
-    "react-addons-css-transition-group": "^15.2.0",
-    "react-addons-test-utils": "^15.2.0",
-    "react-dom": "^15.2.0",
-    "rimraf": "^2.5.2",
+    "react": "^15.2.1",
+    "react-addons-css-transition-group": "^15.2.1",
+    "react-addons-test-utils": "^15.2.1",
+    "react-dom": "^15.2.1",
+    "rimraf": "^2.5.3",
     "style-loader": "^0.13.1",
     "webpack": "^1.13.1",
     "webpack-dev-middleware": "^1.6.1"

tests.webpack.js

@@ -1,18 +1,23 @@
-/* eslint-disable no-console */
 /* eslint-env mocha */
 
 import expect from 'expect'
 
 import { _resetWarned } from './modules/routerWarning'
 
 beforeEach(() => {
+  /* eslint-disable no-console */
   expect.spyOn(console, 'error').andCall(msg => {
-    for (const about of console.error.expected) {
+    let expected = false
+
+    console.error.expected.forEach(about => {
       if (msg.indexOf(about) !== -1) {
         console.error.warned[about] = true
-        return
+        expected = true
       }
-    }
+    })
+
+    if (expected)
+      return
 
     console.error.threw = true
     throw new Error(msg)
@@ -21,18 +26,21 @@ beforeEach(() => {
   console.error.expected = []
   console.error.warned = Object.create(null)
   console.error.threw = false
+  /* eslint-enable no-console */
 })
 
 afterEach(() => {
-  if (!console.error.threw) {
-    console.error.expected.forEach(about => {
-      expect(console.error.warned[about]).toExist(
-        `Missing expected warning: ${about}`
-      )
+  /* eslint-disable no-console */
+  const { threw, expected, warned } = console.error
+  console.error.restore()
+
+  if (!threw) {
+    expected.forEach(about => {
+      expect(warned[about]).toExist(`Missing expected warning: ${about}`)
     })
   }
+  /* eslint-enable no-console */
 
-  console.error.restore()
   _resetWarned()
 })
 

webpack.config.js

@@ -1,4 +1,4 @@
-var webpack = require('webpack')
+const webpack = require('webpack')
 
 module.exports = {