From 0e920ce3f481a23c00c22c10565463ce58c0aac2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 21 Jun 2018 07:31:38 +0300 Subject: Reorganize docs for easier deploys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the current docs directory setup, I'm making too many mistakes and have to manually address path changes and directory moves on deploy. This makes for a frustrating experience developing locally and shipping releases. With this PR, we're basically back to the same setup from v3—duplicating the dist directory into our docs directory. Not the most ideal, but very straightforward for me as the release manager. --- package.json | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 34e3ead8e..5b8571700 100644 --- a/package.json +++ b/package.json @@ -21,23 +21,25 @@ "http-server": "http-server --silent -p 3000", "bundlesize": "bundlesize", "check-broken-links": "npm-run-all --parallel --race \"http-server -- _gh_pages/\" blc", - "css": "npm-run-all --parallel css-lint* css-compile* --sequential css-prefix* css-minify*", + "css": "npm-run-all --parallel css-lint* css-compile* --sequential css-prefix* css-minify* css-copy", "css-main": "npm-run-all --parallel css-lint css-compile --sequential css-prefix css-minify", "css-docs": "npm-run-all --parallel css-lint-docs css-compile-docs --sequential css-prefix-docs css-minify-docs", "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css", - "css-compile-docs": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 assets/scss/docs.scss assets/css/docs.min.css", + "css-compile-docs": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 site/docs/4.1/assets/scss/docs.scss site/docs/4.1/assets/css/docs.min.css", + "css-copy": "shx mkdir -p site/docs/4.1/dist/ && shx cp -r dist/css/ site/docs/4.1/dist/", "css-lint": "stylelint --syntax scss \"scss/**/*.scss\"", - "css-lint-docs": "stylelint --syntax scss \"assets/scss/*.scss\" && stylelint \"docs/**/*.css\"", - "css-lint-vars": "node build/lint-vars.js scss/ assets/scss/", + "css-lint-docs": "stylelint --syntax scss \"site/docs/4.1/assets/scss/*.scss\" && stylelint \"docs/**/*.css\"", + "css-lint-vars": "node build/lint-vars.js scss/ site/docs/4.1/assets/scss/", "css-prefix": "postcss --config build/postcss.config.js --replace \"dist/css/*.css\" \"!dist/css/*.min.css\"", - "css-prefix-docs": "postcss --config build/postcss.config.js --replace \"assets/css/docs.min.css\" \"docs/**/*.css\"", + "css-prefix-docs": "postcss --config build/postcss.config.js --replace \"site/docs/4.1/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", + "css-minify-docs": "cleancss --level 1 --source-map --source-map-inline-sources --output site/docs/4.1/assets/css/docs.min.css site/docs/4.1/assets/css/docs.min.css", + "js": "npm-run-all js-lint* js-compile js-minify js-copy", + "js-copy": "shx mkdir -p site/docs/4.1/dist/ && shx cp -r dist/js/ site/docs/4.1/dist/", "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/src js/tests build/", - "js-lint-docs": "eslint assets/js/ docs/ sw.js", + "js-lint-docs": "eslint site/docs/4.1/assets/js/ site/sw.js", "js-compile": "npm-run-all --parallel js-compile-*", "js-compile-standalone": "rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap", "js-compile-bundle": "rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap", @@ -46,7 +48,7 @@ "js-minify": "npm-run-all --parallel js-minify-*", "js-minify-standalone": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map\" --output dist/js/bootstrap.min.js dist/js/bootstrap.js", "js-minify-bundle": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map\" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js", - "js-minify-docs": "uglifyjs --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/*.js\"", + "js-minify-docs": "uglifyjs --mangle --comments \"/^!/\" --output site/docs/4.1/assets/js/docs.min.js site/docs/4.1/assets/js/vendor/anchor.min.js site/docs/4.1/assets/js/vendor/clipboard.min.js site/docs/4.1/assets/js/vendor/holder.min.js \"site/docs/4.1/assets/js/src/*.js\"", "js-test": "npm-run-all js-test-karma*", "js-test-karma": "karma start js/tests/karma.conf.js", "js-test-karma-old": "cross-env USE_OLD_JQUERY=true npm run js-test-karma", @@ -64,7 +66,7 @@ "docs-lint-vnu-jar": "node build/vnu-jar.js", "docs-serve": "bundle exec jekyll serve", "docs-workbox-precache": "node build/workbox.js", - "maintenance-dependencies": "ncu -a -x jquery && npm update && bundle update && shx echo \"Manually update assets/js/vendor/*, js/tests/vendor/* and .travis.yml\"", + "maintenance-dependencies": "ncu -a -x jquery && npm update && bundle update && shx echo \"Manually update site/docs/4.1/assets/js/vendor/*, js/tests/vendor/* and .travis.yml\"", "release-sri": "node build/generate-sri.js", "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 ..", -- cgit v1.2.3 From 159aebc27461553e2ad9ff26a3922eff2d392a34 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 3 Jul 2018 00:43:57 -0700 Subject: Update watch scripts to properly copy JS files - Updates nodemon scripts to watch specific directories instead of ignoring several - Split watch tasks for CSS and JS into main and docs - Add docs-watch script to serve the docs instead of just build - Add new start script so that instead of two tabs, one for docs-watch and one for watch, we just run npm start --- package.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 5b8571700..d2543b187 100644 --- a/package.json +++ b/package.json @@ -17,11 +17,12 @@ "Twitter, Inc." ], "scripts": { + "start": "npm-run-all --parallel watch-css-main watch-css-docs watch-js-main watch-js-docs docs-watch", "blc": "blc --exclude-external --filter-level 3 --get --ordered --recursive --host-requests 4 --input http://localhost:3000/", "http-server": "http-server --silent -p 3000", "bundlesize": "bundlesize", "check-broken-links": "npm-run-all --parallel --race \"http-server -- _gh_pages/\" blc", - "css": "npm-run-all --parallel css-lint* css-compile* --sequential css-prefix* css-minify* css-copy", + "css": "npm-run-all --parallel css-lint* css-compile* --sequential css-prefix* css-minify*", "css-main": "npm-run-all --parallel css-lint css-compile --sequential css-prefix css-minify", "css-docs": "npm-run-all --parallel css-lint-docs css-compile-docs --sequential css-prefix-docs css-minify-docs", "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css", @@ -58,6 +59,7 @@ "coveralls": "shx cat js/coverage/lcov.info | coveralls", "docs": "npm-run-all --parallel css-docs js-docs --sequential docs-compile docs-lint", "docs-compile": "bundle exec jekyll build", + "docs-watch": "bundle exec jekyll serve", "postdocs-compile": "npm run docs-workbox-precache", "docs-github": "shx echo \"github: true\" > twbsconfig.yml && npm run docs-compile -- --config _config.yml,twbsconfig.yml && shx rm ./twbsconfig.yml", "docs-github-serve": "bundle exec jekyll serve --skip-initial-build --no-watch", @@ -73,9 +75,11 @@ "saucelabs-test": "node build/saucelabs-unit-test.js", "dist": "npm-run-all --parallel css js", "test": "npm-run-all dist js-test docs-compile docs-lint bundlesize", - "watch": "npm-run-all --parallel watch-css watch-js", - "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css\"", - "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile\"" + "watch": "npm-run-all --parallel watch-css-main watch-css-docs watch-js-main watch-js-docs", + "watch-css-main": "nodemon --watch scss/ --ext scss --exec \"npm run css-main && npm run css-copy\"", + "watch-css-docs": "nodemon --watch site/docs/4.1/assets/scss/ --ext scss --exec \"npm run css-docs\"", + "watch-js-main": "nodemon --watch js/src/ --ext js --exec \"npm run js-compile && npm run js-copy\"", + "watch-js-docs": "nodemon --watch site/docs/4.1/assets/js/src/ --ext js --exec \"npm run js-docs\"" }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", -- cgit v1.2.3 From 4518288c7ceb92aa8f1b61a383bc75d6c90017d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 3 Jul 2018 01:12:38 -0700 Subject: Move copy tasks back to css-main and js-compile so docs-github task runs properly --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index d2543b187..3d1f6a3b6 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "bundlesize": "bundlesize", "check-broken-links": "npm-run-all --parallel --race \"http-server -- _gh_pages/\" blc", "css": "npm-run-all --parallel css-lint* css-compile* --sequential css-prefix* css-minify*", - "css-main": "npm-run-all --parallel css-lint css-compile --sequential css-prefix css-minify", + "css-main": "npm-run-all --parallel css-lint css-compile --sequential css-prefix css-minify css-copy", "css-docs": "npm-run-all --parallel css-lint-docs css-compile-docs --sequential css-prefix-docs css-minify-docs", "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css", "css-compile-docs": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 site/docs/4.1/assets/scss/docs.scss site/docs/4.1/assets/css/docs.min.css", @@ -41,7 +41,7 @@ "js-docs": "npm-run-all js-lint-docs js-minify-docs", "js-lint": "eslint js/src js/tests build/", "js-lint-docs": "eslint site/docs/4.1/assets/js/ site/sw.js", - "js-compile": "npm-run-all --parallel js-compile-*", + "js-compile": "npm-run-all --parallel js-compile-* --sequential js-copy", "js-compile-standalone": "rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap", "js-compile-bundle": "rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap", "js-compile-plugins": "cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps", @@ -76,9 +76,9 @@ "dist": "npm-run-all --parallel css js", "test": "npm-run-all dist js-test docs-compile docs-lint bundlesize", "watch": "npm-run-all --parallel watch-css-main watch-css-docs watch-js-main watch-js-docs", - "watch-css-main": "nodemon --watch scss/ --ext scss --exec \"npm run css-main && npm run css-copy\"", + "watch-css-main": "nodemon --watch scss/ --ext scss --exec \"npm run css-main\"", "watch-css-docs": "nodemon --watch site/docs/4.1/assets/scss/ --ext scss --exec \"npm run css-docs\"", - "watch-js-main": "nodemon --watch js/src/ --ext js --exec \"npm run js-compile && npm run js-copy\"", + "watch-js-main": "nodemon --watch js/src/ --ext js --exec \"npm run js-compile\"", "watch-js-docs": "nodemon --watch site/docs/4.1/assets/js/src/ --ext js --exec \"npm run js-docs\"" }, "style": "dist/css/bootstrap.css", -- cgit v1.2.3 From aedd7007682ef39feefce2aea1e4ddba5637cf04 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 3 Jul 2018 10:10:09 -0700 Subject: change dist to only affect main since docs css isn't distributed --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 3d1f6a3b6..2278b8d54 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,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 ..", "saucelabs-test": "node build/saucelabs-unit-test.js", - "dist": "npm-run-all --parallel css js", + "dist": "npm-run-all --parallel css-main js", "test": "npm-run-all dist js-test docs-compile docs-lint bundlesize", "watch": "npm-run-all --parallel watch-css-main watch-css-docs watch-js-main watch-js-docs", "watch-css-main": "nodemon --watch scss/ --ext scss --exec \"npm run css-main\"", -- cgit v1.2.3 From 6589408a4b91c0f58fa4ac1508d69e3e9e4345e1 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 12 Jul 2018 08:29:23 +0300 Subject: Update scripts. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 2278b8d54..fc6756d38 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "Twitter, Inc." ], "scripts": { - "start": "npm-run-all --parallel watch-css-main watch-css-docs watch-js-main watch-js-docs docs-watch", + "start": "npm-run-all --parallel watch docs-serve", "blc": "blc --exclude-external --filter-level 3 --get --ordered --recursive --host-requests 4 --input http://localhost:3000/", "http-server": "http-server --silent -p 3000", "bundlesize": "bundlesize", @@ -59,7 +59,7 @@ "coveralls": "shx cat js/coverage/lcov.info | coveralls", "docs": "npm-run-all --parallel css-docs js-docs --sequential docs-compile docs-lint", "docs-compile": "bundle exec jekyll build", - "docs-watch": "bundle exec jekyll serve", + "docs-serve": "bundle exec jekyll serve", "postdocs-compile": "npm run docs-workbox-precache", "docs-github": "shx echo \"github: true\" > twbsconfig.yml && npm run docs-compile -- --config _config.yml,twbsconfig.yml && shx rm ./twbsconfig.yml", "docs-github-serve": "bundle exec jekyll serve --skip-initial-build --no-watch", @@ -75,7 +75,7 @@ "saucelabs-test": "node build/saucelabs-unit-test.js", "dist": "npm-run-all --parallel css-main js", "test": "npm-run-all dist js-test docs-compile docs-lint bundlesize", - "watch": "npm-run-all --parallel watch-css-main watch-css-docs watch-js-main watch-js-docs", + "watch": "npm-run-all --parallel watch-*", "watch-css-main": "nodemon --watch scss/ --ext scss --exec \"npm run css-main\"", "watch-css-docs": "nodemon --watch site/docs/4.1/assets/scss/ --ext scss --exec \"npm run css-docs\"", "watch-js-main": "nodemon --watch js/src/ --ext js --exec \"npm run js-compile\"", -- cgit v1.2.3 From a49f5cab6fb2e106113e5ab59fdcecc7f9349301 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 12 Jul 2018 09:43:15 +0300 Subject: Clean up npm scripts a bit more. `docs-serve` was duplicated. Also, extend the existent `docs-serve` script for `docs-github-serve`. --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index fc6756d38..d7cb8f745 100644 --- a/package.json +++ b/package.json @@ -59,10 +59,9 @@ "coveralls": "shx cat js/coverage/lcov.info | coveralls", "docs": "npm-run-all --parallel css-docs js-docs --sequential docs-compile docs-lint", "docs-compile": "bundle exec jekyll build", - "docs-serve": "bundle exec jekyll serve", "postdocs-compile": "npm run docs-workbox-precache", "docs-github": "shx echo \"github: true\" > twbsconfig.yml && npm run docs-compile -- --config _config.yml,twbsconfig.yml && shx rm ./twbsconfig.yml", - "docs-github-serve": "bundle exec jekyll serve --skip-initial-build --no-watch", + "docs-github-serve": "npm run docs-serve -- --skip-initial-build --no-watch", "docs-lint": "npm-run-all docs-lint-*", "docs-lint-htmllint": "htmllint --rc build/.htmllintrc \"_gh_pages/**/*.html\" \"js/tests/**/*.html\"", "docs-lint-vnu-jar": "node build/vnu-jar.js", -- cgit v1.2.3 From c4ccfbe04e888f3623d74963ba72d2320da0785a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Jul 2018 00:04:51 -0700 Subject: Ship v4.1.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index d7cb8f745..80d392830 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "version": "4.1.1", + "version": "4.1.2", "keywords": [ "css", "sass", -- cgit v1.2.3 From 6cf8700fd9fd096855d6510ceef9c1ff225f8e40 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 16 Jul 2018 19:07:34 +0300 Subject: Move the browserslist config to a separate file. --- package.json | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 80d392830..3773070a5 100644 --- a/package.json +++ b/package.json @@ -152,19 +152,6 @@ "js/{src,dist}/", "scss/" ], - "browserslist": [ - ">= 1%", - "last 1 major version", - "not dead", - "Chrome >= 45", - "Firefox >= 38", - "Edge >= 12", - "Explorer >= 10", - "iOS >= 9", - "Safari >= 9", - "Android >= 4.4", - "Opera >= 30" - ], "bundlesize": [ { "path": "./dist/css/bootstrap-grid.css", -- cgit v1.2.3 From eb81c39f2c36d88d4ebc062a2fa179980827e8be Mon Sep 17 00:00:00 2001 From: Johann-S Date: Wed, 27 Jun 2018 11:33:07 +0200 Subject: feat(plugins): allow to import separate plugins --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 3773070a5..23d799e4b 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,8 @@ "js-compile": "npm-run-all --parallel js-compile-* --sequential js-copy", "js-compile-standalone": "rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap", "js-compile-bundle": "rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap", - "js-compile-plugins": "cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps", - "js-compile-plugins-coverage": "cross-env PLUGINS=true NODE_ENV=test babel js/src/ --out-dir js/coverage/dist/ --source-maps", + "js-compile-plugins": "node build/build-plugins.js", + "js-compile-plugins-coverage": "cross-env NODE_ENV=test node build/build-plugins.js", "js-minify": "npm-run-all --parallel js-minify-*", "js-minify-standalone": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map\" --output dist/js/bootstrap.min.js dist/js/bootstrap.js", "js-minify-bundle": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map\" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js", @@ -103,7 +103,6 @@ "autoprefixer": "^8.6.5", "babel-eslint": "^8.2.5", "babel-plugin-istanbul": "^4.1.6", - "babel-plugin-transform-es2015-modules-strip": "^0.1.1", "broken-link-checker": "^0.7.8", "bundlesize": "^0.15.3", "clean-css-cli": "^4.1.11", -- cgit v1.2.3 From 3b558734382ce58b51e5fc676453bfd53bba9201 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jul 2018 19:25:52 -0700 Subject: Ship v4.1.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 23d799e4b..5e1e2d6a6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "version": "4.1.2", + "version": "4.1.3", "keywords": [ "css", "sass", -- cgit v1.2.3