docs(en): merging all conflicts

Author: docschina-bot

.vitepress/theme/components/AsideSponsors.vue

@@ -21,14 +21,14 @@ const sponsors = computed(() => {
 <template>
   <a
     class="viteconf"
-    href="https://viteconf.org/24/replay?utm=vite-sidebar"
+    href="https://viteconf.org/?utm=vite-sidebar"
     target="_blank"
   >
     <img width="22" height="22" src="/viteconf.svg" alt="ViteConf Logo" />
     <span>
       <p class="extra-info">Building Together</p>
-      <p class="heading">ViteConf 2024</p>
-      <p class="extra-info">Watch the replay!</p>
+      <p class="heading">ViteConf 2025</p>
+      <p class="extra-info">First time in-person!</p>
     </span>
   </a>
   <VPDocAsideSponsors v-if="data" :data="sponsors" />

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

@@ -5,14 +5,14 @@ import HeroDiagram from './HeroDiagram.vue'
 <template>
   <div class="hero">
     <div class="container">
-      <!-- ViteConf Replay Button -->
+      <!-- ViteConf 2025 Button -->
       <a
-        href="https://viteconf.org/24/replay?utm=vite"
+        href="https://viteconf.org/?utm=vite"
         class="hero__pill"
         target="_blank"
       >
         <img src="/viteconf.svg" alt="Viteconf logo" width="20" height="20" />
-        <span>ViteConf 2024 Talks</span>
+        <span>ViteConf 2025</span>
       </a>
 
       <!-- Heading -->

config/index.md

@@ -121,3 +121,19 @@ export default defineConfig(({ mode }) => {
   }
 })
 ```
+
+## Debugging the Config File on VS Code
+
+With the default `--configLoader bundle` behavior, Vite writes the generated temporary configuration file to the `node_modules/.vite-temp` folder and a file not found error will occur when setting breakpoint debugging in the Vite config file. To fix the issue, add the following configuration to `.vscode/settings.json`:
+
+```json
+{
+  "debug.javascript.terminalOptions": {
+    "resolveSourceMapLocations": [
+      "${workspaceFolder}/**",
+      "!**/node_modules/**",
+      "**/node_modules/.vite-temp/**"
+    ]
+  }
+}
+```

package.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
 	"name": "vite-docs-cn",
 	"version": "1.0.0",
 	"description": "Vite.js documentation Chinese translation.",
@@ -32,4 +33,22 @@
 	"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": "^2.5.0",
+    "@types/express": "^4.17.21",
+    "feed": "^4.2.2",
+    "vitepress": "^1.6.3",
+    "vitepress-plugin-group-icons": "^1.3.7",
+    "vue": "^3.5.13"
+  }
+>>>>>>> 421e971fd16a72efed9acdfc584773c6f950d495
 }