From 4e77950f937dfcd380468775d2b5af96c93a5224 Mon Sep 17 00:00:00 2001 From: Jimmy Jia Date: Tue, 12 Apr 2016 18:44:26 -0400 Subject: [PATCH] Point original package back at React Router --- .travis.yml | 8 +++++++- CHANGELOG.md | 9 +++++++++ README.md | 6 +++--- package.json | 6 ++---- 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 | 2 +- webpack.config.babel.js | 8 ++++---- 14 files changed, 35 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39272c4..6261811 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,13 @@ sudo: false + language: node_js node_js: - - "iojs" + - stable + cache: directories: - node_modules + +branches: + only: + - master diff --git a/CHANGELOG.md b/CHANGELOG.md index 0327ab0..035c1c9 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index 7ea27d6..82c69c2 100644 --- a/README.md +++ b/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 diff --git a/package.json b/package.json index 723862f..b737408 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", - "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": { diff --git a/src/LinkContainer.js b/src/LinkContainer.js index bf8214b..d5860c4 100644 --- a/src/LinkContainer.js +++ b/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) { diff --git a/tests/IndexLinkContainer.spec.js b/tests/IndexLinkContainer.spec.js index 5034ec9..39eb612 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 'rrtr'; +import { createMemoryHistory, IndexRoute, Route, Router } from 'react-router'; import IndexLinkContainer from '../src/IndexLinkContainer'; diff --git a/tests/LinkContainer.spec.js b/tests/LinkContainer.spec.js index 2102e95..4d8da8c 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 'rrtr'; +import { createMemoryHistory, Route, Router } from 'react-router'; import LinkContainer from '../src/LinkContainer'; diff --git a/tests/visual/ButtonVisual.js b/tests/visual/ButtonVisual.js index 7283240..da54a81 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 'rrtr'; +import { Link } from 'react-router'; import LinkContainer from '../../src/LinkContainer'; diff --git a/tests/visual/Home.js b/tests/visual/Home.js index a74ed3d..f1e4e76 100644 --- a/tests/visual/Home.js +++ b/tests/visual/Home.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Link } from 'rrtr'; +import { Link } from 'react-router'; export default () => (
diff --git a/tests/visual/ListGroupItemVisual.js b/tests/visual/ListGroupItemVisual.js index e2226b9..75f2ff1 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 'rrtr'; +import { Link } from 'react-router'; import LinkContainer from '../../src/LinkContainer'; diff --git a/tests/visual/MenuItemVisual.js b/tests/visual/MenuItemVisual.js index d28cf18..0359f40 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 'rrtr'; +import { Link } from 'react-router'; import LinkContainer from '../../src/LinkContainer'; diff --git a/tests/visual/NavItemVisual.js b/tests/visual/NavItemVisual.js index 61a0b2d..3b957b7 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 'rrtr'; +import { Link } from 'react-router'; import LinkContainer from '../../src/LinkContainer'; diff --git a/tests/visual/index.js b/tests/visual/index.js index c689073..fda592f 100644 --- a/tests/visual/index.js +++ b/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'; diff --git a/webpack.config.babel.js b/webpack.config.babel.js index 424651f..41250d3 100644 --- a/webpack.config.babel.js +++ b/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' } } ],