diff options
| author | Chris Rebert <[email protected]> | 2014-12-29 12:11:51 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-12-29 12:11:51 -0800 |
| commit | e4c7a92c76865545f76a84d75cfa19024d5001a5 (patch) | |
| tree | 7888178e639d9fedf797d3b1de58b391b60df98a | |
| parent | f149e4309add96394ed072265cca84aabd623649 (diff) | |
| parent | 2ae4c0b03f7fde62f99ea8324859fa60cd890163 (diff) | |
| download | bootstrap-e4c7a92c76865545f76a84d75cfa19024d5001a5.tar.xz bootstrap-e4c7a92c76865545f76a84d75cfa19024d5001a5.zip | |
Merge pull request #15462 from twbs/bump-jscs
bump grunt-jscs to ~1.1.0
| -rw-r--r-- | js/.jscsrc | 1 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | test-infra/npm-shrinkwrap.json | 20 |
3 files changed, 18 insertions, 5 deletions
diff --git a/js/.jscsrc b/js/.jscsrc index 9612c1683..ac1d73f55 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -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 }, diff --git a/package.json b/package.json index 91d807dea..771fd4324 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json index c0053f4be..855ccee2a 100644 --- a/test-infra/npm-shrinkwrap.json +++ b/test-infra/npm-shrinkwrap.json @@ -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", |
