creevey 0.9.0-beta.5 → 0.9.0-beta.6

package/lib/cjs/server/selenium/browser.js

@@ -40,6 +40,7 @@ var _utils = require("../utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const storybookRootID = (0, _helpers.isStorybookVersionLessThan)(7) ? 'root' : 'storybook-root';
 const DOCKER_INTERNAL = 'host.docker.internal';
 let browserLogger = _logger.logger;
 let browserName = '';
@@ -116,10 +117,10 @@ function getUrlChecker(browser) {
       // We don't use any page load strategies except `NONE`
       // because other add significant delay and some of them don't work in earlier chrome versions
       // Browsers always load page successful even it's failed
-      // So we just check `#root` element
+      // So we just check `root` element
 
-      browserLogger.debug(`Checking ${_chalk.default.cyan('#root')} existence on ${_chalk.default.magenta(url)}`);
-      return source.includes('<div id="root"></div>');
+      browserLogger.debug(`Checking ${_chalk.default.cyan(`#${storybookRootID}`)} existence on ${_chalk.default.magenta(url)}`);
+      return source.includes(`id="${storybookRootID}"`);
     } catch (error) {
       return false;
     }
@@ -137,11 +138,18 @@ async function waitForStorybook(browser) {
   }, 60000);
 
   while (wait) {
-    wait = await browser.executeAsyncScript(function (SET_STORIES, callback) {
-      if (typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined') return callback(true);
-      if (window.__STORYBOOK_ADDONS_CHANNEL__.last(SET_STORIES) == undefined) return callback(true);
-      return callback(false);
-    }, Events.SET_STORIES);
+    if ((0, _helpers.isStorybookVersionLessThan)(7)) {
+      wait = await browser.executeAsyncScript(function (SET_STORIES, callback) {
+        if (typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined') return callback(true);
+        if (window.__STORYBOOK_ADDONS_CHANNEL__.last(SET_STORIES) == undefined) return callback(true);
+        return callback(false);
+      }, Events.SET_STORIES);
+    } else {
+      wait = await browser.executeAsyncScript(function (callback) {
+        return callback(typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined');
+      });
+    }
+
     if (!wait) clearTimeout(initiateTimeout);
   }
 
@@ -429,21 +437,18 @@ async function resolveCreeveyHost(browser, port) {
   return creeveyServerHost;
 }
 
-async function loadStoriesFromBrowser(port) {
+async function loadStoriesFromBrowser() {
   if (!browser) throw new Error("Can't get stories from browser if webdriver isn't connected");
-  const host = await resolveCreeveyHost(browser, port);
-  const stories = await browser.executeAsyncScript(function (creeveyHost, creeveyPort, callback) {
-    window.__CREEVEY_SERVER_HOST__ = creeveyHost;
-    window.__CREEVEY_SERVER_PORT__ = creeveyPort;
+  const stories = await browser.executeAsyncScript(function (callback) {
     void window.__CREEVEY_GET_STORIES__().then(callback);
-  }, host, port);
+  });
   if (!stories) throw new Error("Can't get stories, it seems creevey or storybook API isn't available");
   return stories;
 }
 
-async function getBrowser(config, name) {
+async function getBrowser(config, options) {
   if (browser) return browser;
-  browserName = name;
+  browserName = options.browser;
   const browserConfig = config.browsers[browserName];
   const {
     gridUrl = config.gridUrl,
@@ -473,7 +478,7 @@ async function getBrowser(config, name) {
     const url = new URL(gridUrl);
     url.username = url.username ? '********' : '';
     url.password = url.password ? '********' : '';
-    browserLogger.debug(`(${name}) Connecting to Selenium ${_chalk.default.magenta(url.toString())}`);
+    browserLogger.debug(`(${browserName}) Connecting to Selenium ${_chalk.default.magenta(url.toString())}`);
     browser = await new _seleniumWebdriver.Builder().usingServer(gridUrl).withCapabilities(capabilities).build();
     const sessionId = (_await$browser$getSes = await browser.getSession()) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
     let browserHost = '';
@@ -487,14 +492,14 @@ async function getBrowser(config, name) {
       /* noop */
     }
 
-    browserLogger.debug(`(${name}) Connected successful with ${[_chalk.default.green(browserHost), _chalk.default.magenta(sessionId)].filter(Boolean).join(':')}`);
+    browserLogger.debug(`(${browserName}) Connected successful with ${[_chalk.default.green(browserHost), _chalk.default.magenta(sessionId)].filter(Boolean).join(':')}`);
     browserLogger = (0, _loglevel.getLogger)(sessionId);
 
     _loglevelPluginPrefix.default.apply(browserLogger, {
       format(level) {
         const levelColor = _logger.colors[level.toUpperCase()];
 
-        return `[${name}:${_chalk.default.gray(sessionId)}] ${levelColor(level)} =>`;
+        return `[${browserName}:${_chalk.default.gray(sessionId)}] ${levelColor(level)} =>`;
       }
 
     });
@@ -528,9 +533,12 @@ async function getBrowser(config, name) {
     await updateStorybookGlobals(browser, _storybookGlobals);
   }
 
-  await browser.executeScript(function (workerId) {
+  const creeveyHost = await resolveCreeveyHost(browser, options.port);
+  await browser.executeScript(function (workerId, creeveyHost, creeveyPort) {
     window.__CREEVEY_WORKER_ID__ = workerId;
-  }, process.pid);
+    window.__CREEVEY_SERVER_HOST__ = creeveyHost;
+    window.__CREEVEY_SERVER_PORT__ = creeveyPort;
+  }, process.pid, creeveyHost, options.port);
   return browser;
 }
 
@@ -581,7 +589,7 @@ async function switchStory() {
     parameters
   } = story;
   const {
-    captureElement = '#root',
+    captureElement = `#${storybookRootID}`,
     waitForReady,
     ignoreElements
   } = parameters.creevey ?? {};

package/lib/cjs/server/storybook/helpers.js

@@ -88,7 +88,7 @@ function getStorybookVersion() {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const {
     version
-  } = require(resolveFromStorybook('@storybook/core/package.json'));
+  } = require(resolveFromStorybook('@storybook/core-server/package.json'));
 
   return version;
 }

package/lib/cjs/server/storybook/providers/browser.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.loadStories = loadStories;
+exports.loadStories = void 0;
 
 var _cluster = _interopRequireDefault(require("cluster"));
 
@@ -17,9 +17,7 @@ var _logger = require("../../logger");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-async function loadStories(_config, {
-  port
-}, storiesListener) {
+const loadStories = async (_config, _options, storiesListener) => {
   if (_cluster.default.isPrimary) {
     return new Promise(resolve => {
       const worker = Object.values(_cluster.default.workers ?? {}).filter(_types.isDefined).find(worker => worker.isConnected());
@@ -57,7 +55,7 @@ async function loadStories(_config, {
       });
       if (message.type == 'update') storiesListener(new Map(message.payload));
     });
-    const stories = await (0, _selenium.loadStoriesFromBrowser)(port);
+    const stories = await (0, _selenium.loadStoriesFromBrowser)();
     const storiesWithOldTests = [];
     Object.values(stories).forEach(story => {
       var _parameters, _parameters$creevey;
@@ -71,4 +69,6 @@ async function loadStories(_config, {
     });
     return stories;
   }
-}
+};
+
+exports.loadStories = loadStories;

package/lib/cjs/server/storybook/providers/hybrid.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.loadStories = loadStories;
+exports.loadStories = void 0;
 
 var _chokidar = _interopRequireDefault(require("chokidar"));
 
@@ -23,9 +23,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-async function loadStories(_config, {
-  port
-}, storiesListener) {
+const loadStories = async (_config, _options, storiesListener) => {
   let creeveyParamsByStoryId = {};
 
   const mergeParamsFromTestsToStory = (story, creeveyParams) => {
@@ -34,9 +32,7 @@ async function loadStories(_config, {
     }
   };
 
-  const stories = await (0, _browser.loadStories)(_config, {
-    port
-  }, updatedStoriesByFiles => {
+  const stories = await (0, _browser.loadStories)(_config, {}, updatedStoriesByFiles => {
     Array.from(updatedStoriesByFiles.entries()).forEach(([, storiesArray]) => {
       storiesArray.forEach(story => {
         const creeveyParams = creeveyParamsByStoryId[story.id];
@@ -56,7 +52,9 @@ async function loadStories(_config, {
     mergeParamsFromTestsToStory(story, creeveyParamsByStoryId[storyId]);
   });
   return stories;
-}
+};
+
+exports.loadStories = loadStories;
 
 async function parseParams(config, listener) {
   if (!config.testsDir) {

package/lib/cjs/server/storybook/providers/nodejs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.extractStoriesData = extractStoriesData;
-exports.loadStories = loadStories;
+exports.loadStories = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -189,10 +189,10 @@ async function loadStoriesDirectly(config, {
 } // TODO Do we need to support multiple storybooks here?
 
 
-async function loadStories(config, {
+const loadStories = async (config, {
   watch,
   debug
-}, storiesListener) {
+}, storiesListener) => {
   const storybookApi = await initStorybookEnvironment();
   const Events = await (0, _helpers.importStorybookCoreEvents)();
   const {
@@ -217,7 +217,9 @@ async function loadStories(config, {
     debug
   });
   return loadPromise;
-}
+};
+
+exports.loadStories = loadStories;
 
 async function extractStoriesData(config, {
   watch,

package/lib/cjs/server/worker/worker.js

@@ -194,7 +194,7 @@ async function worker(config, options) {
 
   _chai.default.use((0, _chaiImage.default)(getExpected, config.diffOptions));
 
-  if ((await (0, _selenium.getBrowser)(config, options.browser)) == null) return;
+  if ((await (0, _selenium.getBrowser)(config, options)) == null) return;
   await (0, _helpers.addTestsFromStories)(mocha.suite, config, {
     browser: options.browser,
     watch: options.ui,
@@ -205,12 +205,12 @@ async function worker(config, options) {
   try {
     var _await$getBrowser;
 
-    await ((_await$getBrowser = await (0, _selenium.getBrowser)(config, options.browser)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
+    await ((_await$getBrowser = await (0, _selenium.getBrowser)(config, options)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
   } catch (_) {
     await (0, _selenium.closeBrowser)();
   }
 
-  const browser = await (0, _selenium.getBrowser)(config, options.browser);
+  const browser = await (0, _selenium.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 => {

package/lib/cjs/types.js

@@ -20,6 +20,7 @@ exports.noop = noop;
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 /* eslint-enable @typescript-eslint/no-explicit-any */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function noop() {
   /* noop */
 }

package/lib/esm/server/selenium/browser.js

@@ -10,8 +10,9 @@ import { PageLoadStrategy } from 'selenium-webdriver/lib/capabilities';
 import { isDefined, noop } from '../../types';
 import { colors, logger } from '../logger';
 import { emitStoriesMessage, subscribeOn } from '../messages';
-import { importStorybookCoreEvents } from '../storybook/helpers';
+import { importStorybookCoreEvents, isStorybookVersionLessThan } from '../storybook/helpers';
 import { isShuttingDown, LOCALHOST_REGEXP, runSequence } from '../utils';
+const storybookRootID = isStorybookVersionLessThan(7) ? 'root' : 'storybook-root';
 const DOCKER_INTERNAL = 'host.docker.internal';
 let browserLogger = logger;
 let browserName = '';
@@ -88,10 +89,10 @@ function getUrlChecker(browser) {
       // We don't use any page load strategies except `NONE`
       // because other add significant delay and some of them don't work in earlier chrome versions
       // Browsers always load page successful even it's failed
-      // So we just check `#root` element
+      // So we just check `root` element
 
-      browserLogger.debug(`Checking ${chalk.cyan('#root')} existence on ${chalk.magenta(url)}`);
-      return source.includes('<div id="root"></div>');
+      browserLogger.debug(`Checking ${chalk.cyan(`#${storybookRootID}`)} existence on ${chalk.magenta(url)}`);
+      return source.includes(`id="${storybookRootID}"`);
     } catch (error) {
       return false;
     }
@@ -109,11 +110,18 @@ async function waitForStorybook(browser) {
   }, 60000);
 
   while (wait) {
-    wait = await browser.executeAsyncScript(function (SET_STORIES, callback) {
-      if (typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined') return callback(true);
-      if (window.__STORYBOOK_ADDONS_CHANNEL__.last(SET_STORIES) == undefined) return callback(true);
-      return callback(false);
-    }, Events.SET_STORIES);
+    if (isStorybookVersionLessThan(7)) {
+      wait = await browser.executeAsyncScript(function (SET_STORIES, callback) {
+        if (typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined') return callback(true);
+        if (window.__STORYBOOK_ADDONS_CHANNEL__.last(SET_STORIES) == undefined) return callback(true);
+        return callback(false);
+      }, Events.SET_STORIES);
+    } else {
+      wait = await browser.executeAsyncScript(function (callback) {
+        return callback(typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined');
+      });
+    }
+
     if (!wait) clearTimeout(initiateTimeout);
   }
 
@@ -401,20 +409,17 @@ async function resolveCreeveyHost(browser, port) {
   return creeveyServerHost;
 }
 
-export async function loadStoriesFromBrowser(port) {
+export async function loadStoriesFromBrowser() {
   if (!browser) throw new Error("Can't get stories from browser if webdriver isn't connected");
-  const host = await resolveCreeveyHost(browser, port);
-  const stories = await browser.executeAsyncScript(function (creeveyHost, creeveyPort, callback) {
-    window.__CREEVEY_SERVER_HOST__ = creeveyHost;
-    window.__CREEVEY_SERVER_PORT__ = creeveyPort;
+  const stories = await browser.executeAsyncScript(function (callback) {
     void window.__CREEVEY_GET_STORIES__().then(callback);
-  }, host, port);
+  });
   if (!stories) throw new Error("Can't get stories, it seems creevey or storybook API isn't available");
   return stories;
 }
-export async function getBrowser(config, name) {
+export async function getBrowser(config, options) {
   if (browser) return browser;
-  browserName = name;
+  browserName = options.browser;
   const browserConfig = config.browsers[browserName];
   const {
     gridUrl = config.gridUrl,
@@ -444,7 +449,7 @@ export async function getBrowser(config, name) {
     const url = new URL(gridUrl);
     url.username = url.username ? '********' : '';
     url.password = url.password ? '********' : '';
-    browserLogger.debug(`(${name}) Connecting to Selenium ${chalk.magenta(url.toString())}`);
+    browserLogger.debug(`(${browserName}) Connecting to Selenium ${chalk.magenta(url.toString())}`);
     browser = await new Builder().usingServer(gridUrl).withCapabilities(capabilities).build();
     const sessionId = (_await$browser$getSes = await browser.getSession()) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
     let browserHost = '';
@@ -458,12 +463,12 @@ export async function getBrowser(config, name) {
       /* noop */
     }
 
-    browserLogger.debug(`(${name}) Connected successful with ${[chalk.green(browserHost), chalk.magenta(sessionId)].filter(Boolean).join(':')}`);
+    browserLogger.debug(`(${browserName}) Connected successful with ${[chalk.green(browserHost), chalk.magenta(sessionId)].filter(Boolean).join(':')}`);
     browserLogger = getLogger(sessionId);
     prefix.apply(browserLogger, {
       format(level) {
         const levelColor = colors[level.toUpperCase()];
-        return `[${name}:${chalk.gray(sessionId)}] ${levelColor(level)} =>`;
+        return `[${browserName}:${chalk.gray(sessionId)}] ${levelColor(level)} =>`;
       }
 
     });
@@ -496,9 +501,12 @@ export async function getBrowser(config, name) {
     await updateStorybookGlobals(browser, _storybookGlobals);
   }
 
-  await browser.executeScript(function (workerId) {
+  const creeveyHost = await resolveCreeveyHost(browser, options.port);
+  await browser.executeScript(function (workerId, creeveyHost, creeveyPort) {
     window.__CREEVEY_WORKER_ID__ = workerId;
-  }, process.pid);
+    window.__CREEVEY_SERVER_HOST__ = creeveyHost;
+    window.__CREEVEY_SERVER_PORT__ = creeveyPort;
+  }, process.pid, creeveyHost, options.port);
   return browser;
 }
 
@@ -548,7 +556,7 @@ export async function switchStory() {
     parameters
   } = story;
   const {
-    captureElement = '#root',
+    captureElement = `#${storybookRootID}`,
     waitForReady,
     ignoreElements
   } = parameters.creevey ?? {};

package/lib/esm/server/storybook/helpers.js

@@ -35,7 +35,7 @@ export function getStorybookVersion() {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const {
     version
-  } = require(resolveFromStorybook('@storybook/core/package.json'));
+  } = require(resolveFromStorybook('@storybook/core-server/package.json'));
 
   return version;
 }

package/lib/esm/server/storybook/providers/browser.js

@@ -3,9 +3,7 @@ import { loadStoriesFromBrowser } from '../../selenium';
 import { emitStoriesMessage, sendStoriesMessage, subscribeOn, subscribeOnWorker } from '../../messages';
 import { isDefined } from '../../../types';
 import { logger } from '../../logger';
-export async function loadStories(_config, {
-  port
-}, storiesListener) {
+export const loadStories = async (_config, _options, storiesListener) => {
   if (cluster.isPrimary) {
     return new Promise(resolve => {
       const worker = Object.values(cluster.workers ?? {}).filter(isDefined).find(worker => worker.isConnected());
@@ -43,7 +41,7 @@ export async function loadStories(_config, {
       });
       if (message.type == 'update') storiesListener(new Map(message.payload));
     });
-    const stories = await loadStoriesFromBrowser(port);
+    const stories = await loadStoriesFromBrowser();
     const storiesWithOldTests = [];
     Object.values(stories).forEach(story => {
       var _parameters, _parameters$creevey;
@@ -57,4 +55,4 @@ export async function loadStories(_config, {
     });
     return stories;
   }
-}
+};

package/lib/esm/server/storybook/providers/hybrid.js

@@ -4,9 +4,7 @@ import { logger } from '../../logger';
 import parse from '../../testsFiles/parser';
 import { readDirRecursive } from '../../../server/utils';
 import { combineParameters } from '../../../shared';
-export async function loadStories(_config, {
-  port
-}, storiesListener) {
+export const loadStories = async (_config, _options, storiesListener) => {
   let creeveyParamsByStoryId = {};
 
   const mergeParamsFromTestsToStory = (story, creeveyParams) => {
@@ -15,9 +13,7 @@ export async function loadStories(_config, {
     }
   };
 
-  const stories = await browserProvider(_config, {
-    port
-  }, updatedStoriesByFiles => {
+  const stories = await browserProvider(_config, {}, updatedStoriesByFiles => {
     Array.from(updatedStoriesByFiles.entries()).forEach(([, storiesArray]) => {
       storiesArray.forEach(story => {
         const creeveyParams = creeveyParamsByStoryId[story.id];
@@ -37,7 +33,7 @@ export async function loadStories(_config, {
     mergeParamsFromTestsToStory(story, creeveyParamsByStoryId[storyId]);
   });
   return stories;
-}
+};
 
 async function parseParams(config, listener) {
   if (!config.testsDir) {

package/lib/esm/server/storybook/providers/nodejs.js

@@ -169,10 +169,10 @@ async function loadStoriesDirectly(config, {
 } // TODO Do we need to support multiple storybooks here?
 
 
-export async function loadStories(config, {
+export const loadStories = async (config, {
   watch,
   debug
-}, storiesListener) {
+}, storiesListener) => {
   const storybookApi = await initStorybookEnvironment();
   const Events = await importStorybookCoreEvents();
   const {
@@ -197,7 +197,7 @@ export async function loadStories(config, {
     debug
   });
   return loadPromise;
-}
+};
 export async function extractStoriesData(config, {
   watch,
   debug

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

@@ -166,7 +166,7 @@ export default async function worker(config, options) {
   const mocha = new Mocha(mochaOptions);
   mocha.cleanReferencesAfterRun(false);
   chai.use(chaiImage(getExpected, config.diffOptions));
-  if ((await getBrowser(config, options.browser)) == null) return;
+  if ((await getBrowser(config, options)) == null) return;
   await addTestsFromStories(mocha.suite, config, {
     browser: options.browser,
     watch: options.ui,
@@ -177,12 +177,12 @@ export default async function worker(config, options) {
   try {
     var _await$getBrowser;
 
-    await ((_await$getBrowser = await getBrowser(config, options.browser)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
+    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.browser);
+  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 => {

package/lib/esm/types.js

@@ -1,6 +1,7 @@
 /* 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 */
 }

package/lib/types/cli.d.ts

@@ -1 +1 @@
-#!/usr/bin/env node
+#!/usr/bin/env node

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

@@ -1,37 +1,37 @@
-import { API } from '@storybook/api';
-import { denormalizeStoryParameters } from '../../shared';
-import { CreeveyStatus, CreeveyUpdate, TestData, TestStatus, StoriesRaw } from '../../types';
-import { CreeveyClientApi } from '../shared/creeveyClientApi';
-export declare class CreeveyManager {
-    storybookApi: API;
-    storyId: string;
-    activeBrowser: string;
-    selectedTestId: string;
-    status: CreeveyStatus;
-    creeveyApi: CreeveyClientApi | null;
-    stories: StoriesRaw;
-    updateStatusListeners: Array<(update: CreeveyUpdate) => void>;
-    changeTestListeners: Array<(testId: string) => void>;
-    constructor(storybookApi: API);
-    initAll: () => Promise<void>;
-    onUpdateStatus(listener: (update: CreeveyUpdate) => void): () => void;
-    onChangeTest(listener: (testId: string) => void): () => void;
-    handleCreeveyUpdate: (update: CreeveyUpdate) => void;
-    getCurrentTest: () => TestData | undefined;
-    onStoryRendered: (storyId: string) => void;
-    onStart: () => void;
-    onStop: () => void;
-    onImageApprove: (id: string, retry: number, image: string) => void;
-    onStartAllStoryTests: () => void;
-    onStartAllTests: () => void;
-    onSetStories: (data: Parameters<typeof denormalizeStoryParameters>['0']) => void;
-    setActiveBrowser: (browser: string) => void;
-    setSelectedTestId: (testId: string) => void;
-    getStoryTests: (storyId: string) => TestData[];
-    getBrowsers: () => string[];
-    getTestsByStoryIdAndBrowser: (browser: string) => TestData[];
-    getTabTitle: (browser: string) => string;
-    setPanelsTitle: () => void;
-    addStatusesToSideBar(): Promise<void>;
-    addStatusToStoryName(name: string, status: TestStatus | undefined, skip: string | boolean): string;
-}
+import { API } from '@storybook/api';
+import { denormalizeStoryParameters } from '../../shared';
+import { CreeveyStatus, CreeveyUpdate, TestData, TestStatus, StoriesRaw } from '../../types';
+import { CreeveyClientApi } from '../shared/creeveyClientApi';
+export declare class CreeveyManager {
+    storybookApi: API;
+    storyId: string;
+    activeBrowser: string;
+    selectedTestId: string;
+    status: CreeveyStatus;
+    creeveyApi: CreeveyClientApi | null;
+    stories: StoriesRaw;
+    updateStatusListeners: Array<(update: CreeveyUpdate) => void>;
+    changeTestListeners: Array<(testId: string) => void>;
+    constructor(storybookApi: API);
+    initAll: () => Promise<void>;
+    onUpdateStatus(listener: (update: CreeveyUpdate) => void): () => void;
+    onChangeTest(listener: (testId: string) => void): () => void;
+    handleCreeveyUpdate: (update: CreeveyUpdate) => void;
+    getCurrentTest: () => TestData | undefined;
+    onStoryRendered: (storyId: string) => void;
+    onStart: () => void;
+    onStop: () => void;
+    onImageApprove: (id: string, retry: number, image: string) => void;
+    onStartAllStoryTests: () => void;
+    onStartAllTests: () => void;
+    onSetStories: (data: Parameters<typeof denormalizeStoryParameters>['0']) => void;
+    setActiveBrowser: (browser: string) => void;
+    setSelectedTestId: (testId: string) => void;
+    getStoryTests: (storyId: string) => TestData[];
+    getBrowsers: () => string[];
+    getTestsByStoryIdAndBrowser: (browser: string) => TestData[];
+    getTabTitle: (browser: string) => string;
+    setPanelsTitle: () => void;
+    addStatusesToSideBar(): Promise<void>;
+    addStatusToStoryName(name: string, status: TestStatus | undefined, skip: string | boolean): string;
+}

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

@@ -1,8 +1,8 @@
-import { CreeveyManager } from '../Manager';
-interface AddonProps {
-    active?: boolean;
-    browser: string;
-    manager: CreeveyManager;
-}
-export declare const Addon: ({ active, browser, manager }: AddonProps) => JSX.Element | null;
-export {};
+import { CreeveyManager } from '../Manager';
+interface AddonProps {
+    active?: boolean;
+    browser: string;
+    manager: CreeveyManager;
+}
+export declare const Addon: ({ active, browser, manager }: AddonProps) => JSX.Element | null;
+export {};

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

@@ -1,7 +1,7 @@
-interface IconProps {
-    width?: number;
-    height?: number;
-}
-export declare const NextIcon: ({ width, height }: IconProps) => JSX.Element;
-export declare const ForwardIcon: ({ width, height }: IconProps) => JSX.Element;
-export {};
+interface IconProps {
+    width?: number;
+    height?: number;
+}
+export declare const NextIcon: ({ width, height }: IconProps) => JSX.Element;
+export declare const ForwardIcon: ({ width, height }: IconProps) => JSX.Element;
+export {};

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

@@ -1,9 +1,9 @@
-import { TestData } from '../../../types';
-interface PanelProps {
-    tests: TestData[];
-    selectedTestId: string;
-    onChangeTest: (testId: string) => void;
-    onImageApprove: (id: string, retry: number, image: string) => void;
-}
-export declare const Panel: ({ tests, selectedTestId, onChangeTest, onImageApprove }: PanelProps) => JSX.Element;
-export {};
+import { TestData } from '../../../types';
+interface PanelProps {
+    tests: TestData[];
+    selectedTestId: string;
+    onChangeTest: (testId: string) => void;
+    onImageApprove: (id: string, retry: number, image: string) => void;
+}
+export declare const Panel: ({ tests, selectedTestId, onChangeTest, onImageApprove }: PanelProps) => JSX.Element;
+export {};