Merge branch 'master' into master-mc-remove-text-justify

.github/workflows/test.yml

@@ -15,9 +15,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v1
-        with:
-          fetch-depth: 3
+        uses: actions/checkout@v2
 
       - name: Set Node.js version
         uses: actions/setup-node@v1
@@ -28,6 +26,15 @@ jobs:
       - run: npm --version
       - run: java -version
 
+      - name: Set up npm cache
+        uses: actions/cache@v1
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}-${{ hashFiles('.github/workflows/test.yml') }}
+          restore-keys: |
+            ${{ runner.OS }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}-${{ hashFiles('.github/workflows/test.yml') }}
+            ${{ runner.OS }}-node-v${{ matrix.node }}-
+
       - name: Install npm dependencies
         run: npm ci
 

README.md

@@ -192,7 +192,7 @@ Thanks to [BrowserStack](https://www.browserstack.com/) for providing the infras
 
 Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/bootstrap#backer)]
 
-[![Bakers](https://opencollective.com/bootstrap/backers.svg?width=890)](https://opencollective.com/bootstrap#backers)
+[![Backers](https://opencollective.com/bootstrap/backers.svg?width=890)](https://opencollective.com/bootstrap#backers)
 
 
 ## Sponsors

build/rollup.config.js

@@ -2,7 +2,7 @@
 
 const path = require('path')
 const babel = require('rollup-plugin-babel')
-const resolve = require('rollup-plugin-node-resolve')
+const resolve = require('@rollup/plugin-node-resolve')
 const banner = require('./banner.js')
 
 const BUNDLE = process.env.BUNDLE === 'true'

config.yml

@@ -3,9 +3,12 @@ title:                  "Bootstrap"
 baseURL:                "https://getbootstrap.com"
 enableInlineShortcodes: true
 
-pygmentsUseClasses:     true
-# you can use ```lang if you want too
-pygmentsCodeFences:     true
+markup:
+  goldmark:
+    renderer:
+      unsafe:           true
+  highlight:
+    noClasses:          false
 
 buildDrafts:            true
 buildFuture:            true

js/tests/integration/rollup.bundle-modularity.js

@@ -1,6 +1,6 @@
 /* eslint-env node */
 
-const commonjs = require('rollup-plugin-commonjs')
+const commonjs = require('@rollup/plugin-commonjs')
 const configRollup = require('./rollup.bundle')
 
 const config = {

js/tests/integration/rollup.bundle.js

@@ -1,6 +1,6 @@
 /* eslint-env node */
 
-const resolve = require('rollup-plugin-node-resolve')
+const resolve = require('@rollup/plugin-node-resolve')
 const babel = require('rollup-plugin-babel')
 
 module.exports = {

js/tests/karma.conf.js

@@ -3,7 +3,7 @@ const path = require('path')
 const ip = require('ip')
 const babel = require('rollup-plugin-babel')
 const istanbul = require('rollup-plugin-istanbul')
-const resolve = require('rollup-plugin-node-resolve')
+const resolve = require('@rollup/plugin-node-resolve')
 
 const {
   browsers,