Skip to content

Commit 4910f6b

Browse files
dflockdflock
authored
Merge branch 'dev' into table-header-context-click
2 parents 110e81f + 7d62956 commit 4910f6b

35 files changed

+8312
-4374
lines changed

‎.bundlewatch.config.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
"files": [
33
{
44
"path": "./dist/bootstrap-vue-icons.js",
5-
"maxSize": "140 kB"
5+
"maxSize": "145 kB"
66
},
77
{
88
"path": "./dist/bootstrap-vue-icons.min.js",
9-
"maxSize": "130 kB"
9+
"maxSize": "135 kB"
1010
},
1111
{
1212
"path": "./dist/bootstrap-vue-icons.common.js",
13-
"maxSize": "140 kB"
13+
"maxSize": "145 kB"
1414
},
1515
{
1616
"path": "./dist/bootstrap-vue-icons.common.min.js",
17-
"maxSize": "130 kB"
17+
"maxSize": "135 kB"
1818
},
1919
{
2020
"path": "./dist/bootstrap-vue-icons.esm.js",
21-
"maxSize": "140 kB"
21+
"maxSize": "145 kB"
2222
},
2323
{
2424
"path": "./dist/bootstrap-vue-icons.esm.min.js",
25-
"maxSize": "130 kB"
25+
"maxSize": "135 kB"
2626
},
2727
{
2828
"path": "./dist/bootstrap-vue-icons.css",
@@ -42,19 +42,19 @@
4242
},
4343
{
4444
"path": "./dist/bootstrap-vue.common.js",
45-
"maxSize": "340 kB"
45+
"maxSize": "345 kB"
4646
},
4747
{
4848
"path": "./dist/bootstrap-vue.common.min.js",
49-
"maxSize": "220 kB"
49+
"maxSize": "225 kB"
5050
},
5151
{
5252
"path": "./dist/bootstrap-vue.esm.js",
53-
"maxSize": "340 kB"
53+
"maxSize": "345 kB"
5454
},
5555
{
5656
"path": "./dist/bootstrap-vue.esm.min.js",
57-
"maxSize": "220 kB"
57+
"maxSize": "225 kB"
5858
},
5959
{
6060
"path": "./dist/bootstrap-vue.css",

‎.eslintrc.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
module.exports = {
2-
extends: ['standard', 'plugin:vue/recommended', 'plugin:prettier/recommended'],
3-
plugins: ['jest', 'markdown', 'node', 'promise'],
2+
extends: [
3+
'standard',
4+
'plugin:vue/recommended',
5+
'plugin:prettier/recommended',
6+
'plugin:markdown/recommended'
7+
],
8+
plugins: ['jest', 'node', 'promise'],
49
parserOptions: {
510
parser: 'babel-eslint',
611
sourceType: 'module'

‎.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@ updates:
2222
ignore:
2323
- dependency-name: "bootstrap"
2424
versions: [">=5.0.0"]
25+
- dependency-name: "clean-css-cli"
26+
versions: [">=5.0.0"]
27+
- dependency-name: "html-loader"
28+
versions: [">=2.0.0"]
2529
- dependency-name: "prettier"
2630
versions: [">1.14.3"]
31+
- dependency-name: "sass-loader"
32+
versions: [">=11.0.0"]
2733
- dependency-name: "@vue/test-utils"
2834
versions: [">=2.0.0"]
2935
reviewers:

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
os: [ubuntu-latest]
20-
node: [10, 12, 14]
20+
node: [12, 14, 16]
2121

2222
steps:
2323
- name: Clone repository
@@ -33,7 +33,7 @@ jobs:
3333
run: echo "::set-output name=dir::$(yarn cache dir)"
3434

3535
- name: Cache node_modules
36-
uses: actions/cache@v2.1.4
36+
uses: actions/cache@v2.1.5
3737
with:
3838
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
3939
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -50,6 +50,6 @@ jobs:
5050

5151
- name: BundleWatch
5252
run: yarn run bundlewatch
53-
if: matrix.node == '14'
53+
if: matrix.node == '16'
5454
env:
5555
BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"

‎.github/workflows/codeql.yml

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@ name: "CodeQL"
22

33
on:
44
push:
5+
branches:
6+
- dev
7+
- master
8+
- "!dependabot/**"
59
pull_request:
10+
# The branches below must be a subset of the branches above
11+
branches:
12+
- dev
13+
- master
14+
- "!dependabot/**"
615
schedule:
716
- cron: "0 2 * * 5"
817

@@ -11,48 +20,18 @@ jobs:
1120
name: Analyze
1221
runs-on: ubuntu-latest
1322

14-
strategy:
15-
fail-fast: false
16-
matrix:
17-
language: ["javascript"]
18-
1923
steps:
2024
- name: Checkout repository
2125
uses: actions/checkout@v2
22-
with:
23-
# We must fetch at least the immediate parents so that if this is
24-
# a pull request then we can checkout the head
25-
fetch-depth: 2
26-
27-
# If this run was triggered by a pull request event, then checkout
28-
# the head of the pull request instead of the merge commit
29-
- run: git checkout HEAD^2
30-
if: ${{ github.event_name == 'pull_request' }}
3126

3227
# Initializes the CodeQL tools for scanning.
3328
- name: Initialize CodeQL
3429
uses: github/codeql-action/init@v1
3530
with:
36-
languages: ${{ matrix.language }}
37-
# If you wish to specify custom queries, you can do so here or in a config file
38-
# By default, queries listed here will override any specified in a config file
39-
# Prefix the list here with "+" to use these queries and those in the config file
40-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
31+
languages: "javascript"
4132

42-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java)
43-
# If this step fails, then you should remove it and run the build manually (see below)
4433
- name: Autobuild
4534
uses: github/codeql-action/autobuild@v1
4635

47-
# ℹ️ Command-line programs to run using the OS shell.
48-
# 📚 https://git.io/JvXDl
49-
50-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines and
51-
# modify them (or add more) to build your code if your project uses a compiled language
52-
53-
#- run: |
54-
# make bootstrap
55-
# make release
56-
5736
- name: Perform CodeQL Analysis
5837
uses: github/codeql-action/analyze@v1

‎.github/workflows/test.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
os: [ubuntu-latest]
20-
node: [14]
20+
node: [16]
2121

2222
steps:
2323
- name: Clone repository
@@ -33,7 +33,7 @@ jobs:
3333
run: echo "::set-output name=dir::$(yarn cache dir)"
3434

3535
- name: Cache node_modules
36-
uses: actions/cache@v2.1.4
36+
uses: actions/cache@v2.1.5
3737
with:
3838
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
3939
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
matrix:
5656
os: [ubuntu-latest]
57-
node: [14]
57+
node: [16]
5858

5959
steps:
6060
- name: Clone repository
@@ -70,7 +70,7 @@ jobs:
7070
run: echo "::set-output name=dir::$(yarn cache dir)"
7171

7272
- name: Cache node_modules
73-
uses: actions/cache@v2.1.4
73+
uses: actions/cache@v2.1.5
7474
with:
7575
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
7676
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -91,7 +91,7 @@ jobs:
9191
strategy:
9292
matrix:
9393
os: [ubuntu-latest]
94-
node: [10, 12, 14]
94+
node: [12, 14, 16]
9595

9696
steps:
9797
- name: Clone repository
@@ -107,7 +107,7 @@ jobs:
107107
run: echo "::set-output name=dir::$(yarn cache dir)"
108108

109109
- name: Cache node_modules
110-
uses: actions/cache@v2.1.4
110+
uses: actions/cache@v2.1.5
111111
with:
112112
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
113113
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -124,7 +124,6 @@ jobs:
124124

125125
- name: CodeCov
126126
uses: codecov/codecov-action@v1
127-
if: matrix.node == '14'
128127
with:
129128
token: ${{ secrets.CODECOV_TOKEN }}
130129
flags: unittests

‎.husky/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

‎.husky/pre-commit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
yarn lint-staged

‎docs/content/themes/vuexy-admin-dashboard.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
title: 'Vuexy - Admin Dashboard'
2+
type: 'dashboard'
3+
category: 'Admin & Dashboard'
4+
img: 'https://www.pixinvent.com/demo/vuexy-html-bootstrap-admin-template/item-page/bootstrap-vue.jpg'
5+
href: 'https://1.envato.market/WDyA1O'
6+
description: 'Vuexy is a production ready, carefully crafted, extensive Admin Dashboard. It is mainly powered by BootstrapVue and the Vue.js Composition API. The dashboard is API powered with JWT Authentication and ability based access control.'
7+
provider: 'PIXINVENT'
8+
price: '$32.00'

‎docs/markdown/intro/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -712,18 +712,18 @@ JavaScript files.
712712
<!-- Add this to <head> -->
713713

714714
<!-- Load required Bootstrap and BootstrapVue CSS -->
715-
<link type="text/css" rel="stylesheet" href="//unpkg.com/bootstrap/dist/css/bootstrap.min.css" />
716-
<link type="text/css" rel="stylesheet" href="//unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.min.css" />
715+
<link type="text/css" rel="stylesheet" href="https://unpkg.com/bootstrap/dist/css/bootstrap.min.css" />
716+
<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 -->
719-
<script src="//polyfill.io/v3/polyfill.min.js?features=es2015%2CIntersectionObserver" crossorigin="anonymous"></script>
719+
<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="//unpkg.com/vue@latest/dist/vue.min.js"></script>
723-
<script src="//unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.min.js"></script>
722+
<script src="https://unpkg.com/vue@latest/dist/vue.min.js"></script>
723+
<script src="https://unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.min.js"></script>
724724

725725
<!-- Load the following for BootstrapVueIcons support -->
726-
<script src="//unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue-icons.min.js"></script>
726+
<script src="https://unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue-icons.min.js"></script>
727727
```
728728

729729
## Build variants

‎docs/nuxt.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ renderer.code = (code, language) => {
5858
}
5959

6060
const validLang = !!(language && hljs.getLanguage(language))
61-
const highlighted = validLang ? hljs.highlight(language, code).value : code
61+
const highlighted = validLang ? hljs.highlight(code, { language }).value : code
6262

6363
const attrsMarkup = Object.keys(attrs).reduce(
6464
(markup, attr) => `${markup}${markup ? ' ' : ''}${attr}="${attrs[attr]}"`,

‎docs/utils/marked-loader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ const marked = require('marked')
77
const { getOptions } = require('loader-utils')
88

99
module.exports = function(markdown) {
10-
// merge params and default config
10+
// Merge params and default config
1111
const options = getOptions(this)
1212
// Make results cacheable
1313
this.cacheable()
1414
// Pass our options
1515
marked.setOptions(options)
1616
// Return the converted file as HTML
1717
const html = marked(markdown) || ''
18-
// Mark certain elements as translate="no"
18+
// Mark certain elements as `translate="no"`
1919
return html.replace(/<(kbd|code|samp)>/gi, '<$1 class="notranslate" translate="no">')
2020
}

0 commit comments

Comments
 (0)