Skip to content

Commit af067c0

Browse files
committed
chore: merge main
2 parents cc36605 + 9acf818 commit af067c0

File tree

25 files changed

+151
-80
lines changed

25 files changed

+151
-80
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ jobs:
6767
include:
6868
# Active LTS + other OS
6969
- os: macos-latest
70-
node_version: 22
70+
node_version: 24
7171
- os: windows-latest
72-
node_version: 22
72+
node_version: 24
7373
fail-fast: false
7474

7575
name: "Build&Test: node-${{ matrix.node_version }}, ${{ matrix.os }}"
@@ -218,17 +218,17 @@ jobs:
218218
lint:
219219
timeout-minutes: 10
220220
runs-on: ubuntu-latest
221-
name: "Lint: node-22, ubuntu-latest"
221+
name: "Lint: node-24, ubuntu-latest"
222222
steps:
223223
- uses: actions/checkout@v5
224224

225225
- name: Install pnpm
226226
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
227227

228-
- name: Set node version to 22
228+
- name: Set node version to 24
229229
uses: actions/setup-node@v6
230230
with:
231-
node-version: 22
231+
node-version: 24
232232
cache: "pnpm"
233233

234234
- name: Install deps

.github/workflows/copilot-setup-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
- name: Install pnpm
2020
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
2121

22-
- name: Set node version to 22
22+
- name: Set node version to 24
2323
uses: actions/setup-node@v6
2424
with:
25-
node-version: 22
25+
node-version: 24
2626
cache: "pnpm"
2727

2828
- name: Install deps

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
issues: write # to add / delete reactions, post comments
1313
pull-requests: write # to read PR data, and to add labels
1414
actions: read # to check workflow status
15-
contents: read # to clone the repo
1615
steps:
1716
- name: Check User Permissions
1817
uses: actions/github-script@v8
@@ -230,12 +229,6 @@ jobs:
230229
console.log('Removed "rocket" reaction.')
231230
}
232231
233-
- name: Checkout
234-
uses: actions/checkout@v5
235-
with:
236-
ref: refs/pull/${{ fromJSON(steps.get-pr-data.outputs.result).num }}/head
237-
fetch-depth: 0
238-
239232
- name: Trigger Downstream Workflow
240233
uses: actions/github-script@v8
241234
id: trigger

.github/workflows/issue-close-require.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write # for actions-cool/issues-helper to update PRs
1414
steps:
1515
- name: needs reproduction
16-
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # v3
16+
uses: actions-cool/issues-helper@ca1b238fecb728f25584d2beb288d7f1727f9fa6 # v3
1717
with:
1818
actions: "close-issues"
1919
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue-labeled.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- name: contribution welcome
1616
if: github.event.label.name == 'contribution welcome' || github.event.label.name == 'help wanted'
17-
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # v3
17+
uses: actions-cool/issues-helper@ca1b238fecb728f25584d2beb288d7f1727f9fa6 # v3
1818
with:
1919
actions: "remove-labels"
2020
token: ${{ secrets.GITHUB_TOKEN }}
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: remove pending
2525
if: (github.event.label.name == 'enhancement' || contains(github.event.label.description, '(priority)')) && contains(github.event.issue.labels.*.name, 'pending triage')
26-
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # v3
26+
uses: actions-cool/issues-helper@ca1b238fecb728f25584d2beb288d7f1727f9fa6 # v3
2727
with:
2828
actions: "remove-labels"
2929
token: ${{ secrets.GITHUB_TOKEN }}
@@ -32,7 +32,7 @@ jobs:
3232

3333
- name: needs reproduction
3434
if: github.event.label.name == 'needs reproduction'
35-
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # v3
35+
uses: actions-cool/issues-helper@ca1b238fecb728f25584d2beb288d7f1727f9fa6 # v3
3636
with:
3737
actions: "create-comment, remove-labels"
3838
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lock-closed-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.repository == 'vitejs/vite'
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # v3
15+
- uses: actions-cool/issues-helper@ca1b238fecb728f25584d2beb288d7f1727f9fa6 # v3
1616
with:
1717
actions: "lock-issues"
1818
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/preview-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
- name: Install pnpm
2929
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
3030

31-
- name: Set node version to 22
31+
- name: Set node version to 24
3232
uses: actions/setup-node@v6
3333
with:
34-
node-version: 22
34+
node-version: 24
3535
registry-url: https://registry.npmjs.org/
3636
# disable cache, to avoid cache poisoning (https://docs.zizmor.sh/audits/#cache-poisoning)
3737
package-manager-cache: false

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
- name: Install pnpm
2424
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
2525

26-
- name: Set node version to 22
26+
- name: Set node version to 24
2727
uses: actions/setup-node@v6
2828
with:
29-
node-version: 22
29+
node-version: 24
3030
registry-url: https://registry.npmjs.org/
3131
# disable cache, to avoid cache poisoning (https://docs.zizmor.sh/audits/#cache-poisoning)
3232
package-manager-cache: false

docs/guide/api-plugin.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,9 @@ Vite plugins can also provide hooks that serve Vite-specific purposes. These hoo
387387

388388
interface HtmlTagDescriptor {
389389
tag: string
390+
/**
391+
* attribute values will be escaped automatically if needed
392+
*/
390393
attrs?: Record<string, string | boolean>
391394
children?: string | HtmlTagDescriptor[]
392395
/**

docs/guide/rolldown.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ If you don't pass the option in yourself, this must be fixed by the utilized fra
111111

112112
#### `manualChunks` to `advancedChunks`
113113

114-
While Rolldown has support for the `manualChunks` option that is also exposed by Rollup, it is marked deprecated. Instead of it, Rolldown offers a more fine-grained setting via the [`advancedChunks` option](https://rolldown.rs/guide/in-depth/advanced-chunks#advanced-chunks), which is more similar to webpack's `splitChunk`:
114+
While Rolldown has support for the `manualChunks` option that is also exposed by Rollup, it is marked deprecated. Instead of it, Rolldown offers a more fine-grained setting via the [`advancedChunks` option](https://rolldown.rs/in-depth/advanced-chunks), which is more similar to webpack's `splitChunk`:
115115

116116
```js
117117
// Old configuration (Rollup)

0 commit comments

Comments
 (0)