Re-export all of react-router from react-router-dom

mjackson · mjackson · commit 9fef85f22ff6 · 2017-01-27T15:28:25.000-08:00
diff --git a/packages/react-router-dom/modules/index.js b/packages/react-router-dom/modules/index.js
@@ -1,14 +1,5 @@
+export * from 'react-router'
 export BrowserRouter from './BrowserRouter'
 export HashRouter from './HashRouter'
 export Link from './Link'
 export NavLink from './NavLink'
-
-// Re-export a bunch of stuff from react-router for convenience.
-export MemoryRouter from 'react-router/MemoryRouter'
-export ServerRouter from 'react-router/ServerRouter'
-export Redirect from 'react-router/Redirect'
-export Route from 'react-router/Route'
-export Router from 'react-router/Router'
-export Switch from 'react-router/Switch'
-export matchPath from 'react-router/matchPath'
-export withRouter from 'react-router/withRouter'
diff --git a/packages/react-router-website/examples/Ambiguous.js b/packages/react-router-website/examples/Ambiguous.js
@@ -1,7 +1,7 @@
 import React from 'react'
-import Route from 'react-router/Route'
-import Switch from 'react-router/Switch'
 import Router from 'react-router-dom/BrowserRouter'
+import Route from 'react-router-dom/Route'
+import Switch from 'react-router-dom/Switch'
 import Link from 'react-router-dom/Link'
 
 const AmbiguousExample = () => (
diff --git a/packages/react-router-website/examples/Animation.js b/packages/react-router-website/examples/Animation.js
@@ -1,9 +1,9 @@
 import React from 'react'
 import { TransitionMotion, spring } from 'react-motion'
-import Route from 'react-router/Route'
-import Redirect from 'react-router/Redirect'
 import Router from 'react-router-dom/BrowserRouter'
+import Route from 'react-router-dom/Route'
 import Link from 'react-router-dom/Link'
+import Redirect from 'react-router-dom/Redirect'
 
 const AnimationExample = () => (
   <Router>
diff --git a/packages/react-router-website/examples/Auth.js b/packages/react-router-website/examples/Auth.js
@@ -1,9 +1,9 @@
 import React, { PropTypes } from 'react'
-import Route from 'react-router/Route'
-import Redirect from 'react-router/Redirect'
-import withRouter from 'react-router/withRouter'
 import Router from 'react-router-dom/BrowserRouter'
+import Route from 'react-router-dom/Route'
 import Link from 'react-router-dom/Link'
+import Redirect from 'react-router-dom/Redirect'
+import withRouter from 'react-router-dom/withRouter'
 
 ////////////////////////////////////////////////////////////
 // 1. Click the public page
diff --git a/packages/react-router-website/examples/Basic.js b/packages/react-router-website/examples/Basic.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import Route from 'react-router/Route'
 import Router from 'react-router-dom/BrowserRouter'
+import Route from 'react-router-dom/Route'
 import Link from 'react-router-dom/Link'
 
 const BasicExample = () => (
diff --git a/packages/react-router-website/examples/CustomLink.js b/packages/react-router-website/examples/CustomLink.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import Route from 'react-router/Route'
 import Router from 'react-router-dom/BrowserRouter'
+import Route from 'react-router-dom/Route'
 import Link from 'react-router-dom/Link'
 
 const CustomLinkExample = () => (
diff --git a/packages/react-router-website/examples/NoMatch.js b/packages/react-router-website/examples/NoMatch.js
@@ -1,8 +1,8 @@
 import React from 'react'
-import Route from 'react-router/Route'
-import Switch from 'react-router/Switch'
 import Router from 'react-router-dom/BrowserRouter'
+import Route from 'react-router-dom/Route'
 import Link from 'react-router-dom/Link'
+import Switch from 'react-router-dom/Switch'
 
 const NoMatchExample = () => (
   <Router>
diff --git a/packages/react-router-website/examples/Params.js b/packages/react-router-website/examples/Params.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import Route from 'react-router/Route'
 import Router from 'react-router-dom/BrowserRouter'
+import Route from 'react-router-dom/Route'
 import Link from 'react-router-dom/Link'
 
 const ParamsExample = () => (
diff --git a/packages/react-router-website/examples/PreventingTransitions.js b/packages/react-router-website/examples/PreventingTransitions.js
@@ -1,8 +1,8 @@
 import React from 'react'
-import Route from 'react-router/Route'
-import Prompt from 'react-router/Prompt'
 import Router from 'react-router-dom/BrowserRouter'
+import Route from 'react-router-dom/Route'
 import Link from 'react-router-dom/Link'
+import Prompt from 'react-router-dom/Prompt'
 
 const PreventingTransitionsExample = () => (
   <Router>
diff --git a/packages/react-router-website/examples/Recursive.js b/packages/react-router-website/examples/Recursive.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import Route from 'react-router/Route'
 import Router from 'react-router-dom/BrowserRouter'
+import Route from 'react-router-dom/Route'
 import Link from 'react-router-dom/Link'
 
 const PEEPS = [
diff --git a/packages/react-router-website/examples/RouteConfig.js b/packages/react-router-website/examples/RouteConfig.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import Route from 'react-router/Route'
 import Router from 'react-router-dom/BrowserRouter'
+import Route from 'react-router-dom/Route'
 import Link from 'react-router-dom/Link'
 
 // Some folks find value in a centralized route config.
diff --git a/packages/react-router-website/examples/Sidebar.js b/packages/react-router-website/examples/Sidebar.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import Route from 'react-router/Route'
 import Router from 'react-router-dom/BrowserRouter'
+import Route from 'react-router-dom/Route'
 import Link from 'react-router-dom/Link'
 
 // Each logical "route" has two components, one for
diff --git a/packages/react-router-website/webpack.config.js b/packages/react-router-website/webpack.config.js
@@ -44,16 +44,16 @@ module.exports = {
       // Help the examples find the router modules. This is only for the examples.
       // All modules used to build the docs site itself should import directly
       // from packages/react-router.
-      'react-router/Prompt': path.join(ReactRouterModules, 'Prompt'),
-      'react-router/Redirect': path.join(ReactRouterModules, 'Redirect'),
-      'react-router/Route': path.join(ReactRouterModules, 'Route'),
-      'react-router/Router': path.join(ReactRouterModules, 'Router'),
-      'react-router/Switch': path.join(ReactRouterModules, 'Switch'),
-      'react-router/withRouter': path.join(ReactRouterModules, 'withRouter'),
+      'react-router-dom/Link': path.join(ReactRouterDOMModules, 'Link'),
+      'react-router-dom/Prompt': path.join(ReactRouterModules, 'Prompt'),
+      'react-router-dom/Redirect': path.join(ReactRouterModules, 'Redirect'),
+      'react-router-dom/Route': path.join(ReactRouterModules, 'Route'),
+      'react-router-dom/Router': path.join(ReactRouterModules, 'Router'),
+      'react-router-dom/Switch': path.join(ReactRouterModules, 'Switch'),
+      'react-router-dom/withRouter': path.join(ReactRouterModules, 'withRouter'),
 
       // Shim the real router so people can copy paste examples into create-react-app
-      'react-router-dom/BrowserRouter': path.resolve(__dirname, 'components/ExampleRouter'),
-      'react-router-dom/Link': path.join(ReactRouterDOMModules, 'Link')
+      'react-router-dom/BrowserRouter': path.resolve(__dirname, 'components/ExampleRouter')
     }
   },
 
diff --git a/packages/react-router/modules/Switch.js b/packages/react-router/modules/Switch.js
@@ -27,7 +27,7 @@ class Switch extends React.Component {
     })
 
     // Start listening here so we can <Redirect> on the initial render.
-    this.unlisten = this.context.router.listen(() => {
+    this.unlisten = router.listen(() => {
       this.setState({
         location: router.location
       })
