docs(en): merging all conflicts

Author: docschina-bot

.vitepress/components.d.ts

@@ -8,15 +8,18 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
+    Advanced: typeof import('./components/Advanced.vue')['default']
     ArrowDown: typeof import('./components/ArrowDown.vue')['default']
     BlogIndex: typeof import('./components/BlogIndex.vue')['default']
     Box: typeof import('./components/Box.vue')['default']
     Contributors: typeof import('./components/Contributors.vue')['default']
     CourseLink: typeof import('./components/CourseLink.vue')['default']
+    CRoot: typeof import('./components/CRoot.vue')['default']
+    Deprecated: typeof import('./components/Deprecated.vue')['default']
+    Experimental: typeof import('./components/Experimental.vue')['default']
     FeaturesList: typeof import('./components/FeaturesList.vue')['default']
     HomePage: typeof import('./components/HomePage.vue')['default']
     ListItem: typeof import('./components/ListItem.vue')['default']
-    NonProjectOption: typeof import('./components/NonProjectOption.vue')['default']
     Version: typeof import('./components/Version.vue')['default']
   }
 }

.vitepress/components/Advanced.vue

@@ -0,0 +1,5 @@
+<template>
+  <Badge type="danger" title="This is an advanced API intended for library authors and framework integrations. Most users should not need this." class="cursor-help">
+    advanced
+  </Badge>
+</template>

.vitepress/components/CRoot.vue

@@ -0,0 +1,5 @@
+<template>
+  <Badge type="warning" title="This options is only available in the top level config. You cannot specify it as an option of a test project." class="underline decoration-dotted cursor-help">
+    <div i-carbon:document-configuration class="my-1 -mx-1" />
+  </Badge>
+</template>

.vitepress/components/Deprecated.vue

@@ -0,0 +1,5 @@
+<template>
+  <Badge type="danger">
+    deprecated
+  </Badge>
+</template>

.vitepress/components/Experimental.vue

@@ -0,0 +1,5 @@
+<template>
+  <Badge type="warning" title="This feature is experimental and does not follow SemVer." class="cursor-help">
+    experimental
+  </Badge>
+</template>

.vitepress/components/FeaturesList.vue

@@ -1,5 +1,22 @@
 <template>
+<<<<<<< HEAD
   <ul class="features-list" dir="auto" flex="~ col gap2 md:gap-3">
+=======
+  <ul
+    class="features-list"
+    dir="auto"
+    flex="~ col gap2 md:gap-3"
+  >
+    <ListItem><a target="_blank" href="https://vitejs.dev" rel="noopener noreferrer">Vite</a>'s config, transformers, resolvers, and plugins</ListItem>
+    <ListItem>Use the same setup from your app to run the tests!</ListItem>
+    <ListItem>Smart & instant watch mode, like HMR for tests!</ListItem>
+    <ListItem>Component testing for Vue, React, Svelte, Lit, Marko and more</ListItem>
+    <ListItem>Out-of-the-box TypeScript / JSX support</ListItem>
+    <ListItem>ESM first, top level await</ListItem>
+    <ListItem>Benchmarking support with <a target="_blank" href="https://github.com/tinylibs/tinybench" rel="noopener noreferrer">Tinybench</a></ListItem>
+    <ListItem>Filtering, timeouts, concurrent for suite and tests</ListItem>
+    <ListItem><a href="/guide/projects">Projects</a> support</ListItem>
+>>>>>>> 63c27c40d2833c42ec624f3076c90acd960fe8f9
     <ListItem>
       与
       <a target="_blank" href="https://vitejs.dev" rel="noopener noreferrer">Vite</a>

.vitepress/components/NonProjectOption.vue

@@ -1,9 +1,16 @@
 <script setup lang="ts">
 import { VPBadge } from 'vitepress/theme'
+
+const { type = 'stable' } = defineProps<{
+  type?: 'stable' | 'experimental'
+}>()
 </script>
 
 <template>
-  <VPBadge type="info">
+  <VPBadge
+    :type="type === 'experimental' ? 'warning' : 'info'"
+    :title="type === 'experimental' ? 'This feature is experimental and does not follow SemVer.' : undefined"
+  >
     <slot />+
   </VPBadge>
 </template>