Merge pull request #46 from react-bootstrap/update-linting-deps

Update linting dependencies to fix linting
react-bootstrap · Nov 28, 2015 · 9da2860 · 9da2860
2 parents 44dda40 + 589b1a3
commit 9da2860
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,4 +1,5 @@
 {
+  "extends": "eslint:recommended",
   "env": {
     "browser": true,
     "node": true

diff --git a/package.json b/package.json
@@ -44,16 +44,16 @@
   "devDependencies": {
     "babel": "5.6.14",
     "babel-core": "5.6.15",
-    "babel-eslint": "^3.1.20",
+    "babel-eslint": "^4.1.6",
     "babel-loader": "^5.3.0",
     "babel-plugin-object-assign": "^1.2.1",
     "chai": "^3.2.0",
     "component-playground": "jquense/component-playground",
     "css-loader": "^0.15.6",
     "es5-shim": "^4.1.7",
-    "eslint": "^0.24.0",
-    "eslint-plugin-babel": "^1.0.0",
-    "eslint-plugin-mocha": "^0.4.0",
+    "eslint": "^1.10.1",
+    "eslint-plugin-babel": "^3.0.0",
+    "eslint-plugin-mocha": "^1.1.0",
     "eslint-plugin-react": "^3.1.0",
     "isparta-loader": "^0.2.0",
     "jquery": "^2.1.4",

diff --git a/test/.eslintrc b/test/.eslintrc
@@ -11,6 +11,7 @@
     "mocha"
   ],
   "rules": {
+    "no-console": 0,
     "no-unused-expressions": 0,
     "mocha/no-exclusive-tests": 2
   }