Skip to content

Commit e807297

Browse files
committed
Minor fixes
1 parent 820cccd commit e807297

File tree

6 files changed

+33
-32
lines changed

6 files changed

+33
-32
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ before_install:
2020
branches:
2121
only:
2222
- master
23+
- rr-v3

package.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"build": "rimraf lib && babel src -d lib && webpack && webpack -p && npm run bower-prepare",
1212
"lint": "eslint scripts src test *.js",
1313
"release": "release",
14-
"test": "npm run lint && karma start",
14+
"test": "npm run lint && karma start --single-run",
1515
"visual-test": "open http://localhost:8080/ && webpack-dev-server --config webpack.visual.config.babel.js"
1616
},
1717
"repository": {
@@ -33,19 +33,19 @@
3333
},
3434
"homepage": "https://github.com/react-bootstrap/react-router-bootstrap",
3535
"peerDependencies": {
36-
"react": ">=0.14.0"
36+
"react": ">=0.14.9"
3737
},
3838
"devDependencies": {
39-
"babel-cli": "^6.11.4",
40-
"babel-core": "^6.11.4",
41-
"babel-eslint": "^6.1.2",
42-
"babel-loader": "^6.2.4",
39+
"babel-cli": "^6.24.1",
40+
"babel-core": "^6.24.1",
41+
"babel-eslint": "^7.2.2",
42+
"babel-loader": "^6.4.1",
4343
"babel-plugin-add-module-exports": "^0.2.1",
44-
"babel-preset-es2015": "^6.9.0",
44+
"babel-preset-es2015": "^6.24.1",
4545
"babel-preset-es2015-loose": "^7.0.0",
46-
"babel-preset-react": "^6.11.1",
47-
"babel-preset-stage-1": "^6.5.0",
48-
"babel-register": "^6.11.5",
46+
"babel-preset-react": "^6.24.1",
47+
"babel-preset-stage-1": "^6.24.1",
48+
"babel-register": "^6.24.1",
4949
"bootstrap": "^3.3.7",
5050
"chai": "^3.5.0",
5151
"colors": "^1.1.2",
@@ -55,37 +55,37 @@
5555
"eslint-plugin-babel": "^3.3.0",
5656
"eslint-plugin-import": "^1.11.1",
5757
"eslint-plugin-jsx-a11y": "^1.5.5",
58-
"eslint-plugin-mocha": "^4.1.0",
58+
"eslint-plugin-mocha": "^4.9.0",
5959
"eslint-plugin-react": "^5.2.2",
6060
"file-loader": "^0.9.0",
6161
"history": "^2.1.2",
62-
"html-webpack-plugin": "^2.22.0",
63-
"karma": "^1.1.1",
62+
"html-webpack-plugin": "^2.28.0",
63+
"karma": "^1.6.0",
6464
"karma-chrome-launcher": "^1.0.1",
65-
"karma-firefox-launcher": "^1.0.0",
66-
"karma-mocha": "^1.1.1",
67-
"karma-mocha-reporter": "^2.0.4",
68-
"karma-sinon-chai": "^1.2.3",
65+
"karma-firefox-launcher": "^1.0.1",
66+
"karma-mocha": "^1.3.0",
67+
"karma-mocha-reporter": "^2.2.3",
68+
"karma-sinon-chai": "^1.3.1",
6969
"karma-sourcemap-loader": "^0.3.7",
7070
"karma-webpack": "^1.7.0",
71-
"less": "^2.7.1",
71+
"less": "^2.7.2",
7272
"less-loader": "^2.2.3",
73-
"lodash": "^4.14.0",
73+
"lodash": "^4.17.4",
7474
"mocha": "^2.5.3",
75-
"react": "^15.2.1",
76-
"react-bootstrap": "^0.30.0",
77-
"react-dom": "^15.2.1",
75+
"react": "^15.5.4",
76+
"react-bootstrap": "^0.30.9",
77+
"react-dom": "^15.5.4",
7878
"react-router": "^2.6.0",
7979
"release-script": "^1.0.2",
80-
"rimraf": "^2.5.4",
81-
"shelljs": "^0.7.2",
82-
"sinon": "^1.17.4",
83-
"sinon-chai": "^2.8.0",
80+
"rimraf": "^2.6.1",
81+
"shelljs": "^0.7.7",
82+
"sinon": "^2.1.0",
83+
"sinon-chai": "^2.9.0",
8484
"style-loader": "^0.13.1",
85-
"url-loader": "^0.5.7",
85+
"url-loader": "^0.5.8",
8686
"webpack": "^1.13.1",
8787
"webpack-dev-server": "^1.14.1",
88-
"yargs": "^4.8.1"
88+
"yargs": "^7.1.0"
8989
},
9090
"dependencies": {
9191
"prop-types": "^15.5.8"

src/LinkContainer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This is largely taken from react-router/lib/Link.
2-
import React from 'react';
32
import PropTypes from 'prop-types';
3+
import React from 'react';
44

55
function isLeftClickEvent(event) {
66
return event.button === 0;

test/IndexLinkContainer.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
2-
import ReactTestUtils from 'react/lib/ReactTestUtils';
32
import * as ReactBootstrap from 'react-bootstrap';
43
import ReactDOM from 'react-dom';
4+
import ReactTestUtils from 'react-dom/test-utils';
55
import { createMemoryHistory, IndexRoute, Route, Router } from 'react-router';
66

77
import IndexLinkContainer from '../src/IndexLinkContainer';

test/LinkContainer.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
2-
import ReactTestUtils from 'react/lib/ReactTestUtils';
32
import * as ReactBootstrap from 'react-bootstrap';
43
import ReactDOM from 'react-dom';
4+
import ReactTestUtils from 'react-dom/test-utils';
55
import { createMemoryHistory, Route, Router } from 'react-router';
66

77
import LinkContainer from '../src/LinkContainer';

test/visual/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React from 'react';
21
import PropTypes from 'prop-types';
2+
import React from 'react';
33
import Grid from 'react-bootstrap/lib/Grid';
44
import ReactDOM from 'react-dom';
55
import { hashHistory, IndexRedirect, Route, Router } from 'react-router';

0 commit comments

Comments
 (0)