Skip to content

Commit 3f6f840

Browse files
author
Issayah
authored
Merge branch 'dev' into specify-specific-cdn-versions
2 parents a7024aa + 85a9e65 commit 3f6f840

File tree

294 files changed

+3702
-2295
lines changed

Some content is hidden

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

294 files changed

+3702
-2295
lines changed

‎.bundlewatch.config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
},
4343
{
4444
"path": "./dist/bootstrap-vue.common.js",
45-
"maxSize": "355 kB"
45+
"maxSize": "360 kB"
4646
},
4747
{
4848
"path": "./dist/bootstrap-vue.common.min.js",
49-
"maxSize": "235 kB"
49+
"maxSize": "240 kB"
5050
},
5151
{
5252
"path": "./dist/bootstrap-vue.esm.js",

‎.eslintrc.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ module.exports = {
1515
es6: true,
1616
'jest/globals': true
1717
},
18-
globals: {
19-
Vue: true
20-
},
2118
rules: {
2219
'no-unused-vars': [
2320
'error',

‎.github/workflows/build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
- dev
1111
- master
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
build:
1518
runs-on: ${{ matrix.os }}
@@ -21,10 +24,10 @@ jobs:
2124

2225
steps:
2326
- name: Clone repository
24-
uses: actions/checkout@v2
27+
uses: actions/checkout@v3
2528

2629
- name: Set Node.js version
27-
uses: actions/setup-node@v2.1.5
30+
uses: actions/setup-node@v3.5.1
2831
with:
2932
node-version: ${{ matrix.node }}
3033

@@ -33,7 +36,7 @@ jobs:
3336
run: echo "::set-output name=dir::$(yarn cache dir)"
3437

3538
- name: Cache node_modules
36-
uses: actions/cache@v2.1.5
39+
uses: actions/cache@v3.0.11
3740
with:
3841
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
3942
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}

‎.github/workflows/codeql.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,30 @@ on:
1515
schedule:
1616
- cron: "0 2 * * 5"
1717

18+
permissions:
19+
contents: read
20+
1821
jobs:
1922
analyze:
23+
permissions:
24+
actions: read # for github/codeql-action/init to get workflow details
25+
contents: read # for actions/checkout to fetch code
26+
security-events: write # for github/codeql-action/autobuild to send a status report
2027
name: Analyze
2128
runs-on: ubuntu-latest
2229

2330
steps:
2431
- name: Checkout repository
25-
uses: actions/checkout@v2
32+
uses: actions/checkout@v3
2633

2734
# Initializes the CodeQL tools for scanning.
2835
- name: Initialize CodeQL
29-
uses: github/codeql-action/init@v1
36+
uses: github/codeql-action/init@v2
3037
with:
3138
languages: "javascript"
3239

3340
- name: Autobuild
34-
uses: github/codeql-action/autobuild@v1
41+
uses: github/codeql-action/autobuild@v2
3542

3643
- name: Perform CodeQL Analysis
37-
uses: github/codeql-action/analyze@v1
44+
uses: github/codeql-action/analyze@v2

‎.github/workflows/test.yml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
- dev
1111
- master
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
lint:
1518
runs-on: ${{ matrix.os }}
@@ -21,10 +24,10 @@ jobs:
2124

2225
steps:
2326
- name: Clone repository
24-
uses: actions/checkout@v2
27+
uses: actions/checkout@v3
2528

2629
- name: Set Node.js version
27-
uses: actions/setup-node@v2.1.5
30+
uses: actions/setup-node@v3.5.1
2831
with:
2932
node-version: ${{ matrix.node }}
3033

@@ -33,7 +36,7 @@ jobs:
3336
run: echo "::set-output name=dir::$(yarn cache dir)"
3437

3538
- name: Cache node_modules
36-
uses: actions/cache@v2.1.5
39+
uses: actions/cache@v3.0.11
3740
with:
3841
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
3942
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -58,10 +61,10 @@ jobs:
5861

5962
steps:
6063
- name: Clone repository
61-
uses: actions/checkout@v2
64+
uses: actions/checkout@v3
6265

6366
- name: Set Node.js version
64-
uses: actions/setup-node@v2.1.5
67+
uses: actions/setup-node@v3.5.1
6568
with:
6669
node-version: ${{ matrix.node }}
6770

@@ -70,7 +73,7 @@ jobs:
7073
run: echo "::set-output name=dir::$(yarn cache dir)"
7174

7275
- name: Cache node_modules
73-
uses: actions/cache@v2.1.5
76+
uses: actions/cache@v3.0.11
7477
with:
7578
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
7679
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -95,10 +98,10 @@ jobs:
9598

9699
steps:
97100
- name: Clone repository
98-
uses: actions/checkout@v2
101+
uses: actions/checkout@v3
99102

100103
- name: Set Node.js version
101-
uses: actions/setup-node@v2.1.5
104+
uses: actions/setup-node@v3.5.1
102105
with:
103106
node-version: ${{ matrix.node }}
104107

@@ -107,7 +110,7 @@ jobs:
107110
run: echo "::set-output name=dir::$(yarn cache dir)"
108111

109112
- name: Cache node_modules
110-
uses: actions/cache@v2.1.5
113+
uses: actions/cache@v3.0.11
111114
with:
112115
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
113116
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -122,8 +125,19 @@ jobs:
122125
- name: Test unit
123126
run: yarn run test:unit --coverage --maxWorkers=2
124127

128+
- name: Test unit (Vue 3)
129+
run: yarn run test:unit --coverage --maxWorkers=2
130+
env:
131+
USE_VUE3: '1'
132+
133+
- name: Merge coverage
134+
run:
135+
npx istanbul-merge --out ./coverage-final.json coverage/coverage-final.json
136+
coverage-vue3/coverage-final.json
137+
125138
- name: CodeCov
126-
uses: codecov/codecov-action@v1
139+
uses: codecov/codecov-action@v3.1.1
127140
with:
128141
token: ${{ secrets.CODECOV_TOKEN }}
129142
flags: unittests
143+
files: ./coverage-final.json

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
.vercel/
55
.vscode/
66
coverage/
7+
coverage-vue3/
78
dist/
89
docs-dist/
910
esm/

0 commit comments

Comments
 (0)