Merge branch 'dev' into feat-pagination-btn-classes-and-first-last-numbers

tmorehouse · web-flow · commit 2b35b11e1715 · 2020-01-14T16:51:42.000-04:00
diff --git a/nuxt/index.js b/nuxt/index.js
@@ -11,12 +11,12 @@ const srcIndex = 'bootstrap-vue/src/index.js'
 // --- Utility methods ---
 
 // Converts PascalCase or camelCase to kebab-case
-export const kebabCase = str => {
+const kebabCase = str => {
   return str.replace(RX_HYPHENATE, '-$1').toLowerCase()
 }
 
 // Converts a kebab-case or camelCase string to PascalCase
-export const pascalCase = str => {
+const pascalCase = str => {
   str = kebabCase(str).replace(RX_UN_KEBAB, (_, c) => (c ? c.toUpperCase() : ''))
   return str.charAt(0).toUpperCase() + str.slice(1)
 }
@@ -161,7 +161,8 @@ module.exports = function nuxtBootstrapVue(moduleOptions = {}) {
     if (
       templateOptions.treeShake &&
       templateOptions.icons &&
-      templateOptions.componentPlugins.indexOf('IconsPlugin') === -1
+      templateOptions.componentPlugins.indexOf('IconsPlugin') === -1 &&
+      templateOptions.componentPlugins.indexOf('BootstrapVueIcons') === -1
     ) {
       templateOptions.componentPlugins.push('IconsPlugin')
     }
diff --git a/src/components/form-tags/README.md b/src/components/form-tags/README.md
@@ -3,7 +3,7 @@
 > Lightweight custom tagged input form control, with options for customized interface rendering,
 > duplicate tag detection and optional tag validation.
 
-Tags are arrays of short strings, used in various ways such as assinging categories. Use the default
+Tags are arrays of short strings, used in various ways such as assigning categories. Use the default
 user interface, or create your own custom interface via the use of the default scoped slot.
 
 The tagged input was added in BootstrapVue release `v2.2.0`.
