Merge branch 'main' into v5-docs-forms

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 { nodeResolve } = require('@rollup/plugin-node-resolve')
 const banner = require('./banner.js')
 
 const BUNDLE = process.env.BUNDLE === 'true'
@@ -27,7 +27,7 @@ if (BUNDLE) {
   // Remove last entry in external array to bundle Popper
   external.pop()
   delete globals['popper.js']
-  plugins.push(resolve())
+  plugins.push(nodeResolve())
 }
 
 const rollupConfig = {

config.yml

@@ -74,5 +74,5 @@ params:
     js_hash:          "sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/"
     js_bundle:        "https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.bundle.min.js"
     js_bundle_hash:   "sha384-DBjhmceckmzwrnMMrjI7BvG2FmRuxQVaTfFYHgfnrdfqMhxKt445b7j3KBQLolRl"
-    popper:           "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
-    popper_hash:      "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
+    popper:           "https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"
+    popper_hash:      "sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN"

js/tests/integration/rollup.bundle.js

@@ -1,7 +1,7 @@
 /* eslint-env node */
 
-const resolve = require('@rollup/plugin-node-resolve')
 const { babel } = require('@rollup/plugin-babel')
+const { nodeResolve } = require('@rollup/plugin-node-resolve')
 
 module.exports = {
   input: 'js/tests/integration/bundle.js',
@@ -10,7 +10,7 @@ module.exports = {
     format: 'iife'
   },
   plugins: [
-    resolve(),
+    nodeResolve(),
     babel({
       exclude: 'node_modules/**',
       babelHelpers: 'bundled'

js/tests/karma.conf.js

@@ -1,9 +1,10 @@
 /* eslint-env node */
+
 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 { nodeResolve } = require('@rollup/plugin-node-resolve')
 
 const {
   browsers,
@@ -79,7 +80,7 @@ const conf = {
         // Inline the required helpers in each file
         babelHelpers: 'inline'
       }),
-      resolve()
+      nodeResolve()
     ],
     output: {
       format: 'iife',

nuget/bootstrap.nuspec

@@ -17,7 +17,7 @@
     <copyright>Copyright 2017-2020</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
-      <dependency id="popper.js" version="[1.16.0,2)" />
+      <dependency id="popper.js" version="[1.16.1,2)" />
     </dependencies>
     <tags>css mobile-first responsive front-end framework web</tags>
     <contentFiles>

nuget/bootstrap.sass.nuspec

@@ -17,7 +17,7 @@
     <copyright>Copyright 2017-2020</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
-      <dependency id="popper.js" version="[1.16.0,2)" />
+      <dependency id="popper.js" version="[1.16.1,2)" />
     </dependencies>
     <tags>css sass mobile-first responsive front-end framework web</tags>
     <contentFiles>

package.json

@@ -56,7 +56,7 @@
     "docs-serve": "hugo server --port 9001 --disableFastRender",
     "docs-serve-only": "sirv _gh_pages --port 9001",
     "lockfile-lint": "lockfile-lint --allowed-hosts npm --allowed-schemes https: --empty-hostname false --type npm --path package-lock.json",
-    "update-deps": "ncu -u -x karma-browserstack-launcher,popper.js && npm update && echo Manually update site/assets/js/vendor",
+    "update-deps": "ncu -u -x karma-browserstack-launcher && npm update && echo Manually update site/assets/js/vendor",
     "release": "npm-run-all dist release-sri docs-build release-zip*",
     "release-sri": "node build/generate-sri.js",
     "release-version": "node build/change-version.js",
@@ -89,15 +89,15 @@
   },
   "dependencies": {},
   "peerDependencies": {
-    "popper.js": "^1.16.0"
+    "popper.js": "^1.16.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.10.4",
     "@babel/core": "^7.10.4",
     "@babel/preset-env": "^7.10.4",
     "@rollup/plugin-babel": "^5.0.4",
     "@rollup/plugin-commonjs": "^13.0.0",
-    "@rollup/plugin-node-resolve": "^7.1.3",
+    "@rollup/plugin-node-resolve": "^8.1.0",
     "autoprefixer": "^9.8.4",
     "bundlewatch": "^0.2.7",
     "clean-css-cli": "^4.3.0",
@@ -126,9 +126,9 @@
     "node-sass": "^4.14.1",
     "nodemon": "^2.0.4",
     "npm-run-all": "^4.1.5",
-    "popper.js": "^1.16.0",
+    "popper.js": "^1.16.1",
     "postcss-cli": "^7.1.1",
-    "rollup": "^2.19.0",
+    "rollup": "^2.20.0",
     "rollup-plugin-istanbul": "^2.0.1",
     "shelljs": "^0.8.4",
     "sirv-cli": "^1.0.3",
@@ -160,7 +160,7 @@
     },
     "dependencies": {},
     "peerDependencies": {
-      "popper.js": "^1.16.0"
+      "popper.js": "^1.16.1"
     }
   }
 }

site/data/colors.yml

@@ -1,11 +1,11 @@
 - name: blue
-  hex: "#007bff"
+  hex: "#0d6efd"
 - name: indigo
   hex: "#6610f2"
 - name: purple
   hex: "#6f42c1"
 - name: pink
-  hex: "#e83e8c"
+  hex: "#d63384"
 - name: red
   hex: "#dc3545"
 - name: orange
@@ -21,6 +21,6 @@
 - name: white
   hex: "#fff"
 - name: gray
-  hex: "#868e96"
+  hex: "#6c757d"
 - name: gray-dark
   hex: "#343a40"

site/data/theme-colors.yml

@@ -1,7 +1,7 @@
 - name: primary
-  hex: "#007bff"
+  hex: "#0d6efd"
 - name: secondary
-  hex: "#868e96"
+  hex: "#6c757d"
 - name: success
   hex: "#28a745"
 - name: danger