Skip to content

Commit db503fc

Browse files
johnsoncodehkjohnsoncodehk
committed
Merge branch 'minor' into define-component-next
2 parents 5dcf69b + e499d56 commit db503fc

File tree

369 files changed

+40903
-7379
lines changed

Some content is hidden

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

369 files changed

+40903
-7379
lines changed

‎.github/workflows/autofix.yml‎

Lines changed: 3 additions & 3 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.1.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'

‎.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
runs-on: ubuntu-latest
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'

‎.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626

2727
- name: Install pnpm
28-
uses: pnpm/action-setup@v4.1.0
28+
uses: pnpm/action-setup@v4.2.0
2929

3030
- name: Install Node.js
31-
uses: actions/setup-node@v4
31+
uses: actions/setup-node@v6
3232
with:
3333
node-version-file: '.node-version'
3434
cache: pnpm
@@ -45,7 +45,7 @@ jobs:
4545
echo ${{ github.base_ref }} > ./temp/size/base.txt
4646
4747
- name: Upload Size Data
48-
uses: actions/upload-artifact@v4
48+
uses: actions/upload-artifact@v5
4949
with:
5050
name: size-data
5151
path: temp/size

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
github.event.workflow_run.event == 'pull_request' &&
2323
github.event.workflow_run.conclusion == 'success'
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626

2727
- name: Install pnpm
28-
uses: pnpm/action-setup@v4.1.0
28+
uses: pnpm/action-setup@v4.2.0
2929

3030
- name: Install Node.js
31-
uses: actions/setup-node@v4
31+
uses: actions/setup-node@v6
3232
with:
3333
node-version-file: '.node-version'
3434
cache: pnpm
@@ -37,7 +37,7 @@ jobs:
3737
run: pnpm install
3838

3939
- name: Download Size Data
40-
uses: dawidd6/action-download-artifact@v9
40+
uses: dawidd6/action-download-artifact@v11
4141
with:
4242
name: size-data
4343
run_id: ${{ github.event.workflow_run.id }}
@@ -56,7 +56,7 @@ jobs:
5656
path: temp/size/base.txt
5757

5858
- name: Download Previous Size Data
59-
uses: dawidd6/action-download-artifact@v9
59+
uses: dawidd6/action-download-artifact@v11
6060
with:
6161
branch: ${{ steps.pr-base.outputs.content }}
6262
workflow: size-data.yml

‎.github/workflows/test.yml‎

Lines changed: 12 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.1.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.1.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.1.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'
@@ -111,13 +111,13 @@ jobs:
111111
env:
112112
PUPPETEER_SKIP_DOWNLOAD: 'true'
113113
steps:
114-
- uses: actions/checkout@v4
114+
- uses: actions/checkout@v5
115115

116116
- name: Install pnpm
117-
uses: pnpm/action-setup@v4.1.0
117+
uses: pnpm/action-setup@v4.2.0
118118

119119
- name: Install Node.js
120-
uses: actions/setup-node@v4
120+
uses: actions/setup-node@v6
121121
with:
122122
node-version-file: '.node-version'
123123
cache: 'pnpm'

‎.vscode/settings.json‎

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

55
"cSpell.enabledLanguageIds": ["markdown", "plaintext", "text", "yml"],
66

7-
// Use prettier to format typescript, javascript and JSON files
7+
// Use prettier to format TypeScript, JavaScript and JSON files
88
"[typescript]": {
99
"editor.defaultFormatter": "esbenp.prettier-vscode"
1010
},

0 commit comments

Comments
 (0)