Skip to content

Commit c98504f

Browse files
authored
Merge branch 'main' into copilot/fix-30fb8ddb-e23f-4a2c-ba29-02144fbd2479
2 parents 6b13cf1 + bb85bd7 commit c98504f

File tree

249 files changed

+4605
-2585
lines changed

Some content is hidden

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

249 files changed

+4605
-2585
lines changed

.github/renovate.json5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"labels": ["dependencies"],
55
"ignorePaths": ["**/__tests__/**"],
66
"rangeStrategy": "bump",
7+
"postUpdateOptions": ["pnpmDedupe"],
78
"packageRules": [
89
{
910
"matchDepTypes": ["peerDependencies"],

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ jobs:
7878
uses: actions/checkout@v5
7979

8080
- name: Install pnpm
81-
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
81+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
8282

8383
- name: Set node version to ${{ matrix.node_version }}
84-
uses: actions/setup-node@v5
84+
uses: actions/setup-node@v6
8585
with:
8686
node-version: ${{ matrix.node_version }}
8787
cache: "pnpm"
@@ -151,10 +151,10 @@ jobs:
151151
- uses: actions/checkout@v5
152152

153153
- name: Install pnpm
154-
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
154+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
155155

156156
- name: Set node version to 22
157-
uses: actions/setup-node@v5
157+
uses: actions/setup-node@v6
158158
with:
159159
node-version: 22
160160
cache: "pnpm"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
uses: actions/checkout@v5
1818

1919
- name: Install pnpm
20-
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
20+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
2121

2222
- name: Set node version to 22
23-
uses: actions/setup-node@v5
23+
uses: actions/setup-node@v6
2424
with:
2525
node-version: 22
2626
cache: "pnpm"

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

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
if: github.repository == 'vitejs/vite' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/ecosystem-ci run')
1111
permissions:
12-
issues: write # to add / delete reactions
12+
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
1515
contents: read # to clone the repo
@@ -66,6 +66,37 @@ jobs:
6666
repo: context.repo.repo,
6767
pull_number: context.issue.number
6868
})
69+
70+
const commentCreatedAt = new Date(context.payload.comment.created_at)
71+
const commitPushedAt = new Date(pr.head.repo.pushed_at)
72+
73+
console.log(`Comment created at: ${commentCreatedAt.toISOString()}`)
74+
console.log(`PR last pushed at: ${commitPushedAt.toISOString()}`)
75+
76+
// Check if any commits were pushed after the comment was created
77+
if (commitPushedAt > commentCreatedAt) {
78+
const errorMsg = [
79+
'⚠️ Security warning: PR was updated after the trigger command was posted.',
80+
'',
81+
`Comment posted at: ${commentCreatedAt.toISOString()}`,
82+
`PR last pushed at: ${commitPushedAt.toISOString()}`,
83+
'',
84+
'This could indicate an attempt to inject code after approval.',
85+
'Please review the latest changes and re-run /ecosystem-ci run if they are acceptable.'
86+
].join('\n')
87+
88+
core.setFailed(errorMsg)
89+
90+
await github.rest.issues.createComment({
91+
owner: context.repo.owner,
92+
repo: context.repo.repo,
93+
issue_number: context.issue.number,
94+
body: errorMsg
95+
})
96+
97+
throw new Error('PR was pushed to after comment was created')
98+
}
99+
69100
core.setOutput('head_sha', pr.head.sha)
70101
return {
71102
num: context.issue.number,
@@ -228,7 +259,7 @@ jobs:
228259
prNumber: '' + prData.num,
229260
branchName: prData.branchName,
230261
repo: prData.repo,
231-
commit: process.env.COLLISION === 'false' ? prData.commit : '',
262+
commit: prData.commit,
232263
suite: suite === '' ? '-' : suite
233264
}
234265
})

.github/workflows/preview-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
uses: actions/checkout@v5
2727

2828
- name: Install pnpm
29-
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
29+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
3030

3131
- name: Set node version to 22
32-
uses: actions/setup-node@v5
32+
uses: actions/setup-node@v6
3333
with:
3434
node-version: 22
3535
registry-url: https://registry.npmjs.org/

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
uses: actions/checkout@v5
2222

2323
- name: Install pnpm
24-
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
24+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
2525

2626
- name: Set node version to 22
27-
uses: actions/setup-node@v5
27+
uses: actions/setup-node@v6
2828
with:
2929
node-version: 22
3030
registry-url: https://registry.npmjs.org/

.github/workflows/release-tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- "plugin-*" # Push events to matching plugin-*, i.e. plugin-(vue|vue-jsx|react|legacy)@1.0.0
88
- "create-vite*" # # Push events to matching create-vite*, i.e. [email protected]
99

10-
# $GITHUB_REF_NAME - https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
10+
# $GITHUB_REF_NAME - https://docs.github.com/en/actions/reference/workflows-and-actions/variables#default-environment-variables
1111

1212
jobs:
1313
release:

docs/.vitepress/config.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,10 @@ export default defineConfig({
203203
{ text: 'Team', link: '/team' },
204204
{ text: 'Blog', link: '/blog' },
205205
{ text: 'Releases', link: '/releases' },
206+
{
207+
text: 'The Documentary',
208+
link: 'https://www.youtube.com/watch?v=bmWQqAKLgT4',
209+
},
206210
{
207211
items: [
208212
{

docs/.vitepress/inlined-scripts/banner.js

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

9-
window.__VITE_BANNER_ID__ = 'viteconf2025'
9+
window.__VITE_BANNER_ID__ = 'viteplusannouncement'
1010
restore(`vite-docs-banner-${__VITE_BANNER_ID__}`, 'banner-dismissed')
1111
})()

docs/.vitepress/theme/components/AsideSponsors.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const sponsors = computed(() => {
2121
<template>
2222
<a
2323
class="viteconf"
24-
href="https://viteconf.org/?utm=vite-sidebar"
24+
href="https://www.youtube.com/playlist?list=PLqGQbXn_GDmkJaoykvHCUmXUPjhgH2bVr"
2525
target="_blank"
2626
>
2727
<img
@@ -33,7 +33,7 @@ const sponsors = computed(() => {
3333
<span>
3434
<p class="extra-info">Building Together</p>
3535
<p class="heading">ViteConf 2025</p>
36-
<p class="extra-info">First time in-person!</p>
36+
<p class="extra-info">View the replays</p>
3737
</span>
3838
</a>
3939
<VPDocAsideSponsors v-if="data" :data="sponsors" />

0 commit comments

Comments
 (0)