creevey 0.9.0-beta.1 → 0.9.0-beta.10.timeouts.0

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

@@ -0,0 +1,86 @@
+import chalk from 'chalk';
+import { reporters } from 'mocha';
+import prefix from 'loglevel-plugin-prefix';
+import { isDefined, isImageError } from '../../types';
+import { getLogger } from '../logger';
+const testLevels = {
+  INFO: chalk.green('PASS'),
+  WARN: chalk.yellow('START'),
+  ERROR: chalk.red('FAIL')
+};
+export class CreeveyReporter extends reporters.Base {
+  constructor(runner, options) {
+    super(runner);
+    const {
+      sessionId,
+      topLevelSuite
+    } = options.reporterOptions;
+    const testLogger = getLogger(topLevelSuite);
+    prefix.apply(testLogger, {
+      format(level) {
+        return `${testLevels[level]} => (${topLevelSuite}:${chalk.gray(sessionId)})`;
+      }
+
+    });
+    runner.on('test', test => testLogger.warn(chalk.cyan(test.titlePath().join('/'))));
+    runner.on('pass', test => testLogger.info(chalk.cyan(test.titlePath().join('/'))));
+    runner.on('fail', (test, error) => testLogger.error(chalk.cyan(test.titlePath().join('/')), '\n  ', getErrors(error, (error, imageName) => `${chalk.bold(imageName ?? topLevelSuite)}:${error}`, error => `${error.stack ?? error.message}`).join('\n  ')));
+  }
+
+}
+export class TeamcityReporter extends reporters.Base {
+  constructor(runner, options) {
+    super(runner);
+    const topLevelSuite = this.escape(options.reporterOptions.topLevelSuite);
+    const reporterOptions = options.reporterOptions;
+    runner.on('suite', suite => suite.root ? console.log(`##teamcity[testSuiteStarted name='${topLevelSuite}' flowId='${process.pid}']`) : console.log(`##teamcity[testSuiteStarted name='${this.escape(suite.title)}' flowId='${process.pid}']`));
+    runner.on('test', test => console.log(`##teamcity[testStarted name='${this.escape(test.title)}' flowId='${process.pid}']`));
+    runner.on('fail', (test, error) => {
+      Object.entries(reporterOptions.images).forEach(([name, image]) => {
+        if (!image) return;
+        const filePath = test.titlePath().concat(name == topLevelSuite ? [] : [topLevelSuite]).map(this.escape).join('/'); // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
+        const {
+          error,
+          ...rest
+        } = image;
+        Object.values(rest).filter(isDefined).forEach(fileName => {
+          console.log(`##teamcity[publishArtifacts '${reporterOptions.reportDir}/${filePath}/${fileName} => report/${filePath}']`);
+          console.log(`##teamcity[testMetadata testName='${this.escape(test.title)}' type='image' value='report/${filePath}/${fileName}' flowId='${process.pid}']`);
+        });
+      }); // Output failed test as passed due TC don't support retry mechanic
+      // https://teamcity-support.jetbrains.com/hc/en-us/community/posts/207216829-Count-test-as-successful-if-at-least-one-try-is-successful?page=1#community_comment_207394125
+
+      reporterOptions.willRetry ? console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`) : console.log(`##teamcity[testFailed name='${this.escape(test.title)}' message='${this.escape(error.message)}' details='${this.escape(error.stack ?? '')}' flowId='${process.pid}']`);
+    });
+    runner.on('pending', test => console.log(`##teamcity[testIgnored name='${this.escape(test.title)}' message='${this.escape(typeof test.skipReason == 'boolean' ? test.title : test.skipReason)}' flowId='${process.pid}']`));
+    runner.on('test end', test => console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`));
+    runner.on('suite end', suite => suite.root || console.log(`##teamcity[testSuiteFinished name='${this.escape(suite.title)}' flowId='${process.pid}']`));
+    runner.on('end', () => console.log(`##teamcity[testSuiteFinished name='${topLevelSuite}' flowId='${process.pid}']`));
+  }
+
+  escape = str => {
+    if (!str) return '';
+    return str.toString() // eslint-disable-next-line no-control-regex
+    .replace(/\x1B.*?m/g, '').replace(/\|/g, '||').replace(/\n/g, '|n').replace(/\r/g, '|r').replace(/\[/g, '|[').replace(/\]/g, '|]').replace(/\u0085/g, '|x').replace(/\u2028/g, '|l').replace(/\u2029/g, '|p').replace(/'/g, "|'");
+  };
+}
+
+function getErrors(error, imageErrorToString, errorToString) {
+  const errors = [];
+
+  if (!(error instanceof Error)) {
+    errors.push(error);
+  } else if (!isImageError(error)) {
+    errors.push(errorToString(error));
+  } else if (typeof error.images == 'string') {
+    errors.push(imageErrorToString(error.images));
+  } else {
+    const imageErrors = error.images;
+    Object.keys(imageErrors).forEach(imageName => {
+      errors.push(imageErrorToString(imageErrors[imageName] ?? '', imageName));
+    });
+  }
+
+  return errors;
+}

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

@@ -0,0 +1,238 @@
+import { promisify } from 'util';
+import fs from 'fs';
+import path from 'path';
+import chai from 'chai';
+import chalk from 'chalk';
+import Mocha from 'mocha';
+import { Key, until } from 'selenium-webdriver';
+import { isImageError } from '../../types';
+import { subscribeOn, emitTestMessage, emitWorkerMessage } from '../messages';
+import chaiImage from './chai-image';
+import { closeBrowser, getBrowser, switchStory } from '../selenium';
+import { CreeveyReporter, TeamcityReporter } from './reporter';
+import { addTestsFromStories } from './helpers';
+import { logger } from '../logger';
+const statAsync = promisify(fs.stat);
+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);
+  } catch (error) {
+    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
+
+
+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));
+      const payload = {
+        status: 'failed',
+        images,
+        error
+      };
+      isTimeout ? emitWorkerMessage({
+        type: 'error',
+        payload: {
+          error: error ?? 'Unknown error'
+        }
+      }) : emitTestMessage({
+        type: 'end',
+        payload
+      });
+    } else {
+      emitTestMessage({
+        type: 'end',
+        payload: {
+          status: 'success',
+          images
+        }
+      });
+    }
+  }
+
+  async function saveImages(imageDir, images) {
+    await mkdirAsync(imageDir, {
+      recursive: true
+    });
+
+    for (const {
+      name,
+      data
+    } of images) {
+      await writeFileAsync(path.join(imageDir, name), data);
+    }
+  }
+
+  async function getExpected(assertImageName) {
+    // context => [kind, story, test, browser]
+    // rootSuite -> kindSuite -> storyTest -> [browsers.png]
+    // rootSuite -> kindSuite -> storySuite -> test -> [browsers.png]
+    const testPath = [...testScope];
+    const imageName = assertImageName ?? testPath.pop();
+    const imagesMeta = [];
+    const reportImageDir = path.join(config.reportDir, ...testPath);
+    const imageNumber = (await getLastImageNumber(reportImageDir, imageName)) + 1;
+    const actualImageName = `${imageName}-actual-${imageNumber}.png`;
+    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`;
+        imagesMeta.push({
+          name: image.expect,
+          data: expect
+        });
+        imagesMeta.push({
+          name: image.diff,
+          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 {
+      expected: null,
+      onCompare
+    };
+    const expected = await readFileAsync(path.join(expectImageDir, `${imageName}.png`));
+    return {
+      expected,
+      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);
+  mocha.cleanReferencesAfterRun(false);
+  chai.use(chaiImage(getExpected, config.diffOptions));
+  if ((await getBrowser(config, options)) == null) return;
+  await addTestsFromStories(mocha.suite, config, {
+    browser: options.browser,
+    watch: options.ui,
+    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;
+  const interval = setInterval(() => void browser.getCurrentUrl().then(url => {
+    if (options.debug) logger.debug(`${options.browser}:${chalk.gray(sessionId)}`, 'current url', chalk.magenta(url));
+  }), 10 * 1000);
+  subscribeOn('shutdown', () => clearInterval(interval));
+  mocha.suite.beforeAll(function () {
+    this.config = config;
+    this.browser = browser;
+    this.until = until;
+    this.keys = Key;
+    this.expect = chai.expect;
+    this.browserName = options.browser;
+    this.testScope = testScope;
+    this.screenshots = screenshots;
+  });
+  mocha.suite.beforeEach(switchStory);
+  subscribeOn('test', message => {
+    if (message.type != 'start') return;
+    const test = message.payload;
+    const testPath = test.path.join(' ').replace(/[|\\{}()[\]^$+*?.-]/g, '\\$&');
+    images = {};
+    error = undefined;
+    retries = test.retries;
+    mocha.grep(new RegExp(`^${testPath}$`));
+    const runner = mocha.run(runHandler); // TODO How handle browser corruption?
+
+    runner.on('fail', (_test, reason) => {
+      if (!(reason instanceof Error)) {
+        error = reason;
+      } else if (!isImageError(reason)) {
+        error = reason.stack ?? reason.message;
+      } else if (typeof reason.images == 'string') {
+        const image = images[testScope.slice(-1)[0]];
+        if (image) image.error = reason.images;
+      } else {
+        const imageErrors = reason.images;
+        Object.keys(imageErrors).forEach(imageName => {
+          const image = images[imageName];
+          if (image) image.error = imageErrors[imageName];
+        });
+      }
+    });
+  });
+  logger.info(`${options.browser}:${chalk.gray(sessionId)} is ready`);
+  emitWorkerMessage({
+    type: 'ready'
+  });
+}
+
+function hasTimeout(str) {
+  return str != null && str.toLowerCase().includes('timeout');
+}

package/lib/esm/shared/index.js

@@ -0,0 +1,78 @@
+import { mapValues, mergeWith, cloneDeepWith } from 'lodash';
+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
+    mergeWith({}, ...parameterSets, (_, srcValue) => {
+      // Treat arrays as scalars:
+      if (Array.isArray(srcValue)) return srcValue;
+      return undefined;
+    })
+  );
+}; // 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)
+    };
+  });
+};
+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,
+            skip: cloneDeepWith(creevey.skip, value => {
+              if (isRegExp(value)) {
+                return serializeRegExp(value);
+              }
+
+              return undefined;
+            })
+          }
+        }
+      };
+    }
+
+    return storyData;
+  });
+};
+export const deserializeRawStories = stories => {
+  return mapValues(stories, deserializeStory);
+};
+export const deserializeStory = story => {
+  const creevey = story.parameters.creevey;
+
+  if (creevey !== null && creevey !== void 0 && 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/shared/serializeRegExp.js

@@ -0,0 +1,24 @@
+export const isRegExp = exp => {
+  return exp instanceof RegExp;
+};
+export const isSerializedRegExp = exp => {
+  return typeof exp === 'object' && exp !== null && Reflect.get(exp, '__regexp') === true;
+};
+export const serializeRegExp = exp => {
+  const {
+    source,
+    flags
+  } = exp;
+  return {
+    __regexp: true,
+    source,
+    flags
+  };
+};
+export const deserializeRegExp = _ref => {
+  let {
+    source,
+    flags
+  } = _ref;
+  return new RegExp(source, flags);
+};

package/lib/esm/types.js

@@ -0,0 +1,44 @@
+/* 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 */
+}
+export function isDefined(value) {
+  return value !== null && value !== undefined;
+}
+export function isTest(x) {
+  return isDefined(x) && 'id' in x && 'storyId' in x && typeof x.id == 'string' && typeof x.storyId == 'string';
+}
+export function isObject(x) {
+  return typeof x == 'object' && x != null;
+}
+export function isString(x) {
+  return typeof x == 'string';
+} // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+export function isFunction(x) {
+  return typeof x == 'function';
+}
+export function isImageError(error) {
+  return error instanceof Error && 'images' in error;
+}
+export function isProcessMessage(message) {
+  return isObject(message) && 'scope' in message;
+}
+export function isWorkerMessage(message) {
+  return isProcessMessage(message) && message.scope == 'worker';
+}
+export function isStoriesMessage(message) {
+  return isProcessMessage(message) && message.scope == 'stories';
+}
+export function isTestMessage(message) {
+  return isProcessMessage(message) && message.scope == 'test';
+}
+export function isWebpackMessage(message) {
+  return isProcessMessage(message) && message.scope == 'webpack';
+}
+export function isDockerMessage(message) {
+  return isProcessMessage(message) && message.scope == 'docker';
+}

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

@@ -1,5 +1,5 @@
 import { API } from '@storybook/api';
-import { SetStoriesPayload } from '@storybook/api/dist/ts3.9/lib/stories';
+import { denormalizeStoryParameters } from '../../shared';
 import { CreeveyStatus, CreeveyUpdate, TestData, TestStatus, StoriesRaw } from '../../types';
 import { CreeveyClientApi } from '../shared/creeveyClientApi';
 export declare class CreeveyManager {
@@ -24,7 +24,7 @@ export declare class CreeveyManager {
     onImageApprove: (id: string, retry: number, image: string) => void;
     onStartAllStoryTests: () => void;
     onStartAllTests: () => void;
-    onSetStories: (data: SetStoriesPayload) => void;
+    onSetStories: (data: Parameters<typeof denormalizeStoryParameters>['0']) => void;
     setActiveBrowser: (browser: string) => void;
     setSelectedTestId: (testId: string) => void;
     getStoryTests: (storyId: string) => TestData[];

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

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

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

@@ -0,0 +1,2 @@
+export * from './withCreevey';
+export * from './readyForCapture';

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

@@ -1,24 +1,2 @@
-/// <reference types="webpack-dev-server" />
-import { Configuration } from 'webpack';
 export declare function config(entry?: string[]): string[];
 export declare function managerEntries(entry?: string[]): string[];
-declare global {
-    const __CREEVEY_SERVER_HOST__: string;
-    const __CREEVEY_SERVER_PORT__: number;
-    const __CREEVEY_CLIENT_PORT__: number | null;
-}
-export interface CreeveyAddonOptions {
-    creeveyConfigPath?: string;
-    creeveyPreExtract?: string;
-    creeveyHost?: string;
-    creeveyPort?: number;
-    clientPort?: number;
-    configType: string;
-    configDir: string;
-    outputDir: string;
-    skipExtract?: boolean;
-    presets?: {
-        apply: <T>(preset: string) => Promise<T | undefined>;
-    };
-}
-export declare function managerWebpack(config: Configuration, options: CreeveyAddonOptions): Promise<Configuration>;

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

@@ -0,0 +1,10 @@
+import type { Configuration } from 'webpack';
+import { PluginItem } from '@babel/core';
+interface BabelOptions {
+    extends: string | null;
+    presets: PluginItem[] | null;
+}
+export declare const babel: (config: BabelOptions) => BabelOptions;
+export declare const managerWebpack: (webpackConfig?: Configuration) => Configuration;
+export declare const webpack: (webpackConfig?: Configuration) => Configuration;
+export {};

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

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

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

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

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

@@ -1,2 +1,3 @@
 import { TestStatus } from '../../types';
 export declare function getEmojiByTestStatus(status: TestStatus | undefined, skip?: string | boolean): string;
+export declare const isInternetExplorer: boolean;

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

@@ -9,7 +9,7 @@ declare global {
         __CREEVEY_SERVER_PORT__: number;
         __CREEVEY_WORKER_ID__: number;
         __CREEVEY_GET_STORIES__: () => Promise<StoriesRaw | void>;
-        __CREEVEY_SELECT_STORY__: (storyId: string, kind: string, name: string, shouldWaitForReady: boolean, callback: (response: [error?: string | null, isCaptureCalled?: boolean]) => void) => void;
+        __CREEVEY_SELECT_STORY__: (storyId: string, kind: string, name: string, shouldWaitForReady: boolean, callback: (response: [error?: string | null, isCaptureCalled?: boolean]) => void) => Promise<void>;
         __CREEVEY_UPDATE_GLOBALS__: (globals: StorybookGlobals) => void;
         __CREEVEY_INSERT_IGNORE_STYLES__: (ignoreElements: string[]) => HTMLStyleElement;
         __CREEVEY_REMOVE_IGNORE_STYLES__: (ignoreStyles: HTMLStyleElement) => void;

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

@@ -1,3 +1,3 @@
 import React from 'react';
 import { ViewPropsWithTheme } from './ImagesView';
-export declare const BlendView: React.SFC<import("emotion-theming/types/helper").AddOptionalTo<ViewPropsWithTheme, "theme">>;
+export declare const BlendView: React.FC<import("@storybook/theming").AddOptionalTo<ViewPropsWithTheme, "theme">>;

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

@@ -1,4 +1,3 @@
-/// <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,3 @@
 import React from 'react';
 import { ViewPropsWithTheme } from './ImagesView';
-export declare const SideBySideView: React.SFC<import("emotion-theming/types/helper").AddOptionalTo<ViewPropsWithTheme, "theme">>;
+export declare const SideBySideView: React.FC<import("@storybook/theming").AddOptionalTo<ViewPropsWithTheme, "theme">>;

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

@@ -1,3 +1,3 @@
 import React from 'react';
 import { ViewPropsWithTheme } from './ImagesView';
-export declare const SlideView: React.SFC<import("emotion-theming/types/helper").AddOptionalTo<ViewPropsWithTheme, "theme">>;
+export declare const SlideView: React.FC<import("@storybook/theming").AddOptionalTo<ViewPropsWithTheme, "theme">>;

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

@@ -1,3 +1,3 @@
 import React from 'react';
 import { ViewPropsWithTheme } from './ImagesView';
-export declare const SwapView: React.SFC<import("emotion-theming/types/helper").AddOptionalTo<ViewPropsWithTheme, "theme">>;
+export declare const SwapView: React.FC<import("@storybook/theming").AddOptionalTo<ViewPropsWithTheme, "theme">>;

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

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

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

@@ -1,4 +1,3 @@
-/// <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,5 @@ interface ImageSwapProps {
     theme: Theme;
     error?: boolean;
 }
-export declare const ImagePreview: React.SFC<import("emotion-theming/types/helper").AddOptionalTo<ImageSwapProps, "theme">>;
+export declare const ImagePreview: React.FC<import("@storybook/theming").AddOptionalTo<ImageSwapProps, "theme">>;
 export {};

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

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

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

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

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

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

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

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

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

@@ -8,7 +8,7 @@ interface BooleanProps {
 interface CheckboxState {
     indeterminate: boolean;
 }
-export declare const CheckboxContainer: import("@emotion/styled-base").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<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, Pick<React.ClassAttributes<HTMLDivElement> & React.HTMLAttributes<HTMLDivElement>, keyof React.HTMLAttributes<HTMLDivElement>>, Theme>;
 export declare class Checkbox extends React.Component<BooleanProps, CheckboxState> {
     state: CheckboxState;
     handleIndeterminateChange: (value: boolean) => void;

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

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