Merge pull request #31271 from storybookjs/valentin/remove-vitest-2-workarounds

Test: Remove legacy code

Author: valentinpalkovic

code/core/src/test/spy.ts

@@ -1,4 +1,4 @@
-import type { MockInstance, Mock as MockV2 } from '@vitest/spy';
+import type { Mock, MockInstance } from '@vitest/spy';
 import {
   type MaybeMocked,
   type MaybeMockedDeep,
@@ -33,24 +33,7 @@ export const spyOn: typeof vitestSpyOn = (...args) => {
 
 type Procedure = (...args: any[]) => any;
 
-// TODO: Remove in 9.0
-export type Mock<T extends Procedure | any[] = any[], R = any> = T extends Procedure
-  ? MockV2<T>
-  : T extends any[]
-    ? MockV2<(...args: T) => R>
-    : never;
-
-// V2
 export function fn<T extends Procedure = Procedure>(implementation?: T): Mock<T>;
-// TODO: Remove in 9.0
-// V1
-export function fn<TArgs extends any[] = any, R = any>(): Mock<(...args: TArgs) => R>;
-export function fn<TArgs extends any[] = any[], R = any>(
-  implementation: (...args: TArgs) => R
-): Mock<(...args: TArgs) => R>;
-export function fn<TArgs extends any[] = any[], R = any>(
-  implementation?: (...args: TArgs) => R
-): Mock<(...args: TArgs) => R>;
 export function fn(implementation?: Procedure) {
   const mock = implementation ? vitestFn(implementation) : vitestFn();
   return reactiveMock(mock);

code/frameworks/nextjs-vite/src/export-mocks/navigation/index.ts

@@ -93,4 +93,4 @@ export const notFound = fn(actual.notFound).mockName('next/navigation::notFound'
 interface Params {
   [key: string]: string | string[];
 }
-export const useParams = fn<[], Params>(actual.useParams).mockName('next/navigation::useParams');
+export const useParams = fn<() => Params>(actual.useParams).mockName('next/navigation::useParams');

code/frameworks/nextjs/src/export-mocks/navigation/index.ts

@@ -93,4 +93,4 @@ export const notFound = fn(actual.notFound).mockName('next/navigation::notFound'
 interface Params {
   [key: string]: string | string[];
 }
-export const useParams = fn<[], Params>(actual.useParams).mockName('next/navigation::useParams');
+export const useParams = fn<() => Params>(actual.useParams).mockName('next/navigation::useParams');