Merge branch 'main' into global-focus-vars

.bundlewatch.config.json

@@ -22,15 +22,15 @@
     },
     {
       "path": "./dist/css/bootstrap-utilities.min.css",
-      "maxSize": "6.85 kB"
+      "maxSize": "7 kB"
     },
     {
       "path": "./dist/css/bootstrap.css",
-      "maxSize": "25.5 kB"
+      "maxSize": "26 kB"
     },
     {
       "path": "./dist/css/bootstrap.min.css",
-      "maxSize": "23.25 kB"
+      "maxSize": "23.8 kB"
     },
     {
       "path": "./dist/js/bootstrap.bundle.js",

.cspell.json

@@ -11,6 +11,7 @@
     "Blockquotes",
     "Bootstrappers",
     "borderless",
+    "Brotli",
     "browserslist",
     "browserslistrc",
     "btncheck",
@@ -19,11 +20,11 @@
     "callouts",
     "clearfix",
     "Codesniffer",
-    "colorspace",
     "combinator",
     "Contentful",
     "Cpath",
     "Crossfade",
+    "crossfading",
     "cssgrid",
     "Csvg",
     "Datalists",
@@ -42,9 +43,7 @@
     "fieldsets",
     "flexbox",
     "fullscreen",
-    "fusv",
     "getbootstrap",
-    "globby",
     "Grayscale",
     "Hoverable",
     "hreflang",
@@ -69,6 +68,7 @@
     "Noto",
     "offcanvas",
     "offcanvases",
+    "Packagist",
     "popperjs",
     "prebuild",
     "precompiled",
@@ -85,20 +85,17 @@
     "scrollbars",
     "scrollspy",
     "Segoe",
-    "sirv",
     "srcset",
     "stickied",
     "Stylelint",
     "subnav",
-    "svgo",
     "tabbable",
     "textareas",
     "toggleable",
     "topbar",
     "touchend",
     "twbs",
     "unitless",
-    "Unported",
     "unstylable",
     "unstyled",
     "Uppercased",
@@ -108,15 +105,18 @@
     "vstack",
     "walkthroughs",
     "WCAG",
-    "webfont",
-    "Woohoo",
-    "zindex",
-    "بالعالم",
-    "مرحبًا"
+    "zindex"
+  ],
+  "language": "en-US",
+  "files": [
+    "**/*.md"
   ],
-  "language": "en,en-US",
   "ignorePaths": [
     ".cspell.json",
-    ".min."
-  ]
+    "dist/",
+    "*.min.*",
+    "**/*rtl*",
+    "**/tests/**"
+  ],
+  "useGitignore": true
 }

.github/workflows/browserstack.yml

@@ -2,6 +2,7 @@ name: BrowserStack
 
 on:
   push:
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2

.github/workflows/bundlewatch.yml

@@ -5,6 +5,7 @@ on:
     branches-ignore:
       - "dependabot/**"
   pull_request:
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2

.github/workflows/codeql.yml

@@ -14,6 +14,7 @@ on:
       - "!dependabot/**"
   schedule:
     - cron: "0 2 * * 5"
+  workflow_dispatch:
 
 jobs:
   analyze:

.github/workflows/cspell.yml

@@ -0,0 +1,28 @@
+name: cspell
+
+on:
+  push:
+    branches-ignore:
+      - "dependabot/**"
+  pull_request:
+  workflow_dispatch:
+
+env:
+  FORCE_COLOR: 2
+  NODE: 16
+
+jobs:
+  cspell:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v2
+
+      - name: Run cspell
+        uses: streetsidesoftware/cspell-action@v1
+        with:
+          config: ".cspell.json"
+          files: "**/*.md"
+          inline: error
+          incremental_files_only: false

.github/workflows/css.yml

@@ -5,6 +5,7 @@ on:
     branches-ignore:
       - "dependabot/**"
   pull_request:
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2

.github/workflows/docs.yml

@@ -5,6 +5,7 @@ on:
     branches-ignore:
       - "dependabot/**"
   pull_request:
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2
@@ -29,5 +30,16 @@ jobs:
       - name: Install npm dependencies
         run: npm ci
 
-      - name: Test docs
-        run: npm run docs
+      - name: Build docs
+        run: npm run docs-build
+
+      - name: Validate HTML
+        run: npm run docs-vnu
+
+      - name: Run linkinator
+        uses: JustinBeckwith/linkinator-action@v1
+        with:
+          paths: _site
+          recurse: true
+          verbosity: error
+          skip: "^(?!http://localhost)"

.github/workflows/js.yml

@@ -5,28 +5,25 @@ on:
     branches-ignore:
       - "dependabot/**"
   pull_request:
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2
+  NODE: 16
 
 jobs:
   run:
-    name: Node ${{ matrix.node }}
+    name: JS Tests
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        node: [12, 14, 16]
-
     steps:
       - name: Clone repository
         uses: actions/checkout@v2
 
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node }}
+          node-version: ${{ env.NODE }}
           cache: npm
 
       - name: Install npm dependencies
@@ -40,7 +37,6 @@ jobs:
 
       - name: Run Coveralls
         uses: coverallsapp/github-action@1.1.3
-        if: matrix.node == 16
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           path-to-lcov: "./js/coverage/lcov.info"

.github/workflows/lint.yml

@@ -5,6 +5,7 @@ on:
     branches-ignore:
       - "dependabot/**"
   pull_request:
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2

.github/workflows/node-sass.yml

@@ -5,6 +5,7 @@ on:
     branches-ignore:
       - "dependabot/**"
   pull_request:
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2

.github/workflows/release-notes.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   update_release_draft:

.stylelintrc

@@ -1,6 +1,6 @@
 {
   "extends": [
-    "stylelint-config-twbs-bootstrap/scss"
+    "stylelint-config-twbs-bootstrap"
   ],
   "rules": {
     "declaration-property-value-disallowed-list": {

LICENSE

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2021 Twitter, Inc.
-Copyright (c) 2011-2021 The Bootstrap Authors
+Copyright (c) 2011-2022 Twitter, Inc.
+Copyright (c) 2011-2022 The Bootstrap Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -77,7 +77,9 @@ Read the [Getting started page](https://getbootstrap.com/docs/5.1/getting-starte
 
 ## What's included
 
-Within the download you'll find the following directories and files, logically grouping common assets and providing both compiled and minified variations. You'll see something like this:
+Within the download you'll find the following directories and files, logically grouping common assets and providing both compiled and minified variations.
+
+<details><summary>Download contents</summary>
 
 ```text
 bootstrap/
@@ -128,6 +130,7 @@ bootstrap/
     ├── bootstrap.min.js
     └── bootstrap.min.js.map
 ```
+</details>
 
 We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). [Source maps](https://developers.google.com/web/tools/chrome-devtools/javascript/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Bundled JS files (`bootstrap.bundle.js` and minified `bootstrap.bundle.min.js`) include [Popper](https://popper.js.org/).
 
@@ -184,7 +187,7 @@ Get updates on Bootstrap's development and chat with the project maintainers and
 
 For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under [the Semantic Versioning guidelines](https://semver.org/). Sometimes we screw up, but we adhere to those rules whenever possible.
 
-See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap. Release announcement posts on [the official Bootstrap blog](https://blog.getbootstrap.com/) contain summaries of the most noteworthy changes made in each release.
+See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap. Release announcement posts on [the official Bootstrap blog](https://blog.getbootstrap.com/) contain summaries of the most noteworthy changes made in each release. [Release planning](https://github.com/twbs/release#upcoming-release-schedule) takes place in a separate project.
 
 
 ## Creators
@@ -203,11 +206,17 @@ See [the Releases section of our GitHub project](https://github.com/twbs/bootstr
 ## Thanks
 
 <a href="https://www.browserstack.com/">
-  <img src="https://live.browserstack.com/images/opensource/browserstack-logo.svg" alt="BrowserStack Logo" width="192" height="42">
+  <img src="https://live.browserstack.com/images/opensource/browserstack-logo.svg" alt="BrowserStack" width="192" height="42">
 </a>
 
 Thanks to [BrowserStack](https://www.browserstack.com/) for providing the infrastructure that allows us to test in real browsers!
 
+<a href="https://www.netlify.com/">
+  <img src="https://www.netlify.com/v3/img/components/full-logo-light.svg" alt="Netlify" width="147" height="40">
+</a>
+
+Thanks to [Netlify](https://www.netlify.com/) for providing us with Deploy Previews!
+
 
 ## Sponsors
 
@@ -234,4 +243,4 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
 
 ## Copyright and license
 
-Code and documentation copyright 2011–2021 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
+Code and documentation copyright 2011–2022 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

build/build-plugins.js

@@ -2,21 +2,21 @@
 
 /*!
  * Script to build our plugins to use them separately.
- * Copyright 2020-2021 The Bootstrap Authors
- * Copyright 2020-2021 Twitter, Inc.
+ * Copyright 2020-2022 The Bootstrap Authors
+ * Copyright 2020-2022 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 
 'use strict'
 
 const path = require('path')
 const rollup = require('rollup')
-const glob = require('glob')
+const globby = require('globby')
 const { babel } = require('@rollup/plugin-babel')
 const banner = require('./banner.js')
 
-const srcPath = path.resolve(__dirname, '../js/src/')
-const jsFiles = glob.sync(srcPath + '/**/*.js')
+const sourcePath = path.resolve(__dirname, '../js/src/').replace(/\\/g, '/')
+const jsFiles = globby.sync(sourcePath + '/**/*.js')
 
 // Array which holds the resolved plugins
 const resolvedPlugins = []
@@ -31,7 +31,7 @@ for (const file of jsFiles) {
     dist: file.replace('src', 'dist'),
     fileName: path.basename(file),
     className: filenameToEntity(path.basename(file))
-    // safeClassName: filenameToEntity(path.relative(srcPath, file))
+    // safeClassName: filenameToEntity(path.relative(sourcePath, file))
   })
 }
 

build/change-version.js

@@ -2,8 +2,8 @@
 
 /*!
  * Script to update version number references in the project.
- * Copyright 2017-2021 The Bootstrap Authors
- * Copyright 2017-2021 Twitter, Inc.
+ * Copyright 2017-2022 The Bootstrap Authors
+ * Copyright 2017-2022 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */