creevey 0.9.0-beta.2 → 0.9.0-non-webpack.1

package/lib/cjs/server/master/runner.js

@@ -19,69 +19,44 @@ var _pool = _interopRequireDefault(require("./pool"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const copyFileAsync = (0, _util.promisify)(_fs.copyFile);
 const mkdirAsync = (0, _util.promisify)(_fs.mkdir);
 
 class Runner extends _events.EventEmitter {
+  pools = {};
+  tests = {};
+
   get isRunning() {
     return Object.values(this.pools).some(pool => pool.isRunning);
   }
 
   constructor(config) {
     super();
+    this.failFast = config.failFast;
+    this.screenDir = config.screenDir;
+    this.reportDir = config.reportDir;
+    this.browsers = Object.keys(config.browsers);
+    this.browsers.map(browser => this.pools[browser] = new _pool.default(config, browser)).map(pool => pool.on('test', this.handlePoolMessage));
+  }
 
-    _defineProperty(this, "failFast", void 0);
-
-    _defineProperty(this, "screenDir", void 0);
-
-    _defineProperty(this, "reportDir", void 0);
-
-    _defineProperty(this, "browsers", void 0);
-
-    _defineProperty(this, "pools", {});
-
-    _defineProperty(this, "tests", {});
-
-    _defineProperty(this, "handlePoolMessage", message => {
-      const {
-        id,
-        status,
-        result
-      } = message;
-      const test = this.tests[id];
-      if (!test) return;
-      const {
-        browser,
-        testName,
-        storyPath,
-        storyId
-      } = test; // TODO Handle 'retrying' status
-
-      test.status = status == 'retrying' ? 'failed' : status;
-
-      if (!result) {
-        this.sendUpdate({
-          tests: {
-            [id]: {
-              id,
-              browser,
-              testName,
-              storyPath,
-              status: test.status,
-              storyId
-            }
-          }
-        });
-        return;
-      }
+  handlePoolMessage = message => {
+    const {
+      id,
+      status,
+      result
+    } = message;
+    const test = this.tests[id];
+    if (!test) return;
+    const {
+      browser,
+      testName,
+      storyPath,
+      storyId
+    } = test; // TODO Handle 'retrying' status
 
-      if (!test.results) {
-        test.results = [];
-      }
+    test.status = status == 'retrying' ? 'failed' : status;
 
-      test.results.push(result);
+    if (!result) {
       this.sendUpdate({
         tests: {
           [id]: {
@@ -90,29 +65,41 @@ class Runner extends _events.EventEmitter {
             testName,
             storyPath,
             status: test.status,
-            results: [result],
             storyId
           }
         }
       });
-      if (this.failFast && status == 'failed') this.stop();
-    });
+      return;
+    }
 
-    _defineProperty(this, "handlePoolStop", () => {
-      if (!this.isRunning) {
-        this.sendUpdate({
-          isRunning: false
-        });
-        this.emit('stop');
+    if (!test.results) {
+      test.results = [];
+    }
+
+    test.results.push(result);
+    this.sendUpdate({
+      tests: {
+        [id]: {
+          id,
+          browser,
+          testName,
+          storyPath,
+          status: test.status,
+          results: [result],
+          storyId
+        }
       }
     });
-
-    this.failFast = config.failFast;
-    this.screenDir = config.screenDir;
-    this.reportDir = config.reportDir;
-    this.browsers = Object.keys(config.browsers);
-    this.browsers.map(browser => this.pools[browser] = new _pool.default(config, browser)).map(pool => pool.on('test', this.handlePoolMessage));
-  }
+    if (this.failFast && status == 'failed') this.stop();
+  };
+  handlePoolStop = () => {
+    if (!this.isRunning) {
+      this.sendUpdate({
+        isRunning: false
+      });
+      this.emit('stop');
+    }
+  };
 
   async init() {
     await Promise.all(Object.values(this.pools).map(pool => pool.init()));

package/lib/cjs/server/master/server.js

@@ -75,7 +75,7 @@ function server(reportDir, port, ui) {
         type: 'update',
         payload: deserializedStories
       });
-      Object.values(_cluster.default.workers).filter(_types.isDefined).filter(worker => worker.isConnected()).forEach(worker => (0, _messages.sendStoriesMessage)(worker, {
+      Object.values(_cluster.default.workers ?? {}).filter(_types.isDefined).filter(worker => worker.isConnected()).forEach(worker => (0, _messages.sendStoriesMessage)(worker, {
         type: 'update',
         payload: deserializedStories
       }));
@@ -90,7 +90,7 @@ function server(reportDir, port, ui) {
         workerId,
         options
       } = ctx.request.body;
-      const worker = Object.values(_cluster.default.workers).filter(_types.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.default.workers ?? {}).filter(_types.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 => {

package/lib/cjs/server/messages.js

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.emitWorkerMessage = emitWorkerMessage;
+exports.emitDockerMessage = emitDockerMessage;
+exports.emitShutdownMessage = emitShutdownMessage;
 exports.emitStoriesMessage = emitStoriesMessage;
 exports.emitTestMessage = emitTestMessage;
 exports.emitWebpackMessage = emitWebpackMessage;
-exports.emitDockerMessage = emitDockerMessage;
-exports.emitShutdownMessage = emitShutdownMessage;
-exports.sendStoriesMessage = sendStoriesMessage;
-exports.sendTestMessage = sendTestMessage;
+exports.emitWorkerMessage = emitWorkerMessage;
 exports.sendDockerMessage = sendDockerMessage;
 exports.sendShutdownMessage = sendShutdownMessage;
+exports.sendStoriesMessage = sendStoriesMessage;
+exports.sendTestMessage = sendTestMessage;
 exports.subscribeOn = subscribeOn;
 exports.subscribeOnWorker = subscribeOnWorker;
 
@@ -21,10 +21,10 @@ var _cluster = _interopRequireDefault(require("cluster"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function emitMessage(message) {
-  var _process$send, _process$send2, _process;
+  var _process$send, _process;
 
   if (_cluster.default.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);
 }
 
@@ -190,9 +190,7 @@ function subscribeOn(scope, handler) {
 const workers = new Map();
 
 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/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"));
 
@@ -51,9 +51,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 +61,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}`));
       }
     });
   }));
@@ -132,7 +128,7 @@ function getUrlChecker(browser) {
 
 async function waitForStorybook(browser) {
   // NOTE: Storybook 5.x doesn't have the `last` method
-  if ((0, _helpers.isStorybookVersionLessThan)(6)) {
+  if ((0, _helpers.isStorybookVersionLessThan)(6) || (0, _helpers.isStorybookVersionGreaterThan)(6, 4)) {
     browserLogger.debug('Waiting for `load` event to make sure that storybook is initiated');
     return browser.executeAsyncScript(function (callback) {
       if (document.readyState == 'complete') return callback();
@@ -164,11 +160,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 +248,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 +302,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 +352,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,9 +378,9 @@ 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;
 }
@@ -430,11 +427,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;
@@ -530,7 +524,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 +535,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;
   }
@@ -579,7 +573,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");
@@ -606,7 +600,7 @@ 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.default.cyan(kind)}/${_chalk.default.cyan(name)} by id ${_chalk.default.magenta(id)}`);
   if (captureElement) Object.defineProperty(this, 'captureElement', {
     enumerable: true,
@@ -622,8 +616,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 +623,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

@@ -25,14 +25,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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 +60,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 +101,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,19 +121,12 @@ 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)) {
@@ -153,8 +142,8 @@ function saveStoriesJson(storiesData, extract) {
   } // 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,13 +3,13 @@
 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;
+var _api$context;
 
 const framework = (0, _helpers.getStorybookFramework)(); // eslint-disable-next-line @typescript-eslint/no-var-requires
 
@@ -19,7 +19,9 @@ const core = require((0, _helpers.resolveFromStorybook)('@storybook/core')); //@
 
 const start = (0, _helpers.isStorybookVersionLessThan)(6, 2) ? core.default.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 = (0, _helpers.isStorybookVersionLessThan)(6, 4) ? //@ts-expect-error: 6.x has { channel }, but 5.x has { context: { channel } }
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+api.channel ?? ((_api$context = api.context) === null || _api$context === void 0 ? void 0 : _api$context.channel) : _addons.addons.getChannel();
 exports.channel = channel;
 const clientApi = api.clientApi;
 exports.clientApi = clientApi;

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.resolveFromStorybookCore = exports.resolveFromStorybookBuilderWebpack4 = exports.resolveFromStorybookAddonDocs = exports.resolveFromStorybook = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -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 (_) {
@@ -159,7 +153,7 @@ async function importStorybookConfig() {
 }
 
 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;
 }