diff options
| author | Mark Otto <[email protected]> | 2016-06-02 21:48:53 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-06-02 21:48:53 -0700 |
| commit | 8feae9075ae55be4e6cd0e884fbfa006a6639ceb (patch) | |
| tree | 0124594afc748b650fbe2f840b1e8d4cabc841cf /package.json | |
| parent | 96835e1512631a1a54e99e1179e06d2e23060705 (diff) | |
| parent | 0b4187d37b8fb1a65a5929329b51b04a2d6aa1eb (diff) | |
| download | bootstrap-8feae9075ae55be4e6cd0e884fbfa006a6639ceb.tar.xz bootstrap-8feae9075ae55be4e6cd0e884fbfa006a6639ceb.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/package.json b/package.json index 32c823821..5afbef629 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,13 @@ "web" ], "homepage": "http://getbootstrap.com", - "author": "Twitter, Inc.", + "author": "The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)", + "contributors": ["Twitter, Inc."], "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.json js/src", + "test": "npm run eslint && grunt test" }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", @@ -35,7 +37,8 @@ }, "devDependencies": { "autoprefixer": "^6.0.3", - "babel-eslint": "^4.1.3", + "babel-eslint": "^6.0.4", + "eslint": "^2.2.0", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", @@ -49,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", |