Skip to content

Commit 60c065c

Browse files
Merge branch 'main' into test-shared
2 parents dd1df8f + 94b9b37 commit 60c065c

File tree

548 files changed

+33509
-30701
lines changed

Some content is hidden

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

548 files changed

+33509
-30701
lines changed

.eslintrc.cjs

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

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# update prettier & eslint config (#9162)
2+
bfe6b459d3a0ce6168611ee1ac7e6e789709df9d

.github/commit-convention.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
Messages must be matched by the following regex:
88

9-
``` js
9+
```regexp
1010
/^(revert: )?(feat|fix|docs|dx|style|refactor|perf|test|workflow|build|ci|chore|types|wip)(\(.+\))?: .{1,50}/
1111
```
1212

.github/contributing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before
6363

6464
You will need [Node.js](https://nodejs.org) **version 18.12+**, and [PNPM](https://pnpm.io) **version 8+**.
6565

66-
We also recommend installing [ni](https://github.com/antfu/ni) to help switching between repos using different package managers. `ni` also provides the handy `nr` command which running npm scripts easier.
66+
We also recommend installing [@antfu/ni](https://github.com/antfu/ni) to help switching between repos using different package managers. `ni` also provides the handy `nr` command which running npm scripts easier.
6767

6868
After cloning the repo, run:
6969

@@ -86,11 +86,11 @@ The project uses [simple-git-hooks](https://github.com/toplenboren/simple-git-ho
8686

8787
- Type check the entire project
8888
- Automatically format changed files using Prettier
89-
- Verify commit message format (logic in `scripts/verifyCommit.js`)
89+
- Verify commit message format (logic in `scripts/verify-commit.js`)
9090

9191
## Scripts
9292

93-
**The examples below will be using the `nr` command from the [ni](https://github.com/antfu/ni) package.** You can also use plain `npm run`, but you will need to pass all additional arguments after the command after an extra `--`. For example, `nr build runtime --all` is equivalent to `npm run build -- runtime --all`.
93+
**The examples below will be using the `nr` command from the [@antfu/ni](https://github.com/antfu/ni) package.** You can also use plain `npm run`, but you will need to pass all additional arguments after the command after an extra `--`. For example, `nr build runtime --all` is equivalent to `npm run build -- runtime --all`.
9494

9595
The `run-s` and `run-p` commands found in some scripts are from [npm-run-all](https://github.com/mysticatea/npm-run-all) for orchestrating multiple scripts. `run-s` means "run in sequence" while `run-p` means "run in parallel".
9696

.github/renovate.json5

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,35 @@
77
packageRules: [
88
{
99
depTypeList: ['peerDependencies'],
10-
enabled: false
10+
enabled: false,
1111
},
1212
{
1313
groupName: 'test',
1414
matchPackageNames: ['vitest', 'jsdom', 'puppeteer'],
15-
matchPackagePrefixes: ['@vitest']
15+
matchPackagePrefixes: ['@vitest'],
1616
},
1717
{
1818
groupName: 'playground',
1919
matchFileNames: [
2020
'packages/sfc-playground/package.json',
21-
'packages/template-explorer/package.json'
22-
]
21+
'packages/template-explorer/package.json',
22+
],
2323
},
2424
{
2525
groupName: 'compiler',
2626
matchPackageNames: ['magic-string'],
27-
matchPackagePrefixes: ['@babel', 'postcss']
27+
matchPackagePrefixes: ['@babel', 'postcss'],
2828
},
2929
{
3030
groupName: 'build',
3131
matchPackageNames: ['vite', 'terser'],
32-
matchPackagePrefixes: ['rollup', 'esbuild', '@rollup', '@vitejs']
32+
matchPackagePrefixes: ['rollup', 'esbuild', '@rollup', '@vitejs'],
3333
},
3434
{
3535
groupName: 'lint',
3636
matchPackageNames: ['simple-git-hooks', 'lint-staged'],
37-
matchPackagePrefixes: ['@typescript-eslint', 'eslint', 'prettier']
38-
}
37+
matchPackagePrefixes: ['typescript-eslint', 'eslint', 'prettier'],
38+
},
3939
],
4040
ignoreDeps: [
4141
'vue',
@@ -45,6 +45,14 @@
4545
'typescript',
4646

4747
// ESM only
48-
'estree-walker'
49-
]
48+
'estree-walker',
49+
50+
// pinned
51+
// https://github.com/vuejs/core/issues/10300#issuecomment-1940855364
52+
'lru-cache',
53+
54+
// pinned
55+
// https://github.com/vuejs/core/commit/a012e39b373f1b6918e5c89856e8f902e1bfa14d
56+
'@rollup/plugin-replace',
57+
],
5058
}

.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@v2
17+
uses: pnpm/action-setup@v3.0.0
1818

1919
- name: Set node version to 18
2020
uses: actions/setup-node@v4
@@ -30,4 +30,4 @@ jobs:
3030
- name: Run prettier
3131
run: pnpm run format
3232

33-
- uses: autofix-ci/action@bee19d72e71787c12ca0f29de72f2833e437e4c9
33+
- uses: autofix-ci/action@ea32e3a12414e6d3183163c3424a7d7a8631ad84

.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@v2
20+
uses: pnpm/action-setup@v3.0.0
2121

2222
- name: Set node version to 18
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@v2
18+
uses: pnpm/action-setup@v3.0.0
1919

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

.github/workflows/ci.yml

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
pull_request:
77
branches:
88
- main
9+
- minor
910

1011
permissions:
1112
contents: read # to fetch code (actions/checkout)
@@ -20,7 +21,7 @@ jobs:
2021
- uses: actions/checkout@v4
2122

2223
- name: Install pnpm
23-
uses: pnpm/action-setup@v2
24+
uses: pnpm/action-setup@v3.0.0
2425

2526
- name: Install Node.js
2627
uses: actions/setup-node@v4
@@ -42,7 +43,7 @@ jobs:
4243
- uses: actions/checkout@v4
4344

4445
- name: Install pnpm
45-
uses: pnpm/action-setup@v2
46+
uses: pnpm/action-setup@v3.0.0
4647

4748
- name: Install Node.js
4849
uses: actions/setup-node@v4
@@ -58,45 +59,20 @@ jobs:
5859
- name: Run ssr unit tests
5960
run: pnpm run test-unit server-renderer
6061

61-
benchmarks:
62-
runs-on: ubuntu-latest
63-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
64-
env:
65-
PUPPETEER_SKIP_DOWNLOAD: 'true'
66-
steps:
67-
- uses: actions/checkout@v4
68-
69-
- name: Install pnpm
70-
uses: pnpm/action-setup@v2
71-
72-
- name: Install Node.js
73-
uses: actions/setup-node@v4
74-
with:
75-
node-version-file: '.node-version'
76-
cache: 'pnpm'
77-
78-
- run: pnpm install
79-
80-
- name: Run benchmarks
81-
uses: CodSpeedHQ/action@v2
82-
with:
83-
run: pnpm vitest bench --run
84-
token: ${{ secrets.CODSPEED_TOKEN }}
85-
8662
e2e-test:
8763
runs-on: ubuntu-latest
8864
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
8965
steps:
9066
- uses: actions/checkout@v4
9167

9268
- name: Setup cache for Chromium binary
93-
uses: actions/cache@v3
69+
uses: actions/cache@v4
9470
with:
9571
path: ~/.cache/puppeteer
9672
key: chromium-${{ hashFiles('pnpm-lock.yaml') }}
9773

9874
- name: Install pnpm
99-
uses: pnpm/action-setup@v2
75+
uses: pnpm/action-setup@v3.0.0
10076

10177
- name: Install Node.js
10278
uses: actions/setup-node@v4
@@ -110,6 +86,9 @@ jobs:
11086
- name: Run e2e tests
11187
run: pnpm run test-e2e
11288

89+
- name: verify treeshaking
90+
run: node scripts/verify-treeshaking.js
91+
11392
lint-and-test-dts:
11493
runs-on: ubuntu-latest
11594
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
@@ -119,7 +98,7 @@ jobs:
11998
- uses: actions/checkout@v4
12099

121100
- name: Install pnpm
122-
uses: pnpm/action-setup@v2
101+
uses: pnpm/action-setup@v3.0.0
123102

124103
- name: Install Node.js
125104
uses: actions/setup-node@v4
@@ -137,3 +116,28 @@ jobs:
137116

138117
- name: Run type declaration tests
139118
run: pnpm run test-dts
119+
120+
# benchmarks:
121+
# runs-on: ubuntu-latest
122+
# if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
123+
# env:
124+
# PUPPETEER_SKIP_DOWNLOAD: 'true'
125+
# steps:
126+
# - uses: actions/checkout@v4
127+
128+
# - name: Install pnpm
129+
# uses: pnpm/[email protected]
130+
131+
# - name: Install Node.js
132+
# uses: actions/setup-node@v4
133+
# with:
134+
# node-version-file: '.node-version'
135+
# cache: 'pnpm'
136+
137+
# - run: pnpm install
138+
139+
# - name: Run benchmarks
140+
# uses: CodSpeedHQ/action@v2
141+
# with:
142+
# run: pnpm vitest bench --run
143+
# token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/release-tag.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ jobs:
2424
with:
2525
tag_name: ${{ github.ref }}
2626
body: |
27-
Please refer to [CHANGELOG.md](https://github.com/vuejs/core/blob/main/CHANGELOG.md) for details.
27+
For stable releases, please refer to [CHANGELOG.md](https://github.com/vuejs/core/blob/main/CHANGELOG.md) for details.
28+
For pre-releases, please refer to [CHANGELOG.md](https://github.com/vuejs/core/blob/minor/CHANGELOG.md) of the `minor` branch.

.github/workflows/size-data.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
pull_request:
88
branches:
99
- main
10+
- minor
1011

1112
permissions:
1213
contents: read
@@ -22,7 +23,7 @@ jobs:
2223
- uses: actions/checkout@v4
2324

2425
- name: Install pnpm
25-
uses: pnpm/action-setup@v2
26+
uses: pnpm/action-setup@v3.0.0
2627

2728
- name: Install Node.js
2829
uses: actions/setup-node@v4
@@ -36,7 +37,7 @@ jobs:
3637
- run: pnpm run size
3738

3839
- name: Upload Size Data
39-
uses: actions/upload-artifact@v3
40+
uses: actions/upload-artifact@v4
4041
with:
4142
name: size-data
4243
path: temp/size
@@ -45,7 +46,7 @@ jobs:
4546
if: ${{github.event_name == 'pull_request'}}
4647
run: echo ${{ github.event.number }} > ./pr.txt
4748

48-
- uses: actions/upload-artifact@v3
49+
- uses: actions/upload-artifact@v4
4950
if: ${{github.event_name == 'pull_request'}}
5051
with:
5152
name: pr-number

0 commit comments

Comments
 (0)