From b4dfd13aab1bbec2929eb7de0316030b2039a7f8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 11 Jun 2025 18:07:09 +0900
Subject: [PATCH 1/2] fix(deps): update all non-major dependencies (#20181)

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

diff --git a/package.json b/package.json
index db7eb036..f6d81b97 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,12 @@
   },
   "devDependencies": {
     "@shikijs/vitepress-twoslash": "^2.5.0",
-    "@types/express": "^5.0.2",
+    "@types/express": "^5.0.3",
     "feed": "^5.1.0",
     "gsap": "^3.13.0",
     "vitepress": "^1.6.3",
     "vitepress-plugin-group-icons": "^1.6.0",
-    "vitepress-plugin-llms": "^1.3.4",
+    "vitepress-plugin-llms": "^1.5.0",
     "vue": "^3.5.16"
   }
 }

From 5f8d497d19ace3ba5127f96614e13a50d7699eea Mon Sep 17 00:00:00 2001
From: thinkasany <480968828@qq.com>
Date: Thu, 12 Jun 2025 09:53:17 +0800
Subject: [PATCH 2/2] chore: update deps

---
 package.json   | 23 +----------------------
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index 34ee8ff6..cc2621e2 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.",
@@ -10,7 +9,7 @@
 	"license": "CC BY-NC-SA 4.0",
 	"devDependencies": {
 		"@shikijs/vitepress-twoslash": "^2.5.0",
-		"@types/express": "^5.0.2",
+		"@types/express": "^5.0.3",
 		"feed": "^5.1.0",
 		"vitepress": "^1.6.3",
 		"vitepress-plugin-group-icons": "^1.6.0",
@@ -33,24 +32,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": "^2.5.0",
-    "@types/express": "^5.0.3",
-    "feed": "^5.1.0",
-    "gsap": "^3.13.0",
-    "vitepress": "^1.6.3",
-    "vitepress-plugin-group-icons": "^1.6.0",
-    "vitepress-plugin-llms": "^1.5.0",
-    "vue": "^3.5.16"
-  }
->>>>>>> b4dfd13aab1bbec2929eb7de0316030b2039a7f8
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index db3768ee..63950d2d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -15,8 +15,8 @@ importers:
         specifier: ^0.1.1
         version: 0.1.1
       '@types/express':
-        specifier: ^5.0.2
-        version: 5.0.2
+        specifier: ^5.0.3
+        version: 5.0.3
       '@types/node':
         specifier: ^20.9.2
         version: 20.12.12
@@ -751,8 +751,8 @@ packages:
   '@types/express-serve-static-core@5.0.6':
     resolution: {integrity: sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==}
 
-  '@types/express@5.0.2':
-    resolution: {integrity: sha512-BtjL3ZwbCQriyb0DGw+Rt12qAXPiBTPs815lsUvtt1Grk0vLRMZNMUZ741d5rjk+UQOxfDiBZ3dxpX00vSkK3g==}
+  '@types/express@5.0.3':
+    resolution: {integrity: sha512-wGA0NX93b19/dZC1J18tKWVIYWyyF2ZjT9vin/NRu0qzzvfVzWjs04iq2rQ3H65vCTQYlRqs3YHfY7zjdV+9Kw==}
 
   '@types/hast@3.0.4':
     resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
@@ -2230,7 +2230,7 @@ snapshots:
       '@types/range-parser': 1.2.7
       '@types/send': 0.17.4
 
-  '@types/express@5.0.2':
+  '@types/express@5.0.3':
     dependencies:
       '@types/body-parser': 1.19.5
       '@types/express-serve-static-core': 5.0.6