creevey 0.9.0-beta.2 → 0.9.0-beta.4

package/lib/esm/server/master/server.js

@@ -51,7 +51,7 @@ export default function server(reportDir, port, ui) {
         type: 'update',
         payload: deserializedStories
       });
-      Object.values(cluster.workers).filter(isDefined).filter(worker => worker.isConnected()).forEach(worker => sendStoriesMessage(worker, {
+      Object.values(cluster.workers ?? {}).filter(isDefined).filter(worker => worker.isConnected()).forEach(worker => sendStoriesMessage(worker, {
         type: 'update',
         payload: deserializedStories
       }));
@@ -66,7 +66,7 @@ export default function server(reportDir, port, ui) {
         workerId,
         options
       } = ctx.request.body;
-      const worker = Object.values(cluster.workers).filter(isDefined).find(worker => worker.process.pid == workerId); // NOTE: Hypothetical case when someone send to us capture req and we don't have a worker with browser session for it
+      const worker = Object.values(cluster.workers ?? {}).filter(isDefined).find(worker => worker.process.pid == workerId); // NOTE: Hypothetical case when someone send to us capture req and we don't have a worker with browser session for it
 
       if (!worker) return;
       await new Promise(resolve => {
@@ -98,7 +98,9 @@ export default function server(reportDir, port, ui) {
   void creeveyApi.then(api => {
     api.subscribe(wss);
     wss.on('connection', ws => {
-      ws.on('message', message => api.handleMessage(ws, message));
+      ws.on('message', (message, isBinary) => {
+        api.handleMessage(ws, isBinary ? message : message.toString());
+      });
     });
   });
   return resolveApi;

package/lib/esm/server/messages.js

@@ -1,10 +1,10 @@
 import cluster from 'cluster';
 
 function emitMessage(message) {
-  var _process$send, _process$send2, _process;
+  var _process$send, _process;
 
   if (cluster.isWorker && !process.connected) return false;
-  return (_process$send = (_process$send2 = (_process = process).send) === null || _process$send2 === void 0 ? void 0 : _process$send2.call(_process, message)) !== null && _process$send !== void 0 ? _process$send : // @ts-expect-error: wrong typings `process.emit` return boolean
+  return ((_process$send = (_process = process).send) === null || _process$send === void 0 ? void 0 : _process$send.call(_process, message)) ?? // @ts-expect-error: wrong typings `process.emit` return boolean
   process.emit('message', message);
 }
 
@@ -158,9 +158,7 @@ export function subscribeOn(scope, handler) {
 }
 const workers = new Map();
 export function subscribeOnWorker(worker, scope, handler) {
-  var _workers$get;
-
-  const workerHandlers = (_workers$get = workers.get(worker)) !== null && _workers$get !== void 0 ? _workers$get : createHandlers();
+  const workerHandlers = workers.get(worker) ?? createHandlers();
 
   if (!workers.has(worker)) {
     workers.set(worker, workerHandlers);

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

@@ -10,7 +10,7 @@ import { PageLoadStrategy } from 'selenium-webdriver/lib/capabilities';
 import { isDefined, noop } from '../../types';
 import { colors, logger } from '../logger';
 import { emitStoriesMessage, subscribeOn } from '../messages';
-import { importStorybookCoreEvents, isStorybookVersionLessThan } from '../storybook/helpers';
+import { importStorybookCoreEvents } from '../storybook/helpers';
 import { isShuttingDown, LOCALHOST_REGEXP, runSequence } from '../utils';
 const DOCKER_INTERNAL = 'host.docker.internal';
 let browserLogger = logger;
@@ -23,9 +23,7 @@ function getSessionData(grid, sessionId = '') {
   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 = '';
@@ -35,9 +33,7 @@ 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}`));
       }
     });
   }));
@@ -103,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;
@@ -136,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 {
@@ -224,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');
 }
@@ -278,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];
@@ -327,7 +313,7 @@ export 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)}`);
@@ -353,19 +339,14 @@ async function selectStory(browser, {
       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 || [];
+  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);
@@ -402,11 +383,8 @@ async function resolveCreeveyHost(browser, port) {
   const addresses = getAddresses();
   creeveyServerHost = await browser.executeAsyncScript(function (hosts, port, callback) {
     void Promise.all(hosts.map(function (host) {
-      return new Promise(function (resolve, reject) {
-        setTimeout(reject, 10000); // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
-
-        fetch('//' + host + ':' + port + '/ping').then(resolve).catch(reject);
-      }).then(function (response) {
+      // 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;
@@ -498,7 +476,7 @@ export async function getBrowser(config, name) {
       });
     }, () => 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;
@@ -509,7 +487,7 @@ export async function getBrowser(config, name) {
     }
 
     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;
   }
@@ -546,7 +524,7 @@ export async function closeBrowser() {
   }
 }
 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");
@@ -573,7 +551,7 @@ 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)}`);
   if (captureElement) Object.defineProperty(this, 'captureElement', {
     enumerable: true,
@@ -589,8 +567,6 @@ export async function switchStory() {
   let storyPlayResolver;
   let waitForComplete = new Promise(resolve => storyPlayResolver = resolve);
   const unsubscribe = subscribeOn('stories', message => {
-    var _payload$captureEleme, _payload$ignoreElemen;
-
     if (message.type != 'capture') return;
     const {
       payload = {},
@@ -598,7 +574,7 @@ export async function switchStory() {
         imageName
       } = {}
     } = message;
-    void takeScreenshot(this.browser, (_payload$captureEleme = payload.captureElement) !== null && _payload$captureEleme !== void 0 ? _payload$captureEleme : captureElement, (_payload$ignoreElemen = payload.ignoreElements) !== null && _payload$ignoreElemen !== void 0 ? _payload$ignoreElemen : ignoreElements).then(screenshot => {
+    void takeScreenshot(this.browser, payload.captureElement ?? captureElement, payload.ignoreElements ?? ignoreElements).then(screenshot => {
       this.screenshots.push({
         imageName,
         screenshot

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,18 +4,15 @@ import { createHash } from 'crypto';
 import { mapValues, pick } from 'lodash';
 import { isDefined, isFunction, isObject } from '../types';
 import { shouldSkip, removeProps } from './utils';
-import { isStorybookVersionLessThan } from './storybook/helpers';
 
 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.screenshots.length > 0 ? this.expect(this.screenshots.reduce((screenshots, {
+    await (testFn ? testFn.call(this) : this.screenshots.length > 0 ? this.expect(this.screenshots.reduce((screenshots, {
       imageName,
       screenshot
     }, index) => ({ ...screenshots,
-      [imageName !== null && imageName !== void 0 ? imageName : `screenshot_${index}`]: screenshot
+      [imageName ?? `screenshot_${index}`]: screenshot
     }), {})).to.matchImages() : this.expect(await this.takeScreenshot()).to.matchImage());
   };
 }
@@ -45,15 +42,13 @@ function createCreeveyTest(browser, storyMeta, skipOptions, testName) {
 function convertStories(browserName, stories) {
   const tests = {};
   (Array.isArray(stories) ? stories : Object.values(stories)).forEach(storyMeta => {
-    var _storyMeta$parameters;
-
     // TODO Skip docsOnly stories for now
     if (storyMeta.parameters.docsOnly) return;
     const {
       delay: delayParam,
       tests: storyTests,
       skip
-    } = (_storyMeta$parameters = storyMeta.parameters.creevey) !== null && _storyMeta$parameters !== void 0 ? _storyMeta$parameters : {};
+    } = 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]
@@ -88,11 +83,11 @@ export async function loadTestsFromStories(browsers, provider, update) {
     const tests = {};
     browsers.forEach(browser => {
       Array.from(storiesByFiles.entries()).forEach(([filename, stories]) => {
-        var _testIdsByFiles$get$f, _testIdsByFiles$get;
+        var _testIdsByFiles$get;
 
         Object.assign(tests, convertStories(browser, 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 : [];
+        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);
@@ -108,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;

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

@@ -7,7 +7,7 @@ export const storybookDirRef = {
 export const resolveFromStorybook = modulePath => resolveFrom(storybookDirRef.current, modulePath);
 export const resolveFromStorybookAddonDocs = modulePath => resolveFrom(resolveFromStorybook('@storybook/addon-docs'), modulePath);
 export const resolveFromStorybookBuilderWebpack4 = modulePath => resolveFrom(resolveFromStorybook('@storybook/builder-webpack4'), modulePath);
-export const resolveFromStorybookCore = modulePath => resolveFrom(resolveFromStorybook('@storybook/core'), modulePath);
+export const resolveFromStorybookCoreClient = modulePath => resolveFrom(resolveFromStorybook('@storybook/core-client'), modulePath);
 export const resolveFromStorybookCoreServer = modulePath => resolveFrom(resolveFromStorybook('@storybook/core-server'), modulePath);
 
 const importFromStorybook = modulePath => import(resolveFromStorybook(modulePath));
@@ -40,27 +40,19 @@ export function getStorybookVersion() {
   return version;
 }
 export function isStorybookVersionLessThan(major, minor) {
-  var _process$env$__CREEVE;
-
-  const [sbMajor, sbMinor] = ((_process$env$__CREEVE = process.env.__CREEVEY_STORYBOOK_VERSION__) !== null && _process$env$__CREEVE !== void 0 ? _process$env$__CREEVE : getStorybookVersion()).split('.');
+  const [sbMajor, sbMinor] = (process.env.__CREEVEY_STORYBOOK_VERSION__ ?? getStorybookVersion()).split('.');
   return Number(sbMajor) < major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) < minor;
 }
 export function isStorybookVersionGreaterThan(major, minor) {
-  var _process$env$__CREEVE2;
-
-  const [sbMajor, sbMinor] = ((_process$env$__CREEVE2 = process.env.__CREEVEY_STORYBOOK_VERSION__) !== null && _process$env$__CREEVE2 !== void 0 ? _process$env$__CREEVE2 : getStorybookVersion()).split('.');
+  const [sbMajor, sbMinor] = (process.env.__CREEVEY_STORYBOOK_VERSION__ ?? getStorybookVersion()).split('.');
   return Number(sbMajor) > major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) > minor;
 }
 export function isStorybookVersion(major, minor) {
-  var _process$env$__CREEVE3;
-
-  const [sbMajor, sbMinor] = ((_process$env$__CREEVE3 = process.env.__CREEVEY_STORYBOOK_VERSION__) !== null && _process$env$__CREEVE3 !== void 0 ? _process$env$__CREEVE3 : getStorybookVersion()).split('.');
+  const [sbMajor, sbMinor] = (process.env.__CREEVEY_STORYBOOK_VERSION__ ?? getStorybookVersion()).split('.');
   return Number(sbMajor) == major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) == minor;
 }
 export function getStorybookFramework() {
-  var _process$env$__CREEVE4;
-
-  const framework = (_process$env$__CREEVE4 = process.env.__CREEVEY_STORYBOOK_FRAMEWORK__) !== null && _process$env$__CREEVE4 !== void 0 ? _process$env$__CREEVE4 : supportedFrameworks.find(framework => {
+  const framework = process.env.__CREEVEY_STORYBOOK_FRAMEWORK__ ?? supportedFrameworks.find(framework => {
     try {
       return require.resolve(resolveFromStorybook(`@storybook/${framework}`));
     } catch (_) {
@@ -81,8 +73,8 @@ export async function importStorybookConfig() {
   try {
     return storybookConfigRef.current = (await import(require.resolve(configPath))).default;
   } catch (_) {
-    const storybookUtilsPath = isStorybookVersionLessThan(6, 2) ? '@storybook/core/dist/server/utils' : '@storybook/core-common/dist/cjs/utils';
-    const serverRequireModule = isStorybookVersionLessThan(6, 2) ? 'server-require' : 'interpret-require'; // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const storybookUtilsPath = '@storybook/core-common/dist/cjs/utils';
+    const serverRequireModule = 'interpret-require'; // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 
     const {
       getInterpretedFile
@@ -91,16 +83,15 @@ export async function importStorybookConfig() {
     const {
       default: serverRequireFallback,
       serverRequire = serverRequireFallback
-    } = await import(resolveFromStorybook(`${storybookUtilsPath}/${serverRequireModule}`)); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    } = await import(resolveFromStorybook(`${storybookUtilsPath}/${serverRequireModule}`)); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
 
-    const mainConfigFile = isStorybookVersionLessThan(6, 1) ? configPath : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    getInterpretedFile(configPath); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+    const mainConfigFile = getInterpretedFile(configPath); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
 
     return storybookConfigRef.current = serverRequire(mainConfigFile);
   }
 }
 export async function isCSFv3Enabled() {
-  var _await$importStoryboo, _await$importStoryboo2, _await$importStoryboo3;
+  var _await$importStoryboo, _await$importStoryboo2;
 
-  return (_await$importStoryboo = (_await$importStoryboo2 = await importStorybookConfig()) === null || _await$importStoryboo2 === void 0 ? void 0 : (_await$importStoryboo3 = _await$importStoryboo2.features) === null || _await$importStoryboo3 === void 0 ? void 0 : _await$importStoryboo3.previewCsfV3) !== null && _await$importStoryboo !== void 0 ? _await$importStoryboo : false;
+  return ((_await$importStoryboo = await importStorybookConfig()) === null || _await$importStoryboo === void 0 ? void 0 : (_await$importStoryboo2 = _await$importStoryboo.features) === null || _await$importStoryboo2 === void 0 ? void 0 : _await$importStoryboo2.previewCsfV3) ?? false;
 }

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

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

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

@@ -1,13 +1,12 @@
 /* eslint-disable @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/ban-ts-comment */
 import path from 'path';
-import { isWorker, isMaster } from 'cluster';
+import cluster from 'cluster';
 import chokidar from 'chokidar';
 import { noop } from '../../../types';
 import { getCreeveyCache } from '../../utils';
 import { subscribeOn } from '../../messages';
-import { importStorybookClientLogger, importStorybookConfig, importStorybookCoreCommon, importStorybookCoreEvents, isStorybookVersionGreaterThan, isStorybookVersionLessThan } from '../helpers';
+import { importStorybookClientLogger, importStorybookConfig, importStorybookCoreCommon, importStorybookCoreEvents } from '../helpers';
 import { logger } from '../../logger';
-import { denormalizeStoryParameters } from '../../../shared';
 
 async function initStorybookEnvironment() {
   // @ts-expect-error There is no @types/global-jsdom package
@@ -25,7 +24,7 @@ async function initStorybookEnvironment() {
     logger
   } = await importStorybookClientLogger(); // NOTE: Disable duplication warnings for >=6.2 storybook
 
-  if (isWorker) logger.warn = noop; // NOTE: disable logger for 5.x storybook
+  if (cluster.isWorker) logger.warn = noop; // NOTE: disable logger for 5.x storybook
 
   logger.debug = noop;
   return import('../entry');
@@ -39,7 +38,7 @@ function watchStories(channel, watcher, initialFiles) {
   watcher.on('change', filePath => storiesByFiles.set(path.isAbsolute(filePath) ? filePath : `./${filePath.replace(/\\/g, '/')}`, []));
   watcher.on('unlink', filePath => storiesByFiles.set(path.isAbsolute(filePath) ? filePath : `./${filePath.replace(/\\/g, '/')}`, []));
   return data => {
-    const stories = isStorybookVersionLessThan(6) || isStorybookVersionGreaterThan(6, 3) ? data.stories : denormalizeStoryParameters(data);
+    const stories = data.stories;
     const files = new Set(Object.values(stories).map(story => story.parameters.fileName));
     const addedFiles = Array.from(files).filter(filePath => !watchingFiles.has(filePath));
     const removedFiles = Array.from(watchingFiles).filter(filePath => !files.has(filePath));
@@ -105,7 +104,7 @@ async function loadStoriesDirectly(config, {
     stories
   } = await importStorybookConfig();
   const contexts = stories.map(entry => {
-    const normalizedEntry = isStorybookVersionLessThan(6, 4) ? entry : normalizeStoriesEntry(entry, {
+    const normalizedEntry = normalizeStoriesEntry(entry, {
       configDir: config.storybookDir,
       workingDir: process.cwd()
     });
@@ -154,7 +153,7 @@ async function loadStoriesDirectly(config, {
     try {
       configure(contexts.map(ctx => ctx()), module, false);
     } catch (error) {
-      if (isMaster) logger.error(error);
+      if (cluster.isPrimary) logger.error(error);
     }
   }
 
@@ -187,7 +186,7 @@ export async function loadStories(config, {
   });
   const loadPromise = new Promise(resolve => {
     channel.once(Events.SET_STORIES, data => {
-      const stories = isStorybookVersionLessThan(6) || isStorybookVersionGreaterThan(6, 3) ? data.stories : denormalizeStoryParameters(data);
+      const stories = data.stories;
       const files = new Set(Object.values(stories).map(story => story.parameters.fileName));
       if (watcher) channel.on(Events.SET_STORIES, watchStories(channel, watcher, files));
       resolve(stories);

package/lib/esm/server/update.js

@@ -15,11 +15,7 @@ function tryToLoadTestsData(filename) {
 const actualRegex = /^(.*)-actual-(\d+)\.png$/i;
 
 function approve(dirents, srcPath, dstPath, testPaths, isMatch) {
-  dirents.filter(dirent => dirent.isFile()).map(dirent => actualRegex.exec(dirent.name)).filter(isDefined).filter(([fileName, imageName]) => !testPaths || testPaths.find(([token]) => token == imageName) && isMatch(path.join(srcPath, fileName))).reduce((images, [, imageName, retry]) => {
-    var _images$get;
-
-    return Number(retry) > ((_images$get = images.get(imageName)) !== null && _images$get !== void 0 ? _images$get : -1) ? images.set(imageName, Number(retry)) : images;
-  }, new Map()).forEach((retry, imageName) => {
+  dirents.filter(dirent => dirent.isFile()).map(dirent => actualRegex.exec(dirent.name)).filter(isDefined).filter(([fileName, imageName]) => !testPaths || testPaths.find(([token]) => token == imageName) && isMatch(path.join(srcPath, fileName))).reduce((images, [, imageName, retry]) => Number(retry) > (images.get(imageName) ?? -1) ? images.set(imageName, Number(retry)) : images, new Map()).forEach((retry, imageName) => {
     mkdirSync(dstPath, {
       recursive: true
     });