From d336adfafdf2c8edf8715a9d5dc3becaee819483 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Thu, 27 Apr 2017 23:03:17 +0200 Subject: Fix build by installing grunt dependencies before js-test-cloud --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index ab1185bd7..4833746d1 100644 --- a/package.json +++ b/package.json @@ -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/", @@ -76,8 +78,6 @@ "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", -- cgit v1.2.3 From ebf0c3104e8c70daeb77696277e22366ec144b88 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Thu, 27 Apr 2017 23:20:29 +0200 Subject: Run js-test locally before js-test-cloud --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 4833746d1..28937f563 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "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" }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", -- cgit v1.2.3 From 03c26407aa1e0dc082a367d54df34e639b1697bb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 21 Apr 2017 23:35:24 -0700 Subject: watch task docs + css --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 28937f563..7307a56b1 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,8 @@ "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 js-test docs" + "test": "npm-run-all dist js-test docs", + "watch": "nodemon -e scss -x \"npm run css && npm run css-docs\"" }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", @@ -81,6 +82,7 @@ "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", -- cgit v1.2.3 From 482052585eee27bd8f3b315c2cce9120ecd11559 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 21 Apr 2017 23:46:54 -0700 Subject: don't prefix docs css, it generates .map files and mucks it all up --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7307a56b1..5440548a5 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", -- cgit v1.2.3 From dbe8e554bb0df9175c31c68efa05f89ef26461fc Mon Sep 17 00:00:00 2001 From: Johann-S Date: Fri, 28 Apr 2017 13:43:42 +0200 Subject: Add watch-css and watch-js + a global watch command --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 5440548a5..7e9ee3c75 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,9 @@ "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 js-test docs", - "watch": "nodemon -e scss -x \"npm run css && npm run css-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", -- cgit v1.2.3