aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2016-06-04 17:55:21 -0700
committerChris Rebert <[email protected]>2016-06-04 17:55:21 -0700
commiteb350d1a7c91a42b4d943b13edf9304309920cb7 (patch)
tree269f50d411342979deb687eece4cbfc011800011
parent0c4abb69e3c37cb454e6c3003763171528576ad1 (diff)
downloadbootstrap-eb350d1a7c91a42b4d943b13edf9304309920cb7.tar.xz
bootstrap-eb350d1a7c91a42b4d943b13edf9304309920cb7.zip
Upgrade to latest version of JSCS (v3.0.4) (#20070)
Fixes #20002 [skip sauce] [skip validator]
-rw-r--r--grunt/npm-shrinkwrap.json94
-rw-r--r--js/.jscsrc2
-rw-r--r--package.json2
3 files changed, 29 insertions, 69 deletions
diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index efee46056..881ce946a 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -234,11 +234,6 @@
}
}
},
- "babel-jscs": {
- "version": "2.0.5",
- "from": "babel-jscs@>=2.0.0 <3.0.0",
- "resolved": "https://registry.npmjs.org/babel-jscs/-/babel-jscs-2.0.5.tgz"
- },
"babel-messages": {
"version": "6.8.0",
"from": "babel-messages@>=6.8.0 <7.0.0",
@@ -684,6 +679,28 @@
"from": "css-mq-parser@>=0.0.3 <0.0.4",
"resolved": "https://registry.npmjs.org/css-mq-parser/-/css-mq-parser-0.0.3.tgz"
},
+ "cst": {
+ "version": "0.3.0",
+ "from": "cst@>=0.3.0 <0.4.0",
+ "resolved": "https://registry.npmjs.org/cst/-/cst-0.3.0.tgz",
+ "dependencies": {
+ "babylon": {
+ "version": "6.8.0",
+ "from": "babylon@>=6.7.0 <7.0.0",
+ "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.8.0.tgz"
+ },
+ "source-map": {
+ "version": "0.1.32",
+ "from": "[email protected]",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"
+ },
+ "source-map-support": {
+ "version": "0.4.0",
+ "from": "source-map-support@>=0.4.0 <0.5.0",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.0.tgz"
+ }
+ }
+ },
"ctype": {
"version": "0.5.3",
"from": "[email protected]",
@@ -1913,9 +1930,9 @@
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
},
"jscs": {
- "version": "2.11.0",
- "from": "jscs@>=2.11.0 <2.12.0",
- "resolved": "https://registry.npmjs.org/jscs/-/jscs-2.11.0.tgz",
+ "version": "3.0.4",
+ "from": "[email protected]",
+ "resolved": "https://registry.npmjs.org/jscs/-/jscs-3.0.4.tgz",
"dependencies": {
"argparse": {
"version": "1.0.7",
@@ -1940,9 +1957,9 @@
}
},
"jscs-jsdoc": {
- "version": "1.3.2",
- "from": "jscs-jsdoc@>=1.3.1 <2.0.0",
- "resolved": "https://registry.npmjs.org/jscs-jsdoc/-/jscs-jsdoc-1.3.2.tgz"
+ "version": "2.0.0",
+ "from": "jscs-jsdoc@>=2.0.0 <3.0.0",
+ "resolved": "https://registry.npmjs.org/jscs-jsdoc/-/jscs-jsdoc-2.0.0.tgz"
},
"jscs-preset-wikimedia": {
"version": "1.0.0",
@@ -2069,16 +2086,6 @@
"from": "lodash@>=3.10.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
},
- "lodash._baseassign": {
- "version": "3.2.0",
- "from": "lodash._baseassign@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"
- },
- "lodash._basecopy": {
- "version": "3.0.1",
- "from": "lodash._basecopy@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
- },
"lodash._baseiteratee": {
"version": "4.7.0",
"from": "lodash._baseiteratee@>=4.7.0 <4.8.0",
@@ -2094,51 +2101,11 @@
"from": "lodash._basetostring@>=4.12.0 <4.13.0",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz"
},
- "lodash._bindcallback": {
- "version": "3.0.1",
- "from": "lodash._bindcallback@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"
- },
- "lodash._createassigner": {
- "version": "3.1.1",
- "from": "lodash._createassigner@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz"
- },
- "lodash._getnative": {
- "version": "3.9.1",
- "from": "lodash._getnative@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
- },
- "lodash._isiterateecall": {
- "version": "3.0.9",
- "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
- },
"lodash._stringtopath": {
"version": "4.8.0",
"from": "lodash._stringtopath@>=4.8.0 <4.9.0",
"resolved": "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz"
},
- "lodash.assign": {
- "version": "3.2.0",
- "from": "lodash.assign@>=3.2.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz"
- },
- "lodash.isarguments": {
- "version": "3.0.8",
- "from": "lodash.isarguments@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.8.tgz"
- },
- "lodash.isarray": {
- "version": "3.0.4",
- "from": "lodash.isarray@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
- },
- "lodash.keys": {
- "version": "3.1.2",
- "from": "lodash.keys@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"
- },
"lodash.keysin": {
"version": "4.1.4",
"from": "lodash.keysin@>=4.0.0 <5.0.0",
@@ -2169,11 +2136,6 @@
"from": "lodash.rest@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.3.tgz"
},
- "lodash.restparam": {
- "version": "3.6.1",
- "from": "lodash.restparam@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
- },
"lodash.tostring": {
"version": "4.1.3",
"from": "lodash.tostring@>=4.0.0 <5.0.0",
diff --git a/js/.jscsrc b/js/.jscsrc
index a2ec95bb7..7a720ee76 100644
--- a/js/.jscsrc
+++ b/js/.jscsrc
@@ -1,6 +1,4 @@
{
- "esnext": true,
- "verbose": true,
"disallowEmptyBlocks": true,
"disallowKeywords": ["with"],
"disallowMixedSpacesAndTabs": true,
diff --git a/package.json b/package.json
index 8510855ae..5369ac115 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
"grunt-scss-lint": "^0.3.8",
"grunt-stamp": "^0.1.0",
"is-travis": "^1.0.0",
- "jscs": "^2.11.0",
+ "jscs": "^3.0.4",
"load-grunt-tasks": "^3.4.0",
"mq4-hover-shim": "^0.3.0",
"postcss-flexbugs-fixes": "^2.0.0",