Skip to content

Commit

Permalink
Kill the grunt-jscs middleman; use JSCS directly instead
Browse files Browse the repository at this point in the history
Refs #19990

[skip sauce]
[skip validator]
  • Loading branch information
cvrebert committed Jun 5, 2016
1 parent 04165ba commit e2fd8be
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 38 deletions.
21 changes: 0 additions & 21 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,27 +107,6 @@ module.exports = function (grunt) {
}
},

jscs: {
options: {
config: 'js/.jscsrc'
},
grunt: {
src: ['Gruntfile.js', 'grunt/*.js']
},
core: {
src: 'js/src/*.js'
},
test: {
src: 'js/tests/unit/*.js'
},
assets: {
options: {
requireCamelCaseOrUpperCaseIdentifiers: null
},
src: ['docs/assets/js/src/*.js', 'docs/assets/js/*.js', '!docs/assets/js/*.min.js']
}
},

stamp: {
options: {
banner: '<%= banner %>\n<%= jqueryCheck %>\n<%= jqueryVersionCheck %>\n+function ($) {\n',
Expand Down
18 changes: 3 additions & 15 deletions grunt/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"change-version": "node grunt/change-version.js",
"shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json",
"eslint": "eslint --config js/.eslintrc.json js/src",
"test": "npm run eslint && grunt test"
"jscs": "jscs --config=js/.jscsrc js/src js/tests/unit docs/assets/js/src docs/assets/js/ie*.js grunt Gruntfile.js",
"test": "npm run eslint && npm run jscs && grunt test"
},
"style": "dist/css/bootstrap.css",
"sass": "scss/bootstrap.scss",
Expand Down Expand Up @@ -55,13 +56,13 @@
"grunt-exec": "^0.4.6",
"grunt-html": "^7.0.0",
"grunt-jekyll": "^0.4.2",
"grunt-jscs": "^2.8.0",
"grunt-postcss": "^0.8.0",
"grunt-sass": "^1.0.0",
"grunt-saucelabs": "^8.6.1",
"grunt-scss-lint": "^0.3.8",
"grunt-stamp": "^0.1.0",
"is-travis": "^1.0.0",
"jscs": "^2.11.0",
"load-grunt-tasks": "^3.4.0",
"mq4-hover-shim": "^0.3.0",
"postcss-flexbugs-fixes": "^2.0.0",
Expand Down

0 comments on commit e2fd8be

Please sign in to comment.