Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

1 files changed, 6 insertions, 4 deletions

diff --git a/package.json b/package.json
index 5afbef629..1c871f907 100644
--- a/package.json
+++ b/package.json
@@ -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",
@@ -38,7 +39,7 @@
   "devDependencies": {
     "autoprefixer": "^6.0.3",
     "babel-eslint": "^6.0.4",
-    "eslint": "^2.2.0",
+    "eslint": "^2.11.1",
     "grunt": "^0.4.5",
     "grunt-babel": "^5.0.3",
     "grunt-build-control": "^0.6.0",
@@ -55,16 +56,17 @@
     "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": "^3.0.4",
     "load-grunt-tasks": "^3.4.0",
     "mq4-hover-shim": "^0.3.0",
-    "shelljs": "^0.6.0",
+    "postcss-flexbugs-fixes": "^2.0.0",
+    "shelljs": "^0.7.0",
     "time-grunt": "^1.2.1"
   },
   "engines": {