Merge branch 'v4-dev' into v4-docs-streamlined

1 files changed, 35 insertions, 28 deletions

diff --git a/package.json b/package.json
index c056861ee..4767a2538 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.4",
+  "version": "4.0.0-alpha.5",
   "keywords": [
     "css",
     "sass",
@@ -11,18 +11,24 @@
     "framework",
     "web"
   ],
-  "homepage": "http://getbootstrap.com",
+  "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",
-    "eslint": "eslint --config js/.eslintrc.json js/src",
+    "clean-css": "cleancss --skip-advanced --source-map --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --skip-advanced --source-map --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --skip-advanced --source-map --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css",
+    "clean-css-docs": "cleancss --skip-advanced --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.css",
+    "eslint": "eslint --ignore-path .eslintignore js",
     "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",
+    "scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude scss/_normalize.scss scss/*.scss",
+    "scss-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
+    "uglify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js",
+    "uglify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/*.js docs/assets/js/src/application.js",
     "update-shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json",
     "test": "npm run eslint && npm run jscs && grunt test"
   },
@@ -38,42 +44,43 @@
   },
   "license": "MIT",
   "dependencies": {
-    "jquery": "1.9.1 - 3",
-    "tether": "^1.1.1"
+    "jquery": ">=1.9.1",
+    "tether": "^1.3.7"
   },
   "devDependencies": {
-    "autoprefixer": "^6.0.3",
-    "babel-eslint": "^6.0.4",
-    "eslint": "^3.0.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",
+    "clean-css": "^3.4.23",
+    "eslint": "^3.7.1",
     "grunt": "^1.0.1",
-    "grunt-babel": "^5.0.3",
-    "grunt-build-control": "^0.7.0",
+    "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-qunit": "^1.2.0",
     "grunt-contrib-sass": "^1.0.0",
-    "grunt-contrib-uglify": "^1.0.0",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-exec": "^1.0.0",
-    "grunt-html": "^8.0.1",
-    "grunt-jekyll": "^0.4.2",
-    "grunt-sass": "^1.0.0",
+    "grunt-exec": "^1.0.1",
+    "grunt-html": "^8.0.2",
+    "grunt-jekyll": "^0.4.4",
+    "grunt-sass": "2.0.0",
     "grunt-saucelabs": "^9.0.0",
-    "grunt-scss-lint": "^0.3.8",
     "grunt-stamp": "^0.3.0",
     "htmlhint": "^0.9.13",
     "is-travis": "^1.0.0",
-    "jscs": "^3.0.4",
-    "load-grunt-tasks": "^3.4.0",
-    "postcss-cli": "^2.5.2",
+    "jscs": "^3.0.7",
+    "load-grunt-tasks": "^3.5.2",
+    "postcss-cli": "^2.6.0",
     "postcss-flexbugs-fixes": "^2.0.0",
-    "shelljs": "^0.7.0",
-    "shx": "^0.1.2",
-    "time-grunt": "^1.2.1"
+    "shelljs": "^0.7.4",
+    "shx": "^0.2.1",
+    "time-grunt": "^1.4.0",
+    "uglify-js": "^2.7.5"
   },
   "engines": {
     "node": ">=4"
@@ -100,7 +107,7 @@
       }
     },
     "dependencies": {
-      "jquery": "1.9.1 - 3"
+      "jquery": "3"
     }
   }
 }