aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2016-05-31 00:11:19 -0700
committerChris Rebert <[email protected]>2016-05-31 00:12:17 -0700
commit9324da7aeb35055c0b8ce9eccc0b56ac2b9c5574 (patch)
tree2a53e4ac763257313e6c40b424f1ba35a99ab842
parent06b3af3c0a4ac6d1a4165b16b341b12f4389231b (diff)
downloadbootstrap-9324da7aeb35055c0b8ce9eccc0b56ac2b9c5574.tar.xz
bootstrap-9324da7aeb35055c0b8ce9eccc0b56ac2b9c5574.zip
Upgrade ESLint to v1.10.3
Refs #19908
-rw-r--r--.hound.yml2
-rw-r--r--js/.eslintrc.json (renamed from js/.eslintrc)0
-rw-r--r--package.json4
3 files changed, 3 insertions, 3 deletions
diff --git a/.hound.yml b/.hound.yml
index 8a21bdf44..4589de64b 100644
--- a/.hound.yml
+++ b/.hound.yml
@@ -10,7 +10,7 @@ javascript:
eslint:
enabled: true
- config_file: js/.eslintrc
+ config_file: js/.eslintrc.json
jscs:
enabled: true
diff --git a/js/.eslintrc b/js/.eslintrc.json
index 619df7cb3..619df7cb3 100644
--- a/js/.eslintrc
+++ b/js/.eslintrc.json
diff --git a/package.json b/package.json
index d358bb866..db64c2afe 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"scripts": {
"change-version": "node grunt/change-version.js",
"shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json",
- "eslint": "eslint --config js/.eslintrc js/src",
+ "eslint": "eslint --config js/.eslintrc.json js/src",
"test": "npm run eslint && grunt test"
},
"style": "dist/css/bootstrap.css",
@@ -38,7 +38,7 @@
"devDependencies": {
"autoprefixer": "^6.0.3",
"babel-eslint": "^4.1.3",
- "eslint": "^1.9.0",
+ "eslint": "^1.10.3",
"grunt": "^0.4.5",
"grunt-babel": "^5.0.3",
"grunt-build-control": "^0.6.0",