diff --git a/README.md b/README.md
index a84d63369..3b54ee301 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ Have a bug or a feature request? Please first read the [issue guidelines](https:
Bootstrap's documentation, included in this repo in the root directory, is built with [Hugo](https://gohugo.io/) and publicly hosted on GitHub Pages at . The docs may also be run locally.
-Documentation search is powered by [Algolia's DocSearch](https://community.algolia.com/docsearch/). Working on our search? Be sure to set `debug: true` in `site/static/docs/4.3/assets/js/src/search.js` file.
+Documentation search is powered by [Algolia's DocSearch](https://community.algolia.com/docsearch/). Working on our search? Be sure to set `debug: true` in `site/assets/js/src/search.js` file.
### Running documentation locally
diff --git a/config.yml b/config.yml
index aca4615c6..806aca4e4 100644
--- a/config.yml
+++ b/config.yml
@@ -23,6 +23,8 @@ module:
mounts:
- source: dist
target: static/docs/4.3/dist
+ - source: site/assets
+ target: assets
- source: site/content
target: content
- source: site/data
diff --git a/package.json b/package.json
index cd92e879b..581970d98 100644
--- a/package.json
+++ b/package.json
@@ -20,45 +20,34 @@
"scripts": {
"start": "npm-run-all --parallel watch docs-serve",
"bundlesize": "bundlesize",
+ "coveralls": "shx cat js/coverage/lcov.info | coveralls",
"css": "npm-run-all css-compile css-prefix css-minify",
- "css-main": "npm-run-all css-lint css-compile-main css-prefix-main css-minify-main",
- "css-docs": "npm-run-all css-compile-docs css-prefix-docs* css-minify-docs",
- "css-compile": "npm-run-all --parallel css-compile-*",
- "css-compile-main": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/ -o dist/css/",
- "css-compile-docs": "cross-env-shell node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 site/static/docs/$npm_package_version_short/assets/scss/docs.scss site/static/docs/$npm_package_version_short/assets/css/docs.min.css",
+ "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/ -o dist/css/",
"css-lint": "npm-run-all --continue-on-error --parallel css-lint-*",
"css-lint-stylelint": "stylelint \"**/*.{css,scss}\" --cache --cache-location .cache/.stylelintcache",
- "css-lint-vars": "fusv scss/ site/static/",
- "css-minify": "npm-run-all --parallel css-minify-*",
- "css-minify-main": "cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap-utilities.min.css dist/css/bootstrap-utilities.css && cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css",
- "css-minify-docs": "cross-env-shell cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output site/static/docs/$npm_package_version_short/assets/css/docs.min.css site/static/docs/$npm_package_version_short/assets/css/docs.min.css",
+ "css-lint-vars": "fusv scss/ site/assets/scss/",
+ "css-minify": "cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap-utilities.min.css dist/css/bootstrap-utilities.css && cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css",
"css-prefix": "npm-run-all --parallel css-prefix-*",
"css-prefix-main": "postcss --config build/postcss.config.js --replace \"dist/css/*.css\" \"!dist/css/*.min.css\"",
- "css-prefix-docs": "cross-env-shell postcss --config build/postcss.config.js --replace \"site/static/docs/$npm_package_version_short/assets/css/*.css\"",
- "css-prefix-docs-examples": "postcss --config build/postcss.config.js --replace \"site/content/**/*.css\"",
+ "css-prefix-examples": "postcss --config build/postcss.config.js --replace \"site/content/**/*.css\"",
"js": "npm-run-all js-compile js-minify",
- "js-main": "npm-run-all js-lint js-compile js-minify-main",
- "js-docs": "npm-run-all js-lint js-minify-docs",
"js-compile": "npm-run-all --parallel js-compile-*",
"js-compile-standalone": "rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap",
"js-compile-standalone-esm": "rollup --environment ESM:true,BUNDLE:false --config build/rollup.config.js --sourcemap",
"js-compile-bundle": "rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap",
"js-compile-plugins": "node build/build-plugins.js",
"js-lint": "eslint --cache --cache-location .cache/.eslintcache --report-unused-disable-directives .",
- "js-minify": "npm-run-all --parallel js-minify-main js-minify-docs",
- "js-minify-main": "npm-run-all js-minify-standalone* js-minify-bundle",
+ "js-minify": "npm-run-all --parallel js-minify-*",
"js-minify-standalone": "terser --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-standalone-esm": "terser --compress --mangle --comments \"/^!/\" --source-map \"content=dist/js/bootstrap.esm.js.map,includeSources,url=bootstrap.esm.min.js.map\" --output dist/js/bootstrap.esm.min.js dist/js/bootstrap.esm.js",
"js-minify-bundle": "terser --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": "cross-env-shell terser --mangle --comments \\\"/^!/\\\" --output site/static/docs/$npm_package_version_short/assets/js/docs.min.js site/static/docs/$npm_package_version_short/assets/js/vendor/anchor.min.js site/static/docs/$npm_package_version_short/assets/js/vendor/clipboard.min.js site/static/docs/$npm_package_version_short/assets/js/vendor/bs-custom-file-input.min.js \"site/static/docs/$npm_package_version_short/assets/js/src/*.js\"",
"js-test": "npm-run-all --parallel js-test-karma js-test-integration",
"js-debug": "cross-env DEBUG=true karma start js/tests/karma.conf.js",
"js-test-karma": "karma start js/tests/karma.conf.js",
"js-test-integration": "rollup --config js/tests/integration/rollup.bundle.js",
"js-test-cloud": "cross-env BROWSER=true npm run js-test-karma",
"lint": "npm-run-all --parallel js-lint css-lint",
- "coveralls": "shx cat js/coverage/lcov.info | coveralls",
- "docs": "npm-run-all css-docs js-docs docs-build docs-lint",
+ "docs": "npm-run-all docs-build docs-lint",
"docs-build": "hugo --cleanDestinationDir",
"docs-compile": "npm run docs-build",
"docs-production": "cross-env HUGO_ENV=production npm run docs-build",
@@ -67,7 +56,7 @@
"docs-lint": "npm-run-all --parallel docs-vnu docs-linkinator",
"docs-serve": "hugo server --port 9001 --disableFastRender",
"docs-serve-only": "serve _gh_pages --listen 9001",
- "update-deps": "ncu -a -x karma-browserstack-launcher && npm update && cross-env-shell echo Manually update \\\"site/static/docs/$npm_package_version_short/assets/js/vendor/\\\"",
+ "update-deps": "ncu -a -x karma-browserstack-launcher && npm update && cross-env echo Manually update site/assets/js/vendor",
"release": "npm-run-all dist release-sri release-zip docs-production",
"release-sri": "node build/generate-sri.js",
"release-version": "node build/change-version.js",
@@ -76,10 +65,10 @@
"test": "npm-run-all lint dist js-test docs-build docs-lint",
"netlify": "npm-run-all dist release-sri docs-production",
"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/static/**/assets/scss/\" --ext scss --exec \"npm run css-docs\"",
- "watch-js-main": "nodemon --watch js/src/ --ext js --exec \"npm run js-compile\"",
- "watch-js-docs": "nodemon --watch \"site/static/**/assets/js/src/\" --ext js --exec \"npm run js-docs\""
+ "watch-css-main": "nodemon --watch scss/ --ext scss --exec \"npm-run-all css-lint css-compile css-prefix\"",
+ "watch-css-docs": "nodemon --watch site/assets/scss/ --ext scss --exec \"npm run css-lint\"",
+ "watch-js-main": "nodemon --watch js/src/ --ext js --exec \"npm-run-all js-lint js-compile\"",
+ "watch-js-docs": "nodemon --watch site/assets/js/src/ --ext js --exec \"npm run js-lint\""
},
"style": "dist/css/bootstrap.css",
"sass": "scss/bootstrap.scss",
@@ -155,6 +144,9 @@
"!js/src/**/*.spec.js",
"scss/**/*.scss"
],
+ "hugo-bin": {
+ "buildTags": "extended"
+ },
"jspm": {
"registry": "npm",
"main": "js/bootstrap",
diff --git a/site/static/docs/4.3/assets/js/src/application.js b/site/assets/js/src/application.js
similarity index 100%
rename from site/static/docs/4.3/assets/js/src/application.js
rename to site/assets/js/src/application.js
diff --git a/site/static/docs/4.3/assets/js/src/search.js b/site/assets/js/src/search.js
similarity index 100%
rename from site/static/docs/4.3/assets/js/src/search.js
rename to site/assets/js/src/search.js
diff --git a/site/static/docs/4.3/assets/js/vendor/anchor.min.js b/site/assets/js/vendor/anchor.min.js
similarity index 100%
rename from site/static/docs/4.3/assets/js/vendor/anchor.min.js
rename to site/assets/js/vendor/anchor.min.js
diff --git a/site/static/docs/4.3/assets/js/vendor/bs-custom-file-input.min.js b/site/assets/js/vendor/bs-custom-file-input.min.js
similarity index 100%
rename from site/static/docs/4.3/assets/js/vendor/bs-custom-file-input.min.js
rename to site/assets/js/vendor/bs-custom-file-input.min.js
diff --git a/site/static/docs/4.3/assets/js/vendor/clipboard.min.js b/site/assets/js/vendor/clipboard.min.js
similarity index 100%
rename from site/static/docs/4.3/assets/js/vendor/clipboard.min.js
rename to site/assets/js/vendor/clipboard.min.js
diff --git a/site/static/docs/4.3/assets/scss/_ads.scss b/site/assets/scss/_ads.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_ads.scss
rename to site/assets/scss/_ads.scss
diff --git a/site/static/docs/4.3/assets/scss/_algolia.scss b/site/assets/scss/_algolia.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_algolia.scss
rename to site/assets/scss/_algolia.scss
diff --git a/site/static/docs/4.3/assets/scss/_anchor.scss b/site/assets/scss/_anchor.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_anchor.scss
rename to site/assets/scss/_anchor.scss
diff --git a/site/static/docs/4.3/assets/scss/_brand.scss b/site/assets/scss/_brand.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_brand.scss
rename to site/assets/scss/_brand.scss
diff --git a/site/static/docs/4.3/assets/scss/_buttons.scss b/site/assets/scss/_buttons.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_buttons.scss
rename to site/assets/scss/_buttons.scss
diff --git a/site/static/docs/4.3/assets/scss/_callouts.scss b/site/assets/scss/_callouts.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_callouts.scss
rename to site/assets/scss/_callouts.scss
diff --git a/site/static/docs/4.3/assets/scss/_clipboard-js.scss b/site/assets/scss/_clipboard-js.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_clipboard-js.scss
rename to site/assets/scss/_clipboard-js.scss
diff --git a/site/static/docs/4.3/assets/scss/_colors.scss b/site/assets/scss/_colors.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_colors.scss
rename to site/assets/scss/_colors.scss
diff --git a/site/static/docs/4.3/assets/scss/_component-examples.scss b/site/assets/scss/_component-examples.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_component-examples.scss
rename to site/assets/scss/_component-examples.scss
diff --git a/site/static/docs/4.3/assets/scss/_content.scss b/site/assets/scss/_content.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_content.scss
rename to site/assets/scss/_content.scss
diff --git a/site/static/docs/4.3/assets/scss/_footer.scss b/site/assets/scss/_footer.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_footer.scss
rename to site/assets/scss/_footer.scss
diff --git a/site/static/docs/4.3/assets/scss/_masthead.scss b/site/assets/scss/_masthead.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_masthead.scss
rename to site/assets/scss/_masthead.scss
diff --git a/site/static/docs/4.3/assets/scss/_navbar.scss b/site/assets/scss/_navbar.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_navbar.scss
rename to site/assets/scss/_navbar.scss
diff --git a/site/static/docs/4.3/assets/scss/_placeholder-img.scss b/site/assets/scss/_placeholder-img.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_placeholder-img.scss
rename to site/assets/scss/_placeholder-img.scss
diff --git a/site/static/docs/4.3/assets/scss/_sidebar.scss b/site/assets/scss/_sidebar.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_sidebar.scss
rename to site/assets/scss/_sidebar.scss
diff --git a/site/static/docs/4.3/assets/scss/_skippy.scss b/site/assets/scss/_skippy.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_skippy.scss
rename to site/assets/scss/_skippy.scss
diff --git a/site/static/docs/4.3/assets/scss/_subnav.scss b/site/assets/scss/_subnav.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_subnav.scss
rename to site/assets/scss/_subnav.scss
diff --git a/site/static/docs/4.3/assets/scss/_syntax.scss b/site/assets/scss/_syntax.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_syntax.scss
rename to site/assets/scss/_syntax.scss
diff --git a/site/static/docs/4.3/assets/scss/_toc.scss b/site/assets/scss/_toc.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_toc.scss
rename to site/assets/scss/_toc.scss
diff --git a/site/static/docs/4.3/assets/scss/_variables.scss b/site/assets/scss/_variables.scss
similarity index 100%
rename from site/static/docs/4.3/assets/scss/_variables.scss
rename to site/assets/scss/_variables.scss
diff --git a/site/static/docs/4.3/assets/scss/docs.scss b/site/assets/scss/docs.scss
similarity index 92%
rename from site/static/docs/4.3/assets/scss/docs.scss
rename to site/assets/scss/docs.scss
index 38016fad1..8cf0e198f 100644
--- a/site/static/docs/4.3/assets/scss/docs.scss
+++ b/site/assets/scss/docs.scss
@@ -24,9 +24,9 @@
// Happy Bootstrapping!
// Load Bootstrap variables and mixins
-@import "../../../../../../scss/functions";
-@import "../../../../../../scss/variables";
-@import "../../../../../../scss/mixins";
+@import "../../../scss/functions";
+@import "../../../scss/variables";
+@import "../../../scss/mixins";
// Load docs components
@import "variables";
diff --git a/site/content/docs/4.3/getting-started/build-tools.md b/site/content/docs/4.3/getting-started/build-tools.md
index 60b99959c..9e7176acf 100644
--- a/site/content/docs/4.3/getting-started/build-tools.md
+++ b/site/content/docs/4.3/getting-started/build-tools.md
@@ -55,10 +55,10 @@ Our [package.json]({{< param repo >}}/blob/v{{< param current_version >}}/packag
- npm run docs
+ npm run docs-serve
- Builds and lints CSS and JavaScript for docs. You can then run the documentation locally via npm run docs-serve.
+ Builds and runs the documentation locally.