From 1f7172a48e0dcebe3b8ae6c11a0c33cad6f062ae Mon Sep 17 00:00:00 2001
From: Sean Kenneth Doherty <Smaster7772@gmail.com>
Date: Thu, 28 May 2026 22:37:19 -0500
Subject: [PATCH 1/3] docs: use enforce post for CSS metadata (#22467)

---
 guide/api-plugin.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/guide/api-plugin.md b/guide/api-plugin.md
index c6cdbfb8..80789414 100644
--- a/guide/api-plugin.md
+++ b/guide/api-plugin.md
@@ -526,6 +526,7 @@ Example:
 function outputMetadataPlugin(): Plugin {
   return {
     name: 'output-metadata-plugin',
+    enforce: 'post',
     generateBundle(_, bundle) {
       for (const output of Object.values(bundle)) {
         const css = output.viteMetadata?.importedCss

From 3cc044a606e2fd0f84fbc9684edd3ba3e4ae04b6 Mon Sep 17 00:00:00 2001
From: Jerry Zhao <165626830+shulaoda@users.noreply.github.com>
Date: Fri, 29 May 2026 12:20:13 +0800
Subject: [PATCH 2/3] feat: update rolldown to 1.0.3 (#22538)

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

diff --git a/package.json b/package.json
index 9b577ca0..68a4af72 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "@voidzero-dev/vitepress-theme": "^4.8.4",
     "feed": "^5.2.1",
     "markdown-it-image-size": "^15.0.1",
-    "oxc-minify": "^0.132.0",
+    "oxc-minify": "^0.133.0",
     "vitepress": "^2.0.0-alpha.17",
     "vitepress-plugin-graphviz": "^0.1.0",
     "vitepress-plugin-group-icons": "^1.7.5",

From c50b1b4432f706ac38fdcd59022823064c9dca17 Mon Sep 17 00:00:00 2001
From: thinkasany <480968828@qq.com>
Date: Mon, 1 Jun 2026 09:52:53 +0800
Subject: [PATCH 3/3] fix: resolve

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

diff --git a/package.json b/package.json
index 0629fe1c..6bdff9e5 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
 	"name": "vite-docs-cn",
 	"version": "8.0.0",
 	"description": "Vite.js documentation Chinese translation.",
@@ -42,29 +41,4 @@
 	"gitHooks": {
 		"commit-msg": "node scripts/verifyCommit.js"
 	}
-=======
-  "name": "@vitejs/monorepo-docs",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "docs": "vitepress dev",
-    "docs-build": "vitepress build",
-    "docs-serve": "vitepress serve"
-  },
-  "devDependencies": {
-    "@iconify/vue": "^5.0.1",
-    "@shikijs/vitepress-twoslash": "^4.1.0",
-    "@types/express": "^5.0.6",
-    "@voidzero-dev/vitepress-theme": "^4.8.4",
-    "feed": "^5.2.1",
-    "markdown-it-image-size": "^15.0.1",
-    "oxc-minify": "^0.133.0",
-    "vitepress": "^2.0.0-alpha.17",
-    "vitepress-plugin-graphviz": "^0.1.0",
-    "vitepress-plugin-group-icons": "^1.7.5",
-    "vitepress-plugin-llms": "^1.12.2",
-    "vue": "^3.5.34",
-    "vue-tsc": "^3.3.1"
-  }
->>>>>>> 3cc044a606e2fd0f84fbc9684edd3ba3e4ae04b6
 }