Skip to content

Commit c60304b

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into patch-1
2 parents 0a888c4 + 3e29c63 commit c60304b

File tree

242 files changed

+2202
-1228
lines changed

Some content is hidden

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

242 files changed

+2202
-1228
lines changed

‎.eslintrc.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ module.exports = {
1515
es6: true,
1616
'jest/globals': true
1717
},
18-
globals: {
19-
Vue: true
20-
},
2118
rules: {
2219
'no-unused-vars': [
2320
'error',

‎.github/workflows/build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
- dev
1111
- master
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
build:
1518
runs-on: ${{ matrix.os }}
@@ -24,7 +27,7 @@ jobs:
2427
uses: actions/checkout@v3
2528

2629
- name: Set Node.js version
27-
uses: actions/setup-node@v3.1.1
30+
uses: actions/setup-node@v3.5.1
2831
with:
2932
node-version: ${{ matrix.node }}
3033

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

3538
- name: Cache node_modules
36-
uses: actions/cache@v3.0.2
39+
uses: actions/cache@v3.2.2
3740
with:
3841
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
3942
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}

‎.github/workflows/codeql.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,15 @@ on:
1515
schedule:
1616
- cron: "0 2 * * 5"
1717

18+
permissions:
19+
contents: read
20+
1821
jobs:
1922
analyze:
23+
permissions:
24+
actions: read # for github/codeql-action/init to get workflow details
25+
contents: read # for actions/checkout to fetch code
26+
security-events: write # for github/codeql-action/autobuild to send a status report
2027
name: Analyze
2128
runs-on: ubuntu-latest
2229

@@ -26,12 +33,12 @@ jobs:
2633

2734
# Initializes the CodeQL tools for scanning.
2835
- name: Initialize CodeQL
29-
uses: github/codeql-action/init@v1
36+
uses: github/codeql-action/init@v2
3037
with:
3138
languages: "javascript"
3239

3340
- name: Autobuild
34-
uses: github/codeql-action/autobuild@v1
41+
uses: github/codeql-action/autobuild@v2
3542

3643
- name: Perform CodeQL Analysis
37-
uses: github/codeql-action/analyze@v1
44+
uses: github/codeql-action/analyze@v2

‎.github/workflows/test.yml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
- dev
1111
- master
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
lint:
1518
runs-on: ${{ matrix.os }}
@@ -24,7 +27,7 @@ jobs:
2427
uses: actions/checkout@v3
2528

2629
- name: Set Node.js version
27-
uses: actions/setup-node@v3.1.1
30+
uses: actions/setup-node@v3.5.1
2831
with:
2932
node-version: ${{ matrix.node }}
3033

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

3538
- name: Cache node_modules
36-
uses: actions/cache@v3.0.2
39+
uses: actions/cache@v3.2.2
3740
with:
3841
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
3942
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -61,7 +64,7 @@ jobs:
6164
uses: actions/checkout@v3
6265

6366
- name: Set Node.js version
64-
uses: actions/setup-node@v3.1.1
67+
uses: actions/setup-node@v3.5.1
6568
with:
6669
node-version: ${{ matrix.node }}
6770

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

7275
- name: Cache node_modules
73-
uses: actions/cache@v3.0.2
76+
uses: actions/cache@v3.2.2
7477
with:
7578
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
7679
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -98,7 +101,7 @@ jobs:
98101
uses: actions/checkout@v3
99102

100103
- name: Set Node.js version
101-
uses: actions/setup-node@v3.1.1
104+
uses: actions/setup-node@v3.5.1
102105
with:
103106
node-version: ${{ matrix.node }}
104107

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

109112
- name: Cache node_modules
110-
uses: actions/cache@v3.0.2
113+
uses: actions/cache@v3.2.2
111114
with:
112115
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
113116
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -122,8 +125,19 @@ jobs:
122125
- name: Test unit
123126
run: yarn run test:unit --coverage --maxWorkers=2
124127

128+
- name: Test unit (Vue 3)
129+
run: yarn run test:unit --coverage --maxWorkers=2
130+
env:
131+
USE_VUE3: '1'
132+
133+
- name: Merge coverage
134+
run:
135+
npx istanbul-merge --out ./coverage-final.json coverage/coverage-final.json
136+
coverage-vue3/coverage-final.json
137+
125138
- name: CodeCov
126-
uses: codecov/codecov-action@v3.0.0
139+
uses: codecov/codecov-action@v3.1.1
127140
with:
128141
token: ${{ secrets.CODECOV_TOKEN }}
129142
flags: unittests
143+
files: ./coverage-final.json

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
.vercel/
55
.vscode/
66
coverage/
7+
coverage-vue3/
78
dist/
89
docs-dist/
910
esm/

‎CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,26 @@ 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+
## [2.23.1](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.23.0...v2.23.1) (2022-10-26)
8+
9+
### Bug Fixes
10+
11+
- correctly pass parent relations for Vue.js2
12+
([58e2d7e](https://github.com/bootstrap-vue/bootstrap-vue/commit/58e2d7e4f5e883207c4f7baa856532d3ae924a0c))
13+
14+
## [2.23.0](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.22.0...v2.23.0) (2022-10-25)
15+
16+
### Bug Fixes
17+
18+
- **vue3:** do not rely on \_\_vueParentComponent in tooltip
19+
([fe13503](https://github.com/bootstrap-vue/bootstrap-vue/commit/fe13503f7aa6d0bd6f7e1ed4f4a2e7acff421106))
20+
- update refs inside v-for to work for @vue/compat
21+
([ae4bac8](https://github.com/bootstrap-vue/bootstrap-vue/commit/ae4bac8a4327a1f293afbcf571e84ed1de4497f8))
22+
23+
### Other v2.23.0
24+
25+
- add support for @vue/compat
26+
727
## [2.22.0](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.21.2...v2.22.0) (2022-04-17)
828

929
### Features

‎docs/components/header.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<div class="navbar-nav-scroll">
3232
<b-navbar-nav class="bd-navbar-nav flex-row">
3333
<b-nav-item to="/docs" active-class="active" exact no-prefetch>Docs</b-nav-item>
34+
<b-nav-item to="/vue3" active-class="active" exact no-prefetch>Vue.js 3</b-nav-item>
3435
<b-nav-item to="/docs/components" active-class="active" no-prefetch>Components</b-nav-item>
3536
<b-nav-item to="/docs/directives" active-class="active" no-prefetch>Directives</b-nav-item>
3637
<b-nav-item to="/docs/icons" active-class="active" no-prefetch>Icons</b-nav-item>

‎docs/components/main-docs.js

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import QuickLinks from '~/components/quick-links'
44
import Reload from '~/components/reload'
55
import Section from '~/components/section'
66
import { mergeData } from 'vue-functional-data-merge'
7+
import { bootstrapVersion, vueVersion } from '~/content'
78

89
// @vue/component
910
export default {
@@ -62,11 +63,25 @@ export default {
6263
const $quickLinks = h(QuickLinks)
6364

6465
// Body section
65-
const $bodySection = h(Section, {
66-
props: { play: true },
67-
domProps: { innerHTML: body || '' }
66+
const $bodySectionContent = h({
67+
delimiters: ['[[', ']]'], // change the delimiters to avoid conflicts with code examples
68+
data() {
69+
return {
70+
bootstrapVersion,
71+
vueVersion
72+
}
73+
},
74+
template: `<div>${body}</div>`
6875
})
6976

77+
const $bodySection = h(
78+
Section,
79+
{
80+
props: { play: true }
81+
},
82+
[$bodySectionContent]
83+
)
84+
7085
return h(Main, mergeData(data, { props: { tag } }), [
7186
$leadSection,
7287
$error,

‎docs/markdown/intro/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The online documentation comprises:
3131

3232
## Prerequisites
3333

34-
This BootstrapVue documentation assumes you are familiar with Vue and and Bootstrap
34+
This BootstrapVue documentation assumes you are familiar with Vue and Bootstrap
3535
v{{ bootstrapVersionMajor }} CSS. Good starting points for these:
3636

3737
- [Vue Guide](https://vuejs.org/v2/guide/)
@@ -44,8 +44,8 @@ v{{ bootstrapVersionMajor }} CSS. Good starting points for these:
4444

4545
In many of the examples shown in BootstrapVue's documentation, you may see the use of CSS classes
4646
such as <code class="text-nowrap">ml-2</code>, <code class="text-nowrap">py-1</code>, etc. These are
47-
Bootstrap v{{bootstrapVersionMinor}} utility classes that help control padding, margins, positioning
48-
and more. You can find information on these classes in the
47+
Bootstrap v{{bootstrapVersionMinor}} utility classes that help control padding, margins,
48+
positioning, and more. You can find information on these classes in the
4949
[Utility Classes](/docs/reference/utility-classes) reference section.
5050

5151
Many of the examples in this documentation are _live_ and can be edited in-place for an enhanced
@@ -712,14 +712,14 @@ JavaScript files.
712712
<!-- Add this to <head> -->
713713

714714
<!-- Load required Bootstrap and BootstrapVue CSS -->
715-
<link type="text/css" rel="stylesheet" href="https://unpkg.com/bootstrap/dist/css/bootstrap.min.css" />
715+
<link type="text/css" rel="stylesheet" href="https://unpkg.com/bootstrap@{{ bootstrapVersion }}/dist/css/bootstrap.min.css" />
716716
<link type="text/css" rel="stylesheet" href="https://unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.min.css" />
717717

718718
<!-- Load polyfills to support older browsers -->
719719
<script src="https://polyfill.io/v3/polyfill.min.js?features=es2015%2CIntersectionObserver" crossorigin="anonymous"></script>
720720

721721
<!-- Load Vue followed by BootstrapVue -->
722-
<script src="https://unpkg.com/vue@latest/dist/vue.min.js"></script>
722+
<script src="https://unpkg.com/vue@{{ vueVersion }}/dist/vue.min.js"></script>
723723
<script src="https://unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.min.js"></script>
724724

725725
<!-- Load the following for BootstrapVueIcons support -->

‎docs/markdown/reference/starter-templates/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ tags to load the required JavaScript and CSS in your page.
2626
<link
2727
type="text/css"
2828
rel="stylesheet"
29-
href="https://unpkg.com/bootstrap/dist/css/bootstrap.min.css"
29+
href="https://unpkg.com/bootstrap@[[ bootstrapVersion ]]/dist/css/bootstrap.min.css"
3030
/>
3131
<link
3232
type="text/css"
@@ -38,7 +38,7 @@ tags to load the required JavaScript and CSS in your page.
3838
<script src="https://polyfill.io/v3/polyfill.min.js?features=es2015%2CIntersectionObserver"></script>
3939

4040
<!-- Required scripts -->
41-
<script src="https://unpkg.com/vue@latest/dist/vue.js"></script>
41+
<script src="https://unpkg.com/vue@[[ vueVersion ]]/dist/vue.js"></script>
4242
<script src="https://unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.js"></script>
4343
</head>
4444
<body>

‎docs/pages/docs/icons/index.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ import Main from '~/components/main'
77
import QuickLinks from '~/components/quick-links'
88
import Section from '~/components/section'
99
import docsMixin from '~/plugins/docs-mixin'
10-
import { icons as iconsMeta, bootstrapIconsVersion, bootstrapIconsCount } from '~/content'
10+
import {
11+
icons as iconsMeta,
12+
bootstrapIconsVersion,
13+
bootstrapIconsCount,
14+
bootstrapVersion,
15+
vueVersion
16+
} from '~/content'
1117
import readmeData from '~/../src/icons/README.md'
1218

1319
const { titleLead = '', body = '', baseTOC = {} } = readmeData
@@ -35,7 +41,9 @@ export default {
3541
// Key for icons meta is `''` (empty slug)
3642
meta: iconsMeta[''],
3743
bootstrapIconsVersion,
38-
bootstrapIconsCount
44+
bootstrapIconsCount,
45+
bootstrapVersion,
46+
vueVersion
3947
}
4048
},
4149
computed: {

‎docs/pages/index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<b-col tag="aside" cols="12" md="4" order-md="2" class="logo-aside mb-4 mb-md-0">
88
<BvLogo></bvLogo>
99
</b-col>
10-
1110
<b-col tag="header" cols="12" md="8" order-md="1">
1211
<h1 class="mb-3 text-center text-md-left bd-text-purple-bright">
1312
Bootstrap<span class="text-vue-green">Vue</span>

0 commit comments

Comments
 (0)