react-router 5.1.2 → 5.2.0

package/umd/react-router.js

@@ -12,8 +12,6 @@
     subClass.__proto__ = superClass;
   }
 
-  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;
   }
@@ -1579,15 +1577,13 @@
     subClass.__proto__ = superClass;
   }
 
-  var inheritsLoose = _inheritsLoose$1;
-
-  var key = '__global_unique_id__';
+  var MAX_SIGNED_31_BIT_INT = 1073741823;
+  var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : {};
 
-  var gud = function() {
+  function getUniqueId() {
+    var key = '__global_unique_id__';
     return commonjsGlobal[key] = (commonjsGlobal[key] || 0) + 1;
-  };
-
-  var MAX_SIGNED_31_BIT_INT = 1073741823;
+  }
 
   function objectIs(x, y) {
     if (x === y) {
@@ -1627,12 +1623,10 @@
   function createReactContext(defaultValue, calculateChangedBits) {
     var _Provider$childContex, _Consumer$contextType;
 
-    var contextProp = '__create-react-context-' + gud() + '__';
+    var contextProp = '__create-react-context-' + getUniqueId() + '__';
 
-    var Provider =
-    /*#__PURE__*/
-    function (_Component) {
-      inheritsLoose(Provider, _Component);
+    var Provider = /*#__PURE__*/function (_Component) {
+      _inheritsLoose$1(Provider, _Component);
 
       function Provider() {
         var _this;
@@ -1683,10 +1677,8 @@
 
     Provider.childContextTypes = (_Provider$childContex = {}, _Provider$childContex[contextProp] = propTypes.object.isRequired, _Provider$childContex);
 
-    var Consumer =
-    /*#__PURE__*/
-    function (_Component2) {
-      inheritsLoose(Consumer, _Component2);
+    var Consumer = /*#__PURE__*/function (_Component2) {
+      _inheritsLoose$1(Consumer, _Component2);
 
       function Consumer() {
         var _this2;
@@ -1763,9 +1755,21 @@
     return context;
   };
 
+  var historyContext =
+  /*#__PURE__*/
+  createNamedContext("Router-History");
+
+  // TODO: Replace with React.createContext once we can assume React 16+
+
+  var createNamedContext$1 = function createNamedContext(name) {
+    var context = index();
+    context.displayName = name;
+    return context;
+  };
+
   var context =
   /*#__PURE__*/
-  createNamedContext("Router");
+  createNamedContext$1("Router");
 
   /**
    * The public API for putting history on context.
@@ -1833,14 +1837,16 @@
 
     _proto.render = function render() {
       return React__default.createElement(context.Provider, {
-        children: this.props.children || null,
         value: {
           history: this.props.history,
           location: this.state.location,
           match: Router.computeRootMatch(this.state.location.pathname),
           staticContext: this.props.staticContext
         }
-      });
+      }, React__default.createElement(historyContext.Provider, {
+        children: this.props.children || null,
+        value: this.props.history
+      }));
     };
 
     return Router;
@@ -2997,7 +3003,7 @@
       !(typeof useContext === "function") ?  invariant(false, "You must use React >= 16.8 in order to use useHistory()")  : void 0;
     }
 
-    return useContext(context).history;
+    return useContext(historyContext);
   }
   function useLocation() {
     {
@@ -3019,28 +3025,30 @@
       !(typeof useContext === "function") ?  invariant(false, "You must use React >= 16.8 in order to use useRouteMatch()")  : void 0;
     }
 
-    return path ? matchPath(useLocation().pathname, path) : useContext(context).match;
+    var location = useLocation();
+    var match = useContext(context).match;
+    return path ? matchPath(location.pathname, path) : match;
   }
 
   {
     if (typeof window !== "undefined") {
       var global$1 = window;
-      var key$1 = "__react_router_build__";
+      var key = "__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]];
+      if (global$1[key] && global$1[key] !== "umd") {
+        var initialBuildName = buildNames[global$1[key]];
         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";
+      global$1[key] = "umd";
     }
   }
 
@@ -3051,6 +3059,7 @@
   exports.Router = Router;
   exports.StaticRouter = StaticRouter;
   exports.Switch = Switch;
+  exports.__HistoryContext = historyContext;
   exports.__RouterContext = context;
   exports.generatePath = generatePath;
   exports.matchPath = matchPath;