Skip to content

[pull] main from vitest-dev:main #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Mar 17, 2026
Merged

[pull] main from vitest-dev:main #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9092664
fix: type regression in vi.mocked() static class methods (#9857)
purepear Mar 17, 2026
d32bca5
test: test ecma decorator on Vite 8 with babel plugin (#9885)
hi-ogawa Mar 17, 2026
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"ui:build": "vite build packages/ui",
"ui:dev": "npm -C packages/ui run dev:client",
"ui:test": "npm -C packages/ui run test:run",
"override-rolldown": "yq -i '.overrides.vite = \"npm:vite@beta\"' pnpm-workspace.yaml",
"override-rolldown": "yq -i '.overrides.vite = \"npm:vite@8\"' pnpm-workspace.yaml",
"test:browser:webdriverio": "pnpm -C test/browser run test:webdriverio",
"test:browser:playwright": "pnpm -C test/browser run test:playwright"
},
Expand Down
10 changes: 4 additions & 6 deletions packages/spy/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,12 +462,10 @@ type DeepPartialMock<T extends Procedure | Constructable = Procedure> = Mock<
export type MaybeMockedConstructor<T> = T extends Constructable
? Mock<T>
: T
export type MockedFunction<T extends Procedure | Constructable> = Mock<T> & {
[K in keyof T]: T[K];
}
export type PartiallyMockedFunction<T extends Procedure | Constructable> = PartialMock<T> & {
[K in keyof T]: T[K];
}
export type MockedFunction<T extends Procedure | Constructable> = Mock<T>
& MockedObject<T>
export type PartiallyMockedFunction<T extends Procedure | Constructable> = PartialMock<T>
& MockedObject<T>
export type MockedFunctionDeep<T extends Procedure | Constructable> = Mock<T>
& MockedObjectDeep<T>
export type PartiallyMockedFunctionDeep<T extends Procedure | Constructable> = DeepPartialMock<T>
Expand Down
Loading
Loading