Rename PropTypes.router => PropTypes.routerContext

Author: mjackson

modules/Link.js

@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react'
 import {
   location as locationType,
-  router as routerType
+  routerContext as routerContextType
 } from './PropTypes'
 
 class Link extends React.Component {
@@ -41,7 +41,7 @@ class Link extends React.Component {
   }
 
   static contextTypes = {
-    router: routerType, // TODO: This should be required, lazy testers be damned
+    router: routerContextType, // TODO: This should be required, lazy testers be damned
     location: locationType // TODO: This should also be required
   }
 

modules/PropTypes.js

@@ -21,11 +21,11 @@ export const location = PropTypes.shape({
   key: PropTypes.string
 })
 
-export const router = PropTypes.shape({
-  createHref: PropTypes.func.isRequired,
+export const routerContext = PropTypes.shape({
   transitionTo: PropTypes.func.isRequired,
   replaceWith: PropTypes.func.isRequired,
-  blockTransitions: PropTypes.func.isRequired
+  blockTransitions: PropTypes.func.isRequired,
+  createHref: PropTypes.func.isRequired
 })
 
 export const action = PropTypes.oneOf([

modules/Redirect.js

@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react'
 import {
-  router as routerType
+  routerContext as routerContextType
 } from './PropTypes'
 
 class Redirect extends React.Component {
@@ -12,7 +12,7 @@ class Redirect extends React.Component {
   }
 
   static contextTypes = {
-    router: routerType,
+    router: routerContextType,
     serverRouter: PropTypes.object
   }
 

modules/StaticRouter.js

@@ -5,7 +5,7 @@ import MatchProvider from './MatchProvider'
 import {
   action as actionType,
   location as locationType,
-  router as routerType
+  routerContext as routerContextType
 } from './PropTypes'
 
 const stringifyQuery = (query) => (
@@ -37,8 +37,8 @@ class StaticRouter extends React.Component {
   }
 
   static childContextTypes = {
-    router: routerType.isRequired,
-    location: locationType.isRequired // TODO: Keep state updates out of context
+    router: routerContextType.isRequired,
+    location: locationType.isRequired // TODO: Remove location state from context
   }
 
   createLocationForContext(loc) {

modules/__tests__/StaticRouter-test.js

@@ -1,7 +1,7 @@
 import expect from 'expect'
 import React from 'react'
 import StaticRouter from '../StaticRouter'
-import { router as routerType } from '../PropTypes'
+import { routerContext as routerContextType } from '../PropTypes'
 import { renderToString } from 'react-dom/server'
 
 //console.error = () => {}
@@ -192,7 +192,7 @@ describe('StaticRouter', () => {
   describe('basename support', () => {
     class Test extends React.Component {
       static contextTypes = {
-        router: routerType
+        router: routerContextType
       }
 
       render() {