diff --git a/packages/storycap/decl/storybook.d.ts b/packages/storycap/decl/storybook.d.ts index 78ea71d1..5c79dd39 100644 --- a/packages/storycap/decl/storybook.d.ts +++ b/packages/storycap/decl/storybook.d.ts @@ -19,55 +19,16 @@ declare module '@storybook/manager-api' { export const addons: Addons; } + declare module '@storybook/preview-api' { interface MakeDecorator { (options: { name: string; parameterName: string; skipIfNoParametersOrOptions: boolean; - allowDeprecatedUsage: boolean; wrapper: (getStory: any, context: any, args: { parameters: any; options: any }) => any; }): Function; } export const makeDecorator: MakeDecorator; } -declare module '@storybook/addons' { - // eslint-disable-next-line no-duplicate-imports - import { EventEmitter } from 'events'; - export interface API { - raw?: () => { id: string; kind: string; name: string }[]; - getStorybook(): { kind: string; stories: { name: string }[] }[]; - } - - export interface StoryKind { - kind: string; - stories: string[]; - } - - export class Channel extends EventEmitter { - on(name: 'setStories', listener: (event: { stories: StoryKind[] }) => void): this; - once(name: 'setStories', listener: (event: { stories: StoryKind[] }) => void): this; - } - - export interface Addons { - register(name: string, callback: (api: API) => void): void; - getChannel(): Channel; - } - - interface MakeDecorator { - (options: { - name: string; - parameterName: string; - skipIfNoParametersOrOptions: boolean; - allowDeprecatedUsage: boolean; - wrapper: (getStory: any, context: any, args: { parameters: any; options: any }) => any; - }): Function; - } - - // Note: - // Storybook v4 does not export makeDecorator function. - export const makeDecorator: MakeDecorator | undefined; - - export const addons: Addons; -} diff --git a/packages/storycap/package.json b/packages/storycap/package.json index d0f92009..eb722d9f 100644 --- a/packages/storycap/package.json +++ b/packages/storycap/package.json @@ -93,6 +93,10 @@ "storycrawler": "^5.0.0-alpha.0", "yargs": "^16.0.0" }, + "peerDependencies": { + "@storybook/manager-api": "^7.0.0 || ^8.0.0", + "@storybook/preview-api": "^7.0.0 || ^8.0.0" + }, "jest": { "moduleFileExtensions": [ "ts", diff --git a/packages/storycap/src/client/with-screenshot.ts b/packages/storycap/src/client/with-screenshot.ts index f0410dec..e6c433a2 100644 --- a/packages/storycap/src/client/with-screenshot.ts +++ b/packages/storycap/src/client/with-screenshot.ts @@ -6,7 +6,6 @@ const withScreenshotDecorator = makeDecorator({ name: 'withScreenshot', parameterName: 'screenshot', skipIfNoParametersOrOptions: false, - allowDeprecatedUsage: true, wrapper: (getStory, context, { parameters, options }) => { if (typeof process !== 'undefined' && process?.env.JEST_WORKER_ID !== undefined) { return getStory(context);