react-router 4.4.0-beta.6 → 5.0.1

package/umd/react-router.js

@@ -4,7 +4,7 @@
   (factory((global.ReactRouter = {}),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;
 
   function _inheritsLoose(subClass, superClass) {
     subClass.prototype = Object.create(superClass.prototype);
@@ -12,10 +12,10 @@
     subClass.__proto__ = superClass;
   }
 
-  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) {
@@ -920,17 +920,17 @@
   }
 
   function parsePath(path) {
-    var pathname = path || "/";
-    var search = "";
-    var hash = "";
-    var hashIndex = pathname.indexOf("#");
+    var pathname = path || '/';
+    var search = '';
+    var hash = '';
+    var hashIndex = pathname.indexOf('#');
 
     if (hashIndex !== -1) {
       hash = pathname.substr(hashIndex);
       pathname = pathname.substr(0, hashIndex);
     }
 
-    var searchIndex = pathname.indexOf("?");
+    var searchIndex = pathname.indexOf('?');
 
     if (searchIndex !== -1) {
       search = pathname.substr(searchIndex);
@@ -939,42 +939,42 @@
 
     return {
       pathname: pathname,
-      search: search === "?" ? "" : search,
-      hash: hash === "#" ? "" : hash
+      search: search === '?' ? '' : search,
+      hash: hash === '#' ? '' : hash
     };
   }
   function createPath(location) {
     var pathname = location.pathname,
         search = location.search,
         hash = location.hash;
-    var path = pathname || "/";
-    if (search && search !== "?") path += search.charAt(0) === "?" ? search : "?" + search;
-    if (hash && hash !== "#") path += hash.charAt(0) === "#" ? hash : "#" + hash;
+    var path = pathname || '/';
+    if (search && search !== '?') path += search.charAt(0) === '?' ? search : "?" + search;
+    if (hash && hash !== '#') path += hash.charAt(0) === '#' ? hash : "#" + hash;
     return path;
   }
 
   function createLocation(path, state, key, currentLocation) {
     var location;
 
-    if (typeof path === "string") {
+    if (typeof path === 'string') {
       // Two-arg form: push(path, state)
       location = parsePath(path);
       location.state = state;
     } else {
       // One-arg form: push(location)
       location = _extends({}, path);
-      if (location.pathname === undefined) location.pathname = "";
+      if (location.pathname === undefined) location.pathname = '';
 
       if (location.search) {
-        if (location.search.charAt(0) !== "?") location.search = "?" + location.search;
+        if (location.search.charAt(0) !== '?') location.search = '?' + location.search;
       } else {
-        location.search = "";
+        location.search = '';
       }
 
       if (location.hash) {
-        if (location.hash.charAt(0) !== "#") location.hash = "#" + location.hash;
+        if (location.hash.charAt(0) !== '#') location.hash = '#' + location.hash;
       } else {
-        location.hash = "";
+        location.hash = '';
       }
 
       if (state !== undefined && location.state === undefined) location.state = state;
@@ -984,7 +984,7 @@
       location.pathname = decodeURI(location.pathname);
     } catch (e) {
       if (e instanceof URIError) {
-        throw new URIError('Pathname "' + location.pathname + '" could not be decoded. ' + "This is likely caused by an invalid percent-encoding.");
+        throw new URIError('Pathname "' + location.pathname + '" could not be decoded. ' + 'This is likely caused by an invalid percent-encoding.');
       } else {
         throw e;
       }
@@ -996,13 +996,13 @@
       // Resolve incomplete/relative pathname relative to current location.
       if (!location.pathname) {
         location.pathname = currentLocation.pathname;
-      } else if (location.pathname.charAt(0) !== "/") {
+      } else if (location.pathname.charAt(0) !== '/') {
         location.pathname = resolvePathname(location.pathname, currentLocation.pathname);
       }
     } else {
       // When there is no prior location and pathname is empty, set it to /
       if (!location.pathname) {
-        location.pathname = "/";
+        location.pathname = '/';
       }
     }
 
@@ -1016,7 +1016,7 @@
     var prompt = null;
 
     function setPrompt(nextPrompt) {
-      warning(prompt == null, "A history supports only one prompt at a time");
+      warning(prompt == null, 'A history supports only one prompt at a time');
       prompt = nextPrompt;
       return function () {
         if (prompt === nextPrompt) prompt = null;
@@ -1028,13 +1028,13 @@
       // the previous one, we may end up in a weird state. Figure out the
       // best way to handle this.
       if (prompt != null) {
-        var result = typeof prompt === "function" ? prompt(location, action) : prompt;
+        var result = typeof prompt === 'function' ? prompt(location, action) : prompt;
 
-        if (typeof result === "string") {
-          if (typeof getUserConfirmation === "function") {
+        if (typeof result === 'string') {
+          if (typeof getUserConfirmation === 'function') {
             getUserConfirmation(result, callback);
           } else {
-            warning(false, "A history needs a getUserConfirmation function in order to use a prompt message");
+            warning(false, 'A history needs a getUserConfirmation function in order to use a prompt message');
             callback(true);
           }
         } else {
@@ -1082,7 +1082,7 @@
     };
   }
 
-  var canUseDOM = !!(typeof window !== "undefined" && window.document && window.document.createElement);
+  var canUseDOM = !!(typeof window !== 'undefined' && window.document && window.document.createElement);
 
   function clamp(n, lowerBound, upperBound) {
     return Math.min(Math.max(n, lowerBound), upperBound);
@@ -1100,7 +1100,7 @@
     var _props = props,
         getUserConfirmation = _props.getUserConfirmation,
         _props$initialEntries = _props.initialEntries,
-        initialEntries = _props$initialEntries === void 0 ? ["/"] : _props$initialEntries,
+        initialEntries = _props$initialEntries === void 0 ? ['/'] : _props$initialEntries,
         _props$initialIndex = _props.initialIndex,
         initialIndex = _props$initialIndex === void 0 ? 0 : _props$initialIndex,
         _props$keyLength = _props.keyLength,
@@ -1120,14 +1120,14 @@
 
     var index = clamp(initialIndex, 0, initialEntries.length - 1);
     var entries = initialEntries.map(function (entry) {
-      return typeof entry === "string" ? createLocation(entry, undefined, createKey()) : createLocation(entry, undefined, entry.key || createKey());
+      return typeof entry === 'string' ? createLocation(entry, undefined, createKey()) : createLocation(entry, undefined, entry.key || createKey());
     }); // Public interface
 
     var createHref = createPath;
 
     function push(path, state) {
-      warning(!(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";
+      warning(!(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 = createLocation(path, state, createKey(), history.location);
       transitionManager.confirmTransitionTo(location, action, getUserConfirmation, function (ok) {
         if (!ok) return;
@@ -1151,8 +1151,8 @@
     }
 
     function replace(path, state) {
-      warning(!(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";
+      warning(!(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 = createLocation(path, state, createKey(), history.location);
       transitionManager.confirmTransitionTo(location, action, getUserConfirmation, function (ok) {
         if (!ok) return;
@@ -1166,7 +1166,7 @@
 
     function go(n) {
       var nextIndex = clamp(history.index + n, 0, history.entries.length - 1);
-      var action = "POP";
+      var action = 'POP';
       var location = history.entries[nextIndex];
       transitionManager.confirmTransitionTo(location, action, getUserConfirmation, function (ok) {
         if (ok) {
@@ -1210,7 +1210,7 @@
 
     var history = {
       length: entries.length,
-      action: "POP",
+      action: 'POP',
       location: entries[index],
       index: index,
       entries: entries,
@@ -1233,124 +1233,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$1 = 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$1(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$1 = 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$1;
-
-  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$1(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;
@@ -1387,43 +1319,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$1(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$1((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits, 'calculateChangedBits: Expected the return value to be a ' + '31-bit integer. Instead received: ' + changedBits);
             }
 
             changedBits |= 0;
@@ -1435,61 +1374,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$1(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 {
@@ -1497,15 +1448,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,
@@ -1513,72 +1463,24 @@
     };
   }
 
-  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 createContext = unwrapExports(lib);
+  var index = React__default.createContext || createReactContext;
 
   // TODO: Replace with React.createContext once we can assume React 16+
-  var context = createContext();
-  context.Provider.displayName = "Router.Provider";
-  context.Consumer.displayName = "Router.Consumer";
-
-  var warnAboutGettingProperty = function warnAboutGettingProperty() {};
 
-  {
-    warnAboutGettingProperty = function warnAboutGettingProperty(object, key, message) {
-      var didIssueWarning = false;
-      var value = object[key];
-      Object.defineProperty(object, key, {
-        get: function get() {
-          if (!didIssueWarning) {
-            warning(false, message);
-            didIssueWarning = true;
-          }
-
-          return value;
-        },
-        configurable: true
-      });
-    };
-  }
+  var createNamedContext = function createNamedContext(name) {
+    var context = index();
+    context.displayName = name;
+    return context;
+  };
 
-  var warnAboutGettingProperty$1 = warnAboutGettingProperty;
+  var context =
+  /*#__PURE__*/
+  createNamedContext("Router");
 
-  function getContext(props, state) {
-    return {
-      history: props.history,
-      location: state.location,
-      match: Router.computeRootMatch(state.location.pathname),
-      staticContext: props.staticContext
-    };
-  }
   /**
    * The public API for putting history on context.
    */
 
-
   var Router =
   /*#__PURE__*/
   function (_React$Component) {
@@ -1640,39 +1542,19 @@
     };
 
     _proto.render = function render() {
-      var context$$1 = getContext(this.props, this.state);
-      return React.createElement(context.Provider, {
+      return React__default.createElement(context.Provider, {
         children: this.props.children || null,
-        value: context$$1
+        value: {
+          history: this.props.history,
+          location: this.state.location,
+          match: Router.computeRootMatch(this.state.location.pathname),
+          staticContext: this.props.staticContext
+        }
       });
     };
 
     return Router;
-  }(React.Component); // TODO: Remove this in v5
-
-
-  if (!React.createContext) {
-    Router.childContextTypes = {
-      router: propTypes.object.isRequired
-    };
-
-    Router.prototype.getChildContext = function () {
-      var context$$1 = getContext(this.props, this.state);
-
-      {
-        var contextWithoutWarnings = _extends({}, context$$1);
-
-        Object.keys(context$$1).forEach(function (key) {
-          warnAboutGettingProperty$1(context$$1, key, "You should not be using this.context.router." + key + " directly. It is private API " + "for internal use only and is subject to change at any time. Instead, use " + "a <Route> or withRouter() to access the current location, match, etc.");
-        });
-        context$$1._withoutWarnings = contextWithoutWarnings;
-      }
-
-      return {
-        router: context$$1
-      };
-    };
-  }
+  }(React__default.Component);
 
   {
     Router.propTypes = {
@@ -1710,14 +1592,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 = {
@@ -1761,19 +1643,21 @@
     };
 
     return Lifecycle;
-  }(React.Component);
+  }(React__default.Component);
 
   /**
    * The public API for prompting the user before navigating away from a screen.
    */
 
-  function Prompt(props) {
-    return React.createElement(context.Consumer, null, function (context$$1) {
+  function Prompt(_ref) {
+    var message = _ref.message,
+        _ref$when = _ref.when,
+        when = _ref$when === void 0 ? true : _ref$when;
+    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 (!props.when || context$$1.staticContext) return null;
+      if (!when || context$$1.staticContext) return null;
       var method = context$$1.history.block;
-      var message = props.message;
-      return React.createElement(Lifecycle, {
+      return React__default.createElement(Lifecycle, {
         onMount: function onMount(self) {
           self.release = method(message);
         },
@@ -1785,15 +1669,12 @@
         },
         onUnmount: function onUnmount(self) {
           self.release();
-        }
+        },
+        message: message
       });
     });
   }
 
-  Prompt.defaultProps = {
-    when: true
-  };
-
   {
     var messageType = propTypes.oneOfType([propTypes.func, propTypes.string]);
     Prompt.propTypes = {
@@ -2273,27 +2154,37 @@
    * The public API for navigating programmatically with a component.
    */
 
-  function Redirect(props) {
-    return React.createElement(context.Consumer, null, function (context$$1) {
+  function Redirect(_ref) {
+    var computedMatch = _ref.computedMatch,
+        to = _ref.to,
+        _ref$push = _ref.push,
+        push = _ref$push === void 0 ? false : _ref$push;
+    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 method = props.push ? context$$1.history.push : context$$1.history.replace;
-      var to = createLocation(props.computedMatch ? typeof props.to === "string" ? generatePath(props.to, props.computedMatch.params) : _extends({}, props.to, {
-        pathname: generatePath(props.to.pathname, props.computedMatch.params)
-      }) : props.to); // When rendering in a static context,
+      var history = context$$1.history,
+          staticContext = context$$1.staticContext;
+      var method = push ? history.push : history.replace;
+      var location = createLocation(computedMatch ? typeof to === "string" ? generatePath(to, computedMatch.params) : _extends({}, to, {
+        pathname: generatePath(to.pathname, computedMatch.params)
+      }) : to); // When rendering in a static context,
       // set the new location immediately.
 
-      if (context$$1.staticContext) {
-        method(to);
+      if (staticContext) {
+        method(location);
         return null;
       }
 
-      return React.createElement(Lifecycle, {
+      return React__default.createElement(Lifecycle, {
         onMount: function onMount() {
-          method(to);
+          method(location);
         },
         onUpdate: function onUpdate(self, prevProps) {
-          if (!locationsAreEqual(prevProps.to, to)) {
-            method(to);
+          var prevLocation = createLocation(prevProps.to);
+
+          if (!locationsAreEqual(prevLocation, _extends({}, location, {
+            key: prevLocation.key
+          }))) {
+            method(location);
           }
         },
         to: to
@@ -2301,10 +2192,6 @@
     });
   }
 
-  Redirect.defaultProps = {
-    push: false
-  };
-
   {
     Redirect.propTypes = {
       push: propTypes.bool,
@@ -2315,33 +2202,35 @@
 
   var reactIs_production_min = createCommonjsModule(function (module, exports) {
   Object.defineProperty(exports,"__esModule",{value:!0});
-  var b="function"===typeof Symbol&&Symbol.for,c=b?Symbol.for("react.element"):60103,d=b?Symbol.for("react.portal"):60106,e=b?Symbol.for("react.fragment"):60107,f=b?Symbol.for("react.strict_mode"):60108,g=b?Symbol.for("react.profiler"):60114,h=b?Symbol.for("react.provider"):60109,k=b?Symbol.for("react.context"):60110,l=b?Symbol.for("react.async_mode"):60111,m=b?Symbol.for("react.forward_ref"):60112,n=b?Symbol.for("react.placeholder"):60113;
-  function q(a){if("object"===typeof a&&null!==a){var p=a.$$typeof;switch(p){case c:switch(a=a.type,a){case l:case e:case g:case f:return a;default:switch(a=a&&a.$$typeof,a){case k:case m:case h:return a;default:return p}}case d:return p}}}exports.typeOf=q;exports.AsyncMode=l;exports.ContextConsumer=k;exports.ContextProvider=h;exports.Element=c;exports.ForwardRef=m;exports.Fragment=e;exports.Profiler=g;exports.Portal=d;exports.StrictMode=f;
-  exports.isValidElementType=function(a){return "string"===typeof a||"function"===typeof a||a===e||a===l||a===g||a===f||a===n||"object"===typeof a&&null!==a&&("function"===typeof a.then||a.$$typeof===h||a.$$typeof===k||a.$$typeof===m)};exports.isAsyncMode=function(a){return q(a)===l};exports.isContextConsumer=function(a){return q(a)===k};exports.isContextProvider=function(a){return q(a)===h};exports.isElement=function(a){return "object"===typeof a&&null!==a&&a.$$typeof===c};
-  exports.isForwardRef=function(a){return q(a)===m};exports.isFragment=function(a){return q(a)===e};exports.isProfiler=function(a){return q(a)===g};exports.isPortal=function(a){return q(a)===d};exports.isStrictMode=function(a){return q(a)===f};
+  var b="function"===typeof Symbol&&Symbol.for,c=b?Symbol.for("react.element"):60103,d=b?Symbol.for("react.portal"):60106,e=b?Symbol.for("react.fragment"):60107,f=b?Symbol.for("react.strict_mode"):60108,g=b?Symbol.for("react.profiler"):60114,h=b?Symbol.for("react.provider"):60109,k=b?Symbol.for("react.context"):60110,l=b?Symbol.for("react.concurrent_mode"):60111,m=b?Symbol.for("react.forward_ref"):60112,n=b?Symbol.for("react.suspense"):60113,q=b?Symbol.for("react.memo"):60115,r=b?Symbol.for("react.lazy"):
+  60116;function t(a){if("object"===typeof a&&null!==a){var p=a.$$typeof;switch(p){case c:switch(a=a.type,a){case l:case e:case g:case f:return a;default:switch(a=a&&a.$$typeof,a){case k:case m:case h:return a;default:return p}}case d:return p}}}function u(a){return t(a)===l}exports.typeOf=t;exports.AsyncMode=l;exports.ConcurrentMode=l;exports.ContextConsumer=k;exports.ContextProvider=h;exports.Element=c;exports.ForwardRef=m;exports.Fragment=e;exports.Profiler=g;exports.Portal=d;
+  exports.StrictMode=f;exports.isValidElementType=function(a){return "string"===typeof a||"function"===typeof a||a===e||a===l||a===g||a===f||a===n||"object"===typeof a&&null!==a&&(a.$$typeof===r||a.$$typeof===q||a.$$typeof===h||a.$$typeof===k||a.$$typeof===m)};exports.isAsyncMode=function(a){return u(a)};exports.isConcurrentMode=u;exports.isContextConsumer=function(a){return t(a)===k};exports.isContextProvider=function(a){return t(a)===h};
+  exports.isElement=function(a){return "object"===typeof a&&null!==a&&a.$$typeof===c};exports.isForwardRef=function(a){return t(a)===m};exports.isFragment=function(a){return t(a)===e};exports.isProfiler=function(a){return t(a)===g};exports.isPortal=function(a){return t(a)===d};exports.isStrictMode=function(a){return t(a)===f};
   });
 
   unwrapExports(reactIs_production_min);
   var reactIs_production_min_1 = reactIs_production_min.typeOf;
   var reactIs_production_min_2 = reactIs_production_min.AsyncMode;
-  var reactIs_production_min_3 = reactIs_production_min.ContextConsumer;
-  var reactIs_production_min_4 = reactIs_production_min.ContextProvider;
-  var reactIs_production_min_5 = reactIs_production_min.Element;
-  var reactIs_production_min_6 = reactIs_production_min.ForwardRef;
-  var reactIs_production_min_7 = reactIs_production_min.Fragment;
-  var reactIs_production_min_8 = reactIs_production_min.Profiler;
-  var reactIs_production_min_9 = reactIs_production_min.Portal;
-  var reactIs_production_min_10 = reactIs_production_min.StrictMode;
-  var reactIs_production_min_11 = reactIs_production_min.isValidElementType;
-  var reactIs_production_min_12 = reactIs_production_min.isAsyncMode;
-  var reactIs_production_min_13 = reactIs_production_min.isContextConsumer;
-  var reactIs_production_min_14 = reactIs_production_min.isContextProvider;
-  var reactIs_production_min_15 = reactIs_production_min.isElement;
-  var reactIs_production_min_16 = reactIs_production_min.isForwardRef;
-  var reactIs_production_min_17 = reactIs_production_min.isFragment;
-  var reactIs_production_min_18 = reactIs_production_min.isProfiler;
-  var reactIs_production_min_19 = reactIs_production_min.isPortal;
-  var reactIs_production_min_20 = reactIs_production_min.isStrictMode;
+  var reactIs_production_min_3 = reactIs_production_min.ConcurrentMode;
+  var reactIs_production_min_4 = reactIs_production_min.ContextConsumer;
+  var reactIs_production_min_5 = reactIs_production_min.ContextProvider;
+  var reactIs_production_min_6 = reactIs_production_min.Element;
+  var reactIs_production_min_7 = reactIs_production_min.ForwardRef;
+  var reactIs_production_min_8 = reactIs_production_min.Fragment;
+  var reactIs_production_min_9 = reactIs_production_min.Profiler;
+  var reactIs_production_min_10 = reactIs_production_min.Portal;
+  var reactIs_production_min_11 = reactIs_production_min.StrictMode;
+  var reactIs_production_min_12 = reactIs_production_min.isValidElementType;
+  var reactIs_production_min_13 = reactIs_production_min.isAsyncMode;
+  var reactIs_production_min_14 = reactIs_production_min.isConcurrentMode;
+  var reactIs_production_min_15 = reactIs_production_min.isContextConsumer;
+  var reactIs_production_min_16 = reactIs_production_min.isContextProvider;
+  var reactIs_production_min_17 = reactIs_production_min.isElement;
+  var reactIs_production_min_18 = reactIs_production_min.isForwardRef;
+  var reactIs_production_min_19 = reactIs_production_min.isFragment;
+  var reactIs_production_min_20 = reactIs_production_min.isProfiler;
+  var reactIs_production_min_21 = reactIs_production_min.isPortal;
+  var reactIs_production_min_22 = reactIs_production_min.isStrictMode;
 
   var reactIs_development = createCommonjsModule(function (module, exports) {
 
@@ -2363,16 +2252,71 @@
   var REACT_PROFILER_TYPE = hasSymbol ? Symbol.for('react.profiler') : 0xead2;
   var REACT_PROVIDER_TYPE = hasSymbol ? Symbol.for('react.provider') : 0xeacd;
   var REACT_CONTEXT_TYPE = hasSymbol ? Symbol.for('react.context') : 0xeace;
-  var REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol.for('react.async_mode') : 0xeacf;
+  var REACT_CONCURRENT_MODE_TYPE = hasSymbol ? Symbol.for('react.concurrent_mode') : 0xeacf;
   var REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for('react.forward_ref') : 0xead0;
-  var REACT_PLACEHOLDER_TYPE = hasSymbol ? Symbol.for('react.placeholder') : 0xead1;
+  var REACT_SUSPENSE_TYPE = hasSymbol ? Symbol.for('react.suspense') : 0xead1;
+  var REACT_MEMO_TYPE = hasSymbol ? Symbol.for('react.memo') : 0xead3;
+  var REACT_LAZY_TYPE = hasSymbol ? Symbol.for('react.lazy') : 0xead4;
 
   function isValidElementType(type) {
     return typeof type === 'string' || typeof type === 'function' ||
     // Note: its typeof might be other than 'symbol' or 'number' if it's a polyfill.
-    type === REACT_FRAGMENT_TYPE || type === REACT_ASYNC_MODE_TYPE || type === REACT_PROFILER_TYPE || type === REACT_STRICT_MODE_TYPE || type === REACT_PLACEHOLDER_TYPE || typeof type === 'object' && type !== null && (typeof type.then === 'function' || type.$$typeof === REACT_PROVIDER_TYPE || type.$$typeof === REACT_CONTEXT_TYPE || type.$$typeof === REACT_FORWARD_REF_TYPE);
+    type === REACT_FRAGMENT_TYPE || type === REACT_CONCURRENT_MODE_TYPE || type === REACT_PROFILER_TYPE || type === REACT_STRICT_MODE_TYPE || type === REACT_SUSPENSE_TYPE || typeof type === 'object' && type !== null && (type.$$typeof === REACT_LAZY_TYPE || type.$$typeof === REACT_MEMO_TYPE || type.$$typeof === REACT_PROVIDER_TYPE || type.$$typeof === REACT_CONTEXT_TYPE || type.$$typeof === REACT_FORWARD_REF_TYPE);
   }
 
+  /**
+   * Forked from fbjs/warning:
+   * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
+   *
+   * Only change is we use console.warn instead of console.error,
+   * and do nothing when 'console' is not supported.
+   * This really simplifies the code.
+   * ---
+   * 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 lowPriorityWarning = function () {};
+
+  {
+    var printWarning = function (format) {
+      for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+
+      var argIndex = 0;
+      var message = 'Warning: ' + format.replace(/%s/g, function () {
+        return args[argIndex++];
+      });
+      if (typeof console !== 'undefined') {
+        console.warn(message);
+      }
+      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);
+      } catch (x) {}
+    };
+
+    lowPriorityWarning = function (condition, format) {
+      if (format === undefined) {
+        throw new Error('`lowPriorityWarning(condition, format, ...args)` requires a warning ' + 'message argument');
+      }
+      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.apply(undefined, [format].concat(args));
+      }
+    };
+  }
+
+  var lowPriorityWarning$1 = lowPriorityWarning;
+
   function typeOf(object) {
     if (typeof object === 'object' && object !== null) {
       var $$typeof = object.$$typeof;
@@ -2382,7 +2326,7 @@
           var type = object.type;
 
           switch (type) {
-            case REACT_ASYNC_MODE_TYPE:
+            case REACT_CONCURRENT_MODE_TYPE:
             case REACT_FRAGMENT_TYPE:
             case REACT_PROFILER_TYPE:
             case REACT_STRICT_MODE_TYPE:
@@ -2407,7 +2351,9 @@
     return undefined;
   }
 
-  var AsyncMode = REACT_ASYNC_MODE_TYPE;
+  // AsyncMode alias is deprecated along with isAsyncMode
+  var AsyncMode = REACT_CONCURRENT_MODE_TYPE;
+  var ConcurrentMode = REACT_CONCURRENT_MODE_TYPE;
   var ContextConsumer = REACT_CONTEXT_TYPE;
   var ContextProvider = REACT_PROVIDER_TYPE;
   var Element = REACT_ELEMENT_TYPE;
@@ -2417,8 +2363,20 @@
   var Portal = REACT_PORTAL_TYPE;
   var StrictMode = REACT_STRICT_MODE_TYPE;
 
+  var hasWarnedAboutDeprecatedIsAsyncMode = false;
+
+  // AsyncMode should be deprecated
   function isAsyncMode(object) {
-    return typeOf(object) === REACT_ASYNC_MODE_TYPE;
+    {
+      if (!hasWarnedAboutDeprecatedIsAsyncMode) {
+        hasWarnedAboutDeprecatedIsAsyncMode = true;
+        lowPriorityWarning$1(false, 'The ReactIs.isAsyncMode() alias has been deprecated, ' + 'and will be removed in React 17+. Update your code to use ' + 'ReactIs.isConcurrentMode() instead. It has the exact same API.');
+      }
+    }
+    return isConcurrentMode(object);
+  }
+  function isConcurrentMode(object) {
+    return typeOf(object) === REACT_CONCURRENT_MODE_TYPE;
   }
   function isContextConsumer(object) {
     return typeOf(object) === REACT_CONTEXT_TYPE;
@@ -2447,6 +2405,7 @@
 
   exports.typeOf = typeOf;
   exports.AsyncMode = AsyncMode;
+  exports.ConcurrentMode = ConcurrentMode;
   exports.ContextConsumer = ContextConsumer;
   exports.ContextProvider = ContextProvider;
   exports.Element = Element;
@@ -2457,6 +2416,7 @@
   exports.StrictMode = StrictMode;
   exports.isValidElementType = isValidElementType;
   exports.isAsyncMode = isAsyncMode;
+  exports.isConcurrentMode = isConcurrentMode;
   exports.isContextConsumer = isContextConsumer;
   exports.isContextProvider = isContextProvider;
   exports.isElement = isElement;
@@ -2472,24 +2432,26 @@
   unwrapExports(reactIs_development);
   var reactIs_development_1 = reactIs_development.typeOf;
   var reactIs_development_2 = reactIs_development.AsyncMode;
-  var reactIs_development_3 = reactIs_development.ContextConsumer;
-  var reactIs_development_4 = reactIs_development.ContextProvider;
-  var reactIs_development_5 = reactIs_development.Element;
-  var reactIs_development_6 = reactIs_development.ForwardRef;
-  var reactIs_development_7 = reactIs_development.Fragment;
-  var reactIs_development_8 = reactIs_development.Profiler;
-  var reactIs_development_9 = reactIs_development.Portal;
-  var reactIs_development_10 = reactIs_development.StrictMode;
-  var reactIs_development_11 = reactIs_development.isValidElementType;
-  var reactIs_development_12 = reactIs_development.isAsyncMode;
-  var reactIs_development_13 = reactIs_development.isContextConsumer;
-  var reactIs_development_14 = reactIs_development.isContextProvider;
-  var reactIs_development_15 = reactIs_development.isElement;
-  var reactIs_development_16 = reactIs_development.isForwardRef;
-  var reactIs_development_17 = reactIs_development.isFragment;
-  var reactIs_development_18 = reactIs_development.isProfiler;
-  var reactIs_development_19 = reactIs_development.isPortal;
-  var reactIs_development_20 = reactIs_development.isStrictMode;
+  var reactIs_development_3 = reactIs_development.ConcurrentMode;
+  var reactIs_development_4 = reactIs_development.ContextConsumer;
+  var reactIs_development_5 = reactIs_development.ContextProvider;
+  var reactIs_development_6 = reactIs_development.Element;
+  var reactIs_development_7 = reactIs_development.ForwardRef;
+  var reactIs_development_8 = reactIs_development.Fragment;
+  var reactIs_development_9 = reactIs_development.Profiler;
+  var reactIs_development_10 = reactIs_development.Portal;
+  var reactIs_development_11 = reactIs_development.StrictMode;
+  var reactIs_development_12 = reactIs_development.isValidElementType;
+  var reactIs_development_13 = reactIs_development.isAsyncMode;
+  var reactIs_development_14 = reactIs_development.isConcurrentMode;
+  var reactIs_development_15 = reactIs_development.isContextConsumer;
+  var reactIs_development_16 = reactIs_development.isContextProvider;
+  var reactIs_development_17 = reactIs_development.isElement;
+  var reactIs_development_18 = reactIs_development.isForwardRef;
+  var reactIs_development_19 = reactIs_development.isFragment;
+  var reactIs_development_20 = reactIs_development.isProfiler;
+  var reactIs_development_21 = reactIs_development.isPortal;
+  var reactIs_development_22 = reactIs_development.isStrictMode;
 
   var reactIs = createCommonjsModule(function (module) {
 
@@ -2544,6 +2506,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, {
@@ -2576,17 +2539,7 @@
   }
 
   function isEmptyChildren(children) {
-    return React.Children.count(children) === 0;
-  }
-
-  function getContext$1(props, context$$1) {
-    var location = props.location || context$$1.location;
-    var match = props.computedMatch ? props.computedMatch // <Switch> already computed the match for us
-    : props.path ? matchPath(location.pathname, props) : context$$1.match;
-    return _extends({}, context$$1, {
-      location: location,
-      match: match
-    });
+    return React__default.Children.count(children) === 0;
   }
   /**
    * The public API for matching a single path and rendering.
@@ -2607,9 +2560,17 @@
     _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 props = getContext$1(_this.props, context$$1);
+        var location = _this.props.location || context$$1.location;
+        var match = _this.props.computedMatch ? _this.props.computedMatch // <Switch> already computed the match for us
+        : _this.props.path ? matchPath(location.pathname, _this.props) : context$$1.match;
+
+        var props = _extends({}, context$$1, {
+          location: location,
+          match: match
+        });
+
         var _this$props = _this.props,
             children = _this$props.children,
             component = _this$props.component,
@@ -2633,48 +2594,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); // TODO: Remove this in v5
-
-
-  if (!React.createContext) {
-    Route.contextTypes = {
-      router: propTypes.object.isRequired
-    };
-    Route.childContextTypes = {
-      router: propTypes.object.isRequired
-    };
-
-    Route.prototype.getChildContext = function () {
-      !this.context.router ? invariant(false, "You should not use <Route> outside a <Router>") : void 0;
-      var parentContext = this.context.router;
-
-      {
-        parentContext = parentContext._withoutWarnings;
-      }
-
-      var context$$1 = getContext$1(this.props, parentContext);
-
-      {
-        var contextWithoutWarnings = _extends({}, context$$1);
-
-        Object.keys(context$$1).forEach(function (key) {
-          warnAboutGettingProperty$1(context$$1, key, "You should not be using this.context.router." + key + " directly. It is private API " + "for internal use only and is subject to change at any time. Instead, use " + "a <Route> or withRouter() to access the current location, match, etc.");
-        });
-        context$$1._withoutWarnings = contextWithoutWarnings;
-      }
-
-      return {
-        router: context$$1
-      };
-    };
-  }
+  }(React__default.Component);
 
   {
     Route.propTypes = {
@@ -2772,26 +2699,12 @@
 
       _this = _React$Component.call.apply(_React$Component, [this].concat(args)) || this;
 
-      _this.createHref = function (path) {
-        return addLeadingSlash$1(_this.props.basename + createURL(path));
-      };
-
       _this.handlePush = function (location) {
-        var _this$props = _this.props,
-            basename = _this$props.basename,
-            context = _this$props.context;
-        context.action = "PUSH";
-        context.location = addBasename(basename, createLocation(location));
-        context.url = createURL(context.location);
+        return _this.navigateTo(location, "PUSH");
       };
 
       _this.handleReplace = function (location) {
-        var _this$props2 = _this.props,
-            basename = _this$props2.basename,
-            context = _this$props2.context;
-        context.action = "REPLACE";
-        context.location = addBasename(basename, createLocation(location));
-        context.url = createURL(context.location);
+        return _this.navigateTo(location, "REPLACE");
       };
 
       _this.handleListen = function () {
@@ -2807,15 +2720,31 @@
 
     var _proto = StaticRouter.prototype;
 
+    _proto.navigateTo = function navigateTo(location, action) {
+      var _this$props = this.props,
+          _this$props$basename = _this$props.basename,
+          basename = _this$props$basename === void 0 ? "" : _this$props$basename,
+          _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);
+    };
+
     _proto.render = function render() {
-      var _this$props3 = this.props,
-          basename = _this$props3.basename,
-          context = _this$props3.context,
-          location = _this$props3.location,
-          rest = _objectWithoutPropertiesLoose(_this$props3, ["basename", "context", "location"]);
+      var _this$props2 = this.props,
+          _this$props2$basename = _this$props2.basename,
+          basename = _this$props2$basename === void 0 ? "" : _this$props2$basename,
+          _this$props2$context = _this$props2.context,
+          context = _this$props2$context === void 0 ? {} : _this$props2$context,
+          _this$props2$location = _this$props2.location,
+          location = _this$props2$location === void 0 ? "/" : _this$props2$location,
+          rest = _objectWithoutPropertiesLoose(_this$props2, ["basename", "context", "location"]);
 
       var history = {
-        createHref: this.createHref,
+        createHref: function createHref(path) {
+          return addLeadingSlash$1(basename + createURL(path));
+        },
         action: "POP",
         location: stripBasename$1(basename, createLocation(location)),
         push: this.handlePush,
@@ -2826,19 +2755,14 @@
         listen: this.handleListen,
         block: this.handleBlock
       };
-      return React.createElement(Router, _extends({}, rest, {
+      return React__default.createElement(Router, _extends({}, rest, {
         history: history,
-        staticContext: this.props.context || {}
+        staticContext: context
       }));
     };
 
     return StaticRouter;
-  }(React.Component);
-
-  StaticRouter.defaultProps = {
-    basename: "",
-    location: "/"
-  };
+  }(React__default.Component);
 
   {
     StaticRouter.propTypes = {
@@ -2870,7 +2794,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()
@@ -2878,8 +2802,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, {
@@ -2887,7 +2811,7 @@
             })) : context$$1.match;
           }
         });
-        return match ? React.cloneElement(element, {
+        return match ? React__default.cloneElement(element, {
           location: location,
           computedMatch: match
         }) : null;
@@ -2895,7 +2819,7 @@
     };
 
     return Switch;
-  }(React.Component);
+  }(React__default.Component);
 
   {
     Switch.propTypes = {
@@ -2913,8 +2837,11 @@
    * Copyright 2015, Yahoo! Inc.
    * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
    */
+
+
   var REACT_STATICS = {
       childContextTypes: true,
+      contextType: true,
       contextTypes: true,
       defaultProps: true,
       displayName: true,
@@ -2935,15 +2862,24 @@
       arity: true
   };
 
+  var FORWARD_REF_STATICS = {
+      '$$typeof': true,
+      render: true
+  };
+
+  var TYPE_STATICS = {};
+  TYPE_STATICS[reactIs.ForwardRef] = FORWARD_REF_STATICS;
+
   var defineProperty = Object.defineProperty;
   var getOwnPropertyNames = Object.getOwnPropertyNames;
   var getOwnPropertySymbols$1 = Object.getOwnPropertySymbols;
   var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
   var getPrototypeOf = Object.getPrototypeOf;
-  var objectPrototype = getPrototypeOf && getPrototypeOf(Object);
+  var objectPrototype = Object.prototype;
 
   function hoistNonReactStatics(targetComponent, sourceComponent, blacklist) {
-      if (typeof sourceComponent !== 'string') { // don't hoist over string (html) components
+      if (typeof sourceComponent !== 'string') {
+          // don't hoist over string (html) components
 
           if (objectPrototype) {
               var inheritedComponent = getPrototypeOf(sourceComponent);
@@ -2958,11 +2894,15 @@
               keys = keys.concat(getOwnPropertySymbols$1(sourceComponent));
           }
 
+          var targetStatics = TYPE_STATICS[targetComponent['$$typeof']] || REACT_STATICS;
+          var sourceStatics = TYPE_STATICS[sourceComponent['$$typeof']] || REACT_STATICS;
+
           for (var i = 0; i < keys.length; ++i) {
               var key = keys[i];
-              if (!REACT_STATICS[key] && !KNOWN_STATICS[key] && (!blacklist || !blacklist[key])) {
+              if (!KNOWN_STATICS[key] && !(blacklist && blacklist[key]) && !(sourceStatics && sourceStatics[key]) && !(targetStatics && targetStatics[key])) {
                   var descriptor = getOwnPropertyDescriptor(sourceComponent, key);
-                  try { // Avoid failures from read-only properties
+                  try {
+                      // Avoid failures from read-only properties
                       defineProperty(targetComponent, key, descriptor);
                   } catch (e) {}
               }
@@ -2981,31 +2921,54 @@
    */
 
   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])
       };
     }
 
     return hoistNonReactStatics_cjs(C, Component);
   }
 
+  {
+    if (typeof window !== "undefined") {
+      var global$1 = window;
+      var key$1 = "__react_router_build__";
+      var buildNames = {
+        cjs: "CommonJS",
+        esm: "ES modules",
+        umd: "UMD"
+      };
+
+      if (global$1[key$1] && global$1[key$1] !== "umd") {
+        var initialBuildName = buildNames[global$1[key$1]];
+        var secondaryBuildName = buildNames["umd"]; // TODO: Add link to article that explains in detail how to avoid
+        // loading 2 different builds.
+
+        throw new Error("You are loading the " + secondaryBuildName + " build of React Router " + ("on a page that is already running the " + initialBuildName + " ") + "build, so things won't work right.");
+      }
+
+      global$1[key$1] = "umd";
+    }
+  }
+
   exports.MemoryRouter = MemoryRouter;
   exports.Prompt = Prompt;
   exports.Redirect = Redirect;