diff options
| author | Mark Otto <[email protected]> | 2017-05-01 21:54:50 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-05-01 21:54:50 -0700 |
| commit | 8c7fe6cf147e98fb5d8096f6e6536bcb4e207586 (patch) | |
| tree | d33635083f70814945e92cb17957b6c522073379 /package.json | |
| parent | ca44f5b03a9707dda74e1aa3f92a1b54de3ec6d5 (diff) | |
| parent | e00de46540818fa11feb6d1f0e8b0089ba56f082 (diff) | |
| download | bootstrap-8c7fe6cf147e98fb5d8096f6e6536bcb4e207586.tar.xz bootstrap-8c7fe6cf147e98fb5d8096f6e6536bcb4e207586.zip | |
Merge branch 'v4-dev' into form-tweaks
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/package.json b/package.json index ab1185bd7..7e9ee3c75 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "css-compile": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css", "css-compile-docs": "node-sass --output-style expanded --source-map true --precision 6 docs/assets/scss/docs.scss docs/assets/css/docs.min.css", "css-prefix": "postcss --config build/ --replace dist/css/*.css", - "css-prefix-docs": "postcss --config build/ --no-map --replace docs/assets/css/docs.min.css docs/examples/**/*.css", + "css-prefix-docs": "postcss --config build/ --no-map --replace docs/assets/css/docs.min.css", "css-minify": "cleancss --level 1 --source-map --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", "css-minify-docs": "cleancss --level 1 --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.css", "js": "npm-run-all js-compile js-minify", @@ -38,7 +38,9 @@ "js-minify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js", "js-minify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/anchor.min.js docs/assets/js/vendor/clipboard.min.js docs/assets/js/vendor/holder.min.js docs/assets/js/src/application.js", "js-test": "phantomjs ./node_modules/qunit-phantomjs-runner/runner.js js/tests/index.html 60", - "js-test-cloud": "ruby -run -ehttpd . -p3000 > /dev/null & grunt saucelabs-qunit", + "js-test-dep": "npm install grunt && npm install grunt-saucelabs", + "js-launch-cloud": "ruby -run -ehttpd . -p3000 > /dev/null & grunt saucelabs-qunit", + "js-test-cloud": "npm-run-all js-test-dep js-launch-cloud", "docs": "npm-run-all docs-compile docs-lint", "docs-lint": "htmlhint --config docs/.htmlhintrc _gh_pages/ js/tests/visual/ && htmllint --rc docs/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", "docs-clean": "shx rm -r docs/dist/* && shx cp -r dist/* docs/dist/", @@ -51,7 +53,10 @@ "release-version": "node build/change-version.js", "release-zip": "cd dist/ && zip -r9 bootstrap-$npm_package_version-dist.zip * && shx mv bootstrap-$npm_package_version-dist.zip ..", "dist": "npm-run-all --parallel css js", - "test": "npm-run-all dist docs" + "test": "npm-run-all dist js-test docs", + "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css && npm run css-docs\"", + "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile\"", + "watch": "npm-run-all --parallel watch-css watch-js" }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", @@ -76,11 +81,10 @@ "babel-preset-es2015": "^7.0.0-alpha.7", "clean-css-cli": "^4.0.12", "eslint": "^3.19.0", - "grunt": "^1.0.1", - "grunt-saucelabs": "^9.0.0", "htmlhint": "^0.9.13", "htmllint-cli": "^0.0.6", "node-sass": "^4.5.2", + "nodemon": "^1.11.0", "npm-run-all": "^4.0.2", "phantomjs-prebuilt": "^2.1.14", "postcss-cli": "^3.1.1", |