From 793e84400cec314198df38b6ae0a06e4711f72de Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 26 May 2017 21:41:36 -0700 Subject: Add `docs-clean` task to watch scripts Without this, the CSS and JS files don't get copied over to the `docs/dist/` folder during development. I imagine we can simplify this and not run it twice, and instead run it once? Unsure. /cc @johann-s --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 881a5b806..9ee855d58 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,8 @@ "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-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-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css && npm run css-docs && npm run docs-clean\"", + "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile && npm run docs-clean\"", "watch": "npm-run-all --parallel watch-css watch-js" }, "style": "dist/css/bootstrap.css", -- cgit v1.2.3 From 7c9efe786aad4d55b468223697c6018b9b59b8dd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 27 May 2017 17:54:23 -0700 Subject: move .scss-lint.yml to route dir instead of symlink (which didn't work) --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 9ee855d58..e23a89bd9 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "bash": "bash", "css": "npm-run-all css-lint css-compile css-prefix css-minify", "css-docs": "npm-run-all css-lint-docs css-compile-docs css-prefix-docs css-minify-docs", - "css-lint": "bundle exec scss-lint --config scss/.scss-lint.yml scss/*.scss", - "css-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss", + "css-lint": "bundle exec scss-lint --config .scss-lint.yml scss/*.scss", + "css-lint-docs": "bundle exec scss-lint --config .scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss", "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", @@ -106,7 +106,7 @@ "build", "js/.eslintrc.json", "js/**/*.js", - "scss/.scss-lint.yml", + ".scss-lint.yml", "scss/**/*.scss", "LICENSE" ], -- cgit v1.2.3 From 3e76d6565603fafa2c85ad81d7b6345c4e279c72 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 28 May 2017 22:50:57 -0700 Subject: Rearrange all the docs to allow for a docs/major.minor/ setup --- package.json | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index e23a89bd9..ff331185f 100644 --- a/package.json +++ b/package.json @@ -21,41 +21,40 @@ "css": "npm-run-all css-lint css-compile css-prefix css-minify", "css-docs": "npm-run-all css-lint-docs css-compile-docs css-prefix-docs css-minify-docs", "css-lint": "bundle exec scss-lint --config .scss-lint.yml scss/*.scss", - "css-lint-docs": "bundle exec scss-lint --config .scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss", + "css-lint-docs": "bundle exec scss-lint --config .scss-lint.yml --exclude assets/scss/docs.scss assets/scss/*.scss", "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-compile-docs": "node-sass --output-style expanded --source-map true --precision 6 assets/scss/docs.scss 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", + "css-prefix-docs": "postcss --config build/ --no-map --replace 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", + "css-minify-docs": "cleancss --level 1 --source-map --output assets/css/docs.min.css assets/css/docs.min.css", "js": "npm-run-all 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/ Gruntfile.js", - "js-lint-docs": "eslint --config js/tests/.eslintrc.json docs/assets/js/", + "js-lint-docs": "eslint --config js/tests/.eslintrc.json assets/js/", "js-compile": "npm-run-all --parallel js-compile-*", "js-compile-bundle": "shx cat js/src/util.js js/src/alert.js js/src/button.js js/src/carousel.js js/src/collapse.js js/src/dropdown.js js/src/modal.js js/src/scrollspy.js js/src/tab.js js/src/tooltip.js js/src/popover.js | shx sed \"s/^(import|export).*//\" | babel --filename js/src/bootstrap.js | node build/stamp.js > dist/js/bootstrap.js", "js-compile-plugins": "babel js/src/ --out-dir js/dist/ --source-maps", "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-minify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js", "js-test": "phantomjs ./node_modules/qunit-phantomjs-runner/runner.js js/tests/index.html 60", "js-test-dep": "npm install grunt && npm install grunt-saucelabs", "js-launch-cloud": "ruby -r webrick -e \"s = WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd, :Logger => WEBrick::Log.new('/dev/null'), :AccessLog => []); trap('INT') { s.shutdown }; s.start\" & 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/", - "docs-compile": "npm run docs-clean && bundle exec jekyll build", - "docs-serve": "npm run docs-clean && bundle exec jekyll serve", + "docs-lint": "htmlhint --config build/.htmlhintrc _gh_pages/ js/tests/visual/ && htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", + "docs-compile": "bundle exec jekyll build", + "docs-serve": "bundle exec jekyll serve", "docs-github": "shx echo 'github: true' > $npm_config_tmp/twbsconfig.yml && npm run docs-compile -- --config _config.yml,$npm_config_tmp/twbsconfig.yml && shx rm $npm_config_tmp/twbsconfig.yml", "docs-upload-preview": "build/upload-preview.sh", - "maintenance-dependencies": "ncu -a -x jquery && bundle update && shx echo 'Manually update docs/assets/js/vendor/*, js/tests/vendor/*, bower.json and .travis.yml'", + "maintenance-dependencies": "ncu -a -x jquery && bundle update && shx echo 'Manually update assets/js/vendor/*, js/tests/vendor/*, bower.json and .travis.yml'", "maintenance-shrinkwrap": "npm shrinkwrap --dev && shx mv npm-shrinkwrap.json build/npm-shrinkwrap.json", "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", - "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css && npm run css-docs && npm run docs-clean\"", - "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile && npm run docs-clean\"", + "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", -- cgit v1.2.3 From 4d2570d0383da92b22cc136987f041412c4d20a3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 May 2017 11:15:43 -0700 Subject: drop htmlhint given htmllint gives us most of the coverage we need here --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index ff331185f..8816c1bd1 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "js-launch-cloud": "ruby -r webrick -e \"s = WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd, :Logger => WEBrick::Log.new('/dev/null'), :AccessLog => []); trap('INT') { s.shutdown }; s.start\" & 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 build/.htmlhintrc _gh_pages/ js/tests/visual/ && htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", + "docs-lint": "htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", "docs-compile": "bundle exec jekyll build", "docs-serve": "bundle exec jekyll serve", "docs-github": "shx echo 'github: true' > $npm_config_tmp/twbsconfig.yml && npm run docs-compile -- --config _config.yml,$npm_config_tmp/twbsconfig.yml && shx rm $npm_config_tmp/twbsconfig.yml", @@ -80,7 +80,6 @@ "babel-preset-es2015": "^7.0.0-alpha.7", "clean-css-cli": "^4.0.12", "eslint": "^3.19.0", - "htmlhint": "^0.9.13", "htmllint-cli": "^0.0.6", "node-sass": "^4.5.2", "nodemon": "^1.11.0", -- cgit v1.2.3 From ccd86bdc967d8714f718c55bd13db967f2e849d2 Mon Sep 17 00:00:00 2001 From: CDAGaming Date: Tue, 30 May 2017 21:11:56 -0700 Subject: Update Dependencies (REUPLOAD) (#22594) * Update Dependencies (REUPLOAD) Uglify-JS: 2.8.22 > 3.0.3 QUnitJS: 2.3.1 > 2.3.2 PostCSS-CLI: 3.1.1 > 4.0.0 Clean-CSS-CLI: 4.0.12 > 4.1.0 Babel-Eslint: 7.2.2 > 7.2.3 AutoPrefixer: 6.7.7 > 7.0.1 * Updates More Dependencies Autoprefixer: v7.0.1 > v7.1.1 Clean-CSS-CLI: v4.1.0 > v4.1.3 Node-Sass: v4.5.2 > v4.5.3 PostCSS-FlexBugs-Fixes: v2.1.1 > v3.0.0 Uglify-JS: v3.0.3 > v3.0.11 Signed-off-by: CDAGaming * Update Gem Bundler Dependency Signed-off-by: CDAGaming * Update Gemfile.lock Dependency Signed-off-by: CDAGaming * Update QUnit Signed-off-by: CDAGaming * Update Uglify-JS to v3.0.13 Signed-off-by: CDAGaming --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 9ee855d58..8fb8c8246 100644 --- a/package.json +++ b/package.json @@ -74,26 +74,26 @@ "popper.js": "^1.9.9" }, "devDependencies": { - "autoprefixer": "^6.7.7", + "autoprefixer": "^7.1.1", "babel-cli": "^6.24.1", - "babel-eslint": "^7.2.2", + "babel-eslint": "^7.2.3", "babel-plugin-transform-es2015-modules-strip": "^0.1.1", "babel-preset-es2015": "^7.0.0-alpha.7", - "clean-css-cli": "^4.0.12", + "clean-css-cli": "^4.1.3", "eslint": "^3.19.0", "htmlhint": "^0.9.13", "htmllint-cli": "^0.0.6", - "node-sass": "^4.5.2", + "node-sass": "^4.5.3", "nodemon": "^1.11.0", "npm-run-all": "^4.0.2", "phantomjs-prebuilt": "^2.1.14", - "postcss-cli": "^3.1.1", - "postcss-flexbugs-fixes": "^2.1.1", + "postcss-cli": "^4.0.0", + "postcss-flexbugs-fixes": "^3.0.0", "qunit-phantomjs-runner": "^2.3.0", - "qunitjs": "^2.3.1", + "qunitjs": "^2.3.2", "shelljs": "^0.7.7", "shx": "^0.2.2", - "uglify-js": "^2.8.22" + "uglify-js": "^3.0.13" }, "engines": { "node": ">=4" -- cgit v1.2.3 From 4119023482675d3cb796e3347d243c3ca7f359a1 Mon Sep 17 00:00:00 2001 From: Brian Ng Date: Wed, 31 May 2017 15:02:26 -0500 Subject: Use correct version of babel-preset-es2015 The 7.x-alpha preset won't work with 6.x core. An alternative would be to bump babel-cli to 7.x-alpha (if you'd like to help us test :D) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 8fb8c8246..dffc58f83 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "babel-cli": "^6.24.1", "babel-eslint": "^7.2.3", "babel-plugin-transform-es2015-modules-strip": "^0.1.1", - "babel-preset-es2015": "^7.0.0-alpha.7", + "babel-preset-es2015": "^6.24.1", "clean-css-cli": "^4.1.3", "eslint": "^3.19.0", "htmlhint": "^0.9.13", -- cgit v1.2.3