Skip to content

Commit 61381b1

Browse files
authored
Merge branch 'main' into fix/vuejs#10042
2 parents 88e7695 + 0ac0f2e commit 61381b1

File tree

184 files changed

+8766
-4667
lines changed

Some content is hidden

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

184 files changed

+8766
-4667
lines changed

.eslintignore

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

.eslintrc.cjs

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

.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: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,27 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before
1717

1818
## Pull Request Guidelines
1919

20+
### What kinds of Pull Requests are accepted?
21+
22+
- Bug fix that addresses a clearly identified bug. **"Clearly identified bug"** means the bug has a proper reproduction either from a related open issue, or is included in the PR itself. Avoid submitting PRs that claim to fix something but do not sufficiently explain what is being fixed.
23+
24+
- New feature that addresses a clearly explained and widely applicable use case. **"Widely applicable"** means the new feature should provide non-trivial improvements to the majority of the user base. Vue already has a large API surface so we are quite cautious about adding new features - if the use case is niche and can be addressed via userland implementations, it likely isn't suitable to go into core.
25+
26+
The feature implementation should also consider the trade-off between the added complexity vs. the benefits gained. For example, if a small feature requires significant changes that spreads across the codebase, it is likely not worth it, or the approach should be reconsidered.
27+
28+
If the feature has a non-trivial API surface addition, or significantly affects the way a common use case is approached by the users, it should go through a discussion first in the [RFC repo](https://github.com/vuejs/rfcs/discussions). PRs of such features without prior discussion make it really difficult to steer / adjust the API design due to coupling with concrete implementations, and can lead to wasted work.
29+
30+
- Chore: typos, comment improvements, build config, CI config, etc. For typos and comment changes, try to combine multiple of them into a single PR.
31+
32+
- **It should be noted that we discourage contributors from submitting code refactors that are largely stylistic.** Code refactors are only accepted if it improves performance, or comes with sufficient explanations on why it objectively improves the code quality (e.g. makes a related feature implementation easier).
33+
34+
The reason is that code readability is subjective. The maintainers of this project have chosen to write the code in its current style based on our preferences, and we do not want to spend time explaining our stylistic preferences. Contributors should just respect the established conventions when contributing code.
35+
36+
Another aspect of it is that large scale stylistic changes result in massive diffs that touch multiple files, adding noise to the git history and makes tracing behavior changes across commits more cumbersome.
37+
38+
39+
### Pull Request Checklist
40+
2041
- Vue core has two primary work branches: `main` and `minor`.
2142

2243
- If your pull request is a feature that adds new API surface, it should be submitted against the `minor` branch.

.github/renovate.json5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
{
3535
groupName: 'lint',
3636
matchPackageNames: ['simple-git-hooks', 'lint-staged'],
37-
matchPackagePrefixes: ['@typescript-eslint', 'eslint', 'prettier'],
37+
matchPackagePrefixes: ['typescript-eslint', 'eslint', 'prettier'],
3838
},
3939
],
4040
ignoreDeps: [

.github/workflows/autofix.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ jobs:
1414
- uses: actions/checkout@v4
1515

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

19-
- name: Set node version to 18
19+
- name: Install Node.js
2020
uses: actions/setup-node@v4
2121
with:
22-
node-version: 18
23-
cache: pnpm
22+
node-version-file: '.node-version'
23+
registry-url: 'https://registry.npmjs.org'
24+
cache: 'pnpm'
2425

2526
- run: pnpm install
2627

@@ -30,4 +31,4 @@ jobs:
3031
- name: Run prettier
3132
run: pnpm run format
3233

33-
- uses: autofix-ci/action@ea32e3a12414e6d3183163c3424a7d7a8631ad84
34+
- uses: autofix-ci/action@2891949f3779a1cafafae1523058501de3d4e944

.github/workflows/canary-minor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
ref: minor
1818

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

22-
- name: Set node version to 18
22+
- name: Install Node.js
2323
uses: actions/setup-node@v4
2424
with:
25-
node-version: 18
25+
node-version-file: '.node-version'
2626
registry-url: 'https://registry.npmjs.org'
2727
cache: 'pnpm'
2828

.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@v3.0.0
18+
uses: pnpm/action-setup@v4.0.0
1919

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

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v4
2222

2323
- name: Install pnpm
24-
uses: pnpm/action-setup@v3.0.0
24+
uses: pnpm/action-setup@v4.0.0
2525

2626
- name: Install Node.js
2727
uses: actions/setup-node@v4
@@ -43,7 +43,7 @@ jobs:
4343
- uses: actions/checkout@v4
4444

4545
- name: Install pnpm
46-
uses: pnpm/action-setup@v3.0.0
46+
uses: pnpm/action-setup@v4.0.0
4747

4848
- name: Install Node.js
4949
uses: actions/setup-node@v4
@@ -72,7 +72,7 @@ jobs:
7272
key: chromium-${{ hashFiles('pnpm-lock.yaml') }}
7373

7474
- name: Install pnpm
75-
uses: pnpm/action-setup@v3.0.0
75+
uses: pnpm/action-setup@v4.0.0
7676

7777
- name: Install Node.js
7878
uses: actions/setup-node@v4
@@ -98,7 +98,7 @@ jobs:
9898
- uses: actions/checkout@v4
9999

100100
- name: Install pnpm
101-
uses: pnpm/action-setup@v3.0.0
101+
uses: pnpm/action-setup@v4.0.0
102102

103103
- name: Install Node.js
104104
uses: actions/setup-node@v4

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v4
2424

2525
- name: Install pnpm
26-
uses: pnpm/action-setup@v3.0.0
26+
uses: pnpm/action-setup@v4.0.0
2727

2828
- name: Install Node.js
2929
uses: actions/setup-node@v4

.github/workflows/size-report.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v4
2525

2626
- name: Install pnpm
27-
uses: pnpm/action-setup@v3.0.0
27+
uses: pnpm/action-setup@v4.0.0
2828

2929
- name: Install Node.js
3030
uses: actions/setup-node@v4
@@ -36,26 +36,27 @@ jobs:
3636
run: pnpm install
3737

3838
- name: Download PR number
39-
uses: dawidd6/action-download-artifact@v3
39+
uses: dawidd6/action-download-artifact@v6
4040
with:
4141
name: pr-number
4242
run_id: ${{ github.event.workflow_run.id }}
43+
path: /tmp/pr-number
4344

4445
- name: Read PR Number
4546
id: pr-number
4647
uses: juliangruber/read-file-action@v1
4748
with:
48-
path: ./pr.txt
49+
path: /tmp/pr-number/pr.txt
4950

5051
- name: Download Size Data
51-
uses: dawidd6/action-download-artifact@v3
52+
uses: dawidd6/action-download-artifact@v6
5253
with:
5354
name: size-data
5455
run_id: ${{ github.event.workflow_run.id }}
5556
path: temp/size
5657

5758
- name: Download Previous Size Data
58-
uses: dawidd6/action-download-artifact@v3
59+
uses: dawidd6/action-download-artifact@v6
5960
with:
6061
branch: main
6162
workflow: size-data.yml
@@ -64,7 +65,7 @@ jobs:
6465
path: temp/size-prev
6566
if_no_artifact_found: warn
6667

67-
- name: Compare size
68+
- name: Prepare report
6869
run: pnpm tsx scripts/size-report.ts > size-report.md
6970

7071
- name: Read Size Report

0 commit comments

Comments
 (0)