Move back to react-router (#122)

README.md

@@ -1,10 +1,8 @@
 # react-router-relay [![Travis][build-badge]][build] [![npm][npm-badge]][npm]
-[Relay](http://facebook.github.io/relay/) integration for [rrtr](https://github.com/taion/rrtr).
+[Relay](http://facebook.github.io/relay/) integration for [React Router](https://github.com/reactjs/react-router).
 
 [![Discord][discord-badge]][discord]
 
-**rrtr**? It's an actively-maintained fork of React Router. More details [here](https://medium.com/@taion/react-router-is-dead-long-live-rrtr-d229ca30e318).
-
 ## Usage
 
 Use `<RelayRouter>` or `<RelayRouterContext>` instead of `<Router>` or `<RouterContext>` respectively, then define Relay queries and render callbacks for each of your routes:
@@ -53,7 +51,7 @@ You can find an example implementation of TodoMVC with routing using `react-rout
 ### Installation
 
 ```shell
-$ npm install react react-dom react-relay rrtr
+$ npm install react react-dom react-relay react-router
 $ npm install react-router-relay
 ```
 

package.json

@@ -36,7 +36,7 @@
   "peerDependencies": {
     "react": ">=0.14.0",
     "react-relay": ">=0.6.0",
-    "rrtr": ">=2.1.2"
+    "react-router": ">=2.0.0"
   },
   "devDependencies": {
     "babel": "^5.8.38",
@@ -64,9 +64,9 @@
     "react": "^15.0.1",
     "react-dom": "^15.0.1",
     "react-relay": "^0.8.0",
+    "react-router": "^2.1.1",
     "relay-local-schema": "^0.4.0",
     "rimraf": "^2.5.2",
-    "rrtr": "^2.1.2",
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.0",
     "webpack": "^1.12.15"

src/RelayRouter.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import Router from 'rrtr/lib/Router';
+import Router from 'react-router/lib/Router';
 
 import RelayRouterContext from './RelayRouterContext';
 

src/RelayRouterContext.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import Relay from 'react-relay';
-import RouterContext from 'rrtr/lib/RouterContext';
+import RouterContext from 'react-router/lib/RouterContext';
 
 import RouteAggregator from './RouteAggregator';
 import RouteContainer from './RouteContainer';

src/utils/getParamsForRoute.js

@@ -1,6 +1,6 @@
 import invariant from 'invariant';
 
-import getRouteParams from 'rrtr/lib/getRouteParams';
+import getRouteParams from 'react-router/lib/getRouteParams';
 
 function getLocationParams(paramNames, paramSource) {
   if (!paramNames) {

test/RelayRouter.spec.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import ReactTestUtils from 'react/lib/ReactTestUtils';
 import Relay from 'react-relay';
+import { createMemoryHistory, Route } from 'react-router';
 import RelayLocalSchema from 'relay-local-schema';
-import { createMemoryHistory, Route } from 'rrtr';
 
 import { RelayRouter } from '../src';