Skip to content

Commit 7b7927a

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into dependabot/npm_and_yarn/ws-7.5.10
2 parents 248e1ee + f0898d9 commit 7b7927a

File tree

7 files changed

+23
-102
lines changed

7 files changed

+23
-102
lines changed

‎.github/dependabot.yml

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

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
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') }}

‎.github/workflows/codeql.yml

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

‎.github/workflows/test.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
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') }}
@@ -61,10 +61,10 @@ jobs:
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') }}
@@ -98,10 +98,10 @@ jobs:
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

‎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/).

‎README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@
6363

6464
<h2 align="center">Sponsors</h2>
6565

66-
Support this project by becoming a sponsor.
67-
68-
Your logo will show up here with a link to your website.
69-
[[Become a sponsor](https://opencollective.com/bootstrap-vue#sponsor)]
70-
7166
<a href="https://opencollective.com/bootstrap-vue/sponsor/0/website" target="_blank" rel="noopener"><img src="https://opencollective.com/bootstrap-vue/sponsor/0/avatar.svg"></a>
7267
<a href="https://opencollective.com/bootstrap-vue/sponsor/1/website" target="_blank" rel="noopener"><img src="https://opencollective.com/bootstrap-vue/sponsor/1/avatar.svg"></a>
7368
<a href="https://opencollective.com/bootstrap-vue/sponsor/2/website" target="_blank" rel="noopener"><img src="https://opencollective.com/bootstrap-vue/sponsor/2/avatar.svg"></a>
@@ -79,9 +74,15 @@ Your logo will show up here with a link to your website.
7974
<a href="https://opencollective.com/bootstrap-vue/sponsor/8/website" target="_blank" rel="noopener"><img src="https://opencollective.com/bootstrap-vue/sponsor/8/avatar.svg"></a>
8075
<a href="https://opencollective.com/bootstrap-vue/sponsor/9/website" target="_blank" rel="noopener"><img src="https://opencollective.com/bootstrap-vue/sponsor/9/avatar.svg"></a>
8176

77+
Support this project by [becoming a sponsor](https://opencollective.com/bootstrap-vue#sponsor).
78+
79+
<small>**Disclaimer:** This is a donation. No goods or services are expected in return. Any requests
80+
for refunds for those purposes will be rejected.</small>
81+
8282
<h2 align="center">Backers</h2>
8383

8484
Thank you to all our backers! 🙏
85+
8586
[[Become a backer](https://opencollective.com/bootstrap-vue#backer)]
8687

8788
<a href="https://opencollective.com/bootstrap-vue#backers" target="_blank" rel="noopener"><img src="https://opencollective.com/bootstrap-vue/backers.svg?width=890"></a>

‎yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12336,9 +12336,9 @@ pretty@^2.0.0:
1233612336
js-beautify "^1.6.12"
1233712337

1233812338
prismjs@^1.23.0:
12339-
version "1.29.0"
12340-
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12"
12341-
integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==
12339+
version "1.30.0"
12340+
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.30.0.tgz#d9709969d9d4e16403f6f348c63553b19f0975a9"
12341+
integrity sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==
1234212342

1234312343
process-nextick-args@~2.0.0:
1234412344
version "2.0.1"

0 commit comments

Comments
 (0)