Skip to content

Commit

Permalink
Merge branch 'main' into feat-concurrent-suite
Browse files Browse the repository at this point in the history
  • Loading branch information
hi-ogawa authored Apr 30, 2024
2 parents 9dee912 + becabb5 commit 6264d10
Show file tree
Hide file tree
Showing 582 changed files with 9,707 additions and 6,561 deletions.
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: VS Code Extension Issues
url: https://github.com/vitest-dev/vscode/issues/new/choose
about: VS Code extension related issues should be reported on the vitest-dev/vscode repository.
- name: Discord Chat
url: https://chat.vitest.dev
about: Ask questions and discuss with other Vitest users in real time.
Expand Down
33 changes: 7 additions & 26 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,6 @@ jobs:
- name: Lint
run: pnpm run lint

typecheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: ./.github/actions/setup-and-cache

- name: Install
run: pnpm i

- name: Build
run: pnpm run build

- name: Typecheck
run: pnpm run typecheck

test:
runs-on: ${{ matrix.os }}

Expand All @@ -56,7 +40,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node_version: [18, 20]
node_version: [18, 20, 22]
include:
- os: macos-14
node_version: 20
Expand Down Expand Up @@ -85,11 +69,8 @@ jobs:
- name: Test
run: pnpm run test:ci

- name: Test No Threads
run: pnpm run test:ci:no-threads

- name: Test Vm Threads
run: pnpm run test:ci:vm-threads
- name: Test Examples
run: pnpm run test:examples

test-ui:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -147,8 +128,6 @@ jobs:

timeout-minutes: 30

env:
BROWSER: ${{ matrix.browser[0] }}
steps:
- uses: actions/checkout@v4

Expand All @@ -170,6 +149,8 @@ jobs:

- name: Test Browser (webdriverio)
run: pnpm run test:browser:webdriverio
env:
BROWSER: ${{ matrix.browser[0] }}

- name: Test Browser (playwright)
run: pnpm run test:browser:playwright
Expand All @@ -185,8 +166,6 @@ jobs:

timeout-minutes: 30

env:
BROWSER: ${{ matrix.browser[0] }}
steps:
- uses: actions/checkout@v4

Expand All @@ -208,6 +187,8 @@ jobs:

- name: Test Browser (webdriverio)
run: pnpm run test:browser:webdriverio
env:
BROWSER: ${{ matrix.browser[0] }}

- name: Test Browser (playwright)
run: pnpm run test:browser:playwright
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:

- name: Build
run: pnpm build
env:
NO_VITE_TEST_WATCHER_DEBUG: '1'

- name: Publish to npm
run: pnpm run publish-ci ${{ github.ref_name }}
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ docs/public/user-avatars
docs/public/sponsors
.eslintcache
docs/.vitepress/cache/
!test/cwd/**/.cache
!test/cli/fixtures/dotted-files/**/.cache
1 change: 1 addition & 0 deletions docs/.vitepress/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ declare module 'vue' {
NonProjectOption: typeof import('./components/NonProjectOption.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
Version: typeof import('./components/Version.vue')['default']
}
}
7 changes: 7 additions & 0 deletions docs/.vitepress/components/Version.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<script setup lang="ts">
import { VPBadge } from 'vitepress/theme'
</script>

<template>
<VPBadge type="info"><slot/>+</VPBadge>
</template>
Loading

0 comments on commit 6264d10

Please sign in to comment.