react-router 4.0.0-beta.7 → 4.1.1

package/MemoryRouter.js

@@ -6,6 +6,10 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 var _createMemoryHistory = require('history/createMemoryHistory');
 
 var _createMemoryHistory2 = _interopRequireDefault(_createMemoryHistory);
@@ -48,10 +52,10 @@ var MemoryRouter = function (_React$Component) {
 }(_react2.default.Component);
 
 MemoryRouter.propTypes = {
-  initialEntries: _react.PropTypes.array,
-  initialIndex: _react.PropTypes.number,
-  getUserConfirmation: _react.PropTypes.func,
-  keyLength: _react.PropTypes.number,
-  children: _react.PropTypes.node
+  initialEntries: _propTypes2.default.array,
+  initialIndex: _propTypes2.default.number,
+  getUserConfirmation: _propTypes2.default.func,
+  keyLength: _propTypes2.default.number,
+  children: _propTypes2.default.node
 };
 exports.default = MemoryRouter;

package/Prompt.js

@@ -6,6 +6,10 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -30,7 +34,7 @@ var Prompt = function (_React$Component) {
   Prompt.prototype.enable = function enable(message) {
     if (this.unblock) this.unblock();
 
-    this.unblock = this.context.history.block(message);
+    this.unblock = this.context.router.history.block(message);
   };
 
   Prompt.prototype.disable = function disable() {
@@ -63,16 +67,18 @@ var Prompt = function (_React$Component) {
   return Prompt;
 }(_react2.default.Component);
 
-Prompt.contextTypes = {
-  history: _react.PropTypes.shape({
-    block: _react.PropTypes.func.isRequired
-  }).isRequired
-};
 Prompt.propTypes = {
-  when: _react.PropTypes.bool,
-  message: _react.PropTypes.oneOfType([_react.PropTypes.func, _react.PropTypes.string]).isRequired
+  when: _propTypes2.default.bool,
+  message: _propTypes2.default.oneOfType([_propTypes2.default.func, _propTypes2.default.string]).isRequired
 };
 Prompt.defaultProps = {
   when: true
 };
+Prompt.contextTypes = {
+  router: _propTypes2.default.shape({
+    history: _propTypes2.default.shape({
+      block: _propTypes2.default.func.isRequired
+    }).isRequired
+  }).isRequired
+};
 exports.default = Prompt;

package/README.md

@@ -6,7 +6,7 @@ Declarative routing for [React](https://facebook.github.io/react).
 
 Using [npm](https://www.npmjs.com/):
 
-    $ npm install --save react-router@next
+    $ npm install --save react-router
 
 Then with a module bundler like [webpack](https://webpack.github.io/), use as you would anything else:
 
@@ -23,7 +23,7 @@ var Switch = require('react-router').Switch
 The UMD build is also available on [unpkg](https://unpkg.com):
 
 ```html
-<script src="https://unpkg.com/react-router@next/umd/react-router.min.js"></script>
+<script src="https://unpkg.com/react-router/umd/react-router.min.js"></script>
 ```
 
 You can find the library on `window.ReactRouter`.

package/Redirect.js

@@ -6,6 +6,10 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -27,16 +31,20 @@ var Redirect = function (_React$Component) {
     return _possibleConstructorReturn(this, _React$Component.apply(this, arguments));
   }
 
+  Redirect.prototype.isStatic = function isStatic() {
+    return this.context.router && this.context.router.staticContext;
+  };
+
   Redirect.prototype.componentWillMount = function componentWillMount() {
-    if (this.context.history.staticContext) this.perform();
+    if (this.isStatic()) this.perform();
   };
 
   Redirect.prototype.componentDidMount = function componentDidMount() {
-    if (!this.context.history.staticContext) this.perform();
+    if (!this.isStatic()) this.perform();
   };
 
   Redirect.prototype.perform = function perform() {
-    var history = this.context.history;
+    var history = this.context.router.history;
     var _props = this.props,
         push = _props.push,
         to = _props.to;
@@ -56,18 +64,21 @@ var Redirect = function (_React$Component) {
   return Redirect;
 }(_react2.default.Component);
 
-Redirect.contextTypes = {
-  history: _react.PropTypes.shape({
-    push: _react.PropTypes.func.isRequired,
-    replace: _react.PropTypes.func.isRequired,
-    staticContext: _react.PropTypes.object
-  }).isRequired
-};
 Redirect.propTypes = {
-  push: _react.PropTypes.bool,
-  to: _react.PropTypes.oneOfType([_react.PropTypes.string, _react.PropTypes.object])
+  push: _propTypes2.default.bool,
+  from: _propTypes2.default.string,
+  to: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.object])
 };
 Redirect.defaultProps = {
   push: false
 };
+Redirect.contextTypes = {
+  router: _propTypes2.default.shape({
+    history: _propTypes2.default.shape({
+      push: _propTypes2.default.func.isRequired,
+      replace: _propTypes2.default.func.isRequired
+    }).isRequired,
+    staticContext: _propTypes2.default.object
+  }).isRequired
+};
 exports.default = Redirect;

package/Route.js

@@ -2,6 +2,8 @@
 
 exports.__esModule = true;
 
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 var _warning = require('warning');
 
 var _warning2 = _interopRequireDefault(_warning);
@@ -10,6 +12,10 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 var _matchPath = require('./matchPath');
 
 var _matchPath2 = _interopRequireDefault(_matchPath);
@@ -38,16 +44,18 @@ var Route = function (_React$Component) {
     }
 
     return _ret = (_temp = (_this = _possibleConstructorReturn(this, _React$Component.call.apply(_React$Component, [this].concat(args))), _this), _this.state = {
-      match: _this.computeMatch(_this.props, _this.context)
+      match: _this.computeMatch(_this.props, _this.context.router)
     }, _temp), _possibleConstructorReturn(_this, _ret);
   }
 
   Route.prototype.getChildContext = function getChildContext() {
     return {
-      route: {
-        location: this.props.location || this.context.route.location,
-        match: this.state.match
-      }
+      router: _extends({}, this.context.router, {
+        route: {
+          location: this.props.location || this.context.router.route.location,
+          match: this.state.match
+        }
+      })
     };
   };
 
@@ -63,7 +71,21 @@ var Route = function (_React$Component) {
 
     var pathname = (location || route.location).pathname;
 
-    return (0, _matchPath2.default)(pathname, { path: path, strict: strict, exact: exact });
+    return path ? (0, _matchPath2.default)(pathname, { path: path, strict: strict, exact: exact }) : route.match;
+  };
+
+  Route.prototype.componentWillMount = function componentWillMount() {
+    var _props = this.props,
+        component = _props.component,
+        render = _props.render,
+        children = _props.children;
+
+
+    (0, _warning2.default)(!(component && render), 'You should not use <Route component> and <Route render> in the same route; <Route render> will be ignored');
+
+    (0, _warning2.default)(!(component && children), 'You should not use <Route component> and <Route children> in the same route; <Route children> will be ignored');
+
+    (0, _warning2.default)(!(render && children), 'You should not use <Route render> and <Route children> in the same route; <Route children> will be ignored');
   };
 
   Route.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps, nextContext) {
@@ -72,22 +94,23 @@ var Route = function (_React$Component) {
     (0, _warning2.default)(!(!nextProps.location && this.props.location), '<Route> elements should not change from controlled to uncontrolled (or vice versa). You provided a "location" prop initially but omitted it on a subsequent render.');
 
     this.setState({
-      match: this.computeMatch(nextProps, nextContext)
+      match: this.computeMatch(nextProps, nextContext.router)
     });
   };
 
   Route.prototype.render = function render() {
     var match = this.state.match;
-    var _props = this.props,
-        children = _props.children,
-        component = _props.component,
-        render = _props.render;
-    var _context = this.context,
-        history = _context.history,
-        route = _context.route;
+    var _props2 = this.props,
+        children = _props2.children,
+        component = _props2.component,
+        render = _props2.render;
+    var _context$router = this.context.router,
+        history = _context$router.history,
+        route = _context$router.route,
+        staticContext = _context$router.staticContext;
 
     var location = this.props.location || route.location;
-    var props = { match: match, location: location, history: history };
+    var props = { match: match, location: location, history: history, staticContext: staticContext };
 
     return component ? // component prop gets first priority, only called if there's a match
     match ? _react2.default.createElement(component, props) : null : render ? // render prop is next, only called if there's a match
@@ -99,21 +122,24 @@ var Route = function (_React$Component) {
   return Route;
 }(_react2.default.Component);
 
-Route.contextTypes = {
-  history: _react.PropTypes.object.isRequired,
-  route: _react.PropTypes.object.isRequired
-};
 Route.propTypes = {
-  computedMatch: _react.PropTypes.object, // private, from <Switch>
-  path: _react.PropTypes.string,
-  exact: _react.PropTypes.bool,
-  strict: _react.PropTypes.bool,
-  component: _react.PropTypes.func,
-  render: _react.PropTypes.func,
-  children: _react.PropTypes.oneOfType([_react.PropTypes.func, _react.PropTypes.node]),
-  location: _react.PropTypes.object
+  computedMatch: _propTypes2.default.object, // private, from <Switch>
+  path: _propTypes2.default.string,
+  exact: _propTypes2.default.bool,
+  strict: _propTypes2.default.bool,
+  component: _propTypes2.default.func,
+  render: _propTypes2.default.func,
+  children: _propTypes2.default.oneOfType([_propTypes2.default.func, _propTypes2.default.node]),
+  location: _propTypes2.default.object
+};
+Route.contextTypes = {
+  router: _propTypes2.default.shape({
+    history: _propTypes2.default.object.isRequired,
+    route: _propTypes2.default.object.isRequired,
+    staticContext: _propTypes2.default.object
+  })
 };
 Route.childContextTypes = {
-  route: _react.PropTypes.object.isRequired
+  router: _propTypes2.default.object.isRequired
 };
 exports.default = Route;

package/Router.js

@@ -2,6 +2,8 @@
 
 exports.__esModule = true;
 
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 var _warning = require('warning');
 
 var _warning2 = _interopRequireDefault(_warning);
@@ -14,6 +16,10 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -44,11 +50,13 @@ var Router = function (_React$Component) {
 
   Router.prototype.getChildContext = function getChildContext() {
     return {
-      history: this.props.history,
-      route: {
-        location: this.props.history.location,
-        match: this.state.match
-      }
+      router: _extends({}, this.context.router, {
+        history: this.props.history,
+        route: {
+          location: this.props.history.location,
+          match: this.state.match
+        }
+      })
     };
   };
 
@@ -99,11 +107,13 @@ var Router = function (_React$Component) {
 }(_react2.default.Component);
 
 Router.propTypes = {
-  history: _react.PropTypes.object.isRequired,
-  children: _react.PropTypes.node
+  history: _propTypes2.default.object.isRequired,
+  children: _propTypes2.default.node
+};
+Router.contextTypes = {
+  router: _propTypes2.default.object
 };
 Router.childContextTypes = {
-  history: _react.PropTypes.object.isRequired,
-  route: _react.PropTypes.object.isRequired
+  router: _propTypes2.default.object.isRequired
 };
 exports.default = Router;

package/StaticRouter.js

@@ -12,6 +12,10 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 var _PathUtils = require('history/PathUtils');
 
 var _Router = require('./Router');
@@ -124,6 +128,14 @@ var StaticRouter = function (_React$Component) {
     }, _temp), _possibleConstructorReturn(_this, _ret);
   }
 
+  StaticRouter.prototype.getChildContext = function getChildContext() {
+    return {
+      router: {
+        staticContext: this.props.context
+      }
+    };
+  };
+
   StaticRouter.prototype.render = function render() {
     var _props = this.props,
         basename = _props.basename,
@@ -132,7 +144,6 @@ var StaticRouter = function (_React$Component) {
         props = _objectWithoutProperties(_props, ['basename', 'context', 'location']);
 
     var history = {
-      staticContext: context,
       createHref: this.createHref,
       action: 'POP',
       location: stripBasename(basename, createLocation(location)),
@@ -152,12 +163,15 @@ var StaticRouter = function (_React$Component) {
 }(_react2.default.Component);
 
 StaticRouter.propTypes = {
-  basename: _react.PropTypes.string,
-  context: _react.PropTypes.object.isRequired,
-  location: _react.PropTypes.oneOfType([_react.PropTypes.string, _react.PropTypes.object])
+  basename: _propTypes2.default.string,
+  context: _propTypes2.default.object.isRequired,
+  location: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.object])
 };
 StaticRouter.defaultProps = {
   basename: '',
   location: '/'
 };
+StaticRouter.childContextTypes = {
+  router: _propTypes2.default.object.isRequired
+};
 exports.default = StaticRouter;

package/Switch.js

@@ -6,6 +6,10 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 var _warning = require('warning');
 
 var _warning2 = _interopRequireDefault(_warning);
@@ -41,16 +45,27 @@ var Switch = function (_React$Component) {
   };
 
   Switch.prototype.render = function render() {
+    var route = this.context.router.route;
     var children = this.props.children;
 
-    var location = this.props.location || this.context.route.location;
+    var location = this.props.location || route.location;
 
     var match = void 0,
         child = void 0;
     _react2.default.Children.forEach(children, function (element) {
+      if (!_react2.default.isValidElement(element)) return;
+
+      var _element$props = element.props,
+          pathProp = _element$props.path,
+          exact = _element$props.exact,
+          strict = _element$props.strict,
+          from = _element$props.from;
+
+      var path = pathProp || from;
+
       if (match == null) {
         child = element;
-        match = (0, _matchPath2.default)(location.pathname, element.props);
+        match = path ? (0, _matchPath2.default)(location.pathname, { path: path, exact: exact, strict: strict }) : route.match;
       }
     });
 
@@ -61,10 +76,12 @@ var Switch = function (_React$Component) {
 }(_react2.default.Component);
 
 Switch.contextTypes = {
-  route: _react.PropTypes.object.isRequired
+  router: _propTypes2.default.shape({
+    route: _propTypes2.default.object.isRequired
+  }).isRequired
 };
 Switch.propTypes = {
-  children: _react.PropTypes.node,
-  location: _react.PropTypes.object
+  children: _propTypes2.default.node,
+  location: _propTypes2.default.object
 };
 exports.default = Switch;

package/es/MemoryRouter.js

@@ -4,7 +4,8 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 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; }
 
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import createHistory from 'history/createMemoryHistory';
 import Router from './Router';
 

package/es/Prompt.js

@@ -4,7 +4,8 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 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; }
 
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * The public API for prompting the user before navigating away
@@ -23,7 +24,7 @@ var Prompt = function (_React$Component) {
   Prompt.prototype.enable = function enable(message) {
     if (this.unblock) this.unblock();
 
-    this.unblock = this.context.history.block(message);
+    this.unblock = this.context.router.history.block(message);
   };
 
   Prompt.prototype.disable = function disable() {
@@ -56,11 +57,6 @@ var Prompt = function (_React$Component) {
   return Prompt;
 }(React.Component);
 
-Prompt.contextTypes = {
-  history: PropTypes.shape({
-    block: PropTypes.func.isRequired
-  }).isRequired
-};
 Prompt.propTypes = {
   when: PropTypes.bool,
   message: PropTypes.oneOfType([PropTypes.func, PropTypes.string]).isRequired
@@ -68,6 +64,13 @@ Prompt.propTypes = {
 Prompt.defaultProps = {
   when: true
 };
+Prompt.contextTypes = {
+  router: PropTypes.shape({
+    history: PropTypes.shape({
+      block: PropTypes.func.isRequired
+    }).isRequired
+  }).isRequired
+};
 
 
 export default Prompt;

package/es/Redirect.js

@@ -4,7 +4,8 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 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; }
 
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * The public API for updating the location programatically
@@ -20,16 +21,20 @@ var Redirect = function (_React$Component) {
     return _possibleConstructorReturn(this, _React$Component.apply(this, arguments));
   }
 
+  Redirect.prototype.isStatic = function isStatic() {
+    return this.context.router && this.context.router.staticContext;
+  };
+
   Redirect.prototype.componentWillMount = function componentWillMount() {
-    if (this.context.history.staticContext) this.perform();
+    if (this.isStatic()) this.perform();
   };
 
   Redirect.prototype.componentDidMount = function componentDidMount() {
-    if (!this.context.history.staticContext) this.perform();
+    if (!this.isStatic()) this.perform();
   };
 
   Redirect.prototype.perform = function perform() {
-    var history = this.context.history;
+    var history = this.context.router.history;
     var _props = this.props,
         push = _props.push,
         to = _props.to;
@@ -49,20 +54,23 @@ var Redirect = function (_React$Component) {
   return Redirect;
 }(React.Component);
 
-Redirect.contextTypes = {
-  history: PropTypes.shape({
-    push: PropTypes.func.isRequired,
-    replace: PropTypes.func.isRequired,
-    staticContext: PropTypes.object
-  }).isRequired
-};
 Redirect.propTypes = {
   push: PropTypes.bool,
+  from: PropTypes.string,
   to: PropTypes.oneOfType([PropTypes.string, PropTypes.object])
 };
 Redirect.defaultProps = {
   push: false
 };
+Redirect.contextTypes = {
+  router: PropTypes.shape({
+    history: PropTypes.shape({
+      push: PropTypes.func.isRequired,
+      replace: PropTypes.func.isRequired
+    }).isRequired,
+    staticContext: PropTypes.object
+  }).isRequired
+};
 
 
 export default Redirect;