chore: update deps

Author: waynzh

package.json

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
 	"name": "vite-docs-cn",
 	"version": "1.0.0",
 	"description": "Vite.js documentation Chinese translation.",
@@ -9,17 +8,17 @@
 	"private": true,
 	"license": "CC BY-NC-SA 4.0",
 	"devDependencies": {
-    "@types/node": "^20.9.2",
+    "@shikijs/vitepress-twoslash": "^1.7.0",
+		"@types/express": "^4.17.21",
+		"feed": "^4.2.2",
+		"vitepress": "1.2.3",
+		"vue": "^3.4.29",
+		"@types/node": "^20.9.2",
 		"chalk": "^4.1.2",
 		"gray-matter": "^4.0.3",
 		"lodash": "^4.17.21",
 		"vite": "^5.1.6",
-		"feed": "^4.2.2",
-		"yorkie": "^2.0.0",
-		"@shikijs/vitepress-twoslash": "^1.6.3",
-		"@types/express": "^4.17.21",
-		"vitepress": "1.2.3",
-		"vue": "^3.4.27"
+		"yorkie": "^2.0.0"
 	},
 	"scripts": {
 		"dev": "vitepress dev .",
@@ -29,21 +28,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": "^1.7.0",
-    "@types/express": "^4.17.21",
-    "feed": "^4.2.2",
-    "vitepress": "1.2.3",
-    "vue": "^3.4.29"
-  }
->>>>>>> cfa53198f6c859029ffa3fd28b08724973a8867b
 }