Skip to content

Commit 60c8e2c

Browse files
jacobmllr95jacobmllr95
committed
Merge branch 'dev' into docs-github-pages
2 parents 8071b93 + 2dee352 commit 60c8e2c

File tree

22 files changed

+199
-94
lines changed

22 files changed

+199
-94
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: echo "::set-output name=dir::$(yarn cache dir)"
3737

3838
- name: Cache node_modules
39-
uses: actions/cache@v3.0.11
39+
uses: actions/cache@v3.2.2
4040
with:
4141
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
4242
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}

‎.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: echo "::set-output name=dir::$(yarn cache dir)"
3737

3838
- name: Cache node_modules
39-
uses: actions/cache@v3.0.11
39+
uses: actions/cache@v3.2.2
4040
with:
4141
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
4242
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -73,7 +73,7 @@ jobs:
7373
run: echo "::set-output name=dir::$(yarn cache dir)"
7474

7575
- name: Cache node_modules
76-
uses: actions/cache@v3.0.11
76+
uses: actions/cache@v3.2.2
7777
with:
7878
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
7979
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -110,7 +110,7 @@ jobs:
110110
run: echo "::set-output name=dir::$(yarn cache dir)"
111111

112112
- name: Cache node_modules
113-
uses: actions/cache@v3.0.11
113+
uses: actions/cache@v3.2.2
114114
with:
115115
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
116116
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}

‎CODE_OF_CONDUCT.md

Lines changed: 113 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,133 @@
11
# Contributor Covenant Code of Conduct
22

3-
## Our pledge
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the overall
26+
community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
450

5-
In the interest of fostering an open and welcoming environment, we as contributors and maintainers
6-
pledge to making participation in our project and our community a harassment-free experience for
7-
everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level
8-
of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
51+
## Scope
952

10-
## Our standards
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
1158

12-
Examples of behavior that contributes to creating a positive environment include:
59+
## Enforcement
1360

14-
- Using welcoming and inclusive language
15-
- Being respectful of differing viewpoints and experiences
16-
- Gracefully accepting constructive criticism
17-
- Focusing on what is best for the community
18-
- Showing empathy towards other community members
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting
62+
the project team at pooya@pi0.ir. The project team will review and investigate all complaints, and
63+
will respond in a way that it deems appropriate to the circumstances. The project team is obligated
64+
to maintain confidentiality with regard to the reporter of an incident. Further details of specific
65+
enforcement policies may be posted separately.
1966

20-
Examples of unacceptable behavior by participants include:
67+
All community leaders are obligated to respect the privacy and security of the
68+
reporter of any incident.
2169

22-
- The use of sexualized language or imagery and unwelcome sexual attention or advances
23-
- Trolling, insulting/derogatory comments, and personal or political attacks
24-
- Public or private harassment
25-
- Publishing others' private information, such as a physical or electronic address, without explicit
26-
permission
27-
- Other conduct which could reasonably be considered inappropriate in a professional setting
70+
## Enforcement Guidelines
2871

29-
## Our responsibilities
72+
Community leaders will follow these Community Impact Guidelines in determining
73+
the consequences for any action they deem in violation of this Code of Conduct:
3074

31-
Project maintainers are responsible for clarifying the standards of acceptable behavior and are
32-
expected to take appropriate and fair corrective action in response to any instances of unacceptable
33-
behavior.
75+
### 1. Correction
3476

35-
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits,
36-
code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or
37-
to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate,
38-
threatening, offensive, or harmful.
77+
**Community Impact**: Use of inappropriate language or other behavior deemed
78+
unprofessional or unwelcome in the community.
3979

40-
## Scope
80+
**Consequence**: A private, written warning from community leaders, providing
81+
clarity around the nature of the violation and an explanation of why the
82+
behavior was inappropriate. A public apology may be requested.
4183

42-
This Code of Conduct applies both within project spaces and in public spaces when an individual is
43-
representing the project or its community. Examples of representing a project or community include
44-
using an official project e-mail address, posting via an official social media account, or acting as
45-
an appointed representative at an online or offline event. Representation of a project may be
46-
further defined and clarified by project maintainers.
84+
### 2. Warning
4785

48-
## Enforcement
86+
**Community Impact**: A violation through a single incident or series of
87+
actions.
4988

50-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting
51-
the project team at pooya@pi0.ir. The project team will review and investigate all complaints, and
52-
will respond in a way that it deems appropriate to the circumstances. The project team is obligated
53-
to maintain confidentiality with regard to the reporter of an incident. Further details of specific
54-
enforcement policies may be posted separately.
89+
**Consequence**: A warning with consequences for continued behavior. No
90+
interaction with the people involved, including unsolicited interaction with
91+
those enforcing the Code of Conduct, for a specified period of time. This
92+
includes avoiding interactions in community spaces as well as external channels
93+
like social media. Violating these terms may lead to a temporary or permanent
94+
ban.
95+
96+
### 3. Temporary Ban
97+
98+
**Community Impact**: A serious violation of community standards, including
99+
sustained inappropriate behavior.
55100

56-
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face
57-
temporary or permanent repercussions as determined by other members of the project's leadership.
101+
**Consequence**: A temporary ban from any sort of interaction or public
102+
communication with the community for a specified period of time. No public or
103+
private interaction with the people involved, including unsolicited interaction
104+
with those enforcing the Code of Conduct, is allowed during this period.
105+
Violating these terms may lead to a permanent ban.
106+
107+
### 4. Permanent Ban
108+
109+
**Community Impact**: Demonstrating a pattern of violation of community
110+
standards, including sustained inappropriate behavior, harassment of an
111+
individual, or aggression toward or disparagement of classes of individuals.
112+
113+
**Consequence**: A permanent ban from any sort of public interaction within the
114+
community.
58115

59116
## Attribution
60117

61-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at
62-
[https://contributor-covenant.org/version/1/4][version]
118+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
119+
version 2.1, available at
120+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
121+
122+
Community Impact Guidelines were inspired by
123+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
124+
125+
For answers to common questions about this code of conduct, see the FAQ at
126+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
127+
[https://www.contributor-covenant.org/translations][translations].
63128

64-
[homepage]: https://contributor-covenant.org
65-
[version]: https://contributor-covenant.org/version/1/4/
129+
[homepage]: https://www.contributor-covenant.org
130+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
131+
[Mozilla CoC]: https://github.com/mozilla/diversity
132+
[FAQ]: https://www.contributor-covenant.org/faq
133+
[translations]: https://www.contributor-covenant.org/translations

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016-2020 - BootstrapVue
3+
Copyright (c) 2016-2024 - BootstrapVue
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎docs/components/main-docs.js

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

78
// @vue/component
89
export default {
@@ -58,11 +59,25 @@ export default {
5859
const $quickLinks = h(QuickLinks)
5960

6061
// Body section
61-
const $bodySection = h(Section, {
62-
props: { play: true },
63-
domProps: { innerHTML: body || '' }
62+
const $bodySectionContent = h({
63+
delimiters: ['[[', ']]'], // change the delimiters to avoid conflicts with code examples
64+
data() {
65+
return {
66+
bootstrapVersion,
67+
vueVersion
68+
}
69+
},
70+
template: `<div>${body}</div>`
6471
})
6572

73+
const $bodySection = h(
74+
Section,
75+
{
76+
props: { play: true }
77+
},
78+
[$bodySectionContent]
79+
)
80+
6681
return h(Main, mergeData(data, { props: { tag } }), [
6782
$leadSection,
6883
$error,

‎docs/markdown/intro/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ version of Vue.js, Bootstrap v4 and BootstrapVue:
118118

119119
```bash
120120
# With npm
121-
npm install vue bootstrap bootstrap-vue
121+
npm install vue bootstrap@4 bootstrap-vue
122122

123123
# With yarn
124-
yarn add vue bootstrap bootstrap-vue
124+
yarn add vue bootstrap@4 bootstrap-vue
125125
```
126126

127127
Then, register BootstrapVue in your app entry point (typically `app.js` or `main.js`):
@@ -711,14 +711,14 @@ JavaScript files.
711711
<!-- Add this to <head> -->
712712

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

717717
<!-- Load polyfills to support older browsers -->
718718
<script src="https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?version=4.8.0&features=es2015%2CIntersectionObserver" crossorigin="anonymous"></script>
719719

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

724724
<!-- 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://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?version=4.8.0&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
@@ -6,7 +6,13 @@ import Main from '~/components/main'
66
import QuickLinks from '~/components/quick-links'
77
import Section from '~/components/section'
88
import docsMixin from '~/plugins/docs-mixin'
9-
import { icons as iconsMeta, bootstrapIconsVersion, bootstrapIconsCount } from '~/content'
9+
import {
10+
icons as iconsMeta,
11+
bootstrapIconsVersion,
12+
bootstrapIconsCount,
13+
bootstrapVersion,
14+
vueVersion
15+
} from '~/content'
1016
import readmeData from '~/../src/icons/README.md'
1117

1218
const { titleLead = '', body = '', baseTOC = {} } = readmeData
@@ -33,7 +39,9 @@ export default {
3339
// Key for icons meta is `''` (empty slug)
3440
meta: iconsMeta[''],
3541
bootstrapIconsVersion,
36-
bootstrapIconsCount
42+
bootstrapIconsCount,
43+
bootstrapVersion,
44+
vueVersion
3745
}
3846
},
3947
computed: {

0 commit comments

Comments
 (0)