rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-11 08:54:23 +01:00
Code Issues Actions Packages Releases Activity

Upgrade ESLint to v2.9.0 (#20047)

Browse Source 
Refs #19908

[skip sauce]
[skip validator]
This commit is contained in:
Chris Rebert 2016-06-04 15:07:16 -07:00
parent 1f5d8aa4b3
commit d1b8ec85e2
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
grunt/npm-shrinkwrap.json generated
View File

@ -18,14 +18,14 @@
"resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz" "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
}, },
"acorn-jsx": { "acorn-jsx": {
"version": "2.0.1", "version": "3.0.1",
"from": "acorn-jsx@>=2.0.1 <3.0.0", "from": "acorn-jsx@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-2.0.1.tgz", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
"dependencies": { "dependencies": {
"acorn": { "acorn": {
"version": "2.7.0", "version": "3.1.0",
"from": "acorn@>=2.0.1 <3.0.0", "from": "acorn@^3.0.4",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz" "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" "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"
}, },
"eslint": { "eslint": {
"version": "2.8.0", "version": "2.9.0",
"from": "eslint@2.8.0", "from": "eslint@2.9.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-2.8.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.9.0.tgz",
"dependencies": { "dependencies": {
"argparse": { "argparse": {
"version": "1.0.7", "version": "1.0.7",
@ -958,9 +958,9 @@
} }
}, },
"espree": { "espree": {
"version": "3.1.3", "version": "3.1.4",
"from": "espree@3.1.3", "from": "espree@3.1.4",
"resolved": "https://registry.npmjs.org/espree/-/espree-3.1.3.tgz", "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.4.tgz",
"dependencies": { "dependencies": {
"acorn": { "acorn": {
"version": "3.1.0", "version": "3.1.0",

4
js/.eslintrc.json
View File

@ -136,6 +136,7 @@
"keyword-spacing": "error", "keyword-spacing": "error",
"linebreak-style": "error", "linebreak-style": "error",
"lines-around-comment": "off", "lines-around-comment": "off",
"max-statements-per-line": ["error", { "max": 1 }],
"new-cap": "off", "new-cap": "off",
"newline-after-var": "off", "newline-after-var": "off",
"new-parens": "error", "new-parens": "error",
@ -152,6 +153,8 @@
"no-trailing-spaces": "error", "no-trailing-spaces": "error",
"no-underscore-dangle": "off", "no-underscore-dangle": "off",
"no-unneeded-ternary": "error", "no-unneeded-ternary": "error",
"no-unsafe-finally": "error",
"no-useless-computed-key": "error",
"object-curly-spacing": ["warn", "always"], "object-curly-spacing": ["warn", "always"],
"one-var": "off", "one-var": "off",
"operator-assignment": "error", "operator-assignment": "error",
@ -168,7 +171,6 @@
"space-infix-ops": "error", "space-infix-ops": "error",
"space-in-parens": "error", "space-in-parens": "error",
"space-unary-ops": "error", "space-unary-ops": "error",
"max-statements-per-line": ["error", { "max": 1 }],
// es6 // es6
"arrow-parens": "error", "arrow-parens": "error",

2
package.json
View File

@ -38,7 +38,7 @@
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.0.3", "autoprefixer": "^6.0.3",
"babel-eslint": "^6.0.4", "babel-eslint": "^6.0.4",
"eslint": "^2.8.0", "eslint": "^2.9.0",
"grunt": "^0.4.5", "grunt": "^0.4.5",
"grunt-babel": "^5.0.3", "grunt-babel": "^5.0.3",
"grunt-build-control": "^0.6.0", "grunt-build-control": "^0.6.0",