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

Killed the grunt-eslint middleman; Long live ESLint.

Browse Source 
Refs #19908

[skip sauce]
[skip validator]
This commit is contained in:
Chris Rebert 2016-05-30 22:14:18 -07:00
parent 14c7ba95f9
commit f77d8c91a9
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Gruntfile.js
View File

@ -107,13 +107,6 @@ module.exports = function (grunt) {
} }
}, },
eslint: {
options: {
configFile: 'js/.eslintrc'
},
target: 'js/src/*.js'
},
jscs: { jscs: {
options: { options: {
config: 'js/.jscsrc' config: 'js/.jscsrc'
@ -438,7 +431,7 @@ module.exports = function (grunt) {
testSubtasks.push('saucelabs-qunit'); testSubtasks.push('saucelabs-qunit');
} }
grunt.registerTask('test', testSubtasks); grunt.registerTask('test', testSubtasks);
grunt.registerTask('test-js', ['eslint', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']); grunt.registerTask('test-js', ['jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']);
// JS distribution task. // JS distribution task.
grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']); grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']);

5
package.json
View File

@ -17,7 +17,8 @@
"scripts": { "scripts": {
"change-version": "node grunt/change-version.js", "change-version": "node grunt/change-version.js",
"shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json",
"test": "grunt test" "eslint": "eslint --config js/.eslintrc js/src",
"test": "npm run eslint && grunt test"
}, },
"style": "dist/css/bootstrap.css", "style": "dist/css/bootstrap.css",
"sass": "scss/bootstrap.scss", "sass": "scss/bootstrap.scss",
@ -37,6 +38,7 @@
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.0.3", "autoprefixer": "^6.0.3",
"babel-eslint": "^4.1.3", "babel-eslint": "^4.1.3",
"eslint": "^1.5.1",
"grunt": "^0.4.5", "grunt": "^0.4.5",
"grunt-babel": "^5.0.3", "grunt-babel": "^5.0.3",
"grunt-build-control": "^0.6.0", "grunt-build-control": "^0.6.0",
@ -50,7 +52,6 @@
"grunt-contrib-sass": "^1.0.0", "grunt-contrib-sass": "^1.0.0",
"grunt-contrib-uglify": "^1.0.0", "grunt-contrib-uglify": "^1.0.0",
"grunt-contrib-watch": "^1.0.0", "grunt-contrib-watch": "^1.0.0",
"grunt-eslint": "^17.1.0",
"grunt-exec": "^0.4.6", "grunt-exec": "^0.4.6",
"grunt-html": "^7.0.0", "grunt-html": "^7.0.0",
"grunt-jekyll": "^0.4.2", "grunt-jekyll": "^0.4.2",