Skip to content

Commit df58d42

Browse files
authored
Merge branch 'dev' into dev
2 parents f79600a + 8e45ad4 commit df58d42

File tree

161 files changed

+5002
-2873
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+5002
-2873
lines changed

.bundlewatch.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"files": [
33
{
44
"path": "./dist/bootstrap-vue-icons.js",
5-
"maxSize": "110 kB"
5+
"maxSize": "115 kB"
66
},
77
{
88
"path": "./dist/bootstrap-vue-icons.min.js",

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v2
2525

2626
- name: Set Node.js version
27-
uses: actions/setup-node@v1
27+
uses: actions/setup-node@v2.1.2
2828
with:
2929
node-version: ${{ matrix.node }}
3030

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v2
2525

2626
- name: Set Node.js version
27-
uses: actions/setup-node@v1
27+
uses: actions/setup-node@v2.1.2
2828
with:
2929
node-version: ${{ matrix.node }}
3030

@@ -61,7 +61,7 @@ jobs:
6161
uses: actions/checkout@v2
6262

6363
- name: Set Node.js version
64-
uses: actions/setup-node@v1
64+
uses: actions/setup-node@v2.1.2
6565
with:
6666
node-version: ${{ matrix.node }}
6767

@@ -98,7 +98,7 @@ jobs:
9898
uses: actions/checkout@v2
9999

100100
- name: Set Node.js version
101-
uses: actions/setup-node@v1
101+
uses: actions/setup-node@v2.1.2
102102
with:
103103
node-version: ${{ matrix.node }}
104104

CHANGELOG.md

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,72 @@ All notable changes to this project will be documented in this file. See
44
[standard-version](https://github.com/conventional-changelog/standard-version) for commit
55
guidelines.
66

7+
## [v2.18.1](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.18.0...v2.18.1)
8+
9+
Released: 2020-10-21
10+
11+
### Bug Fixes v2.18.1
12+
13+
- **b-form-group:** content element ID handling (closes
14+
[#5930](https://github.com/bootstrap-vue/bootstrap-vue/issues/5930))
15+
([#5933](https://github.com/bootstrap-vue/bootstrap-vue/issues/5933))
16+
([fecd558](https://github.com/bootstrap-vue/bootstrap-vue/commit/fecd55814c4f4553348d8016cdf0d449f22228f7))
17+
- **b-icon:** local component lookup
18+
([#5939](https://github.com/bootstrap-vue/bootstrap-vue/issues/5939))
19+
([4586b49](https://github.com/bootstrap-vue/bootstrap-vue/commit/4586b49d99e4239dbebe2518f57022d6e4e20224))
20+
- **b-link:** `href` handling with live router (closes
21+
[#5927](https://github.com/bootstrap-vue/bootstrap-vue/issues/5927))
22+
([#5934](https://github.com/bootstrap-vue/bootstrap-vue/issues/5934))
23+
([8a367b6](https://github.com/bootstrap-vue/bootstrap-vue/commit/8a367b6296b0aa9700f67633fd60fb351e2f7373))
24+
25+
## [v2.18.0](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.17.3...v2.18.0)
26+
27+
Released: 2020-10-19
28+
29+
### Features v2.18.0
30+
31+
- **b-calendar:** add `no-key-nav` property (closes
32+
[#5861](https://github.com/bootstrap-vue/bootstrap-vue/issues/5861))
33+
([#5883](https://github.com/bootstrap-vue/bootstrap-vue/issues/5883))
34+
([955ad63](https://github.com/bootstrap-vue/bootstrap-vue/commit/955ad631698f82a83de214ce9cd37271367d8c45))
35+
- update `core-js` to v3 ([#5894](https://github.com/bootstrap-vue/bootstrap-vue/issues/5894))
36+
([aeed981](https://github.com/bootstrap-vue/bootstrap-vue/commit/aeed9812afe770b6561c9513709e4be852250022))
37+
38+
### Bug Fixes v2.18.0
39+
40+
- **b-calendar:** month formatting for certain dates
41+
([#5911](https://github.com/bootstrap-vue/bootstrap-vue/issues/5911))
42+
([7de1844](https://github.com/bootstrap-vue/bootstrap-vue/commit/7de1844c6d5c0014d25c930527a7fc49a2b0cc25))
43+
- **b-card:** properly support header/footer with body image overlay
44+
([#5872](https://github.com/bootstrap-vue/bootstrap-vue/issues/5872))
45+
([bd8319d](https://github.com/bootstrap-vue/bootstrap-vue/commit/bd8319da8c6166f9fe3e64d9a3ac5c490c6b2f48))
46+
- **b-carousel:** fix glitching when switching slides fast (closes
47+
[#5810](https://github.com/bootstrap-vue/bootstrap-vue/issues/5810))
48+
([#5845](https://github.com/bootstrap-vue/bootstrap-vue/issues/5845))
49+
([761bc93](https://github.com/bootstrap-vue/bootstrap-vue/commit/761bc9381ba24aed751726c8213651e2014aa746))
50+
- **b-link:** `href` handling inconsistencies to `<router-link>` (closes
51+
[#5820](https://github.com/bootstrap-vue/bootstrap-vue/issues/5820))
52+
([#5876](https://github.com/bootstrap-vue/bootstrap-vue/issues/5876))
53+
([daea0e5](https://github.com/bootstrap-vue/bootstrap-vue/commit/daea0e5c638de9ec45d39af5aa1e9f8a9e455422))
54+
- **b-skeleton:** animation overflow issue for Safari
55+
([#5863](https://github.com/bootstrap-vue/bootstrap-vue/issues/5863))
56+
([bfd4f96](https://github.com/bootstrap-vue/bootstrap-vue/commit/bfd4f960d7056edcd2ccb1ae3930639d543d8b34))
57+
- **v-tooltip, v-popover:** render data-\* attributes on root components (closes
58+
[#5836](https://github.com/bootstrap-vue/bootstrap-vue/issues/5836))
59+
([#5882](https://github.com/bootstrap-vue/bootstrap-vue/issues/5882))
60+
([f6b51e0](https://github.com/bootstrap-vue/bootstrap-vue/commit/f6b51e04f074e45e98650034e88c2b5629ad25f6))
61+
762
<a name="2.17.3"></a>
863

9-
### [v2.17.3](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.17.2...v2.17.3)
64+
## [v2.17.3](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.17.2...v2.17.3)
1065

1166
Released: 2020-09-18
1267

1368
- No changes to v2.17.2.
1469

1570
<a name="2.17.2"></a>
1671

17-
### [v2.17.2](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.17.1...v2.17.2)
72+
## [v2.17.2](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.17.1...v2.17.2)
1873

1974
Released: 2020-09-18
2075

@@ -33,7 +88,7 @@ Released: 2020-09-18
3388

3489
<a name="2.17.1"></a>
3590

36-
### [v2.17.1](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.17.0...v2.17.1)
91+
## [v2.17.1](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.17.0...v2.17.1)
3792

3893
Released: 2020-09-16
3994

docs/markdown/intro/README.md

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ import 'bootstrap-vue/dist/bootstrap-vue.css'
151151

152152
```scss
153153
// custom.scss
154-
@import 'node_modules/bootstrap/scss/bootstrap';
154+
@import 'node_modules/bootstrap/scss/bootstrap.scss';
155155
@import 'node_modules/bootstrap-vue/src/index.scss';
156156
```
157157

@@ -181,7 +181,7 @@ a `scss` file:
181181

182182
```scss
183183
// Parcel example
184-
@import '~bootstrap/scss/bootstrap';
184+
@import '~bootstrap/scss/bootstrap.scss';
185185
@import '~bootstrap-vue/src/index.scss';
186186
```
187187

@@ -214,7 +214,25 @@ BootstrapVue and PortalVue require access to the global `Vue` reference (via
214214
</p>
215215
</div>
216216

217-
**Example: Vue alias in webpack.config.js**
217+
**Example: Vue alias for [Vue CLI](https://cli.vuejs.org/) in `vue.config.js`**
218+
219+
```js
220+
const path = require('path')
221+
222+
module.exports = {
223+
chainWebpack: config => {
224+
config.resolve.alias.set(
225+
'vue$',
226+
// If using the runtime only build
227+
path.resolve(__dirname, 'node_modules/vue/dist/vue.runtime.esm.js')
228+
// Or if using full build of Vue (runtime + compiler)
229+
// path.resolve(__dirname, 'node_modules/vue/dist/vue.esm.js')
230+
)
231+
}
232+
}
233+
```
234+
235+
**Example: Vue alias in `webpack.config.js`**
218236

219237
```js
220238
module.exports = {

docs/markdown/reference/theming/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
> Theming is accomplished by Sass variables, Sass maps, and custom CSS. There's no dedicated theme
44
> stylesheet; instead, you can enable the built-in theme to add gradients, shadows, and more.
55
6-
While BootstrapVue uses Bootstrap's CSS, certain features of BootstrapVue uses custom CSS (i.e.
6+
While BootstrapVue uses Bootstrap's CSS, certain features of BootstrapVue use custom CSS (i.e.
77
stacked tables, etc.). Our custom CSS relies on variables defined the Bootstrap v4.x SCSS. The
88
`bootstrap-vue/dist/bootstrap-vue.css` is compiled using the default Bootstrap v4.x variables. By
99
using the BootstrapVue source SCSS, you can have your variable overrides (such as breakpoints, theme

package.json

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-vue",
3-
"version": "2.17.3",
3+
"version": "2.18.1",
44
"description": "With more than 85 components, over 45 available plugins, several directives, and 1000+ icons, BootstrapVue provides one of the most comprehensive implementations of the Bootstrap v4 component and grid system available for Vue.js v2.6, complete with extensive and automated WAI-ARIA accessibility markup.",
55
"main": "dist/bootstrap-vue.common.js",
66
"web": "dist/bootstrap-vue.js",
@@ -42,14 +42,6 @@
4242
{
4343
"name": "Alex Regan",
4444
"url": "https://github.com/alexsasharegan"
45-
},
46-
{
47-
"name": "SirLamer",
48-
"url": "https://github.com/SirLamer"
49-
},
50-
{
51-
"name": "vizo",
52-
"url": "https://github.com/vizo"
5345
}
5446
],
5547
"files": [
@@ -93,76 +85,76 @@
9385
},
9486
"dependencies": {
9587
"@nuxt/opencollective": "^0.3.2",
96-
"bootstrap": ">=4.5.2 <5.0.0",
88+
"bootstrap": ">=4.5.3 <5.0.0",
9789
"popper.js": "^1.16.1",
9890
"portal-vue": "^2.1.7",
9991
"vue-functional-data-merge": "^3.1.0"
10092
},
10193
"devDependencies": {
102-
"@babel/cli": "^7.11.6",
103-
"@babel/core": "^7.11.6",
104-
"@babel/plugin-transform-modules-commonjs": "^7.10.4",
105-
"@babel/plugin-transform-runtime": "^7.11.5",
106-
"@babel/preset-env": "^7.11.5",
107-
"@babel/standalone": "^7.11.6",
94+
"@babel/cli": "^7.12.1",
95+
"@babel/core": "^7.12.3",
96+
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
97+
"@babel/plugin-transform-runtime": "^7.12.1",
98+
"@babel/preset-env": "^7.12.1",
99+
"@babel/standalone": "^7.12.4",
108100
"@nuxt/content": "^1.10.0",
109101
"@nuxtjs/google-analytics": "^2.4.0",
110102
"@nuxtjs/pwa": "^3.2.2",
111103
"@nuxtjs/robots": "^2.4.2",
112104
"@nuxtjs/sitemap": "^2.4.0",
113-
"@testing-library/jest-dom": "^5.11.4",
105+
"@testing-library/jest-dom": "^5.11.5",
114106
"@vue/test-utils": "^1.1.0",
115107
"autoprefixer": "^10.0.1",
116108
"babel-core": "^7.0.0-bridge.0",
117109
"babel-eslint": "^10.1.0",
118-
"babel-jest": "^26.5.2",
110+
"babel-jest": "^26.6.1",
119111
"babel-plugin-istanbul": "^6.0.0",
120-
"bootstrap-icons": "^1.0.0",
112+
"bootstrap-icons": "^1.1.0",
121113
"bundlewatch": "^0.3.1",
122114
"clean-css-cli": "^4.3.0",
123-
"codemirror": "^5.58.1",
115+
"codemirror": "^5.58.2",
124116
"codesandbox": "^2.2.1",
125117
"core-js": "^3.6.5",
126118
"cross-env": "^7.0.2",
127-
"eslint": "^7.11.0",
128-
"eslint-config-prettier": "^6.12.0",
129-
"eslint-config-standard": "^14.1.1",
119+
"eslint": "^7.12.1",
120+
"eslint-config-prettier": "^6.15.0",
121+
"eslint-config-standard": "^15.0.1",
130122
"eslint-config-vue": "^2.0.2",
131123
"eslint-plugin-import": "^2.22.1",
132124
"eslint-plugin-jest": "^24.1.0",
133125
"eslint-plugin-markdown": "^1.0.2",
134126
"eslint-plugin-node": "^11.1.0",
135127
"eslint-plugin-prettier": "^3.1.4",
136128
"eslint-plugin-promise": "^4.2.1",
137-
"eslint-plugin-standard": "^4.0.1",
138-
"eslint-plugin-vue": "^7.0.1",
129+
"eslint-plugin-standard": "^4.0.2",
130+
"eslint-plugin-vue": "^7.1.0",
139131
"esm": "^3.2.25",
140-
"execa": "^4.0.3",
132+
"execa": "^4.1.0",
141133
"highlight.js": "^9.18.2",
142134
"html-loader": "^1.3.2",
143135
"husky": "^4.3.0",
144136
"improved-yarn-audit": "^2.3.1",
145-
"jest": "^26.5.3",
146-
"lint-staged": "^10.4.0",
137+
"jest": "^26.6.1",
138+
"lint-staged": "^10.5.0",
147139
"loader-utils": "^2.0.0",
148140
"lodash": "^4.17.20",
149-
"marked": "^1.2.0",
141+
"marked": "^1.2.2",
150142
"node-sass": "^4.14.1",
151-
"nuxt": "^2.14.6",
152-
"postcss": "^8.1.1",
143+
"nuxt": "^2.14.7",
144+
"postcss": "^8.1.4",
153145
"postcss-cli": "^8.1.0",
154146
"prettier": "1.14.3",
155147
"require-context": "^1.1.0",
156-
"rollup": "^2.30.0",
148+
"rollup": "^2.32.1",
157149
"rollup-plugin-babel": "^4.4.0",
158150
"rollup-plugin-commonjs": "^10.1.0",
159151
"rollup-plugin-node-resolve": "^5.2.0",
160-
"sass-loader": "^10.0.3",
152+
"sass-loader": "^10.0.4",
161153
"standard-version": "^9.0.0",
162-
"terser": "^5.3.5",
154+
"terser": "^5.3.8",
163155
"vue": "^2.6.12",
164156
"vue-jest": "^3.0.7",
165-
"vue-router": "^3.4.6",
157+
"vue-router": "^3.4.8",
166158
"vue-server-renderer": "^2.6.12",
167159
"vue-template-compiler": "^2.6.12"
168160
},

src/components/alert/alert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import Vue from '../../vue'
12
import { NAME_ALERT } from '../../constants/components'
2-
import Vue from '../../utils/vue'
33
import { getComponentConfig } from '../../utils/config'
44
import { requestAF } from '../../utils/dom'
55
import { isBoolean, isNumeric } from '../../utils/inspect'

src/components/aspect/aspect.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import Vue from '../../vue'
12
import { NAME_ASPECT } from '../../constants/components'
23
import { RX_ASPECT, RX_ASPECT_SEPARATOR } from '../../constants/regex'
3-
import Vue from '../../utils/vue'
44
import { mathAbs } from '../../utils/math'
55
import { toFloat } from '../../utils/number'
66
import normalizeSlotMixin from '../../mixins/normalize-slot'

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy