diff options
| author | Mark Otto <[email protected]> | 2017-10-25 12:31:33 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-10-25 12:31:33 -0700 |
| commit | 59bf81f649c8cb171a9f9e052eb40032aecbcf11 (patch) | |
| tree | 0190bde8182a0fe8c47dbc7645d744f0970ba675 /package.json | |
| parent | 0c40a5bf67056780abbea77894542741f51e2968 (diff) | |
| parent | 988327032d6b76fdb70075feb7254bcb053ec117 (diff) | |
| download | bootstrap-59bf81f649c8cb171a9f9e052eb40032aecbcf11.tar.xz bootstrap-59bf81f649c8cb171a9f9e052eb40032aecbcf11.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index 69eb6ae0e..3d04e52fc 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "css-prefix-docs": "postcss --config build/postcss.config.js --replace \"assets/css/docs.min.css\" \"docs/**/*.css\"", "css-minify": "cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", "css-minify-docs": "cleancss --level 1 --source-map --source-map-inline-sources --output assets/css/docs.min.css assets/css/docs.min.css", - "js": "npm-run-all js-lint* js-compile* js-minify*", + "js": "npm-run-all js-lint* js-compile js-minify", "js-main": "npm-run-all js-lint js-compile js-minify", "js-docs": "npm-run-all js-lint-docs js-minify-docs", "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/", @@ -76,7 +76,7 @@ "dependencies": {}, "peerDependencies": { "jquery": "1.9.1 - 3", - "popper.js": "^1.12.3" + "popper.js": "^1.12.6" }, "devDependencies": { "autoprefixer": "^7.1.2", @@ -96,7 +96,7 @@ "nodemon": "^1.11.0", "npm-run-all": "^4.0.2", "phantomjs-prebuilt": "^2.1.14", - "popper.js": "^1.12.5", + "popper.js": "^1.12.6", "postcss-cli": "^4.1.0", "qunit-phantomjs-runner": "^2.3.0", "qunitjs": "^2.4.0", @@ -198,7 +198,7 @@ "dependencies": {}, "peerDependencies": { "jquery": "^3.0.0", - "popper.js": "^1.12.3" + "popper.js": "^1.12.6" } } } |