Point original package back at React Router (#160)

Author: taion

.travis.yml

@@ -1,7 +1,13 @@
 sudo: false
+
 language: node_js
 node_js:
-  - "iojs"
+  - stable
+
 cache:
   directories:
     - node_modules
+
+branches:
+  only:
+    - master

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [v0.22.0]
+> 2016-04-12
+
+- **Breaking:** Move from rrtr to React Router ([#160])
+
+[v0.22.0]: https://github.com/react-bootstrap/react-router-bootstrap/compare/v0.21.0...v0.22.0
+[#160]: https://github.com/react-bootstrap/react-router-bootstrap/pull/160
+
+
 ## [v0.21.0]
 > 2016-04-11
 

README.md

@@ -1,10 +1,10 @@
 # react-router-bootstrap
-Integration between [rrtr](https://github.com/taion/rrtr) and [React-Bootstrap](https://github.com/react-bootstrap/react-bootstrap).
+Integration between [React Router](https://github.com/rackt/react-router) 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)
 
-**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).
+Using rrtr instead of React Router? Use [rrtr-bootstrap](https://github.com/react-bootstrap/rrtr-bootstrap) instead.
 
 ## Usage
 
@@ -29,7 +29,7 @@ npm install react-router-bootstrap
 You will also want to have React Router and React-Bootstrap.
 
 ```
-npm install rrtr react-bootstrap
+npm install react-router react-bootstrap
 ```
 
 ## Contributing

package.json

@@ -33,7 +33,7 @@
   "homepage": "https://github.com/react-bootstrap/react-router-bootstrap",
   "peerDependencies": {
     "react": ">=0.14.0",
-    "rrtr": ">=2.1.2"
+    "react-router": ">=2.0.0"
   },
   "devDependencies": {
     "babel": "^5.8.38",
@@ -71,9 +71,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",
@@ -84,8 +84,6 @@
     "yargs": "^4.4.0"
   },
   "files": [
-    "README",
-    "CHANGELOG.md",
     "lib"
   ],
   "release-script": {

src/LinkContainer.js

@@ -1,7 +1,7 @@
-// This is largely taken from rrtr/lib/Link.
+// This is largely taken from react-router/lib/Link.
 
 import React from 'react';
-import Link from 'rrtr/lib/Link';
+import Link from 'react-router/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 'rrtr';
+import { createMemoryHistory, IndexRoute, Route, Router } from 'react-router';
 
 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 'rrtr';
+import { createMemoryHistory, Route, Router } from 'react-router';
 
 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 'rrtr';
+import { Link } from 'react-router';
 
 import LinkContainer from '../../src/LinkContainer';
 

tests/visual/Home.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link } from 'rrtr';
+import { Link } from 'react-router';
 
 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 'rrtr';
+import { Link } from 'react-router';
 
 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 'rrtr';
+import { Link } from 'react-router';
 
 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 'rrtr';
+import { Link } from 'react-router';
 
 import LinkContainer from '../../src/LinkContainer';
 

tests/visual/index.js

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

webpack.config.babel.js

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