diff options
| author | Chris Rebert <[email protected]> | 2016-06-04 15:07:16 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-06-04 15:07:16 -0700 |
| commit | d1b8ec85e25a33c824c4eb211cb5638e98fd616f (patch) | |
| tree | a6f754373a63af78107a623d74851bdc86f3c8f3 | |
| parent | 1f5d8aa4b30475798f4fa4a4d0b607bd0771cb94 (diff) | |
| download | bootstrap-d1b8ec85e25a33c824c4eb211cb5638e98fd616f.tar.xz bootstrap-d1b8ec85e25a33c824c4eb211cb5638e98fd616f.zip | |
Upgrade ESLint to v2.9.0 (#20047)
Refs #19908
[skip sauce]
[skip validator]
| -rw-r--r-- | grunt/npm-shrinkwrap.json | 24 | ||||
| -rw-r--r-- | js/.eslintrc.json | 4 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 16 insertions, 14 deletions
diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json index 4dc8c8c89..8e871521f 100644 --- a/grunt/npm-shrinkwrap.json +++ b/grunt/npm-shrinkwrap.json @@ -18,14 +18,14 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz" }, "acorn-jsx": { - "version": "2.0.1", - "from": "acorn-jsx@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-2.0.1.tgz", + "version": "3.0.1", + "from": "acorn-jsx@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", "dependencies": { "acorn": { - "version": "2.7.0", - "from": "acorn@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz" + "version": "3.1.0", + "from": "acorn@^3.0.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.1.0.tgz" } } }, @@ -916,9 +916,9 @@ "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz" }, "eslint": { - "version": "2.8.0", - "from": "[email protected]", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.8.0.tgz", + "version": "2.9.0", + "from": "[email protected]", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.9.0.tgz", "dependencies": { "argparse": { "version": "1.0.7", @@ -958,9 +958,9 @@ } }, "espree": { - "version": "3.1.3", - "from": "[email protected]", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.3.tgz", + "version": "3.1.4", + "from": "[email protected]", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.4.tgz", "dependencies": { "acorn": { "version": "3.1.0", diff --git a/js/.eslintrc.json b/js/.eslintrc.json index f64ef2e70..452cd2401 100644 --- a/js/.eslintrc.json +++ b/js/.eslintrc.json @@ -136,6 +136,7 @@ "keyword-spacing": "error", "linebreak-style": "error", "lines-around-comment": "off", + "max-statements-per-line": ["error", { "max": 1 }], "new-cap": "off", "newline-after-var": "off", "new-parens": "error", @@ -152,6 +153,8 @@ "no-trailing-spaces": "error", "no-underscore-dangle": "off", "no-unneeded-ternary": "error", + "no-unsafe-finally": "error", + "no-useless-computed-key": "error", "object-curly-spacing": ["warn", "always"], "one-var": "off", "operator-assignment": "error", @@ -168,7 +171,6 @@ "space-infix-ops": "error", "space-in-parens": "error", "space-unary-ops": "error", - "max-statements-per-line": ["error", { "max": 1 }], // es6 "arrow-parens": "error", diff --git a/package.json b/package.json index 493c270bc..caf86f069 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^6.0.4", - "eslint": "^2.8.0", + "eslint": "^2.9.0", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", |