docs(cn): resolve conflicts

Author: waynzh

.vitepress/config.ts

@@ -124,23 +124,13 @@ export default defineConfig({
   ],
 
   locales: {
-<<<<<<< HEAD
     root: { label: '简体中文' },
-    en: { label: 'English', link: 'https://vitejs.dev' },
-    ja: { label: '日本語', link: 'https://ja.vitejs.dev' },
-    es: { label: 'Español', link: 'https://es.vitejs.dev' },
-    pt: { label: 'Português', link: 'https://pt.vitejs.dev' },
-    ko: { label: '한국어', link: 'https://ko.vitejs.dev' },
-    de: { label: 'Deutsch', link: 'https://de.vitejs.dev' },
-=======
-    root: { label: 'English' },
-    zh: { label: '简体中文', link: 'https://cn.vite.dev' },
+    en: { label: 'English', link: 'https://vite.dev' },
     ja: { label: '日本語', link: 'https://ja.vite.dev' },
     es: { label: 'Español', link: 'https://es.vite.dev' },
     pt: { label: 'Português', link: 'https://pt.vite.dev' },
     ko: { label: '한국어', link: 'https://ko.vite.dev' },
     de: { label: 'Deutsch', link: 'https://de.vite.dev' },
->>>>>>> 0fd7d2e8b36cf55fe5385ff2f957b92e9d44054b
   },
 
   themeConfig: {
@@ -218,12 +208,8 @@ export default defineConfig({
 
     footer: {
       message: `Released under the MIT License. (${commitRef})`,
-<<<<<<< HEAD
       copyright:
-        '本中文文档内容版权为 Vite 官方中文翻译团队所有，保留所有权利。'
-=======
-      copyright: 'Copyright © 2019-present VoidZero Inc. & Vite Contributors',
->>>>>>> 0fd7d2e8b36cf55fe5385ff2f957b92e9d44054b
+        'Copyright © 2019-present VoidZero Inc. & Vite Contributors'
     },
 
     nav: [
@@ -247,13 +233,8 @@ export default defineConfig({
                 link: 'https://twitter.com/vite_js',
               },
               {
-<<<<<<< HEAD
                 text: 'Discord 聊天室',
-                link: 'https://chat.vitejs.dev'
-=======
-                text: 'Discord Chat',
                 link: 'https://chat.vite.dev',
->>>>>>> 0fd7d2e8b36cf55fe5385ff2f957b92e9d44054b
               },
               {
                 text: 'Awesome Vite',
@@ -284,15 +265,15 @@ export default defineConfig({
         items: [
           {
             text: 'Vite v4 文档（英文）',
-            link: 'https://v4.vitejs.dev'
+            link: 'https://v4.vite.dev'
           },
           {
             text: 'Vite v3 文档（英文）',
-            link: 'https://v3.vitejs.dev'
+            link: 'https://v3.vite.dev'
           },
           {
             text: 'Vite v2 文档（英文）',
-            link: 'https://v2.vitejs.dev'
+            link: 'https://v2.vite.dev'
           },
         ]
       }
@@ -368,16 +349,11 @@ export default defineConfig({
               link: '/guide/philosophy',
             },
             {
-<<<<<<< HEAD
-              text: '从 v4 迁移',
+              text: '从 v5 迁移',
               link: '/guide/migration'
-=======
-              text: 'Migration from v5',
-              link: '/guide/migration',
->>>>>>> 0fd7d2e8b36cf55fe5385ff2f957b92e9d44054b
             },
             {
-              text: 'Breaking Changes',
+              text: '破坏性变更',
               link: '/changes/',
             },
           ],
@@ -398,13 +374,8 @@ export default defineConfig({
               link: '/guide/api-javascript',
             },
             {
-<<<<<<< HEAD
-              text: 'Vite 运行时 API',
-              link: '/guide/api-vite-runtime',
-=======
-              text: 'Environment API',
+              text: '环境 API',
               link: '/guide/api-environment',
->>>>>>> 0fd7d2e8b36cf55fe5385ff2f957b92e9d44054b
             },
             {
               text: '配置参考',
@@ -454,40 +425,40 @@ export default defineConfig({
       ],
       '/changes/': [
         {
-          text: 'Breaking Changes',
+          text: '破坏性变更',
           link: '/changes/',
         },
         {
-          text: 'Current',
+          text: '现在',
           items: [],
         },
         {
-          text: 'Future',
+          text: '未来',
           items: [
             {
-              text: 'this.environment in Hooks',
+              text: '钩子函数中的 this.environment',
               link: '/changes/this-environment-in-hooks',
             },
             {
-              text: 'HMR hotUpdate Plugin Hook',
+              text: 'HMR hotUpdate 插件钩子',
               link: '/changes/hotupdate-hook',
             },
             {
-              text: 'Move to per-environment APIs',
+              text: '迁移到按环境划分的 API',
               link: '/changes/per-environment-apis',
             },
             {
-              text: 'SSR using ModuleRunner API',
+              text: '使用 ModuleRunner API 进行服务端渲染',
               link: '/changes/ssr-using-modulerunner',
             },
             {
-              text: 'Shared plugins during build',
+              text: '构建过程中的共享插件',
               link: '/changes/shared-plugins-during-build',
             },
           ],
         },
         {
-          text: 'Past',
+          text: '过去',
           items: [],
         },
       ],

.vitepress/theme/components/landing/1. hero-section/HeroSection.vue

@@ -15,13 +15,12 @@ import HeroDiagram from './HeroDiagram.vue'
       <h1>The Build Tool<br />for the Web</h1>
       <!-- Tagline -->
       <h3>
-        Vite is a blazing fast frontend build tool powering the next generation
-        of web applications.
+        Vite 是一个超快速的前端构建工具，推动着下一代网络应用的发展
       </h3>
 
       <!-- CTA Buttons -->
       <div class="hero__actions">
-        <a href="/guide/" class="btn btn--primary">Get started</a>
+        <a href="/guide/" class="btn btn--primary">开始</a>
         <a
           href="https://github.com/vitejs/vite"
           target="_blank"

.vitepress/theme/components/landing/2. feature-section/FeatureCI.vue

@@ -319,10 +319,10 @@ const { startAnimation, isCardActive } = useCardAnimation(
       </div>
     </div>
     <div class="feature__meta meta--center">
-      <div class="meta__title">Continuous ecosystem integration</div>
+      <div class="meta__title">持续的生态系统集成</div>
       <div class="meta__description">
-        Our CI continuously tests Vite changes against downstream projects,
-        allowing us to improve Vite with stability and confidence.
+        我们的持续集成（CI）系统不断测试 Vite 对下游项目的更改，
+        这使我们能够在确保稳定性的同时，自信地改进 Vite
       </div>
     </div>
   </div>

.vitepress/theme/components/landing/2. feature-section/FeatureFlexiblePlugins.vue

@@ -349,10 +349,9 @@ const { isCardActive, startAnimation } = useCardAnimation(
       </div>
     </div>
     <div class="feature__meta">
-      <div class="meta__title">Flexible plugin system</div>
+      <div class="meta__title">灵活的插件系统</div>
       <div class="meta__description">
-        Vite plugins extends Rollup's well-designed plugin interface with a few
-        extra Vite-specific options.
+        Vite 插件扩展了 Rollup 精妙的插件接口，并增加了一些 Vite 特有的选项配置
       </div>
     </div>
   </div>

.vitepress/theme/components/landing/2. feature-section/FeatureHMR.vue

@@ -247,9 +247,9 @@ const { startAnimation } = useCardAnimation(
       </div>
     </div>
     <div class="feature__meta meta--center">
-      <div class="meta__title">Lightning fast HMR</div>
+      <div class="meta__title">轻量快速的模块热替换</div>
       <div class="meta__description">
-        Hot Module Replacement (HMR) that stays fast regardless of app size.
+        无论应用程序大小如何，都始终以极快的速度进行模块热替换（HMR）
       </div>
     </div>
   </div>

.vitepress/theme/components/landing/2. feature-section/FeatureInstantServerStart.vue

@@ -182,9 +182,9 @@ onUnmounted(() => {
       <div class="connection-line" :class="{ active: commandTriggered }" />
     </div>
     <div class="feature__meta">
-      <div class="meta__title">Instant server start</div>
+      <div class="meta__title">极速的服务启动</div>
       <div class="meta__description">
-        On demand file serving over native ESM, no bundling required!
+        使用原生 ESM 文件，无需打包
       </div>
     </div>
   </div>

.vitepress/theme/components/landing/2. feature-section/FeatureOptimizedBuild.vue

@@ -436,9 +436,9 @@ const { startAnimation } = useCardAnimation(
       </svg>
     </div>
     <div class="feature__meta meta--center">
-      <div class="meta__title">Optimized build</div>
+      <div class="meta__title">优化后的构建</div>
       <div class="meta__description">
-        Pre-configured Rollup build with multi-page and library mode support.
+        可选 “多页应用” 或 “库” 模式的预配置 Rollup 构建
       </div>
     </div>
   </div>

.vitepress/theme/components/landing/2. feature-section/FeatureRichFeatures.vue

@@ -126,9 +126,9 @@ const { isCardActive, startAnimation } = useCardAnimation(
       <div class="center-glow" />
     </div>
     <div class="feature__meta meta--center">
-      <div class="meta__title">Rich features</div>
+      <div class="meta__title">丰富的功能</div>
       <div class="meta__description">
-        Out-of-the-box support for TypeScript, JSX, CSS and more.
+        对 TypeScript、JSX、CSS 等支持开箱即用
       </div>
     </div>
   </div>

.vitepress/theme/components/landing/2. feature-section/FeatureSSRSupport.vue

@@ -417,10 +417,9 @@ const { isCardActive, startAnimation } = useCardAnimation(
       </svg>
     </div>
     <div class="feature__meta">
-      <div class="meta__title">First class SSR Support</div>
+      <div class="meta__title">一流的 SSR 支持</div>
       <div class="meta__description">
-        It's never been easier to setup custom SSR (Server-Side Rendering), or
-        build your own SSR framework.
+        设置自定义 SSR（服务端渲染）及构建自己的 SSR 框架从未如此简单
       </div>
     </div>
   </div>

.vitepress/theme/components/landing/2. feature-section/FeatureTypedAPI.vue

@@ -68,8 +68,8 @@ const { isCardActive, startAnimation } = useCardAnimation(
       </div>
     </div>
     <div class="feature__meta meta--center">
-      <div class="meta__title">Fully typed API</div>
-      <div class="meta__description">Designed to be built on top of.</div>
+      <div class="meta__title">完全类型化的 API</div>
+      <div class="meta__description">专为在上层构建而设计</div>
     </div>
   </div>
 </template>

.vitepress/theme/components/landing/3. frameworks-section/FrameworksSection.vue

@@ -276,7 +276,7 @@ const rowStyle: ComputedRef<{ transform: string }> = computed(() => {
 
 <template>
   <section class="frameworks-section" id="frameworks-section">
-    <h2>Powering your favorite frameworks and tools</h2>
+    <h2>支持你喜爱的框架和工具</h2>
     <div class="frameworks-container">
       <!-- Top Row -->
       <div class="framework-row" :style="rowStyle">

.vitepress/theme/components/landing/4. community-section/CommunitySection.vue

@@ -86,10 +86,9 @@ SolidJS in mind, they should scale from our simplest template to opinionated sta
 
 <template>
   <section class="community-section">
-    <h2>Loved by the community</h2>
+    <h2>深受社区喜爱</h2>
     <h3>
-      Don't take our word for it - listen to what Vite community members have to
-      say.
+      不要只听我们说 —— 来听听 Vite 社区成员的声音
     </h3>
     <div class="community-grid-container">
       <div class="community-grid">

.vitepress/theme/components/landing/5. sponsor-section/SponsorSection.vue

@@ -46,13 +46,12 @@ const { data } = useSponsor()
       width="58"
       height="55"
     />
-    <h2>Free &amp; open source</h2>
+    <h2>免费 &amp; 开源</h2>
     <h4>
-      Vite is MIT Licensed and will always be free and open source. This is made
-      possible by our contributors and these companies:
+      Vite 采用 MIT 许可证，并将始终保持免费和开源。这一切都要感谢我们的贡献者和以下公司：
     </h4>
 
-    <h4>Brought to you by</h4>
+    <h4>由以下团队呈现</h4>
     <div class="voidzero">
       <a href="https://voidzero.dev" target="_blank">
         <img src="./voidzero.svg" />

.vitepress/theme/components/landing/6. get-started-section/GetStartedSection.vue

@@ -109,12 +109,11 @@
       </svg>
       <img src="/logo.svg" alt="Vite Logo" class="vite-chip__logo" />
     </div>
-    <h2>Start building with Vite</h2>
+    <h2>使用 Vite 开始构建</h2>
     <h3>
-      Prepare for a development environment that can finally keep pace with the
-      speed of your mind.
+      准备好迎接一个能跟上您思维速度的开发环境
     </h3>
-    <a href="/guide/" class="btn btn--primary">Get started</a>
+    <a href="/guide/" class="btn btn--primary">开始</a>
     <div class="glow glow--purple" />
     <div class="glow glow--blue" />
   </div>

.vitepress/theme/index.ts

@@ -7,24 +7,14 @@ import './styles/vars.css'
 import './styles/landing.css'
 import AsideSponsors from './components/AsideSponsors.vue'
 import SvgImage from './components/SvgImage.vue'
-<<<<<<< HEAD
-import WwAds from './components/WwAds.vue'
 import './custom.css'
-=======
 import 'virtual:group-icons.css'
->>>>>>> 0fd7d2e8b36cf55fe5385ff2f957b92e9d44054b
 
 export default {
   extends: DefaultTheme,
   Layout() {
     return h(DefaultTheme.Layout, null, {
-<<<<<<< HEAD
-      'home-features-after': () => h(HomeSponsors),
-      'aside-outline-after': () => h(WwAds),
-      'aside-bottom': () => h(AsideSponsors)
-=======
       'aside-ads-before': () => h(AsideSponsors),
->>>>>>> 0fd7d2e8b36cf55fe5385ff2f957b92e9d44054b
     })
   },
   enhanceApp({ app }) {

.vscode/settings.json

@@ -3,5 +3,9 @@
   "editor.tabSize": 2,
   "prettier.singleQuote": true,
   "prettier.semi": false,
-  "prettier.trailingComma": "none"
+  "prettier.trailingComma": "none",
+  "cSpell.words": [
+    "Rollup",
+    "Vite"
+  ]
 }

README.md

@@ -1,11 +1,11 @@
 > ### 敬请所有读者注意
 >
 > - 原则上这里只进行英文版对应的翻译工作，如果觉得原文有改进之处，或任何不仅针对中文版，而受益所有语言版本的想法，建议直接在英文版仓库讨论。
-> - **原则上这里不适合讨论 Vite 的使用问题**，建议相关问题在 Vite 的 [issues 区](https://github.com/vitejs/vite/issues)、[Vite 官方讨论区](https://chat.vitejs.dev/) 或各大主流技术社区讨论，以便得到更多帮助和更充分的讨论。
+> - **原则上这里不适合讨论 Vite 的使用问题**，建议相关问题在 Vite 的 [issues 区](https://github.com/vitejs/vite/issues)、[Vite 官方讨论区](https://chat.vite.dev/) 或各大主流技术社区讨论，以便得到更多帮助和更充分的讨论。
 
 <p align="center">
-  <a href="https://vitejs.dev" target="_blank" rel="noopener noreferrer">
-    <img width="180" src="https://vitejs.dev/logo.svg" alt="Vite logo">
+  <a href="https://vite.dev" target="_blank" rel="noopener noreferrer">
+    <img width="180" src="https://vite.dev/logo.svg" alt="Vite logo">
   </a>
 </p>
 <br/>
@@ -14,7 +14,7 @@
   <a href="https://nodejs.org/en/about/releases/"><img src="https://img.shields.io/node/v/vite.svg" alt="node compatility"></a>
   <a href="https://app.circleci.com/pipelines/github/vitejs/vite?branch=main"><img src="https://circleci.com/gh/vitejs/vite/tree/main.svg?style=shield" alt="unix build status"></a>
   <a href="https://ci.appveyor.com/project/yyx990803/vite/branch/main"><img src="https://ci.appveyor.com/api/projects/status/0q4j8062olbcs71l/branch/main?svg=true" alt="windows build status"></a>
-  <a href="https://chat.vitejs.dev"><img src="https://img.shields.io/badge/chat-discord-blue?style=flat&logo=discord" alt="discord chat"></a>
+  <a href="https://chat.vite.dev"><img src="https://img.shields.io/badge/chat-discord-blue?style=flat&logo=discord" alt="discord chat"></a>
 </p>
 <br/>
 
@@ -23,7 +23,7 @@
 > Vite：下一代前端开发与构建工具
 
 - 💡 极速的开发服务器启动
-- ⚡️ 轻量快速的热模块重载（HMR）
+- ⚡️ 轻量快速的模块热替换（HMR）
 - 🛠️ 丰富的功能
 - 📦 自带优化的构建
 - 🔩 通用的插件接口