Skip to content

Commit b6407e6

Browse files
committed
more deprecation links
1 parent 6e705de commit b6407e6

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

modules/Router.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const Router = React.createClass({
6565
const { parseQueryString, stringifyQuery } = this.props
6666
warning(
6767
!(parseQueryString || stringifyQuery),
68-
'`parseQueryString` and `stringifyQuery` are deprecated, please create a custom `history` as described in https://github.com/rackt/react-router/blob/v1.1.0/CHANGES.md#v110'
68+
'`parseQueryString` and `stringifyQuery` are deprecated. Please create a custom history. See http://bit.ly/1NRMoPX for details.'
6969
)
7070

7171
if (isDeprecatedHistory(history)) {
@@ -92,7 +92,7 @@ const Router = React.createClass({
9292

9393
let createHistory
9494
if (history) {
95-
warning(false, 'It appears you have provided a deprecated history object to `<Router/>`, please use a history provided by React Router with `import { browserHistory } from \'react-router\'` or `import { hashHistory } from \'react-router\'`. If you are using a custom, valid history please set `history.__v2_compatible__ = true`.')
95+
warning(false, 'It appears you have provided a deprecated history object to `<Router/>`, please use a history provided by React Router with `import { browserHistory } from \'react-router\'` or `import { hashHistory } from \'react-router\'`. If you are using a custom, valid history please set `history.__v2_compatible__ = true`. See http://bit.ly/1Pxrl7E')
9696
createHistory = () => history
9797
} else {
9898
warning(false, 'the default hash history is deprecated; use the `hashHistory` singleton instead')

upgrade-guides/v2.0.0.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,6 @@ import { browserHistory } from 'react-router'
5050
<Router history={browserHistory}/>
5151
```
5252

53-
## New Router render prop (`RoutingContext` prop replacement)
54-
55-
You can now pass a `render` prop to `Router` for it to use for rendering. This allows you to create "middleware components" that participate in routing. Its critical for integrations with libraries like Relay, Redux, Resolver, Transmit, Async Props, etc.
56-
57-
```js
58-
// the default is basically this:
59-
<Router render={props => <RouterContext {...props}/>}/>
60-
```
61-
62-
`RoutingContext` was undocumented and therefore has no backwards compatibility.
63-
6453
## Changes to provided context and Mixins
6554

6655
Only an object named `router` is added to context. Accessing `context.history`, `context.location`, and `context.route` are all deprecated.
@@ -270,3 +259,15 @@ const appHistory = useRouterHistory({
270259
<Router history={appHistory}/>
271260
```
272261
262+
## RoutingContext -> Router render prop
263+
264+
You can now pass a `render` prop to `Router` for it to use for rendering. This allows you to create "middleware components" that participate in routing. Its critical for integrations with libraries like Relay, Redux, Resolver, Transmit, Async Props, etc.
265+
266+
```js
267+
// the default is basically this:
268+
<Router render={props => <RouterContext {...props}/>}/>
269+
```
270+
271+
`RoutingContext` was undocumented and therefore has no backwards compatibility.
272+
273+

0 commit comments

Comments
 (0)