react-router 4.0.0-beta.7 → 4.1.1

package/umd/react-router.js

@@ -63,35 +63,35 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _MemoryRouter3 = _interopRequireDefault(_MemoryRouter2);
 
-	var _Prompt2 = __webpack_require__(12);
+	var _Prompt2 = __webpack_require__(16);
 
 	var _Prompt3 = _interopRequireDefault(_Prompt2);
 
-	var _Redirect2 = __webpack_require__(13);
+	var _Redirect2 = __webpack_require__(17);
 
 	var _Redirect3 = _interopRequireDefault(_Redirect2);
 
-	var _Route2 = __webpack_require__(14);
+	var _Route2 = __webpack_require__(18);
 
 	var _Route3 = _interopRequireDefault(_Route2);
 
-	var _Router2 = __webpack_require__(10);
+	var _Router2 = __webpack_require__(14);
 
 	var _Router3 = _interopRequireDefault(_Router2);
 
-	var _StaticRouter2 = __webpack_require__(18);
+	var _StaticRouter2 = __webpack_require__(22);
 
 	var _StaticRouter3 = _interopRequireDefault(_StaticRouter2);
 
-	var _Switch2 = __webpack_require__(19);
+	var _Switch2 = __webpack_require__(23);
 
 	var _Switch3 = _interopRequireDefault(_Switch2);
 
-	var _matchPath2 = __webpack_require__(15);
+	var _matchPath2 = __webpack_require__(19);
 
 	var _matchPath3 = _interopRequireDefault(_matchPath2);
 
-	var _withRouter2 = __webpack_require__(20);
+	var _withRouter2 = __webpack_require__(24);
 
 	var _withRouter3 = _interopRequireDefault(_withRouter2);
 
@@ -119,11 +119,15 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _react2 = _interopRequireDefault(_react);
 
-	var _createMemoryHistory = __webpack_require__(3);
+	var _propTypes = __webpack_require__(3);
+
+	var _propTypes2 = _interopRequireDefault(_propTypes);
+
+	var _createMemoryHistory = __webpack_require__(7);
 
 	var _createMemoryHistory2 = _interopRequireDefault(_createMemoryHistory);
 
-	var _Router = __webpack_require__(10);
+	var _Router = __webpack_require__(14);
 
 	var _Router2 = _interopRequireDefault(_Router);
 
@@ -170,6 +174,205 @@ return /******/ (function(modules) { // webpackBootstrap
 
 /***/ },
 /* 3 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Copyright 2013-present, Facebook, Inc.
+	 * All rights reserved.
+	 *
+	 * This source code is licensed under the BSD-style license found in the
+	 * LICENSE file in the root directory of this source tree. An additional grant
+	 * of patent rights can be found in the PATENTS file in the same directory.
+	 */
+
+	if (false) {
+	  var REACT_ELEMENT_TYPE = (typeof Symbol === 'function' &&
+	    Symbol.for &&
+	    Symbol.for('react.element')) ||
+	    0xeac7;
+
+	  var isValidElement = function(object) {
+	    return typeof object === 'object' &&
+	      object !== null &&
+	      object.$$typeof === REACT_ELEMENT_TYPE;
+	  };
+
+	  // By explicitly using `prop-types` you are opting into new development behavior.
+	  // http://fb.me/prop-types-in-prod
+	  var throwOnDirectAccess = true;
+	  module.exports = require('./factoryWithTypeCheckers')(isValidElement, throwOnDirectAccess);
+	} else {
+	  // By explicitly using `prop-types` you are opting into new production behavior.
+	  // http://fb.me/prop-types-in-prod
+	  module.exports = __webpack_require__(4)();
+	}
+
+
+/***/ },
+/* 4 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Copyright 2013-present, Facebook, Inc.
+	 * All rights reserved.
+	 *
+	 * This source code is licensed under the BSD-style license found in the
+	 * LICENSE file in the root directory of this source tree. An additional grant
+	 * of patent rights can be found in the PATENTS file in the same directory.
+	 */
+
+	'use strict';
+
+	var emptyFunction = __webpack_require__(5);
+	var invariant = __webpack_require__(6);
+
+	module.exports = function() {
+	  // Important!
+	  // Keep this list in sync with production version in `./factoryWithTypeCheckers.js`.
+	  function shim() {
+	    invariant(
+	      false,
+	      'Calling PropTypes validators directly is not supported by the `prop-types` package. ' +
+	      'Use PropTypes.checkPropTypes() to call them. ' +
+	      'Read more at http://fb.me/use-check-prop-types'
+	    );
+	  };
+	  shim.isRequired = shim;
+	  function getShim() {
+	    return shim;
+	  };
+	  var ReactPropTypes = {
+	    array: shim,
+	    bool: shim,
+	    func: shim,
+	    number: shim,
+	    object: shim,
+	    string: shim,
+	    symbol: shim,
+
+	    any: shim,
+	    arrayOf: getShim,
+	    element: shim,
+	    instanceOf: getShim,
+	    node: shim,
+	    objectOf: getShim,
+	    oneOf: getShim,
+	    oneOfType: getShim,
+	    shape: getShim
+	  };
+
+	  ReactPropTypes.checkPropTypes = emptyFunction;
+	  ReactPropTypes.PropTypes = ReactPropTypes;
+
+	  return ReactPropTypes;
+	};
+
+
+/***/ },
+/* 5 */
+/***/ function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Copyright (c) 2013-present, Facebook, Inc.
+	 * All rights reserved.
+	 *
+	 * This source code is licensed under the BSD-style license found in the
+	 * LICENSE file in the root directory of this source tree. An additional grant
+	 * of patent rights can be found in the PATENTS file in the same directory.
+	 *
+	 * 
+	 */
+
+	function makeEmptyFunction(arg) {
+	  return function () {
+	    return arg;
+	  };
+	}
+
+	/**
+	 * This function accepts and discards inputs; it has no side effects. This is
+	 * primarily useful idiomatically for overridable function endpoints which
+	 * always need to be callable, since JS lacks a null-call idiom ala Cocoa.
+	 */
+	var emptyFunction = function emptyFunction() {};
+
+	emptyFunction.thatReturns = makeEmptyFunction;
+	emptyFunction.thatReturnsFalse = makeEmptyFunction(false);
+	emptyFunction.thatReturnsTrue = makeEmptyFunction(true);
+	emptyFunction.thatReturnsNull = makeEmptyFunction(null);
+	emptyFunction.thatReturnsThis = function () {
+	  return this;
+	};
+	emptyFunction.thatReturnsArgument = function (arg) {
+	  return arg;
+	};
+
+	module.exports = emptyFunction;
+
+/***/ },
+/* 6 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Copyright (c) 2013-present, Facebook, Inc.
+	 * All rights reserved.
+	 *
+	 * This source code is licensed under the BSD-style license found in the
+	 * LICENSE file in the root directory of this source tree. An additional grant
+	 * of patent rights can be found in the PATENTS file in the same directory.
+	 *
+	 */
+
+	'use strict';
+
+	/**
+	 * Use invariant() to assert state which your program assumes to be true.
+	 *
+	 * Provide sprintf-style format (only %s is supported) and arguments
+	 * to provide information about what broke and what you were
+	 * expecting.
+	 *
+	 * The invariant message will be stripped in production, but the invariant
+	 * will remain to ensure logic does not differ in production.
+	 */
+
+	var validateFormat = function validateFormat(format) {};
+
+	if (false) {
+	  validateFormat = function validateFormat(format) {
+	    if (format === undefined) {
+	      throw new Error('invariant requires an error message argument');
+	    }
+	  };
+	}
+
+	function invariant(condition, format, a, b, c, d, e, f) {
+	  validateFormat(format);
+
+	  if (!condition) {
+	    var error;
+	    if (format === undefined) {
+	      error = new Error('Minified exception occurred; use the non-minified dev environment ' + 'for the full error message and additional helpful warnings.');
+	    } else {
+	      var args = [a, b, c, d, e, f];
+	      var argIndex = 0;
+	      error = new Error(format.replace(/%s/g, function () {
+	        return args[argIndex++];
+	      }));
+	      error.name = 'Invariant Violation';
+	    }
+
+	    error.framesToPop = 1; // we don't care about invariant's own frame
+	    throw error;
+	  }
+	}
+
+	module.exports = invariant;
+
+/***/ },
+/* 7 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -180,15 +383,15 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	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; };
 
-	var _warning = __webpack_require__(4);
+	var _warning = __webpack_require__(8);
 
 	var _warning2 = _interopRequireDefault(_warning);
 
-	var _PathUtils = __webpack_require__(5);
+	var _PathUtils = __webpack_require__(9);
 
-	var _LocationUtils = __webpack_require__(6);
+	var _LocationUtils = __webpack_require__(10);
 
-	var _createTransitionManager = __webpack_require__(9);
+	var _createTransitionManager = __webpack_require__(13);
 
 	var _createTransitionManager2 = _interopRequireDefault(_createTransitionManager);
 
@@ -227,8 +430,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	  };
 
 	  var index = clamp(initialIndex, 0, initialEntries.length - 1);
-	  var entries = initialEntries.map(function (entry, index) {
-	    return typeof entry === 'string' ? (0, _LocationUtils.createLocation)(entry, undefined, index ? createKey() : undefined) : (0, _LocationUtils.createLocation)(entry, undefined, index ? entry.key || createKey() : undefined);
+	  var entries = initialEntries.map(function (entry) {
+	    return typeof entry === 'string' ? (0, _LocationUtils.createLocation)(entry, undefined, createKey()) : (0, _LocationUtils.createLocation)(entry, undefined, entry.key || createKey());
 	  });
 
 	  // Public interface
@@ -236,7 +439,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  var createHref = _PathUtils.createPath;
 
 	  var push = function push(path, state) {
-	     false ? (0, _warning2.default)(!((typeof path === 'undefined' ? 'undefined' : _typeof(path)) === 'object' && path.state !== undefined && state !== undefined), 'You should avoid providing a 2nd state argument to push when the 1st ' + 'argument is a location-like object that already has state; it is ignored') : void 0;
+	    (0, _warning2.default)(!((typeof path === 'undefined' ? 'undefined' : _typeof(path)) === 'object' && path.state !== undefined && state !== undefined), 'You should avoid providing a 2nd state argument to push when the 1st ' + 'argument is a location-like object that already has state; it is ignored');
 
 	    var action = 'PUSH';
 	    var location = (0, _LocationUtils.createLocation)(path, state, createKey(), history.location);
@@ -264,7 +467,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  };
 
 	  var replace = function replace(path, state) {
-	     false ? (0, _warning2.default)(!((typeof path === 'undefined' ? 'undefined' : _typeof(path)) === 'object' && path.state !== undefined && state !== undefined), 'You should avoid providing a 2nd state argument to replace when the 1st ' + 'argument is a location-like object that already has state; it is ignored') : void 0;
+	    (0, _warning2.default)(!((typeof path === 'undefined' ? 'undefined' : _typeof(path)) === 'object' && path.state !== undefined && state !== undefined), 'You should avoid providing a 2nd state argument to replace when the 1st ' + 'argument is a location-like object that already has state; it is ignored');
 
 	    var action = 'REPLACE';
 	    var location = (0, _LocationUtils.createLocation)(path, state, createKey(), history.location);
@@ -344,7 +547,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.default = createMemoryHistory;
 
 /***/ },
-/* 4 */
+/* 8 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/**
@@ -410,7 +613,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ },
-/* 5 */
+/* 9 */
 /***/ function(module, exports) {
 
 	'use strict';
@@ -428,6 +631,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return path.indexOf(prefix) === 0 ? path.substr(prefix.length) : path;
 	};
 
+	var stripTrailingSlash = exports.stripTrailingSlash = function stripTrailingSlash(path) {
+	  return path.charAt(path.length - 1) === '/' ? path.slice(0, -1) : path;
+	};
+
 	var parsePath = exports.parsePath = function parsePath(path) {
 	  var pathname = path || '/';
 	  var search = '';
@@ -445,6 +652,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	    pathname = pathname.substr(0, searchIndex);
 	  }
 
+	  pathname = decodeURI(pathname);
+
 	  return {
 	    pathname: pathname,
 	    search: search === '?' ? '' : search,
@@ -458,7 +667,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	      hash = location.hash;
 
 
-	  var path = pathname || '/';
+	  var path = encodeURI(pathname || '/');
 
 	  if (search && search !== '?') path += search.charAt(0) === '?' ? search : '?' + search;
 
@@ -468,7 +677,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 
 /***/ },
-/* 6 */
+/* 10 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -478,15 +687,15 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	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; };
 
-	var _resolvePathname = __webpack_require__(7);
+	var _resolvePathname = __webpack_require__(11);
 
 	var _resolvePathname2 = _interopRequireDefault(_resolvePathname);
 
-	var _valueEqual = __webpack_require__(8);
+	var _valueEqual = __webpack_require__(12);
 
 	var _valueEqual2 = _interopRequireDefault(_valueEqual);
 
-	var _PathUtils = __webpack_require__(5);
+	var _PathUtils = __webpack_require__(9);
 
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -536,7 +745,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	};
 
 /***/ },
-/* 7 */
+/* 11 */
 /***/ function(module, exports) {
 
 	'use strict';
@@ -611,7 +820,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = resolvePathname;
 
 /***/ },
-/* 8 */
+/* 12 */
 /***/ function(module, exports) {
 
 	'use strict';
@@ -660,14 +869,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.default = valueEqual;
 
 /***/ },
-/* 9 */
+/* 13 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	exports.__esModule = true;
 
-	var _warning = __webpack_require__(4);
+	var _warning = __webpack_require__(8);
 
 	var _warning2 = _interopRequireDefault(_warning);
 
@@ -677,7 +886,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  var prompt = null;
 
 	  var setPrompt = function setPrompt(nextPrompt) {
-	     false ? (0, _warning2.default)(prompt == null, 'A history supports only one prompt at a time') : void 0;
+	    (0, _warning2.default)(prompt == null, 'A history supports only one prompt at a time');
 
 	    prompt = nextPrompt;
 
@@ -697,7 +906,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        if (typeof getUserConfirmation === 'function') {
 	          getUserConfirmation(result, callback);
 	        } else {
-	           false ? (0, _warning2.default)(false, 'A history needs a getUserConfirmation function in order to use a prompt message') : void 0;
+	          (0, _warning2.default)(false, 'A history needs a getUserConfirmation function in order to use a prompt message');
 
 	          callback(true);
 	        }
@@ -750,18 +959,20 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.default = createTransitionManager;
 
 /***/ },
-/* 10 */
+/* 14 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	exports.__esModule = true;
 
-	var _warning = __webpack_require__(4);
+	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; };
+
+	var _warning = __webpack_require__(8);
 
 	var _warning2 = _interopRequireDefault(_warning);
 
-	var _invariant = __webpack_require__(11);
+	var _invariant = __webpack_require__(15);
 
 	var _invariant2 = _interopRequireDefault(_invariant);
 
@@ -769,6 +980,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _react2 = _interopRequireDefault(_react);
 
+	var _propTypes = __webpack_require__(3);
+
+	var _propTypes2 = _interopRequireDefault(_propTypes);
+
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -799,11 +1014,13 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  Router.prototype.getChildContext = function getChildContext() {
 	    return {
-	      history: this.props.history,
-	      route: {
-	        location: this.props.history.location,
-	        match: this.state.match
-	      }
+	      router: _extends({}, this.context.router, {
+	        history: this.props.history,
+	        route: {
+	          location: this.props.history.location,
+	          match: this.state.match
+	        }
+	      })
 	    };
 	  };
 
@@ -853,14 +1070,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return Router;
 	}(_react2.default.Component);
 
+	Router.contextTypes = {
+	  router: _propTypes2.default.object
+	};
 	Router.childContextTypes = {
-	  history: _react.PropTypes.object.isRequired,
-	  route: _react.PropTypes.object.isRequired
+	  router: _propTypes2.default.object.isRequired
 	};
 	exports.default = Router;
 
 /***/ },
-/* 11 */
+/* 15 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/**
@@ -917,7 +1136,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ },
-/* 12 */
+/* 16 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -928,6 +1147,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _react2 = _interopRequireDefault(_react);
 
+	var _propTypes = __webpack_require__(3);
+
+	var _propTypes2 = _interopRequireDefault(_propTypes);
+
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -952,7 +1175,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  Prompt.prototype.enable = function enable(message) {
 	    if (this.unblock) this.unblock();
 
-	    this.unblock = this.context.history.block(message);
+	    this.unblock = this.context.router.history.block(message);
 	  };
 
 	  Prompt.prototype.disable = function disable() {
@@ -985,18 +1208,20 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return Prompt;
 	}(_react2.default.Component);
 
-	Prompt.contextTypes = {
-	  history: _react.PropTypes.shape({
-	    block: _react.PropTypes.func.isRequired
-	  }).isRequired
-	};
 	Prompt.defaultProps = {
 	  when: true
 	};
+	Prompt.contextTypes = {
+	  router: _propTypes2.default.shape({
+	    history: _propTypes2.default.shape({
+	      block: _propTypes2.default.func.isRequired
+	    }).isRequired
+	  }).isRequired
+	};
 	exports.default = Prompt;
 
 /***/ },
-/* 13 */
+/* 17 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -1007,6 +1232,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _react2 = _interopRequireDefault(_react);
 
+	var _propTypes = __webpack_require__(3);
+
+	var _propTypes2 = _interopRequireDefault(_propTypes);
+
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -1028,16 +1257,20 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return _possibleConstructorReturn(this, _React$Component.apply(this, arguments));
 	  }
 
+	  Redirect.prototype.isStatic = function isStatic() {
+	    return this.context.router && this.context.router.staticContext;
+	  };
+
 	  Redirect.prototype.componentWillMount = function componentWillMount() {
-	    if (this.context.history.staticContext) this.perform();
+	    if (this.isStatic()) this.perform();
 	  };
 
 	  Redirect.prototype.componentDidMount = function componentDidMount() {
-	    if (!this.context.history.staticContext) this.perform();
+	    if (!this.isStatic()) this.perform();
 	  };
 
 	  Redirect.prototype.perform = function perform() {
-	    var history = this.context.history;
+	    var history = this.context.router.history;
 	    var _props = this.props,
 	        push = _props.push,
 	        to = _props.to;
@@ -1057,27 +1290,31 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return Redirect;
 	}(_react2.default.Component);
 
-	Redirect.contextTypes = {
-	  history: _react.PropTypes.shape({
-	    push: _react.PropTypes.func.isRequired,
-	    replace: _react.PropTypes.func.isRequired,
-	    staticContext: _react.PropTypes.object
-	  }).isRequired
-	};
 	Redirect.defaultProps = {
 	  push: false
 	};
+	Redirect.contextTypes = {
+	  router: _propTypes2.default.shape({
+	    history: _propTypes2.default.shape({
+	      push: _propTypes2.default.func.isRequired,
+	      replace: _propTypes2.default.func.isRequired
+	    }).isRequired,
+	    staticContext: _propTypes2.default.object
+	  }).isRequired
+	};
 	exports.default = Redirect;
 
 /***/ },
-/* 14 */
+/* 18 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	exports.__esModule = true;
 
-	var _warning = __webpack_require__(4);
+	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; };
+
+	var _warning = __webpack_require__(8);
 
 	var _warning2 = _interopRequireDefault(_warning);
 
@@ -1085,7 +1322,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _react2 = _interopRequireDefault(_react);
 
-	var _matchPath = __webpack_require__(15);
+	var _propTypes = __webpack_require__(3);
+
+	var _propTypes2 = _interopRequireDefault(_propTypes);
+
+	var _matchPath = __webpack_require__(19);
 
 	var _matchPath2 = _interopRequireDefault(_matchPath);
 
@@ -1113,16 +1354,18 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 
 	    return _ret = (_temp = (_this = _possibleConstructorReturn(this, _React$Component.call.apply(_React$Component, [this].concat(args))), _this), _this.state = {
-	      match: _this.computeMatch(_this.props, _this.context)
+	      match: _this.computeMatch(_this.props, _this.context.router)
 	    }, _temp), _possibleConstructorReturn(_this, _ret);
 	  }
 
 	  Route.prototype.getChildContext = function getChildContext() {
 	    return {
-	      route: {
-	        location: this.props.location || this.context.route.location,
-	        match: this.state.match
-	      }
+	      router: _extends({}, this.context.router, {
+	        route: {
+	          location: this.props.location || this.context.router.route.location,
+	          match: this.state.match
+	        }
+	      })
 	    };
 	  };
 
@@ -1138,7 +1381,21 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    var pathname = (location || route.location).pathname;
 
-	    return (0, _matchPath2.default)(pathname, { path: path, strict: strict, exact: exact });
+	    return path ? (0, _matchPath2.default)(pathname, { path: path, strict: strict, exact: exact }) : route.match;
+	  };
+
+	  Route.prototype.componentWillMount = function componentWillMount() {
+	    var _props = this.props,
+	        component = _props.component,
+	        render = _props.render,
+	        children = _props.children;
+
+
+	     false ? (0, _warning2.default)(!(component && render), 'You should not use <Route component> and <Route render> in the same route; <Route render> will be ignored') : void 0;
+
+	     false ? (0, _warning2.default)(!(component && children), 'You should not use <Route component> and <Route children> in the same route; <Route children> will be ignored') : void 0;
+
+	     false ? (0, _warning2.default)(!(render && children), 'You should not use <Route render> and <Route children> in the same route; <Route children> will be ignored') : void 0;
 	  };
 
 	  Route.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps, nextContext) {
@@ -1147,22 +1404,23 @@ return /******/ (function(modules) { // webpackBootstrap
 	     false ? (0, _warning2.default)(!(!nextProps.location && this.props.location), '<Route> elements should not change from controlled to uncontrolled (or vice versa). You provided a "location" prop initially but omitted it on a subsequent render.') : void 0;
 
 	    this.setState({
-	      match: this.computeMatch(nextProps, nextContext)
+	      match: this.computeMatch(nextProps, nextContext.router)
 	    });
 	  };
 
 	  Route.prototype.render = function render() {
 	    var match = this.state.match;
-	    var _props = this.props,
-	        children = _props.children,
-	        component = _props.component,
-	        render = _props.render;
-	    var _context = this.context,
-	        history = _context.history,
-	        route = _context.route;
+	    var _props2 = this.props,
+	        children = _props2.children,
+	        component = _props2.component,
+	        render = _props2.render;
+	    var _context$router = this.context.router,
+	        history = _context$router.history,
+	        route = _context$router.route,
+	        staticContext = _context$router.staticContext;
 
 	    var location = this.props.location || route.location;
-	    var props = { match: match, location: location, history: history };
+	    var props = { match: match, location: location, history: history, staticContext: staticContext };
 
 	    return component ? // component prop gets first priority, only called if there's a match
 	    match ? _react2.default.createElement(component, props) : null : render ? // render prop is next, only called if there's a match
@@ -1175,23 +1433,26 @@ return /******/ (function(modules) { // webpackBootstrap
 	}(_react2.default.Component);
 
 	Route.contextTypes = {
-	  history: _react.PropTypes.object.isRequired,
-	  route: _react.PropTypes.object.isRequired
+	  router: _propTypes2.default.shape({
+	    history: _propTypes2.default.object.isRequired,
+	    route: _propTypes2.default.object.isRequired,
+	    staticContext: _propTypes2.default.object
+	  })
 	};
 	Route.childContextTypes = {
-	  route: _react.PropTypes.object.isRequired
+	  router: _propTypes2.default.object.isRequired
 	};
 	exports.default = Route;
 
 /***/ },
-/* 15 */
+/* 19 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
 
 	exports.__esModule = true;
 
-	var _pathToRegexp = __webpack_require__(16);
+	var _pathToRegexp = __webpack_require__(20);
 
 	var _pathToRegexp2 = _interopRequireDefault(_pathToRegexp);
 
@@ -1228,15 +1489,13 @@ return /******/ (function(modules) { // webpackBootstrap
 	  if (typeof options === 'string') options = { path: options };
 
 	  var _options = options,
+	      _options$path = _options.path,
+	      path = _options$path === undefined ? '/' : _options$path,
 	      _options$exact = _options.exact,
 	      exact = _options$exact === undefined ? false : _options$exact,
 	      _options$strict = _options.strict,
 	      strict = _options$strict === undefined ? false : _options$strict;
 
-	  var path = options.path || options.from;
-
-	  if (!path) return { url: pathname, isExact: true, params: {} };
-
 	  var _compilePath = compilePath(path, { end: exact, strict: strict }),
 	      re = _compilePath.re,
 	      keys = _compilePath.keys;
@@ -1266,10 +1525,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.default = matchPath;
 
 /***/ },
-/* 16 */
+/* 20 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var isarray = __webpack_require__(17)
+	var isarray = __webpack_require__(21)
 
 	/**
 	 * Expose `pathToRegexp`.
@@ -1698,7 +1957,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ },
-/* 17 */
+/* 21 */
 /***/ function(module, exports) {
 
 	module.exports = Array.isArray || function (arr) {
@@ -1707,7 +1966,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ },
-/* 18 */
+/* 22 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -1716,7 +1975,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	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; };
 
-	var _invariant = __webpack_require__(11);
+	var _invariant = __webpack_require__(15);
 
 	var _invariant2 = _interopRequireDefault(_invariant);
 
@@ -1724,9 +1983,13 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _react2 = _interopRequireDefault(_react);
 
-	var _PathUtils = __webpack_require__(5);
+	var _propTypes = __webpack_require__(3);
+
+	var _propTypes2 = _interopRequireDefault(_propTypes);
+
+	var _PathUtils = __webpack_require__(9);
 
-	var _Router = __webpack_require__(10);
+	var _Router = __webpack_require__(14);
 
 	var _Router2 = _interopRequireDefault(_Router);
 
@@ -1836,6 +2099,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }, _temp), _possibleConstructorReturn(_this, _ret);
 	  }
 
+	  StaticRouter.prototype.getChildContext = function getChildContext() {
+	    return {
+	      router: {
+	        staticContext: this.props.context
+	      }
+	    };
+	  };
+
 	  StaticRouter.prototype.render = function render() {
 	    var _props = this.props,
 	        basename = _props.basename,
@@ -1844,7 +2115,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	        props = _objectWithoutProperties(_props, ['basename', 'context', 'location']);
 
 	    var history = {
-	      staticContext: context,
 	      createHref: this.createHref,
 	      action: 'POP',
 	      location: stripBasename(basename, createLocation(location)),
@@ -1867,10 +2137,13 @@ return /******/ (function(modules) { // webpackBootstrap
 	  basename: '',
 	  location: '/'
 	};
+	StaticRouter.childContextTypes = {
+	  router: _propTypes2.default.object.isRequired
+	};
 	exports.default = StaticRouter;
 
 /***/ },
-/* 19 */
+/* 23 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -1881,11 +2154,15 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _react2 = _interopRequireDefault(_react);
 
-	var _warning = __webpack_require__(4);
+	var _propTypes = __webpack_require__(3);
+
+	var _propTypes2 = _interopRequireDefault(_propTypes);
+
+	var _warning = __webpack_require__(8);
 
 	var _warning2 = _interopRequireDefault(_warning);
 
-	var _matchPath = __webpack_require__(15);
+	var _matchPath = __webpack_require__(19);
 
 	var _matchPath2 = _interopRequireDefault(_matchPath);
 
@@ -1916,16 +2193,27 @@ return /******/ (function(modules) { // webpackBootstrap
 	  };
 
 	  Switch.prototype.render = function render() {
+	    var route = this.context.router.route;
 	    var children = this.props.children;
 
-	    var location = this.props.location || this.context.route.location;
+	    var location = this.props.location || route.location;
 
 	    var match = void 0,
 	        child = void 0;
 	    _react2.default.Children.forEach(children, function (element) {
+	      if (!_react2.default.isValidElement(element)) return;
+
+	      var _element$props = element.props,
+	          pathProp = _element$props.path,
+	          exact = _element$props.exact,
+	          strict = _element$props.strict,
+	          from = _element$props.from;
+
+	      var path = pathProp || from;
+
 	      if (match == null) {
 	        child = element;
-	        match = (0, _matchPath2.default)(location.pathname, element.props);
+	        match = path ? (0, _matchPath2.default)(location.pathname, { path: path, exact: exact, strict: strict }) : route.match;
 	      }
 	    });
 
@@ -1936,12 +2224,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	}(_react2.default.Component);
 
 	Switch.contextTypes = {
-	  route: _react.PropTypes.object.isRequired
+	  router: _propTypes2.default.shape({
+	    route: _propTypes2.default.object.isRequired
+	  }).isRequired
 	};
 	exports.default = Switch;
 
 /***/ },
-/* 20 */
+/* 24 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -1954,29 +2244,100 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _react2 = _interopRequireDefault(_react);
 
-	var _Route = __webpack_require__(14);
+	var _propTypes = __webpack_require__(3);
+
+	var _propTypes2 = _interopRequireDefault(_propTypes);
+
+	var _hoistNonReactStatics = __webpack_require__(25);
+
+	var _hoistNonReactStatics2 = _interopRequireDefault(_hoistNonReactStatics);
+
+	var _Route = __webpack_require__(18);
 
 	var _Route2 = _interopRequireDefault(_Route);
 
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+	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; }
+
 	/**
 	 * A public higher-order component to access the imperative API
 	 */
 	var withRouter = function withRouter(Component) {
 	  var C = function C(props) {
+	    var wrappedComponentRef = props.wrappedComponentRef,
+	        remainingProps = _objectWithoutProperties(props, ['wrappedComponentRef']);
+
 	    return _react2.default.createElement(_Route2.default, { render: function render(routeComponentProps) {
-	        return _react2.default.createElement(Component, _extends({}, props, routeComponentProps));
+	        return _react2.default.createElement(Component, _extends({}, remainingProps, routeComponentProps, { ref: wrappedComponentRef }));
 	      } });
 	  };
 
 	  C.displayName = 'withRouter(' + (Component.displayName || Component.name) + ')';
+	  C.WrappedComponent = Component;
+
 
-	  return C;
+	  return (0, _hoistNonReactStatics2.default)(C, Component);
 	};
 
 	exports.default = withRouter;
 
+/***/ },
+/* 25 */
+/***/ function(module, exports) {
+
+	/**
+	 * Copyright 2015, Yahoo! Inc.
+	 * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
+	 */
+	'use strict';
+
+	var REACT_STATICS = {
+	    childContextTypes: true,
+	    contextTypes: true,
+	    defaultProps: true,
+	    displayName: true,
+	    getDefaultProps: true,
+	    mixins: true,
+	    propTypes: true,
+	    type: true
+	};
+
+	var KNOWN_STATICS = {
+	    name: true,
+	    length: true,
+	    prototype: true,
+	    caller: true,
+	    arguments: true,
+	    arity: true
+	};
+
+	var isGetOwnPropertySymbolsAvailable = typeof Object.getOwnPropertySymbols === 'function';
+
+	module.exports = function hoistNonReactStatics(targetComponent, sourceComponent, customStatics) {
+	    if (typeof sourceComponent !== 'string') { // don't hoist over string (html) components
+	        var keys = Object.getOwnPropertyNames(sourceComponent);
+
+	        /* istanbul ignore else */
+	        if (isGetOwnPropertySymbolsAvailable) {
+	            keys = keys.concat(Object.getOwnPropertySymbols(sourceComponent));
+	        }
+
+	        for (var i = 0; i < keys.length; ++i) {
+	            if (!REACT_STATICS[keys[i]] && !KNOWN_STATICS[keys[i]] && (!customStatics || !customStatics[keys[i]])) {
+	                try {
+	                    targetComponent[keys[i]] = sourceComponent[keys[i]];
+	                } catch (error) {
+
+	                }
+	            }
+	        }
+	    }
+
+	    return targetComponent;
+	};
+
+
 /***/ }
 /******/ ])
 });