Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Explicit error on <Route> outside <Router> #4939

Merged
merged 9 commits into from
Jul 14, 2017
Merged

Explicit error on <Route> outside <Router> #4939

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b210ae5
Explicit error on <Route> outside <Router>
eXon Apr 9, 2017
bb37890
Add unit test
eXon Apr 9, 2017
2f38409
Fix unit test change
eXon Apr 9, 2017
2434019
Merge remote-tracking branch 'upstream/master' into patch-1
eXon Apr 9, 2017
14a6bd8
Add router check before first usage on <Router />
eXon Apr 9, 2017
f6b0325
Switch throw to invariant for <Router> check
eXon Apr 11, 2017
c126da1
Add <Router> check on <Link>, <Switch>, <Redirect>, <Prompt>
eXon Apr 11, 2017
fcba02e
Merge remote-tracking branch 'upstream/master' into patch-1
eXon Apr 11, 2017
c610b79
Merge branch 'master' into patch-1
timdorr Jul 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions packages/react-router/modules/Route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ class Route extends React.Component {
}

getChildContext() {
if (!this.context.router) {
throw new Error('You should not use <Route> or withRoute() outside a valid <Router>')
}

return {
router: {
...this.context.router,
Expand All @@ -53,10 +49,15 @@ class Route extends React.Component {
match: this.computeMatch(this.props, this.context.router)
}

computeMatch({ computedMatch, location, path, strict, exact }, { route }) {
computeMatch({ computedMatch, location, path, strict, exact }, router) {
if (computedMatch)
return computedMatch // <Switch> already computed the match for us

if (!router) {
throw new Error('You should not use <Route> or withRoute() outside a valid <Router>')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

withRouter not withRoute.

Also, shouldn't this be done with warning or invariant?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, yes, I would do this via an invariant. We can optimize those calls out for production builds that way.

}

const { route } = router
const pathname = (location || route.location).pathname

return path ? matchPath(pathname, { path, strict, exact }) : route.match
Expand Down