From 08e6faac677d17fd7ebfabc28f5c3d57757ccd3a Mon Sep 17 00:00:00 2001 From: Jimmy Jia Date: Mon, 11 Apr 2016 14:33:43 -0400 Subject: [PATCH] Move to rrtr --- README.md | 6 ++---- package.json | 4 ++-- src/LinkContainer.js | 4 ++-- tests/IndexLinkContainer.spec.js | 2 +- tests/LinkContainer.spec.js | 2 +- tests/visual/ButtonVisual.js | 2 +- tests/visual/Home.js | 2 +- tests/visual/ListGroupItemVisual.js | 2 +- tests/visual/MenuItemVisual.js | 2 +- tests/visual/NavItemVisual.js | 2 +- tests/visual/index.js | 3 +-- webpack.config.babel.js | 8 ++++---- 12 files changed, 18 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 4e9141f..2583930 100644 --- a/README.md +++ b/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,8 +20,6 @@ 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 ``` @@ -29,7 +27,7 @@ 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 diff --git a/package.json b/package.json index 03b60e2..ffdd83a 100644 --- a/package.json +++ b/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", diff --git a/src/LinkContainer.js b/src/LinkContainer.js index a55e6c9..bf8214b 100644 --- a/src/LinkContainer.js +++ b/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) { diff --git a/tests/IndexLinkContainer.spec.js b/tests/IndexLinkContainer.spec.js index 39eb612..5034ec9 100644 --- a/tests/IndexLinkContainer.spec.js +++ b/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'; diff --git a/tests/LinkContainer.spec.js b/tests/LinkContainer.spec.js index 4d8da8c..2102e95 100644 --- a/tests/LinkContainer.spec.js +++ b/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'; diff --git a/tests/visual/ButtonVisual.js b/tests/visual/ButtonVisual.js index da54a81..7283240 100644 --- a/tests/visual/ButtonVisual.js +++ b/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'; diff --git a/tests/visual/Home.js b/tests/visual/Home.js index f1e4e76..a74ed3d 100644 --- a/tests/visual/Home.js +++ b/tests/visual/Home.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Link } from 'react-router'; +import { Link } from 'rrtr'; export default () => (
diff --git a/tests/visual/ListGroupItemVisual.js b/tests/visual/ListGroupItemVisual.js index 75f2ff1..e2226b9 100644 --- a/tests/visual/ListGroupItemVisual.js +++ b/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'; diff --git a/tests/visual/MenuItemVisual.js b/tests/visual/MenuItemVisual.js index 0359f40..d28cf18 100644 --- a/tests/visual/MenuItemVisual.js +++ b/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'; diff --git a/tests/visual/NavItemVisual.js b/tests/visual/NavItemVisual.js index 3b957b7..61a0b2d 100644 --- a/tests/visual/NavItemVisual.js +++ b/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'; diff --git a/tests/visual/index.js b/tests/visual/index.js index e08ef56..c689073 100644 --- a/tests/visual/index.js +++ b/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'; diff --git a/webpack.config.babel.js b/webpack.config.babel.js index 41250d3..424651f 100644 --- a/webpack.config.babel.js +++ b/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' } } ],