aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2016-06-04 17:08:59 -0700
committerChris Rebert <[email protected]>2016-06-04 17:08:59 -0700
commit04165ba6e31cd03e9145f666532d38b147abf703 (patch)
tree598af4691c1849599fb3613e157b0f3e3e267eb8
parentabc4ecf670c190f070320fd04b94357a7963a2f1 (diff)
downloadbootstrap-04165ba6e31cd03e9145f666532d38b147abf703.tar.xz
bootstrap-04165ba6e31cd03e9145f666532d38b147abf703.zip
Update ESLint to v2.11.1 (latest stable) (#20068)
Fixes #19908 [skip sauce] [skip validator]
-rw-r--r--grunt/npm-shrinkwrap.json6
-rw-r--r--js/.eslintrc.json2
-rw-r--r--package.json2
3 files changed, 6 insertions, 4 deletions
diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index a462864bd..2e1d267e7 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -916,9 +916,9 @@
"resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"
},
"eslint": {
- "version": "2.10.2",
- "from": "[email protected]",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.10.2.tgz",
+ "version": "2.11.1",
+ "from": "[email protected]",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.11.1.tgz",
"dependencies": {
"argparse": {
"version": "1.0.7",
diff --git a/js/.eslintrc.json b/js/.eslintrc.json
index 452cd2401..0e9e9fa75 100644
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
@@ -45,6 +45,7 @@
"no-unexpected-multiline": "error",
"no-unreachable": "error",
"no-useless-escape": "error",
+ "no-useless-rename": "error",
"use-isnan": "error",
"valid-jsdoc": "off",
"valid-typeof": "error",
@@ -102,6 +103,7 @@
"no-warning-comments": "off",
"no-with": "error",
"radix": "error",
+ "unicode-bom": ["error", "never"],
"vars-on-top": "off",
"wrap-iife": "error",
"yoda": "error",
diff --git a/package.json b/package.json
index 10245ec63..e4c9a2ec4 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"devDependencies": {
"autoprefixer": "^6.0.3",
"babel-eslint": "^6.0.4",
- "eslint": "^2.10.2",
+ "eslint": "^2.11.1",
"grunt": "^0.4.5",
"grunt-babel": "^5.0.3",
"grunt-build-control": "^0.6.0",