3 files changed, 62 insertions, 65 deletions

diff --git a/vendor/twbs/bootstrap/build/build-plugins.js b/vendor/twbs/bootstrap/build/build-plugins.js
index 53093dc41..2e16e4f03 100644
--- a/vendor/twbs/bootstrap/build/build-plugins.js
+++ b/vendor/twbs/bootstrap/build/build-plugins.js
@@ -59,76 +59,67 @@ const defaultPluginConfig = {
 }
 
 const getConfigByPluginKey = pluginKey => {
-  if (
-    pluginKey === 'Data' ||
-    pluginKey === 'Manipulator' ||
-    pluginKey === 'EventHandler' ||
-    pluginKey === 'SelectorEngine' ||
-    pluginKey === 'Util' ||
-    pluginKey === 'Sanitizer' ||
-    pluginKey === 'Backdrop'
-  ) {
-    return {
-      external: []
+  switch (pluginKey) {
+    case 'Alert':
+    case 'Offcanvas':
+    case 'Tab':
+      return defaultPluginConfig
+
+    case 'Base':
+    case 'Button':
+    case 'Carousel':
+    case 'Collapse':
+    case 'Modal':
+    case 'ScrollSpy': {
+      const config = Object.assign(defaultPluginConfig)
+      config.external.push(bsPlugins.Manipulator)
+      config.globals[bsPlugins.Manipulator] = 'Manipulator'
+      return config
     }
-  }
-
-  if (pluginKey === 'Alert' || pluginKey === 'Tab' || pluginKey === 'Offcanvas') {
-    return defaultPluginConfig
-  }
 
-  if (
-    pluginKey === 'Base' ||
-    pluginKey === 'Button' ||
-    pluginKey === 'Carousel' ||
-    pluginKey === 'Collapse' ||
-    pluginKey === 'Modal' ||
-    pluginKey === 'ScrollSpy'
-  ) {
-    const config = Object.assign(defaultPluginConfig)
-    config.external.push(bsPlugins.Manipulator)
-    config.globals[bsPlugins.Manipulator] = 'Manipulator'
-    return config
-  }
+    case 'Dropdown':
+    case 'Tooltip': {
+      const config = Object.assign(defaultPluginConfig)
+      config.external.push(bsPlugins.Manipulator, '@popperjs/core')
+      config.globals[bsPlugins.Manipulator] = 'Manipulator'
+      config.globals['@popperjs/core'] = 'Popper'
+      return config
+    }
 
-  if (pluginKey === 'Dropdown' || pluginKey === 'Tooltip') {
-    const config = Object.assign(defaultPluginConfig)
-    config.external.push(bsPlugins.Manipulator, '@popperjs/core')
-    config.globals[bsPlugins.Manipulator] = 'Manipulator'
-    config.globals['@popperjs/core'] = 'Popper'
-    return config
-  }
+    case 'Popover':
+      return {
+        external: [
+          bsPlugins.Data,
+          bsPlugins.SelectorEngine,
+          bsPlugins.Tooltip
+        ],
+        globals: {
+          [bsPlugins.Data]: 'Data',
+          [bsPlugins.SelectorEngine]: 'SelectorEngine',
+          [bsPlugins.Tooltip]: 'Tooltip'
+        }
+      }
 
-  if (pluginKey === 'Popover') {
-    return {
-      external: [
-        bsPlugins.Data,
-        bsPlugins.SelectorEngine,
-        bsPlugins.Tooltip
-      ],
-      globals: {
-        [bsPlugins.Data]: 'Data',
-        [bsPlugins.SelectorEngine]: 'SelectorEngine',
-        [bsPlugins.Tooltip]: 'Tooltip'
+    case 'Toast':
+      return {
+        external: [
+          bsPlugins.Data,
+          bsPlugins.Base,
+          bsPlugins.EventHandler,
+          bsPlugins.Manipulator
+        ],
+        globals: {
+          [bsPlugins.Data]: 'Data',
+          [bsPlugins.Base]: 'Base',
+          [bsPlugins.EventHandler]: 'EventHandler',
+          [bsPlugins.Manipulator]: 'Manipulator'
+        }
       }
-    }
-  }
 
-  if (pluginKey === 'Toast') {
-    return {
-      external: [
-        bsPlugins.Data,
-        bsPlugins.Base,
-        bsPlugins.EventHandler,
-        bsPlugins.Manipulator
-      ],
-      globals: {
-        [bsPlugins.Data]: 'Data',
-        [bsPlugins.Base]: 'Base',
-        [bsPlugins.EventHandler]: 'EventHandler',
-        [bsPlugins.Manipulator]: 'Manipulator'
+    default:
+      return {
+        external: []
       }
-    }
   }
 }
 
@@ -172,6 +163,7 @@ const build = async plugin => {
     name: plugin,
     sourcemap: true,
     globals,
+    generatedCode: 'es2015',
     file: path.resolve(__dirname, `${pluginPath}/${pluginFilename}`)
   })
 
diff --git a/vendor/twbs/bootstrap/build/rollup.config.js b/vendor/twbs/bootstrap/build/rollup.config.js
index 8cecec9aa..c00438de2 100644
--- a/vendor/twbs/bootstrap/build/rollup.config.js
+++ b/vendor/twbs/bootstrap/build/rollup.config.js
@@ -43,7 +43,8 @@ const rollupConfig = {
     banner,
     file: path.resolve(__dirname, `../dist/js/${fileDest}.js`),
     format: ESM ? 'esm' : 'umd',
-    globals
+    globals,
+    generatedCode: 'es2015'
   },
   external,
   plugins
diff --git a/vendor/twbs/bootstrap/build/vnu-jar.js b/vendor/twbs/bootstrap/build/vnu-jar.js
index 6c3517ca5..2d5cc8b55 100644
--- a/vendor/twbs/bootstrap/build/vnu-jar.js
+++ b/vendor/twbs/bootstrap/build/vnu-jar.js
@@ -26,7 +26,11 @@ execFile('java', ['-version'], (error, stdout, stderr) => {
     // "autocomplete" is included in <button> and checkboxes and radio <input>s due to
     // Firefox's non-standard autocomplete behavior - see https://bugzilla.mozilla.org/show_bug.cgi?id=654072
     'Attribute “autocomplete” is only allowed when the input type is.*',
-    'Attribute “autocomplete” not allowed on element “button” at this point.'
+    'Attribute “autocomplete” not allowed on element “button” at this point.',
+    // Per https://www.w3.org/TR/html-aria/#docconformance having "aria-disabled" on a link is
+    // NOT RECOMMENDED, but it's still valid - we explain in the docs that it's not ideal,
+    // and offer more robust alternatives, but also need to show a less-than-ideal example
+    'An “aria-disabled” attribute whose value is “true” should not be specified on an “a” element that has an “href” attribute.'
   ].join('|')
 
   const args = [