Skip to content

Commit a92509d

Browse files
Merge branch 'main' into fix-toRaw-readolny-type
2 parents ebfa037 + 35785f3 commit a92509d

File tree

404 files changed

+18169
-8063
lines changed

Some content is hidden

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

404 files changed

+18169
-8063
lines changed

.github/contributing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ Tests that test against source code are grouped under `nr test-unit`, while test
236236

237237
### `nr test-dts`
238238

239-
Runs `nr build-dts` first, then verify the type tests in `packages/dts-test` are working correctly against the actual built type declarations.
239+
Runs `nr build-dts` first, then verify the type tests in `packages-private/dts-test` are working correctly against the actual built type declarations.
240240

241241
## Project Structure
242242

@@ -335,7 +335,7 @@ Test coverage is continuously deployed at https://coverage.vuejs.org. PRs that i
335335

336336
### Testing Type Definition Correctness
337337

338-
Type tests are located in the `packages/dts-test` directory. To run the dts tests, run `nr test-dts`. Note that the type test requires all relevant `*.d.ts` files to be built first (and the script does it for you). Once the `d.ts` files are built and up-to-date, the tests can be re-run by running `nr test-dts-only`.
338+
Type tests are located in the `packages-private/dts-test` directory. To run the dts tests, run `nr test-dts`. Note that the type test requires all relevant `*.d.ts` files to be built first (and the script does it for you). Once the `d.ts` files are built and up-to-date, the tests can be re-run by running `nr test-dts-only`.
339339

340340
## Financial Contribution
341341

.github/renovate.json5

+10-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
{
1818
groupName: 'playground',
1919
matchFileNames: [
20-
'packages/sfc-playground/package.json',
21-
'packages/template-explorer/package.json',
20+
'packages-private/sfc-playground/package.json',
21+
'packages-private/template-explorer/package.json',
2222
],
2323
},
2424
{
@@ -54,5 +54,13 @@
5454
// pinned
5555
// https://github.com/vuejs/core/commit/a012e39b373f1b6918e5c89856e8f902e1bfa14d
5656
'@rollup/plugin-replace',
57+
58+
// pinned
59+
// only used in example for e2e tests
60+
'marked',
61+
62+
// pinned, 5.0+ has exports issues
63+
// https://github.com/vuejs/core/issues/11603
64+
'entities',
5765
],
5866
}

.github/workflows/canary-minor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ jobs:
2828

2929
- run: pnpm install
3030

31-
- run: pnpm release --canary --tag minor
31+
- run: pnpm release --canary --publish --tag minor
3232
env:
3333
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/canary.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ jobs:
2626

2727
- run: pnpm install
2828

29-
- run: pnpm release --canary
29+
- run: pnpm release --canary --publish
3030
env:
3131
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/ci.yml

+17-118
Original file line numberDiff line numberDiff line change
@@ -3,141 +3,40 @@ on:
33
push:
44
branches:
55
- '**'
6+
tags:
7+
- '!**'
68
pull_request:
79
branches:
810
- main
911
- minor
1012

11-
permissions:
12-
contents: read # to fetch code (actions/checkout)
13-
1413
jobs:
15-
unit-test:
16-
runs-on: ubuntu-latest
17-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
18-
env:
19-
PUPPETEER_SKIP_DOWNLOAD: 'true'
20-
steps:
21-
- uses: actions/checkout@v4
22-
23-
- name: Install pnpm
24-
uses: pnpm/[email protected]
25-
26-
- name: Install Node.js
27-
uses: actions/setup-node@v4
28-
with:
29-
node-version-file: '.node-version'
30-
cache: 'pnpm'
31-
32-
- run: pnpm install
33-
34-
- name: Run unit tests
35-
run: pnpm run test-unit
36-
37-
unit-test-windows:
38-
runs-on: windows-latest
39-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
40-
env:
41-
PUPPETEER_SKIP_DOWNLOAD: 'true'
42-
steps:
43-
- uses: actions/checkout@v4
44-
45-
- name: Install pnpm
46-
uses: pnpm/[email protected]
47-
48-
- name: Install Node.js
49-
uses: actions/setup-node@v4
50-
with:
51-
node-version-file: '.node-version'
52-
cache: 'pnpm'
53-
54-
- run: pnpm install
14+
test:
15+
if: ${{ ! startsWith(github.event.head_commit.message, 'release:') && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) }}
16+
uses: ./.github/workflows/test.yml
5517

56-
- name: Run compiler unit tests
57-
run: pnpm run test-unit compiler
58-
59-
- name: Run ssr unit tests
60-
run: pnpm run test-unit server-renderer
61-
62-
e2e-test:
63-
runs-on: ubuntu-latest
64-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
65-
steps:
66-
- uses: actions/checkout@v4
67-
68-
- name: Setup cache for Chromium binary
69-
uses: actions/cache@v4
70-
with:
71-
path: ~/.cache/puppeteer
72-
key: chromium-${{ hashFiles('pnpm-lock.yaml') }}
73-
74-
- name: Install pnpm
75-
uses: pnpm/[email protected]
76-
77-
- name: Install Node.js
78-
uses: actions/setup-node@v4
79-
with:
80-
node-version-file: '.node-version'
81-
cache: 'pnpm'
82-
83-
- run: pnpm install
84-
- run: node node_modules/puppeteer/install.mjs
85-
86-
- name: Run e2e tests
87-
run: pnpm run test-e2e
88-
89-
- name: verify treeshaking
90-
run: node scripts/verify-treeshaking.js
91-
92-
lint-and-test-dts:
18+
continuous-release:
19+
if: github.repository == 'vuejs/core'
9320
runs-on: ubuntu-latest
94-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
95-
env:
96-
PUPPETEER_SKIP_DOWNLOAD: 'true'
9721
steps:
98-
- uses: actions/checkout@v4
22+
- name: Checkout
23+
uses: actions/checkout@v4
9924

10025
- name: Install pnpm
101-
uses: pnpm/action-setup@v4.0.0
26+
uses: pnpm/action-setup@v4
10227

10328
- name: Install Node.js
10429
uses: actions/setup-node@v4
10530
with:
10631
node-version-file: '.node-version'
32+
registry-url: 'https://registry.npmjs.org'
10733
cache: 'pnpm'
10834

109-
- run: pnpm install
110-
111-
- name: Run eslint
112-
run: pnpm run lint
113-
114-
- name: Run prettier
115-
run: pnpm run format-check
116-
117-
- name: Run type declaration tests
118-
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'
35+
- name: Install deps
36+
run: pnpm install
13637

137-
# - run: pnpm install
38+
- name: Build
39+
run: pnpm build --withTypes
13840

139-
# - name: Run benchmarks
140-
# uses: CodSpeedHQ/action@v2
141-
# with:
142-
# run: pnpm vitest bench --run
143-
# token: ${{ secrets.CODSPEED_TOKEN }}
41+
- name: Release
42+
run: pnpx pkg-pr-new publish --compact --pnpm './packages/*'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Auto close issues with "can't reproduce" label
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *'
6+
7+
permissions:
8+
issues: write
9+
10+
jobs:
11+
close-issues:
12+
if: github.repository == 'vuejs/core'
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: can't reproduce
16+
uses: actions-cool/issues-helper@v3
17+
with:
18+
actions: 'close-issues'
19+
token: ${{ secrets.GITHUB_TOKEN }}
20+
labels: "can't reproduce"
21+
inactive-day: 3

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

+10-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ jobs:
99
runs-on: ubuntu-latest
1010
if: github.repository == 'vuejs/core' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/ecosystem-ci run')
1111
steps:
12-
- uses: actions/github-script@v7
12+
- name: Check user permission
13+
uses: actions/github-script@v7
1314
with:
1415
script: |
1516
const user = context.payload.sender.login
@@ -43,7 +44,8 @@ jobs:
4344
})
4445
throw new Error('not allowed')
4546
}
46-
- uses: actions/github-script@v7
47+
- name: Get PR info
48+
uses: actions/github-script@v7
4749
id: get-pr-data
4850
with:
4951
script: |
@@ -56,9 +58,11 @@ jobs:
5658
return {
5759
num: context.issue.number,
5860
branchName: pr.head.ref,
59-
repo: pr.head.repo.full_name
61+
repo: pr.head.repo.full_name,
62+
commit: pr.head.sha
6063
}
61-
- uses: actions/github-script@v7
64+
- name: Trigger run
65+
uses: actions/github-script@v7
6266
id: trigger
6367
env:
6468
COMMENT: ${{ github.event.comment.body }}
@@ -80,6 +84,7 @@ jobs:
8084
prNumber: '' + prData.num,
8185
branchName: prData.branchName,
8286
repo: prData.repo,
83-
suite: suite === '' ? '-' : suite
87+
suite: suite === '' ? '-' : suite,
88+
commit: prData.commit
8489
}
8590
})

.github/workflows/release-gh.yml

-28
This file was deleted.

0 commit comments

Comments
 (0)