creevey 0.8.0-beta.0 → 0.8.0

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

@@ -9,20 +9,21 @@ import { Builder, By, Capabilities, Origin } from 'selenium-webdriver';
 import { PageLoadStrategy } from 'selenium-webdriver/lib/capabilities';
 import { isDefined, noop } from '../../types';
 import { colors, logger } from '../logger';
-import { subscribeOn } from '../messages';
-import { importStorybookCoreEvents, isStorybookVersionLessThan } from '../storybook/helpers';
+import { emitStoriesMessage, subscribeOn } from '../messages';
+import { importStorybookCoreEvents } from '../storybook/helpers';
 import { isShuttingDown, LOCALHOST_REGEXP, runSequence } from '../utils';
 const DOCKER_INTERNAL = 'host.docker.internal';
 let browserLogger = logger;
+let browserName = '';
+let browser = null;
+let creeveyServerHost = null;
 
 function getSessionData(grid, sessionId = '') {
   const gridUrl = new URL(grid);
   gridUrl.pathname = `/host/${sessionId}`;
   return new Promise((resolve, reject) => (gridUrl.protocol == 'https:' ? https : http).get(gridUrl.toString(), res => {
     if (res.statusCode !== 200) {
-      var _res$statusCode;
-
-      return reject(new Error(`Couldn't get session data for ${sessionId}. Status code: ${(_res$statusCode = res.statusCode) !== null && _res$statusCode !== void 0 ? _res$statusCode : 'Unknown'}`));
+      return reject(new Error(`Couldn't get session data for ${sessionId}. Status code: ${res.statusCode ?? 'Unknown'}`));
     }
 
     let data = '';
@@ -32,17 +33,19 @@ function getSessionData(grid, sessionId = '') {
       try {
         resolve(JSON.parse(data));
       } catch (error) {
-        var _error$stack;
-
-        reject(new Error(`Couldn't get session data for ${sessionId}. ${error instanceof Error ? (_error$stack = error.stack) !== null && _error$stack !== void 0 ? _error$stack : error.message : error}`));
+        reject(new Error(`Couldn't get session data for ${sessionId}. ${error instanceof Error ? error.stack ?? error.message : error}`));
       }
     });
   }));
 }
 
+function getAddresses() {
+  return [DOCKER_INTERNAL].concat(...Object.values(networkInterfaces()).filter(isDefined).map(network => network.filter(info => info.family == 'IPv4').map(info => info.address)));
+}
+
 async function resolveStorybookUrl(storybookUrl, checkUrl) {
   browserLogger.debug('Resolving storybook url');
-  const addresses = [DOCKER_INTERNAL].concat(...Object.values(networkInterfaces()).filter(isDefined).map(network => network.filter(info => info.family == 'IPv4').map(info => info.address)));
+  const addresses = getAddresses();
 
   for (const ip of addresses) {
     const resolvedUrl = storybookUrl.replace(LOCALHOST_REGEXP, ip);
@@ -96,17 +99,6 @@ function getUrlChecker(browser) {
 }
 
 async function waitForStorybook(browser) {
-  // NOTE: Storybook 5.x doesn't have the `last` method
-  if (isStorybookVersionLessThan(6)) {
-    browserLogger.debug('Waiting for `load` event to make sure that storybook is initiated');
-    return browser.executeAsyncScript(function (callback) {
-      if (document.readyState == 'complete') return callback();
-      window.addEventListener('load', function () {
-        callback();
-      });
-    });
-  }
-
   browserLogger.debug('Waiting for `setStories` event to make sure that storybook is initiated');
   let wait = true;
   let isTimeout = false;
@@ -129,11 +121,11 @@ async function waitForStorybook(browser) {
 }
 
 async function resetMousePosition(browser) {
-  var _ref, _await$browser$getCap, _await$browser$getCap2, _await$browser$getCap3;
+  var _await$browser$getCap, _await$browser$getCap2;
 
   browserLogger.debug('Resetting mouse position to the top-left corner');
   const browserName = (await browser.getCapabilities()).getBrowserName();
-  const [browserVersion] = (_ref = (_await$browser$getCap = (_await$browser$getCap2 = (await browser.getCapabilities()).getBrowserVersion()) === null || _await$browser$getCap2 === void 0 ? void 0 : _await$browser$getCap2.split('.')) !== null && _await$browser$getCap !== void 0 ? _await$browser$getCap : (_await$browser$getCap3 = (await browser.getCapabilities()).get('version')) === null || _await$browser$getCap3 === void 0 ? void 0 : _await$browser$getCap3.split('.')) !== null && _ref !== void 0 ? _ref : []; // NOTE Reset mouse position to support keweb selenium grid browser versions
+  const [browserVersion] = ((_await$browser$getCap = (await browser.getCapabilities()).getBrowserVersion()) === null || _await$browser$getCap === void 0 ? void 0 : _await$browser$getCap.split('.')) ?? ((_await$browser$getCap2 = (await browser.getCapabilities()).get('version')) === null || _await$browser$getCap2 === void 0 ? void 0 : _await$browser$getCap2.split('.')) ?? []; // NOTE Reset mouse position to support keweb selenium grid browser versions
 
   if (browserName == 'chrome' && browserVersion == '70') {
     const {
@@ -217,10 +209,10 @@ const getScrollBarWidth = (() => {
 
 
 async function hasScrollBar(browser) {
-  var _await$browser$getCap4, _await$browser$getCap5;
+  var _await$browser$getCap3;
 
   const browserName = (await browser.getCapabilities()).getBrowserName();
-  const [browserVersion] = (_await$browser$getCap4 = (_await$browser$getCap5 = (await browser.getCapabilities()).getBrowserVersion()) === null || _await$browser$getCap5 === void 0 ? void 0 : _await$browser$getCap5.split('.')) !== null && _await$browser$getCap4 !== void 0 ? _await$browser$getCap4 : [];
+  const [browserVersion] = ((_await$browser$getCap3 = (await browser.getCapabilities()).getBrowserVersion()) === null || _await$browser$getCap3 === void 0 ? void 0 : _await$browser$getCap3.split('.')) ?? [];
   return browserName != 'Safari' && // NOTE This need to work with keweb selenium grid
   !(browserName == 'firefox' && browserVersion == '61');
 }
@@ -271,7 +263,8 @@ async function takeCompositeScreenshot(browser, windowRect, elementRect) {
       const scrollOffset = isFitVertically || isScreenshotWithoutScrollBar ? 0 : scrollBarWidth;
       const i = (y * compositeImage.width + x) * 4;
       const j = // NOTE compositeImage(x, y) => image(x, y)
-      (y % viewportHeight * (viewportWidth + scrollOffset) + x % viewportWidth) * 4 + (isLastRow ? yOffset * (viewportWidth + scrollOffset) * 4 : 0) + (isLastCol ? xOffset * 4 : 0);
+      (y % viewportHeight * (viewportWidth + scrollOffset) + x % viewportWidth) * 4 + ( // NOTE Offset for last row/col image
+      isLastRow ? yOffset * (viewportWidth + scrollOffset) * 4 : 0) + (isLastCol ? xOffset * 4 : 0);
       const image = images[row * cols + col];
       compositeImage.data[i + 0] = image.data[j + 0];
       compositeImage.data[i + 1] = image.data[j + 1];
@@ -283,7 +276,7 @@ async function takeCompositeScreenshot(browser, windowRect, elementRect) {
   return PNG.sync.write(compositeImage).toString('base64');
 }
 
-async function takeScreenshot(browser, captureElement, ignoreElements) {
+export async function takeScreenshot(browser, captureElement, ignoreElements) {
   let screenshot;
   const ignoreStyles = await insertIgnoreStyles(browser, ignoreElements);
 
@@ -320,7 +313,7 @@ async function takeScreenshot(browser, captureElement, ignoreElements) {
       const {
         elementRect,
         windowRect
-      } = rects !== null && rects !== void 0 ? rects : {};
+      } = rects ?? {};
       if (!elementRect || !windowRect) throw new Error(`Couldn't find element with selector: '${captureElement}'`);
       const isFitIntoViewport = elementRect.width + elementRect.left <= windowRect.width && elementRect.height + elementRect.top <= windowRect.height;
       if (isFitIntoViewport) browserLogger.debug(`Capturing ${chalk.cyan(captureElement)}`);else browserLogger.debug(`Capturing composite screenshot image of ${chalk.cyan(captureElement)}`);
@@ -341,22 +334,19 @@ async function selectStory(browser, {
   name
 }, waitForReady = false) {
   browserLogger.debug(`Triggering 'SetCurrentStory' event with storyId ${chalk.magenta(id)}`);
-  const errorMessage = await browser.executeAsyncScript(function (id, kind, name, shouldWaitForReady, callback) {
+  const result = await browser.executeAsyncScript(function (id, kind, name, shouldWaitForReady, callback) {
     if (typeof window.__CREEVEY_SELECT_STORY__ == 'undefined') {
-      return callback("Creevey can't switch story. This may happened if forget to add `creevey` addon to your storybook config, or storybook not loaded in browser due syntax error.");
+      return callback(["Creevey can't switch story. This may happened if forget to add `creevey` addon to your storybook config, or storybook not loaded in browser due syntax error."]);
     }
 
-    window.__CREEVEY_SELECT_STORY__(id, kind, name, shouldWaitForReady, callback);
+    void window.__CREEVEY_SELECT_STORY__(id, kind, name, shouldWaitForReady, callback);
   }, id, kind, name, waitForReady);
+  const [errorMessage, isCaptureCalled = false] = result ?? [];
   if (errorMessage) throw new Error(errorMessage);
+  return isCaptureCalled;
 }
 
 export async function updateStorybookGlobals(browser, globals) {
-  if (isStorybookVersionLessThan(6)) {
-    browserLogger.warn('Globals are not supported by Storybook versions less than 6');
-    return;
-  }
-
   browserLogger.debug('Applying storybook globals');
   await browser.executeScript(function (globals) {
     window.__CREEVEY_UPDATE_GLOBALS__(globals);
@@ -388,7 +378,44 @@ async function openStorybookPage(browser, storybookUrl, resolver) {
   }
 }
 
-export async function getBrowser(config, browserConfig) {
+async function resolveCreeveyHost(browser, port) {
+  if (creeveyServerHost != null) return creeveyServerHost;
+  const addresses = getAddresses();
+  creeveyServerHost = await browser.executeAsyncScript(function (hosts, port, callback) {
+    void Promise.all(hosts.map(function (host) {
+      // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+      return fetch('http://' + host + ':' + port + '/ping').then(function (response) {
+        return response.text();
+      }).then(function (pong) {
+        return pong == 'pong' ? host : null;
+      }).catch(function () {
+        return null;
+      });
+    })).then(function (hosts) {
+      callback(hosts.find(function (host) {
+        return host != null;
+      }));
+    });
+  }, addresses, port);
+  if (creeveyServerHost == null) throw new Error("Can't reach creevey server from a browser");
+  return creeveyServerHost;
+}
+
+export async function loadStoriesFromBrowser(port) {
+  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;
+    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) {
+  if (browser) return browser;
+  browserName = name;
+  const browserConfig = config.browsers[browserName];
   const {
     gridUrl = config.gridUrl,
     storybookUrl: address = config.storybookUrl,
@@ -398,14 +425,11 @@ export async function getBrowser(config, browserConfig) {
     ...userCapabilities
   } = browserConfig;
   void limit;
-  const {
-    browserName
-  } = userCapabilities;
-  const realAddress = address;
-  let browser = null; // TODO Define some capabilities explicitly and define typings
+  const realAddress = address; // TODO Define some capabilities explicitly and define typings
 
-  const capabilities = new Capabilities(userCapabilities);
-  capabilities.setPageLoadStrategy(PageLoadStrategy.NONE);
+  const capabilities = new Capabilities({ ...userCapabilities,
+    pageLoadStrategy: PageLoadStrategy.NONE
+  });
   subscribeOn('shutdown', () => {
     var _browser;
 
@@ -420,7 +444,7 @@ export async function getBrowser(config, browserConfig) {
     const url = new URL(gridUrl);
     url.username = url.username ? '********' : '';
     url.password = url.password ? '********' : '';
-    browserLogger.debug(`(${browserName}) Connecting to Selenium ${chalk.magenta(url.toString())}`);
+    browserLogger.debug(`(${name}) 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 = '';
@@ -434,12 +458,12 @@ export async function getBrowser(config, browserConfig) {
       /* noop */
     }
 
-    browserLogger.debug(`(${browserName}) Connected successful with ${[chalk.green(browserHost), chalk.magenta(sessionId)].filter(Boolean).join(':')}`);
+    browserLogger.debug(`(${name}) 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 `[${browserName}:${chalk.gray(sessionId)}] ${levelColor(level)} =>`;
+        return `[${name}:${chalk.gray(sessionId)}] ${levelColor(level)} =>`;
       }
 
     });
@@ -452,17 +476,18 @@ export async function getBrowser(config, browserConfig) {
       });
     }, () => viewport && browser && resizeViewport(browser, viewport), () => browser && openStorybookPage(browser, realAddress, config.resolveStorybookUrl), () => browser && waitForStorybook(browser)], () => !isShuttingDown.current);
   } catch (originalError) {
-    var _await$browser$getCur, _browser4;
+    var _browser4;
 
     if (isShuttingDown.current) {
       var _browser3;
 
       (_browser3 = browser) === null || _browser3 === void 0 ? void 0 : _browser3.quit().catch(noop);
+      browser = null;
       return null;
     }
 
     if (originalError instanceof Error && originalError.name == 'ResolveUrlError') throw originalError;
-    const error = new Error(`Can't load storybook root page by URL ${(_await$browser$getCur = await ((_browser4 = browser) === null || _browser4 === void 0 ? void 0 : _browser4.getCurrentUrl())) !== null && _await$browser$getCur !== void 0 ? _await$browser$getCur : realAddress}`);
+    const error = new Error(`Can't load storybook root page by URL ${(await ((_browser4 = browser) === null || _browser4 === void 0 ? void 0 : _browser4.getCurrentUrl())) ?? realAddress}`);
     if (originalError instanceof Error) error.stack = originalError.stack;
     throw error;
   }
@@ -471,6 +496,9 @@ export async function getBrowser(config, browserConfig) {
     await updateStorybookGlobals(browser, _storybookGlobals);
   }
 
+  await browser.executeScript(function (workerId) {
+    window.__CREEVEY_WORKER_ID__ = workerId;
+  }, process.pid);
   return browser;
 }
 
@@ -486,12 +514,22 @@ async function updateStoryArgs(browser, story, updatedArgs) {
   }, story.id, updatedArgs, Events.UPDATE_STORY_ARGS, Events.STORY_RENDERED);
 }
 
+export async function closeBrowser() {
+  if (!browser) return;
+
+  try {
+    await browser.quit();
+  } finally {
+    browser = null;
+  }
+}
 export async function switchStory() {
-  var _this$currentTest, _this$currentTest$ctx, _parameters$creevey;
+  var _this$currentTest, _this$currentTest$ctx;
 
   let testOrSuite = this.currentTest;
   if (!testOrSuite) throw new Error("Can't switch story, because test context doesn't have 'currentTest' field");
   this.testScope.length = 0;
+  this.screenshots.length = 0;
   this.testScope.push(this.browserName);
 
   while ((_testOrSuite = testOrSuite) !== null && _testOrSuite !== void 0 && _testOrSuite.title) {
@@ -513,15 +551,8 @@ export async function switchStory() {
     captureElement = '#root',
     waitForReady,
     ignoreElements
-  } = (_parameters$creevey = parameters.creevey) !== null && _parameters$creevey !== void 0 ? _parameters$creevey : {};
+  } = parameters.creevey ?? {};
   browserLogger.debug(`Switching to story ${chalk.cyan(kind)}/${chalk.cyan(name)} by id ${chalk.magenta(id)}`);
-  await resetMousePosition(this.browser);
-  await selectStory(this.browser, {
-    id,
-    kind,
-    name
-  }, waitForReady);
-  browserLogger.debug(`Story ${chalk.magenta(id)} ready for capturing`);
   if (captureElement) Object.defineProperty(this, 'captureElement', {
     enumerable: true,
     configurable: true,
@@ -533,6 +564,44 @@ export async function switchStory() {
   this.updateStoryArgs = updatedArgs => updateStoryArgs(this.browser, story, updatedArgs);
 
   this.testScope.reverse();
+  let storyPlayResolver;
+  let waitForComplete = new Promise(resolve => storyPlayResolver = resolve);
+  const unsubscribe = subscribeOn('stories', message => {
+    if (message.type != 'capture') return;
+    const {
+      payload = {},
+      payload: {
+        imageName
+      } = {}
+    } = message;
+    void takeScreenshot(this.browser, payload.captureElement ?? captureElement, payload.ignoreElements ?? ignoreElements).then(screenshot => {
+      this.screenshots.push({
+        imageName,
+        screenshot
+      });
+      void this.browser.executeAsyncScript(function (callback) {
+        window.__CREEVEY_HAS_PLAY_COMPLETED_YET__(callback);
+      }).then(isCompleted => storyPlayResolver(isCompleted));
+      emitStoriesMessage({
+        type: 'capture'
+      });
+    });
+  });
+  await resetMousePosition(this.browser);
+  const isCaptureCalled = await selectStory(this.browser, {
+    id,
+    kind,
+    name
+  }, waitForReady);
+
+  if (isCaptureCalled) {
+    while (!(await waitForComplete)) {
+      waitForComplete = new Promise(resolve => storyPlayResolver = resolve);
+    }
+  }
+
+  unsubscribe();
+  browserLogger.debug(`Story ${chalk.magenta(id)} ready for capturing`);
 }
 
 async function insertIgnoreStyles(browser, ignoreElements) {

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

@@ -5,7 +5,7 @@ import { downloadBinary, getCreeveyCache } from '../utils';
 import { pullImages, runImage } from '../docker';
 import { Octokit } from '@octokit/core';
 import { subscribeOn } from '../messages';
-import { isWorker } from 'cluster';
+import cluster from 'cluster';
 import { chmod, exec } from 'shelljs';
 const mkdirAsync = promisify(mkdir);
 const writeFileAsync = promisify(writeFile);
@@ -41,8 +41,6 @@ async function createSelenoidConfig(browsers, {
 }
 
 async function downloadSelenoidBinary(destination) {
-  var _assets$find;
-
   const platformNameMapping = {
     darwin: 'selenoid_darwin_amd64',
     linux: 'selenoid_linux_amd64',
@@ -59,9 +57,9 @@ async function downloadSelenoidBinary(destination) {
   const {
     browser_download_url: downloadUrl,
     size: binarySize
-  } = (_assets$find = assets.find(({
+  } = assets.find(({
     name
-  }) => platformNameMapping[process.platform] == name)) !== null && _assets$find !== void 0 ? _assets$find : {};
+  }) => platformNameMapping[process.platform] == name) ?? {};
   if (existsSync(destination) && lstatSync(destination).size == binarySize) return;
 
   if (!downloadUrl) {
@@ -73,7 +71,7 @@ async function downloadSelenoidBinary(destination) {
 
 export async function startSelenoidStandalone(config, debug) {
   config.gridUrl = 'http://localhost:4444/wd/hub';
-  if (isWorker) return;
+  if (cluster.isWorker) return;
   const browsers = Object.values(config.browsers).filter(browser => !browser.gridUrl);
   const selenoidConfigDir = await createSelenoidConfig(browsers, {
     useDocker: false

package/lib/esm/server/stories.js

@@ -4,15 +4,16 @@ import { createHash } from 'crypto';
 import { mapValues, pick } from 'lodash';
 import { isDefined, isFunction, isObject } from '../types';
 import { shouldSkip, removeProps } from './utils';
-import { isStorybookVersionGreaterThan, isStorybookVersionLessThan } from './storybook/helpers';
-import { denormalizeStoryParameters } from '../shared';
 
 function storyTestFabric(delay, testFn) {
   return async function storyTest() {
-    var _testFn$call;
-
     delay ? await new Promise(resolve => setTimeout(resolve, delay)) : void 0;
-    await ((_testFn$call = testFn === null || testFn === void 0 ? void 0 : testFn.call(this)) !== null && _testFn$call !== void 0 ? _testFn$call : this.expect(await this.takeScreenshot()).to.matchImage());
+    await (testFn ? testFn.call(this) : this.screenshots.length > 0 ? this.expect(this.screenshots.reduce((screenshots, {
+      imageName,
+      screenshot
+    }, index) => ({ ...screenshots,
+      [imageName ?? `screenshot_${index}`]: screenshot
+    }), {})).to.matchImages() : this.expect(await this.takeScreenshot()).to.matchImage());
   };
 }
 
@@ -38,42 +39,38 @@ function createCreeveyTest(browser, storyMeta, skipOptions, testName) {
   };
 }
 
-function convertStories(browsers, stories) {
+function convertStories(browserName, stories) {
   const tests = {};
   (Array.isArray(stories) ? stories : Object.values(stories)).forEach(storyMeta => {
     // TODO Skip docsOnly stories for now
     if (storyMeta.parameters.docsOnly) return;
-    browsers.forEach(browserName => {
-      var _storyMeta$parameters;
-
-      const {
-        delay: delayParam,
-        tests: storyTests,
-        skip
-      } = (_storyMeta$parameters = storyMeta.parameters.creevey) !== null && _storyMeta$parameters !== void 0 ? _storyMeta$parameters : {};
-      const delay = typeof delayParam == 'number' ? delayParam : delayParam !== null && delayParam !== void 0 && delayParam.for.includes(browserName) ? delayParam.ms : 0; // typeof tests === "undefined" => rootSuite -> kindSuite -> storyTest -> [browsers.png]
-      // typeof tests === "function"  => rootSuite -> kindSuite -> storyTest -> browser -> [images.png]
-      // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> [browsers.png]
-      // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> browser -> [images.png]
-
-      if (!storyTests) {
-        const test = createCreeveyTest(browserName, storyMeta, skip);
-        tests[test.id] = { ...test,
-          storyId: storyMeta.id,
-          story: storyMeta,
-          fn: storyTestFabric(delay)
-        };
-        return;
-      }
+    const {
+      delay: delayParam,
+      tests: storyTests,
+      skip
+    } = storyMeta.parameters.creevey ?? {};
+    const delay = typeof delayParam == 'number' ? delayParam : delayParam !== null && delayParam !== void 0 && delayParam.for.includes(browserName) ? delayParam.ms : 0; // typeof tests === "undefined" => rootSuite -> kindSuite -> storyTest -> [browsers.png]
+    // typeof tests === "function"  => rootSuite -> kindSuite -> storyTest -> browser -> [images.png]
+    // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> [browsers.png]
+    // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> browser -> [images.png]
+
+    if (!storyTests) {
+      const test = createCreeveyTest(browserName, storyMeta, skip);
+      tests[test.id] = { ...test,
+        storyId: storyMeta.id,
+        story: storyMeta,
+        fn: storyTestFabric(delay)
+      };
+      return;
+    }
 
-      Object.entries(storyTests).forEach(([testName, testFn]) => {
-        const test = createCreeveyTest(browserName, storyMeta, skip, testName);
-        tests[test.id] = { ...test,
-          storyId: storyMeta.id,
-          story: storyMeta,
-          fn: storyTestFabric(delay, testFn)
-        };
-      });
+    Object.entries(storyTests).forEach(([testName, testFn]) => {
+      const test = createCreeveyTest(browserName, storyMeta, skip, testName);
+      tests[test.id] = { ...test,
+        storyId: storyMeta.id,
+        story: storyMeta,
+        fn: storyTestFabric(delay, testFn)
+      };
     });
   });
   return tests;
@@ -81,22 +78,24 @@ function convertStories(browsers, stories) {
 
 export async function loadTestsFromStories(browsers, provider, update) {
   const testIdsByFiles = new Map();
-  const data = await provider(storiesByFiles => {
+  const stories = await provider(storiesByFiles => {
     const testsDiff = {};
-    Array.from(storiesByFiles.entries()).forEach(([filename, stories]) => {
-      var _testIdsByFiles$get$f, _testIdsByFiles$get;
-
-      const tests = convertStories(browsers, stories);
-      const changed = Object.keys(tests);
-      const removed = (_testIdsByFiles$get$f = (_testIdsByFiles$get = testIdsByFiles.get(filename)) === null || _testIdsByFiles$get === void 0 ? void 0 : _testIdsByFiles$get.filter(testId => !tests[testId])) !== null && _testIdsByFiles$get$f !== void 0 ? _testIdsByFiles$get$f : [];
-      if (changed.length == 0) testIdsByFiles.delete(filename);else testIdsByFiles.set(filename, changed);
-      Object.assign(testsDiff, tests);
-      removed.forEach(testId => testsDiff[testId] = undefined);
+    const tests = {};
+    browsers.forEach(browser => {
+      Array.from(storiesByFiles.entries()).forEach(([filename, stories]) => {
+        var _testIdsByFiles$get;
+
+        Object.assign(tests, convertStories(browser, stories));
+        const changed = Object.keys(tests);
+        const removed = ((_testIdsByFiles$get = testIdsByFiles.get(filename)) === null || _testIdsByFiles$get === void 0 ? void 0 : _testIdsByFiles$get.filter(testId => !tests[testId])) ?? [];
+        if (changed.length == 0) testIdsByFiles.delete(filename);else testIdsByFiles.set(filename, changed);
+        Object.assign(testsDiff, tests);
+        removed.forEach(testId => testsDiff[testId] = undefined);
+      });
     });
     update === null || update === void 0 ? void 0 : update(testsDiff);
   });
-  const stories = isStorybookVersionLessThan(6) || isStorybookVersionGreaterThan(6, 3) ? data.stories : denormalizeStoryParameters(data);
-  const tests = convertStories(browsers, stories);
+  const tests = browsers.reduce((tests, browser) => Object.assign(tests, convertStories(browser, stories)), {});
   Object.values(tests).filter(isDefined).forEach(({
     id,
     story: {
@@ -104,35 +103,24 @@ export async function loadTestsFromStories(browsers, provider, update) {
         fileName
       }
     }
-  }) => {
-    var _testIdsByFiles$get2;
-
-    return (// TODO Don't use filename as a key, due possible collisions if two require.context with same structure of modules are defined
-      testIdsByFiles.set(fileName, [...((_testIdsByFiles$get2 = testIdsByFiles.get(fileName)) !== null && _testIdsByFiles$get2 !== void 0 ? _testIdsByFiles$get2 : []), id])
-    );
-  });
+  }) => // TODO Don't use filename as a key, due possible collisions if two require.context with same structure of modules are defined
+  testIdsByFiles.set(fileName, [...(testIdsByFiles.get(fileName) ?? []), id]));
   return tests;
 }
 export function saveStoriesJson(storiesData, extract) {
-  var _storiesData$stories;
-
-  const outputDir = typeof extract == 'boolean' ? 'storybook-static' : extract;
-
-  if (!isStorybookVersionLessThan(6)) {
-    // NOTE Copy-pasted from Storybook's `getStoriesJsonData` method
-    const allowed = ['fileName', 'docsOnly', 'framework', '__id', '__isArgsStory'];
-    storiesData.globalParameters = pick(storiesData.globalParameters, allowed); // @ts-expect-error ignore error
+  const outputDir = typeof extract == 'boolean' ? 'storybook-static' : extract; // NOTE Copy-pasted from Storybook's `getStoriesJsonData` method
 
-    storiesData.kindParameters = mapValues(storiesData.kindParameters, v => pick(v, allowed)); // @ts-expect-error ignore error
+  const allowed = ['fileName', 'docsOnly', 'framework', '__id', '__isArgsStory'];
+  storiesData.globalParameters = pick(storiesData.globalParameters, allowed); // @ts-expect-error ignore error
 
-    storiesData.stories = mapValues(storiesData.stories, v => ({ ...pick(v, ['id', 'name', 'kind', 'story']),
-      parameters: pick(v.parameters, allowed)
-    }));
-  } // TODO Fix args stories
+  storiesData.kindParameters = mapValues(storiesData.kindParameters, v => pick(v, allowed)); // @ts-expect-error ignore error
 
+  storiesData.stories = mapValues(storiesData.stories, v => ({ ...pick(v, ['id', 'name', 'kind', 'story']),
+    parameters: pick(v.parameters, allowed)
+  })); // TODO Fix args stories
 
-  removeProps(storiesData !== null && storiesData !== void 0 ? storiesData : {}, ['stories', () => true, 'parameters', '__isArgsStory']);
-  Object.values((_storiesData$stories = storiesData === null || storiesData === void 0 ? void 0 : storiesData.stories) !== null && _storiesData$stories !== void 0 ? _storiesData$stories : {}).forEach(story => isObject(story) && 'parameters' in story && isObject(story.parameters) && delete story.parameters.__isArgsStory);
+  removeProps(storiesData ?? {}, ['stories', () => true, 'parameters', '__isArgsStory']);
+  Object.values((storiesData === null || storiesData === void 0 ? void 0 : storiesData.stories) ?? {}).forEach(story => isObject(story) && 'parameters' in story && isObject(story.parameters) && delete story.parameters.__isArgsStory);
   mkdirSync(outputDir, {
     recursive: true
   });

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

@@ -1,16 +1,12 @@
-var _api$channel, _api$context;
-
 import { addons } from '@storybook/addons';
-import { getStorybookFramework, isStorybookVersionLessThan, resolveFromStorybook } from './helpers';
+import { getStorybookFramework, resolveFromStorybook } from './helpers';
 const framework = getStorybookFramework(); // eslint-disable-next-line @typescript-eslint/no-var-requires
 
-const core = require(resolveFromStorybook('@storybook/core')); //@ts-expect-error: 6.2 use named exports
-// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-
+const core = require(resolveFromStorybook('@storybook/core-client'));
 
-const start = isStorybookVersionLessThan(6, 2) ? core.default.start : core.start;
+const start = core.start;
 const api = start(() => void 0);
-export const channel = isStorybookVersionLessThan(6, 4) ? (_api$channel = api.channel) !== null && _api$channel !== void 0 ? _api$channel : (_api$context = api.context) === null || _api$context === void 0 ? void 0 : _api$context.channel : addons.getChannel();
+export const channel = addons.getChannel();
 export const clientApi = api.clientApi;
 export const forceReRender = api.forceReRender;
 export const storiesOf = (kind, m) => {
@@ -19,21 +15,8 @@ export const storiesOf = (kind, m) => {
   });
 };
 export const configure = (...args) => {
-  if (isStorybookVersionLessThan(5, 2)) {
-    //NOTE: Storybook <= 5.1 pass args as is
-    //@ts-expect-error: ignore it
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-    return api.configApi.configure(...args);
-  }
-
-  if (isStorybookVersionLessThan(6)) {
-    //NOTE: Storybook <= 5.3 pass `framework` as last argument
-    //@ts-expect-error: ignore it
-    return api.configure(...args, framework);
-  } //NOTE Storybook 6.x pass `framework` as first argument
+  //NOTE Storybook 6.x pass `framework` as first argument
   //@ts-expect-error: ignore it
-
-
   return api.configure(framework, ...args);
 };
 export const addDecorator = clientApi.addDecorator;