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

Merge pull request #15462 from twbs/bump-jscs

Browse Source 
bump grunt-jscs to ~1.1.0
This commit is contained in:
Chris Rebert 2014-12-29 12:11:51 -08:00
commit e4c7a92c76
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/.jscsrc
View File

@ -22,6 +22,7 @@
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"requireSpaceAfterLineComment": true,
"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
"requireSpaceBetweenArguments": true,
"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true },
"requireSpacesInConditionalExpression": true,
"requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },

2
package.json
View File

@ -53,7 +53,7 @@
"grunt-exec": "~0.4.6",
"grunt-html-validation": "~0.1.18",
"grunt-jekyll": "~0.4.2",
"grunt-jscs": "~1.0.0",
"grunt-jscs": "~1.1.0",
"grunt-saucelabs": "~8.4.0",
"grunt-sed": "~0.1.1",
"load-grunt-tasks": "~2.0.0",

20
test-infra/npm-shrinkwrap.json generated
View File

@ -3170,16 +3170,16 @@
}
},
"grunt-jscs": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-1.0.0.tgz",
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-1.1.0.tgz",
"dependencies": {
"hooker": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
},
"jscs": {
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/jscs/-/jscs-1.8.1.tgz",
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/jscs/-/jscs-1.9.0.tgz",
"dependencies": {
"colors": {
"version": "1.0.3",
@ -3197,6 +3197,10 @@
"version": "1.1.0-dev-harmony",
"resolved": "https://registry.npmjs.org/esprima-harmony-jscs/-/esprima-harmony-jscs-1.1.0-dev-harmony.tgz"
},
"estraverse": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz"
},
"exit": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
@ -3239,6 +3243,10 @@
}
}
},
"regenerate": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.0.1.tgz"
},
"strip-json-comments": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz"
@ -3247,6 +3255,10 @@
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz"
},
"unicode-6.3.0": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/unicode-6.3.0/-/unicode-6.3.0-0.1.5.tgz"
},
"vow-fs": {
"version": "0.3.4",
"resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.4.tgz",