Skip to content

Commit f088691

Browse files
committed
Merge pull request #121 from taion/update-deps
Update dependencies
2 parents 2fdfda0 + 7978021 commit f088691

File tree

3 files changed

+29
-27
lines changed

3 files changed

+29
-27
lines changed

.eslintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"extends": "airbnb",
33
"rules": {
44
"comma-dangle": 0,
5-
"no-eq-null": 0
5+
"eqeqeq": [2, "allow-null"],
6+
"id-length": 0
67
}
78
}

package.json

+26-26
Original file line numberDiff line numberDiff line change
@@ -31,49 +31,49 @@
3131
},
3232
"homepage": "https://github.com/react-bootstrap/react-router-bootstrap",
3333
"peerDependencies": {
34-
"react": ">=0.13.0 || >=0.14.0-rc1",
34+
"react": ">=0.13.0",
3535
"react-router": ">=1.0.0-rc1"
3636
},
3737
"devDependencies": {
3838
"babel": "^5.8.23",
39-
"babel-core": "^5.8.24",
40-
"babel-eslint": "^4.1.2",
39+
"babel-core": "^5.8.25",
40+
"babel-eslint": "^4.1.3",
4141
"babel-loader": "^5.3.2",
4242
"bootstrap": "^3.3.5",
43-
"css-loader": "^0.18.0",
44-
"es5-shim": "^4.1.13",
45-
"eslint": "1.3.x",
46-
"eslint-config-airbnb": "0.0.8",
43+
"css-loader": "^0.19.0",
44+
"es5-shim": "^4.1.14",
45+
"eslint": "1.6.x",
46+
"eslint-config-airbnb": "0.1.0",
4747
"eslint-plugin-babel": "^2.1.1",
48-
"eslint-plugin-mocha": "^0.5.1",
49-
"eslint-plugin-react": "^3.3.2",
48+
"eslint-plugin-mocha": "^1.0.0",
49+
"eslint-plugin-react": "^3.5.1",
5050
"file-loader": "^0.8.4",
51-
"history": "^1.9.1",
52-
"html-webpack-plugin": "^1.6.1",
53-
"karma": "^0.13.9",
54-
"karma-cli": "^0.1.0",
51+
"history": "^1.12.3",
52+
"html-webpack-plugin": "^1.6.2",
53+
"karma": "^0.13.10",
54+
"karma-cli": "^0.1.1",
5555
"karma-mocha": "^0.2.0",
5656
"karma-mocha-reporter": "^1.1.1",
5757
"karma-phantomjs-launcher": "^0.2.1",
5858
"karma-sinon-chai": "^1.1.0",
5959
"karma-sourcemap-loader": "^0.3.5",
6060
"karma-webpack": "^1.7.0",
61-
"less": "^2.5.1",
62-
"less-loader": "^2.2.0",
63-
"mocha": "^2.3.2",
61+
"less": "^2.5.3",
62+
"less-loader": "^2.2.1",
63+
"mocha": "^2.3.3",
6464
"mt-changelog": "^0.6.2",
65-
"node-libs-browser": "^0.5.2",
65+
"node-libs-browser": "^0.5.3",
6666
"phantomjs": "^1.9.18",
67-
"react": "^0.14.0-rc1",
68-
"react-bootstrap": "^0.25.100-react-pre.1",
69-
"react-dom": "^0.14.0-rc1",
70-
"react-router": "^1.0.0-rc1",
71-
"release-script": "^0.2.7",
72-
"style-loader": "^0.12.3",
67+
"react": "^0.14.0",
68+
"react-bootstrap": "^0.27.1",
69+
"react-dom": "^0.14.0",
70+
"react-router": "^1.0.0-rc3",
71+
"release-script": "^0.5.3",
72+
"style-loader": "^0.12.4",
7373
"url-loader": "^0.5.6",
74-
"webpack": "^1.12.1",
75-
"webpack-dev-server": "^1.10.1",
76-
"yargs": "^3.25.0"
74+
"webpack": "^1.12.2",
75+
"webpack-dev-server": "^1.12.0",
76+
"yargs": "^3.27.0"
7777
},
7878
"files": [
7979
"README",

tests/.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"mocha"
1212
],
1313
"rules": {
14+
"no-unused-expressions": 0,
1415
"mocha/no-exclusive-tests": 2,
1516
"react/no-multi-comp": 0
1617
}

0 commit comments

Comments
 (0)