8000 Merge branch 'dev' into simplify-sidebar-scss · bootstrap-vue/bootstrap-vue@91a28c9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 91a28c9

Browse files
mmilanommilano
authored
Merge branch 'dev' into simplify-sidebar-scss
2 parents c49ce86 + a704ccc commit 91a28c9

File tree

21 files changed

+1091
-250
lines changed

21 files changed

+1091
-250
lines changed

‎.github/workflows/build.yml

Lines changed: 55 additions & 0 deletions
< 57AE td data-grid-cell-id="diff-5c3fa597431eda03ac3339ae6bf7f05e1a50d6fc7333679ec38e21b337cb6721-empty-3-2" data-line-anchor="diff-5c3fa597431eda03ac3339ae6bf7f05e1a50d6fc7333679ec38e21b337cb6721R3" data-selected="false" role="gridcell" style="background-color:var(--diffBlob-additionLine-bgColor, var(--diffBlob-addition-bgColor-line));padding-right:24px" tabindex="-1" valign="top" class="focusable-grid-cell diff-text-cell right-side-diff-cell left-side">+
on:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Build
2+
3
4+
push:
5+
branches:
6+
- dev
7+
- master
8+
pull_request:
9+
branches:
10+
- dev
11+
- master
12+
13+
jobs:
14+
build:
15+
runs-on: ${{ matrix.os }}
16+
17+
strategy:
18+
matrix:
19+
os: [ubuntu-latest]
20+
node: [10, 12]
21+
22+
steps:
23+
- name: Clone repository
24+
uses: actions/checkout@v2
25+
26+
- name: Set Node.js version
27+
uses: actions/setup-node@v1
28+
with:
29+
node-version: ${{ matrix.node }}
30+
31+
- name: Get yarn cache directory path
32+
id: yarn-cache-dir-path
33+
run: echo "::set-output name=dir::$(yarn cache dir)"
34+
35+
- name: Cache node_modules
36+
uses: actions/cache@v2
37+
with:
38+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
39+
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
40+
restore-keys: |
41+
${{ matrix.os }}-node-v${{ matrix.node }}-yarn-
42+
${{ matrix.os }}-node-v${{ matrix.node }}-
43+
${{ matrix.os }}-
44+
45+
- name: Install dependencies
46+
run: yarn install --check-files --frozen-lockfile --non-interactive
47+
48+
- name: Build
49+
run: yarn run build
50+
51+
- name: BundleWatch
52+
run: yarn run bundlewatch
53+
if: matrix.node == '12'
54+
env:
55+
BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_TOKEN }}"

‎.github/workflows/test.yml

Lines changed: 38 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ on:
1111
- master
1212

1313
jobs:
14-
setup:
14+
lint:
1515
runs-on: ${{ matrix.os }}
16-
if: github.event_name == 'push' || !(github.base_ref == 'master' && github.head_ref == 'dev')
1716

1817
strategy:
1918
matrix:
2019
os: [ubuntu-latest]
21-
node: [10, 12]
20+
node: [12]
2221

2322
steps:
2423
- name: Clone repository
@@ -34,53 +33,22 @@ jobs:
3433
run: echo "::set-output name=dir::$(yarn cache dir)"
3534

3635
- name: Cache node_modules
37-
uses: actions/cache@v1
36+
uses: actions/cache@v2
3837
with:
3938
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
40-
key: ${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
39+
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
4140
restore-keys: |
42-
${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
43-
${{ runner.OS }}-node-v${{ matrix.node }}-
44-
${{ runner.OS }}-
41+
${{ matrix.os }}-node-v${{ matrix.node }}-yarn-
42+
${{ matrix.os }}-node-v${{ matrix.node }}-
43+
${{ matrix.os }}-
4544
4645
- name: Install dependencies
4746
run: yarn install --check-files --frozen-lockfile --non-interactive
4847

49-
- name: Cache workspace
50-
uses: actions/cache@v1
51-
with:
52-
path: ${{ github.workspace }}
53-
key: ${{ matrix.os }}-node-v${{ matrix.node }}-bootstrap-vue-${{ github.sha }}
54-
55-
lint:
56-
needs: setup
57-
runs-on: ${{ matrix.os }}
58-
59-
strategy:
60-
matrix:
61-
os: [ubuntu-latest]
62-
node: [12]
63-
64-
steps:
65-
- name: Clone repository
66-
uses: actions/checkout@v2
67-
68-
- name: Set Node.js version
69-
uses: actions/setup-node@v1
70-
with:
71-
node-version: ${{ matrix.node }}
72-
73-
- name: Restore workspace cache
74-
uses: actions/cache@v1
75-
with:
76-
path: ${{ github.workspace }}
77-
key: ${{ matrix.os }}-node-v${{ matrix.node }}-bootstrap-vue-${{ github.sha }}
78-
7948
- name: Lint
8049
run: yarn run test:lint
8150

8251
audit:
83-
needs: setup
8452
runs-on: ${{ matrix.os }}
8553

8654
strategy:
@@ -97,17 +65,27 @@ jobs:
9765
with:
9866
node-version: ${{ matrix.node }}
9967

100-
- name: Restore workspace cache
101-
uses: actions/cache@v1
68+
- name: Get yarn cache directory path
69+
id: yarn-cache-dir-path
70+
run: echo "::set-output name=dir::$(yarn cache dir)"
71+
72+
- name: Cache node_modules
73+
uses: actions/cache@v2
10274
with:
103-
path: ${{ github.workspace }}
104-
key: ${{ matrix.os }}-node-v${{ matrix.node }}-bootstrap-vue-${{ github.sha }}
75+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
76+
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
77+
restore-keys: |
78+
${{ matrix.os }}-node-v${{ matrix.node }}-yarn-
79+
${{ matrix.os }}-node-v${{ matrix.node }}-
80+
${{ matrix.os }}-
81+
82+
- name: Install dependencies
83+
run: yarn install --check-files --frozen-lockfile --non-interactive
10584

10685
- name: Audit
10786
run: yarn run audit
10887

10988
test-unit:
110-
needs: setup
11189
runs-on: ${{ matrix.os }}
11290

11391
strategy:
@@ -124,86 +102,29 @@ jobs:
124102
with:
125103
node-version: ${{ matrix.node }}
126104

127-
- name: Restore workspace cache
128-
uses: actions/cache@v1
105+
- name: Get yarn cache directory path
106+
id: yarn-cache-dir-path
107+
run: echo "::set-output name=dir::$(yarn cache dir)"
108+
109+
- name: Cache node_modules
110+
uses: actions/cache@v2
129111
with:
130-
path: ${{ github.workspace }}
131-
key: ${{ matrix.os }}-node-v${{ matrix.node }}-bootstrap-vue-${{ github.sha }}
112+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
113+
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
114+
restore-keys: |
115+
${{ matrix.os }}-node-v${{ matrix.node }}-yarn-
116+
${{ matrix.os }}-node-v${{ matrix.node }}-
117+
${{ matrix.os }}-
118+
119+
- name: Install dependencies
120+
run: yarn install --check-files --frozen-lockfile --non-interactive
132121

133122
- name: Test unit
134123
run: yarn run test:unit --coverage --maxWorkers=2
135124

136125
- name: CodeCov
137126
uses: codecov/codecov-action@v1
138-
if: matrix.node == '10'
127+
if: matrix.node == '12'
139128
with:
140129
token: ${{ secrets.CODECOV_TOKEN }}
141130
flags: unittests
142-
143-
build:
144-
needs: setup
145-
runs-on: ${{ matrix.os }}
146-
147-
strategy:
148-
matrix:
149-
os: [ubuntu-latest]
150-
node: [12]
151-
152-
steps:
153-
- name: Clone repository
154-
uses: actions/checkout@v2
155-
156-
- name: Set Node.js version
157-
uses: actions/setup-node@v1
158-
with:
159-
node-version: ${{ matrix.node }}
160-
161-
- name: Restore workspace cache
162-
uses: actions/cache@v1
163-
with:
164-
path: ${{ github.workspace }}
165-
key: ${{ matrix.os }}-node-v${{ matrix.node }}-bootstrap-vue-${{ github.sha }}
166-
167-
- name: Build
168-
run: yarn run build
169-
170-
- name: Upload build files
171-
uses: actions/upload-artifact@v1
172-
with:
173-
name: build-files
174-
path: dist
175-
176-
bundlewatch:
177-
needs: build
178-
runs-on: ${{ matrix.os }}
179-
180-
strategy:
181-
matrix:
182-
os: [ubuntu-latest]
183-
node: [12]
184-
185-
steps:
186-
- name: Clone repository
187-
uses: actions/checkout@v2
188-
189-
- name: Set Node.js version
190-
uses: actions/setup-node@v1
191-
with:
192-
node-version: ${{ matrix.node }}
193-
194-
- name: Restore workspace cache
195-
uses: actions/cache@v1
196-
with:
197-
path: ${{ github.workspace }}
198-
key: ${{ matrix.os }}-node-v${{ matrix.node }}-bootstrap-vue-${{ github.sha }}
199-
200-
- name: Download build files
201-
uses: actions/download-artifact@v1
202-
with:
203-
name: build-files
204-
path: dist
205-
206-
- name: BundleWatch
207-
run: yarn run bundlewatch
208-
env:
209-
BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
<a href="https://codecov.io/gh/bootstrap-vue/bootstrap-vue">
3434
<img src="https://flat.badgen.net/codecov/c/github/bootstrap-vue/bootstrap-vue" alt="Coverage">
3535
</a>
36-
<a href="https://packagequality.com/#?package=bootstrap-vue">
37-
<img src="https://npm.packagequality.com/shield/bootstrap-vue.svg?style=flat-square" alt="Package quality">
36+
<a href="https://app.codacy.com/gh/bootstrap-vue/bootstrap-vue/dashboard">
37+
<img src="https://flat.badgen.net/codacy/grade/8b19182d32514a83baac4dd0ccf5f35c" alt="Code quality">
3838
</a>
3939
<a href="https://www.npmjs.com/package/bootstrap-vue">
4040
<img src="https://flat.badgen.net/npm/dt/bootstrap-vue" alt="npm downloads">
4141
</a>
4242
<a href="https://www.npmjs.com/package/bootstrap-vue">
43-
<img src="https://flat.badgen.net/npm/dw/bootstrap-vue" alt="npm monthly downloads">
43+
<img src="https://flat.badgen.net/npm/dw/bootstrap-vue" alt="npm weekly downloads">
4444
</a>
4545
<br>
4646
<a href="https://opencollective.com/bootstrap-vue#sponsor">

‎docs/components/footer.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919
<li><b-link to="/docs/reference" exact>Reference</b-link></li>
2020
<li><b-link to="/play" exact>Playground</b-link></li>
2121
</ul>
22-
<!-- TODO: Uncomment when we have themes
2322
<h5 class="bd-text-purple-bright mb-1 mt-3">Themes</h5>
2423
<ul class="list-unstyled ml-3">
2524
<li><b-link to="/themes" exact>Themes and dashboards</b-link></li>
2625
</ul>
27-
-->
2826
</b-col>
2927

3028
<b-col cols="auto" class="text-left">

‎docs/components/header.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
<b-nav-item to="/docs/directives" active-class="active" no-prefetch>Directives</b-nav-item>
3636
<b-nav-item to="/docs/icons" active-class="active" no-prefetch>Icons</b-nav-item>
3737
<b-nav-item to="/docs/reference" active-class="active">Reference</b-nav-item>
38-
<!-- TODO: Uncomment when we have themes
3938
<b-nav-item to="/themes" active-class="active" no-prefetch>Themes</b-nav-item>
40-
-->
4139
<b-nav-item to="/play" active-class="active" no-prefetch>Play</b-nav-item>
4240
</b-navbar-nav>
4341
</div>

‎docs/components/sidebar.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
</b-nav>
5252
</b-link>
5353

54-
<!-- TODO: Uncomment when we have themes
5554
<b-link
5655
to="/themes"
5756
router-tag="div"
@@ -69,7 +68,6 @@
6968
Themes
7069
</b-link>
7170
</b-link>
72-
-->
7371

7472
<b-link
7573
to="/play"

‎docs/content/index.js renamed to ‎docs/content.js

File renamed without changes.

‎docs/content/themes/argon-dashboard-pro.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
title: 'BootstrapVue Argon Dashboard PRO'
2+
type: 'dashboard'
3+
category: 'Admin & Dashboard'
4+
img: 'https://raw.githubusercontent.com/creativetimofficial/public-assets/master/bootstrap-vue-argon-dashboard-pro/opt_badp_thumbnail.jpg'
5+
href: 'https://www.creative-tim.com/product/bootstrap-vue-argon-dashboard-pro?partner=134895'
6+
description: 'BootstrapVue Argon Dashboard PRO is a completely new product built on our newest re-built from scratch framework structure that is meant to make our products more intuitive, more adaptive and, needless to say, so much easier to customize. Let Argon amaze you with its cool features and build tools and get your project to a whole new level.'
7+
provider: 'Creative Tim'
8+
price: '$89.00'

‎docs/markdown/intro/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ The online documentation is comprised of the following sections:
2727
- [Icons](/docs/icons) - Icons and icon plugin documentation <b-badge>v2.2.0+</b-badge>
2828
- [Reference](/docs/reference) - Reference information and documentation
2929
- [Playground](/play) - Online playground
30-
31-
<!-- TODO: Uncomment when we have themes
3230
- [Themes](/themes) - Themes and dashboards
33-
-->
3431

3532
## Prerequisites
3633

‎docs/markdown/reference/theming/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ stacked tables, etc). Our custom CSS relies on variables defined the Bootstrap v
99
using the BootstrapVue source SCSS, you can have your variable overrides (such as breakpoints, theme
1010
colors, etc) adjust the custom BootstrapVue css generation.
1111

12-
<!-- TODO: Uncomment when we have themes
1312
For premium dashboards and themes, please refer to the [`Themes section`](/themes) of the
1413
documentation.
15-
-->
1614

1715
## SASS variable defaults
1816

@@ -283,10 +281,8 @@ a {
283281
284282
## See also
285283
286-
<!-- TODO: Uncomment when we have themes
287284
- For premium dashboards and themes, please refer to the [`Themes section`](/themes) of the
288285
documentation.
289-
-->
290286
291287
- If you are defining custom breakpoint names, please see the
292288
[BootstrapVue settings](/docs/reference/settings) page on how to update BootstrapVue `<b-col>` and

‎docs/nuxt.config.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,15 +280,19 @@ module.exports = {
280280
plugins: ['~/plugins/bootstrap-vue.js', '~/plugins/play.js', '~/plugins/docs.js'],
281281

282282
buildModules: ['@nuxtjs/google-analytics'],
283-
modules: ['@nuxtjs/pwa', '@nuxtjs/robots', '@nuxtjs/sitemap'],
283+
modules: ['@nuxt/content', '@nuxtjs/pwa', '@nuxtjs/robots', '@nuxtjs/sitemap'],
284284

285-
'google-analytics': {
285+
googleAnalytics: {
286286
id: GA_TRACKING_ID,
287287
autoTracking: {
288288
exception: true
289289
}
290290
},
291291

292+
content: {
293+
apiPrefix: 'api'
294+
},
295+
292296
// We enable crawling in production docs only
293297
robots: () => {
294298
// In production docs we allow crawling, else we deny crawling

‎docs/pages/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@ export default {
566566
created() {
567567
this.bootstrapUrl = `https://getbootstrap.com/docs/${bootstrapVersionMinor}`
568568
this.bootstrapVersionMajor = bootstrapVersionMajor
569+
this.bootstrapVersionMinor = bootstrapVersionMinor
569570
this.bootstrapIconsCount = bootstrapIconsCount
570571
this.vueVersionMinor = vueVersionMinor
571572
this.version = version

0 commit comments

Comments
 (0)
0