Move to rrtr (#155)

Author: taion

README.md

@@ -1,5 +1,5 @@
 # react-router-bootstrap
-Integration between [React Router](https://github.com/rackt/react-router) and [React-Bootstrap](https://github.com/react-bootstrap/react-bootstrap).
+Integration between [rrtr](https://github.com/taion/rrtr) and [React-Bootstrap](https://github.com/react-bootstrap/react-bootstrap).
 
 [![Build Status](https://travis-ci.org/react-bootstrap/react-router-bootstrap.svg?branch=master)](https://travis-ci.org/react-bootstrap/react-router-bootstrap)
 [![npm version](https://badge.fury.io/js/react-router-bootstrap.svg)](http://badge.fury.io/js/react-router-bootstrap)
@@ -20,16 +20,14 @@ As with React Router's `Link`, returning `false` from an `onClick` handler on `L
 
 ## Installation
 
-**Note:** Releases from v0.20.0 onward only support React Router v2.x. For React Router 1.x support, use v0.19.3 or earlier.
-
 ```
 npm install react-router-bootstrap
 ```
 
 You will also want to have React Router and React-Bootstrap.
 
 ```
-npm install react-router react-bootstrap
+npm install rrtr react-bootstrap
 ```
 
 ## Contributing

package.json

@@ -33,7 +33,7 @@
   "homepage": "https://github.com/react-bootstrap/react-router-bootstrap",
   "peerDependencies": {
     "react": ">=0.14.0",
-    "react-router": ">=2.0.0"
+    "rrtr": ">=2.1.2"
   },
   "devDependencies": {
     "babel": "^5.8.38",
@@ -72,9 +72,9 @@
     "react": "^15.0.0",
     "react-bootstrap": "^0.28.5",
     "react-dom": "^15.0.0",
-    "react-router": "^2.0.1",
     "release-script": "^1.0.2",
     "rimraf": "^2.5.2",
+    "rrtr": "^2.1.2",
     "shelljs": "^0.6.0",
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.0",

src/LinkContainer.js

@@ -1,7 +1,7 @@
-// This is largely taken from react-router/lib/Link.
+// This is largely taken from rrtr/lib/Link.
 
 import React from 'react';
-import { Link } from 'react-router';
+import Link from 'rrtr/lib/Link';
 
 export default class LinkContainer extends React.Component {
   constructor(props, context) {

tests/IndexLinkContainer.spec.js

@@ -2,7 +2,7 @@ import React from 'react';
 import ReactTestUtils from 'react/lib/ReactTestUtils';
 import * as ReactBootstrap from 'react-bootstrap';
 import ReactDOM from 'react-dom';
-import { createMemoryHistory, IndexRoute, Route, Router } from 'react-router';
+import { createMemoryHistory, IndexRoute, Route, Router } from 'rrtr';
 
 import IndexLinkContainer from '../src/IndexLinkContainer';
 

tests/LinkContainer.spec.js

@@ -2,7 +2,7 @@ import React from 'react';
 import ReactTestUtils from 'react/lib/ReactTestUtils';
 import * as ReactBootstrap from 'react-bootstrap';
 import ReactDOM from 'react-dom';
-import { createMemoryHistory, Route, Router } from 'react-router';
+import { createMemoryHistory, Route, Router } from 'rrtr';
 
 import LinkContainer from '../src/LinkContainer';
 

tests/visual/ButtonVisual.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import ButtonToolbar from 'react-bootstrap/lib/ButtonToolbar';
 import Button from 'react-bootstrap/lib/Button';
-import { Link } from 'react-router';
+import { Link } from 'rrtr';
 
 import LinkContainer from '../../src/LinkContainer';
 

tests/visual/Home.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link } from 'react-router';
+import { Link } from 'rrtr';
 
 export default () => (
   <div>

tests/visual/ListGroupItemVisual.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import ListGroup from 'react-bootstrap/lib/ListGroup';
 import ListGroupItem from 'react-bootstrap/lib/ListGroupItem';
-import { Link } from 'react-router';
+import { Link } from 'rrtr';
 
 import LinkContainer from '../../src/LinkContainer';
 

tests/visual/MenuItemVisual.js

@@ -2,7 +2,7 @@ import React from 'react';
 import ButtonToolbar from 'react-bootstrap/lib/ButtonToolbar';
 import MenuItem from 'react-bootstrap/lib/MenuItem';
 import SplitButton from 'react-bootstrap/lib/SplitButton';
-import { Link } from 'react-router';
+import { Link } from 'rrtr';
 
 import LinkContainer from '../../src/LinkContainer';
 

tests/visual/NavItemVisual.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import Nav from 'react-bootstrap/lib/Nav';
 import NavItem from 'react-bootstrap/lib/NavItem';
-import { Link } from 'react-router';
+import { Link } from 'rrtr';
 
 import LinkContainer from '../../src/LinkContainer';
 

tests/visual/index.js

@@ -1,8 +1,7 @@
 import React from 'react';
 import Grid from 'react-bootstrap/lib/Grid';
 import ReactDOM from 'react-dom';
-import { IndexRedirect, Route, Router } from 'react-router';
-import hashHistory from 'react-router/lib/hashHistory';
+import { hashHistory, IndexRedirect, Route, Router } from 'rrtr';
 
 import ButtonVisual from './ButtonVisual';
 import Home from './Home';

webpack.config.babel.js

@@ -29,11 +29,11 @@ export default {
       }
     },
     {
-      'react-router': {
+      'rrtr': {
         root: 'ReactRouter',
-        commonjs2: 'react-router',
-        commonjs: 'react-router',
-        amd: 'react-router'
+        commonjs2: 'rrtr',
+        commonjs: 'rrtr',
+        amd: 'rrtr'
       }
     }
   ],