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

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

@@ -3,12 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.takeScreenshot = takeScreenshot;
-exports.updateStorybookGlobals = updateStorybookGlobals;
-exports.loadStoriesFromBrowser = loadStoriesFromBrowser;
-exports.getBrowser = getBrowser;
 exports.closeBrowser = closeBrowser;
+exports.getBrowser = getBrowser;
+exports.loadStoriesFromBrowser = loadStoriesFromBrowser;
 exports.switchStory = switchStory;
+exports.takeScreenshot = takeScreenshot;
+exports.updateStorybookGlobals = updateStorybookGlobals;
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
@@ -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 = '';
@@ -51,9 +52,7 @@ function getSessionData(grid, sessionId = '') {
   gridUrl.pathname = `/host/${sessionId}`;
   return new Promise((resolve, reject) => (gridUrl.protocol == 'https:' ? _https.default : _http.default).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 = '';
@@ -63,9 +62,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}`));
       }
     });
   }));
@@ -120,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;
     }
@@ -131,17 +128,6 @@ function getUrlChecker(browser) {
 }
 
 async function waitForStorybook(browser) {
-  // NOTE: Storybook 5.x doesn't have the `last` method
-  if ((0, _helpers.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;
@@ -151,12 +137,21 @@ async function waitForStorybook(browser) {
     isTimeout = true;
   }, 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);
+  while (wait !== false) {
+    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.executeScript(function (SET_GLOBALS) {
+        if (typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined') return true;
+        if (window.__STORYBOOK_ADDONS_CHANNEL__.last(SET_GLOBALS) == undefined) return true;
+        return false;
+      }, Events.SET_GLOBALS);
+    }
+
     if (!wait) clearTimeout(initiateTimeout);
   }
 
@@ -164,11 +159,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 {
@@ -252,10 +247,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');
 }
@@ -306,7 +301,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];
@@ -355,7 +351,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.default.cyan(captureElement)}`);else browserLogger.debug(`Capturing composite screenshot image of ${_chalk.default.cyan(captureElement)}`);
@@ -381,19 +377,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;
 }
 
 async function updateStorybookGlobals(browser, globals) {
-  if ((0, _helpers.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);
@@ -430,13 +421,12 @@ 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('http://' + host + ':' + port + '/ping').then(resolve).catch(reject);
-      }).then(function (response) {
+      return Promise.race([// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+      fetch('http://' + host + ':' + port + '/ping').then(function (response) {
         return response.text();
-      }).then(function (pong) {
+      }), new Promise((_resolve, reject) => {
+        setTimeout(reject, 5000);
+      })]).then(function (pong) {
         return pong == 'pong' ? host : null;
       }).catch(function () {
         return null;
@@ -451,21 +441,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,
@@ -495,7 +482,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 = '';
@@ -509,14 +496,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)} =>`;
       }
 
     });
@@ -530,7 +517,7 @@ async function getBrowser(config, name) {
       });
     }, () => viewport && browser && resizeViewport(browser, viewport), () => browser && openStorybookPage(browser, realAddress, config.resolveStorybookUrl), () => browser && waitForStorybook(browser)], () => !_utils.isShuttingDown.current);
   } catch (originalError) {
-    var _await$browser$getCur, _browser4;
+    var _browser4;
 
     if (_utils.isShuttingDown.current) {
       var _browser3;
@@ -541,7 +528,7 @@ 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;
   }
@@ -550,9 +537,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;
 }
 
@@ -579,7 +569,7 @@ async function closeBrowser() {
 }
 
 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");
@@ -603,10 +593,10 @@ async function switchStory() {
     parameters
   } = story;
   const {
-    captureElement = '#root',
+    captureElement = `#${storybookRootID}`,
     waitForReady,
     ignoreElements
-  } = (_parameters$creevey = parameters.creevey) !== null && _parameters$creevey !== void 0 ? _parameters$creevey : {};
+  } = parameters.creevey ?? {};
   browserLogger.debug(`Switching to story ${_chalk.default.cyan(kind)}/${_chalk.default.cyan(name)} by id ${_chalk.default.magenta(id)}`);
   if (captureElement) Object.defineProperty(this, 'captureElement', {
     enumerable: true,
@@ -622,8 +612,6 @@ async function switchStory() {
   let storyPlayResolver;
   let waitForComplete = new Promise(resolve => storyPlayResolver = resolve);
   const unsubscribe = (0, _messages.subscribeOn)('stories', message => {
-    var _payload$captureEleme, _payload$ignoreElemen;
-
     if (message.type != 'capture') return;
     const {
       payload = {},
@@ -631,7 +619,7 @@ 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/cjs/server/selenium/selenoid.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.startSelenoidStandalone = startSelenoidStandalone;
 exports.startSelenoidContainer = startSelenoidContainer;
+exports.startSelenoidStandalone = startSelenoidStandalone;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -20,7 +20,7 @@ var _core = require("@octokit/core");
 
 var _messages = require("../messages");
 
-var _cluster = require("cluster");
+var _cluster = _interopRequireDefault(require("cluster"));
 
 var _shelljs = require("shelljs");
 
@@ -62,8 +62,6 @@ async function createSelenoidConfig(browsers, {
 }
 
 async function downloadSelenoidBinary(destination) {
-  var _assets$find;
-
   const platformNameMapping = {
     darwin: 'selenoid_darwin_amd64',
     linux: 'selenoid_linux_amd64',
@@ -80,9 +78,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 ((0, _fs.existsSync)(destination) && (0, _fs.lstatSync)(destination).size == binarySize) return;
 
   if (!downloadUrl) {
@@ -94,7 +92,7 @@ async function downloadSelenoidBinary(destination) {
 
 async function startSelenoidStandalone(config, debug) {
   config.gridUrl = 'http://localhost:4444/wd/hub';
-  if (_cluster.isWorker) return;
+  if (_cluster.default.isWorker) return;
   const browsers = Object.values(config.browsers).filter(browser => !browser.gridUrl);
   const selenoidConfigDir = await createSelenoidConfig(browsers, {
     useDocker: false

package/lib/cjs/server/stories.js

@@ -19,20 +19,16 @@ var _types = require("../types");
 
 var _utils = require("./utils");
 
-var _helpers = require("./storybook/helpers");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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());
   };
 }
@@ -62,15 +58,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]
@@ -105,11 +99,11 @@ 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);
@@ -125,36 +119,25 @@ 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;
 }
 
 function saveStoriesJson(storiesData, extract) {
-  var _storiesData$stories;
-
-  const outputDir = typeof extract == 'boolean' ? 'storybook-static' : extract;
-
-  if (!(0, _helpers.isStorybookVersionLessThan)(6)) {
-    // NOTE Copy-pasted from Storybook's `getStoriesJsonData` method
-    const allowed = ['fileName', 'docsOnly', 'framework', '__id', '__isArgsStory'];
-    storiesData.globalParameters = (0, _lodash.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 = (0, _lodash.mapValues)(storiesData.kindParameters, v => (0, _lodash.pick)(v, allowed)); // @ts-expect-error ignore error
+  const allowed = ['fileName', 'docsOnly', 'framework', '__id', '__isArgsStory'];
+  storiesData.globalParameters = (0, _lodash.pick)(storiesData.globalParameters, allowed); // @ts-expect-error ignore error
 
-    storiesData.stories = (0, _lodash.mapValues)(storiesData.stories, v => ({ ...(0, _lodash.pick)(v, ['id', 'name', 'kind', 'story']),
-      parameters: (0, _lodash.pick)(v.parameters, allowed)
-    }));
-  } // TODO Fix args stories
+  storiesData.kindParameters = (0, _lodash.mapValues)(storiesData.kindParameters, v => (0, _lodash.pick)(v, allowed)); // @ts-expect-error ignore error
 
+  storiesData.stories = (0, _lodash.mapValues)(storiesData.stories, v => ({ ...(0, _lodash.pick)(v, ['id', 'name', 'kind', 'story']),
+    parameters: (0, _lodash.pick)(v.parameters, allowed)
+  })); // TODO Fix args stories
 
-  (0, _utils.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 => (0, _types.isObject)(story) && 'parameters' in story && (0, _types.isObject)(story.parameters) && delete story.parameters.__isArgsStory);
+  (0, _utils.removeProps)(storiesData ?? {}, ['stories', () => true, 'parameters', '__isArgsStory']);
+  Object.values((storiesData === null || storiesData === void 0 ? void 0 : storiesData.stories) ?? {}).forEach(story => (0, _types.isObject)(story) && 'parameters' in story && (0, _types.isObject)(story.parameters) && delete story.parameters.__isArgsStory);
   (0, _fs.mkdirSync)(outputDir, {
     recursive: true
   });

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

@@ -3,23 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.raw = exports.getStorybook = exports.setAddon = exports.clearDecorators = exports.addParameters = exports.addDecorator = exports.configure = exports.storiesOf = exports.forceReRender = exports.clientApi = exports.channel = void 0;
+exports.storiesOf = exports.setAddon = exports.raw = exports.getStorybook = exports.forceReRender = exports.configure = exports.clientApi = exports.clearDecorators = exports.channel = exports.addParameters = exports.addDecorator = void 0;
 
 var _addons = require("@storybook/addons");
 
 var _helpers = require("./helpers");
 
-var _api$channel, _api$context;
-
 const framework = (0, _helpers.getStorybookFramework)(); // eslint-disable-next-line @typescript-eslint/no-var-requires
 
-const core = require((0, _helpers.resolveFromStorybook)('@storybook/core')); //@ts-expect-error: 6.2 use named exports
-// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-
+const core = require((0, _helpers.resolveFromStorybook)('@storybook/core-client'));
 
-const start = (0, _helpers.isStorybookVersionLessThan)(6, 2) ? core.default.start : core.start;
+const start = core.start;
 const api = start(() => void 0);
-const channel = (0, _helpers.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.addons.getChannel();
+
+const channel = _addons.addons.getChannel();
+
 exports.channel = channel;
 const clientApi = api.clientApi;
 exports.clientApi = clientApi;
@@ -35,21 +33,8 @@ const storiesOf = (kind, m) => {
 exports.storiesOf = storiesOf;
 
 const configure = (...args) => {
-  if ((0, _helpers.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 ((0, _helpers.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);
 };
 

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

@@ -3,16 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getStorybookFramework = getStorybookFramework;
+exports.getStorybookVersion = getStorybookVersion;
 exports.hasDocsAddon = hasDocsAddon;
 exports.hasSvelteCSFAddon = hasSvelteCSFAddon;
-exports.getStorybookVersion = getStorybookVersion;
-exports.isStorybookVersionLessThan = isStorybookVersionLessThan;
-exports.isStorybookVersionGreaterThan = isStorybookVersionGreaterThan;
-exports.isStorybookVersion = isStorybookVersion;
-exports.getStorybookFramework = getStorybookFramework;
+exports.importStorybookClientLogger = void 0;
 exports.importStorybookConfig = importStorybookConfig;
+exports.importStorybookCoreEvents = exports.importStorybookCoreCommon = void 0;
 exports.isCSFv3Enabled = isCSFv3Enabled;
-exports.storybookConfigRef = exports.importStorybookCoreEvents = exports.importStorybookCoreCommon = exports.importStorybookClientLogger = exports.resolveFromStorybookCoreServer = exports.resolveFromStorybookCore = exports.resolveFromStorybookBuilderWebpack4 = exports.resolveFromStorybookAddonDocs = exports.resolveFromStorybook = exports.storybookDirRef = void 0;
+exports.isStorybookVersion = isStorybookVersion;
+exports.isStorybookVersionGreaterThan = isStorybookVersionGreaterThan;
+exports.isStorybookVersionLessThan = isStorybookVersionLessThan;
+exports.storybookDirRef = exports.storybookConfigRef = exports.resolveFromStorybookCoreServer = exports.resolveFromStorybookCoreClient = exports.resolveFromStorybookBuilderWebpack4 = exports.resolveFromStorybookAddonDocs = exports.resolveFromStorybook = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -42,9 +44,9 @@ const resolveFromStorybookBuilderWebpack4 = modulePath => (0, _resolveFrom.defau
 
 exports.resolveFromStorybookBuilderWebpack4 = resolveFromStorybookBuilderWebpack4;
 
-const resolveFromStorybookCore = modulePath => (0, _resolveFrom.default)(resolveFromStorybook('@storybook/core'), modulePath);
+const resolveFromStorybookCoreClient = modulePath => (0, _resolveFrom.default)(resolveFromStorybook('@storybook/core-client'), modulePath);
 
-exports.resolveFromStorybookCore = resolveFromStorybookCore;
+exports.resolveFromStorybookCoreClient = resolveFromStorybookCoreClient;
 
 const resolveFromStorybookCoreServer = modulePath => (0, _resolveFrom.default)(resolveFromStorybook('@storybook/core-server'), modulePath);
 
@@ -86,36 +88,28 @@ 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;
 }
 
 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;
 }
 
 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;
 }
 
 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;
 }
 
 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 (_) {
@@ -139,8 +133,8 @@ async function importStorybookConfig() {
   try {
     return storybookConfigRef.current = (await Promise.resolve(`${require.resolve(configPath)}`).then(s => _interopRequireWildcard(require(s)))).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
@@ -149,17 +143,16 @@ async function importStorybookConfig() {
     const {
       default: serverRequireFallback,
       serverRequire = serverRequireFallback
-    } = await Promise.resolve(`${resolveFromStorybook(`${storybookUtilsPath}/${serverRequireModule}`)}`).then(s => _interopRequireWildcard(require(s))); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    } = await Promise.resolve(`${resolveFromStorybook(`${storybookUtilsPath}/${serverRequireModule}`)}`).then(s => _interopRequireWildcard(require(s))); // 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);
   }
 }
 
 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;
 }