Skip to content

d2m #1386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkasany merged 10 commits into from
Oct 15, 2025
Merged

d2m #1386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a31fc69
Merge pull request #1384 from vitejs/main
thinkasany Oct 8, 2025
d07370d
fix(deps): update all non-major dependencies
renovate[bot] Oct 14, 2025
a8350e0
docs: update banner to Vite+ (#20931)
TheAlexLichter Oct 14, 2025
bd1f2a6
docs: add viteconf 2025 video playlist (#20938)
TheAlexLichter Oct 14, 2025
10fe59a
docs: add the vite documentary to resources (#20939)
TheAlexLichter Oct 14, 2025
7671f62
docs(rolldown): update links to match new docs (#20941)
bvoo Oct 14, 2025
fd2dc87
docs(en): merging all conflicts
docschina-bot Oct 14, 2025
7365f01
resolved deps
thinkasany Oct 15, 2025
497e375
resolved conflict
thinkasany Oct 15, 2025
7fe4aa8
Merge pull request #1385 from vitejs/sync-7671f62f-1
thinkasany Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .vitepress/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ export default defineConfig({
{ text: '团队成员', link: '/team' },
{ text: '最新博客', link: '/blog' },
{ text: '发布策略', link: '/releases' },
{
text: '纪录片',
link: 'https://www.youtube.com/watch?v=bmWQqAKLgT4',
},
{
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion .vitepress/inlined-scripts/banner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
}
}

window.__VITE_BANNER_ID__ = 'viteconf2025'
window.__VITE_BANNER_ID__ = 'viteplusannouncement'
restore(`vite-docs-banner-${__VITE_BANNER_ID__}`, 'banner-dismissed')
})()
4 changes: 2 additions & 2 deletions .vitepress/theme/components/AsideSponsors.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const sponsors = computed(() => {
<template>
<a
class="viteconf"
href="https://viteconf.org/?utm=vite-sidebar"
href="https://www.youtube.com/playlist?list=PLqGQbXn_GDmkJaoykvHCUmXUPjhgH2bVr"
target="_blank"
>
<img
Expand All @@ -33,7 +33,7 @@ const sponsors = computed(() => {
<span>
<p class="extra-info">Building Together</p>
<p class="heading">ViteConf 2025</p>
<p class="extra-info">First time in-person!</p>
<p class="extra-info">View the replays</p>
</span>
</a>
<VPDocAsideSponsors v-if="data" :data="sponsors" />
Expand Down
Loading