react-router-dom 4.4.0-beta.6 → 5.0.1

package/README.md

@@ -12,12 +12,12 @@ Then with a module bundler like [webpack](https://webpack.github.io/), use as yo
 
 ```js
 // using ES6 modules
-import { BrowserRouter, Route, Link } from 'react-router-dom'
+import { BrowserRouter, Route, Link } from "react-router-dom";
 
 // using CommonJS modules
-const BrowserRouter = require('react-router-dom').BrowserRouter
-const Route = require('react-router-dom').Route
-const Link = require('react-router-dom').Link
+const BrowserRouter = require("react-router-dom").BrowserRouter;
+const Route = require("react-router-dom").Route;
+const Link = require("react-router-dom").Link;
 ```
 
 The UMD build is also available on [unpkg](https://unpkg.com):

package/cjs/react-router-dom.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
 var React = _interopDefault(require('react'));
@@ -162,8 +160,13 @@ function (_React$Component) {
 
   var _proto = Link.prototype;
 
-  _proto.handleClick = function handleClick(event, context) {
-    if (this.props.onClick) this.props.onClick(event);
+  _proto.handleClick = function handleClick(event, history$$1) {
+    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
@@ -171,7 +174,7 @@ function (_React$Component) {
     !isModifiedEvent(event) // ignore clicks with modifier keys
     ) {
         event.preventDefault();
-        var method = this.props.replace ? context.history.replace : context.history.push;
+        var method = this.props.replace ? history$$1.replace : history$$1.push;
         method(this.props.to);
       }
   };
@@ -192,7 +195,7 @@ function (_React$Component) {
       var href = location ? context.history.createHref(location) : "";
       return React.createElement("a", _extends({}, rest, {
         onClick: function onClick(event) {
-          return _this.handleClick(event, context);
+          return _this.handleClick(event, context.history);
         },
         href: href,
         ref: innerRef
@@ -203,13 +206,11 @@ function (_React$Component) {
   return Link;
 }(React.Component);
 
-Link.defaultProps = {
-  replace: false
-};
-
 {
   var toType = PropTypes.oneOfType([PropTypes.string, PropTypes.object]);
-  var innerRefType = PropTypes.oneOfType([PropTypes.string, PropTypes.func]);
+  var innerRefType = PropTypes.oneOfType([PropTypes.string, PropTypes.func, PropTypes.shape({
+    current: PropTypes.any
+  })]);
   Link.propTypes = {
     innerRef: innerRefType,
     onClick: PropTypes.func,
@@ -234,13 +235,15 @@ function joinClassnames() {
 
 
 function NavLink(_ref) {
-  var ariaCurrent = _ref["aria-current"],
-      activeClassName = _ref.activeClassName,
+  var _ref$ariaCurrent = _ref["aria-current"],
+      ariaCurrent = _ref$ariaCurrent === void 0 ? "page" : _ref$ariaCurrent,
+      _ref$activeClassName = _ref.activeClassName,
+      activeClassName = _ref$activeClassName === void 0 ? "active" : _ref$activeClassName,
       activeStyle = _ref.activeStyle,
       classNameProp = _ref.className,
       exact = _ref.exact,
       isActiveProp = _ref.isActive,
-      location = _ref.location,
+      locationProp = _ref.location,
       strict = _ref.strict,
       styleProp = _ref.style,
       to = _ref.to,
@@ -249,46 +252,39 @@ function NavLink(_ref) {
   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(reactRouter.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({}, styleProp, activeStyle) : styleProp;
-      return React.createElement(Link, _extends({
-        "aria-current": isActive && ariaCurrent || null,
-        className: className,
-        style: style,
-        to: to
-      }, rest));
-    }
+  return React.createElement(reactRouter.__RouterContext.Consumer, null, function (context) {
+    !context ? invariant(false, "You should not use <NavLink> outside a <Router>") : void 0;
+    var pathToMatch = locationProp ? locationProp.pathname : context.location.pathname;
+    var match = escapedPath ? reactRouter.matchPath(pathToMatch, {
+      path: escapedPath,
+      exact: exact,
+      strict: strict
+    }) : null;
+    var isActive = !!(isActiveProp ? isActiveProp(match, context.location) : match);
+    var className = isActive ? joinClassnames(classNameProp, activeClassName) : classNameProp;
+    var style = isActive ? _extends({}, styleProp, activeStyle) : styleProp;
+    return React.createElement(Link, _extends({
+      "aria-current": isActive && ariaCurrent || null,
+      className: className,
+      style: style,
+      to: to
+    }, rest));
   });
 }
 
-NavLink.defaultProps = {
-  "aria-current": "page",
-  activeClassName: "active"
-};
-
 {
   var ariaCurrentType = PropTypes.oneOf(["page", "step", "location", "date", "time", "true"]);
-  NavLink.propTypes = {
+  NavLink.propTypes = _extends({}, Link.propTypes, {
     "aria-current": ariaCurrentType,
     activeClassName: PropTypes.string,
     activeStyle: PropTypes.object,
     className: PropTypes.string,
-    exact: reactRouter.Route.propTypes.exact,
+    exact: PropTypes.bool,
     isActive: PropTypes.func,
     location: PropTypes.object,
-    strict: reactRouter.Route.propTypes.strict,
-    style: PropTypes.object,
-    to: Link.propTypes.to
-  };
+    strict: PropTypes.bool,
+    style: PropTypes.object
+  });
 }
 
 Object.keys(reactRouter).forEach(function (key) { exports[key] = reactRouter[key]; });

package/cjs/react-router-dom.min.js

@@ -1 +1 @@
-"use strict";function _interopDefault(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var React=_interopDefault(require("react")),reactRouter=require("react-router"),history=require("history");require("prop-types"),require("tiny-warning");var invariant=_interopDefault(require("tiny-invariant"));function _extends(){return(_extends=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o])}return e}).apply(this,arguments)}function _inheritsLoose(e,t){e.prototype=Object.create(t.prototype),(e.prototype.constructor=e).__proto__=t}function _objectWithoutPropertiesLoose(e,t){if(null==e)return{};var r,o,n={},i=Object.keys(e);for(o=0;o<i.length;o++)r=i[o],0<=t.indexOf(r)||(n[r]=e[r]);return n}var BrowserRouter=function(n){function e(){for(var e,t=arguments.length,r=new Array(t),o=0;o<t;o++)r[o]=arguments[o];return(e=n.call.apply(n,[this].concat(r))||this).history=history.createBrowserHistory(e.props),e}return _inheritsLoose(e,n),e.prototype.render=function(){return React.createElement(reactRouter.Router,{history:this.history,children:this.props.children})},e}(React.Component),HashRouter=function(n){function e(){for(var e,t=arguments.length,r=new Array(t),o=0;o<t;o++)r[o]=arguments[o];return(e=n.call.apply(n,[this].concat(r))||this).history=history.createHashHistory(e.props),e}return _inheritsLoose(e,n),e.prototype.render=function(){return React.createElement(reactRouter.Router,{history:this.history,children:this.props.children})},e}(React.Component);function isModifiedEvent(e){return!!(e.metaKey||e.altKey||e.ctrlKey||e.shiftKey)}var Link=function(e){function t(){return e.apply(this,arguments)||this}_inheritsLoose(t,e);var r=t.prototype;return r.handleClick=function(e,t){(this.props.onClick&&this.props.onClick(e),e.defaultPrevented||0!==e.button||this.props.target&&"_self"!==this.props.target||isModifiedEvent(e))||(e.preventDefault(),(this.props.replace?t.history.replace:t.history.push)(this.props.to))},r.render=function(){var o=this,e=this.props,n=e.innerRef,i=(e.replace,e.to),a=_objectWithoutPropertiesLoose(e,["innerRef","replace","to"]);return React.createElement(reactRouter.__RouterContext.Consumer,null,function(t){t||invariant(!1);var e="string"==typeof i?history.createLocation(i,null,null,t.location):i,r=e?t.history.createHref(e):"";return React.createElement("a",_extends({},a,{onClick:function(e){return o.handleClick(e,t)},href:r,ref:n}))})},t}(React.Component);function joinClassnames(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r];return t.filter(function(e){return e}).join(" ")}function NavLink(e){var a=e["aria-current"],s=e.activeClassName,c=e.activeStyle,u=e.className,t=e.exact,l=e.isActive,r=e.location,o=e.strict,p=e.style,h=e.to,f=_objectWithoutPropertiesLoose(e,["aria-current","activeClassName","activeStyle","className","exact","isActive","location","strict","style","to"]),n="object"==typeof h?h.pathname:h,i=n&&n.replace(/([.+*?=^!:${}()[\]|/\\])/g,"\\$1");return React.createElement(reactRouter.Route,{path:i,exact:t,strict:o,location:r,children:function(e){var t=e.location,r=e.match,o=!!(l?l(r,t):r),n=o?joinClassnames(u,s):u,i=o?_extends({},p,c):p;return React.createElement(Link,_extends({"aria-current":o&&a||null,className:n,style:i,to:h},f))}})}Link.defaultProps={replace:!1},NavLink.defaultProps={"aria-current":"page",activeClassName:"active"},Object.keys(reactRouter).forEach(function(e){exports[e]=reactRouter[e]}),exports.BrowserRouter=BrowserRouter,exports.HashRouter=HashRouter,exports.Link=Link,exports.NavLink=NavLink;
+"use strict";function _interopDefault(t){return t&&"object"==typeof t&&"default"in t?t.default:t}Object.defineProperty(exports,"__esModule",{value:!0});var React=_interopDefault(require("react")),reactRouter=require("react-router"),history=require("history");require("prop-types"),require("tiny-warning");var invariant=_interopDefault(require("tiny-invariant"));function _extends(){return(_extends=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var r=arguments[e];for(var o in r)Object.prototype.hasOwnProperty.call(r,o)&&(t[o]=r[o])}return t}).apply(this,arguments)}function _inheritsLoose(t,e){t.prototype=Object.create(e.prototype),(t.prototype.constructor=t).__proto__=e}function _objectWithoutPropertiesLoose(t,e){if(null==t)return{};var r,o,n={},i=Object.keys(t);for(o=0;o<i.length;o++)r=i[o],0<=e.indexOf(r)||(n[r]=t[r]);return n}var BrowserRouter=function(n){function t(){for(var t,e=arguments.length,r=new Array(e),o=0;o<e;o++)r[o]=arguments[o];return(t=n.call.apply(n,[this].concat(r))||this).history=history.createBrowserHistory(t.props),t}return _inheritsLoose(t,n),t.prototype.render=function(){return React.createElement(reactRouter.Router,{history:this.history,children:this.props.children})},t}(React.Component),HashRouter=function(n){function t(){for(var t,e=arguments.length,r=new Array(e),o=0;o<e;o++)r[o]=arguments[o];return(t=n.call.apply(n,[this].concat(r))||this).history=history.createHashHistory(t.props),t}return _inheritsLoose(t,n),t.prototype.render=function(){return React.createElement(reactRouter.Router,{history:this.history,children:this.props.children})},t}(React.Component);function isModifiedEvent(t){return!!(t.metaKey||t.altKey||t.ctrlKey||t.shiftKey)}var Link=function(t){function e(){return t.apply(this,arguments)||this}_inheritsLoose(e,t);var r=e.prototype;return r.handleClick=function(e,t){try{this.props.onClick&&this.props.onClick(e)}catch(t){throw e.preventDefault(),t}e.defaultPrevented||0!==e.button||this.props.target&&"_self"!==this.props.target||isModifiedEvent(e)||(e.preventDefault(),(this.props.replace?t.replace:t.push)(this.props.to))},r.render=function(){var o=this,t=this.props,n=t.innerRef,i=(t.replace,t.to),a=_objectWithoutPropertiesLoose(t,["innerRef","replace","to"]);return React.createElement(reactRouter.__RouterContext.Consumer,null,function(e){e||invariant(!1);var t="string"==typeof i?history.createLocation(i,null,null,e.location):i,r=t?e.history.createHref(t):"";return React.createElement("a",_extends({},a,{onClick:function(t){return o.handleClick(t,e.history)},href:r,ref:n}))})},e}(React.Component);function joinClassnames(){for(var t=arguments.length,e=new Array(t),r=0;r<t;r++)e[r]=arguments[r];return e.filter(function(t){return t}).join(" ")}function NavLink(t){var e=t["aria-current"],a=void 0===e?"page":e,r=t.activeClassName,s=void 0===r?"active":r,c=t.activeStyle,u=t.className,l=t.exact,p=t.isActive,h=t.location,f=t.strict,y=t.style,v=t.to,R=_objectWithoutPropertiesLoose(t,["aria-current","activeClassName","activeStyle","className","exact","isActive","location","strict","style","to"]),o="object"==typeof v?v.pathname:v,d=o&&o.replace(/([.+*?=^!:${}()[\]|/\\])/g,"\\$1");return React.createElement(reactRouter.__RouterContext.Consumer,null,function(t){t||invariant(!1);var e=h?h.pathname:t.location.pathname,r=d?reactRouter.matchPath(e,{path:d,exact:l,strict:f}):null,o=!!(p?p(r,t.location):r),n=o?joinClassnames(u,s):u,i=o?_extends({},y,c):y;return React.createElement(Link,_extends({"aria-current":o&&a||null,className:n,style:i,to:v},R))})}Object.keys(reactRouter).forEach(function(t){exports[t]=reactRouter[t]}),exports.BrowserRouter=BrowserRouter,exports.HashRouter=HashRouter,exports.Link=Link,exports.NavLink=NavLink;

package/esm/react-router-dom.js

@@ -1,6 +1,6 @@
 import _inheritsLoose from '@babel/runtime/helpers/esm/inheritsLoose';
 import React from 'react';
-import { Router, __RouterContext, Route } from 'react-router';
+import { Router, __RouterContext, matchPath } from 'react-router';
 export * from 'react-router';
 import { createBrowserHistory, createHashHistory, createLocation } from 'history';
 import PropTypes from 'prop-types';
@@ -121,8 +121,13 @@ function (_React$Component) {
 
   var _proto = Link.prototype;
 
-  _proto.handleClick = function handleClick(event, context) {
-    if (this.props.onClick) this.props.onClick(event);
+  _proto.handleClick = function handleClick(event, history) {
+    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
@@ -130,7 +135,7 @@ function (_React$Component) {
     !isModifiedEvent(event) // ignore clicks with modifier keys
     ) {
         event.preventDefault();
-        var method = this.props.replace ? context.history.replace : context.history.push;
+        var method = this.props.replace ? history.replace : history.push;
         method(this.props.to);
       }
   };
@@ -151,7 +156,7 @@ function (_React$Component) {
       var href = location ? context.history.createHref(location) : "";
       return React.createElement("a", _extends({}, rest, {
         onClick: function onClick(event) {
-          return _this.handleClick(event, context);
+          return _this.handleClick(event, context.history);
         },
         href: href,
         ref: innerRef
@@ -162,13 +167,11 @@ function (_React$Component) {
   return Link;
 }(React.Component);
 
-Link.defaultProps = {
-  replace: false
-};
-
 if (process.env.NODE_ENV !== "production") {
   var toType = PropTypes.oneOfType([PropTypes.string, PropTypes.object]);
-  var innerRefType = PropTypes.oneOfType([PropTypes.string, PropTypes.func]);
+  var innerRefType = PropTypes.oneOfType([PropTypes.string, PropTypes.func, PropTypes.shape({
+    current: PropTypes.any
+  })]);
   Link.propTypes = {
     innerRef: innerRefType,
     onClick: PropTypes.func,
@@ -193,13 +196,15 @@ function joinClassnames() {
 
 
 function NavLink(_ref) {
-  var ariaCurrent = _ref["aria-current"],
-      activeClassName = _ref.activeClassName,
+  var _ref$ariaCurrent = _ref["aria-current"],
+      ariaCurrent = _ref$ariaCurrent === void 0 ? "page" : _ref$ariaCurrent,
+      _ref$activeClassName = _ref.activeClassName,
+      activeClassName = _ref$activeClassName === void 0 ? "active" : _ref$activeClassName,
       activeStyle = _ref.activeStyle,
       classNameProp = _ref.className,
       exact = _ref.exact,
       isActiveProp = _ref.isActive,
-      location = _ref.location,
+      locationProp = _ref.location,
       strict = _ref.strict,
       styleProp = _ref.style,
       to = _ref.to,
@@ -208,46 +213,39 @@ function NavLink(_ref) {
   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({}, styleProp, activeStyle) : styleProp;
-      return React.createElement(Link, _extends({
-        "aria-current": isActive && ariaCurrent || null,
-        className: className,
-        style: style,
-        to: to
-      }, rest));
-    }
+  return React.createElement(__RouterContext.Consumer, null, function (context) {
+    !context ? process.env.NODE_ENV !== "production" ? invariant(false, "You should not use <NavLink> outside a <Router>") : invariant(false) : void 0;
+    var pathToMatch = locationProp ? locationProp.pathname : context.location.pathname;
+    var match = escapedPath ? matchPath(pathToMatch, {
+      path: escapedPath,
+      exact: exact,
+      strict: strict
+    }) : null;
+    var isActive = !!(isActiveProp ? isActiveProp(match, context.location) : match);
+    var className = isActive ? joinClassnames(classNameProp, activeClassName) : classNameProp;
+    var style = isActive ? _extends({}, styleProp, activeStyle) : styleProp;
+    return React.createElement(Link, _extends({
+      "aria-current": isActive && ariaCurrent || null,
+      className: className,
+      style: style,
+      to: to
+    }, rest));
   });
 }
 
-NavLink.defaultProps = {
-  "aria-current": "page",
-  activeClassName: "active"
-};
-
 if (process.env.NODE_ENV !== "production") {
   var ariaCurrentType = PropTypes.oneOf(["page", "step", "location", "date", "time", "true"]);
-  NavLink.propTypes = {
+  NavLink.propTypes = _extends({}, Link.propTypes, {
     "aria-current": ariaCurrentType,
     activeClassName: PropTypes.string,
     activeStyle: PropTypes.object,
     className: PropTypes.string,
-    exact: Route.propTypes.exact,
+    exact: PropTypes.bool,
     isActive: PropTypes.func,
     location: PropTypes.object,
-    strict: Route.propTypes.strict,
-    style: PropTypes.object,
-    to: Link.propTypes.to
-  };
+    strict: PropTypes.bool,
+    style: PropTypes.object
+  });
 }
 
 export { BrowserRouter, HashRouter, Link, NavLink };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom",
-  "version": "4.4.0-beta.6",
+  "version": "5.0.1",
   "description": "DOM bindings for React Router",
   "repository": "ReactTraining/react-router",
   "license": "MIT",
@@ -34,9 +34,9 @@
   "module": "esm/react-router-dom.js",
   "sideEffects": false,
   "scripts": {
-    "build": "del cjs esm umd && rollup -c",
-    "prepublishOnly": "del cjs esm umd && rollup -c",
+    "build": "rollup -c",
     "lint": "eslint modules",
+    "prepublishOnly": "npm run build",
     "test": "jest"
   },
   "peerDependencies": {
@@ -44,10 +44,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "history": "^4.8.0-beta.0",
+    "history": "^4.9.0",
     "loose-envify": "^1.3.1",
     "prop-types": "^15.6.2",
-    "react-router": "^4.4.0-beta.6",
+    "react-router": "5.0.1",
     "tiny-invariant": "^1.0.2",
     "tiny-warning": "^1.0.0"
   },
@@ -57,26 +57,24 @@
     "@babel/plugin-transform-runtime": "^7.1.0",
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-react": "^7.0.0",
-    "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.0.1",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.8.0",
     "babel-plugin-dev-expression": "^0.2.1",
-    "del-cli": "^1.1.0",
-    "eslint": "^5.7.0",
-    "eslint-plugin-import": "^2.12.0",
+    "eslint": "^5.16.0",
+    "eslint-plugin-import": "^2.17.0",
     "eslint-plugin-react": "^7.9.1",
-    "jest": "^23.6.0",
-    "jest-circus": "^23.6.0",
-    "raf": "^3.4.0",
+    "jest": "^24.8.0",
+    "jest-circus": "^24.8.0",
+    "raf": "^3.4.1",
     "react": "^16.5.2",
     "react-dom": "^16.5.2",
     "rollup": "^0.66.6",
-    "rollup-plugin-babel": "^4.0.3",
-    "rollup-plugin-commonjs": "^9.1.3",
-    "rollup-plugin-node-resolve": "^3.3.0",
-    "rollup-plugin-replace": "^2.0.0",
-    "rollup-plugin-size-snapshot": "^0.7.0",
-    "rollup-plugin-uglify": "^6.0.0"
+    "rollup-plugin-babel": "^4.3.2",
+    "rollup-plugin-commonjs": "^9.3.4",
+    "rollup-plugin-node-resolve": "^3.4.0",
+    "rollup-plugin-replace": "^2.2.0",
+    "rollup-plugin-size-snapshot": "0.7.0",
+    "rollup-plugin-uglify": "^6.0.2"
   },
   "browserify": {
     "transform": [
@@ -91,5 +89,5 @@
     "history",
     "link"
   ],
-  "gitHead": "5ccb241cd59eae7a15de31c7babff6619378be39"
+  "gitHead": "0c9a10d9807b879912f2dff2fbebffe0aa7048ed"
 }