docs(en): merging all conflicts

Author: docschina-bot

guide/index.md

@@ -116,10 +116,14 @@ create-vite 是一个快速生成主流框架基础模板的工具。查看 Awes
 
 对于一个 `https://github.com/user/project` 中的模板，可以尝试使用 `https://github.stackblitz.com/user/project`（即在项目 URL 的 `github` 后添加 `.stackblitz`）。
 
+<<<<<<< HEAD
 你也可以用如 [degit](https://github.com/Rich-Harris/degit) 之类的工具，使用社区模版来搭建项目。假设项目在 GitHub 上并使用 `main` 作为默认分支，可以使用以下命令创建本地副本：
+=======
+You can also use a tool like [tiged](https://github.com/tiged/tiged) to scaffold your project with one of the templates. Assuming the project is on GitHub and uses `main` as the default branch, you can create a local copy using:
+>>>>>>> a6a5c9d25c4142c49981c46aaac6919007432db9
 
 ```bash
-npx degit user/project#main my-project
+npx tiged user/project my-project
 cd my-project
 
 npm install

guide/performance.md

@@ -114,13 +114,25 @@ export default defineConfig({
 
 精简工作的例子：
 
+<<<<<<< HEAD
 - 使用 CSS 而不是 Sass/Less/Stylus（可以由 PostCSS 处理嵌套）
 - 不要将 SVG 转换为 UI 框架组件（例如 React、Vue 等）。请将其作为字符串或 URL 导入。
 - 当使用 `@vitejs/plugin-react` 时，避免配置 Babel 选项，这样它就会在构建期间跳过转换（只使用 esbuild）。
+=======
+- Use CSS instead of Sass/Less/Stylus when possible (nesting can be handled by PostCSS / Lightning CSS)
+- Don't transform SVGs into UI framework components (React, Vue, etc.). Import them as strings or URLs instead.
+- When using `@vitejs/plugin-react`, avoid configuring the Babel options, so it skips the transformation during build (only Oxc will be used).
+>>>>>>> a6a5c9d25c4142c49981c46aaac6919007432db9
 
 使用更原生化工具链的例子：
 
+<<<<<<< HEAD
 使用更原生化的工具链往往会带来更大的安装大小，因此在启动新的 Vite 项目时不是默认的。但对于较大的应用程序来说，这可能是值得的。
 
 - 尝试实验性的 [LightningCSS](https://github.com/vitejs/vite/discussions/13835)
 - 使用 [`@vitejs/plugin-react-swc`](https://github.com/vitejs/vite-plugin-react-swc) 代替 `@vitejs/plugin-react`。
+=======
+While Vite core is based on native tooling, some features still use non-native tooling by default to provide better compatibility and feature set. But it may be worth the cost for larger applications.
+
+- Try out the experimental support for [LightningCSS](https://github.com/vitejs/vite/discussions/13835)
+>>>>>>> a6a5c9d25c4142c49981c46aaac6919007432db9

package.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
 	"name": "vite-docs-cn",
 	"version": "8.0.0-beta.0",
 	"description": "Vite.js documentation Chinese translation.",
@@ -38,4 +39,28 @@
 	"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.20.0",
+    "@types/express": "^5.0.6",
+    "feed": "^5.1.0",
+    "gsap": "^3.14.2",
+    "markdown-it-image-size": "^15.0.1",
+    "oxc-minify": "^0.102.0",
+    "vitepress": "^2.0.0-alpha.15",
+    "vitepress-plugin-group-icons": "^1.6.5",
+    "vitepress-plugin-llms": "^1.9.3",
+    "vue": "^3.5.25",
+    "vue-tsc": "^3.1.8"
+  }
+>>>>>>> a6a5c9d25c4142c49981c46aaac6919007432db9
 }