Skip to content

Commit 4780e7c

Browse files
authored
Merge branch 'main' into fix/9239
2 parents 0cf0c87 + 1f98a9c commit 4780e7c

File tree

270 files changed

+9013
-3560
lines changed

Some content is hidden

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

270 files changed

+9013
-3560
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515

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

1919
- name: Install Node.js
2020
uses: actions/setup-node@v4
@@ -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@551dded8c6cc8a1054039c8bc0b8b48c51dfc6ef

.github/workflows/canary-minor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
ref: minor
1818

1919
- name: Install pnpm
20-
uses: pnpm/action-setup@v4.0.0
20+
uses: pnpm/action-setup@v4.1.0
2121

2222
- name: Install Node.js
2323
uses: actions/setup-node@v4

.github/workflows/canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v4
1616

1717
- name: Install pnpm
18-
uses: pnpm/action-setup@v4.0.0
18+
uses: pnpm/action-setup@v4.1.0
1919

2020
- name: Install Node.js
2121
uses: actions/setup-node@v4

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ 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

.github/workflows/size-data.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ env:
1818

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

2324
steps:
2425
- uses: actions/checkout@v4
2526

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

2930
- name: Install Node.js
3031
uses: actions/setup-node@v4

.github/workflows/size-report.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ 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:
2425
- uses: actions/checkout@v4
2526

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

2930
- name: Install Node.js
3031
uses: actions/setup-node@v4
@@ -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@v9
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@v9
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515

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

1919
- name: Install Node.js
2020
uses: actions/setup-node@v4
@@ -35,7 +35,7 @@ jobs:
3535
- uses: actions/checkout@v4
3636

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

4040
- name: Install Node.js
4141
uses: actions/setup-node@v4
@@ -63,7 +63,7 @@ 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.1.0
6767

6868
- name: Install Node.js
6969
uses: actions/setup-node@v4
@@ -88,7 +88,7 @@ jobs:
8888
- uses: actions/checkout@v4
8989

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

9393
- name: Install Node.js
9494
uses: actions/setup-node@v4

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
22.14.0

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
},
1414
"[json]": {
1515
"editor.defaultFormatter": "esbenp.prettier-vscode"
16-
}
16+
},
17+
"editor.formatOnSave": true
1718
}

.well-known/funding-manifest-urls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://vuejs.org/funding.json

0 commit comments

Comments
 (0)