CSF: Fix Canvas and userEvent types under Yarn PnP

code/core/src/csf/story.ts

@@ -1,3 +1,6 @@
+import type { BoundFunctions, queries } from '@testing-library/dom';
+import type { userEvent } from '@testing-library/user-event';
+
 import type { OmitIndexSignature, Simplify, UnionToIntersection } from 'type-fest';
 
 import type { ToolbarArgType } from '../toolbar/index.ts';
@@ -264,7 +267,7 @@ export type AfterEach<TRenderer extends Renderer = Renderer, TArgs = Args> = (
   context: StoryContext<TRenderer, TArgs>
 ) => Awaitable<void>;
 
-export interface Canvas {}
+export interface Canvas extends BoundFunctions<typeof queries> {}
 
 export interface StoryContext<TRenderer extends Renderer = Renderer, TArgs = Args>
   extends StoryContextForEnhancers<TRenderer, TArgs>, Required<StoryContextUpdate<TArgs>> {
@@ -277,6 +280,7 @@ export interface StoryContext<TRenderer extends Renderer = Renderer, TArgs = Arg
   step: StepFunction<TRenderer, TArgs>;
   context: this;
   canvas: Canvas;
+  userEvent: ReturnType<typeof userEvent.setup>;
   mount: TRenderer['mount'];
   reporting: ReportingAPI;
 }

code/core/src/test/index.ts

@@ -1,27 +1,16 @@
-import type { BoundFunctions } from '@testing-library/dom';
 import type { userEvent } from '@testing-library/user-event';
 
 import { instrument } from 'storybook/internal/instrumenter';
 
 import { Assertion } from 'chai';
 
 import { expect as rawExpect } from './expect.ts';
-import { type queries } from './testing-library.ts';
 
 export * from './spy.ts';
 export type { Assertion, Expect } from './expect.ts';
 
-type Queries = BoundFunctions<typeof queries>;
-
 export type UserEventObject = ReturnType<typeof userEvent.setup>;
 
-declare module 'storybook/internal/csf' {
-  interface Canvas extends Queries {}
-  interface StoryContext {
-    userEvent: UserEventObject;
-  }
-}
-
 export const { expect } = instrument(
   { expect: rawExpect },
   {