From 993e7b447cdf11b4b9c8998ee9104ba70eae766d Mon Sep 17 00:00:00 2001
From: LovelessCodes <hello@loveless.codes>
Date: Thu, 26 Jun 2025 06:42:07 +0200
Subject: [PATCH 1/4] docs: add vite 6 docs to version dropdown (#20291)

---
 .vitepress/config.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.vitepress/config.ts b/.vitepress/config.ts
index 5d7416ce..5d77ff48 100644
--- a/.vitepress/config.ts
+++ b/.vitepress/config.ts
@@ -40,6 +40,10 @@ const additionalTitle = ((): string => {
 })()
 const versionLinks = ((): DefaultTheme.NavItemWithLink[] => {
   const oldVersions: DefaultTheme.NavItemWithLink[] = [
+    {
+      text: 'Vite 6 Docs',
+      link: 'https://v6.vite.dev',
+    },
     {
       text: 'Vite 5 Docs',
       link: 'https://v5.vite.dev',
@@ -63,7 +67,7 @@ const versionLinks = ((): DefaultTheme.NavItemWithLink[] => {
     case 'local':
       return [
         {
-          text: 'Vite 6 Docs (release)',
+          text: 'Vite 7 Docs (release)',
           link: 'https://vite.dev',
         },
         ...oldVersions,

From 998da4eacae22707602cfbf6a9faee3e399a4cb1 Mon Sep 17 00:00:00 2001
From: btea <2356281422@qq.com>
Date: Fri, 27 Jun 2025 11:44:50 +0800
Subject: [PATCH 2/4] docs: update watch option desc (#20309)

---
 config/server-options.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/server-options.md b/config/server-options.md
index b689118f..6ee6935f 100644
--- a/config/server-options.md
+++ b/config/server-options.md
@@ -254,7 +254,7 @@ export default defineConfig({
 
 File system watcher options to pass on to [chokidar](https://github.com/paulmillr/chokidar/tree/3.6.0#api).
 
-The Vite server watcher watches the `root` and skips the `.git/`, `node_modules/`, and Vite's `cacheDir` and `build.outDir` directories by default. When updating a watched file, Vite will apply HMR and update the page only if needed.
+The Vite server watcher watches the `root` and skips the `.git/`, `node_modules/`, `test-results/`, and Vite's `cacheDir` and `build.outDir` directories by default. When updating a watched file, Vite will apply HMR and update the page only if needed.
 
 If set to `null`, no files will be watched. `server.watcher` will provide a compatible event emitter, but calling `add` or `unwatch` will have no effect.
 

From dc042a7f147faa51100d4046e5e8544e14b2aab7 Mon Sep 17 00:00:00 2001
From: thinkasany <480968828@qq.com>
Date: Sat, 28 Jun 2025 09:00:53 +0800
Subject: [PATCH 3/4] fix: resolved conflict

---
 config/server-options.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/config/server-options.md b/config/server-options.md
index f13f2c87..ff174e21 100644
--- a/config/server-options.md
+++ b/config/server-options.md
@@ -254,11 +254,7 @@ export default defineConfig({
 
 文件系统监视器选项传递给 [chokidar](https://github.com/paulmillr/chokidar/tree/3.6.0#api)。
 
-<<<<<<< HEAD
-Vite 服务器的文件监听器默认会监听 `root` 目录，同时会跳过 `.git/`、`node_modules/`，以及 Vite 的 `cacheDir` 和 `build.outDir` 这些目录。当监听到文件更新时，Vite 会应用 HMR 并且只在需要时更新页面。
-=======
-The Vite server watcher watches the `root` and skips the `.git/`, `node_modules/`, `test-results/`, and Vite's `cacheDir` and `build.outDir` directories by default. When updating a watched file, Vite will apply HMR and update the page only if needed.
->>>>>>> 998da4eacae22707602cfbf6a9faee3e399a4cb1
+Vite 服务器的文件监听器默认会监听 `root` 目录，同时会跳过 `.git/`、`node_modules/`、`test-results/`, 以及 Vite 的 `cacheDir` 和 `build.outDir` 这些目录。当监听到文件更新时，Vite 会应用 HMR 并且只在需要时更新页面。
 
 如果设置为 `null`，则不会监视任何文件。`server.watcher` 将提供兼容的事件发射器，但调用 `add` 或 `unwatch` 将不起作用。
 

From 8fd795e51d33616bb61078fe75459c5c7737c660 Mon Sep 17 00:00:00 2001
From: thinkasany <480968828@qq.com>
Date: Sat, 28 Jun 2025 09:05:13 +0800
Subject: [PATCH 4/4] chore: add old version url

---
 .vitepress/config.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.vitepress/config.ts b/.vitepress/config.ts
index 1cd66e35..e8a9f85d 100644
--- a/.vitepress/config.ts
+++ b/.vitepress/config.ts
@@ -257,6 +257,10 @@ export default defineConfig({
       {
         text: '历史版本',
         items: [
+          {
+            text: 'Vite v6 文档（英文）',
+            link: 'https://v6.vite.dev'
+          },
           {
             text: 'Vite v5 文档（英文）',
             link: 'https://v5.vite.dev'