Skip to content

docs(cn): dissolve the conflict #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoiseFan merged 8 commits into from
Dec 11, 2025
Merged

docs(cn): dissolve the conflict #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
982a71d
docs(cn): update package.json
NoiseFan Dec 10, 2025
69c5f00
docs(cn): dissolve the conflict
NoiseFan Dec 10, 2025
975fa7f
ci(lint): update eslint config
NoiseFan Dec 10, 2025
74e0ed6
fix: failed lint
NoiseFan Dec 10, 2025
aa8ce58
fix: failed lint
NoiseFan Dec 10, 2025
5f5662c
fix: failed lint
NoiseFan Dec 10, 2025
9c6d73b
[autofix.ci] apply automated fixes
autofix-ci[bot] Dec 10, 2025
ae06318
docs(cn): update cli-generated
NoiseFan Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions .vitepress/components/FeaturesList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,5 @@
<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>
Expand Down Expand Up @@ -50,7 +33,8 @@
</ListItem>
<ListItem>
内置
<a target="_blank" href="https://github.com/Aslemammad/tinyspy" rel="noopener noreferrer">Tinyspy</a> 用于对象 Mock
<a target="_blank" href="https://github.com/Aslemammad/tinyspy" rel="noopener noreferrer">Tinyspy</a> 用于对象
Mock
</ListItem>
<ListItem>
使用
Expand Down
Loading