react-router-dom 5.3.2 → 5.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom",
-  "version": "5.3.2",
+  "version": "5.3.4",
   "description": "DOM bindings for React Router",
   "homepage": "https://reactrouter.com/",
   "repository": {
@@ -51,7 +51,7 @@
     "history": "^4.9.0",
     "loose-envify": "^1.3.1",
     "prop-types": "^15.6.2",
-    "react-router": "5.3.2",
+    "react-router": "5.3.4",
     "tiny-invariant": "^1.0.2",
     "tiny-warning": "^1.0.0"
   },

package/umd/react-router-dom.js

@@ -4,7 +4,7 @@
   (global = global || self, factory(global.ReactRouterDOM = {}, global.React));
 }(this, function (exports, React) { 'use strict';
 
-  var React__default = 'default' in React ? React['default'] : React;
+  React = React && React.hasOwnProperty('default') ? React['default'] : React;
 
   function _setPrototypeOf(o, p) {
     _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
@@ -2169,176 +2169,6 @@
     return history;
   }
 
-  var MAX_SIGNED_31_BIT_INT = 1073741823;
-  var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : {};
-
-  function getUniqueId() {
-    var key = '__global_unique_id__';
-    return commonjsGlobal[key] = (commonjsGlobal[key] || 0) + 1;
-  }
-
-  function objectIs(x, y) {
-    if (x === y) {
-      return x !== 0 || 1 / x === 1 / y;
-    } else {
-      return x !== x && y !== y;
-    }
-  }
-
-  function createEventEmitter(value) {
-    var handlers = [];
-    return {
-      on: function on(handler) {
-        handlers.push(handler);
-      },
-      off: function off(handler) {
-        handlers = handlers.filter(function (h) {
-          return h !== handler;
-        });
-      },
-      get: function get() {
-        return value;
-      },
-      set: function set(newValue, changedBits) {
-        value = newValue;
-        handlers.forEach(function (handler) {
-          return handler(value, changedBits);
-        });
-      }
-    };
-  }
-
-  function onlyChild(children) {
-    return Array.isArray(children) ? children[0] : children;
-  }
-
-  function createReactContext(defaultValue, calculateChangedBits) {
-    var _Provider$childContex, _Consumer$contextType;
-
-    var contextProp = '__create-react-context-' + getUniqueId() + '__';
-
-    var Provider = /*#__PURE__*/function (_Component) {
-      _inheritsLoose(Provider, _Component);
-
-      function Provider() {
-        var _this;
-
-        _this = _Component.apply(this, arguments) || this;
-        _this.emitter = createEventEmitter(_this.props.value);
-        return _this;
-      }
-
-      var _proto = Provider.prototype;
-
-      _proto.getChildContext = function getChildContext() {
-        var _ref;
-
-        return _ref = {}, _ref[contextProp] = this.emitter, _ref;
-      };
-
-      _proto.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
-        if (this.props.value !== nextProps.value) {
-          var oldValue = this.props.value;
-          var newValue = nextProps.value;
-          var changedBits;
-
-          if (objectIs(oldValue, newValue)) {
-            changedBits = 0;
-          } else {
-            changedBits = typeof calculateChangedBits === 'function' ? calculateChangedBits(oldValue, newValue) : MAX_SIGNED_31_BIT_INT;
-
-            {
-              warning((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits, 'calculateChangedBits: Expected the return value to be a ' + '31-bit integer. Instead received: ' + changedBits);
-            }
-
-            changedBits |= 0;
-
-            if (changedBits !== 0) {
-              this.emitter.set(nextProps.value, changedBits);
-            }
-          }
-        }
-      };
-
-      _proto.render = function render() {
-        return this.props.children;
-      };
-
-      return Provider;
-    }(React.Component);
-
-    Provider.childContextTypes = (_Provider$childContex = {}, _Provider$childContex[contextProp] = propTypes.object.isRequired, _Provider$childContex);
-
-    var Consumer = /*#__PURE__*/function (_Component2) {
-      _inheritsLoose(Consumer, _Component2);
-
-      function Consumer() {
-        var _this2;
-
-        _this2 = _Component2.apply(this, arguments) || this;
-        _this2.state = {
-          value: _this2.getValue()
-        };
-
-        _this2.onUpdate = function (newValue, changedBits) {
-          var observedBits = _this2.observedBits | 0;
-
-          if ((observedBits & changedBits) !== 0) {
-            _this2.setState({
-              value: _this2.getValue()
-            });
-          }
-        };
-
-        return _this2;
-      }
-
-      var _proto2 = Consumer.prototype;
-
-      _proto2.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
-        var observedBits = nextProps.observedBits;
-        this.observedBits = observedBits === undefined || observedBits === null ? MAX_SIGNED_31_BIT_INT : observedBits;
-      };
-
-      _proto2.componentDidMount = function componentDidMount() {
-        if (this.context[contextProp]) {
-          this.context[contextProp].on(this.onUpdate);
-        }
-
-        var observedBits = this.props.observedBits;
-        this.observedBits = observedBits === undefined || observedBits === null ? MAX_SIGNED_31_BIT_INT : observedBits;
-      };
-
-      _proto2.componentWillUnmount = function componentWillUnmount() {
-        if (this.context[contextProp]) {
-          this.context[contextProp].off(this.onUpdate);
-        }
-      };
-
-      _proto2.getValue = function getValue() {
-        if (this.context[contextProp]) {
-          return this.context[contextProp].get();
-        } else {
-          return defaultValue;
-        }
-      };
-
-      _proto2.render = function render() {
-        return onlyChild(this.props.children)(this.state.value);
-      };
-
-      return Consumer;
-    }(React.Component);
-
-    Consumer.contextTypes = (_Consumer$contextType = {}, _Consumer$contextType[contextProp] = propTypes.object, _Consumer$contextType);
-    return {
-      Provider: Provider,
-      Consumer: Consumer
-    };
-  }
-
-  var index = React__default.createContext || createReactContext;
-
   var isarray = Array.isArray || function (arr) {
     return Object.prototype.toString.call(arr) == '[object Array]';
   };
@@ -2889,8 +2719,197 @@
 
   var hoistNonReactStatics_cjs = hoistNonReactStatics;
 
+  var MAX_SIGNED_31_BIT_INT = 1073741823;
+  var commonjsGlobal = typeof globalThis !== "undefined" // 'global proper'
+  ? // eslint-disable-next-line no-undef
+  globalThis : typeof window !== "undefined" ? window // Browser
+  : typeof global !== "undefined" ? global // node.js
+  : {};
+
+  function getUniqueId() {
+    var key = "__global_unique_id__";
+    return commonjsGlobal[key] = (commonjsGlobal[key] || 0) + 1;
+  } // 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;
+    } else {
+      // eslint-disable-next-line no-self-compare
+      return x !== x && y !== y;
+    }
+  }
+
+  function createEventEmitter(value) {
+    var handlers = [];
+    return {
+      on: function on(handler) {
+        handlers.push(handler);
+      },
+      off: function off(handler) {
+        handlers = handlers.filter(function (h) {
+          return h !== handler;
+        });
+      },
+      get: function get() {
+        return value;
+      },
+      set: function set(newValue, changedBits) {
+        value = newValue;
+        handlers.forEach(function (handler) {
+          return handler(value, changedBits);
+        });
+      }
+    };
+  }
+
+  function onlyChild(children) {
+    return Array.isArray(children) ? children[0] : children;
+  }
+
+  function createReactContext(defaultValue, calculateChangedBits) {
+    var _Provider$childContex, _Consumer$contextType;
+
+    var contextProp = "__create-react-context-" + getUniqueId() + "__";
+
+    var Provider = /*#__PURE__*/function (_React$Component) {
+      _inheritsLoose(Provider, _React$Component);
+
+      function Provider() {
+        var _this;
+
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
+        }
+
+        _this = _React$Component.call.apply(_React$Component, [this].concat(args)) || this;
+        _this.emitter = createEventEmitter(_this.props.value);
+        return _this;
+      }
+
+      var _proto = Provider.prototype;
+
+      _proto.getChildContext = function getChildContext() {
+        var _ref;
+
+        return _ref = {}, _ref[contextProp] = this.emitter, _ref;
+      };
+
+      _proto.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
+        if (this.props.value !== nextProps.value) {
+          var oldValue = this.props.value;
+          var newValue = nextProps.value;
+          var changedBits;
+
+          if (objectIs(oldValue, newValue)) {
+            changedBits = 0; // No change
+          } else {
+            changedBits = typeof calculateChangedBits === "function" ? calculateChangedBits(oldValue, newValue) : MAX_SIGNED_31_BIT_INT;
+
+            {
+                warning((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits, "calculateChangedBits: Expected the return value to be a " + "31-bit integer. Instead received: " + changedBits)  ;
+            }
+
+            changedBits |= 0;
+
+            if (changedBits !== 0) {
+              this.emitter.set(nextProps.value, changedBits);
+            }
+          }
+        }
+      };
+
+      _proto.render = function render() {
+        return this.props.children;
+      };
+
+      return Provider;
+    }(React.Component);
+
+    Provider.childContextTypes = (_Provider$childContex = {}, _Provider$childContex[contextProp] = propTypes.object.isRequired, _Provider$childContex);
+
+    var Consumer = /*#__PURE__*/function (_React$Component2) {
+      _inheritsLoose(Consumer, _React$Component2);
+
+      function Consumer() {
+        var _this2;
+
+        for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+          args[_key2] = arguments[_key2];
+        }
+
+        _this2 = _React$Component2.call.apply(_React$Component2, [this].concat(args)) || this;
+        _this2.observedBits = void 0;
+        _this2.state = {
+          value: _this2.getValue()
+        };
+
+        _this2.onUpdate = function (newValue, changedBits) {
+          var observedBits = _this2.observedBits | 0;
+
+          if ((observedBits & changedBits) !== 0) {
+            _this2.setState({
+              value: _this2.getValue()
+            });
+          }
+        };
+
+        return _this2;
+      }
+
+      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;
+      };
+
+      _proto2.componentDidMount = function componentDidMount() {
+        if (this.context[contextProp]) {
+          this.context[contextProp].on(this.onUpdate);
+        }
+
+        var observedBits = this.props.observedBits;
+        this.observedBits = observedBits === undefined || observedBits === null ? MAX_SIGNED_31_BIT_INT // Subscribe to all changes by default
+        : observedBits;
+      };
+
+      _proto2.componentWillUnmount = function componentWillUnmount() {
+        if (this.context[contextProp]) {
+          this.context[contextProp].off(this.onUpdate);
+        }
+      };
+
+      _proto2.getValue = function getValue() {
+        if (this.context[contextProp]) {
+          return this.context[contextProp].get();
+        } else {
+          return defaultValue;
+        }
+      };
+
+      _proto2.render = function render() {
+        return onlyChild(this.props.children)(this.state.value);
+      };
+
+      return Consumer;
+    }(React.Component);
+
+    Consumer.contextTypes = (_Consumer$contextType = {}, _Consumer$contextType[contextProp] = propTypes.object, _Consumer$contextType);
+    return {
+      Provider: Provider,
+      Consumer: Consumer
+    };
+  } // MIT License
+
+
+  var createContext = React.createContext || createReactContext; // TODO: Replace with React.createContext once we can assume React 16+
+
   var createNamedContext = function createNamedContext(name) {
-    var context = index();
+    var context = createContext();
     context.displayName = name;
     return context;
   };
@@ -2976,21 +2995,21 @@
     };
 
     _proto.render = function render() {
-      return /*#__PURE__*/React__default.createElement(context.Provider, {
+      return /*#__PURE__*/React.createElement(context.Provider, {
         value: {
           history: this.props.history,
           location: this.state.location,
           match: Router.computeRootMatch(this.state.location.pathname),
           staticContext: this.props.staticContext
         }
-      }, /*#__PURE__*/React__default.createElement(historyContext.Provider, {
+      }, /*#__PURE__*/React.createElement(historyContext.Provider, {
         children: this.props.children || null,
         value: this.props.history
       }));
     };
 
     return Router;
-  }(React__default.Component);
+  }(React.Component);
 
   {
     Router.propTypes = {
@@ -3026,14 +3045,14 @@
     var _proto = MemoryRouter.prototype;
 
     _proto.render = function render() {
-      return /*#__PURE__*/React__default.createElement(Router, {
+      return /*#__PURE__*/React.createElement(Router, {
         history: this.history,
         children: this.props.children
       });
     };
 
     return MemoryRouter;
-  }(React__default.Component);
+  }(React.Component);
 
   {
     MemoryRouter.propTypes = {
@@ -3075,7 +3094,7 @@
     };
 
     return Lifecycle;
-  }(React__default.Component);
+  }(React.Component);
   /**
    * The public API for prompting the user before navigating away from a screen.
    */
@@ -3085,11 +3104,11 @@
     var message = _ref.message,
         _ref$when = _ref.when,
         when = _ref$when === void 0 ? true : _ref$when;
-    return /*#__PURE__*/React__default.createElement(context.Consumer, null, function (context) {
+    return /*#__PURE__*/React.createElement(context.Consumer, null, function (context) {
       !context ?    invariant(false, "You should not use <Prompt> outside a <Router>")    : void 0;
       if (!when || context.staticContext) return null;
       var method = context.history.block;
-      return /*#__PURE__*/React__default.createElement(Lifecycle, {
+      return /*#__PURE__*/React.createElement(Lifecycle, {
         onMount: function onMount(self) {
           self.release = method(message);
         },
@@ -3158,7 +3177,7 @@
         to = _ref.to,
         _ref$push = _ref.push,
         push = _ref$push === void 0 ? false : _ref$push;
-    return /*#__PURE__*/React__default.createElement(context.Consumer, null, function (context) {
+    return /*#__PURE__*/React.createElement(context.Consumer, null, function (context) {
       !context ?    invariant(false, "You should not use <Redirect> outside a <Router>")    : void 0;
       var history = context.history,
           staticContext = context.staticContext;
@@ -3173,7 +3192,7 @@
         return null;
       }
 
-      return /*#__PURE__*/React__default.createElement(Lifecycle, {
+      return /*#__PURE__*/React.createElement(Lifecycle, {
         onMount: function onMount() {
           method(location);
         },
@@ -3280,7 +3299,7 @@
   }
 
   function isEmptyChildren(children) {
-    return React__default.Children.count(children) === 0;
+    return React.Children.count(children) === 0;
   }
 
   function evalChildrenDev(children, props, path) {
@@ -3305,7 +3324,7 @@
     _proto.render = function render() {
       var _this = this;
 
-      return /*#__PURE__*/React__default.createElement(context.Consumer, null, function (context$1) {
+      return /*#__PURE__*/React.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
@@ -3326,14 +3345,14 @@
           children = null;
         }
 
-        return /*#__PURE__*/React__default.createElement(context.Provider, {
+        return /*#__PURE__*/React.createElement(context.Provider, {
           value: props
-        }, props.match ? children ? typeof children === "function" ?  evalChildrenDev(children, props, _this.props.path)  : children : component ? /*#__PURE__*/React__default.createElement(component, props) : render ? render(props) : null : typeof children === "function" ?  evalChildrenDev(children, props, _this.props.path)  : null);
+        }, props.match ? children ? typeof children === "function" ?  evalChildrenDev(children, props, _this.props.path)  : children : component ? /*#__PURE__*/React.createElement(component, props) : render ? render(props) : null : typeof children === "function" ?  evalChildrenDev(children, props, _this.props.path)  : null);
       });
     };
 
     return Route;
-  }(React__default.Component);
+  }(React.Component);
 
   {
     Route.propTypes = {
@@ -3470,14 +3489,14 @@
         listen: this.handleListen,
         block: this.handleBlock
       };
-      return /*#__PURE__*/React__default.createElement(Router, _extends({}, rest, {
+      return /*#__PURE__*/React.createElement(Router, _extends({}, rest, {
         history: history,
         staticContext: context
       }));
     };
 
     return StaticRouter;
-  }(React__default.Component);
+  }(React.Component);
 
   {
     StaticRouter.propTypes = {
@@ -3507,7 +3526,7 @@
     _proto.render = function render() {
       var _this = this;
 
-      return /*#__PURE__*/React__default.createElement(context.Consumer, null, function (context) {
+      return /*#__PURE__*/React.createElement(context.Consumer, null, function (context) {
         !context ?    invariant(false, "You should not use <Switch> outside a <Router>")    : void 0;
         var location = _this.props.location || context.location;
         var element, match; // We use React.Children.forEach instead of React.Children.toArray().find()
@@ -3515,8 +3534,8 @@
         // to trigger an unmount/remount for two <Route>s that render the same
         // component at different URLs.
 
-        React__default.Children.forEach(_this.props.children, function (child) {
-          if (match == null && /*#__PURE__*/React__default.isValidElement(child)) {
+        React.Children.forEach(_this.props.children, function (child) {
+          if (match == null && /*#__PURE__*/React.isValidElement(child)) {
             element = child;
             var path = child.props.path || child.props.from;
             match = path ? matchPath(location.pathname, _extends({}, child.props, {
@@ -3524,7 +3543,7 @@
             })) : context.match;
           }
         });
-        return match ? /*#__PURE__*/React__default.cloneElement(element, {
+        return match ? /*#__PURE__*/React.cloneElement(element, {
           location: location,
           computedMatch: match
         }) : null;
@@ -3532,7 +3551,7 @@
     };
 
     return Switch;
-  }(React__default.Component);
+  }(React.Component);
 
   {
     Switch.propTypes = {
@@ -3557,9 +3576,9 @@
       var wrappedComponentRef = props.wrappedComponentRef,
           remainingProps = _objectWithoutPropertiesLoose(props, ["wrappedComponentRef"]);
 
-      return /*#__PURE__*/React__default.createElement(context.Consumer, null, function (context) {
+      return /*#__PURE__*/React.createElement(context.Consumer, null, function (context) {
         !context ?    invariant(false, "You should not use <" + displayName + " /> outside a <Router>")    : void 0;
-        return /*#__PURE__*/React__default.createElement(Component, _extends({}, remainingProps, context, {
+        return /*#__PURE__*/React.createElement(Component, _extends({}, remainingProps, context, {
           ref: wrappedComponentRef
         }));
       });
@@ -3577,7 +3596,7 @@
     return hoistNonReactStatics_cjs(C, Component);
   }
 
-  var useContext = React__default.useContext;
+  var useContext = React.useContext;
 
   function useHistory() {
     {
@@ -3658,14 +3677,14 @@
     var _proto = BrowserRouter.prototype;
 
     _proto.render = function render() {
-      return /*#__PURE__*/React__default.createElement(Router, {
+      return /*#__PURE__*/React.createElement(Router, {
         history: this.history,
         children: this.props.children
       });
     };
 
     return BrowserRouter;
-  }(React__default.Component);
+  }(React.Component);
 
   {
     BrowserRouter.propTypes = {
@@ -3703,14 +3722,14 @@
     var _proto = HashRouter.prototype;
 
     _proto.render = function render() {
-      return /*#__PURE__*/React__default.createElement(Router, {
+      return /*#__PURE__*/React.createElement(Router, {
         history: this.history,
         children: this.props.children
       });
     };
 
     return HashRouter;
-  }(React__default.Component);
+  }(React.Component);
 
   {
     HashRouter.propTypes = {
@@ -3736,7 +3755,7 @@
     return C;
   };
 
-  var forwardRef = React__default.forwardRef;
+  var forwardRef = React.forwardRef;
 
   if (typeof forwardRef === "undefined") {
     forwardRef = forwardRefShim;
@@ -3783,7 +3802,7 @@
     /* eslint-disable-next-line jsx-a11y/anchor-has-content */
 
 
-    return /*#__PURE__*/React__default.createElement("a", props);
+    return /*#__PURE__*/React.createElement("a", props);
   });
 
   {
@@ -3802,7 +3821,7 @@
         innerRef = _ref2.innerRef,
         rest = _objectWithoutPropertiesLoose(_ref2, ["component", "replace", "to", "innerRef"]);
 
-    return /*#__PURE__*/React__default.createElement(context.Consumer, null, function (context) {
+    return /*#__PURE__*/React.createElement(context.Consumer, null, function (context) {
       !context ?  invariant(false, "You should not use <Link> outside a <Router>")  : void 0;
       var history = context.history;
       var location = normalizeToLocation(resolveToLocation(to, context.location), context.location);
@@ -3825,7 +3844,7 @@
         props.innerRef = innerRef;
       }
 
-      return /*#__PURE__*/React__default.createElement(component, props);
+      return /*#__PURE__*/React.createElement(component, props);
     });
   });
 
@@ -3848,7 +3867,7 @@
     return C;
   };
 
-  var forwardRef$1 = React__default.forwardRef;
+  var forwardRef$1 = React.forwardRef;
 
   if (typeof forwardRef$1 === "undefined") {
     forwardRef$1 = forwardRefShim$1;
@@ -3885,7 +3904,7 @@
         innerRef = _ref.innerRef,
         rest = _objectWithoutPropertiesLoose(_ref, ["aria-current", "activeClassName", "activeStyle", "className", "exact", "isActive", "location", "sensitive", "strict", "style", "to", "innerRef"]);
 
-    return /*#__PURE__*/React__default.createElement(context.Consumer, null, function (context) {
+    return /*#__PURE__*/React.createElement(context.Consumer, null, function (context) {
       !context ?  invariant(false, "You should not use <NavLink> outside a <Router>")  : void 0;
       var currentLocation = locationProp || context.location;
       var toLocation = normalizeToLocation(resolveToLocation(to, currentLocation), currentLocation);
@@ -3921,7 +3940,7 @@
         props.innerRef = innerRef;
       }
 
-      return /*#__PURE__*/React__default.createElement(Link, props);
+      return /*#__PURE__*/React.createElement(Link, props);
     });
   });