Merge branch 'master' into next

Author: taion

.travis.yml

@@ -10,8 +10,7 @@ before_install:
 - 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
+- node_modules/.bin/codecov
 branches:
   only:
   - master

CHANGES.md

@@ -28,6 +28,15 @@
 [#3446]: https://github.com/reactjs/react-router/pull/3446
 
 
+## [v2.6.1]
+> Jul 29, 2016
+
+- **Bugfix:** Correctly handle routes with patterns that are the names of properties on `Object.prototype` ([#3680])
+
+[v2.6.1]: https://github.com/reactjs/react-router/compare/v2.6.0...v2.6.1
+[#3680]: https://github.com/reactjs/react-router/pull/3680
+
+
 ## [v2.6.0]
 > Jul 18, 2016
 

README.md

@@ -6,7 +6,7 @@ React Router is a complete routing library for [React](https://facebook.github.i
 
 React Router keeps your UI in sync with the URL. It has a simple API with powerful features like lazy code loading, dynamic route matching, and location transition handling built right in. Make the URL your first thought, not an after-thought.
 
-[![Coveralls][coveralls-badge]][coveralls]
+[![Codecov][codecov-badge]][codecov]
 [![Discord][discord-badge]][discord]
 
 > **Important:** *This is the `next` branch of React Router and may contain changes that are not yet released. To see the code for stable releases, browse [the `master` branch](https://github.com/reactjs/react-router/tree/master).*
@@ -39,7 +39,7 @@ Using [npm](https://www.npmjs.com/):
 
 Then with a module bundler like [webpack](https://webpack.github.io/) that supports either CommonJS or ES2015 modules, use as you would anything else:
 
-```js
+```jsx
 // using an ES6 transpiler, like babel
 import { Router, Route, Link } from 'react-router'
 
@@ -59,7 +59,7 @@ You can find the library on `window.ReactRouter`.
 
 ### What's it look like?
 
-```js
+```jsx
 import React from 'react'
 import { render } from 'react-dom'
 import { Router, Route, Link, browserHistory } from 'react-router'
@@ -144,8 +144,8 @@ Also, thanks to [BrowserStack](https://www.browserstack.com/) for providing the
 [npm-badge]: https://img.shields.io/npm/v/react-router.svg?style=flat-square
 [npm]: https://www.npmjs.org/package/react-router
 
-[coveralls-badge]: https://img.shields.io/coveralls/reactjs/react-router/master.svg?style=flat-square
-[coveralls]: https://coveralls.io/github/reactjs/react-router
+[codecov-badge]: https://img.shields.io/codecov/c/github/reactjs/react-router/master.svg?style=flat-square
+[codecov]: https://codecov.io/gh/reactjs/react-router
 
 [discord-badge]: https://img.shields.io/badge/Discord-join%20chat%20%E2%86%92-738bd7.svg?style=flat-square
 [discord]: https://discord.gg/0ZcbPKXt5bYaNQ46

codecov.yml

@@ -0,0 +1 @@
+comment: false

docs/API.md

@@ -46,15 +46,15 @@ Alias for `children`.
 ##### `history`
 The history the router should listen to. Typically `browserHistory` or `hashHistory`.
 
-```js
+```jsx
 import { browserHistory } from 'react-router'
 ReactDOM.render(<Router history={browserHistory} />, el)
 ```
 
 ##### `createElement(Component, props)`
 When the router is ready to render a branch of route components, it will use this function to create the elements. You may want to take control of creating the elements when you're using some sort of data abstraction, like setting up subscriptions to stores, or passing in some sort of application module to each component via props.
 
-```js
+```jsx
 <Router createElement={createElement} />
 
 // default behavior
@@ -123,7 +123,7 @@ You can also pass props you'd like to be on the `<a>` such as a `title`, `id`, `
 #### Example
 Given a route like `<Route path="/users/:userId" />`:
 
-```js
+```jsx
 <Link to={`/users/${user.id}`} activeClassName="active">{user.name}</Link>
 // becomes one of these depending on your History and if the route is
 // active
@@ -155,7 +155,7 @@ Contains data and methods relevant to routing. Most useful for imperatively tran
 ##### `push(pathOrLoc)`
 Transitions to a new URL, adding a new entry in the browser history.
 
-```js
+```jsx
 router.push('/users/12')
 
 // or with a location descriptor object
@@ -225,7 +225,7 @@ If left undefined, the router will try to match the child routes.
 A single component to be rendered when the route matches the URL. It can
 be rendered by the parent route component with `this.props.children`.
 
-```js
+```jsx
 const routes = (
   <Route component={App}>
     <Route path="groups" component={Groups} />
@@ -248,7 +248,7 @@ class App extends React.Component {
 ##### `components`
 Routes can define one or more named components as an object of `[name]: component` pairs to be rendered when the path matches the URL. They can be rendered by the parent route component with `this.props[name]`.
 
-```js
+```jsx
 // Think of it outside the context of the router - if you had pluggable
 // portions of your `render`, you might do it like this:
 // <App main={<Users />} sidebar={<UsersSidebar />} />
@@ -299,7 +299,7 @@ Same as `component` but asynchronous, useful for code-splitting.
 ###### `callback` signature
 `cb(err, component)`
 
-```js
+```jsx
 <Route path="courses/:courseId" getComponent={(nextState, cb) => {
   // do asynchronous stuff to find the components
   cb(null, Course)
@@ -313,7 +313,7 @@ code-splitting.
 ###### `callback` signature
 `cb(err, components)`
 
-```js
+```jsx
 <Route path="courses/:courseId" getComponents={(nextState, cb) => {
   // do asynchronous stuff to find the components
   cb(null, {sidebar: CourseSidebar, content: Course})
@@ -331,7 +331,7 @@ If `callback` is listed as a 3rd argument, this hook will run asynchronously, an
 ###### `callback` signature
 `cb(err)`
 
-```js
+```jsx
 const userIsInATeam = (nextState, replace, callback) => {
   fetch(...)
     .then(response = response.json())
@@ -372,7 +372,7 @@ Same as `childRoutes` but asynchronous and receives `partialNextState`. Useful f
 ###### `callback` signature
 `cb(err, routesArray)`
 
-```js
+```jsx
 let myRoute = {
   path: 'course/:courseId',
   childRoutes: [
@@ -419,7 +419,7 @@ Same as `indexRoute`, but asynchronous and receives `partialNextState`. As with
 ###### `callback` signature
 `cb(err, route)`
 
-```js
+```jsx
 // For example:
 let myIndexRoute = {
   component: MyIndex
@@ -455,7 +455,7 @@ The path you want to redirect to.
 ##### `query`
 By default, the query parameters will just pass through but you can specify them if you need to.
 
-```js
+```jsx
 // Say we want to change from `/profile/123` to `/about/123`
 // and redirect `/get-in-touch` to `/contact`
 <Route component={App}>
@@ -467,7 +467,7 @@ By default, the query parameters will just pass through but you can specify them
 
 Note that the `<Redirect>` can be placed anywhere in the route hierarchy, though [normal precedence](/docs/guides/RouteMatching.md#precedence) rules apply. If you'd prefer the redirects to be next to their respective routes, the `from` path will match the same as a regular route `path`.
 
-```js
+```jsx
 <Route path="course/:courseId">
   <Route path="dashboard" />
   {/* /course/123/home -> /course/123/dashboard */}
@@ -521,7 +521,7 @@ A subset of `this.props.params` that were directly specified in this component's
 The matched child route element to be rendered. If the route has [named components](/docs/API.md#named-components) then this will be undefined, and the components will instead be available as direct properties on `this.props`.
 
 ##### Example
-```js
+```jsx
 render((
   <Router>
     <Route path="/" component={App}>
@@ -547,7 +547,7 @@ class App extends React.Component {
 When a route has one or more named components, the child elements are available by name on `this.props`. In this case `this.props.children` will be undefined. All route components can participate in the nesting.
 
 #### Example
-```js
+```jsx
 render((
   <Router>
     <Route path="/" component={App}>
@@ -619,7 +619,7 @@ and
 enhancers from `history`
 
 #### Example
-```js
+```jsx
 import createHashHistory from 'history/lib/createHashHistory'
 const history = useRouterHistory(createHashHistory)({ queryKey: false })
 ```

docs/Glossary.md

@@ -27,7 +27,7 @@ This is a glossary of common terms used in the React Router codebase and documen
 
 ## Action
 
-```js
+```jsx
 type Action = 'PUSH' | 'REPLACE' | 'POP';
 ```
 
@@ -39,15 +39,15 @@ An *action* describes the type of change to a URL. Possible values are:
 
 ## Component
 
-```js
+```jsx
 type Component = ReactClass | string;
 ```
 
 A *component* is a React component class or a string (e.g. "div"). Basically, it's anything that can be used as the first argument to [`React.createElement`](https://facebook.github.io/react/docs/top-level-api.html#react.createelement).
 
 ## EnterHook
 
-```js
+```jsx
 type EnterHook = (nextState: RouterState, replace: RedirectFunction, callback?: Function) => any;
 ```
 
@@ -65,15 +65,15 @@ A *hash* is a string that represents the hash portion of the URL. It is synonymo
 
 ## LeaveHook
 
-```js
+```jsx
 type LeaveHook = (prevState: RouterState) => any;
 ```
 
 A *leave hook* is a user-defined function that is called when a route is about to be unmounted. It receives the previous [router state](#routerstate) as its first argument. 
 
 ## Location
 
-```js
+```jsx
 type Location = {
   pathname: Pathname;
   search: QueryString;
@@ -108,15 +108,15 @@ You can read more about location descriptors in [the `history` docs](https://git
 
 ## LocationKey
 
-```js
+```jsx
 type LocationKey = string;
 ```
 
 A *location key* is a string that is unique to a particular [`location`](#location). It is the one piece of data that most accurately answers the question "Where am I?".
 
 ## LocationState
 
-```js
+```jsx
 type LocationState = ?Object;
 ```
 
@@ -129,55 +129,55 @@ This type gets its name from the first argument to HTML5's [`pushState`][pushSta
 
 ## Params
 
-```js
+```jsx
 type Params = Object;
 ```
 
 The word *params* refers to an object of key/value pairs that were parsed out of the original URL's [pathname](#pathname). The values of this object are typically strings, unless there is more than one param with the same name in which case the value is an array.
 
 ## Path
 
-```js
+```jsx
 type Path = Pathname + QueryString + Hash;
 ```
 
 A *path* represents a URL path.
 
 ## Pathname
 
-```js
+```jsx
 type Pathname = string;
 ```
 
 A *pathname* is the portion of a URL that describes a hierarchical path, including the preceding `/`. For example, in `http://example.com/the/path?the=query`, `/the/path` is the pathname. It is synonymous with `window.location.pathname` in web browsers.
 
 ## Query
 
-```js
+```jsx
 type Query = Object;
 ```
 
 A *query* is the parsed version of a [query string](#querystring).
 
 ## QueryString
 
-```js
+```jsx
 type QueryString = string;
 ```
 
 A *query string* is the portion of the URL that follows the [pathname](#pathname), including any preceding `?`. For example, in `http://example.com/the/path?the=query`, `?the=query` is the query string. It is synonymous with `window.location.search` in web browsers.
 
 ## RedirectFunction
 
-```js
+```jsx
 type RedirectFunction = (state: ?LocationState, pathname: Pathname | Path, query: ?Query) => void;
 ```
 
 A *redirect function* is used in [`onEnter` hooks](#enterhook) to trigger a transition to a new URL.
 
 ## Route
 
-```js
+```jsx
 type Route = {
   component: RouteComponent;
   path: ?RoutePattern;
@@ -192,7 +192,7 @@ It may help to think of a route as an "entry point" into your UI. You don't need
 
 ## RouteComponent
 
-```js
+```jsx
 type RouteComponent = Component;
 ```
 
@@ -208,23 +208,23 @@ Route components should generally be component classes rather than strings. This
 
 ## RouteConfig
 
-```js
+```jsx
 type RouteConfig = Array<Route>;
 ```
 
 A *route config* is an array of [route](#route)s that specifies the order in which routes should be tried when the router attempts to match a URL.
 
 ## RouteHook
 
-```js
+```jsx
 type RouteHook = (nextLocation?: Location) => any;
 ```
 
 A *route hook* is a function that is used to prevent the user from leaving a route. On normal transitions, it receives the next [location](#location) as an argument and must either `return false` to cancel the transition or `return` a prompt message to show the user. When invoked during the `beforeunload` event in web browsers, it does not receive any arguments and must `return` a prompt message to cancel the transition.
 
 ## RoutePattern
 
-```js
+```jsx
 type RoutePattern = string;
 ```
 
@@ -239,7 +239,7 @@ Route patterns are relative to the pattern of the parent route unless they begin
 
 ## Router
 
-```js
+```jsx
 type Router = {
   push(location: LocationDescriptor) => void;
   replace(location: LocationDescriptor) => void;
@@ -255,7 +255,7 @@ A *router* object allows for procedural manipulation of the routing state.
 
 ## RouterState
 
-```js
+```jsx
 type RouterState = {
   location: Location;
   routes: Array<Route>;