Skip to content

Commit 48d76f7

Browse files
committed
Merge branch 'master' into next
# Conflicts: # .github/workflows/ci.yml
2 parents 52493f2 + 8f4fdfc commit 48d76f7

Some content is hidden

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

41 files changed

+4148
-1337
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
version: 2
22
updates:
3-
- package-ecosystem: github-actions
4-
directory: '/'
5-
ignore:
6-
- dependency-name: "actions/*"
7-
update-types:
8-
["version-update:semver-minor", "version-update:semver-patch"]
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
95
schedule:
10-
interval: daily
6+
interval: "monthly"
117
open-pull-requests-limit: 10
12-
- package-ecosystem: npm
13-
directory: '/'
8+
9+
- package-ecosystem: "npm"
10+
directory: "/"
1411
schedule:
15-
interval: daily
12+
interval: "weekly"
1613
open-pull-requests-limit: 10

.github/workflows/benchmark.yml

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,26 @@ jobs:
88
benchmark:
99
if: ${{ github.event.label.name == 'benchmark' }}
1010
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
1113
outputs:
12-
PR-BENCH-12: ${{ steps.benchmark-pr.outputs.BENCH_RESULT12 }}
1314
PR-BENCH-14: ${{ steps.benchmark-pr.outputs.BENCH_RESULT14 }}
1415
PR-BENCH-16: ${{ steps.benchmark-pr.outputs.BENCH_RESULT16 }}
15-
MAIN-BENCH-12: ${{ steps.benchmark-main.outputs.BENCH_RESULT12 }}
16+
PR-BENCH-18: ${{ steps.benchmark-pr.outputs.BENCH_RESULT18 }}
1617
MAIN-BENCH-14: ${{ steps.benchmark-main.outputs.BENCH_RESULT14 }}
1718
MAIN-BENCH-16: ${{ steps.benchmark-main.outputs.BENCH_RESULT16 }}
19+
MAIN-BENCH-18: ${{ steps.benchmark-main.outputs.BENCH_RESULT18 }}
1820
strategy:
1921
matrix:
20-
node-version: [12, 14, 16]
22+
node-version: [14, 16, 18]
2123
steps:
22-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
2325
with:
24-
ref: ${{github.event.pull_request.head.ref}}
26+
persist-credentials: false
27+
ref: ${{github.event.pull_request.head.sha}}
2528
repository: ${{github.event.pull_request.head.repo.full_name}}
2629

27-
- uses: actions/setup-node@v2
30+
- uses: actions/setup-node@v3
2831
with:
2932
node-version: ${{ matrix.node-version }}
3033

@@ -43,7 +46,7 @@ jobs:
4346
echo "::set-output name=BENCH_RESULT${{matrix.node-version}}::$content"
4447
4548
# main benchmark
46-
- uses: actions/checkout@v2
49+
- uses: actions/checkout@v3
4750
with:
4851
ref: 'master'
4952

@@ -64,44 +67,46 @@ jobs:
6467
output-benchmark:
6568
needs: [benchmark]
6669
runs-on: ubuntu-latest
70+
permissions:
71+
pull-requests: write
6772
steps:
6873
- name: Comment PR
6974
uses: thollander/actions-comment-pull-request@v1
7075
with:
7176
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7277
message: |
73-
**Node**: 12
78+
**Node**: 14
7479
**PR**:
7580
```
76-
${{ needs.benchmark.outputs.PR-BENCH-12 }}
81+
${{ needs.benchmark.outputs.PR-BENCH-14 }}
7782
```
7883
**MAIN**:
7984
```
80-
${{ needs.benchmark.outputs.MAIN-BENCH-12 }}
85+
${{ needs.benchmark.outputs.MAIN-BENCH-14 }}
8186
```
8287
8388
---
8489
85-
**Node**: 14
90+
**Node**: 16
8691
**PR**:
8792
```
88-
${{ needs.benchmark.outputs.PR-BENCH-14 }}
93+
${{ needs.benchmark.outputs.PR-BENCH-16 }}
8994
```
9095
**MAIN**:
9196
```
92-
${{ needs.benchmark.outputs.MAIN-BENCH-14 }}
97+
${{ needs.benchmark.outputs.MAIN-BENCH-16 }}
9398
```
9499
95100
---
96101
97-
**Node**: 16
102+
**Node**: 18
98103
**PR**:
99104
```
100-
${{ needs.benchmark.outputs.PR-BENCH-16 }}
105+
${{ needs.benchmark.outputs.PR-BENCH-18 }}
101106
```
102107
**MAIN**:
103108
```
104-
${{ needs.benchmark.outputs.MAIN-BENCH-16 }}
109+
${{ needs.benchmark.outputs.MAIN-BENCH-18 }}
105110
```
106111
107112
- uses: actions-ecosystem/action-remove-labels@v1

.github/workflows/ci.yml

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,6 @@ on:
1212

1313
jobs:
1414
test:
15-
runs-on: ${{ matrix.os }}
16-
strategy:
17-
matrix:
18-
node-version: [14, 16]
19-
os: [macos-latest, ubuntu-latest, windows-latest]
20-
21-
steps:
22-
- uses: actions/checkout@v2
23-
24-
- name: Use Node.js
25-
uses: actions/setup-node@v2
26-
with:
27-
node-version: ${{ matrix.node-version }}
28-
29-
- name: Install Dependencies
30-
run: |
31-
npm install --ignore-scripts
32-
33-
- name: Run Tests
34-
run: |
35-
npm test
36-
37-
automerge:
38-
needs: test
39-
runs-on: ubuntu-latest
40-
permissions:
41-
pull-requests: write
42-
contents: write
43-
steps:
44-
- uses: fastify/github-action-merge-dependabot@v3
45-
with:
46-
github-token: ${{ secrets.GITHUB_TOKEN }}
47-
target: minor
15+
uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3
16+
with:
17+
license-check: true

.gitignore

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ npm-debug.log*
55
yarn-debug.log*
66
yarn-error.log*
77
lerna-debug.log*
8+
.pnpm-debug.log*
89

910
# Diagnostic reports (https://nodejs.org/api/report.html)
1011
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
@@ -53,6 +54,9 @@ web_modules/
5354
# Optional eslint cache
5455
.eslintcache
5556

57+
# Optional stylelint cache
58+
.stylelintcache
59+
5660
# Microbundle cache
5761
.rpt2_cache/
5862
.rts2_cache_cjs/
@@ -68,9 +72,12 @@ web_modules/
6872
# Yarn Integrity file
6973
.yarn-integrity
7074

71-
# dotenv environment variables file
75+
# dotenv environment variable files
7276
.env
73-
.env.test
77+
.env.development.local
78+
.env.test.local
79+
.env.production.local
80+
.env.local
7481

7582
# parcel-bundler cache (https://parceljs.org/)
7683
.cache
@@ -93,6 +100,13 @@ dist
93100
# vuepress build output
94101
.vuepress/dist
95102

103+
# vuepress v2.x temp and cache directory
104+
.temp
105+
.cache
106+
107+
# Docusaurus cache and generated files
108+
.docusaurus
109+
96110
# Serverless directories
97111
.serverless/
98112

@@ -123,6 +137,7 @@ dist
123137

124138
# lock files
125139
package-lock.json
140+
pnpm-lock.yaml
126141
yarn.lock
127142

128143
# editor files

0 commit comments

Comments
 (0)