Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into userquin/feat-allow-run-individua…
Browse files Browse the repository at this point in the history
…l-tests-and-suites

# Conflicts:
#	packages/ui/client/components/explorer/ExplorerItem.vue
#	packages/ui/client/composables/client/index.ts
#	packages/vitest/src/node/core.ts
  • Loading branch information
userquin committed Nov 7, 2024
2 parents e1d7c3e + 3c56feb commit 11f3575
Show file tree
Hide file tree
Showing 572 changed files with 9,251 additions and 7,489 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@e9772d140489982e0e3704fea5ee93d536f1e275 # v45.0.1
uses: tj-actions/changed-files@c3a1bb2c992d77180ae65be6ae6c166cf40f857c # v45.0.3
with:
files: |
docs/**
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ docs/.vitepress/cache/
!test/cli/fixtures/dotted-files/**/.cache
test/**/__screenshots__/**/*
test/browser/fixtures/update-snapshot/basic.test.ts
test/cli/fixtures/browser-multiple/basic-*
.vitest-reports
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
// { "rule": "*semi", "severity": "off" }
// ],

"vitest.workspaceConfig": "./vitest.workspace.vscode.ts",
"testing.openTesting": "neverOpen",

// Enable eslint for all supported languages
"eslint.validate": [
"javascript",
Expand Down
6 changes: 4 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ To develop and test `vitest` package:

1. Run `pnpm install` in `vitest`'s root folder

2. Run `pnpm run dev` to build sources in watch mode
2. Run `pnpm run build` to build all monorepo packages
- after this, you can use `pnpm run dev` to rebuild packages as you modify code

3. Run
- `pnpm run test` to run core tests
- `pnpm run test:all` to run all the suite
- `pnpm run test:ci` to run all the suite
- `cd test/(dir) && pnpm run test` to run a specific test suite

> 💡 If you use VS Code, you can hit `⇧ ⌘ B` or `Ctrl + Shift + B` to launch all the necessary dev tasks.
Expand Down
1 change: 0 additions & 1 deletion docs/.vitepress/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export {}
/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
AsideViteConf: typeof import('./components/AsideViteConf.vue')['default']
Contributors: typeof import('./components/Contributors.vue')['default']
CourseLink: typeof import('./components/CourseLink.vue')['default']
FeaturesList: typeof import('./components/FeaturesList.vue')['default']
Expand Down
73 changes: 0 additions & 73 deletions docs/.vitepress/components/AsideViteConf.vue

This file was deleted.

2 changes: 1 addition & 1 deletion docs/.vitepress/components/FeaturesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
>
<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><a target="_blank" href="https://twitter.com/antfu7/status/1468233216939245579" rel="noopener noreferrer">Smart & instant watch mode, like HMR for tests!</a></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>
Expand Down
2 changes: 1 addition & 1 deletion docs/.vitepress/components/ListItem.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { computed, effectScope, onMounted, ref } from 'vue'
import { until, useElementVisibility } from '@vueuse/core'
import { computed, effectScope, onMounted, ref } from 'vue'
const el = ref<HTMLDivElement>()
const state = ref(0)
Expand Down
10 changes: 5 additions & 5 deletions docs/.vitepress/config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { defineConfig } from 'vitepress'
import { withPwa } from '@vite-pwa/vitepress'
import { transformerTwoslash } from '@shikijs/vitepress-twoslash'
import { withPwa } from '@vite-pwa/vitepress'
import { defineConfig } from 'vitepress'
import { tabsMarkdownPlugin } from 'vitepress-plugin-tabs'
import { version } from '../../package.json'
import { teamMembers } from './contributors'
import {
bluesky,
contributing,
discord,
font,
Expand All @@ -12,13 +14,11 @@ import {
ogImage,
ogUrl,
releases,
twitter,
vitestDescription,
vitestName,
} from './meta'
import { pwa } from './scripts/pwa'
import { transformHead } from './scripts/transformHead'
import { teamMembers } from './contributors'

export default ({ mode }: { mode: string }) => {
return withPwa(defineConfig({
Expand Down Expand Up @@ -104,8 +104,8 @@ export default ({ mode }: { mode: string }) => {
},

socialLinks: [
{ icon: 'bluesky', link: bluesky },
{ icon: 'mastodon', link: mastodon },
{ icon: 'x', link: twitter },
{ icon: 'discord', link: discord },
{ icon: 'github', link: github },
],
Expand Down
Loading

0 comments on commit 11f3575

Please sign in to comment.