From 3c245e21ade40d9d12e869813b865fd701be1192 Mon Sep 17 00:00:00 2001
From: abeer0 <47961062+iiio2@users.noreply.github.com>
Date: Mon, 7 Jul 2025 09:58:25 +0600
Subject: [PATCH 1/3] docs: mention `bun.lock` for lockfile (#20364)

---
 guide/dep-pre-bundling.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guide/dep-pre-bundling.md b/guide/dep-pre-bundling.md
index ab520f12..4a76d2a7 100644
--- a/guide/dep-pre-bundling.md
+++ b/guide/dep-pre-bundling.md
@@ -70,7 +70,7 @@ You can further customize esbuild too with the [`optimizeDeps.esbuildOptions` op
 
 Vite caches the pre-bundled dependencies in `node_modules/.vite`. It determines whether it needs to re-run the pre-bundling step based on a few sources:
 
-- Package manager lockfile content, e.g. `package-lock.json`, `yarn.lock`, `pnpm-lock.yaml` or `bun.lockb`.
+- Package manager lockfile content, e.g. `package-lock.json`, `yarn.lock`, `pnpm-lock.yaml` or `bun.lock`.
 - Patches folder modification time.
 - Relevant fields in your `vite.config.js`, if present.
 - `NODE_ENV` value.

From 8490f1d17348c103e90c4a71a6ad3fec21730c18 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 7 Jul 2025 13:58:42 +0900
Subject: [PATCH 2/3] fix(deps): update all non-major dependencies (#20366)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ea8434e9..b38ec477 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "gsap": "^3.13.0",
     "vitepress": "^2.0.0-alpha.7",
     "vitepress-plugin-group-icons": "^1.6.1",
-    "vitepress-plugin-llms": "^1.6.0",
+    "vitepress-plugin-llms": "^1.7.0",
     "vue": "^3.5.17"
   }
 }

From e4122281de08eccbb37d33eaa863e9c63d103b66 Mon Sep 17 00:00:00 2001
From: thinkasany <480968828@qq.com>
Date: Tue, 8 Jul 2025 13:38:26 +0800
Subject: [PATCH 3/3] fix: resolved conflict

---
 guide/dep-pre-bundling.md |  9 +--------
 package.json              | 21 ---------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/guide/dep-pre-bundling.md b/guide/dep-pre-bundling.md
index 8be9029b..7d8e1985 100644
--- a/guide/dep-pre-bundling.md
+++ b/guide/dep-pre-bundling.md
@@ -70,17 +70,10 @@ export default defineConfig({
 
 Vite 将预构建的依赖项缓存到 `node_modules/.vite` 中。它会基于以下几个来源来决定是否需要重新运行预构建步骤：
 
-<<<<<<< HEAD
-- 包管理器的锁文件内容，例如 `package-lock.json`，`yarn.lock`，`pnpm-lock.yaml`，或者 `bun.lockb`；
+- 包管理器的锁文件内容，例如 `package-lock.json`，`yarn.lock`，`pnpm-lock.yaml`，或者 `bun.lock`；
 - 补丁文件夹的修改时间；
 - `vite.config.js` 中的相关字段；
 - `NODE_ENV` 的值。
-=======
-- Package manager lockfile content, e.g. `package-lock.json`, `yarn.lock`, `pnpm-lock.yaml` or `bun.lock`.
-- Patches folder modification time.
-- Relevant fields in your `vite.config.js`, if present.
-- `NODE_ENV` value.
->>>>>>> 8490f1d17348c103e90c4a71a6ad3fec21730c18
 
 只有在上述其中一项发生更改时，才需要重新运行预构建。
 
diff --git a/package.json b/package.json
index 6d330ad3..39196b29 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
 	"name": "vite-docs-cn",
 	"version": "1.0.0",
 	"description": "Vite.js documentation Chinese translation.",
@@ -36,24 +35,4 @@
 	"gitHooks": {
 		"commit-msg": "node scripts/verifyCommit.js"
 	}
-=======
-  "name": "docs",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "docs": "vitepress dev",
-    "docs-build": "vitepress build",
-    "docs-serve": "vitepress serve"
-  },
-  "devDependencies": {
-    "@shikijs/vitepress-twoslash": "^3.7.0",
-    "@types/express": "^5.0.3",
-    "feed": "^5.1.0",
-    "gsap": "^3.13.0",
-    "vitepress": "^2.0.0-alpha.7",
-    "vitepress-plugin-group-icons": "^1.6.1",
-    "vitepress-plugin-llms": "^1.7.0",
-    "vue": "^3.5.17"
-  }
->>>>>>> 8490f1d17348c103e90c4a71a6ad3fec21730c18
 }