Skip to content

Commit 633e99f

Browse files
tmorehousetmorehouse
authored
Merge branch 'dev' into tmorehouse/table-multi-sort
2 parents e5c0711 + 55787dd commit 633e99f

34 files changed

+1096
-251
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2032,7 +2032,7 @@ Released: (2019-02-14)
20322032
- **table:** add support for transitions on tbody element
20332033
([#1821](https://github.com/bootstrap-vue/bootstrap-vue/issues/1821))
20342034
([#2450](https://github.com/bootstrap-vue/bootstrap-vue/issues/2450))
2035-
([91514af](https://github.com/bootstrap-vue/bootstrap-vue/commit/91514af))
2035+
([91514af](https://github.com/bootstrap-vue/bootstrap-vue/commit/91514af445221286ef0bc55985556d58e3c54fdc))
20362036
- **table:** add table row middle click (auxclicked) event
20372037
([#2425](https://github.com/bootstrap-vue/bootstrap-vue/issues/2425))
20382038
([23250a2](https://github.com/bootstrap-vue/bootstrap-vue/commit/23250a2))
@@ -2261,7 +2261,7 @@ Released: 2018-04-01
22612261
### Bug Fixes v2.0.0-rc.4
22622262

22632263
- **build:** don't exclude lodash.get
2264-
([543c3c2](https://github.com/bootstrap-vue/bootstrap-vue/commit/543c3c2))
2264+
([543c3c2](https://github.com/bootstrap-vue/bootstrap-vue/commit/543c3c2f9aeccffb03c571aeea93333774243ab3))
22652265
- **card:** pass children instead of default prop to sub-components
22662266
([63b35e3](https://github.com/bootstrap-vue/bootstrap-vue/commit/63b35e3))
22672267

‎CONTRIBUTING.md

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,40 @@
22

33
> 👍🎉 First off, thanks for taking the time to contribute! 🎉👍
44
5-
## Playground & Issue Reports
5+
## Playground & Issue reports
66

7-
If you want to play with BootstrapVue components without any local setup just head to
8-
[OnlinePlayground](https://bootstrap-vue.js.org/play) and you can interactively play and test
7+
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
99
components with a fresh Vue instance. If you want to keep your changes or make PRs reporting a
10-
component's misbehaviour you can save them in JSFiddle and provide that link in issues.
10+
component's misbehaviour you can save them to _CodePen_, _CodeSandbox_ or _JSFiddle_ and provide
11+
that link in issues.
1112

1213
## Setup
1314

1415
- Clone this repo (`git clone https://github.com/bootstrap-vue/bootstrap-vue --branch=dev`)
15-
- Make sure you have node & yarn installed locally.
16+
- Make sure you have `node` & `yarn` installed locally
1617
- `cd bootstrap-vue`
17-
- Run `yarn install` to get all dependencies installed.
18+
- Run `yarn install` to get all dependencies installed
1819

1920
## Work on components
2021

2122
If you want to hack and improve components locally, you can follow these steps:
2223

23-
- Run `yarn docs-dev` to run a local development server.
24-
- Head to `http://localhost:3000/play`.
25-
- Now you can locally make changes to components (they are located in the `components` directory).
26-
Changes will be applied with webpack hot-reloading without needing to reload the page.
27-
- Finally feel free to share your awesome hacks with others and opening a PR.
24+
- Run `yarn docs-dev` to run a local development server
25+
- Head to `http://localhost:3000/play`
26+
- Now you can locally make changes to components (they are located in the `components` directory)
27+
Changes will be applied with webpack hot-reloading without needing to reload the page
28+
- Finally feel free to share your awesome hacks with others and opening a PR
2829

2930
## Test inside your project
3031

3132
If you want to see your changes in your project instead of the playground:
3233

33-
- Execute `yarn link` inside _bootstrap-vue_ directory.
34+
- Execute `yarn link` inside _bootstrap-vue_ directory
3435
- In your project run `yarn link bootstrap-vue`
3536
- Run `yarn watch` inside _bootstrap-vue_
3637
- Now every time you change a component, a new production version will be built and ready on your
37-
project.
38+
project
3839

3940
## Pull requests
4041

@@ -45,21 +46,21 @@ This is very important, as the `CHANGELOG` is generated from these messages.
4546
Examples:
4647

4748
- `fix(b-modal): fixes some broken modal stuff`
48-
- `feat(b-table): add a feature to the table component!`
49+
- `feat(b-table): add a feature to the table component`
4950

5051
## Financial contributions
5152

5253
We also welcome financial contributions in full transparency on our
53-
[open collective](https://opencollective.com/bootstrap-vue). Anyone can file an expense. If the
54+
[Open Collective](https://opencollective.com/bootstrap-vue). Anyone can file an expense. If the
5455
expense makes sense for the development of the community, it will be "merged" in the ledger of our
5556
open collective by the core contributors and the person who filed the expense will be reimbursed.
5657

5758
Consider asking your company to also support this open source project by
58-
[becoming a sponsor](https://opencollective.com/bootstrap-vue#sponsor)
59+
[becoming a sponsor](https://opencollective.com/bootstrap-vue/contribute/).
5960

6061
## Contributors
6162

62-
Thank you to all the people who have already contributed to bootstrap-vue!
63+
Thank you to all the people who have already contributed to BootstrapVue!
6364

6465
<div class="p-3 mb-3text-center">
6566
<a href="https://github.com/bootstrap-vue/bootstrap-vue/graphs/contributors" rel="noopener" class="d-inline-block"><img src="https://opencollective.com/bootstrap-vue/contributors.svg?width=890" class="img-fluid"></a>

‎docs/components/componentdoc.vue

Lines changed: 57 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<b-row tag="header" align-v="center">
44
<b-col sm="9">
55
<anchored-heading :id="`comp-ref-${componentName}`" level="3">
6-
<code class="notranslate" translate="no">{{ tag }}</code>
6+
<code class="notranslate bigger" translate="no">{{ tag }}</code>
77
</anchored-heading>
88
<b-badge
99
v-if="componentFunctional"
@@ -21,8 +21,42 @@
2121
</b-col>
2222
</b-row>
2323

24+
<ul class="component-ref-mini-toc my-3">
25+
<li v-if="aliases && aliases.length > 0">
26+
<a :href="`#comp-ref-${componentName}-aliases`">
27+
<code class="notranslate" translate="no">{{ tag }}</code> Component aliases
28+
</a>
29+
</li>
30+
<li v-if="propsItems && propsItems.length > 0">
31+
<a :href="`#comp-ref-${componentName}-props`">
32+
<code class="notranslate" translate="no">{{ tag }}</code> Properties
33+
</a>
34+
</li>
35+
<li v-if="componentVModel">
36+
<a :href="`#comp-ref-${componentName}-v-model`">
37+
<code class="notranslate" translate="no">{{ tag }}</code> v-model
38+
</a>
39+
</li>
40+
<li v-if="slots && slots.length > 0">
41+
<a :href="`#comp-ref-${componentName}-slots`">
42+
<code class="notranslate" translate="no">{{ tag }}</code> Slots
43+
</a>
44+
</li>
45+
<li v-if="events && events.length > 0">
46+
<a :href="`#comp-ref-${componentName}-events`">
47+
<code class="notranslate" translate="no">{{ tag }}</code> Events
48+
</a>
49+
</li>
50+
<li v-if="rootEventListeners && rootEventListeners.length > 0">
51+
<a :href="`#comp-ref-${componentName}-rootEventListeners`">
52+
<code class="notranslate" translate="no">{{ tag }}</code>
53+
<code class="notranslate" translate="no">$root</code> Event Listeners
54+
</a>
55+
</li>
56+
</ul>
57+
2458
<article v-if="aliases && aliases.length > 0" class="bd-content">
25-
<anchored-heading :id="`comp-ref-${componentName}-aliases`" level="4">
59+
<anchored-heading :id="`comp-ref-${componentName}-aliases`" level="4" class="mb-3">
2660
Component aliases
2761
</anchored-heading>
2862
<p><code class="notranslate" translate="no">{{ tag }}</code> can also be used via the following aliases:</p>
@@ -40,7 +74,7 @@
4074
</article>
4175

4276
<article v-if="propsItems && propsItems.length > 0" class="bd-content">
43-
<anchored-heading :id="`comp-ref-${componentName}-props`" level="4">
77+
<anchored-heading :id="`comp-ref-${componentName}-props`" level="4" class="mb-3">
4478
Properties
4579
</anchored-heading>
4680
<b-table
@@ -100,7 +134,7 @@
100134
</article>
101135

102136
<article v-if="componentVModel" class="bd-content">
103-
<anchored-heading :id="`comp-ref-${componentName}-v-model`" level="4">
137+
<anchored-heading :id="`comp-ref-${componentName}-v-model`" level="4" class="mb-3">
104138
v-model
105139
</anchored-heading>
106140
<b-table-lite
@@ -120,7 +154,7 @@
120154
</article>
121155

122156
<article v-if="slots && slots.length > 0" class="bd-content">
123-
<anchored-heading :id="`comp-ref-${componentName}-slots`" level="4">
157+
<anchored-heading :id="`comp-ref-${componentName}-slots`" level="4" class="mb-3">
124158
Slots
125159
</anchored-heading>
126160
<b-table
@@ -132,8 +166,9 @@
132166
sort-icon-left
133167
striped
134168
>
135-
<template v-slot:cell(name)="{ value }">
169+
<template v-slot:cell(name)="{ value, item }">
136170
<code class="text-nowrap notranslate" translate="no">{{ value }}</code>
171+
<b-badge v-if="item.version" variant="secondary">v{{ item.version }}+</b-badge>
137172
</template>
138173
<template v-slot:cell(scope)="{ value, toggleDetails }">
139174
<b-button
@@ -170,8 +205,9 @@
170205
</b-th>
171206
</b-tr>
172207
</template>
173-
<template v-slot:cell(prop)="{ value }">
208+
<template v-slot:cell(prop)="{ value, item }">
174209
<code class="text-nowrap notranslate" translate="no">{{ value }}</code>
210+
<b-badge v-if="item.version" variant="secondary">v{{ item.version }}+</b-badge>
175211
</template>
176212
<template v-slot:cell(type)="{ value }">
177213
<span v-if="value" class="text-nowrap notranslate" translate="no">{{ value }}</span>
@@ -184,7 +220,7 @@
184220
</article>
185221

186222
<article v-if="events && events.length > 0" class="bd-content">
187-
<anchored-heading :id="`comp-ref-${componentName}-events`" level="4">
223+
<anchored-heading :id="`comp-ref-${componentName}-events`" level="4" class="mb-3">
188224
Events
189225
</anchored-heading>
190226
<b-table
@@ -195,8 +231,9 @@
195231
responsive="sm"
196232
striped
197233
>
198-
<template v-slot:cell(event)="{ value }">
234+
<template v-slot:cell(event)="{ value, item }">
199235
<code class="notranslate" translate="no">{{ value }}</code>
236+
<b-badge v-if="item.version" variant="secondary">v{{ item.version }}+</b-badge>
200237
</template>
201238
<template v-slot:cell(args)="{ value, item }">
202239
<p
@@ -214,7 +251,7 @@
214251
</article>
215252

216253
<article v-if="rootEventListeners && rootEventListeners.length > 0" class="bd-content">
217-
<anchored-heading :id="`comp-ref-${componentName}-rootEventListeners`" level="4">
254+
<anchored-heading :id="`comp-ref-${componentName}-rootEventListeners`" level="4" class="mb-3">
218255
<code class="notranslate" translate="no">$root</code> Event Listeners
219256
</anchored-heading>
220257
<p>
@@ -229,8 +266,9 @@
229266
responsive="sm"
230267
striped
231268
>
232-
<template v-slot:cell(event)="{ value }">
269+
<template v-slot:cell(event)="{ value, item }">
233270
<code class="text-nowrap notranslate" translate="no">{{ value }}</code>
271+
<b-badge v-if="item.version" variant="secondary">v{{ item.version }}+</b-badge>
234272
</template>
235273
<template v-slot:cell(args)="{ value, item }">
236274
<p
@@ -257,6 +295,14 @@ h3::before {
257295
content: '';
258296
}
259297
298+
code.bigger {
299+
font-size: 105%;
300+
}
301+
302+
ul.component-ref-mini-toc:empty {
303+
display: none;
304+
}
305+
260306
/deep/ .word-wrap-normal {
261307
white-space: normal !important;
262308
word-break: normal !important;

‎docs/markdown/intro/README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -742,8 +742,15 @@ above for an example.
742742

743743
## Tooling support
744744

745+
BootstrapVue provides additional helper files for auto completion in popular IDE editors.
746+
745747
### VS Code + Vetur
746748

747749
If you are using [VS Code](https://code.visualstudio.com/) as your text editor, BootstrapVue has
748-
intellisense autocompletion for component attributes available when using the
749-
[Vetur extension](https://marketplace.visualstudio.com/items?itemName=octref.vetur).
750+
intellisense autocompletion for component attributes and directives available via the
751+
`dist/vetur-tags.json` and `dist/vetur-attributes.json` files.
752+
753+
### JetBrains WebStorm (and compatible)
754+
755+
For [WebStorm](https://www.jetbrains.com/webstorm/) editor (or web-types compatible), BootstrapVue
756+
provides the file `dist/web-types.json` for component attribute and directive auto-completion.

‎package.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@
1010
"sass": "src/index.scss",
1111
"style": "dist/bootstrap-vue.css",
1212
"license": "MIT",
13-
"types": "src/index.d.ts",
1413
"repository": "bootstrap-vue/bootstrap-vue",
1514
"homepage": "https://bootstrap-vue.js.org",
15+
"types": "src/index.d.ts",
16+
"web-types": "dist/web-types.json",
17+
"vetur": {
18+
"tags": "dist/vetur-tags.json",
19+
"attributes": "dist/vetur-attributes.json"
20+
},
1621
"contributors": [
1722
{
1823
"name": "Pooya Parsa",
@@ -74,7 +79,7 @@
7479
"dependencies": {
7580
"@nuxt/opencollective": "^0.3.0",
7681
"bootstrap": ">=4.3.1 <5.0.0",
77-
"popper.js": "^1.15.0",
82+
"popper.js": "^1.16.0",
7883
"portal-vue": "^2.1.6",
7984
"vue-functional-data-merge": "^3.1.0"
8085
},
@@ -88,7 +93,7 @@
8893
"@nuxtjs/google-analytics": "^2.2.0",
8994
"@nuxtjs/pwa": "^3.0.0-beta.19",
9095
"@vue/test-utils": "^1.0.0-beta.29",
91-
"autoprefixer": "^9.6.4",
96+
"autoprefixer": "^9.6.5",
9297
"babel-core": "^7.0.0-bridge.0",
9398
"babel-eslint": "^10.0.3",
9499
"babel-jest": "^24.9.0",
@@ -104,7 +109,7 @@
104109
"eslint-config-standard": "^14.1.0",
105110
"eslint-config-vue": "^2.0.2",
106111
"eslint-plugin-import": "^2.18.2",
107-
"eslint-plugin-jest": "^22.17.0",
112+
"eslint-plugin-jest": "^22.19.0",
108113
"eslint-plugin-markdown": "^1.0.0",
109114
"eslint-plugin-node": "^10.0.0",
110115
"eslint-plugin-prettier": "^3.1.1",
@@ -125,13 +130,13 @@
125130
"postcss-cli": "^6.1.3",
126131
"prettier": "1.14.3",
127132
"require-context": "^1.1.0",
128-
"rollup": "^1.23.1",
133+
"rollup": "^1.24.0",
129134
"rollup-plugin-babel": "^4.3.3",
130135
"rollup-plugin-commonjs": "^10.1.0",
131136
"rollup-plugin-node-resolve": "^5.2.0",
132137
"sass-loader": "^8.0.0",
133138
"standard-version": "^7.0.0",
134-
"terser": "^4.3.8",
139+
"terser": "^4.3.9",
135140
"vue": "^2.6.10",
136141
"vue-jest": "^3.0.5",
137142
"vue-router": "^3.1.3",

‎scripts/build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,9 @@ cd ..
8484
echo 'Done.'
8585
echo ''
8686

87+
echo 'Building IDE auto-complete helper files...'
88+
node -r esm scripts/create-web-types.js || exit 1
89+
echo 'Done.'
90+
echo ''
91+
8792
echo 'Done building assets.'

0 commit comments

Comments
 (0)