diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99815575263..f5315c30845 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@
> [standard-version](https://github.com/conventional-changelog/standard-version) for commit
> guidelines.
+
+
+## [v2.2.2](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.2.1...v2.2.2)
+
+Released: 2020-01-15
+
+### Bug Fixes v2.2.2
+
+- **nuxt module:** remove unnecessary export statements
+ ([#4624](https://github.com/bootstrap-vue/bootstrap-vue/issues/4624))
+ ([27f066c](https://github.com/bootstrap-vue/bootstrap-vue/commit/27f066cfa07ee311fe1e312d9a9ebd0eb76750c7))
+
+### Other v2.2.2
+
+- dev dependencies updates
+- minor docs updates
+
## [v2.2.1](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.2.0...v2.2.1)
diff --git a/docs/markdown/reference/color-variants/README.md b/docs/markdown/reference/color-variants/README.md
index 4dba055c1be..e4c35901708 100644
--- a/docs/markdown/reference/color-variants/README.md
+++ b/docs/markdown/reference/color-variants/README.md
@@ -10,7 +10,7 @@
- `secondary` - Secondary
- `success` - Success
- `warning` - Warning
-- `danger` - danger
+- `danger` - Danger
- `info` - Info
- `light` - Light
- `dark` - Dark
diff --git a/nuxt/index.js b/nuxt/index.js
index 8c8c0e2e797..875dd02cf3a 100644
--- 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/package.json b/package.json
index 18f4f73d4be..28e205aaefd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "bootstrap-vue",
- "version": "2.2.1",
+ "version": "2.2.2",
"description": "BootstrapVue, with over 40 plugins and more than 80 custom components, custom directives, and over 300 icons, provides one of the most comprehensive implementations of Bootstrap v4 components and grid system for Vue.js. With extensive and automated WAI-ARIA accessibility markup.",
"main": "dist/bootstrap-vue.common.js",
"web": "dist/bootstrap-vue.js",
@@ -105,7 +105,7 @@
"@nuxtjs/google-analytics": "^2.2.3",
"@nuxtjs/pwa": "^3.0.0-beta.19",
"@vue/test-utils": "1.0.0-beta.29",
- "autoprefixer": "^9.7.3",
+ "autoprefixer": "^9.7.4",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
@@ -133,7 +133,7 @@
"gh-pages": "^2.2.0",
"highlight.js": "^9.17.1",
"html-loader": "^0.5.5",
- "husky": "^4.0.7",
+ "husky": "^4.0.10",
"jest": "^24.9.0",
"jest-environment-jsdom-fourteen": "^1.0.1",
"lint-staged": "^9.5.0",
@@ -154,7 +154,7 @@
"terser": "^4.6.3",
"vue": "^2.6.11",
"vue-jest": "^3.0.5",
- "vue-router": "^3.1.3",
+ "vue-router": "^3.1.5",
"vue-server-renderer": "^2.6.11",
"vue-template-compiler": "^2.6.11"
},
@@ -217,6 +217,8 @@
"Popper",
"CSS",
"SCSS",
+ "Icons",
+ "Bootstrap Icons",
"Flexbox",
"Alert",
"Breadcrumb",
@@ -247,12 +249,13 @@
"Tab",
"Table",
"Tag",
+ "Tags",
"Toast",
"Tooltip",
"vue-bootstrap",
"vue-strap",
- "vuetify",
- "vuestrap"
+ "vuestrap",
+ "uiv"
],
"collective": {
"type": "opencollective",
diff --git a/src/components/form-tags/README.md b/src/components/form-tags/README.md
index 9b4ba743c2a..3f6e753552d 100644
--- 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`.
diff --git a/yarn.lock b/yarn.lock
index befff1a4481..f7bb532f31c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2786,17 +2786,17 @@ autoprefixer@^9.6.1:
postcss "^7.0.23"
postcss-value-parser "^4.0.2"
-autoprefixer@^9.7.3:
- version "9.7.3"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.3.tgz#fd42ed03f53de9beb4ca0d61fb4f7268a9bb50b4"
- integrity sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q==
+autoprefixer@^9.7.4:
+ version "9.7.4"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378"
+ integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==
dependencies:
- browserslist "^4.8.0"
- caniuse-lite "^1.0.30001012"
+ browserslist "^4.8.3"
+ caniuse-lite "^1.0.30001020"
chalk "^2.4.2"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
- postcss "^7.0.23"
+ postcss "^7.0.26"
postcss-value-parser "^4.0.2"
aws-sign2@~0.7.0:
@@ -3557,7 +3557,7 @@ caniuse-lite@^1.0.30001015, caniuse-lite@^1.0.30001016:
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz#16ea48d7d6e8caf3cad3295c2d746fe38c4e7f66"
integrity sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA==
-caniuse-lite@^1.0.30001017:
+caniuse-lite@^1.0.30001017, caniuse-lite@^1.0.30001020:
version "1.0.30001020"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001020.tgz#3f04c1737500ffda78be9beb0b5c1e2070e15926"
integrity sha512-yWIvwA68wRHKanAVS1GjN8vajAv7MBFshullKCeq/eKpK7pJBVDgFFEqvgWTkcP2+wIDeQGYFRXECjKZnLkUjA==
@@ -6897,15 +6897,14 @@ humps@^2.0.1:
resolved "https://registry.yarnpkg.com/humps/-/humps-2.0.1.tgz#dd02ea6081bd0568dc5d073184463957ba9ef9aa"
integrity sha1-3QLqYIG9BWjcXQcxhEY5V7qe+ao=
-husky@^4.0.7:
- version "4.0.7"
- resolved "https://registry.yarnpkg.com/husky/-/husky-4.0.7.tgz#cee4301d1db1d731be9c2aa2ac72b46439d30c91"
- integrity sha512-ULivTOe0k+nNjZKIojoHxXjybtEycaba0EDuk1G8iNGD8wZgo8Sr3YiN8bKitXNpI1RvVKTJwRnh2GLysLbxMQ==
+husky@^4.0.10:
+ version "4.0.10"
+ resolved "https://registry.yarnpkg.com/husky/-/husky-4.0.10.tgz#659b52c404d3163b943a73f6c1d454708c0226d8"
+ integrity sha512-Ptm4k2DqOwxeK/kzu5RaJmNRoGvESrgDXObFcZ8aJZcyXyMBHhM2FqZj6zYKdetadmP3wCwxEHCBuB9xGlRp8A==
dependencies:
chalk "^3.0.0"
ci-info "^2.0.0"
cosmiconfig "^6.0.0"
- get-stdin "^7.0.0"
opencollective-postinstall "^2.0.2"
pkg-dir "^4.2.0"
please-upgrade-node "^3.2.0"
@@ -10706,6 +10705,15 @@ postcss@^7.0.25:
source-map "^0.6.1"
supports-color "^6.1.0"
+postcss@^7.0.26:
+ version "7.0.26"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz#5ed615cfcab35ba9bbb82414a4fa88ea10429587"
+ integrity sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==
+ dependencies:
+ chalk "^2.4.2"
+ source-map "^0.6.1"
+ supports-color "^6.1.0"
+
prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -13331,6 +13339,11 @@ vue-router@^3.1.3:
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.3.tgz#e6b14fabc0c0ee9fda0e2cbbda74b350e28e412b"
integrity sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ==
+vue-router@^3.1.5:
+ version "3.1.5"
+ resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.5.tgz#ff29b8a1e1306c526b52d4dc0532109f16c41231"
+ integrity sha512-BszkPvhl7I9h334GjckCh7sVFyjTPMMJFJ4Bsrem/Ik+B/9gt5tgrk8k4gGLO4ZpdvciVdg7O41gW4DisQWurg==
+
vue-server-renderer@^2.6.11:
version "2.6.11"
resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.11.tgz#be8c9abc6aacc309828a755c021a05fc474b4bc3"