creevey 0.9.0-beta.12 → 0.9.0-beta.14

package/lib/esm/server/worker/worker.js

@@ -17,7 +17,6 @@ const readdirAsync = promisify(fs.readdir);
 const readFileAsync = promisify(fs.readFile);
 const writeFileAsync = promisify(fs.writeFile);
 const mkdirAsync = promisify(fs.mkdir);
-
 async function getStat(filePath) {
   try {
     return await statAsync(filePath);
@@ -25,31 +24,26 @@ async function getStat(filePath) {
     if (typeof error == 'object' && error && error.code === 'ENOENT') {
       return null;
     }
-
     throw error;
   }
 }
-
 async function getLastImageNumber(imageDir, imageName) {
   const actualImagesRegexp = new RegExp(`${imageName}-actual-(\\d+)\\.png`);
-
   try {
     return (await readdirAsync(imageDir)).map(filename => filename.replace(actualImagesRegexp, '$1')).map(Number).filter(x => !isNaN(x)).sort((a, b) => b - a)[0] ?? 0;
   } catch (_error) {
     return 0;
   }
-} // FIXME browser options hotfix
-
+}
 
+// FIXME browser options hotfix
 export default async function worker(config, options) {
   var _await$browser$getSes;
-
   let retries = 0;
   let images = {};
   let error = undefined;
   const screenshots = [];
   const testScope = [];
-
   function runHandler(failures) {
     if (failures > 0 && (error || Object.values(images).some(image => (image === null || image === void 0 ? void 0 : image.error) != null))) {
       const isTimeout = hasTimeout(error) || Object.values(images).some(image => hasTimeout(image === null || image === void 0 ? void 0 : image.error));
@@ -77,12 +71,10 @@ export default async function worker(config, options) {
       });
     }
   }
-
   async function saveImages(imageDir, images) {
     await mkdirAsync(imageDir, {
       recursive: true
     });
-
     for (const {
       name,
       data
@@ -90,7 +82,6 @@ export default async function worker(config, options) {
       await writeFileAsync(path.join(imageDir, name), data);
     }
   }
-
   async function getExpected(assertImageName) {
     // context => [kind, story, test, browser]
     // rootSuite -> kindSuite -> storyTest -> [browsers.png]
@@ -104,13 +95,11 @@ export default async function worker(config, options) {
     const image = images[imageName] = images[imageName] ?? {
       actual: actualImageName
     };
-
     const onCompare = async (actual, expect, diff) => {
       imagesMeta.push({
         name: image.actual,
         data: actual
       });
-
       if (diff && expect) {
         image.expect = `${imageName}-expect-${imageNumber}.png`;
         image.diff = `${imageName}-diff-${imageNumber}.png`;
@@ -123,12 +112,10 @@ export default async function worker(config, options) {
           data: diff
         });
       }
-
       if (options.saveReport) {
         await saveImages(reportImageDir, imagesMeta);
       }
     };
-
     const expectImageDir = path.join(config.screenDir, ...testPath);
     const expectImageStat = await getStat(path.join(expectImageDir, `${imageName}.png`));
     if (!expectImageStat) return {
@@ -141,26 +128,21 @@ export default async function worker(config, options) {
       onCompare
     };
   }
-
   const mochaOptions = {
     timeout: 30000,
     reporter: process.env.TEAMCITY_VERSION ? TeamcityReporter : options.reporter || CreeveyReporter,
     reporterOptions: {
       reportDir: config.reportDir,
       topLevelSuite: options.browser,
-
       get willRetry() {
         return retries < config.maxRetries;
       },
-
       get images() {
         return images;
       },
-
       get sessionId() {
         return sessionId;
       }
-
     }
   };
   const mocha = new Mocha(mochaOptions);
@@ -173,15 +155,12 @@ export default async function worker(config, options) {
     debug: options.debug,
     port: options.port
   });
-
   try {
     var _await$getBrowser;
-
     await ((_await$getBrowser = await getBrowser(config, options)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
   } catch (_) {
     await closeBrowser();
   }
-
   const browser = await getBrowser(config, options);
   const sessionId = (_await$browser$getSes = await (browser === null || browser === void 0 ? void 0 : browser.getSession())) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
   if (browser == null) return;
@@ -208,8 +187,9 @@ export default async function worker(config, options) {
     error = undefined;
     retries = test.retries;
     mocha.grep(new RegExp(`^${testPath}$`));
-    const runner = mocha.run(runHandler); // TODO How handle browser corruption?
+    const runner = mocha.run(runHandler);
 
+    // TODO How handle browser corruption?
     runner.on('fail', (_test, reason) => {
       if (!(reason instanceof Error)) {
         error = reason;
@@ -232,7 +212,6 @@ export default async function worker(config, options) {
     type: 'ready'
   });
 }
-
 function hasTimeout(str) {
   return str != null && str.toLowerCase().includes('timeout');
 }

package/lib/esm/shared/index.js

@@ -1,54 +1,53 @@
 import { mapValues, mergeWith, cloneDeepWith } from 'lodash';
-import { deserializeRegExp, isSerializedRegExp, isRegExp, serializeRegExp } from './serializeRegExp'; // NOTE: Copy-paste from storybook/api
+import { deserializeRegExp, isSerializedRegExp, isRegExp, serializeRegExp } from './serializeRegExp';
 
+// NOTE: Copy-paste from storybook/api
 export const combineParameters = function () {
   for (var _len = arguments.length, parameterSets = new Array(_len), _key = 0; _key < _len; _key++) {
     parameterSets[_key] = arguments[_key];
   }
-
-  return (// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  return (
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     mergeWith({}, ...parameterSets, (_, srcValue) => {
       // Treat arrays as scalars:
       if (Array.isArray(srcValue)) return srcValue;
       return undefined;
     })
   );
-}; // NOTE: Copy-paste from storybook/api
+};
 
+// NOTE: Copy-paste from storybook/api
 export const denormalizeStoryParameters = _ref => {
   let {
     globalParameters,
     kindParameters,
     stories
   } = _ref;
-  return mapValues(stories, storyData => {
-    var _kindParameters$story;
-
-    return { ...storyData,
-      parameters: combineParameters(globalParameters, (_kindParameters$story = kindParameters[storyData.kind]) !== null && _kindParameters$story !== void 0 ? _kindParameters$story : {}, storyData.parameters)
-    };
-  });
+  return mapValues(stories, storyData => ({
+    ...storyData,
+    parameters: combineParameters(globalParameters, kindParameters[storyData.kind] ?? {}, storyData.parameters)
+  }));
 };
 export const serializeRawStories = stories => {
   return mapValues(stories, storyData => {
     const creevey = storyData.parameters.creevey;
-
-    if (creevey !== null && creevey !== void 0 && creevey.skip) {
-      return { ...storyData,
-        parameters: { ...storyData.parameters,
-          creevey: { ...creevey,
+    if (creevey?.skip) {
+      return {
+        ...storyData,
+        parameters: {
+          ...storyData.parameters,
+          creevey: {
+            ...creevey,
             skip: cloneDeepWith(creevey.skip, value => {
               if (isRegExp(value)) {
                 return serializeRegExp(value);
               }
-
               return undefined;
             })
           }
         }
       };
     }
-
     return storyData;
   });
 };
@@ -57,22 +56,22 @@ export const deserializeRawStories = stories => {
 };
 export const deserializeStory = story => {
   const creevey = story.parameters.creevey;
-
-  if (creevey !== null && creevey !== void 0 && creevey.skip) {
-    return { ...story,
-      parameters: { ...story.parameters,
-        creevey: { ...creevey,
+  if (creevey?.skip) {
+    return {
+      ...story,
+      parameters: {
+        ...story.parameters,
+        creevey: {
+          ...creevey,
           skip: cloneDeepWith(creevey.skip, value => {
             if (isSerializedRegExp(value)) {
               return deserializeRegExp(value);
             }
-
             return undefined;
           })
         }
       }
     };
   }
-
   return story;
 };

package/lib/esm/types.js

@@ -1,7 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 /* eslint-enable @typescript-eslint/no-explicit-any */
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
 export function noop() {
   /* noop */
 }
@@ -16,8 +18,9 @@ export function isObject(x) {
 }
 export function isString(x) {
   return typeof x == 'string';
-} // eslint-disable-next-line @typescript-eslint/no-explicit-any
+}
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function isFunction(x) {
   return typeof x == 'function';
 }

package/lib/types/client/addon/Manager.d.ts

@@ -32,6 +32,6 @@ export declare class CreeveyManager {
     getTestsByStoryIdAndBrowser: (browser: string) => TestData[];
     getTabTitle: (browser: string) => string;
     setPanelsTitle: () => void;
-    addStatusesToSideBar(): Promise<void>;
+    addStatusesToSideBar(): void;
     addStatusToStoryName(name: string, status: TestStatus | undefined, skip: string | boolean): string;
 }

package/lib/types/client/addon/components/Addon.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CreeveyManager } from '../Manager';
 interface AddonProps {
     active?: boolean;

package/lib/types/client/addon/components/Icons.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface IconProps {
     width?: number;
     height?: number;

package/lib/types/client/addon/components/Panel.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { TestData } from '../../../types';
 interface PanelProps {
     tests: TestData[];

package/lib/types/client/addon/components/TestSelect.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { TestData } from '../../../types';
 interface TestSelectProps {
     tests: TestData[];

package/lib/types/client/addon/components/Tools.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CreeveyManager } from '../Manager';
 interface ToolsProps {
     manager: CreeveyManager;

package/lib/types/client/addon/decorator.d.ts

@@ -1 +1 @@
-export declare const decorators: import("@storybook/addons").MakeDecoratorResult[];
+export declare const decorators: import("@storybook/preview-api/dist/addons").MakeDecoratorResult[];

package/lib/types/client/addon/preset.d.ts

@@ -1,2 +1,2 @@
-export declare function config(entry?: string[]): string[];
-export declare function managerEntries(entry?: string[]): string[];
+export declare const previewAnnotations: string[];
+export declare const managerEntries: string[];

package/lib/types/client/addon/preview.d.ts

@@ -1,4 +1,4 @@
 declare const preview: {
-    decorators: import("@storybook/addons").MakeDecoratorResult[];
+    decorators: import("@storybook/preview-api/dist/addons").MakeDecoratorResult[];
 };
 export default preview;

package/lib/types/client/addon/withCreevey.d.ts

@@ -1,7 +1,8 @@
 import type { PreviewWeb } from '@storybook/preview-web';
 import type { AnyFramework } from '@storybook/csf';
 import type { StoryStore } from '@storybook/client-api';
-import { MakeDecoratorResult, Channel } from '@storybook/addons';
+import { makeDecorator } from '@storybook/preview-api';
+import { Channel } from '@storybook/channels';
 import { CaptureOptions, StoriesRaw, StorybookGlobals } from '../../types';
 declare global {
     interface Window {
@@ -20,5 +21,5 @@ declare global {
         __STORYBOOK_PREVIEW__: PreviewWeb<AnyFramework>;
     }
 }
-export declare function withCreevey(): MakeDecoratorResult;
+export declare function withCreevey(): ReturnType<typeof makeDecorator>;
 export declare function capture(options?: CaptureOptions): Promise<void>;

package/lib/types/client/shared/components/ImagesView/BlendView.d.ts

@@ -1,3 +1,5 @@
 import React from 'react';
 import { ViewPropsWithTheme } from './ImagesView';
-export declare const BlendView: React.FC<import("@storybook/theming").AddOptionalTo<ViewPropsWithTheme, "theme">>;
+export declare const BlendView: React.FC<Pick<ViewPropsWithTheme, "diff" | "actual" | "expect"> & {
+    theme?: import("@storybook/theming").Theme | undefined;
+}>;

package/lib/types/client/shared/components/ImagesView/ImagesView.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Images, ImagesViewMode } from '../../../../types';
 import { Theme } from '@storybook/theming';
 export declare const themeBorderColors: {

package/lib/types/client/shared/components/ImagesView/SideBySideView.d.ts

@@ -1,3 +1,5 @@
 import React from 'react';
 import { ViewPropsWithTheme } from './ImagesView';
-export declare const SideBySideView: React.FC<import("@storybook/theming").AddOptionalTo<ViewPropsWithTheme, "theme">>;
+export declare const SideBySideView: React.FC<Pick<ViewPropsWithTheme, "diff" | "actual" | "expect"> & {
+    theme?: import("@storybook/theming").Theme | undefined;
+}>;

package/lib/types/client/shared/components/ImagesView/SlideView.d.ts

@@ -1,3 +1,5 @@
 import React from 'react';
 import { ViewPropsWithTheme } from './ImagesView';
-export declare const SlideView: React.FC<import("@storybook/theming").AddOptionalTo<ViewPropsWithTheme, "theme">>;
+export declare const SlideView: React.FC<Pick<ViewPropsWithTheme, "diff" | "actual" | "expect"> & {
+    theme?: import("@storybook/theming").Theme | undefined;
+}>;

package/lib/types/client/shared/components/ImagesView/SwapView.d.ts

@@ -1,3 +1,5 @@
 import React from 'react';
 import { ViewPropsWithTheme } from './ImagesView';
-export declare const SwapView: React.FC<import("@storybook/theming").AddOptionalTo<ViewPropsWithTheme, "theme">>;
+export declare const SwapView: React.FC<Pick<ViewPropsWithTheme, "diff" | "actual" | "expect"> & {
+    theme?: import("@storybook/theming").Theme | undefined;
+}>;

package/lib/types/client/shared/components/PageFooter/PageFooter.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface PageFooterProps {
     canApprove: boolean;
     retriesCount: number;

package/lib/types/client/shared/components/PageFooter/Paging.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface PagingProps {
     activePage: number;
     onPageChange: (pageNumber: number) => void;

package/lib/types/client/shared/components/PageHeader/ImagePreview.d.ts

@@ -8,5 +8,7 @@ interface ImageSwapProps {
     theme: Theme;
     error?: boolean;
 }
-export declare const ImagePreview: React.FC<import("@storybook/theming").AddOptionalTo<ImageSwapProps, "theme">>;
+export declare const ImagePreview: React.FC<Pick<ImageSwapProps, "error" | "imageName" | "url" | "onClick" | "isActive"> & {
+    theme?: Theme | undefined;
+}>;
 export {};

package/lib/types/client/shared/components/PageHeader/PageHeader.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ImagesViewMode, Images } from '../../../../types';
 interface PageHeaderProps {
     title: string[];

package/lib/types/client/shared/components/ResultsPage.d.ts

@@ -14,5 +14,7 @@ interface TestResultsProps {
     height?: string;
 }
 export declare function ResultsPageInternal({ id, path, results, approved, theme, onImageApprove, showTitle, height, }: TestResultsProps): JSX.Element;
-export declare const ResultsPage: React.FC<import("@storybook/theming").AddOptionalTo<TestResultsProps, "theme">>;
+export declare const ResultsPage: React.FC<Pick<TestResultsProps, "id" | "results" | "path" | "height" | "approved" | "showTitle" | "onImageApprove"> & {
+    theme?: Theme | undefined;
+}>;
 export {};

package/lib/types/client/web/CreeveyApp.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CreeveySuite } from '../../types';
 import { CreeveyClientApi } from '../shared/creeveyClientApi';
 export interface CreeveyAppProps {

package/lib/types/client/web/CreeveyLoader.d.ts

@@ -1,2 +1,3 @@
-export declare const rotate360: import("@storybook/theming").Keyframes;
+/// <reference types="react" />
+export declare const rotate360: import("@storybook/theming/dist/create-77ee2cf0").K;
 export declare function CreeveyLoader(): JSX.Element;

package/lib/types/client/web/CreeveyView/SideBar/Checkbox.d.ts

@@ -8,7 +8,10 @@ interface BooleanProps {
 interface CheckboxState {
     indeterminate: boolean;
 }
-export declare const CheckboxContainer: import("@storybook/theming").StyledComponent<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, Pick<React.ClassAttributes<HTMLDivElement> & React.HTMLAttributes<HTMLDivElement>, keyof React.HTMLAttributes<HTMLDivElement>>, Theme>;
+export declare const CheckboxContainer: import("@storybook/theming").StyledComponent<{
+    theme?: Theme | undefined;
+    as?: React.ElementType<any> | undefined;
+}, React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
 export declare class Checkbox extends React.Component<BooleanProps, CheckboxState> {
     state: CheckboxState;
     handleIndeterminateChange: (value: boolean) => void;

package/lib/types/client/web/CreeveyView/SideBar/Search.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface SearchProps {
     onChange: (arg: string) => void;
     value: string;

package/lib/types/client/web/CreeveyView/SideBar/SideBarHeader.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { TestsStatusProps } from './TestsStatus';
 import { CreeveyViewFilter } from '../../../shared/helpers';
 interface SideBarHeaderProps {

package/lib/types/client/web/CreeveyView/SideBar/SuiteLink.d.ts

@@ -6,28 +6,33 @@ export interface SuiteLinkProps {
     suite: CreeveySuite;
     'data-testid'?: string;
 }
-export declare const Container: React.FC<import("@storybook/theming").AddOptionalTo<Pick<React.ClassAttributes<HTMLDivElement> & React.HTMLAttributes<HTMLDivElement> & Pick<{
+export declare const Container: React.FC<Pick<{
+    theme?: Theme | undefined;
+    as?: React.ElementType<any> | undefined;
+} & {
     theme: Theme;
     disabled?: boolean | undefined;
-}, "disabled"> & {
+} & React.ClassAttributes<HTMLDivElement> & React.HTMLAttributes<HTMLDivElement> & {
+    children?: React.ReactNode;
+}, "as" | keyof React.ClassAttributes<HTMLDivElement> | keyof React.HTMLAttributes<HTMLDivElement> | "disabled"> & {
+    theme?: Theme | undefined;
+}>;
+export declare const Button: React.FC<Pick<{
     theme?: Theme | undefined;
+    as?: React.ElementType<any> | undefined;
 } & {
-    children?: React.ReactNode;
-}, "key" | "theme" | keyof React.HTMLAttributes<HTMLDivElement> | "disabled"> & {
-    ref?: React.RefObject<HTMLDivElement> | ((instance: HTMLDivElement | null) => void) | null | undefined;
-}, "theme">>;
-export declare const Button: React.FC<import("@storybook/theming").AddOptionalTo<Pick<React.ClassAttributes<HTMLButtonElement> & React.ButtonHTMLAttributes<HTMLButtonElement> & Pick<{
     theme: Theme;
     active?: boolean | undefined;
     focused?: boolean | undefined;
-}, "active" | "focused"> & {
+} & React.ClassAttributes<HTMLButtonElement> & React.ButtonHTMLAttributes<HTMLButtonElement> & {
+    children?: React.ReactNode;
+}, "as" | "active" | keyof React.ClassAttributes<HTMLButtonElement> | keyof React.ButtonHTMLAttributes<HTMLButtonElement> | "focused"> & {
     theme?: Theme | undefined;
+}>;
+export declare const SuiteContainer: import("@storybook/theming").StyledComponent<{
+    theme?: Theme | undefined;
+    as?: React.ElementType<any> | undefined;
 } & {
-    children?: React.ReactNode;
-}, "key" | "theme" | keyof React.ButtonHTMLAttributes<HTMLButtonElement> | "active" | "focused"> & {
-    ref?: ((instance: HTMLButtonElement | null) => void) | React.RefObject<HTMLButtonElement> | null | undefined;
-}, "theme">>;
-export declare const SuiteContainer: import("@storybook/theming").StyledComponent<React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {
     padding: number;
-}, Theme>;
+}, React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
 export declare function SuiteLink({ title, suite, 'data-testid': dataTid }: SuiteLinkProps): JSX.Element;

package/lib/types/client/web/CreeveyView/SideBar/TestLink.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CreeveyTest } from '../../../../types';
 export interface TestLinkProps {
     title: string;

package/lib/types/client/web/CreeveyView/SideBar/TestStatusIcon.d.ts

@@ -7,4 +7,6 @@ export interface TestStatusIconProps {
     skip?: string | boolean;
     theme: Theme;
 }
-export declare const TestStatusIcon: React.FC<import("@storybook/theming").AddOptionalTo<TestStatusIconProps, "theme">>;
+export declare const TestStatusIcon: React.FC<Pick<TestStatusIconProps, "skip" | "status" | "inverted"> & {
+    theme?: Theme | undefined;
+}>;

package/lib/types/client/web/CreeveyView/SideBar/TestsStatus.d.ts

@@ -6,4 +6,6 @@ export interface TestsStatusProps extends CreeveyTestsStatus {
     onClickByStatus: (value: TestStatus) => void;
     theme?: Theme;
 }
-export declare const TestsStatus: React.FC<import("@storybook/theming").AddOptionalTo<TestsStatusProps, "theme">>;
+export declare const TestsStatus: React.FC<Pick<TestsStatusProps, "successCount" | "failedCount" | "pendingCount" | "skippedCount" | "onClickByStatus"> & {
+    theme?: Theme | undefined;
+}>;

package/lib/types/client/web/CreeveyView/SideBar/Toggle.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface ToggleProps {
     value?: boolean;
     onChange: (val: boolean) => void;

package/lib/types/shared/index.d.ts

@@ -1,4 +1,4 @@
-import { Parameters } from '@storybook/api';
+import { Parameters } from '@storybook/csf';
 import { SetStoriesData, StoriesRaw, StoryInput } from '../types';
 export declare const combineParameters: (...parameterSets: Parameters[]) => Parameters;
 export declare const denormalizeStoryParameters: ({ globalParameters, kindParameters, stories, }: SetStoriesData) => StoriesRaw;

package/lib/types/types.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
 /// <reference types="chai" />
-import type { API as StorybookAPI } from '@storybook/api';
-import type { DecoratorFunction } from '@storybook/addons';
+import type { DecoratorFunction } from '@storybook/csf';
 import type { IKey } from 'selenium-webdriver/lib/input';
 import type { Worker as ClusterWorker } from 'cluster';
 import type { until, WebDriver, WebElementPromise } from 'selenium-webdriver';
 import type Pixelmatch from 'pixelmatch';
 import type { Context } from 'mocha';
+import { StoryContextForEnhancers } from '@storybook/csf';
 export declare type DiffOptions = typeof Pixelmatch extends (x1: any, x2: any, x3: any, x4: any, x5: any, options?: infer T) => void ? T : never;
 export declare type SetStoriesData = {
     v?: number;
@@ -21,16 +21,14 @@ export declare type SetStoriesData = {
     }>;
     stories: StoriesRaw;
 };
-export declare type StoriesRaw = StorybookAPI extends {
-    setStories: (stories: infer SS) => void;
-} ? SS : never;
+export declare type StoriesRaw = Record<string, StoryContextForEnhancers>;
 export declare type StoryInput = StoriesRaw extends {
     [id: string]: infer S;
 } ? S : never;
-export interface StoryMeta<StoryFnReturnType = unknown> {
+export interface StoryMeta {
     title: string;
     component?: unknown;
-    decorators?: DecoratorFunction<StoryFnReturnType>[];
+    decorators?: DecoratorFunction[];
     parameters?: {
         creevey?: CreeveyStoryParams;
         [name: string]: unknown;
@@ -53,14 +51,14 @@ export interface CSFStory<StoryFnReturnType = unknown> {
      */
     story?: {
         name?: string;
-        decorators?: DecoratorFunction<StoryFnReturnType>[];
+        decorators?: DecoratorFunction[];
         parameters?: {
             creevey?: CreeveyStoryParams;
             [name: string]: unknown;
         };
     };
     storyName?: string;
-    decorators?: DecoratorFunction<StoryFnReturnType>[];
+    decorators?: DecoratorFunction[];
     parameters?: {
         creevey?: CreeveyStoryParams;
         [name: string]: unknown;
@@ -142,11 +140,6 @@ export interface Config {
      * @default path.join(process.cwd(), './report')
      */
     reportDir: string;
-    /**
-     * Absolute path to storybook config directory
-     * @default path.join(process.cwd(), './.storybook')
-     */
-    storybookDir: string;
     /**
      * How much test would be retried
      * @default 0
@@ -173,18 +166,6 @@ export interface Config {
      * Works only with `useDocker == false`
      */
     selenoidPath?: string;
-    /**
-     * Creevey extract tests by using babel transformations
-     * and load stories to nodejs directly.
-     * In some edge cases it may fail to load tests.
-     * In that case you can enable this option.
-     * Creevey uses Storybook webpack config to build nodejs bundle with tests.
-     * But it slightly slower and doesn't work if you use custom bundler for Storybook
-     *
-     * Affects only for Storybook 6.2+
-     * @default false
-     */
-    useWebpackToExtractTests: boolean;
     /**
      * Creevey has two built-in stories providers.
      *
@@ -254,9 +235,7 @@ export interface Options {
     port: number;
     ui: boolean;
     update: boolean | string;
-    webpack: boolean;
     debug: boolean;
-    extract: boolean | string;
     tests: boolean;
     browser?: string;
     reporter?: string;