react-router-dom 5.0.0 → 5.0.1

package/umd/react-router-dom.js

@@ -4,12 +4,12 @@
 	(factory((global.ReactRouterDOM = {}),global.React));
 }(this, (function (exports,React) { 'use strict';
 
-	React = React && React.hasOwnProperty('default') ? React['default'] : React;
+	var React__default = 'default' in React ? React['default'] : React;
 
-	var commonjsGlobal = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+	var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 	function unwrapExports (x) {
-		return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x.default : x;
+		return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 	}
 
 	function createCommonjsModule(fn, module) {
@@ -774,124 +774,56 @@
 	  return commonjsGlobal[key] = (commonjsGlobal[key] || 0) + 1;
 	};
 
-	/**
-	 * Copyright (c) 2013-present, Facebook, Inc.
-	 *
-	 * This source code is licensed under the MIT license found in the
-	 * LICENSE file in the root directory of this source tree.
-	 *
-	 * 
-	 */
-
-	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$1 = function emptyFunction() {};
-
-	emptyFunction$1.thatReturns = makeEmptyFunction;
-	emptyFunction$1.thatReturnsFalse = makeEmptyFunction(false);
-	emptyFunction$1.thatReturnsTrue = makeEmptyFunction(true);
-	emptyFunction$1.thatReturnsNull = makeEmptyFunction(null);
-	emptyFunction$1.thatReturnsThis = function () {
-	  return this;
-	};
-	emptyFunction$1.thatReturnsArgument = function (arg) {
-	  return arg;
-	};
-
-	var emptyFunction_1 = emptyFunction$1;
-
-	/**
-	 * Similar to invariant but only logs a warning if the condition is not met.
-	 * This can be used to log issues in development environments in critical
-	 * paths. Removing the logging code for production environments will keep the
-	 * same logic and follow the same code paths.
-	 */
-
-	var warning = emptyFunction_1;
-
-	{
-	  var printWarning$2 = function printWarning(format) {
-	    for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-	      args[_key - 1] = arguments[_key];
+	function warning(condition, message) {
+	  {
+	    if (condition) {
+	      return;
 	    }
 
-	    var argIndex = 0;
-	    var message = 'Warning: ' + format.replace(/%s/g, function () {
-	      return args[argIndex++];
-	    });
+	    var text = "Warning: " + message;
+
 	    if (typeof console !== 'undefined') {
-	      console.error(message);
+	      console.warn(text);
 	    }
+
 	    try {
-	      // --- Welcome to debugging React ---
-	      // This error was thrown as a convenience so that you can use this stack
-	      // to find the callsite that caused this warning to fire.
-	      throw new Error(message);
+	      throw Error(text);
 	    } catch (x) {}
-	  };
-
-	  warning = function warning(condition, format) {
-	    if (format === undefined) {
-	      throw new Error('`warning(condition, format, ...args)` requires a warning ' + 'message argument');
-	    }
-
-	    if (format.indexOf('Failed Composite propType: ') === 0) {
-	      return; // Ignore CompositeComponent proptype check.
-	    }
-
-	    if (!condition) {
-	      for (var _len2 = arguments.length, args = Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
-	        args[_key2 - 2] = arguments[_key2];
-	      }
-
-	      printWarning$2.apply(undefined, [format].concat(args));
-	    }
-	  };
+	  }
 	}
 
-	var warning_1 = warning;
-
-	var implementation = createCommonjsModule(function (module, exports) {
-
-	exports.__esModule = true;
-
-
-
-	var _react2 = _interopRequireDefault(React);
-
-
-
-	var _propTypes2 = _interopRequireDefault(propTypes);
-
-
-
-	var _gud2 = _interopRequireDefault(gud);
-
-
-
-	var _warning2 = _interopRequireDefault(warning_1);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+	function _defineProperty(obj, key, value) {
+	  if (key in obj) {
+	    Object.defineProperty(obj, key, {
+	      value: value,
+	      enumerable: true,
+	      configurable: true,
+	      writable: true
+	    });
+	  } else {
+	    obj[key] = value;
+	  }
 
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+	  return obj;
+	}
 
-	function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+	function _inheritsLoose(subClass, superClass) {
+	  subClass.prototype = Object.create(superClass.prototype);
+	  subClass.prototype.constructor = subClass;
+	  subClass.__proto__ = superClass;
+	}
 
-	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+	function _assertThisInitialized(self) {
+	  if (self === void 0) {
+	    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+	  }
 
-	var MAX_SIGNED_31_BIT_INT = 1073741823;
+	  return self;
+	}
 
-	// Inlined Object.is polyfill.
+	var MAX_SIGNED_31_BIT_INT = 1073741823; // Inlined Object.is polyfill.
 	// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+
 	function objectIs(x, y) {
 	  if (x === y) {
 	    return x !== 0 || 1 / x === 1 / y;
@@ -928,43 +860,50 @@
 	}
 
 	function createReactContext(defaultValue, calculateChangedBits) {
-	  var _Provider$childContex, _Consumer$contextType;
+	  var _defineProperty2, _defineProperty3;
 
-	  var contextProp = '__create-react-context-' + (0, _gud2.default)() + '__';
+	  var contextProp = '__create-react-context-' + gud() + '__';
 
-	  var Provider = function (_Component) {
-	    _inherits(Provider, _Component);
+	  var Provider =
+	  /*#__PURE__*/
+	  function (_Component) {
+	    _inheritsLoose(Provider, _Component);
 
 	    function Provider() {
-	      var _temp, _this, _ret;
-
-	      _classCallCheck(this, Provider);
+	      var _this;
 
-	      for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+	      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
 	        args[_key] = arguments[_key];
 	      }
 
-	      return _ret = (_temp = (_this = _possibleConstructorReturn(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.emitter = createEventEmitter(_this.props.value), _temp), _possibleConstructorReturn(_this, _ret);
+	      _this = _Component.call.apply(_Component, [this].concat(args)) || this;
+
+	      _defineProperty(_assertThisInitialized(_this), "emitter", createEventEmitter(_this.props.value));
+
+	      return _this;
 	    }
 
-	    Provider.prototype.getChildContext = function getChildContext() {
+	    var _proto = Provider.prototype;
+
+	    _proto.getChildContext = function getChildContext() {
 	      var _ref;
 
 	      return _ref = {}, _ref[contextProp] = this.emitter, _ref;
 	    };
 
-	    Provider.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
+	    _proto.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
 	      if (this.props.value !== nextProps.value) {
 	        var oldValue = this.props.value;
 	        var newValue = nextProps.value;
-	        var changedBits = void 0;
+	        var changedBits;
 
 	        if (objectIs(oldValue, newValue)) {
 	          changedBits = 0; // No change
 	        } else {
 	          changedBits = typeof calculateChangedBits === 'function' ? calculateChangedBits(oldValue, newValue) : MAX_SIGNED_31_BIT_INT;
+
 	          {
-	            (0, _warning2.default)((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits, 'calculateChangedBits: Expected the return value to be a ' + '31-bit integer. Instead received: %s', changedBits);
+	            warning((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits, 'calculateChangedBits: Expected the return value to be a ' + '31-bit integer. Instead received: ' + changedBits);
 	          }
 
 	          changedBits |= 0;
@@ -976,61 +915,73 @@
 	      }
 	    };
 
-	    Provider.prototype.render = function render() {
+	    _proto.render = function render() {
 	      return this.props.children;
 	    };
 
 	    return Provider;
 	  }(React.Component);
 
-	  Provider.childContextTypes = (_Provider$childContex = {}, _Provider$childContex[contextProp] = _propTypes2.default.object.isRequired, _Provider$childContex);
+	  _defineProperty(Provider, "childContextTypes", (_defineProperty2 = {}, _defineProperty2[contextProp] = propTypes.object.isRequired, _defineProperty2));
 
-	  var Consumer = function (_Component2) {
-	    _inherits(Consumer, _Component2);
+	  var Consumer =
+	  /*#__PURE__*/
+	  function (_Component2) {
+	    _inheritsLoose(Consumer, _Component2);
 
 	    function Consumer() {
-	      var _temp2, _this2, _ret2;
+	      var _this2;
 
-	      _classCallCheck(this, Consumer);
-
-	      for (var _len2 = arguments.length, args = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+	      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
 	        args[_key2] = arguments[_key2];
 	      }
 
-	      return _ret2 = (_temp2 = (_this2 = _possibleConstructorReturn(this, _Component2.call.apply(_Component2, [this].concat(args))), _this2), _this2.state = {
+	      _this2 = _Component2.call.apply(_Component2, [this].concat(args)) || this;
+
+	      _defineProperty(_assertThisInitialized(_this2), "observedBits", void 0);
+
+	      _defineProperty(_assertThisInitialized(_this2), "state", {
 	        value: _this2.getValue()
-	      }, _this2.onUpdate = function (newValue, changedBits) {
+	      });
+
+	      _defineProperty(_assertThisInitialized(_this2), "onUpdate", function (newValue, changedBits) {
 	        var observedBits = _this2.observedBits | 0;
+
 	        if ((observedBits & changedBits) !== 0) {
-	          _this2.setState({ value: _this2.getValue() });
+	          _this2.setState({
+	            value: _this2.getValue()
+	          });
 	        }
-	      }, _temp2), _possibleConstructorReturn(_this2, _ret2);
+	      });
+
+	      return _this2;
 	    }
 
-	    Consumer.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
-	      var observedBits = nextProps.observedBits;
+	    var _proto2 = Consumer.prototype;
 
+	    _proto2.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
+	      var observedBits = nextProps.observedBits;
 	      this.observedBits = observedBits === undefined || observedBits === null ? MAX_SIGNED_31_BIT_INT // Subscribe to all changes by default
 	      : observedBits;
 	    };
 
-	    Consumer.prototype.componentDidMount = function componentDidMount() {
+	    _proto2.componentDidMount = function componentDidMount() {
 	      if (this.context[contextProp]) {
 	        this.context[contextProp].on(this.onUpdate);
 	      }
-	      var observedBits = this.props.observedBits;
 
+	      var observedBits = this.props.observedBits;
 	      this.observedBits = observedBits === undefined || observedBits === null ? MAX_SIGNED_31_BIT_INT // Subscribe to all changes by default
 	      : observedBits;
 	    };
 
-	    Consumer.prototype.componentWillUnmount = function componentWillUnmount() {
+	    _proto2.componentWillUnmount = function componentWillUnmount() {
 	      if (this.context[contextProp]) {
 	        this.context[contextProp].off(this.onUpdate);
 	      }
 	    };
 
-	    Consumer.prototype.getValue = function getValue() {
+	    _proto2.getValue = function getValue() {
 	      if (this.context[contextProp]) {
 	        return this.context[contextProp].get();
 	      } else {
@@ -1038,15 +989,14 @@
 	      }
 	    };
 
-	    Consumer.prototype.render = function render() {
+	    _proto2.render = function render() {
 	      return onlyChild(this.props.children)(this.state.value);
 	    };
 
 	    return Consumer;
 	  }(React.Component);
 
-	  Consumer.contextTypes = (_Consumer$contextType = {}, _Consumer$contextType[contextProp] = _propTypes2.default.object, _Consumer$contextType);
-
+	  _defineProperty(Consumer, "contextTypes", (_defineProperty3 = {}, _defineProperty3[contextProp] = propTypes.object, _defineProperty3));
 
 	  return {
 	    Provider: Provider,
@@ -1054,33 +1004,9 @@
 	  };
 	}
 
-	exports.default = createReactContext;
-	module.exports = exports['default'];
-	});
-
-	unwrapExports(implementation);
-
-	var lib = createCommonjsModule(function (module, exports) {
-
-	exports.__esModule = true;
-
-
-
-	var _react2 = _interopRequireDefault(React);
-
-
-
-	var _implementation2 = _interopRequireDefault(implementation);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	exports.default = _react2.default.createContext || _implementation2.default;
-	module.exports = exports['default'];
-	});
+	var index = React__default.createContext || createReactContext;
 
-	var createContext = unwrapExports(lib);
-
-	function _inheritsLoose(subClass, superClass) {
+	function _inheritsLoose$1(subClass, superClass) {
 	  subClass.prototype = Object.create(superClass.prototype);
 	  subClass.prototype.constructor = subClass;
 	  subClass.__proto__ = superClass;
@@ -2332,15 +2258,14 @@
 	var hoistNonReactStatics_cjs = hoistNonReactStatics;
 
 	var createNamedContext = function createNamedContext(name) {
-	  var context = createContext();
-	  context.Provider.displayName = name + ".Provider";
-	  context.Consumer.displayName = name + ".Consumer";
+	  var context = index();
+	  context.displayName = name;
 	  return context;
 	};
 
 	var context =
 	/*#__PURE__*/
-	createNamedContext('Router');
+	createNamedContext("Router");
 	/**
 	 * The public API for putting history on context.
 	 */
@@ -2348,7 +2273,7 @@
 	var Router =
 	/*#__PURE__*/
 	function (_React$Component) {
-	  _inheritsLoose(Router, _React$Component);
+	  _inheritsLoose$1(Router, _React$Component);
 
 	  Router.computeRootMatch = function computeRootMatch(pathname) {
 	    return {
@@ -2406,7 +2331,7 @@
 	  };
 
 	  _proto.render = function render() {
-	    return React.createElement(context.Provider, {
+	    return React__default.createElement(context.Provider, {
 	      children: this.props.children || null,
 	      value: {
 	        history: this.props.history,
@@ -2418,7 +2343,7 @@
 	  };
 
 	  return Router;
-	}(React.Component);
+	}(React__default.Component);
 
 	{
 	  Router.propTypes = {
@@ -2439,7 +2364,7 @@
 	var MemoryRouter =
 	/*#__PURE__*/
 	function (_React$Component) {
-	  _inheritsLoose(MemoryRouter, _React$Component);
+	  _inheritsLoose$1(MemoryRouter, _React$Component);
 
 	  function MemoryRouter() {
 	    var _this;
@@ -2456,14 +2381,14 @@
 	  var _proto = MemoryRouter.prototype;
 
 	  _proto.render = function render() {
-	    return React.createElement(Router, {
+	    return React__default.createElement(Router, {
 	      history: this.history,
 	      children: this.props.children
 	    });
 	  };
 
 	  return MemoryRouter;
-	}(React.Component);
+	}(React__default.Component);
 
 	{
 	  MemoryRouter.propTypes = {
@@ -2482,7 +2407,7 @@
 	var Lifecycle =
 	/*#__PURE__*/
 	function (_React$Component) {
-	  _inheritsLoose(Lifecycle, _React$Component);
+	  _inheritsLoose$1(Lifecycle, _React$Component);
 
 	  function Lifecycle() {
 	    return _React$Component.apply(this, arguments) || this;
@@ -2507,7 +2432,7 @@
 	  };
 
 	  return Lifecycle;
-	}(React.Component);
+	}(React__default.Component);
 	/**
 	 * The public API for prompting the user before navigating away from a screen.
 	 */
@@ -2517,11 +2442,11 @@
 	  var message = _ref.message,
 	      _ref$when = _ref.when,
 	      when = _ref$when === void 0 ? true : _ref$when;
-	  return React.createElement(context.Consumer, null, function (context$$1) {
+	  return React__default.createElement(context.Consumer, null, function (context$$1) {
 	    !context$$1 ? invariant(false, "You should not use <Prompt> outside a <Router>") : void 0;
 	    if (!when || context$$1.staticContext) return null;
 	    var method = context$$1.history.block;
-	    return React.createElement(Lifecycle, {
+	    return React__default.createElement(Lifecycle, {
 	      onMount: function onMount(self) {
 	        self.release = method(message);
 	      },
@@ -2590,7 +2515,7 @@
 	      to = _ref.to,
 	      _ref$push = _ref.push,
 	      push = _ref$push === void 0 ? false : _ref$push;
-	  return React.createElement(context.Consumer, null, function (context$$1) {
+	  return React__default.createElement(context.Consumer, null, function (context$$1) {
 	    !context$$1 ? invariant(false, "You should not use <Redirect> outside a <Router>") : void 0;
 	    var history = context$$1.history,
 	        staticContext = context$$1.staticContext;
@@ -2605,12 +2530,16 @@
 	      return null;
 	    }
 
-	    return React.createElement(Lifecycle, {
+	    return React__default.createElement(Lifecycle, {
 	      onMount: function onMount() {
 	        method(location);
 	      },
 	      onUpdate: function onUpdate(self, prevProps) {
-	        if (!locationsAreEqual(prevProps.to, location)) {
+	        var prevLocation = createLocation(prevProps.to);
+
+	        if (!locationsAreEqual(prevLocation, _extends({}, location, {
+	          key: prevLocation.key
+	        }))) {
 	          method(location);
 	        }
 	      },
@@ -2672,6 +2601,7 @@
 	      sensitive = _options$sensitive === void 0 ? false : _options$sensitive;
 	  var paths = [].concat(path);
 	  return paths.reduce(function (matched, path) {
+	    if (!path) return null;
 	    if (matched) return matched;
 
 	    var _compilePath = compilePath$1(path, {
@@ -2695,8 +2625,8 @@
 	      // the matched portion of the URL
 	      isExact: isExact,
 	      // whether or not we matched exactly
-	      params: keys.reduce(function (memo, key, index) {
-	        memo[key.name] = values[index];
+	      params: keys.reduce(function (memo, key, index$$1) {
+	        memo[key.name] = values[index$$1];
 	        return memo;
 	      }, {})
 	    };
@@ -2704,7 +2634,7 @@
 	}
 
 	function isEmptyChildren(children) {
-	  return React.Children.count(children) === 0;
+	  return React__default.Children.count(children) === 0;
 	}
 	/**
 	 * The public API for matching a single path and rendering.
@@ -2714,7 +2644,7 @@
 	var Route =
 	/*#__PURE__*/
 	function (_React$Component) {
-	  _inheritsLoose(Route, _React$Component);
+	  _inheritsLoose$1(Route, _React$Component);
 
 	  function Route() {
 	    return _React$Component.apply(this, arguments) || this;
@@ -2725,7 +2655,7 @@
 	  _proto.render = function render() {
 	    var _this = this;
 
-	    return React.createElement(context.Consumer, null, function (context$$1) {
+	    return React__default.createElement(context.Consumer, null, function (context$$1) {
 	      !context$$1 ? invariant(false, "You should not use <Route> outside a <Router>") : void 0;
 	      var location = _this.props.location || context$$1.location;
 	      var match = _this.props.computedMatch ? _this.props.computedMatch // <Switch> already computed the match for us
@@ -2759,14 +2689,14 @@
 	        }
 	      }
 
-	      return React.createElement(context.Provider, {
+	      return React__default.createElement(context.Provider, {
 	        value: props
-	      }, children && !isEmptyChildren(children) ? children : props.match ? component ? React.createElement(component, props) : render ? render(props) : null : null);
+	      }, children && !isEmptyChildren(children) ? children : props.match ? component ? React__default.createElement(component, props) : render ? render(props) : null : null);
 	    });
 	  };
 
 	  return Route;
-	}(React.Component);
+	}(React__default.Component);
 
 	{
 	  Route.propTypes = {
@@ -2838,7 +2768,7 @@
 	var StaticRouter =
 	/*#__PURE__*/
 	function (_React$Component) {
-	  _inheritsLoose(StaticRouter, _React$Component);
+	  _inheritsLoose$1(StaticRouter, _React$Component);
 
 	  function StaticRouter() {
 	    var _this;
@@ -2874,7 +2804,8 @@
 	    var _this$props = this.props,
 	        _this$props$basename = _this$props.basename,
 	        basename = _this$props$basename === void 0 ? "" : _this$props$basename,
-	        context = _this$props.context;
+	        _this$props$context = _this$props.context,
+	        context = _this$props$context === void 0 ? {} : _this$props$context;
 	    context.action = action;
 	    context.location = addBasename(basename, createLocation(location));
 	    context.url = createURL(context.location);
@@ -2904,14 +2835,14 @@
 	      listen: this.handleListen,
 	      block: this.handleBlock
 	    };
-	    return React.createElement(Router, _extends({}, rest, {
+	    return React__default.createElement(Router, _extends({}, rest, {
 	      history: history,
 	      staticContext: context
 	    }));
 	  };
 
 	  return StaticRouter;
-	}(React.Component);
+	}(React__default.Component);
 
 	{
 	  StaticRouter.propTypes = {
@@ -2932,7 +2863,7 @@
 	var Switch =
 	/*#__PURE__*/
 	function (_React$Component) {
-	  _inheritsLoose(Switch, _React$Component);
+	  _inheritsLoose$1(Switch, _React$Component);
 
 	  function Switch() {
 	    return _React$Component.apply(this, arguments) || this;
@@ -2943,7 +2874,7 @@
 	  _proto.render = function render() {
 	    var _this = this;
 
-	    return React.createElement(context.Consumer, null, function (context$$1) {
+	    return React__default.createElement(context.Consumer, null, function (context$$1) {
 	      !context$$1 ? invariant(false, "You should not use <Switch> outside a <Router>") : void 0;
 	      var location = _this.props.location || context$$1.location;
 	      var element, match; // We use React.Children.forEach instead of React.Children.toArray().find()
@@ -2951,8 +2882,8 @@
 	      // to trigger an unmount/remount for two <Route>s that render the same
 	      // component at different URLs.
 
-	      React.Children.forEach(_this.props.children, function (child) {
-	        if (match == null && React.isValidElement(child)) {
+	      React__default.Children.forEach(_this.props.children, function (child) {
+	        if (match == null && React__default.isValidElement(child)) {
 	          element = child;
 	          var path = child.props.path || child.props.from;
 	          match = path ? matchPath(location.pathname, _extends({}, child.props, {
@@ -2960,7 +2891,7 @@
 	          })) : context$$1.match;
 	        }
 	      });
-	      return match ? React.cloneElement(element, {
+	      return match ? React__default.cloneElement(element, {
 	        location: location,
 	        computedMatch: match
 	      }) : null;
@@ -2968,7 +2899,7 @@
 	  };
 
 	  return Switch;
-	}(React.Component);
+	}(React__default.Component);
 
 	{
 	  Switch.propTypes = {
@@ -2987,25 +2918,26 @@
 
 
 	function withRouter(Component) {
+	  var displayName = "withRouter(" + (Component.displayName || Component.name) + ")";
+
 	  var C = function C(props) {
 	    var wrappedComponentRef = props.wrappedComponentRef,
 	        remainingProps = _objectWithoutPropertiesLoose(props, ["wrappedComponentRef"]);
 
-	    return React.createElement(Route, {
-	      children: function children(routeComponentProps) {
-	        return React.createElement(Component, _extends({}, remainingProps, routeComponentProps, {
-	          ref: wrappedComponentRef
-	        }));
-	      }
+	    return React__default.createElement(context.Consumer, null, function (context$$1) {
+	      !context$$1 ? invariant(false, "You should not use <" + displayName + " /> outside a <Router>") : void 0;
+	      return React__default.createElement(Component, _extends({}, remainingProps, context$$1, {
+	        ref: wrappedComponentRef
+	      }));
 	    });
 	  };
 
-	  C.displayName = "withRouter(" + (Component.displayName || Component.name) + ")";
+	  C.displayName = displayName;
 	  C.WrappedComponent = Component;
 
 	  {
 	    C.propTypes = {
-	      wrappedComponentRef: propTypes.func
+	      wrappedComponentRef: propTypes.oneOfType([propTypes.string, propTypes.func, propTypes.object])
 	    };
 	  }
 
@@ -3034,7 +2966,7 @@
 	  }
 	}
 
-	function _inheritsLoose$1(subClass, superClass) {
+	function _inheritsLoose$2(subClass, superClass) {
 	  subClass.prototype = Object.create(superClass.prototype);
 	  subClass.prototype.constructor = subClass;
 	  subClass.__proto__ = superClass;
@@ -4039,13 +3971,13 @@
 
 	var ReactPropTypesSecret_1$1 = ReactPropTypesSecret$2;
 
-	var printWarning$3 = function() {};
+	var printWarning$2 = function() {};
 
 	{
 	  var ReactPropTypesSecret$3 = ReactPropTypesSecret_1$1;
 	  var loggedTypeFailures$1 = {};
 
-	  printWarning$3 = function(text) {
+	  printWarning$2 = function(text) {
 	    var message = 'Warning: ' + text;
 	    if (typeof console !== 'undefined') {
 	      console.error(message);
@@ -4094,7 +4026,7 @@
 	          error = ex;
 	        }
 	        if (error && !(error instanceof Error)) {
-	          printWarning$3(
+	          printWarning$2(
 	            (componentName || 'React class') + ': type specification of ' +
 	            location + ' `' + typeSpecName + '` is invalid; the type checker ' +
 	            'function must return `null` or an `Error` but returned a ' + typeof error + '. ' +
@@ -4111,7 +4043,7 @@
 
 	          var stack = getStack ? getStack() : '';
 
-	          printWarning$3(
+	          printWarning$2(
 	            'Failed ' + location + ' type: ' + error.message + (stack != null ? stack : '')
 	          );
 	        }
@@ -4122,10 +4054,10 @@
 
 	var checkPropTypes_1$1 = checkPropTypes$1;
 
-	var printWarning$4 = function() {};
+	var printWarning$3 = function() {};
 
 	{
-	  printWarning$4 = function(text) {
+	  printWarning$3 = function(text) {
 	    var message = 'Warning: ' + text;
 	    if (typeof console !== 'undefined') {
 	      console.error(message);
@@ -4300,7 +4232,7 @@
 	            // Avoid spamming the console because they are often not actionable except for lib authors
 	            manualPropTypeWarningCount < 3
 	          ) {
-	            printWarning$4(
+	            printWarning$3(
 	              'You are manually calling a React.PropTypes validation ' +
 	              'function for the `' + propFullName + '` prop on `' + componentName  + '`. This is deprecated ' +
 	              'and will throw in the standalone `prop-types` package. ' +
@@ -4399,7 +4331,7 @@
 
 	  function createEnumTypeChecker(expectedValues) {
 	    if (!Array.isArray(expectedValues)) {
-	      printWarning$4('Invalid argument supplied to oneOf, expected an instance of array.');
+	      printWarning$3('Invalid argument supplied to oneOf, expected an instance of array.');
 	      return emptyFunctionThatReturnsNull$1;
 	    }
 
@@ -4442,14 +4374,14 @@
 
 	  function createUnionTypeChecker(arrayOfTypeCheckers) {
 	    if (!Array.isArray(arrayOfTypeCheckers)) {
-	      printWarning$4('Invalid argument supplied to oneOfType, expected an instance of array.');
+	      printWarning$3('Invalid argument supplied to oneOfType, expected an instance of array.');
 	      return emptyFunctionThatReturnsNull$1;
 	    }
 
 	    for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
 	      var checker = arrayOfTypeCheckers[i];
 	      if (typeof checker !== 'function') {
-	        printWarning$4(
+	        printWarning$3(
 	          'Invalid argument supplied to oneOfType. Expected an array of check functions, but ' +
 	          'received ' + getPostfixForTypeWarning(checker) + ' at index ' + i + '.'
 	        );
@@ -4698,7 +4630,7 @@
 	var BrowserRouter =
 	/*#__PURE__*/
 	function (_React$Component) {
-	  _inheritsLoose$1(BrowserRouter, _React$Component);
+	  _inheritsLoose$2(BrowserRouter, _React$Component);
 
 	  function BrowserRouter() {
 	    var _this;
@@ -4715,14 +4647,14 @@
 	  var _proto = BrowserRouter.prototype;
 
 	  _proto.render = function render() {
-	    return React.createElement(Router, {
+	    return React__default.createElement(Router, {
 	      history: this.history,
 	      children: this.props.children
 	    });
 	  };
 
 	  return BrowserRouter;
-	}(React.Component);
+	}(React__default.Component);
 
 	{
 	  BrowserRouter.propTypes = {
@@ -4745,7 +4677,7 @@
 	var HashRouter =
 	/*#__PURE__*/
 	function (_React$Component) {
-	  _inheritsLoose$1(HashRouter, _React$Component);
+	  _inheritsLoose$2(HashRouter, _React$Component);
 
 	  function HashRouter() {
 	    var _this;
@@ -4762,14 +4694,14 @@
 	  var _proto = HashRouter.prototype;
 
 	  _proto.render = function render() {
-	    return React.createElement(Router, {
+	    return React__default.createElement(Router, {
 	      history: this.history,
 	      children: this.props.children
 	    });
 	  };
 
 	  return HashRouter;
-	}(React.Component);
+	}(React__default.Component);
 
 	{
 	  HashRouter.propTypes = {
@@ -4810,7 +4742,7 @@
 	var Link =
 	/*#__PURE__*/
 	function (_React$Component) {
-	  _inheritsLoose$1(Link, _React$Component);
+	  _inheritsLoose$2(Link, _React$Component);
 
 	  function Link() {
 	    return _React$Component.apply(this, arguments) || this;
@@ -4819,7 +4751,12 @@
 	  var _proto = Link.prototype;
 
 	  _proto.handleClick = function handleClick(event, history) {
-	    if (this.props.onClick) this.props.onClick(event);
+	    try {
+	      if (this.props.onClick) this.props.onClick(event);
+	    } catch (ex) {
+	      event.preventDefault();
+	      throw ex;
+	    }
 
 	    if (!event.defaultPrevented && // onClick prevented default
 	    event.button === 0 && ( // ignore everything but left clicks
@@ -4842,11 +4779,11 @@
 	        rest = _objectWithoutPropertiesLoose$1(_this$props, ["innerRef", "replace", "to"]); // eslint-disable-line no-unused-vars
 
 
-	    return React.createElement(context.Consumer, null, function (context$$1) {
+	    return React__default.createElement(context.Consumer, null, function (context$$1) {
 	      !context$$1 ? invariant$1(false, "You should not use <Link> outside a <Router>") : void 0;
 	      var location = typeof to === "string" ? createLocation$1(to, null, null, context$$1.location) : to;
 	      var href = location ? context$$1.history.createHref(location) : "";
-	      return React.createElement("a", _extends$1({}, rest, {
+	      return React__default.createElement("a", _extends$1({}, rest, {
 	        onClick: function onClick(event) {
 	          return _this.handleClick(event, context$$1.history);
 	        },
@@ -4857,7 +4794,7 @@
 	  };
 
 	  return Link;
-	}(React.Component);
+	}(React__default.Component);
 
 	{
 	  var toType = propTypes$1.oneOfType([propTypes$1.string, propTypes$1.object]);
@@ -4896,7 +4833,7 @@
 	      classNameProp = _ref.className,
 	      exact = _ref.exact,
 	      isActiveProp = _ref.isActive,
-	      location = _ref.location,
+	      locationProp = _ref.location,
 	      strict = _ref.strict,
 	      styleProp = _ref.style,
 	      to = _ref.to,
@@ -4905,24 +4842,23 @@
 	  var path = typeof to === "object" ? to.pathname : to; // Regex taken from: https://github.com/pillarjs/path-to-regexp/blob/master/index.js#L202
 
 	  var escapedPath = path && path.replace(/([.+*?=^!:${}()[\]|/\\])/g, "\\$1");
-	  return React.createElement(Route, {
-	    path: escapedPath,
-	    exact: exact,
-	    strict: strict,
-	    location: location,
-	    children: function children(_ref2) {
-	      var location = _ref2.location,
-	          match = _ref2.match;
-	      var isActive = !!(isActiveProp ? isActiveProp(match, location) : match);
-	      var className = isActive ? joinClassnames(classNameProp, activeClassName) : classNameProp;
-	      var style = isActive ? _extends$1({}, styleProp, activeStyle) : styleProp;
-	      return React.createElement(Link, _extends$1({
-	        "aria-current": isActive && ariaCurrent || null,
-	        className: className,
-	        style: style,
-	        to: to
-	      }, rest));
-	    }
+	  return React__default.createElement(context.Consumer, null, function (context$$1) {
+	    !context$$1 ? invariant$1(false, "You should not use <NavLink> outside a <Router>") : void 0;
+	    var pathToMatch = locationProp ? locationProp.pathname : context$$1.location.pathname;
+	    var match = escapedPath ? matchPath(pathToMatch, {
+	      path: escapedPath,
+	      exact: exact,
+	      strict: strict
+	    }) : null;
+	    var isActive = !!(isActiveProp ? isActiveProp(match, context$$1.location) : match);
+	    var className = isActive ? joinClassnames(classNameProp, activeClassName) : classNameProp;
+	    var style = isActive ? _extends$1({}, styleProp, activeStyle) : styleProp;
+	    return React__default.createElement(Link, _extends$1({
+	      "aria-current": isActive && ariaCurrent || null,
+	      className: className,
+	      style: style,
+	      to: to
+	    }, rest));
 	  });
 	}
 
@@ -4933,10 +4869,10 @@
 	    activeClassName: propTypes$1.string,
 	    activeStyle: propTypes$1.object,
 	    className: propTypes$1.string,
-	    exact: Route.propTypes.exact,
+	    exact: propTypes$1.bool,
 	    isActive: propTypes$1.func,
 	    location: propTypes$1.object,
-	    strict: Route.propTypes.strict,
+	    strict: propTypes$1.bool,
 	    style: propTypes$1.object
 	  });
 	}