Skip to content

Commit

Permalink
Merge pull request #121 from taion/update-deps
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
taion committed Oct 9, 2015
2 parents 2fdfda0 + 7978021 commit f088691
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 27 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "airbnb",
"rules": {
"comma-dangle": 0,
"no-eq-null": 0
"eqeqeq": [2, "allow-null"],
"id-length": 0
}
}
52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,49 +31,49 @@
},
"homepage": "https://github.com/react-bootstrap/react-router-bootstrap",
"peerDependencies": {
"react": ">=0.13.0 || >=0.14.0-rc1",
"react": ">=0.13.0",
"react-router": ">=1.0.0-rc1"
},
"devDependencies": {
"babel": "^5.8.23",
"babel-core": "^5.8.24",
"babel-eslint": "^4.1.2",
"babel-core": "^5.8.25",
"babel-eslint": "^4.1.3",
"babel-loader": "^5.3.2",
"bootstrap": "^3.3.5",
"css-loader": "^0.18.0",
"es5-shim": "^4.1.13",
"eslint": "1.3.x",
"eslint-config-airbnb": "0.0.8",
"css-loader": "^0.19.0",
"es5-shim": "^4.1.14",
"eslint": "1.6.x",
"eslint-config-airbnb": "0.1.0",
"eslint-plugin-babel": "^2.1.1",
"eslint-plugin-mocha": "^0.5.1",
"eslint-plugin-react": "^3.3.2",
"eslint-plugin-mocha": "^1.0.0",
"eslint-plugin-react": "^3.5.1",
"file-loader": "^0.8.4",
"history": "^1.9.1",
"html-webpack-plugin": "^1.6.1",
"karma": "^0.13.9",
"karma-cli": "^0.1.0",
"history": "^1.12.3",
"html-webpack-plugin": "^1.6.2",
"karma": "^0.13.10",
"karma-cli": "^0.1.1",
"karma-mocha": "^0.2.0",
"karma-mocha-reporter": "^1.1.1",
"karma-phantomjs-launcher": "^0.2.1",
"karma-sinon-chai": "^1.1.0",
"karma-sourcemap-loader": "^0.3.5",
"karma-webpack": "^1.7.0",
"less": "^2.5.1",
"less-loader": "^2.2.0",
"mocha": "^2.3.2",
"less": "^2.5.3",
"less-loader": "^2.2.1",
"mocha": "^2.3.3",
"mt-changelog": "^0.6.2",
"node-libs-browser": "^0.5.2",
"node-libs-browser": "^0.5.3",
"phantomjs": "^1.9.18",
"react": "^0.14.0-rc1",
"react-bootstrap": "^0.25.100-react-pre.1",
"react-dom": "^0.14.0-rc1",
"react-router": "^1.0.0-rc1",
"release-script": "^0.2.7",
"style-loader": "^0.12.3",
"react": "^0.14.0",
"react-bootstrap": "^0.27.1",
"react-dom": "^0.14.0",
"react-router": "^1.0.0-rc3",
"release-script": "^0.5.3",
"style-loader": "^0.12.4",
"url-loader": "^0.5.6",
"webpack": "^1.12.1",
"webpack-dev-server": "^1.10.1",
"yargs": "^3.25.0"
"webpack": "^1.12.2",
"webpack-dev-server": "^1.12.0",
"yargs": "^3.27.0"
},
"files": [
"README",
Expand Down
1 change: 1 addition & 0 deletions tests/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"mocha"
],
"rules": {
"no-unused-expressions": 0,
"mocha/no-exclusive-tests": 2,
"react/no-multi-comp": 0
}
Expand Down

0 comments on commit f088691

Please sign in to comment.