Merge pull request #204 from twbs/update-jscs

update grunt-jscs to ^1.0.0 and update jscsrc accordingly
This commit is contained in:
Chris Rebert 2014-12-15 18:20:13 -08:00
Родитель a4fb043638 d162227329
Коммит 53f6e0954e
3 изменённых файлов: 10 добавлений и 13 удалений

Просмотреть файл

@ -12,6 +12,7 @@
"requireCommaBeforeLineBreak": true, "requireCommaBeforeLineBreak": true,
"requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch", "case", "default"], "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch", "case", "default"],
"requireLineFeedAtFileEnd": true, "requireLineFeedAtFileEnd": true,
"requireOperatorBeforeLineBreak": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
"requireParenthesesAroundIIFE": true, "requireParenthesesAroundIIFE": true,
"requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="], "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],

Просмотреть файл

@ -44,7 +44,7 @@
"grunt-contrib-watch": "^0.6.1", "grunt-contrib-watch": "^0.6.1",
"grunt-eslint": "^2.0.0", "grunt-eslint": "^2.0.0",
"grunt-exec": "^0.4.6", "grunt-exec": "^0.4.6",
"grunt-jscs": "^0.8.1", "grunt-jscs": "^1.0.0",
"jquery": "~2.1.1", "jquery": "~2.1.1",
"jscoverage": "^0.5.9", "jscoverage": "^0.5.9",
"load-grunt-tasks": "^1.0.0", "load-grunt-tasks": "^1.0.0",

20
test-infra/npm-shrinkwrap.json сгенерированный
Просмотреть файл

@ -3018,24 +3018,20 @@
"resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.6.tgz" "resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.6.tgz"
}, },
"grunt-jscs": { "grunt-jscs": {
"version": "0.8.1", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-0.8.1.tgz", "resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-1.0.0.tgz",
"dependencies": { "dependencies": {
"hooker": { "hooker": {
"version": "0.2.3", "version": "0.2.3",
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
}, },
"jscs": { "jscs": {
"version": "1.7.3", "version": "1.8.1",
"resolved": "https://registry.npmjs.org/jscs/-/jscs-1.7.3.tgz", "resolved": "https://registry.npmjs.org/jscs/-/jscs-1.8.1.tgz",
"dependencies": { "dependencies": {
"colors": { "colors": {
"version": "0.6.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz" "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
},
"commander": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz"
}, },
"esprima": { "esprima": {
"version": "1.2.2", "version": "1.2.2",
@ -3092,8 +3088,8 @@
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz" "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz"
}, },
"supports-color": { "supports-color": {
"version": "1.1.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.1.0.tgz" "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz"
}, },
"vow-fs": { "vow-fs": {
"version": "0.3.3", "version": "0.3.3",