react-router 2.6.0 → 2.8.1

package/CHANGES.md

@@ -1,3 +1,46 @@
+## [v2.8.1]
+> Sep 13, 2016
+
+- **Bugfix:** Fix redirects that specify `query` ([#3808])
+
+[v2.8.1]: https://github.com/reactjs/react-router/compare/v2.8.0...v2.8.1
+[#3808]: https://github.com/reactjs/react-router/pull/3808
+
+
+## [v2.8.0]
+> Sep 9, 2016
+
+- **Feature:** Support omitting `to` on `<Link>` ([#3803])
+- **Refactor:** Use `history.replace` instead of `history.transitionTo` for redirects ([#3799])
+
+[v2.8.0]: https://github.com/reactjs/react-router/compare/v2.7.0...v2.8.0
+[#3799]: https://github.com/reactjs/react-router/pull/3799
+[#3803]: https://github.com/reactjs/react-router/pull/3803
+
+
+## [v2.7.0]
+> Aug 20, 2016
+
+- **Feature:** Support `router` as a prop on `withRouter`-wrapped components for overriding the router object from context ([#3729])
+- **Feature:** Add `withRef` option to `withRouter` that enables `getWrappedInstance` ([#3735], [#3740])
+- **Bugfix:** Warn on invalid router middlewares ([#3717])
+
+[v2.7.0]: https://github.com/reactjs/react-router/compare/v2.6.1...v2.7.0
+[#3717]: https://github.com/reactjs/react-router/pull/3717
+[#3729]: https://github.com/reactjs/react-router/pull/3729
+[#3735]: https://github.com/reactjs/react-router/pull/3735
+[#3740]: https://github.com/reactjs/react-router/pull/3740
+
+
+## [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
 

package/CODE_OF_CONDUCT.md

@@ -1,24 +1,41 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct
 
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
+## Our Pledge
 
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
 Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
@@ -26,26 +43,32 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
+## Scope
 
 This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at rpflorence@gmail.com. All
+reported by contacting the project team at rpflorence@gmail.com. All
 complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Maintainers are
-obligated to maintain confidentiality with regard to the reporter of an
-incident.
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
 
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
+## Attribution
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
 
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

package/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]
 
 ### Docs & Help
@@ -20,7 +20,7 @@ React Router keeps your UI in sync with the URL. It has a simple API with powerf
 
 **Older Versions:**
 
-- 0.13.x - [docs](https://github.com/reactjs/react-router/tree/0.13.x/doc) / [guides](https://github.com/reactjs/react-router/tree/0.13.x/docs/guides) / [code](https://github.com/reactjs/react-router/tree/0.13.x) / [upgrade guide](https://github.com/reactjs/react-router/blob/master/upgrade-guides/v1.0.0.md)
+- 0.13.x - [docs](https://github.com/reactjs/react-router/tree/v0.13.6/doc) / [guides](https://github.com/reactjs/react-router/tree/v0.13.6/docs/guides) / [code](https://github.com/reactjs/react-router/tree/v0.13.6) / [upgrade guide](https://github.com/reactjs/react-router/blob/master/upgrade-guides/v1.0.0.md)
 - 1.0.x - [docs](https://github.com/reactjs/react-router/tree/1.0.x/docs) / [code](https://github.com/reactjs/react-router/tree/1.0.x) / [upgrade guide](https://github.com/reactjs/react-router/blob/master/upgrade-guides/v2.0.0.md)
 
 For questions and support, please visit [our channel on Reactiflux](https://discord.gg/0ZcbPKXt5bYaNQ46) or [Stack Overflow](http://stackoverflow.com/questions/tagged/react-router).
@@ -47,10 +47,10 @@ var Route = require('react-router').Route
 var Link = require('react-router').Link
 ```
 
-The UMD build is also available on [npmcdn](https://npmcdn.com):
+The UMD build is also available on [unpkg](https://unpkg.com):
 
 ```html
-<script src="https://npmcdn.com/react-router/umd/ReactRouter.min.js"></script>
+<script src="https://unpkg.com/react-router/umd/ReactRouter.min.js"></script>
 ```
 
 You can find the library on `window.ReactRouter`.
@@ -125,7 +125,7 @@ See more in the [Introduction](/docs/Introduction.md), [Guides](/docs/guides/REA
 
 ### Versioning and Stability
 
-We want React Router to be a stable dependency that’s easy to keep current. We follow the same versioning as React.js itself: [React Versioning Scheme](https://facebook.github.io/react/blog/2016/02/19/new-versioning-scheme.html).
+We want React Router to be a stable dependency that’s easy to keep current. We take the same approach to versioning as React.js itself: [React Versioning Scheme](https://facebook.github.io/react/blog/2016/02/19/new-versioning-scheme.html).
 
 ### Thanks
 
@@ -142,8 +142,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

package/docs/API.md

@@ -4,7 +4,7 @@
   - [`<Router>`](#router)
   - [`<Link>`](#link)
   - [`<IndexLink>`](#indexlink)
-  - [`withRouter`](#withroutercomponent)
+  - [`withRouter`](#withroutercomponent-options)
   - [`<RouterContext>`](#routercontext)
     - [`context.router`](#contextrouter)
   - `<RoutingContext>` (deprecated, use `<RouterContext>`)
@@ -105,7 +105,7 @@ A `<Link>` can know when the route it links to is active and automatically apply
 
 #### Props
 ##### `to`
-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:
+A [location descriptor](https://github.com/reactjs/react-router/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:
@@ -113,6 +113,7 @@ A [location descriptor](https://github.com/ReactTraining/history/blob/master/doc
   * `query`: An object of key:value pairs to be stringified.
   * `hash`: A hash to put in the URL, e.g. `#a-hash`.
   * `state`: State to persist to the `location`.
+* If it is not specified, an anchor tag without an `href` attribute will be rendered.
 
 _Note: React Router currently does not manage scroll position, and will not scroll to the element corresponding to `hash`._
 
@@ -157,8 +158,22 @@ Given a route like `<Route path="/users/:userId" />`:
 ### `<IndexLink>`
 An `<IndexLink>` is like a [`<Link>`](#link), except it is only active when the current route is exactly the linked route. It is equivalent to `<Link>` with the `onlyActiveOnIndex` prop set.
 
-### `withRouter(component)`
-A HoC (higher-order component) that wraps another component to provide `this.props.router`. Pass in your component and it will return the wrapped component.
+### `withRouter(Component, [options])`
+A HoC (higher-order component) that wraps another component to provide `props.router`. Pass in your component and it will return the wrapped component.
+
+You can explicit specify `router` as a prop to the wrapper component to override the router object from context.
+
+#### Options
+
+##### `withRef`
+If `true`, the wrapper component attaches a ref to the wrapped component, which can then be accessed via `getWrappedInstance`.
+
+```js
+const WrapperComponent = withRouter(MyComponent, { withRef: true })
+
+// Given a `wrapperInstance` that is of type `WrapperComponent`:
+const myInstance = wrapperInstance.getWrappedInstance()
+```
 
 ### `<RouterContext>`
 A `<RouterContext>` renders the component tree for a given router state. Its used by `<Router>` but also useful for server rendering and integrating in brownfield development.
@@ -244,7 +259,7 @@ be rendered by the parent route component with `this.props.children`.
 
 ```js
 const routes = (
-  <Route component={App}>
+  <Route path="/" component={App}>
     <Route path="groups" component={Groups} />
     <Route path="users" component={Users} />
   </Route>
@@ -271,7 +286,7 @@ Routes can define one or more named components as an object of `[name]: componen
 // <App main={<Users />} sidebar={<UsersSidebar />} />
 
 const routes = (
-  <Route component={App}>
+  <Route path="/" component={App}>
     <Route path="groups" components={{main: Groups, sidebar: GroupsSidebar}} />
     <Route path="users" components={{main: Users, sidebar: UsersSidebar}}>
       <Route path=":userId" component={Profile} />
@@ -345,6 +360,28 @@ Called when a route is about to be entered. It provides the next router state an
 
 If `callback` is listed as a 3rd argument, this hook will run asynchronously, and the transition will block until `callback` is called.
 
+###### `callback` signature
+`cb(err)`
+
+```js
+const userIsInATeam = (nextState, replace, callback) => {
+  fetch(...)
+    .then(response = response.json())
+    .then(userTeams => {
+      if (userTeams.length === 0) {
+        replace(`/users/${nextState.params.userId}/teams/new`)
+      }
+      callback();
+    })
+    .catch(error => {
+      // do some error handling here
+      callback(error);
+    })
+}
+
+<Route path="/users/:userId/teams" onEnter={userIsInATeam} />
+```
+
 ##### `onChange(prevState, nextState, replace, callback?)`
 Called on routes when the location changes, but the route itself neither enters or leaves. For example, this will be called when a route's children change, or when the location query changes. It provides the previous router state, the next router state, and a function to redirect to another path. `this` will be the route instance that triggered the hook.
 
@@ -498,7 +535,7 @@ A route's component is rendered when that route matches the URL. The router will
 ### Injected Props
 
 #### `location`
-The current [location](https://github.com/reactjs/history/blob/master/docs/Location.md).
+The current [location](https://github.com/mjackson/history/blob/v2.x/docs/Location.md).
 
 #### `params`
 The dynamic segments of the URL.
@@ -507,7 +544,7 @@ The dynamic segments of the URL.
 The route that rendered this component.
 
 #### `routeParams`
-A subset of `this.props.params` that were directly specified in this component's route. For example, if the route's path is `users/:userId` and the URL is `/users/123/portfolios/345` then `this.props.routeParams` will be `{userId: '123'}`, and `this.props.params` will be `{userId: '123', portfolioId: 345}`.
+A subset of `this.props.params` that were directly specified in this component's route. For example, if the route's path is `users/:userId` and the URL is `/users/123/portfolios/345` then `this.props.routeParams` will be `{userId: '123'}`, and `this.props.params` will be `{userId: '123', portfolioId: '345'}`.
 
 #### `children`
 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`.
@@ -599,8 +636,8 @@ For more details, please see the [histories guide](/docs/guides/Histories.md).
 `hashHistory` uses URL hashes, along with a query key to keep track of state. `hashHistory` requires no additional server configuration, but is generally less preferred than `browserHistory`.
 
 
-### `createMemoryHistory(options)`
-`createMemoryHistory` creates an in-memory `history` object that does not interact with the browser URL. This is useful when you need to customize the `history` used for server-side rendering, as well as for automated testing.
+### `createMemoryHistory([options])`
+`createMemoryHistory` creates an in-memory `history` object that does not interact with the browser URL. This is useful for when you need to customize the `history` object used for server-side rendering, for automated testing, or for when you do not want to manipulate the browser URL, such as when your application is embedded in an `<iframe>`.
 
 
 ### `useRouterHistory(createHistory)`
@@ -622,7 +659,7 @@ const history = useRouterHistory(createHashHistory)({ queryKey: false })
 
 ## Utilities
 
-### `match({ routes, location, [history], ...options }, cb)`
+### `match({ routes, location, [history], [...options] }, cb)`
 
 This function is to be used for server-side rendering. It matches a set of routes to a location, without rendering, and calls a `callback(error, redirectLocation, renderProps)` when it's done.
 

package/docs/Glossary.md

@@ -69,7 +69,7 @@ A *hash* is a string that represents the hash portion of the URL. It is synonymo
 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. 
+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
 
@@ -89,7 +89,7 @@ A *location* answers two important (philosophical) questions:
   - Where am I?
   - How did I get here?
 
-New locations are typically created each time the URL changes. You can read more about locations in [the `history` docs](https://github.com/reactjs/history/blob/master/docs/Location.md).
+New locations are typically created each time the URL changes. You can read more about locations in [the `history` docs](https://github.com/mjackson/history/blob/v2.x/docs/Location.md).
 
 ### LocationDescriptor
 
@@ -104,7 +104,7 @@ New locations are typically created each time the URL changes. You can read more
 
 A *location descriptor* is the pushable analogue of a location. Locations tell you where you are; you create location descriptors to say where to go.
 
-You can read more about location descriptors in [the `history` docs](https://github.com/reactjs/history/blob/master/docs/Location.md).
+You can read more about location descriptors in [the `history` docs](https://github.com/mjackson/history/blob/v2.x/docs/Location.md).
 
 ## LocationKey
 

package/docs/README.md

@@ -8,6 +8,7 @@
  * [Histories](guides/Histories.md)
  * [Index Routes and Links](guides/IndexRoutes.md)
 * Advanced Usage
+ * [Testing](guides/Testing.md)
  * [Dynamic Routing](guides/DynamicRouting.md)
  * [Confirming Navigation](guides/ConfirmingNavigation.md)
  * [Server Rendering](guides/ServerRendering.md)

package/docs/guides/NavigatingOutsideOfComponents.md

@@ -3,14 +3,23 @@
 While you can use `this.props.router` from `withRouter` to navigate around, many apps want to be able to navigate outside of their components. They can do that with the history the app gives to `Router`.
 
 ```js
-// your main file that renders a Router
+// Your main file that renders a <Router>:
 import { Router, browserHistory } from 'react-router'
 import routes from './app/routes'
-render(<Router history={browserHistory} routes={routes}/>, el)
+
+render(
+  <Router history={browserHistory} routes={routes} />,
+  mountNode
+)
 ```
 
 ```js
-// somewhere like a redux/flux action file:
+// Somewhere like a Redux middleware or Flux action:
 import { browserHistory } from 'react-router'
+
+// Go to /some/path.
 browserHistory.push('/some/path')
+
+// Go back to previous location.
+browserHistory.goBack()
 ```

package/docs/guides/README.md

@@ -1,13 +1,15 @@
 # Guides
 
-* [Route Configuration](RouteConfiguration.md)
-* [Route Matching](RouteMatching.md)
-* [Histories](Histories.md)
-* [Index Routes and Links](IndexRoutes.md)
-* [Testing](testing.md)
-* [Dynamic Routing](DynamicRouting.md)
-* [Confirming Navigation](ConfirmingNavigation.md)
-* [Server Rendering](ServerRendering.md)
-* [Component Lifecycle](ComponentLifecycle.md)
-* [Navigating Outside of Components](NavigatingOutsideOfComponents.md)
-* [Minimizing Bundle Size](MinimizingBundleSize.md)
+* Basics
+ * [Route Configuration](RouteConfiguration.md)
+ * [Route Matching](RouteMatching.md)
+ * [Histories](Histories.md)
+ * [Index Routes and Links](IndexRoutes.md)
+* Advanced Usage
+ * [Testing](Testing.md)
+ * [Dynamic Routing](DynamicRouting.md)
+ * [Confirming Navigation](ConfirmingNavigation.md)
+ * [Server Rendering](ServerRendering.md)
+ * [Component Lifecycle](ComponentLifecycle.md)
+ * [Navigating Outside of Components](NavigatingOutsideOfComponents.md)
+ * [Minimizing Bundle Size](MinimizingBundleSize.md)

package/es6/Link.js

@@ -69,7 +69,7 @@ var Link = React.createClass({
   },
 
   propTypes: {
-    to: oneOfType([string, object]).isRequired,
+    to: oneOfType([string, object]),
     query: object,
     hash: string,
     state: object,
@@ -130,6 +130,11 @@ var Link = React.createClass({
 
 
     if (router) {
+      // If user does not specify a `to` prop, return an empty anchor tag.
+      if (to == null) {
+        return React.createElement('a', props);
+      }
+
       var location = createLocationDescriptor(to, { query: query, hash: hash, state: state });
       props.href = router.createHref(location);
 

package/es6/PatternUtils.js

@@ -51,10 +51,10 @@ function _compilePattern(pattern) {
   };
 }
 
-var CompiledPatternsCache = {};
+var CompiledPatternsCache = Object.create(null);
 
 export function compilePattern(pattern) {
-  if (!(pattern in CompiledPatternsCache)) CompiledPatternsCache[pattern] = _compilePattern(pattern);
+  if (!CompiledPatternsCache[pattern]) CompiledPatternsCache[pattern] = _compilePattern(pattern);
 
   return CompiledPatternsCache[pattern];
 }

package/es6/applyRouterMiddleware.js

@@ -2,22 +2,26 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 import React, { createElement } from 'react';
 import RouterContext from './RouterContext';
+import warning from './routerWarning';
 
 export default (function () {
   for (var _len = arguments.length, middlewares = Array(_len), _key = 0; _key < _len; _key++) {
     middlewares[_key] = arguments[_key];
   }
 
-  var withContext = middlewares.map(function (m) {
-    return m.renderRouterContext;
-  }).filter(function (f) {
-    return f;
-  });
-  var withComponent = middlewares.map(function (m) {
-    return m.renderRouteComponent;
-  }).filter(function (f) {
-    return f;
-  });
+  if (process.env.NODE_ENV !== 'production') {
+    middlewares.forEach(function (middleware, index) {
+      process.env.NODE_ENV !== 'production' ? warning(middleware.renderRouterContext || middleware.renderRouteComponent, 'The middleware specified at index ' + index + ' does not appear to be ' + 'a valid React Router middleware.') : void 0;
+    });
+  }
+
+  var withContext = middlewares.map(function (middleware) {
+    return middleware.renderRouterContext;
+  }).filter(Boolean);
+  var withComponent = middlewares.map(function (middleware) {
+    return middleware.renderRouteComponent;
+  }).filter(Boolean);
+
   var makeCreateElement = function makeCreateElement() {
     var baseCreateElement = arguments.length <= 0 || arguments[0] === undefined ? createElement : arguments[0];
     return function (Component, props) {

package/es6/createTransitionManager.js

@@ -1,7 +1,6 @@
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 import warning from './routerWarning';
-import { REPLACE } from 'history/lib/Actions';
 import computeChangedRoutes from './computeChangedRoutes';
 import { runEnterHooks, runChangeHooks, runLeaveHooks } from './TransitionUtils';
 import _isActive from './isActive';
@@ -36,10 +35,6 @@ export default function createTransitionManager(history, routes) {
     return _isActive(location, indexOnly, state.location, state.routes, state.params);
   }
 
-  function createLocationFromRedirectInfo(location) {
-    return history.createLocation(location, REPLACE);
-  }
-
   var partialNextState = void 0;
 
   function match(location, callback) {
@@ -97,7 +92,7 @@ export default function createTransitionManager(history, routes) {
     }
 
     function handleErrorOrRedirect(error, redirectInfo) {
-      if (error) callback(error);else callback(null, createLocationFromRedirectInfo(redirectInfo));
+      if (error) callback(error);else callback(null, redirectInfo);
     }
   }
 
@@ -260,7 +255,7 @@ export default function createTransitionManager(history, routes) {
           if (error) {
             listener(error);
           } else if (redirectLocation) {
-            history.transitionTo(redirectLocation);
+            history.replace(redirectLocation);
           } else if (nextState) {
             listener(null, nextState);
           } else {

package/es6/match.js

@@ -2,6 +2,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
 
+import { REPLACE } from 'history/lib/Actions';
 import invariant from 'invariant';
 
 import createMemoryHistory from './createMemoryHistory';
@@ -47,7 +48,7 @@ function match(_ref, callback) {
   history = createRoutingHistory(history, transitionManager);
 
   transitionManager.match(location, function (error, redirectLocation, nextState) {
-    callback(error, redirectLocation, nextState && _extends({}, nextState, {
+    callback(error, redirectLocation && router.createLocation(redirectLocation, REPLACE), nextState && _extends({}, nextState, {
       history: history,
       router: router,
       matchContext: { history: history, transitionManager: transitionManager, router: router }

package/es6/withRouter.js

@@ -1,5 +1,6 @@
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+import invariant from 'invariant';
 import React from 'react';
 import hoistStatics from 'hoist-non-react-statics';
 import { routerShape } from './PropTypes';
@@ -8,13 +9,33 @@ function getDisplayName(WrappedComponent) {
   return WrappedComponent.displayName || WrappedComponent.name || 'Component';
 }
 
-export default function withRouter(WrappedComponent) {
+export default function withRouter(WrappedComponent, options) {
+  var withRef = options && options.withRef;
+
   var WithRouter = React.createClass({
     displayName: 'WithRouter',
 
     contextTypes: { router: routerShape },
+    propTypes: { router: routerShape },
+
+    getWrappedInstance: function getWrappedInstance() {
+      !withRef ? process.env.NODE_ENV !== 'production' ? invariant(false, 'To access the wrapped instance, you need to specify ' + '`{ withRef: true }` as the second argument of the withRouter() call.') : invariant(false) : void 0;
+
+      return this.wrappedInstance;
+    },
     render: function render() {
-      return React.createElement(WrappedComponent, _extends({}, this.props, { router: this.context.router }));
+      var _this = this;
+
+      var router = this.props.router || this.context.router;
+      var props = _extends({}, this.props, { router: router });
+
+      if (withRef) {
+        props.ref = function (c) {
+          _this.wrappedInstance = c;
+        };
+      }
+
+      return React.createElement(WrappedComponent, props);
     }
   });
 

package/lib/Link.js

@@ -84,7 +84,7 @@ var Link = _react2.default.createClass({
   },
 
   propTypes: {
-    to: oneOfType([string, object]).isRequired,
+    to: oneOfType([string, object]),
     query: object,
     hash: string,
     state: object,
@@ -145,6 +145,11 @@ var Link = _react2.default.createClass({
 
 
     if (router) {
+      // If user does not specify a `to` prop, return an empty anchor tag.
+      if (to == null) {
+        return _react2.default.createElement('a', props);
+      }
+
       var location = createLocationDescriptor(to, { query: query, hash: hash, state: state });
       props.href = router.createHref(location);
 

package/lib/PatternUtils.js

@@ -64,10 +64,10 @@ function _compilePattern(pattern) {
   };
 }
 
-var CompiledPatternsCache = {};
+var CompiledPatternsCache = Object.create(null);
 
 function compilePattern(pattern) {
-  if (!(pattern in CompiledPatternsCache)) CompiledPatternsCache[pattern] = _compilePattern(pattern);
+  if (!CompiledPatternsCache[pattern]) CompiledPatternsCache[pattern] = _compilePattern(pattern);
 
   return CompiledPatternsCache[pattern];
 }