diff options
| author | Mark Otto <[email protected]> | 2016-05-11 11:07:06 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-05-11 11:07:06 -0700 |
| commit | b280e36b788e4b42bbb359f0a13db410adf7dd8c (patch) | |
| tree | bc8115b9b11cb78767655917a482c25c9f711526 /package.json | |
| parent | ef50b7839cb2ca9171eec12c2bf22fc38ad9d7ae (diff) | |
| parent | 9d6b41c1276af04d5e81043059035660add82b8d (diff) | |
| download | bootstrap-b280e36b788e4b42bbb359f0a13db410adf7dd8c.tar.xz bootstrap-b280e36b788e4b42bbb359f0a13db410adf7dd8c.zip | |
Merge branch 'v4-dev' into v4-split-buttons
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/package.json b/package.json index b2494c6e2..32c823821 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "author": "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" }, "style": "dist/css/bootstrap.css", @@ -28,40 +29,39 @@ "url": "https://github.com/twbs/bootstrap/issues" }, "license": "MIT", + "dependencies": { + "jquery": "1.9.1 - 2", + "tether": "^1.1.1" + }, "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^4.1.3", - "btoa": "~1.1.2", - "glob": "~6.0.1", - "grunt": "~0.4.5", + "grunt": "^0.4.5", "grunt-babel": "^5.0.3", - "grunt-build-control": "~0.6.0", - "grunt-contrib-clean": "~0.7.0", - "grunt-contrib-compress": "~0.14.0", - "grunt-contrib-concat": "~0.5.1", - "grunt-contrib-connect": "~0.11.2", - "grunt-contrib-copy": "~0.8.1", - "grunt-contrib-cssmin": "~0.14.0", - "grunt-contrib-qunit": "~1.0.1", - "grunt-contrib-sass": "^0.9.2", - "grunt-contrib-uglify": "~0.11.0", - "grunt-contrib-watch": "~0.6.1", + "grunt-build-control": "^0.6.0", + "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-copy": "^1.0.0", + "grunt-contrib-cssmin": "^1.0.0", + "grunt-contrib-qunit": "^1.0.1", + "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": "~5.0.0", - "grunt-jekyll": "~0.4.2", - "grunt-jscs": "~2.7.0", - "grunt-line-remover": "0.0.2", - "grunt-postcss": "^0.7.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-saucelabs": "^8.6.1", "grunt-scss-lint": "^0.3.8", "grunt-stamp": "^0.1.0", "is-travis": "^1.0.0", - "load-grunt-tasks": "~3.4.0", - "markdown-it": "^5.0.0", + "load-grunt-tasks": "^3.4.0", "mq4-hover-shim": "^0.3.0", - "npm-shrinkwrap": "^200.1.0", "shelljs": "^0.6.0", "time-grunt": "^1.2.1" }, @@ -70,8 +70,7 @@ }, "files": [ "dist", - "grunt/*.js", - "grunt/*.json", + "grunt", "js/*.js", "scss/**/*.scss", "Gruntfile.js", |