Merge branch 'v4-dev' into v4-navbars

1 files changed, 48 insertions, 39 deletions

diff --git a/package.json b/package.json
index 32c823821..ed6fef32a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap",
   "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
-  "version": "4.0.0-alpha.2",
+  "version": "4.0.0-alpha.4",
   "keywords": [
     "css",
     "sass",
@@ -11,16 +11,24 @@
     "framework",
     "web"
   ],
-  "homepage": "http://getbootstrap.com",
-  "author": "Twitter, Inc.",
+  "homepage": "https://getbootstrap.com",
+  "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",
-  "main": "./dist/js/npm",
+  "main": "dist/js/bootstrap",
   "repository": {
     "type": "git",
     "url": "https://github.com/twbs/bootstrap.git"
@@ -30,57 +38,58 @@
   },
   "license": "MIT",
   "dependencies": {
-    "jquery": "1.9.1 - 2",
-    "tether": "^1.1.1"
+    "jquery": "1.9.1 - 3",
+    "tether": "^1.3.7"
   },
   "devDependencies": {
-    "autoprefixer": "^6.0.3",
-    "babel-eslint": "^4.1.3",
-    "grunt": "^0.4.5",
-    "grunt-babel": "^5.0.3",
-    "grunt-build-control": "^0.6.0",
+    "autoprefixer": "^6.5.0",
+    "babel-eslint": "^7.0.0",
+    "babel-plugin-transform-es2015-modules-strip": "^0.1.0",
+    "babel-preset-es2015": "^6.16.0",
+    "eslint": "^3.7.1",
+    "grunt": "^1.0.1",
+    "grunt-babel": "^6.0.0",
+    "grunt-build-control": "^0.7.1",
     "grunt-contrib-clean": "^1.0.0",
-    "grunt-contrib-compress": "^1.1.0",
-    "grunt-contrib-concat": "^1.0.0",
-    "grunt-contrib-connect": "^1.0.0",
+    "grunt-contrib-compress": "^1.3.0",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-connect": "^1.0.2",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-cssmin": "^1.0.0",
-    "grunt-contrib-qunit": "^1.0.1",
+    "grunt-contrib-cssmin": "^1.0.2",
+    "grunt-contrib-qunit": "^1.2.0",
     "grunt-contrib-sass": "^1.0.0",
-    "grunt-contrib-uglify": "^1.0.0",
+    "grunt-contrib-uglify": "^2.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",
-    "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",
+    "grunt-exec": "^1.0.1",
+    "grunt-html": "^8.0.2",
+    "grunt-jekyll": "^0.4.4",
+    "grunt-sass": "^1.2.1",
+    "grunt-saucelabs": "^9.0.0",
+    "grunt-scss-lint": "^0.5.0",
+    "grunt-stamp": "^0.3.0",
+    "htmlhint": "^0.9.13",
     "is-travis": "^1.0.0",
-    "load-grunt-tasks": "^3.4.0",
-    "mq4-hover-shim": "^0.3.0",
-    "shelljs": "^0.6.0",
-    "time-grunt": "^1.2.1"
+    "jscs": "^3.0.7",
+    "load-grunt-tasks": "^3.5.2",
+    "postcss-cli": "^2.6.0",
+    "postcss-flexbugs-fixes": "^2.0.0",
+    "shelljs": "^0.7.4",
+    "shx": "^0.1.4",
+    "time-grunt": "^1.4.0"
   },
   "engines": {
-    "node": ">=0.10.1"
+    "node": ">=4"
   },
   "files": [
     "dist",
     "grunt",
-    "js/*.js",
+    "js/**/*.js",
     "scss/**/*.scss",
     "Gruntfile.js",
     "LICENSE"
   ],
   "jspm": {
     "main": "js/bootstrap",
-    "ignore": [
-      "dist/js/npm"
-    ],
     "directories": {
       "lib": "dist"
     },
@@ -93,7 +102,7 @@
       }
     },
     "dependencies": {
-      "jquery": "*"
+      "jquery": "3"
     }
   }
 }