diff options
| author | Chris Rebert <[email protected]> | 2015-04-06 19:26:25 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-04-06 19:26:25 -0700 |
| commit | 387042e31e9e1a09e7b5647a9e58d46debf65c48 (patch) | |
| tree | 878fb84e07e6d42e77a600151f2a6a438088742e | |
| parent | 7c3034dfb035828a0ddec778a4cfc1010d57eb2e (diff) | |
| parent | b417251a235c1bf8a6642728151a0aebb1d049a1 (diff) | |
| download | bootstrap-387042e31e9e1a09e7b5647a9e58d46debf65c48.tar.xz bootstrap-387042e31e9e1a09e7b5647a9e58d46debf65c48.zip | |
Merge pull request #16244 from twbs/bump-jscs
Bump grunt-jscs to ~1.6.0
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | test-infra/npm-shrinkwrap.json | 74 |
2 files changed, 60 insertions, 16 deletions
diff --git a/package.json b/package.json index d8417287a..fabaa472e 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "grunt-exec": "~0.4.6", "grunt-html": "~4.0.1", "grunt-jekyll": "~0.4.2", - "grunt-jscs": "~1.5.0", + "grunt-jscs": "~1.6.0", "grunt-saucelabs": "~8.6.0", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~3.1.0", diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json index 731447fc8..a779e94fd 100644 --- a/test-infra/npm-shrinkwrap.json +++ b/test-infra/npm-shrinkwrap.json @@ -2881,24 +2881,68 @@ } }, "grunt-jscs": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-1.5.0.tgz", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-1.6.0.tgz", "dependencies": { "hooker": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" }, "jscs": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/jscs/-/jscs-1.11.3.tgz", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/jscs/-/jscs-1.12.0.tgz", "dependencies": { + "chalk": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz", + "dependencies": { + "ansi-styles": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz" + }, + "escape-string-regexp": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" + }, + "has-ansi": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz", + "dependencies": { + "ansi-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" + }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" + } + } + }, + "strip-ansi": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz", + "dependencies": { + "ansi-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" + } + } + }, + "supports-color": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz" + } + } + }, "cli-table": { "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz" - }, - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz" + "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz", + "dependencies": { + "colors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz" + } + } }, "commander": { "version": "2.6.0", @@ -2909,8 +2953,8 @@ "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz" }, "esprima-harmony-jscs": { - "version": "1.1.0-tolerate-import", - "resolved": "https://registry.npmjs.org/esprima-harmony-jscs/-/esprima-harmony-jscs-1.1.0-tolerate-import.tgz" + "version": "1.1.0-templates", + "resolved": "https://registry.npmjs.org/esprima-harmony-jscs/-/esprima-harmony-jscs-1.1.0-templates.tgz" }, "estraverse": { "version": "1.9.3", @@ -3233,12 +3277,12 @@ } }, "xmlbuilder": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.2.tgz", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz", "dependencies": { "lodash": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz" + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz" } } } |
