diff options
| author | Chris Rebert <[email protected]> | 2016-05-30 22:32:15 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-05-30 22:32:15 -0700 |
| commit | 301dc70e1b04fdb70ac8e83a6906b6b27d7d2235 (patch) | |
| tree | ae1e2a67d7a14f8d9a21c9c916944dd58c0d704c /package.json | |
| parent | 14c7ba95f97d853ef653893abfe530a919a1ed24 (diff) | |
| parent | 5f243fa10d6d1bc1f4694ce7c2241a82029b5ee1 (diff) | |
| download | bootstrap-301dc70e1b04fdb70ac8e83a6906b6b27d7d2235.tar.xz bootstrap-301dc70e1b04fdb70ac8e83a6906b6b27d7d2235.zip | |
Merge pull request #19990 from twbs/bypass-grunt-eslint
Just use ESLint directly instead of going thru grunt-eslint
[skip sauce]
[skip validator]
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json index 7b655df8b..f4c96bb7b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ "scripts": { "change-version": "node grunt/change-version.js", "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", "sass": "scss/bootstrap.scss", @@ -37,6 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^4.1.3", + "eslint": "^1.5.1", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", @@ -50,7 +52,6 @@ "grunt-contrib-sass": "^1.0.0", "grunt-contrib-uglify": "^1.0.0", "grunt-contrib-watch": "^1.0.0", - "grunt-eslint": "^17.1.0", "grunt-exec": "^0.4.6", "grunt-html": "^7.0.0", "grunt-jekyll": "^0.4.2", |