Merge branch 'v4-dev' into v4-navbars

1 files changed, 28 insertions, 18 deletions

diff --git a/package.json b/package.json
index 32c823821..38d6b87bf 100644
--- a/package.json
+++ b/package.json
@@ -12,11 +12,19 @@
     "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",
+    "jscs": "jscs --config=js/.jscsrc js/src js/tests/unit docs/assets/js/src grunt Gruntfile.js docs/assets/js/ie-emulation-modes-warning.js docs/assets/js/ie10-viewport-bug-workaround.js",
+    "htmlhint": "htmlhint --config docs/.htmlhintrc _gh_pages/",
+    "postcss": "postcss --config grunt/postcss.js --replace dist/css/*.css",
+    "postcss-docs": "postcss --config grunt/postcss.js --no-map --replace docs/assets/css/docs.min.css && postcss --config grunt/postcss.js --no-map --replace docs/examples/**/*.css",
+    "update-shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json",
+    "test": "npm run eslint && npm run jscs && grunt test"
   },
   "style": "dist/css/bootstrap.css",
   "sass": "scss/bootstrap.scss",
@@ -30,15 +38,16 @@
   },
   "license": "MIT",
   "dependencies": {
-    "jquery": "1.9.1 - 2",
+    "jquery": "1.9.1 - 3",
     "tether": "^1.1.1"
   },
   "devDependencies": {
     "autoprefixer": "^6.0.3",
-    "babel-eslint": "^4.1.3",
-    "grunt": "^0.4.5",
+    "babel-eslint": "^6.0.4",
+    "eslint": "^3.0.0",
+    "grunt": "^1.0.1",
     "grunt-babel": "^5.0.3",
-    "grunt-build-control": "^0.6.0",
+    "grunt-build-control": "^0.7.0",
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-compress": "^1.1.0",
     "grunt-contrib-concat": "^1.0.0",
@@ -49,24 +58,25 @@
     "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-exec": "^1.0.0",
+    "grunt-html": "^8.0.1",
     "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-saucelabs": "^9.0.0",
     "grunt-scss-lint": "^0.3.8",
-    "grunt-stamp": "^0.1.0",
+    "grunt-stamp": "^0.3.0",
+    "htmlhint": "^0.9.13",
     "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-cli": "^2.5.2",
+    "postcss-flexbugs-fixes": "^2.0.0",
+    "shelljs": "^0.7.0",
+    "shx": "^0.1.2",
     "time-grunt": "^1.2.1"
   },
   "engines": {
-    "node": ">=0.10.1"
+    "node": ">=4"
   },
   "files": [
     "dist",
@@ -93,7 +103,7 @@
       }
     },
     "dependencies": {
-      "jquery": "*"
+      "jquery": "1.9.1 - 3"
     }
   }
 }