From 160a055022d9207b4894350d6a0d926552d954b5 Mon Sep 17 00:00:00 2001
From: Philippe Serhal <philippe.serhal@gmail.com>
Date: Thu, 18 Sep 2025 20:59:23 -0400
Subject: [PATCH 1/3] docs: fix `buildApp` type mismatch in code example
 (#20798)

---
 guide/api-environment-frameworks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guide/api-environment-frameworks.md b/guide/api-environment-frameworks.md
index 03a2badc..59fe4891 100644
--- a/guide/api-environment-frameworks.md
+++ b/guide/api-environment-frameworks.md
@@ -315,7 +315,7 @@ export default {
   builder: {
     buildApp: async (builder) => {
       const environments = Object.values(builder.environments)
-      return Promise.all(
+      await Promise.all(
         environments.map((environment) => builder.build(environment)),
       )
     },

From ae068d94bfa2094b3fe4dc853faf1000fc94b49c Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Sat, 20 Sep 2025 22:00:45 +0900
Subject: [PATCH 2/3] chore: ensure `@vitejs/` scope for private packages names
 (#20801)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c48b2cb4..b2c99c63 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "docs",
+  "name": "@vitejs/monorepo-docs",
   "private": true,
   "type": "module",
   "scripts": {

From c59d102a79a91737ce7fcefe356bdf5cea11d714 Mon Sep 17 00:00:00 2001
From: thinkasany <480968828@qq.com>
Date: Sun, 21 Sep 2025 09:12:20 +0800
Subject: [PATCH 3/3] fix: resolved confilct

---
 package.json | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/package.json b/package.json
index 71c66fd5..c0ad3cab 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.",
@@ -40,27 +39,4 @@
 	"gitHooks": {
 		"commit-msg": "node scripts/verifyCommit.js"
 	}
-=======
-  "name": "@vitejs/monorepo-docs",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "typecheck": "vue-tsc",
-    "docs": "vitepress dev",
-    "docs-build": "vitepress build",
-    "docs-serve": "vitepress serve"
-  },
-  "devDependencies": {
-    "@shikijs/vitepress-twoslash": "^3.12.2",
-    "@types/express": "^5.0.3",
-    "feed": "^5.1.0",
-    "gsap": "^3.13.0",
-    "markdown-it-image-size": "^14.8.0",
-    "vitepress": "^2.0.0-alpha.12",
-    "vitepress-plugin-group-icons": "^1.6.3",
-    "vitepress-plugin-llms": "^1.7.5",
-    "vue": "^3.5.21",
-    "vue-tsc": "^3.0.7"
-  }
->>>>>>> ae068d94bfa2094b3fe4dc853faf1000fc94b49c
 }