Skip to content

Commit 21252ca

Browse files
xanfxanf
authored
Merge branch 'dev' into new-b-tabs-slots
2 parents 41a2605 + ccf62a4 commit 21252ca

File tree

97 files changed

+6903
-3510
lines changed

Some content is hidden

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

97 files changed

+6903
-3510
lines changed

‎.bundlewatch.config.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
"files": [
33
{
44
"path": "./dist/bootstrap-vue-icons.js",
5-
"maxSize": "145 kB"
5+
"maxSize": "155 kB"
66
},
77
{
88
"path": "./dist/bootstrap-vue-icons.min.js",
9-
"maxSize": "135 kB"
9+
"maxSize": "145 kB"
1010
},
1111
{
1212
"path": "./dist/bootstrap-vue-icons.common.js",
13-
"maxSize": "145 kB"
13+
"maxSize": "155 kB"
1414
},
1515
{
1616
"path": "./dist/bootstrap-vue-icons.common.min.js",
17-
"maxSize": "135 kB"
17+
"maxSize": "145 kB"
1818
},
1919
{
2020
"path": "./dist/bootstrap-vue-icons.esm.js",
21-
"maxSize": "145 kB"
21+
"maxSize": "155 kB"
2222
},
2323
{
2424
"path": "./dist/bootstrap-vue-icons.esm.min.js",
25-
"maxSize": "135 kB"
25+
"maxSize": "145 kB"
2626
},
2727
{
2828
"path": "./dist/bootstrap-vue-icons.css",
@@ -42,19 +42,19 @@
4242
},
4343
{
4444
"path": "./dist/bootstrap-vue.common.js",
45-
"maxSize": "345 kB"
45+
"maxSize": "360 kB"
4646
},
4747
{
4848
"path": "./dist/bootstrap-vue.common.min.js",
49-
"maxSize": "225 kB"
49+
"maxSize": "240 kB"
5050
},
5151
{
5252
"path": "./dist/bootstrap-vue.esm.js",
53-
"maxSize": "345 kB"
53+
"maxSize": "355 kB"
5454
},
5555
{
5656
"path": "./dist/bootstrap-vue.esm.min.js",
57-
"maxSize": "225 kB"
57+
"maxSize": "235 kB"
5858
},
5959
{
6060
"path": "./dist/bootstrap-vue.css",

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717
strategy:
1818
matrix:
1919
os: [ubuntu-latest]
20-
node: [10, 12, 14]
20+
node: [12, 14, 16]
2121

2222
steps:
2323
- name: Clone repository
2424
uses: actions/checkout@v2
2525

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

@@ -33,7 +33,7 @@ jobs:
3333
run: echo "::set-output name=dir::$(yarn cache dir)"
3434

3535
- name: Cache node_modules
36-
uses: actions/[email protected].4
36+
uses: actions/[email protected].7
3737
with:
3838
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
3939
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -50,6 +50,6 @@ jobs:
5050

5151
- name: BundleWatch
5252
run: yarn run bundlewatch
53-
if: matrix.node == '14'
53+
if: matrix.node == '16'
5454
env:
5555
BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"

‎.github/workflows/codeql.yml‎

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@ name: "CodeQL"
22

33
on:
44
push:
5+
branches:
6+
- dev
7+
- master
8+
- "!dependabot/**"
59
pull_request:
10+
# The branches below must be a subset of the branches above
11+
branches:
12+
- dev
13+
- master
14+
- "!dependabot/**"
615
schedule:
716
- cron: "0 2 * * 5"
817

@@ -11,48 +20,18 @@ jobs:
1120
name: Analyze
1221
runs-on: ubuntu-latest
1322

14-
strategy:
15-
fail-fast: false
16-
matrix:
17-
language: ["javascript"]
18-
1923
steps:
2024
- name: Checkout repository
2125
uses: actions/checkout@v2
22-
with:
23-
# We must fetch at least the immediate parents so that if this is
24-
# a pull request then we can checkout the head
25-
fetch-depth: 2
26-
27-
# If this run was triggered by a pull request event, then checkout
28-
# the head of the pull request instead of the merge commit
29-
- run: git checkout HEAD^2
30-
if: ${{ github.event_name == 'pull_request' }}
3126

3227
# Initializes the CodeQL tools for scanning.
3328
- name: Initialize CodeQL
3429
uses: github/codeql-action/init@v1
3530
with:
36-
languages: ${{ matrix.language }}
37-
# If you wish to specify custom queries, you can do so here or in a config file
38-
# By default, queries listed here will override any specified in a config file
39-
# Prefix the list here with "+" to use these queries and those in the config file
40-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
31+
languages: "javascript"
4132

42-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java)
43-
# If this step fails, then you should remove it and run the build manually (see below)
4433
- name: Autobuild
4534
uses: github/codeql-action/autobuild@v1
4635

47-
# ℹ️ Command-line programs to run using the OS shell.
48-
# 📚 https://git.io/JvXDl
49-
50-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines and
51-
# modify them (or add more) to build your code if your project uses a compiled language
52-
53-
#- run: |
54-
# make bootstrap
55-
# make release
56-
5736
- name: Perform CodeQL Analysis
5837
uses: github/codeql-action/analyze@v1

‎.github/workflows/test.yml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717
strategy:
1818
matrix:
1919
os: [ubuntu-latest]
20-
node: [14]
20+
node: [16]
2121

2222
steps:
2323
- name: Clone repository
2424
uses: actions/checkout@v2
2525

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

@@ -33,7 +33,7 @@ jobs:
3333
run: echo "::set-output name=dir::$(yarn cache dir)"
3434

3535
- name: Cache node_modules
36-
uses: actions/[email protected].4
36+
uses: actions/[email protected].7
3737
with:
3838
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
3939
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -54,14 +54,14 @@ jobs:
5454
strategy:
5555
matrix:
5656
os: [ubuntu-latest]
57-
node: [14]
57+
node: [16]
5858

5959
steps:
6060
- name: Clone repository
6161
uses: actions/checkout@v2
6262

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

@@ -70,7 +70,7 @@ jobs:
7070
run: echo "::set-output name=dir::$(yarn cache dir)"
7171

7272
- name: Cache node_modules
73-
uses: actions/[email protected].4
73+
uses: actions/[email protected].7
7474
with:
7575
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
7676
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -91,14 +91,14 @@ jobs:
9191
strategy:
9292
matrix:
9393
os: [ubuntu-latest]
94-
node: [10, 12, 14]
94+
node: [12, 14, 16]
9595

9696
steps:
9797
- name: Clone repository
9898
uses: actions/checkout@v2
9999

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

@@ -107,7 +107,7 @@ jobs:
107107
run: echo "::set-output name=dir::$(yarn cache dir)"
108108

109109
- name: Cache node_modules
110-
uses: actions/[email protected].4
110+
uses: actions/[email protected].7
111111
with:
112112
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
113113
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -123,8 +123,7 @@ jobs:
123123
run: yarn run test:unit --coverage --maxWorkers=2
124124

125125
- name: CodeCov
126-
uses: codecov/codecov-action@v1
127-
if: matrix.node == '14'
126+
uses: codecov/[email protected]
128127
with:
129128
token: ${{ secrets.CODECOV_TOKEN }}
130129
flags: unittests

‎docs/common-props.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@
7474
"exactActiveClass": {
7575
"description": "<router-link> prop: Configure the active CSS class applied when the link is active with exact match. Typically you will want to set this to class name 'active'"
7676
},
77+
"exactPath": {
78+
"description": "<router-link> prop: Allows matching only using the path section of the url, effectively ignoring the query and the hash sections"
79+
},
80+
"exactPathActiveClass": {
81+
"description": "<router-link> prop: Configure the active CSS class applied when the link is active with exact path match. Typically you will want to set this to class name 'active'"
82+
},
7783
"fade": {
7884
"description": "When set to `true`, enables the fade animation/transition on the component"
7985
},

‎docs/content/themes/vuexy-admin-dashboard.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
title: 'Vuexy - Admin Dashboard'
2+
type: 'dashboard'
3+
category: 'Admin & Dashboard'
4+
img: 'https://www.pixinvent.com/demo/vuexy-html-bootstrap-admin-template/item-page/bootstrap-vue.jpg'
5+
href: 'https://1.envato.market/WDyA1O'
6+
description: 'Vuexy is a production ready, carefully crafted, extensive Admin Dashboard. It is mainly powered by BootstrapVue and the Vue.js Composition API. The dashboard is API powered with JWT Authentication and ability based access control.'
7+
provider: 'PIXINVENT'
8+
price: '$32.00'

‎docs/markdown/intro/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Then, register BootstrapVue in your app entry point (typically `app.js` or `main
132132
import Vue from 'vue'
133133
import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
134134

135-
// Import Bootstrap an BootstrapVue CSS files (order is important)
135+
// Import Bootstrap and BootstrapVue CSS files (order is important)
136136
import 'bootstrap/dist/css/bootstrap.css'
137137
import 'bootstrap-vue/dist/bootstrap-vue.css'
138138

@@ -157,7 +157,7 @@ the 2 `@import`'s at the end:
157157
$body-bg: #000;
158158
$body-color: #111;
159159

160-
// Then import Bootstrap an BootstrapVue SCSS files (order is important)
160+
// Then import Bootstrap and BootstrapVue SCSS files (order is important)
161161
@import 'node_modules/bootstrap/scss/bootstrap.scss';
162162
@import 'node_modules/bootstrap-vue/src/index.scss';
163163
```

‎docs/markdown/reference/router-links/README.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,34 @@ With components that support router links (have a `to` prop), you will want to s
149149
`'active'` (or a space separated string that includes `'active'`) to apply Bootstrap's active
150150
styling on the component when the current route matches the `to` prop.
151151

152+
### `exact-path`
153+
154+
- type: `boolean`
155+
- default: `false`
156+
- availability: Vue Router 3.5.0+
157+
158+
Allows matching only using the `path` section of the url, effectively ignoring the `query` and the
159+
`hash` sections.
160+
161+
```html
162+
<!-- this link will also be active at `/search?page=2` or `/search#filters` -->
163+
<router-link to="/search" exact-path> </router-link>
164+
```
165+
166+
### `exact-path-active-class`
167+
168+
- type: `string`
169+
- default: `'router-link-exact-path-active'`
170+
- availability: Vue Router 3.5.0+
171+
172+
Configure the active CSS class applied when the link is active with exact path match. Note the
173+
default value can also be configured globally via the `linkExactPathActiveClass` router constructor
174+
option.
175+
176+
With components that support router links (have a `to` prop), you will want to set this to the class
177+
`'active'` (or a space separated string that includes `'active'`) to apply Bootstrap's active
178+
styling on the component when the current route matches the `to` prop.
179+
152180
## Nuxt.js specific router link props
153181

154182
When BootstrapVue detects that your app is running under [Nuxt.js](https://nuxtjs.org), it will

‎package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,35 +88,35 @@
8888
},
8989
"devDependencies": {
9090
"@babel/cli": "^7.13.16",
91-
"@babel/core": "^7.14.0",
91+
"@babel/core": "^7.16.5",
9292
"@babel/plugin-transform-modules-commonjs": "^7.14.0",
93-
"@babel/plugin-transform-runtime": "^7.13.15",
94-
"@babel/preset-env": "^7.14.0",
95-
"@babel/standalone": "^7.14.0",
93+
"@babel/plugin-transform-runtime": "^7.16.5",
94+
"@babel/preset-env": "^7.14.2",
95+
"@babel/standalone": "^7.14.1",
9696
"@nuxt/content": "^1.14.0",
9797
"@nuxtjs/google-analytics": "^2.4.0",
9898
"@nuxtjs/pwa": "^3.3.5",
9999
"@nuxtjs/robots": "^2.5.0",
100100
"@nuxtjs/sitemap": "^2.4.0",
101101
"@testing-library/jest-dom": "^5.12.0",
102-
"@vue/test-utils": "^1.2.0",
102+
"@vue/test-utils": "^1.3.0",
103103
"autoprefixer": "^10.2.5",
104104
"babel-core": "^7.0.0-bridge.0",
105105
"babel-eslint": "^10.1.0",
106106
"babel-jest": "^26.6.3",
107107
"babel-plugin-istanbul": "^6.0.0",
108-
"bootstrap-icons": "^1.4.1",
108+
"bootstrap-icons": "^1.5.0",
109109
"bundlewatch": "^0.3.2",
110110
"clean-css-cli": "^4.3.0",
111111
"codemirror": "^5.61.0",
112112
"codesandbox": "^2.2.3",
113-
"core-js": "^3.11.2",
113+
"core-js": "^3.12.1",
114114
"cross-env": "^7.0.3",
115-
"eslint": "^7.25.0",
115+
"eslint": "^7.26.0",
116116
"eslint-config-prettier": "^8.3.0",
117117
"eslint-config-standard": "^16.0.2",
118118
"eslint-config-vue": "^2.0.2",
119-
"eslint-plugin-import": "^2.22.1",
119+
"eslint-plugin-import": "^2.25.3",
120120
"eslint-plugin-jest": "^24.3.6",
121121
"eslint-plugin-markdown": "^2.1.0",
122122
"eslint-plugin-node": "^11.1.0",
@@ -130,22 +130,22 @@
130130
"husky": "^6.0.0",
131131
"improved-yarn-audit": "^2.3.2",
132132
"jest": "^26.6.3",
133-
"lint-staged": "^10.5.4",
133+
"lint-staged": "^11.0.0",
134134
"loader-utils": "^2.0.0",
135135
"lodash": "^4.17.21",
136136
"marked": "^2.0.3",
137-
"nuxt": "^2.15.4",
138-
"postcss": "^8.2.13",
137+
"nuxt": "^2.15.8",
138+
"postcss": "^8.2.15",
139139
"postcss-cli": "^8.3.1",
140140
"prettier": "1.14.3",
141141
"require-context": "^1.1.0",
142-
"rollup": "^2.46.0",
142+
"rollup": "^2.47.0",
143143
"rollup-plugin-babel": "^4.4.0",
144144
"rollup-plugin-commonjs": "^10.1.0",
145145
"rollup-plugin-node-resolve": "^5.2.0",
146-
"sass": "^1.32.12",
146+
"sass": "^1.45.0",
147147
"sass-loader": "^10.1.1",
148-
"standard-version": "^9.2.0",
148+
"standard-version": "^9.3.0",
149149
"terser": "^5.7.0",
150150
"vue": "^2.6.12",
151151
"vue-jest": "^3.0.7",

0 commit comments

Comments
 (0)