Skip to content

Commit 3230e0d

Browse files
edison1105edison1105
authored
Merge branch 'main' into format-component-name
2 parents cc9e5f4 + 5af3dd9 commit 3230e0d

File tree

342 files changed

+15597
-5418
lines changed

Some content is hidden

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

342 files changed

+15597
-5418
lines changed

‎.github/renovate.json5‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
{
22
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3-
extends: ['config:base', 'schedule:weekly', 'group:allNonMajor'],
3+
extends: ['config:recommended', 'schedule:weekly', 'group:allNonMajor'],
44
labels: ['dependencies'],
55
ignorePaths: ['**/__tests__/**'],
66
rangeStrategy: 'bump',
77
packageRules: [
88
{
9-
depTypeList: ['peerDependencies'],
9+
matchDepTypes: ['peerDependencies'],
1010
enabled: false,
1111
},
1212
{
1313
groupName: 'test',
14-
matchPackageNames: ['vitest', 'jsdom', 'puppeteer'],
15-
matchPackagePrefixes: ['@vitest'],
14+
matchPackageNames: ['vitest', 'jsdom', 'puppeteer', '@vitest{/,}**'],
1615
},
1716
{
1817
groupName: 'playground',
@@ -23,18 +22,28 @@
2322
},
2423
{
2524
groupName: 'compiler',
26-
matchPackageNames: ['magic-string'],
27-
matchPackagePrefixes: ['@babel', 'postcss'],
25+
matchPackageNames: ['magic-string', '@babel{/,}**', 'postcss{/,}**'],
2826
},
2927
{
3028
groupName: 'build',
31-
matchPackageNames: ['vite', '@swc/core'],
32-
matchPackagePrefixes: ['rollup', 'esbuild', '@rollup', '@vitejs'],
29+
matchPackageNames: [
30+
'vite',
31+
'@swc/core',
32+
'rollup{/,}**',
33+
'esbuild{/,}**',
34+
'@rollup{/,}**',
35+
'@vitejs{/,}**',
36+
],
3337
},
3438
{
3539
groupName: 'lint',
36-
matchPackageNames: ['simple-git-hooks', 'lint-staged'],
37-
matchPackagePrefixes: ['typescript-eslint', 'eslint', 'prettier'],
40+
matchPackageNames: [
41+
'simple-git-hooks',
42+
'lint-staged',
43+
'typescript-eslint{/,}**',
44+
'eslint{/,}**',
45+
'prettier{/,}**',
46+
],
3847
},
3948
],
4049
ignoreDeps: [

‎.github/workflows/autofix.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
env:
1212
PUPPETEER_SKIP_DOWNLOAD: 'true'
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- name: Install pnpm
17-
uses: pnpm/action-setup@v4.0.0
17+
uses: pnpm/action-setup@v4.2.0
1818

1919
- name: Install Node.js
20-
uses: actions/setup-node@v4
20+
uses: actions/setup-node@v6
2121
with:
2222
node-version-file: '.node-version'
2323
registry-url: 'https://registry.npmjs.org'
@@ -31,4 +31,4 @@ jobs:
3131
- name: Run prettier
3232
run: pnpm run format
3333

34-
- uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c
34+
- uses: autofix-ci/action@635ffb0c9798bd160680f18fd73371e355b85f27

‎.github/workflows/canary-minor.yml‎

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

‎.github/workflows/canary.yml‎

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

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@ jobs:
1616
uses: ./.github/workflows/test.yml
1717

1818
continuous-release:
19+
if: github.repository == 'vuejs/core'
1920
runs-on: ubuntu-latest
2021
steps:
2122
- name: Checkout
22-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2324

2425
- name: Install pnpm
2526
uses: pnpm/action-setup@v4
2627

2728
- name: Install Node.js
28-
uses: actions/setup-node@v4
29+
uses: actions/setup-node@v6
2930
with:
3031
node-version-file: '.node-version'
3132
registry-url: 'https://registry.npmjs.org'

‎.github/workflows/ecosystem-ci-trigger.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
if: github.repository == 'vuejs/core' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/ecosystem-ci run')
1111
steps:
1212
- name: Check user permission
13-
uses: actions/github-script@v7
13+
uses: actions/github-script@v8
1414
with:
1515
script: |
1616
const user = context.payload.sender.login
@@ -45,7 +45,7 @@ jobs:
4545
throw new Error('not allowed')
4646
}
4747
- name: Get PR info
48-
uses: actions/github-script@v7
48+
uses: actions/github-script@v8
4949
id: get-pr-data
5050
with:
5151
script: |
@@ -62,7 +62,7 @@ jobs:
6262
commit: pr.head.sha
6363
}
6464
- name: Trigger run
65-
uses: actions/github-script@v7
65+
uses: actions/github-script@v8
6666
id: trigger
6767
env:
6868
COMMENT: ${{ github.event.comment.body }}

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
environment: Release
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525

2626
- name: Install pnpm
2727
uses: pnpm/action-setup@v4
2828

2929
- name: Install Node.js
30-
uses: actions/setup-node@v4
30+
uses: actions/setup-node@v6
3131
with:
3232
node-version-file: '.node-version'
3333
registry-url: 'https://registry.npmjs.org'
@@ -36,12 +36,13 @@ jobs:
3636
- name: Install deps
3737
run: pnpm install
3838

39+
- name: Update npm
40+
run: npm i -g npm@latest
41+
3942
- name: Build and publish
4043
id: publish
4144
run: |
4245
pnpm release --publishOnly
43-
env:
44-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
4546
4647
- name: Create GitHub release
4748
id: release_tag

‎.github/workflows/size-data.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ env:
1818

1919
jobs:
2020
upload:
21+
if: github.repository == 'vuejs/core'
2122
runs-on: ubuntu-latest
2223

2324
steps:
24-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2526

2627
- name: Install pnpm
27-
uses: pnpm/action-setup@v4.0.0
28+
uses: pnpm/action-setup@v4.2.0
2829

2930
- name: Install Node.js
30-
uses: actions/setup-node@v4
31+
uses: actions/setup-node@v6
3132
with:
3233
node-version-file: '.node-version'
3334
cache: pnpm
@@ -44,7 +45,7 @@ jobs:
4445
echo ${{ github.base_ref }} > ./temp/size/base.txt
4546
4647
- name: Upload Size Data
47-
uses: actions/upload-artifact@v4
48+
uses: actions/upload-artifact@v5
4849
with:
4950
name: size-data
5051
path: temp/size

‎.github/workflows/size-report.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ jobs:
1818
size-report:
1919
runs-on: ubuntu-latest
2020
if: >
21+
github.repository == 'vuejs/core' &&
2122
github.event.workflow_run.event == 'pull_request' &&
2223
github.event.workflow_run.conclusion == 'success'
2324
steps:
24-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2526

2627
- name: Install pnpm
27-
uses: pnpm/action-setup@v4.0.0
28+
uses: pnpm/action-setup@v4.2.0
2829

2930
- name: Install Node.js
30-
uses: actions/setup-node@v4
31+
uses: actions/setup-node@v6
3132
with:
3233
node-version-file: '.node-version'
3334
cache: pnpm
@@ -36,7 +37,7 @@ jobs:
3637
run: pnpm install
3738

3839
- name: Download Size Data
39-
uses: dawidd6/action-download-artifact@v6
40+
uses: dawidd6/action-download-artifact@v11
4041
with:
4142
name: size-data
4243
run_id: ${{ github.event.workflow_run.id }}
@@ -55,7 +56,7 @@ jobs:
5556
path: temp/size/base.txt
5657

5758
- name: Download Previous Size Data
58-
uses: dawidd6/action-download-artifact@v6
59+
uses: dawidd6/action-download-artifact@v11
5960
with:
6061
branch: ${{ steps.pr-base.outputs.content }}
6162
workflow: size-data.yml
@@ -65,7 +66,7 @@ jobs:
6566
if_no_artifact_found: warn
6667

6768
- name: Prepare report
68-
run: pnpm tsx scripts/size-report.ts > size-report.md
69+
run: node scripts/size-report.js > size-report.md
6970

7071
- name: Read Size Report
7172
id: size-report

‎.github/workflows/test.yml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
env:
1212
PUPPETEER_SKIP_DOWNLOAD: 'true'
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- name: Install pnpm
17-
uses: pnpm/action-setup@v4.0.0
17+
uses: pnpm/action-setup@v4.2.0
1818

1919
- name: Install Node.js
20-
uses: actions/setup-node@v4
20+
uses: actions/setup-node@v6
2121
with:
2222
node-version-file: '.node-version'
2323
cache: 'pnpm'
@@ -32,13 +32,13 @@ jobs:
3232
env:
3333
PUPPETEER_SKIP_DOWNLOAD: 'true'
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636

3737
- name: Install pnpm
38-
uses: pnpm/action-setup@v4.0.0
38+
uses: pnpm/action-setup@v4.2.0
3939

4040
- name: Install Node.js
41-
uses: actions/setup-node@v4
41+
uses: actions/setup-node@v6
4242
with:
4343
node-version-file: '.node-version'
4444
cache: 'pnpm'
@@ -54,7 +54,7 @@ jobs:
5454
e2e-test:
5555
runs-on: ubuntu-latest
5656
steps:
57-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v5
5858

5959
- name: Setup cache for Chromium binary
6060
uses: actions/cache@v4
@@ -63,10 +63,10 @@ jobs:
6363
key: chromium-${{ hashFiles('pnpm-lock.yaml') }}
6464

6565
- name: Install pnpm
66-
uses: pnpm/action-setup@v4.0.0
66+
uses: pnpm/action-setup@v4.2.0
6767

6868
- name: Install Node.js
69-
uses: actions/setup-node@v4
69+
uses: actions/setup-node@v6
7070
with:
7171
node-version-file: '.node-version'
7272
cache: 'pnpm'
@@ -85,13 +85,13 @@ jobs:
8585
env:
8686
PUPPETEER_SKIP_DOWNLOAD: 'true'
8787
steps:
88-
- uses: actions/checkout@v4
88+
- uses: actions/checkout@v5
8989

9090
- name: Install pnpm
91-
uses: pnpm/action-setup@v4.0.0
91+
uses: pnpm/action-setup@v4.2.0
9292

9393
- name: Install Node.js
94-
uses: actions/setup-node@v4
94+
uses: actions/setup-node@v6
9595
with:
9696
node-version-file: '.node-version'
9797
cache: 'pnpm'
@@ -104,5 +104,8 @@ jobs:
104104
- name: Run prettier
105105
run: pnpm run format-check
106106

107+
- name: Run tsc
108+
run: pnpm run check
109+
107110
- name: Run type declaration tests
108111
run: pnpm run test-dts

0 commit comments

Comments
 (0)