Skip to content

Commit 1033c74

Browse files
tmorehousetmorehouse
authored
Merge branch 'dev' into feat-popper-v2
2 parents 7648a2b + 582560f commit 1033c74

Some content is hidden

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

89 files changed

+1981
-853
lines changed

‎.codesandbox/ci.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"sandboxes": ["0d335"]
3+
}

‎.eslintignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
.now/
12
.nuxt/
3+
.vercel/
4+
coverage/
25
dist/
36
docs-dist/
47
esm/
5-
es/
68
node_modules/
79
nuxt/plugin.*.js
10+
sw.js

‎.github/ISSUE_TEMPLATE/BUG_REPORT_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ A clear and concise description of what you expected to happen.
3737

3838
If applicable, add a minimal demo link to help explain your problem. Some options for that are [CodePen](https://codepen.io/), [CodeSandbox](https://codesandbox.io/), [JS Bin](https://jsbin.com/) or [JSFiddle](https://jsfiddle.net/).
3939

40-
You can also export markup from the [Online Playground](https://bootstrap-vue.js.org/play) to _CodePen_, _CodeSandbox_ or _JSFiddle_.
40+
You can also export markup from the [Online Playground](https://bootstrap-vue.org/play) to _CodePen_, _CodeSandbox_ or _JSFiddle_.
4141

4242
### Additional context
4343

‎.github/renovate.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
"packageNames": ["core-js"],
1111
"allowedVersions": "<3.0.0"
1212
},
13+
{
14+
"packageNames": ["highlight.js"],
15+
"allowedVersions": "<10.0.0"
16+
},
1317
{
1418
"packageNames": ["prettier"],
1519
"allowedVersions": "<=1.14.3"

‎.github/workflows/test.yml‎

Lines changed: 40 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,27 @@ jobs:
2121
node: [10, 12]
2222

2323
steps:
24-
- uses: actions/setup-node@v1
24+
- name: Clone repository
25+
uses: actions/checkout@v2
26+
27+
- name: Set Node.js version
28+
uses: actions/setup-node@v1
2529
with:
2630
node-version: ${{ matrix.node }}
2731

28-
- name: Checkout
29-
uses: actions/checkout@v2
32+
- name: Get yarn cache directory path
33+
id: yarn-cache-dir-path
34+
run: echo "::set-output name=dir::$(yarn cache dir)"
3035

3136
- name: Cache node_modules
3237
uses: actions/cache@v1
3338
with:
34-
path: node_modules
35-
key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}
39+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
40+
key: ${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
41+
restore-keys: |
42+
${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
43+
${{ runner.OS }}-node-v${{ matrix.node }}-
44+
${{ runner.OS }}-
3645
3746
- name: Install dependencies
3847
run: yarn install --check-files --frozen-lockfile --non-interactive
@@ -53,13 +62,14 @@ jobs:
5362
node: [12]
5463

5564
steps:
56-
- uses: actions/setup-node@v1
65+
- name: Clone repository
66+
uses: actions/checkout@v2
67+
68+
- name: Set Node.js version
69+
uses: actions/setup-node@v1
5770
with:
5871
node-version: ${{ matrix.node }}
5972

60-
- name: Checkout
61-
uses: actions/checkout@master
62-
6373
- name: Restore workspace cache
6474
uses: actions/cache@v1
6575
with:
@@ -79,13 +89,14 @@ jobs:
7989
node: [12]
8090

8191
steps:
82-
- uses: actions/setup-node@v1
92+
- name: Clone repository
93+
uses: actions/checkout@v2
94+
95+
- name: Set Node.js version
96+
uses: actions/setup-node@v1
8397
with:
8498
node-version: ${{ matrix.node }}
8599

86-
- name: Checkout
87-
uses: actions/checkout@master
88-
89100
- name: Restore workspace cache
90101
uses: actions/cache@v1
91102
with:
@@ -105,13 +116,14 @@ jobs:
105116
node: [10, 12]
106117

107118
steps:
108-
- uses: actions/setup-node@v1
119+
- name: Clone repository
120+
uses: actions/checkout@v2
121+
122+
- name: Set Node.js version
123+
uses: actions/setup-node@v1
109124
with:
110125
node-version: ${{ matrix.node }}
111126

112-
- name: Checkout
113-
uses: actions/checkout@master
114-
115127
- name: Restore workspace cache
116128
uses: actions/cache@v1
117129
with:
@@ -138,13 +150,14 @@ jobs:
138150
node: [12]
139151

140152
steps:
141-
- uses: actions/setup-node@v1
153+
- name: Clone repository
154+
uses: actions/checkout@v2
155+
156+
- name: Set Node.js version
157+
uses: actions/setup-node@v1
142158
with:
143159
node-version: ${{ matrix.node }}
144160

145-
- name: Checkout
146-
uses: actions/checkout@master
147-
148161
- name: Restore workspace cache
149162
uses: actions/cache@v1
150163
with:
@@ -170,13 +183,14 @@ jobs:
170183
node: [12]
171184

172185
steps:
173-
- uses: actions/setup-node@v1
186+
- name: Clone repository
187+
uses: actions/checkout@v2
188+
189+
- name: Set Node.js version
190+
uses: actions/setup-node@v1
174191
with:
175192
node-version: ${{ matrix.node }}
176193

177-
- name: Checkout
178-
uses: actions/checkout@master
179-
180194
- name: Restore workspace cache
181195
uses: actions/cache@v1
182196
with:
@@ -193,30 +207,4 @@ jobs:
193207
run: yarn run bundlewatch
194208
env:
195209
BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"
196-
197-
docs:
198-
needs: setup
199-
runs-on: ${{ matrix.os }}
200-
if: github.event_name == 'push' && github.ref == 'master'
201-
202-
strategy:
203-
matrix:
204-
os: [ubuntu-latest]
205-
node: [12]
206-
207-
steps:
208-
- uses: actions/setup-node@v1
209-
with:
210-
node-version: ${{ matrix.node }}
211-
212-
- name: Checkout
213-
uses: actions/checkout@master
214-
215-
- name: Restore workspace cache
216-
uses: actions/cache@v1
217-
with:
218-
path: ${{ github.workspace }}
219-
key: ${{ matrix.os }}-node-v${{ matrix.node }}-bootstrap-vue-${{ github.sha }}
220-
221-
- name: Publish docs
222-
run: yarn run docs-publish
210+
CI_BRANCH_BASE: "${{ github.base_ref }}"

‎.gitignore‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
*.iml
2-
*.log
3-
*.swp
4-
.DS_Store
51
.idea/
2+
.now/
63
.nuxt/
4+
.vercel/
75
.vscode/
86
coverage/
97
dist/
108
docs-dist/
119
esm/
12-
es/
1310
node_modules/
11+
*.iml
12+
*.log
13+
*.swp
14+
.DS_Store
1415
sw.js
1516
workbox*.js*

‎.prettierignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
.now/
12
.nuxt/
3+
.vercel/
4+
coverage/
25
dist/
36
docs-dist/
47
esm/
5-
es/
68
node_modules/
79
nuxt/plugin.template.js
810
nuxt/plugin.prod.js

‎CHANGELOG-OLD.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2454,8 +2454,7 @@ Notable changes:
24542454
v1.0.0 introduces a new source code structure. For those users that are importing individual
24552455
components, the path to the individual components has changed. Please reference the
24562456
[GitHub repo](https://github.com/bootstrap-vue/bootstrap-vue/) and
2457-
[documentation](https://bootstrap-vue.js.org/docs) for the new structure and information on
2458-
importing.
2457+
[documentation](https://bootstrap-vue.org/docs) for the new structure and information on importing.
24592458

24602459
### Bug Fixes v1.0.0
24612460

‎CHANGELOG.md‎

Lines changed: 64 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,68 @@
22

33
> All notable changes to this project will be documented in this file.
44
5+
<a name="2.12.0"></a>
6+
7+
## [v2.12.0](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.11.0...v2.12.0)
8+
9+
Released: 2020-04-20
10+
11+
### Features v2.12.0
12+
13+
- **b-avatar:** add support for badges on avatars
14+
([#5124](https://github.com/bootstrap-vue/bootstrap-vue/issues/5124))
15+
([a2e465b](https://github.com/bootstrap-vue/bootstrap-vue/commit/a2e465b6457cabb88e42bcefd86a86e36c4602de))
16+
- **b-avatar:** if `variant` is empty string, then remove spacing around image (closes
17+
[#5154](https://github.com/bootstrap-vue/bootstrap-vue/issues/5154))
18+
([#5156](https://github.com/bootstrap-vue/bootstrap-vue/issues/5156))
19+
([7ff87fc](https://github.com/bootstrap-vue/bootstrap-vue/commit/7ff87fc560a2ad005bdca394cccf1fafa9d5e696))
20+
- **b-calendar, b-form-datepicker:** add prop `weekday-header-format` to specify weekday header
21+
length (closes [#5171](https://github.com/bootstrap-vue/bootstrap-vue/issues/5171))
22+
([#5175](https://github.com/bootstrap-vue/bootstrap-vue/issues/5175))
23+
([8241644](https://github.com/bootstrap-vue/bootstrap-vue/commit/8241644477b174042bb163ba1741c3066165d9f9))
24+
- **b-calendar, b-form-datepicker:** add scoped slots for date navigation buttons (closes
25+
[#5117](https://github.com/bootstrap-vue/bootstrap-vue/issues/5117))
26+
([#5147](https://github.com/bootstrap-vue/bootstrap-vue/issues/5147))
27+
([5f69864](https://github.com/bootstrap-vue/bootstrap-vue/commit/5f69864497a13a9b18a96b508af6b9ba89a43add))
28+
- **b-form-datepicker:** add pass through prop `date-info-fn` (closes
29+
[#4826](https://github.com/bootstrap-vue/bootstrap-vue/issues/4826))
30+
([#5150](https://github.com/bootstrap-vue/bootstrap-vue/issues/5150))
31+
([bf35f80](https://github.com/bootstrap-vue/bootstrap-vue/commit/bf35f80d1c4619cf4494dc8a6256d093140d4052))
32+
- **b-form-rating:** new `b-form-rating` custom component
33+
([#5132](https://github.com/bootstrap-vue/bootstrap-vue/issues/5132))
34+
([30ad7fe](https://github.com/bootstrap-vue/bootstrap-vue/commit/30ad7fe746cd6187311c86319abf6e9519b81f15))
35+
- **b-sidebar:** add optional backdrop support
36+
([#5182](https://github.com/bootstrap-vue/bootstrap-vue/issues/5182))
37+
([c6375e5](https://github.com/bootstrap-vue/bootstrap-vue/commit/c6375e5513cb0ec33a9bc9fc894a123d74cf7768))
38+
- **custom components:** avoid using padding/margin utility classes where possible (closes
39+
[#5117](https://github.com/bootstrap-vue/bootstrap-vue/issues/5117))
40+
([#5121](https://github.com/bootstrap-vue/bootstrap-vue/issues/5121))
41+
([8c6cfe0](https://github.com/bootstrap-vue/bootstrap-vue/commit/8c6cfe0af919a4e54667bcb4b29d2ba6b6576b67))
42+
- **icons:** new `throb` and `fade` animations
43+
([#5122](https://github.com/bootstrap-vue/bootstrap-vue/issues/5122))
44+
([bc0117c](https://github.com/bootstrap-vue/bootstrap-vue/commit/bc0117cc794c948b202daf2e17f22eb4c36235cc))
45+
46+
### Bug Fixes v2.12.0
47+
48+
- **b-alert:** fix memory leak by using the correct method to clear the countdown timeout
49+
([#5158](https://github.com/bootstrap-vue/bootstrap-vue/issues/5158))
50+
([7a7f33d](https://github.com/bootstrap-vue/bootstrap-vue/commit/7a7f33d74f906e5feecf2bf177636c7f85bc4537))
51+
- **b-avatar:** fix button type font size inheritance
52+
([#5177](https://github.com/bootstrap-vue/bootstrap-vue/issues/5177))
53+
([441ebdc](https://github.com/bootstrap-vue/bootstrap-vue/commit/441ebdc8a262c6c6ed494ddc6a6c0c06604045ef))
54+
- **b-calendar:** use `Intl.NumberFormat` for formatting the number in the date buttons (closes
55+
[#5171](https://github.com/bootstrap-vue/bootstrap-vue/issues/5171))
56+
([#5179](https://github.com/bootstrap-vue/bootstrap-vue/issues/5179))
57+
([cbf2cd0](https://github.com/bootstrap-vue/bootstrap-vue/commit/cbf2cd007cce81a5f664fa649b08af6735fe16e4))
58+
- **b-form-datepicker:** make datepicker respect `no-highlight-today` prop
59+
([#5159](https://github.com/bootstrap-vue/bootstrap-vue/issues/5159))
60+
([c4ead33](https://github.com/bootstrap-vue/bootstrap-vue/commit/c4ead3302b176e4a90fbfcfe6380de0edc22640f))
61+
62+
### Other v2.12.0
63+
64+
- documentation updates
65+
- dev dependency updates
66+
567
<a name="2.11.0"></a>
668

769
## [v2.11.0](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.10.1...v2.11.0)
@@ -901,8 +963,8 @@ Read the following migration guide for more details.
901963
`$bv-popover-color-level` have been removed. Use variables `$b-popover-bg-level`,
902964
`$b-popover-border-level`, and `$b-popover-color-level` (respectively) instead.
903965

904-
Please refer to the [documentation](https://bootstrap-vue.js.org/) for the latest usage and
905-
examples, and below for a list of fixes and new features.
966+
Please refer to the [documentation](https://bootstrap-vue.org/) for the latest usage and examples,
967+
and below for a list of fixes and new features.
906968

907969
### Bug Fixes v2.0.0
908970

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
## Playground & Issue reports
66

77
If you want to play with BootstrapVue components without any local setup just head to our
8-
[Online Playground](https://bootstrap-vue.js.org/play) and you can interactively play and test
8+
[Online Playground](https://bootstrap-vue.org/play) and you can interactively play and test
99
components with a fresh Vue instance. If you want to keep your changes or make PRs reporting a
1010
component's misbehaviour you can save them to _CodePen_, _CodeSandbox_ or _JSFiddle_ and provide
1111
that link in issues.

0 commit comments

Comments
 (0)