Skip to content

Commit

Permalink
fix: the issue of the conflict between vite and vitest
Browse files Browse the repository at this point in the history
  • Loading branch information
HamzaAmar committed Nov 29, 2024
1 parent 60656e8 commit e3efc70
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 21 deletions.
Binary file modified .yarn/install-state.gz
Binary file not shown.
3 changes: 0 additions & 3 deletions apps/docs/src/utils/pillar.ts

This file was deleted.

2 changes: 1 addition & 1 deletion apps/docs/tsconfig.tsbuildinfo

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/stories/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@storybook/react": "^8.4.5",
"@storybook/test": "8.4.5",
"@storybook/test-runner": "^0.19.1",
"@vitejs/plugin-react": "^4.3.1",
"@vitejs/plugin-react": "^4.3.4",
"eslint-config-custom": "*",
"npm-run-all": "^4.1.5",
"rimraf": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/pillar-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@
"rollup-preserve-directives": "^1.1.2",
"sass": "^1.77.8",
"typescript": "^5.5.4",
"vite": "^5.4.10"
"vite": "^5.4.11"
}
}
6 changes: 3 additions & 3 deletions packages/pillar-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@
"@testing-library/react": "^16.0.0",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.0",
"jsdom": "^22.1.0",
"npm-run-all": "^4.1.5",
"react": "^18.3.1",
"rimraf": "^6.0.1",
"tsup": "^8.2.4",
"typescript": "^5.5.4",
"vite": "^5.4.2",
"vitest": "^2.0.5"
"@vitejs/plugin-react": "^4.3.4",
"vite": "^5.4.11",
"vitest": "^2.1.6"
}
}
5 changes: 3 additions & 2 deletions packages/pillar-hooks/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
/// <reference types="vitest" />
/// <reference types="vite/client" />

import { defineConfig } from 'vitest/config'
import { defineConfig, UserConfig } from 'vitest/config'
import react from '@vitejs/plugin-react'
import {} from 'vitest'

export default defineConfig({
plugins: [react()],
plugins: [react()] as UserConfig['plugins'],
test: {
globals: true,
environment: 'jsdom',
Expand Down
2 changes: 1 addition & 1 deletion packages/pillar-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@
"rimraf": "^6.0.1",
"tsup": "^8.2.4",
"typescript": "^5.5.4",
"vitest": "^2.0.5"
"vitest": "^2.1.6"
}
}
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3124,7 +3124,7 @@ __metadata:
rollup-preserve-directives: "npm:^1.1.2"
sass: "npm:^1.77.8"
typescript: "npm:^5.5.4"
vite: "npm:^5.4.10"
vite: "npm:^5.4.11"
peerDependencies:
"@pillar-ui/hooks": ">=0.7 <1"
react: ^18.0.0
Expand Down Expand Up @@ -3181,16 +3181,16 @@ __metadata:
"@testing-library/react": "npm:^16.0.0"
"@types/react": "npm:^18.3.3"
"@types/react-dom": "npm:^18.3.0"
"@vitejs/plugin-react": "npm:^4.3.1"
"@vitejs/plugin-react": "npm:^4.3.4"
eslint: "npm:^8.57.0"
jsdom: "npm:^22.1.0"
npm-run-all: "npm:^4.1.5"
react: "npm:^18.3.1"
rimraf: "npm:^6.0.1"
tsup: "npm:^8.2.4"
typescript: "npm:^5.5.4"
vite: "npm:^5.4.2"
vitest: "npm:^2.0.5"
vite: "npm:^5.4.11"
vitest: "npm:^2.1.6"
peerDependencies:
react: ^18.0.0
languageName: unknown
Expand Down Expand Up @@ -3235,7 +3235,7 @@ __metadata:
"@storybook/react": "npm:^8.4.5"
"@storybook/test": "npm:8.4.5"
"@storybook/test-runner": "npm:^0.19.1"
"@vitejs/plugin-react": "npm:^4.3.1"
"@vitejs/plugin-react": "npm:^4.3.4"
eslint-config-custom: "npm:*"
npm-run-all: "npm:^4.1.5"
react: "npm:^18.3.1"
Expand Down Expand Up @@ -3271,7 +3271,7 @@ __metadata:
rimraf: "npm:^6.0.1"
tsup: "npm:^8.2.4"
typescript: "npm:^5.5.4"
vitest: "npm:^2.0.5"
vitest: "npm:^2.1.6"
peerDependencies:
react: ^18.3.1
languageName: unknown
Expand Down Expand Up @@ -5004,7 +5004,7 @@ __metadata:
languageName: node
linkType: hard

"@vitejs/plugin-react@npm:^4.3.1":
"@vitejs/plugin-react@npm:^4.3.4":
version: 4.3.4
resolution: "@vitejs/plugin-react@npm:4.3.4"
dependencies:
Expand Down Expand Up @@ -21112,7 +21112,7 @@ __metadata:
languageName: node
linkType: hard

"vite@npm:^5.4.10, vite@npm:^5.4.2":
"vite@npm:^5.4.11":
version: 5.4.11
resolution: "vite@npm:5.4.11"
dependencies:
Expand Down Expand Up @@ -21155,7 +21155,7 @@ __metadata:
languageName: node
linkType: hard

"vitest@npm:^2.0.5":
"vitest@npm:^2.1.6":
version: 2.1.6
resolution: "vitest@npm:2.1.6"
dependencies:
Expand Down

0 comments on commit e3efc70

Please sign in to comment.