Skip to content

Commit b095b36

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into sorting-negative-numeric-string
2 parents 7005e02 + 573196b commit b095b36

Some content is hidden

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

64 files changed

+54209
-10896
lines changed

‎.bundlewatch.config.json

Lines changed: 11 additions & 11 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": "155 kB"
5+
"maxSize": "240 kB"
66
},
77
{
88
"path": "./dist/bootstrap-vue-icons.min.js",
9-
"maxSize": "145 kB"
9+
"maxSize": "230 kB"
1010
},
1111
{
1212
"path": "./dist/bootstrap-vue-icons.common.js",
13-
"maxSize": "155 kB"
13+
"maxSize": "250 kB"
1414
},
1515
{
1616
"path": "./dist/bootstrap-vue-icons.common.min.js",
17-
"maxSize": "145 kB"
17+
"maxSize": "240 kB"
1818
},
1919
{
2020
"path": "./dist/bootstrap-vue-icons.esm.js",
21-
"maxSize": "155 kB"
21+
"maxSize": "245 kB"
2222
},
2323
{
2424
"path": "./dist/bootstrap-vue-icons.esm.min.js",
25-
"maxSize": "145 kB"
25+
"maxSize": "235 kB"
2626
},
2727
{
2828
"path": "./dist/bootstrap-vue-icons.css",
@@ -42,27 +42,27 @@
4242
},
4343
{
4444
"path": "./dist/bootstrap-vue.common.js",
45-
"maxSize": "360 kB"
45+
"maxSize": "455 kB"
4646
},
4747
{
4848
"path": "./dist/bootstrap-vue.common.min.js",
49-
"maxSize": "240 kB"
49+
"maxSize": "330 kB"
5050
},
5151
{
5252
"path": "./dist/bootstrap-vue.esm.js",
53-
"maxSize": "355 kB"
53+
"maxSize": "450 kB"
5454
},
5555
{
5656
"path": "./dist/bootstrap-vue.esm.min.js",
57-
"maxSize": "235 kB"
57+
"maxSize": "330 kB"
5858
},
5959
{
6060
"path": "./dist/bootstrap-vue.css",
6161
"maxSize": "15 kB"
6262
},
6363
{
6464
"path": "./dist/bootstrap-vue.min.css",
65-
"maxSize": "10 kB"
65+
"maxSize": "15 kB"
6666
}
6767
],
6868
"ci": {

‎.eslintignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
.now/
21
.nuxt/
3-
.vercel/
42
coverage/
53
dist/
64
docs-dist/

‎.github/dependabot.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
strategy:
2121
matrix:
2222
os: [ubuntu-latest]
23-
node: [12, 14, 16]
23+
node: [18, 20, 22]
2424

2525
steps:
2626
- name: Clone repository
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Set Node.js version
30-
uses: actions/setup-node@v3.5.1
30+
uses: actions/setup-node@v3
3131
with:
3232
node-version: ${{ matrix.node }}
3333

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

3838
- name: Cache node_modules
39-
uses: actions/cache@v3.2.2
39+
uses: actions/cache@v4
4040
with:
4141
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
4242
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -53,6 +53,6 @@ jobs:
5353

5454
- name: BundleWatch
5555
run: yarn run bundlewatch
56-
if: matrix.node == '16'
56+
if: matrix.node == '20'
5757
env:
5858
BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"

‎.github/workflows/codeql.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎.github/workflows/docs-deploy.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Deploy docs to GitHub Pages
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- dev
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
# Sets permissions of the "GITHUB_TOKEN" to allow deployment to GitHub Pages
13+
permissions:
14+
contents: read
15+
pages: write
16+
id-token: write
17+
18+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress
19+
# and latest queued. However, do NOT cancel in-progress runs as we want to allow these
20+
# production deployments to complete.
21+
concurrency:
22+
group: "pages"
23+
cancel-in-progress: false
24+
25+
jobs:
26+
# Build
27+
build:
28+
runs-on: ubuntu-latest
29+
steps:
30+
- name: Checkout
31+
uses: actions/checkout@v4
32+
- name: Setup Node
33+
uses: actions/setup-node@v4
34+
with:
35+
node-version: "20"
36+
cache: "yarn"
37+
- name: Setup Pages
38+
uses: actions/configure-pages@v5
39+
- name: Restore cache
40+
uses: actions/cache@v4
41+
with:
42+
path: |
43+
dist
44+
.nuxt
45+
key: ${{ runner.os }}-nuxt-build-${{ hashFiles('dist') }}
46+
restore-keys: |
47+
${{ runner.os }}-nuxt-build-
48+
- name: Install dependencies
49+
run: yarn install --check-files --frozen-lockfile --non-interactive
50+
- name: Static HTML export with Nuxt
51+
run: yarn docs-gen
52+
- name: Upload artifact
53+
uses: actions/upload-pages-artifact@v3
54+
with:
55+
path: ./docs-dist
56+
57+
# Deploy
58+
deploy:
59+
environment:
60+
name: github-pages
61+
url: ${{ steps.deployment.outputs.page_url }}
62+
runs-on: ubuntu-latest
63+
needs: build
64+
steps:
65+
- name: Deploy to GitHub Pages
66+
id: deployment
67+
uses: actions/deploy-pages@v4

‎.github/workflows/test.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
strategy:
2121
matrix:
2222
os: [ubuntu-latest]
23-
node: [16]
23+
node: [20]
2424

2525
steps:
2626
- name: Clone repository
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Set Node.js version
30-
uses: actions/setup-node@v3.5.1
30+
uses: actions/setup-node@v3
3131
with:
3232
node-version: ${{ matrix.node }}
3333

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

3838
- name: Cache node_modules
39-
uses: actions/cache@v3.2.2
39+
uses: actions/cache@v4
4040
with:
4141
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
4242
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -57,14 +57,14 @@ jobs:
5757
strategy:
5858
matrix:
5959
os: [ubuntu-latest]
60-
node: [16]
60+
node: [20]
6161

6262
steps:
6363
- name: Clone repository
64-
uses: actions/checkout@v3
64+
uses: actions/checkout@v4
6565

6666
- name: Set Node.js version
67-
uses: actions/setup-node@v3.5.1
67+
uses: actions/setup-node@v3
6868
with:
6969
node-version: ${{ matrix.node }}
7070

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

7575
- name: Cache node_modules
76-
uses: actions/cache@v3.2.2
76+
uses: actions/cache@v4
7777
with:
7878
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
7979
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -94,14 +94,14 @@ jobs:
9494
strategy:
9595
matrix:
9696
os: [ubuntu-latest]
97-
node: [12, 14, 16]
97+
node: [18, 20, 22]
9898

9999
steps:
100100
- name: Clone repository
101-
uses: actions/checkout@v3
101+
uses: actions/checkout@v4
102102

103103
- name: Set Node.js version
104-
uses: actions/setup-node@v3.5.1
104+
uses: actions/setup-node@v3
105105
with:
106106
node-version: ${{ matrix.node }}
107107

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

112112
- name: Cache node_modules
113-
uses: actions/cache@v3.2.2
113+
uses: actions/cache@v4
114114
with:
115115
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
116116
key: ${{ matrix.os }}-node-v${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -136,7 +136,7 @@ jobs:
136136
coverage-vue3/coverage-final.json
137137

138138
- name: CodeCov
139-
uses: codecov/codecov-action@v3.1.1
139+
uses: codecov/codecov-action@v5
140140
with:
141141
token: ${{ secrets.CODECOV_TOKEN }}
142142
flags: unittests

‎.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
.idea/
2-
.now/
32
.nuxt/
4-
.vercel/
53
.vscode/
64
coverage/
75
coverage-vue3/

‎.prettierignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
.now/
21
.nuxt/
3-
.vercel/
42
coverage/
53
dist/
64
docs-dist/

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Examples:
5353
We also welcome financial contributions in full transparency on our
5454
[Open Collective](https://opencollective.com/bootstrap-vue). Anyone can file an expense. If the
5555
expense makes sense for the development of the community, it will be "merged" in the ledger of our
56-
open collective by the core contributors and the person who filed the expense will be reimbursed.
56+
Open Collective by the core contributors and the person who filed the expense will be reimbursed.
5757

5858
Consider asking your company to also support this open source project by
5959
[becoming a sponsor](https://opencollective.com/bootstrap-vue/contribute/).

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016-2023 - BootstrapVue
3+
Copyright (c) 2016-2025 - BootstrapVue
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)