Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"@storybook/addon-vitest": "^10.2.0",
"@storybook/react-vite": "^10.2.0",
"@storybook/test-runner": "^0.24.2",
"@testing-library/dom": "^10.4.1",
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was needed as yarn didn't seem to install peer deps automatically for some reason 🤔

https://npmx.dev/package-code/@testing-library/react/v/16.3.2/package.json#L65-L66

"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.2.0",
"@testing-library/user-event": "^14.6.1",
Expand All @@ -90,8 +91,8 @@
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-react": "^4.3.4",
"@vitest/browser": "^3.0.7",
"@vitest/coverage-v8": "^3.0.7",
"@vitest/browser-playwright": "^4.1.0",
"@vitest/coverage-v8": "^4.1.0",
"babel-loader": "8.4.1",
"babel-plugin-istanbul": "^6.1.1",
"babel-plugin-open-source": "^1.3.4",
Expand Down Expand Up @@ -121,7 +122,7 @@
"storybook-addon-test-codegen": "^3.0.1",
"typescript-eslint": "^8.25.0",
"vite": "^6.2.0",
"vitest": "^3.0.7",
"vitest": "^4.1.0",
"vitest-axe": "^0.1.0",
"vitest-canvas-mock": "^0.3.3",
"wait-on": "^8.0.2"
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"noEmit": true,
"jsx": "react-jsx"
},
"include": ["src", ".storybook/*", "functions"],
"include": ["src", ".storybook/*", "functions", "vite.config.ts", "vitest.config.ts"],
"exclude": ["public"]
}
73 changes: 48 additions & 25 deletions vitest.config.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,52 @@
import { mergeConfig, coverageConfigDefaults } from 'vitest/config'
import { mergeConfig, defineConfig } from 'vitest/config'
import { playwright } from '@vitest/browser-playwright'
import { storybookTest } from '@storybook/addon-vitest/vitest-plugin'
import viteConfig from './vite.config'

export default mergeConfig(viteConfig, {
test: {
name: 'node',
environment: 'happy-dom',
include: ['**/*.test.ts'],
coverage: {
exclude: [
...coverageConfigDefaults.exclude,
'storybook.setup.ts',
'**/*.stories.*',
'.storybook',
'src/docs',
'src/components/Button/utils.tsx',
'build',
'public',
'functions',
'**/conditional-logic.ts',
'**/RestaurantCard/progress',
'**/RestaurantsSection.container.tsx',
'src/stub',
'ps-setup.ts',
'**/serviceWorker.ts',
export default mergeConfig(
viteConfig,

defineConfig({
test: {
projects: [
{
test: {
name: 'node',
environment: 'happy-dom',
include: ['**/*.test.ts'],
},
},
{
extends: true,
plugins: [
// See options at: https://storybook.js.org/docs/writing-tests/vitest-plugin#storybooktest
storybookTest({ configDir: '.storybook', storybookScript: 'yarn storybook --ci' }),
],
publicDir: 'public',
test: {
name: 'storybook',
browser: {
enabled: true,
headless: true,
provider: playwright(),
instances: [{ browser: 'chromium' }],
},
setupFiles: ['.storybook/vitest.setup.ts'],
},
},
],
coverage: {
include: ['./src/**/*.{ts,tsx}'],
exclude: [
'**/*.stories.*',
'src/docs/**',
'src/components/Button/utils.tsx',
'**/conditional-logic.ts',
'**/RestaurantCard/progress',
'**/RestaurantsSection.container.tsx',
'src/stub',
],
},
},
},
})
})
)
29 changes: 0 additions & 29 deletions vitest.workspace.ts

This file was deleted.

Loading
Loading