Merge branch 'main' into global-focus-varsglobal-focus-vars

11 files changed, 15 insertions, 58 deletions

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 32b30cdb3..be4ad836d 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -20,7 +20,7 @@ restrictions:
 
 * Please **do not** use the issue tracker for personal support requests.  Stack
   Overflow ([`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag),
-  [Slack](https://bootstrap-slack.herokuapp.com/) or [IRC](README.md#community) are better places to get help.
+  [Slack](https://bootstrap-slack.herokuapp.com/) or [IRC](/README.md#community) are better places to get help.
 
 * Please **do not** derail or troll issues. Keep the discussion on topic and
   respect the opinions of others.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 43ea984ba..000000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-open_collective: bootstrap
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
index c30bed3b4..a4739f589 100644
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -7,5 +7,5 @@ See the [contributing guidelines](CONTRIBUTING.md) for sharing bug reports.
 For general troubleshooting or help getting started:
 
 - Join [the official Slack room](https://bootstrap-slack.herokuapp.com/).
-- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
+- Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel.
 - Ask and explore Stack Overflow with the [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index e2b70e03e..5d0f45de8 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -17,7 +17,7 @@ categories:
       - 'fix'
       - 'bugfix'
       - 'bug'
-  - title: '⚡ Performance Improvements'
+  - title: '⚡ Performance improvements'
     labels:
       - 'performance'
   - title: '🎨 CSS'
@@ -29,6 +29,9 @@ categories:
   - title: '📖 Docs'
     labels:
       - 'docs'
+  - title: '🛠 Examples'
+    labels:
+      - 'examples'
   - title: '🌎 Accessibility'
     labels:
       - 'accessibility'
diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml
index bdbc16089..ffa594a77 100644
--- a/.github/workflows/browserstack.yml
+++ b/.github/workflows/browserstack.yml
@@ -21,14 +21,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "${{ env.NODE }}"
-
-      - name: Set up npm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+          cache: npm
 
       - name: Install npm dependencies
         run: npm ci
diff --git a/.github/workflows/bundlewatch.yml b/.github/workflows/bundlewatch.yml
index bebf01351..c212290df 100644
--- a/.github/workflows/bundlewatch.yml
+++ b/.github/workflows/bundlewatch.yml
@@ -2,8 +2,6 @@ name: Bundlewatch
 
 on:
   push:
-    branches-ignore:
-      - "dependabot/**"
   pull_request:
 
 env:
@@ -22,14 +20,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "${{ env.NODE }}"
-
-      - name: Set up npm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+          cache: npm
 
       - name: Install npm dependencies
         run: npm ci
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 469a5a4fc..13e2eb598 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -11,6 +11,7 @@ on:
     branches:
       - main
       - v4-dev
+      - "!dependabot/**"
   schedule:
     - cron: "0 2 * * 5"
 
diff --git a/.github/workflows/css.yml b/.github/workflows/css.yml
index 1f394c65e..48f11d459 100644
--- a/.github/workflows/css.yml
+++ b/.github/workflows/css.yml
@@ -22,14 +22,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "${{ env.NODE }}"
-
-      - name: Set up npm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+          cache: npm
 
       - name: Install npm dependencies
         run: npm ci
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index badaad744..cc5f4bd6d 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -22,17 +22,10 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "${{ env.NODE }}"
+          cache: npm
 
       - run: java -version
 
-      - name: Set up npm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-
       - name: Install npm dependencies
         run: npm ci
 
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index 0a4fe259a..266b1576d 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [10, 12, 14]
+        node: [12, 14, 16]
 
     steps:
       - name: Clone repository
@@ -27,14 +27,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
-
-      - name: Set up npm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+          cache: npm
 
       - name: Install npm dependencies
         run: npm ci
@@ -46,7 +39,7 @@ jobs:
         run: npm run js-test
 
       - name: Run Coveralls
-        uses: coverallsapp/[email protected]
+        uses: coverallsapp/[email protected]
         if: matrix.node == 14
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f4c288ec7..153ad6f22 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -22,14 +22,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "${{ env.NODE }}"
-
-      - name: Set up npm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+          cache: npm
 
       - name: Install npm dependencies
         run: npm ci