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

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));
@@ -35,32 +35,24 @@ export function getStorybookVersion() {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const {
     version
-  } = require(resolveFromStorybook('@storybook/core/package.json'));
+  } = require(resolveFromStorybook('@storybook/core-server/package.json'));
 
   return version;
 }
 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,12 @@
-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) {
+export const loadStories = async (_config, _options, storiesListener) => {
+  if (cluster.isPrimary) {
     return new Promise(resolve => {
-      const worker = Object.values(cluster.workers).filter(isDefined).find(worker => worker.isConnected());
+      const worker = Object.values(cluster.workers ?? {}).filter(isDefined).find(worker => worker.isConnected());
 
       if (worker) {
         const unsubscribe = subscribeOnWorker(worker, 'stories', message => {
@@ -44,7 +41,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();
     const storiesWithOldTests = [];
     Object.values(stories).forEach(story => {
       var _parameters, _parameters$creevey;
@@ -58,4 +55,4 @@ export async function loadStories(_config, {
     });
     return stories;
   }
-}
+};

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

@@ -1,12 +1,10 @@
 import chokidar from 'chokidar';
 import { loadStories as browserProvider } from './browser';
 import { logger } from '../../logger';
-import parse from '../../parser';
+import parse from '../../testsFiles/parser';
 import { readDirRecursive } from '../../../server/utils';
 import { combineParameters } from '../../../shared';
-export async function loadStories(_config, {
-  port
-}, storiesListener) {
+export const loadStories = async (_config, _options, storiesListener) => {
   let creeveyParamsByStoryId = {};
 
   const mergeParamsFromTestsToStory = (story, creeveyParams) => {
@@ -15,9 +13,7 @@ export async function loadStories(_config, {
     }
   };
 
-  const stories = await browserProvider(_config, {
-    port
-  }, updatedStoriesByFiles => {
+  const stories = await browserProvider(_config, {}, updatedStoriesByFiles => {
     Array.from(updatedStoriesByFiles.entries()).forEach(([, storiesArray]) => {
       storiesArray.forEach(story => {
         const creeveyParams = creeveyParamsByStoryId[story.id];
@@ -37,18 +33,19 @@ export async function loadStories(_config, {
     mergeParamsFromTestsToStory(story, creeveyParamsByStoryId[storyId]);
   });
   return stories;
-}
+};
 
-function parseParams(config, listener) {
-  if (!config.testDir) {
+async function parseParams(config, listener) {
+  if (!config.testsDir) {
     return Promise.resolve({});
   }
 
-  const testFiles = readDirRecursive(config.testDir).filter(file => {
-    var _config$testRegex;
+  const testFiles = readDirRecursive(config.testsDir).filter(file => {
+    var _config$testsRegex;
 
-    return (_config$testRegex = config.testRegex) === null || _config$testRegex === void 0 ? void 0 : _config$testRegex.test(file);
+    return (_config$testsRegex = config.testsRegex) === null || _config$testsRegex === void 0 ? void 0 : _config$testsRegex.test(file);
   });
+  await (await import('../../testsFiles/register')).default(config);
 
   if (listener) {
     chokidar.watch(testFiles).on('change', filePath => {

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

package/lib/esm/server/{parser.js → testsFiles/parser.js}

@@ -1,19 +1,6 @@
 import { toId, storyNameFromExport } from '@storybook/csf';
 export default async function parse(files) {
-  result = {}; // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-
-  (await import('@babel/register')).default({
-    babelrc: false,
-    rootMode: 'upward-optional',
-    ignore: [/node_modules/],
-    extensions: ['.js', '.jsx', '.ts', '.tsx'],
-    plugins: [['@babel/plugin-transform-runtime']],
-    presets: ['@babel/preset-typescript', ['@babel/preset-env', {
-      targets: {
-        node: '10'
-      }
-    }]]
-  });
+  result = {};
   await Promise.all(files.map(async file => import(file)));
   return result;
 }

package/lib/esm/server/testsFiles/register.js

@@ -0,0 +1,31 @@
+import { addHook } from 'pirates';
+import { getTsconfig } from 'get-tsconfig';
+export default async function register(config) {
+  addHook(() => '', {
+    exts: ['.jpg', '.jpeg', '.png', '.gif', '.eot', '.otf', '.svg', '.ttf', '.woff', '.woff2', '.css', '.less', '.scss', '.styl'],
+    ignoreNodeModules: false
+  });
+  const {
+    path: tsConfigPath
+  } = getTsconfig(config.tsConfig) || {}; // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+
+  (await import('@babel/register')).default(config.babelOptions({
+    babelrc: false,
+    rootMode: 'upward-optional',
+    ignore: [/node_modules/],
+    extensions: ['.js', '.jsx', '.ts', '.tsx'],
+    parserOpts: {
+      sourceType: 'module',
+      plugins: ['jsx', 'typescript']
+    },
+    presets: ['@babel/preset-typescript', ['@babel/preset-env', {
+      targets: {
+        node: '10'
+      },
+      modules: 'commonjs'
+    }]],
+    plugins: [['@babel/plugin-transform-runtime'], ...(tsConfigPath ? [['babel-plugin-tsconfig-paths', {
+      tsconfig: tsConfigPath
+    }]] : [])]
+  })); // (await import('ts-node')).register({ project: tsConfigPath, transpileOnly: true });
+}

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
     });

package/lib/esm/server/utils.js

@@ -20,38 +20,29 @@ export function shouldSkip(browser, meta, skipOptions, test) {
     return skipOptions;
   }
 
-  if (Array.isArray(skipOptions)) {
-    for (const skip of skipOptions) {
-      const reason = shouldSkip(browser, meta, skip, test);
-      if (reason) return reason;
-    }
-
-    return false;
+  for (const skipKey in skipOptions) {
+    const reason = shouldSkipByOption(browser, meta, skipOptions[skipKey], skipKey, test);
+    if (reason) return reason;
   }
 
-  let hasSkipOptionKeys = false;
-
-  for (const skipKey in skipOptions) {
-    if (skipOptionKeys.includes(skipKey)) {
-      hasSkipOptionKeys = true;
-      continue;
+  return false;
+}
+export function shouldSkipByOption(browser, meta, skipOption, reason, test) {
+  if (Array.isArray(skipOption)) {
+    for (const skip of skipOption) {
+      const result = shouldSkipByOption(browser, meta, skip, reason, test);
+      if (result) return result;
     }
 
-    const reason = shouldSkip(browser, meta, {
-      reason: skipKey,
-      ...skipOptions[skipKey]
-    }, test);
-    if (reason) return reason;
+    return false;
   }
 
-  if (!hasSkipOptionKeys) return false;
   const {
     in: browsers,
     kinds,
     stories,
-    tests,
-    reason = true
-  } = skipOptions;
+    tests
+  } = skipOption;
   const {
     kind,
     story
@@ -64,7 +55,7 @@ export function shouldSkip(browser, meta, skipOptions, test) {
 }
 export async function shutdownWorkers() {
   isShuttingDown.current = true;
-  await Promise.all(Object.values(cluster.workers).filter(isDefined).filter(worker => worker.isConnected()).map(worker => new Promise(resolve => {
+  await Promise.all(Object.values(cluster.workers ?? {}).filter(isDefined).filter(worker => worker.isConnected()).map(worker => new Promise(resolve => {
     const timeout = setTimeout(() => worker.kill(), 10000);
     worker.on('exit', () => {
       clearTimeout(timeout);
@@ -96,27 +87,23 @@ export function testsToImages(tests) {
     storyPath,
     results
   }) => {
-    var _results$slice$0$imag, _results$slice$;
+    var _results$slice$;
 
-    return Object.keys((_results$slice$0$imag = results === null || results === void 0 ? void 0 : (_results$slice$ = results.slice(-1)[0]) === null || _results$slice$ === void 0 ? void 0 : _results$slice$.images) !== null && _results$slice$0$imag !== void 0 ? _results$slice$0$imag : {}).map(image => `${[...storyPath, testName, browser, browser == image ? undefined : image].filter(isDefined).join('/')}.png`);
+    return Object.keys((results === null || results === void 0 ? void 0 : (_results$slice$ = results.slice(-1)[0]) === null || _results$slice$ === void 0 ? void 0 : _results$slice$.images) ?? {}).map(image => `${[...storyPath, testName, browser, browser == image ? undefined : image].filter(isDefined).join('/')}.png`);
   })));
 } // https://tuhrig.de/how-to-know-you-are-inside-a-docker-container/
 
 export const isInsideDocker = existsSync('/proc/1/cgroup') && /docker/.test(readFileSync('/proc/1/cgroup', 'utf8'));
 export const downloadBinary = (downloadUrl, destination) => new Promise((resolve, reject) => get(downloadUrl, response => {
-  var _response$statusCode2;
-
   if (response.statusCode == 302) {
-    var _response$statusCode;
-
     const {
       location
     } = response.headers;
-    if (!location) return reject(new Error(`Couldn't download selenoid. Status code: ${(_response$statusCode = response.statusCode) !== null && _response$statusCode !== void 0 ? _response$statusCode : 'UNKNOWN'}`));
+    if (!location) return reject(new Error(`Couldn't download selenoid. Status code: ${response.statusCode ?? 'UNKNOWN'}`));
     return resolve(downloadBinary(location, destination));
   }
 
-  if (response.statusCode != 200) return reject(new Error(`Couldn't download selenoid. Status code: ${(_response$statusCode2 = response.statusCode) !== null && _response$statusCode2 !== void 0 ? _response$statusCode2 : 'UNKNOWN'}`));
+  if (response.statusCode != 200) return reject(new Error(`Couldn't download selenoid. Status code: ${response.statusCode ?? 'UNKNOWN'}`));
   const fileStream = createWriteStream(destination);
   response.pipe(fileStream);
   fileStream.on('finish', () => {

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

@@ -1,5 +1,3 @@
-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; }
-
 import chalk from 'chalk';
 import { reporters } from 'mocha';
 import prefix from 'loglevel-plugin-prefix';
@@ -26,31 +24,18 @@ export class CreeveyReporter extends reporters.Base {
     });
     runner.on('test', test => testLogger.warn(chalk.cyan(test.titlePath().join('/'))));
     runner.on('pass', test => testLogger.info(chalk.cyan(test.titlePath().join('/'))));
-    runner.on('fail', (test, error) => testLogger.error(chalk.cyan(test.titlePath().join('/')), '\n  ', getErrors(error, (error, imageName) => `${chalk.bold(imageName !== null && imageName !== void 0 ? imageName : topLevelSuite)}:${error}`, error => {
-      var _error$stack;
-
-      return `${(_error$stack = error.stack) !== null && _error$stack !== void 0 ? _error$stack : error.message}`;
-    }).join('\n  ')));
+    runner.on('fail', (test, error) => testLogger.error(chalk.cyan(test.titlePath().join('/')), '\n  ', getErrors(error, (error, imageName) => `${chalk.bold(imageName ?? topLevelSuite)}:${error}`, error => `${error.stack ?? error.message}`).join('\n  ')));
   }
 
 }
 export class TeamcityReporter extends reporters.Base {
   constructor(runner, options) {
     super(runner);
-
-    _defineProperty(this, "escape", str => {
-      if (!str) return '';
-      return str.toString() // eslint-disable-next-line no-control-regex
-      .replace(/\x1B.*?m/g, '').replace(/\|/g, '||').replace(/\n/g, '|n').replace(/\r/g, '|r').replace(/\[/g, '|[').replace(/\]/g, '|]').replace(/\u0085/g, '|x').replace(/\u2028/g, '|l').replace(/\u2029/g, '|p').replace(/'/g, "|'");
-    });
-
     const topLevelSuite = this.escape(options.reporterOptions.topLevelSuite);
     const reporterOptions = options.reporterOptions;
     runner.on('suite', suite => suite.root ? console.log(`##teamcity[testSuiteStarted name='${topLevelSuite}' flowId='${process.pid}']`) : console.log(`##teamcity[testSuiteStarted name='${this.escape(suite.title)}' flowId='${process.pid}']`));
     runner.on('test', test => console.log(`##teamcity[testStarted name='${this.escape(test.title)}' flowId='${process.pid}']`));
     runner.on('fail', (test, error) => {
-      var _error$stack2;
-
       Object.entries(reporterOptions.images).forEach(([name, image]) => {
         if (!image) return;
         const filePath = test.titlePath().concat(name == topLevelSuite ? [] : [topLevelSuite]).map(this.escape).join('/'); // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -66,7 +51,7 @@ export class TeamcityReporter extends reporters.Base {
       }); // Output failed test as passed due TC don't support retry mechanic
       // https://teamcity-support.jetbrains.com/hc/en-us/community/posts/207216829-Count-test-as-successful-if-at-least-one-try-is-successful?page=1#community_comment_207394125
 
-      reporterOptions.willRetry ? console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`) : console.log(`##teamcity[testFailed name='${this.escape(test.title)}' message='${this.escape(error.message)}' details='${this.escape((_error$stack2 = error.stack) !== null && _error$stack2 !== void 0 ? _error$stack2 : '')}' flowId='${process.pid}']`);
+      reporterOptions.willRetry ? console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`) : console.log(`##teamcity[testFailed name='${this.escape(test.title)}' message='${this.escape(error.message)}' details='${this.escape(error.stack ?? '')}' flowId='${process.pid}']`);
     });
     runner.on('pending', test => console.log(`##teamcity[testIgnored name='${this.escape(test.title)}' message='${this.escape(typeof test.skipReason == 'boolean' ? test.title : test.skipReason)}' flowId='${process.pid}']`));
     runner.on('test end', test => console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`));
@@ -74,6 +59,11 @@ export class TeamcityReporter extends reporters.Base {
     runner.on('end', () => console.log(`##teamcity[testSuiteFinished name='${topLevelSuite}' flowId='${process.pid}']`));
   }
 
+  escape = str => {
+    if (!str) return '';
+    return str.toString() // eslint-disable-next-line no-control-regex
+    .replace(/\x1B.*?m/g, '').replace(/\|/g, '||').replace(/\n/g, '|n').replace(/\r/g, '|r').replace(/\[/g, '|[').replace(/\]/g, '|]').replace(/\u0085/g, '|x').replace(/\u2028/g, '|l').replace(/\u2029/g, '|p').replace(/'/g, "|'");
+  };
 }
 
 function getErrors(error, imageErrorToString, errorToString) {
@@ -88,9 +78,7 @@ function getErrors(error, imageErrorToString, errorToString) {
   } else {
     const imageErrors = error.images;
     Object.keys(imageErrors).forEach(imageName => {
-      var _imageErrors$imageNam;
-
-      errors.push(imageErrorToString((_imageErrors$imageNam = imageErrors[imageName]) !== null && _imageErrors$imageNam !== void 0 ? _imageErrors$imageNam : '', imageName));
+      errors.push(imageErrorToString(imageErrors[imageName] ?? '', imageName));
     });
   }
 

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

@@ -34,9 +34,7 @@ async function getLastImageNumber(imageDir, imageName) {
   const actualImagesRegexp = new RegExp(`${imageName}-actual-(\\d+)\\.png`);
 
   try {
-    var _await$readdirAsync$m;
-
-    return (_await$readdirAsync$m = (await readdirAsync(imageDir)).map(filename => filename.replace(actualImagesRegexp, '$1')).map(Number).filter(x => !isNaN(x)).sort((a, b) => b - a)[0]) !== null && _await$readdirAsync$m !== void 0 ? _await$readdirAsync$m : 0;
+    return (await readdirAsync(imageDir)).map(filename => filename.replace(actualImagesRegexp, '$1')).map(Number).filter(x => !isNaN(x)).sort((a, b) => b - a)[0] ?? 0;
   } catch (_error) {
     return 0;
   }
@@ -54,8 +52,6 @@ export default async function worker(config, options) {
 
   function runHandler(failures) {
     if (failures > 0 && (error || Object.values(images).some(image => (image === null || image === void 0 ? void 0 : image.error) != null))) {
-      var _error2;
-
       const isTimeout = hasTimeout(error) || Object.values(images).some(image => hasTimeout(image === null || image === void 0 ? void 0 : image.error));
       const payload = {
         status: 'failed',
@@ -65,7 +61,7 @@ export default async function worker(config, options) {
       isTimeout ? emitWorkerMessage({
         type: 'error',
         payload: {
-          error: (_error2 = error) !== null && _error2 !== void 0 ? _error2 : 'Unknown error'
+          error: error ?? 'Unknown error'
         }
       }) : emitTestMessage({
         type: 'end',
@@ -96,18 +92,16 @@ export default async function worker(config, options) {
   }
 
   async function getExpected(assertImageName) {
-    var _images$imageName;
-
     // context => [kind, story, test, browser]
     // rootSuite -> kindSuite -> storyTest -> [browsers.png]
     // rootSuite -> kindSuite -> storySuite -> test -> [browsers.png]
     const testPath = [...testScope];
-    const imageName = assertImageName !== null && assertImageName !== void 0 ? assertImageName : testPath.pop();
+    const imageName = assertImageName ?? testPath.pop();
     const imagesMeta = [];
     const reportImageDir = path.join(config.reportDir, ...testPath);
     const imageNumber = (await getLastImageNumber(reportImageDir, imageName)) + 1;
     const actualImageName = `${imageName}-actual-${imageNumber}.png`;
-    const image = images[imageName] = (_images$imageName = images[imageName]) !== null && _images$imageName !== void 0 ? _images$imageName : {
+    const image = images[imageName] = images[imageName] ?? {
       actual: actualImageName
     };
 
@@ -169,12 +163,10 @@ export default async function worker(config, options) {
 
     }
   };
-  const mocha = new Mocha(mochaOptions); // @ts-expect-error: @types/mocha has out-dated types
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-
+  const mocha = new Mocha(mochaOptions);
   mocha.cleanReferencesAfterRun(false);
   chai.use(chaiImage(getExpected, config.diffOptions));
-  if ((await getBrowser(config, options.browser)) == null) return;
+  if ((await getBrowser(config, options)) == null) return;
   await addTestsFromStories(mocha.suite, config, {
     browser: options.browser,
     watch: options.ui,
@@ -185,12 +177,12 @@ export default async function worker(config, options) {
   try {
     var _await$getBrowser;
 
-    await ((_await$getBrowser = await getBrowser(config, options.browser)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
+    await ((_await$getBrowser = await getBrowser(config, options)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
   } catch (_) {
     await closeBrowser();
   }
 
-  const browser = await getBrowser(config, options.browser);
+  const browser = await getBrowser(config, options);
   const sessionId = (_await$browser$getSes = await (browser === null || browser === void 0 ? void 0 : browser.getSession())) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
   if (browser == null) return;
   const interval = setInterval(() => void browser.getCurrentUrl().then(url => {
@@ -222,9 +214,7 @@ export default async function worker(config, options) {
       if (!(reason instanceof Error)) {
         error = reason;
       } else if (!isImageError(reason)) {
-        var _reason$stack;
-
-        error = (_reason$stack = reason.stack) !== null && _reason$stack !== void 0 ? _reason$stack : reason.message;
+        error = reason.stack ?? reason.message;
       } else if (typeof reason.images == 'string') {
         const image = images[testScope.slice(-1)[0]];
         if (image) image.error = reason.images;