Skip to content

Commit

Permalink
Merge branch 'main' into feat-browser-clipboard
Browse files Browse the repository at this point in the history
  • Loading branch information
hi-ogawa committed Dec 20, 2024
2 parents f6cfc27 + 78b62ff commit 1f12f7c
Show file tree
Hide file tree
Showing 757 changed files with 21,876 additions and 10,772 deletions.
7 changes: 7 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"labels": ["dependencies"],
"rangeStrategy": "bump",
"packageRules": [
{
"groupName": "Eslint packages",
"matchPackageNames": ["/eslint/"]
},
{
"depTypeList": ["peerDependencies"],
"enabled": false
Expand All @@ -24,6 +28,9 @@
// manually bumping
"node",
"vite",
// bumping breaks coverage
// https://github.com/vitest-dev/vitest/actions/runs/12121857184/job/33793728382?pr=6920
"vue",
// we patch these packages
"@types/chai",
"@sinonjs/fake-timers",
Expand Down
27 changes: 11 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ jobs:
- name: Typecheck
run: pnpm run typecheck

- name: Diff LICENSE.md
run: |
if ! git diff --exit-code packages/vitest/LICENSE.md; then
echo "::error::LICENSE.md has changed. Please commit the updated LICENSE.md file after the build."
exit 1
fi
# From https://github.com/rhysd/actionlint/blob/main/docs/usage.md#use-actionlint-on-github-actions
- name: Check workflow files
run: |
Expand All @@ -61,7 +68,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@c3a1bb2c992d77180ae65be6ae6c166cf40f857c # v45.0.3
uses: tj-actions/changed-files@bab30c2299617f6615ec02a68b9a40d10bd21366 # v45.0.5
with:
files: |
docs/**
Expand Down Expand Up @@ -101,7 +108,7 @@ jobs:
run: pnpm i

- name: Install Playwright Dependencies
run: pnpm exec playwright install chromium --with-deps
run: pnpm exec playwright install chromium --with-deps --only-shell

- name: Build
run: pnpm run build
Expand All @@ -117,7 +124,7 @@ jobs:

test-browser:
needs: changed
name: 'Browser: ${{ matrix.browser[0] }}, ${{ matrix.os }}'
name: 'Browsers: node-20, ${{ matrix.os }}'
if: needs.changed.outputs.should_skip != 'true'

runs-on: ${{ matrix.os }}
Expand All @@ -126,10 +133,6 @@ jobs:
os:
- macos-latest
- windows-latest
browser:
- [chromium, chrome]
- [firefox, firefox]
- [webkit]
fail-fast: false

timeout-minutes: 30
Expand All @@ -142,27 +145,19 @@ jobs:
node-version: 20

- uses: browser-actions/setup-chrome@v1
if: ${{ matrix.browser[0] == 'chromium' }}
- uses: browser-actions/setup-firefox@v1
if: ${{ matrix.browser[0] == 'firefox' }}

- name: Install
run: pnpm i

- name: Install Playwright Dependencies
if: needs.changed.outputs.should_skip != 'true'
run: pnpm exec playwright install ${{ matrix.browser[0] }} --with-deps
run: pnpm exec playwright install --with-deps --only-shell

- name: Build
run: pnpm run build

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

- name: Test Browser (webdriverio)
run: pnpm run test:browser:webdriverio
if: ${{ matrix.browser[1] }}
env:
BROWSER: ${{ matrix.browser[1] }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ test/**/__screenshots__/**/*
test/browser/fixtures/update-snapshot/basic.test.ts
test/cli/fixtures/browser-multiple/basic-*
.vitest-reports
*.tsbuildinfo
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<p align="center">
<a href="https://vitest.dev">
<img src="https://user-images.githubusercontent.com/11247099/145112184-a9ff6727-661c-439d-9ada-963124a281f7.png" height="150">
</a>
</p>

<h1 align="center">
Expand Down
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
Loading

0 comments on commit 1f12f7c

Please sign in to comment.