react-router 3.0.1 → 3.0.5

package/CHANGES.md

@@ -1,3 +1,41 @@
+## [v3.0.5](https://github.com/ReactTraining/react-router/compare/v3.0.4...v3.0.5)
+> Apr 10, 2017
+
+- Manually set displayName for components
+- Async hooks could be removed during simultaneous server requests (#4941 by @s-yadav)
+
+## [v3.0.4](https://github.com/ReactTraining/react-router/compare/v3.0.3...v3.0.4)
+> Apr 9, 2017
+
+- Fixes for React 15.5 deprecation warnings
+
+## [v3.0.3](https://github.com/ReactTraining/react-router/compare/v3.0.2...v3.0.3)
+> Mar 28, 2017
+
+- Fix webpack-related anonymous function issue (#4857 by @alisd23)
+- Fix usage with babel-plugin-transform-remove-prop-types (#4505 by @oliviertassinari)
+- Remove references to Link hash/query/state props (#4377 by @insin)
+
+## [v3.0.2](https://github.com/ReactTraining/react-router/compare/v3.0.1...v3.0.2)
+> Jan 18, 2017
+
+- Re-add module entry to package.json
+
+## [v3.0.1](https://github.com/ReactTraining/react-router/compare/v3.0.0...v3.0.1)
+> Jan 12, 2017
+
+- Pass transition hook's arguments correctly ([#4123] by @arkist)
+- Fix index routes inside async pathless routes ([#4147] by @taurose)
+- 'to' maybe undefined ([#4216] by @panzj)
+- Fix withRouter error when used without a Router ([#4295] by @dropfen)
+- Adding support for escaped parentheses in Route Paths ([#4202] by @sebastiandeutsch)
+
+[#4123]: https://github.com/ReactTraining/react-router/pull/4123
+[#4147]: https://github.com/ReactTraining/react-router/pull/4147
+[#4216]: https://github.com/ReactTraining/react-router/pull/4216
+[#4295]: https://github.com/ReactTraining/react-router/pull/4295
+[#4202]: https://github.com/ReactTraining/react-router/pull/4202
+
 ## [v3.0.0]
 > Oct 24, 2016
 

package/README.md

@@ -9,11 +9,16 @@ React Router keeps your UI in sync with the URL. It has a simple API with powerf
 [![Codecov][codecov-badge]][codecov]
 [![Discord][discord-badge]][discord]
 
+### 4.0 is here!
+
+The next version of React Router (4.0) has been released! Check out the `master` branch.
+
+[4.0 Documentation](https://reacttraining.com/react-router/)
 
 ### Docs & Help
 
 - [Tutorial – do this first!](https://github.com/reactjs/react-router-tutorial)
-- [Guides and API docs](/docs)
+- [Guides and API docs (v2, v3)](/docs)
 - [Troubleshooting guide](https://github.com/ReactTraining/react-router/blob/master/docs/Troubleshooting.md)
 - [Changelog](/CHANGES.md)
 - [Stack Overflow](http://stackoverflow.com/questions/tagged/react-router)

package/docs/API.md

@@ -535,7 +535,7 @@ A route's component is rendered when that route matches the URL. The router will
 ### Injected Props
 
 #### `location`
-The current [location](https://github.com/mjackson/history/blob/v2.x/docs/Location.md).
+The current [location](https://github.com/ReactTraining/history/blob/v2/docs/Location.md).
 
 #### `params`
 The dynamic segments of the URL.
@@ -546,6 +546,9 @@ The route that rendered this component.
 #### `router`
 Contains methods relevant to routing. Most useful for imperatively transitioning around the application.
 
+#### `routes`
+The routes registered with the router.
+
 #### `routeParams`
 A subset of `this.props.params` that were directly specified in this component's route. For example, if the route's path is `users/:userId` and the URL is `/users/123/portfolios/345` then `this.props.routeParams` will be `{userId: '123'}`, and `this.props.params` will be `{userId: '123', portfolioId: '345'}`.
 
@@ -645,9 +648,9 @@ For more details, please see the [histories guide](/docs/guides/Histories.md).
 `useRouterHistory` is a `history` enhancer that configures a given `createHistory` factory to work with React Router. This allows using custom histories in addition to the bundled singleton histories.
 
 It also pre-enhances the history with the
-[useQueries](https://github.com/mjackson/history/blob/v2.x/docs/QuerySupport.md)
+[useQueries](https://github.com/ReactTraining/history/blob/v2/docs/QuerySupport.md)
 and
-[useBasename](https://github.com/mjackson/history/blob/v2.x/docs/BasenameSupport.md)
+[useBasename](https://github.com/ReactTraining/history/blob/v2/docs/BasenameSupport.md)
 enhancers from `history`
 
 #### Example

package/docs/guides/ConfirmingNavigation.md

@@ -13,6 +13,9 @@ const Home = withRouter(
     routerWillLeave(nextLocation) {
       // return false to prevent a transition w/o prompting the user,
       // or return a string to allow the user to decide:
+      // return `null` or nothing to let other hooks to be executed
+      //
+      // NOTE: if you return true, other hooks will not be executed!
       if (!this.state.isSaved)
         return 'Your work is not saved! Are you sure you want to leave?'
     },

package/docs/guides/Histories.md

@@ -1,6 +1,6 @@
 # Histories
 
-React Router is built with [history](https://github.com/mjackson/history).
+React Router is built with [history](https://github.com/ReactTraining/history).
 In a nutshell, a history knows how to listen to the browser's address
 bar for changes and parses the URL into a `location` object that the
 router can use to match routes and render the correct set of components.
@@ -139,11 +139,11 @@ render(
 
 If you'd like to further customize the history options or use other
 enhancers from
-[history](https://github.com/mjackson/history/) you can use
+[history](https://github.com/ReactTraining/history) you can use
 `useRouterHistory`.
 
 Be aware that `useRouterHistory` already pre-enhances your history
-factory with the [useQueries](https://github.com/mjackson/history/blob/v2.x/docs/QuerySupport.md) and [useBasename](https://github.com/mjackson/history/blob/v2.x/docs/BasenameSupport.md) enhancers from `history`.
+factory with the [useQueries](https://github.com/ReactTraining/history/blob/v2/docs/QuerySupport.md) and [useBasename](https://github.com/ReactTraining/history/blob/v2/docs/BasenameSupport.md) enhancers from `history`.
 
 ### Examples:
 
@@ -159,7 +159,7 @@ const history = useRouterHistory(createHistory)({
 ```
 
 Using the
-[useBeforeUnload](https://github.com/mjackson/history/blob/v2.x/docs/ConfirmingNavigation.md)
+[useBeforeUnload](https://github.com/ReactTraining/history/blob/v2/docs/ConfirmingNavigation.md)
 enhancer:
 
 ```js

package/docs/guides/RouteMatching.md

@@ -13,7 +13,7 @@ React Router uses the concept of nested routes to let you declare nested sets of
 A route path is [a string pattern](/docs/Glossary.md#routepattern) that is used to match a URL (or a portion of one). Route paths are interpreted literally, except for the following special symbols:
 
   - `:paramName` – matches a URL segment up to the next `/`, `?`, or `#`. The matched string is called a [param](/docs/Glossary.md#params)
-  - `()` – Wraps a portion of the URL that is optional. You may escape parentheses if you want to use them in a url using a blackslash \
+  - `()` – Wraps a portion of the URL that is optional. You may escape parentheses if you want to use them in a url using a backslash \
   - `*` – Matches all characters (non-greedy) up to the next character in the pattern, or to the end of the URL if there is none, and creates a `splat` [param](/docs/Glossary.md#params)
   - `**` - Matches all characters (greedy) until the next `/`, `?`, or `#` and creates a `splat` [param](/docs/Glossary.md#params)
 

package/es/ContextUtils.js

@@ -1,4 +1,4 @@
-import { PropTypes } from 'react';
+import PropTypes from 'prop-types';
 
 // Works around issues with context updates failing to propagate.
 // Caveat: the context value is expected to never change its identity.

package/es/IndexLink.js

@@ -1,13 +1,15 @@
 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; };
 
 import React from 'react';
+import createReactClass from 'create-react-class';
 import Link from './Link';
 
 /**
  * An <IndexLink> is used to link to an <IndexRoute>.
  */
-var IndexLink = React.createClass({
+var IndexLink = createReactClass({
   displayName: 'IndexLink',
+
   render: function render() {
     return React.createElement(Link, _extends({}, this.props, { onlyActiveOnIndex: true }));
   }

package/es/IndexRedirect.js

@@ -1,22 +1,17 @@
-import React from 'react';
+import createReactClass from 'create-react-class';
+import { string, object } from 'prop-types';
 import warning from './routerWarning';
 import invariant from 'invariant';
 import Redirect from './Redirect';
 import { falsy } from './InternalPropTypes';
 
-var _React$PropTypes = React.PropTypes,
-    string = _React$PropTypes.string,
-    object = _React$PropTypes.object;
-
 /**
  * An <IndexRedirect> is used to redirect from an indexRoute.
  */
 /* eslint-disable react/require-render-return */
-
-var IndexRedirect = React.createClass({
+var IndexRedirect = createReactClass({
   displayName: 'IndexRedirect',
 
-
   statics: {
     createRouteFromReactElement: function createRouteFromReactElement(element, parentRoute) {
       /* istanbul ignore else: sanity check */

package/es/IndexRoute.js

@@ -1,21 +1,18 @@
-import React from 'react';
+import createReactClass from 'create-react-class';
+import { func } from 'prop-types';
 import warning from './routerWarning';
 import invariant from 'invariant';
 import { createRouteFromReactElement as _createRouteFromReactElement } from './RouteUtils';
 import { component, components, falsy } from './InternalPropTypes';
 
-var func = React.PropTypes.func;
-
 /**
  * An <IndexRoute> is used to specify its parent's <Route indexRoute> in
  * a JSX route config.
  */
 /* eslint-disable react/require-render-return */
-
-var IndexRoute = React.createClass({
+var IndexRoute = createReactClass({
   displayName: 'IndexRoute',
 
-
   statics: {
     createRouteFromReactElement: function createRouteFromReactElement(element, parentRoute) {
       /* istanbul ignore else: sanity check */

package/es/InternalPropTypes.js

@@ -1,13 +1,4 @@
-import { PropTypes } from 'react';
-
-var func = PropTypes.func,
-    object = PropTypes.object,
-    arrayOf = PropTypes.arrayOf,
-    oneOfType = PropTypes.oneOfType,
-    element = PropTypes.element,
-    shape = PropTypes.shape,
-    string = PropTypes.string;
-
+import { func, object, arrayOf, oneOfType, element, shape, string } from 'prop-types';
 
 export function falsy(props, propName, componentName) {
   if (props[propName]) return new Error('<' + componentName + '> should not have a "' + propName + '" prop');

package/es/Link.js

@@ -3,18 +3,12 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
 
 import React from 'react';
+import createReactClass from 'create-react-class';
+import { bool, object, string, func, oneOfType } from 'prop-types';
 import invariant from 'invariant';
 import { routerShape } from './PropTypes';
 import { ContextSubscriber } from './ContextUtils';
 
-var _React$PropTypes = React.PropTypes,
-    bool = _React$PropTypes.bool,
-    object = _React$PropTypes.object,
-    string = _React$PropTypes.string,
-    func = _React$PropTypes.func,
-    oneOfType = _React$PropTypes.oneOfType;
-
-
 function isLeftClickEvent(event) {
   return event.button === 0;
 }
@@ -46,16 +40,10 @@ function resolveToLocation(to, router) {
  * You could use the following component to link to that route:
  *
  *   <Link to={`/posts/${post.id}`} />
- *
- * Links may pass along location state and/or query string parameters
- * in the state/query props, respectively.
- *
- *   <Link ... query={{ show: true }} state={{ the: 'state' }} />
  */
-var Link = React.createClass({
+var Link = createReactClass({
   displayName: 'Link',
 
-
   mixins: [ContextSubscriber('router')],
 
   contextTypes: {
@@ -64,9 +52,6 @@ var Link = React.createClass({
 
   propTypes: {
     to: oneOfType([string, object, func]),
-    query: object,
-    hash: string,
-    state: object,
     activeStyle: object,
     activeClassName: string,
     onlyActiveOnIndex: bool.isRequired,

package/es/PropTypes.js

@@ -1,10 +1,4 @@
-import { PropTypes } from 'react';
-
-var func = PropTypes.func,
-    object = PropTypes.object,
-    shape = PropTypes.shape,
-    string = PropTypes.string;
-
+import { func, object, shape, string } from 'prop-types';
 
 export var routerShape = shape({
   push: func.isRequired,

package/es/Redirect.js

@@ -1,13 +1,10 @@
-import React from 'react';
+import createReactClass from 'create-react-class';
+import { string, object } from 'prop-types';
 import invariant from 'invariant';
 import { createRouteFromReactElement as _createRouteFromReactElement } from './RouteUtils';
 import { formatPattern } from './PatternUtils';
 import { falsy } from './InternalPropTypes';
 
-var _React$PropTypes = React.PropTypes,
-    string = _React$PropTypes.string,
-    object = _React$PropTypes.object;
-
 /**
  * A <Redirect> is used to declare another URL path a client should
  * be sent to when they request a given URL.
@@ -16,11 +13,9 @@ var _React$PropTypes = React.PropTypes,
  * and are traversed in the same manner.
  */
 /* eslint-disable react/require-render-return */
-
-var Redirect = React.createClass({
+var Redirect = createReactClass({
   displayName: 'Redirect',
 
-
   statics: {
     createRouteFromReactElement: function createRouteFromReactElement(element) {
       var route = _createRouteFromReactElement(element);

package/es/Route.js

@@ -1,12 +1,9 @@
-import React from 'react';
+import createReactClass from 'create-react-class';
+import { string, func } from 'prop-types';
 import invariant from 'invariant';
 import { createRouteFromReactElement } from './RouteUtils';
 import { component, components } from './InternalPropTypes';
 
-var _React$PropTypes = React.PropTypes,
-    string = _React$PropTypes.string,
-    func = _React$PropTypes.func;
-
 /**
  * A <Route> is used to declare which components are rendered to the
  * page when the URL matches a given pattern.
@@ -18,11 +15,9 @@ var _React$PropTypes = React.PropTypes,
  * rendered into the DOM, nested in the same order as in the tree.
  */
 /* eslint-disable react/require-render-return */
-
-var Route = React.createClass({
+var Route = createReactClass({
   displayName: 'Route',
 
-
   statics: {
     createRouteFromReactElement: createRouteFromReactElement
   },

package/es/Router.js

@@ -4,6 +4,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 
 import invariant from 'invariant';
 import React from 'react';
+import createReactClass from 'create-react-class';
+import { func, object } from 'prop-types';
 
 import _createTransitionManager from './createTransitionManager';
 import { routes } from './InternalPropTypes';
@@ -12,32 +14,28 @@ import { createRoutes } from './RouteUtils';
 import { createRouterObject as _createRouterObject, assignRouterState } from './RouterUtils';
 import warning from './routerWarning';
 
-var _React$PropTypes = React.PropTypes,
-    func = _React$PropTypes.func,
-    object = _React$PropTypes.object;
+var propTypes = {
+  history: object,
+  children: routes,
+  routes: routes, // alias for children
+  render: func,
+  createElement: func,
+  onError: func,
+  onUpdate: func,
+
+  // PRIVATE: For client-side rehydration of server match.
+  matchContext: object
+};
 
 /**
  * A <Router> is a high-level API for automatically setting up
  * a router that renders a <RouterContext> with all the props
  * it needs each time the URL changes.
  */
-
-var Router = React.createClass({
+var Router = createReactClass({
   displayName: 'Router',
 
-
-  propTypes: {
-    history: object,
-    children: routes,
-    routes: routes, // alias for children
-    render: func,
-    createElement: func,
-    onError: func,
-    onUpdate: func,
-
-    // PRIVATE: For client-side rehydration of server match.
-    matchContext: object
-  },
+  propTypes: propTypes,
 
   getDefaultProps: function getDefaultProps() {
     return {
@@ -86,7 +84,7 @@ var Router = React.createClass({
         children = _props.children;
 
 
-    !history.getCurrentLocation ? process.env.NODE_ENV !== 'production' ? invariant(false, 'You have provided a history object created with history v2.x or ' + 'earlier. This version of React Router is only compatible with v3 ' + 'history objects. Please upgrade to history v3.x.') : invariant(false) : void 0;
+    !history.getCurrentLocation ? process.env.NODE_ENV !== 'production' ? invariant(false, 'You have provided a history object created with history v4.x or v2.x ' + 'and earlier. This version of React Router is only compatible with v3 ' + 'history objects. Please change to history v3.x.') : invariant(false) : void 0;
 
     return _createTransitionManager(history, createRoutes(routes || children));
   },
@@ -134,7 +132,7 @@ var Router = React.createClass({
 
     // Only forward non-Router-specific props to routing context, as those are
     // the only ones that might be custom routing context props.
-    Object.keys(Router.propTypes).forEach(function (propType) {
+    Object.keys(propTypes).forEach(function (propType) {
       return delete props[propType];
     });
 

package/es/RouterContext.js

@@ -4,25 +4,20 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
 import invariant from 'invariant';
 import React from 'react';
+import createReactClass from 'create-react-class';
+import { array, func, object } from 'prop-types';
 
 import getRouteParams from './getRouteParams';
 import { ContextProvider } from './ContextUtils';
 import { isReactChildren } from './RouteUtils';
 
-var _React$PropTypes = React.PropTypes,
-    array = _React$PropTypes.array,
-    func = _React$PropTypes.func,
-    object = _React$PropTypes.object;
-
 /**
  * A <RouterContext> renders the component tree for a given router state
  * and sets the history object and the current location in context.
  */
-
-var RouterContext = React.createClass({
+var RouterContext = createReactClass({
   displayName: 'RouterContext',
 
-
   mixins: [ContextProvider('router')],
 
   propTypes: {