creevey 0.8.0-beta.0 → 0.8.0

package/lib/esm/server/index.js

@@ -1,6 +1,5 @@
 import cluster from 'cluster';
 import { readConfig, defaultBrowser } from './config';
-import { noop } from '../types';
 import { logger } from './logger'; // NOTE: Impure function, mutate config by adding gridUrl prop
 
 async function startWebdriverServer(config, options) {
@@ -22,8 +21,7 @@ export default async function (options) {
     ui,
     port
   } = options;
-  if (!config) return;
-  const resolveApi = ui && cluster.isMaster ? (await import('./master/server')).default(config.reportDir, port) : noop; // NOTE: We don't need docker nor selenoid for webpack or update options
+  if (!config) return; // NOTE: We don't need docker nor selenoid for webpack or update options
 
   if (!(config.gridUrl || Object.values(config.browsers).every(({
     gridUrl
@@ -48,9 +46,10 @@ export default async function (options) {
         return (await import('./loaders/webpack/compile')).default(config, options);
       }
 
-    case cluster.isMaster:
+    case cluster.isPrimary:
       {
         logger.info('Starting Master Process');
+        const resolveApi = (await import('./master/server')).default(config.reportDir, port, ui);
         return (await import('./master')).default(config, options, resolveApi);
       }
 

package/lib/esm/server/loaders/babel/creevey-plugin.js

@@ -7,9 +7,7 @@ const reexportedStories = new Map();
 export default function () {
   return {
     pre() {
-      var _this$opts$parents;
-
-      const parents = (_this$opts$parents = this.opts.parents()) !== null && _this$opts$parents !== void 0 ? _this$opts$parents : [];
+      const parents = this.opts.parents() ?? [];
       const story = this.opts.story();
       this.resourcePath = this.filename;
       this.fileType = FileType.Invalid; // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/lib/esm/server/loaders/babel/helpers.js

@@ -57,11 +57,9 @@ function getPropertyPath(path, name) {
 
 function getDeclaratorPath(path) {
   if (path !== null && path !== void 0 && path.isIdentifier()) {
-    var _path$scope$getBindin;
-
     const {
       path: bindingPath
-    } = (_path$scope$getBindin = path.scope.getBinding(path.node.name)) !== null && _path$scope$getBindin !== void 0 ? _path$scope$getBindin : {};
+    } = path.scope.getBinding(path.node.name) ?? {};
     if (bindingPath !== null && bindingPath !== void 0 && bindingPath.isVariableDeclarator() || bindingPath !== null && bindingPath !== void 0 && bindingPath.isFunctionDeclaration() || bindingPath !== null && bindingPath !== void 0 && bindingPath.isImportSpecifier()) return bindingPath;
   }
 }
@@ -100,7 +98,7 @@ function removeAllPropsExcept(path, propNames) {
 }
 
 function removeAllPropAssignsExcept(propAssigns, propNames) {
-  for (const [assignPath, props] of propAssigns !== null && propAssigns !== void 0 ? propAssigns : []) {
+  for (const [assignPath, props] of propAssigns ?? []) {
     const restNames = props.reduce((subPropNames, prop) => {
       const propName = subPropNames.find(names => {
         const name = Array.isArray(names) ? names[0] : names;
@@ -138,13 +136,11 @@ function getAssignmentPathWithProps(refPath) {
 function getPropertyAssignmentPaths(idPaths) {
   const assignPaths = new Map();
   idPaths.forEach(idPath => {
-    var _idPath$scope$getBind, _idPath$scope$getBind2;
+    var _idPath$scope$getBind;
 
-    const referencePaths = (_idPath$scope$getBind = (_idPath$scope$getBind2 = idPath.scope.getBinding(idPath.node.name)) === null || _idPath$scope$getBind2 === void 0 ? void 0 : _idPath$scope$getBind2.referencePaths) !== null && _idPath$scope$getBind !== void 0 ? _idPath$scope$getBind : [];
+    const referencePaths = ((_idPath$scope$getBind = idPath.scope.getBinding(idPath.node.name)) === null || _idPath$scope$getBind === void 0 ? void 0 : _idPath$scope$getBind.referencePaths) ?? [];
     referencePaths.forEach(refPath => {
-      var _getAssignmentPathWit;
-
-      const [assignmentPath, props] = (_getAssignmentPathWit = getAssignmentPathWithProps(refPath)) !== null && _getAssignmentPathWit !== void 0 ? _getAssignmentPathWit : [];
+      const [assignmentPath, props] = getAssignmentPathWithProps(refPath) ?? [];
       if (assignmentPath && props) assignPaths.set(assignmentPath, props);
     });
   });
@@ -331,12 +327,12 @@ export const previewVisitor = {
 };
 export const mdxVisitor = {
   FunctionDeclaration(functionPath) {
-    var _functionPath$get$nod, _rootPath$scope$getBi, _rootPath$scope$getBi2;
+    var _functionPath$get$nod, _rootPath$scope$getBi;
 
     const functionName = (_functionPath$get$nod = functionPath.get('id').node) === null || _functionPath$get$nod === void 0 ? void 0 : _functionPath$get$nod.name;
     if (functionName != 'MDXContent') return;
     const rootPath = findRootPath(functionPath);
-    const refs = (_rootPath$scope$getBi = rootPath === null || rootPath === void 0 ? void 0 : (_rootPath$scope$getBi2 = rootPath.scope.getBinding(functionName)) === null || _rootPath$scope$getBi2 === void 0 ? void 0 : _rootPath$scope$getBi2.referencePaths) !== null && _rootPath$scope$getBi !== void 0 ? _rootPath$scope$getBi : [];
+    const refs = (rootPath === null || rootPath === void 0 ? void 0 : (_rootPath$scope$getBi = rootPath.scope.getBinding(functionName)) === null || _rootPath$scope$getBi === void 0 ? void 0 : _rootPath$scope$getBi.referencePaths) ?? [];
     refs.forEach(refPath => {
       var _findRootPath;
 
@@ -361,10 +357,8 @@ export const storyVisitor = {
   },
 
   ExportAllDeclaration(allPath) {
-    var _this$reexportedStori;
-
     const request = allPath.get('source').node.value;
-    this.reexportedStories.set(this.resourcePath, ((_this$reexportedStori = this.reexportedStories.get(this.resourcePath)) !== null && _this$reexportedStori !== void 0 ? _this$reexportedStori : new Set()).add(request));
+    this.reexportedStories.set(this.resourcePath, (this.reexportedStories.get(this.resourcePath) ?? new Set()).add(request));
     this.visitedTopPaths.add(allPath);
   },
 
@@ -398,9 +392,9 @@ export const storyVisitor = {
       const storiesIdPath = (_rootPath$get$find = rootPath.get('declarations').find(decl => decl.get('init') == rootCallPath)) === null || _rootPath$get$find === void 0 ? void 0 : _rootPath$get$find.get('id');
 
       if (storiesIdPath !== null && storiesIdPath !== void 0 && storiesIdPath.isIdentifier()) {
-        var _storiesIdPath$scope$, _storiesIdPath$scope$2;
+        var _storiesIdPath$scope$;
 
-        ((_storiesIdPath$scope$ = (_storiesIdPath$scope$2 = storiesIdPath.scope.getBinding(storiesIdPath.node.name)) === null || _storiesIdPath$scope$2 === void 0 ? void 0 : _storiesIdPath$scope$2.referencePaths) !== null && _storiesIdPath$scope$ !== void 0 ? _storiesIdPath$scope$ : []).forEach(cleanUpStoriesOfCallChain);
+        (((_storiesIdPath$scope$ = storiesIdPath.scope.getBinding(storiesIdPath.node.name)) === null || _storiesIdPath$scope$ === void 0 ? void 0 : _storiesIdPath$scope$.referencePaths) ?? []).forEach(cleanUpStoriesOfCallChain);
       }
     }
 
@@ -409,11 +403,9 @@ export const storyVisitor = {
 
   Identifier(identifierPath) {
     if (isExports(identifierPath)) {
-      var _getAssignmentPathWit2;
-
       const rootPath = findRootPath(identifierPath);
       if (rootPath) this.visitedTopPaths.add(rootPath);
-      const [assignmentPath, props] = (_getAssignmentPathWit2 = getAssignmentPathWithProps(identifierPath)) !== null && _getAssignmentPathWit2 !== void 0 ? _getAssignmentPathWit2 : [];
+      const [assignmentPath, props] = getAssignmentPathWithProps(identifierPath) ?? [];
 
       if (assignmentPath && props) {
         if (props.length == 1 && props[0] != 'default') {
@@ -433,11 +425,9 @@ export const storyVisitor = {
     }
 
     if (isModuleExports(identifierPath)) {
-      var _getAssignmentPathWit3;
-
       const rootPath = findRootPath(identifierPath);
       if (rootPath) this.visitedTopPaths.add(rootPath);
-      const [assignmentPath, props] = (_getAssignmentPathWit3 = getAssignmentPathWithProps(identifierPath)) !== null && _getAssignmentPathWit3 !== void 0 ? _getAssignmentPathWit3 : [];
+      const [assignmentPath, props] = getAssignmentPathWithProps(identifierPath) ?? [];
 
       if (assignmentPath && props) {
         if (props.length == 1 && props[0] == 'exports') {

package/lib/esm/server/loaders/babel/register.js

@@ -5,7 +5,7 @@ import { addHook } from 'pirates';
 import { isDefined } from '../../../types';
 import { extensions } from '../../utils';
 import plugin from './creevey-plugin';
-import { hasDocsAddon, hasSvelteCSFAddon, isStorybookVersionLessThan } from '../../storybook/helpers';
+import { hasDocsAddon, hasSvelteCSFAddon } from '../../storybook/helpers';
 let parents = null;
 let story = null; //@ts-expect-error private field doesn't have types
 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
@@ -38,12 +38,10 @@ function getRequireContext(rootDir) {
       fs.readdirSync(dirPath, {
         withFileTypes: true
       }).forEach(dirent => {
-        var _filter$test;
-
         const filename = dirent.name;
         const filePath = join(dirPath, filename);
         if (dirent.isDirectory() && deep) return traverse(filePath);
-        if (dirent.isFile() && ((_filter$test = filter === null || filter === void 0 ? void 0 : filter.test(`./${relative(contextPath, filePath)}`)) !== null && _filter$test !== void 0 ? _filter$test : true)) return ids.push(filePath);
+        if (dirent.isFile() && ((filter === null || filter === void 0 ? void 0 : filter.test(`./${relative(contextPath, filePath)}`)) ?? true)) return ids.push(filePath);
       });
     };
 
@@ -69,7 +67,7 @@ function getRequireContext(rootDir) {
 }
 
 export default async function register(config, debug = false) {
-  const rootDir = isStorybookVersionLessThan(6, 4) ? config.storybookDir : process.cwd();
+  const rootDir = process.cwd();
   const requireContext = getRequireContext(rootDir);
   const preview = resolve(config.storybookDir, 'preview');
   if (hasDocsAddon()) await (await import('../hooks/mdx')).addMDXHook(() => story);

package/lib/esm/server/loaders/webpack/compile.js

@@ -3,7 +3,7 @@ import path from 'path';
 import webpack from 'webpack';
 import nodeExternals from 'webpack-node-externals';
 import { extensions as fallbackExtensions, getCreeveyCache } from '../../utils';
-import { getStorybookFramework, hasDocsAddon, importStorybookConfig, isStorybookVersionLessThan, resolveFromStorybook } from '../../storybook/helpers';
+import { getStorybookFramework, hasDocsAddon, importStorybookConfig, resolveFromStorybook } from '../../storybook/helpers';
 import { noop } from '../../../types';
 import { emitWebpackMessage, subscribeOn } from '../../messages';
 import { logger } from '../../logger';
@@ -11,6 +11,8 @@ let isInitiated = false;
 let dumpStats = noop;
 
 function handleWebpackBuild(error, stats) {
+  var _stats$toJson$warning;
+
   dumpStats(stats);
 
   if (error || !stats || stats.hasErrors()) {
@@ -21,17 +23,16 @@ function handleWebpackBuild(error, stats) {
     if (error) return console.error(error.message);
 
     if (stats && (stats.hasErrors() || stats.hasWarnings())) {
-      const {
-        warnings,
-        errors
-      } = stats.toJson();
-      errors.forEach(e => console.error(e));
-      warnings.forEach(e => console.error(e));
+      var _statsJson$errors, _statsJson$warnings;
+
+      const statsJson = stats.toJson();
+      (_statsJson$errors = statsJson.errors) === null || _statsJson$errors === void 0 ? void 0 : _statsJson$errors.forEach(e => console.error(e));
+      (_statsJson$warnings = statsJson.warnings) === null || _statsJson$warnings === void 0 ? void 0 : _statsJson$warnings.forEach(e => console.error(e));
       return;
     }
   }
 
-  stats.toJson().warnings.forEach(e => console.warn(e));
+  stats === null || stats === void 0 ? void 0 : (_stats$toJson$warning = stats.toJson().warnings) === null || _stats$toJson$warning === void 0 ? void 0 : _stats$toJson$warning.forEach(e => console.warn(e));
 
   if (!isInitiated) {
     isInitiated = true;
@@ -52,72 +53,48 @@ async function applyMdxLoader(config, areAddonsRemoved, loader) {
     mdxLoaders
   } = await import('./mdx-loader');
   mdxLoaders.splice(1, 0, loader);
-  const mdxRegexps = isStorybookVersionLessThan(6, 2) ? [/\.(stories|story).mdx$/, /\.(stories|story)\.mdx$/] : [/(stories|story)\.mdx$/]; // NOTE replace md/mdx to null loader
+  const mdxRegexps = [/(stories|story)\.mdx$/]; // NOTE replace md/mdx to null loader
 
   const mdRegexps = [/\.md$/, /\.mdx$/];
 
   if (areAddonsRemoved) {
-    var _config$module2;
+    var _config$module2, _config$module2$rules;
 
     mdRegexps.forEach(test => {
-      var _config$module;
+      var _config$module, _config$module$rules;
 
-      return (_config$module = config.module) === null || _config$module === void 0 ? void 0 : _config$module.rules.unshift({
+      return (_config$module = config.module) === null || _config$module === void 0 ? void 0 : (_config$module$rules = _config$module.rules) === null || _config$module$rules === void 0 ? void 0 : _config$module$rules.unshift({
         test,
         exclude: /(stories|story)\.mdx$/,
         use: require.resolve('null-loader')
       });
     });
-    (_config$module2 = config.module) === null || _config$module2 === void 0 ? void 0 : _config$module2.rules.unshift({
+    (_config$module2 = config.module) === null || _config$module2 === void 0 ? void 0 : (_config$module2$rules = _config$module2.rules) === null || _config$module2$rules === void 0 ? void 0 : _config$module2$rules.unshift({
       test: /(stories|story)\.mdx$/,
       use: mdxLoaders
     });
   } else {
-    var _config$module3, _config$module4, _config$module$rules$, _config$module5;
+    var _config$module3, _config$module3$rules, _config$module4, _config$module4$rules, _config$module5, _config$module5$rules;
 
     // NOTE Exclude addons' entry points
     config.entry = Array.isArray(config.entry) ? config.entry.filter(entry => !/@storybook(\/|\\)addon/.test(entry)) : config.entry;
-    (_config$module3 = config.module) === null || _config$module3 === void 0 ? void 0 : _config$module3.rules.filter(rule => mdRegexps.some(test => {
+    (_config$module3 = config.module) === null || _config$module3 === void 0 ? void 0 : (_config$module3$rules = _config$module3.rules) === null || _config$module3$rules === void 0 ? void 0 : _config$module3$rules.flatMap(rule => typeof rule == 'object' && 'test' in rule ? rule : []).filter(rule => mdRegexps.some(test => {
       var _rule$test;
 
       return ((_rule$test = rule.test) === null || _rule$test === void 0 ? void 0 : _rule$test.toString()) == test.toString();
     })).forEach(rule => rule.use = require.resolve('null-loader'));
-    (_config$module4 = config.module) === null || _config$module4 === void 0 ? void 0 : _config$module4.rules.filter(rule => mdxRegexps.some(test => {
+    (_config$module4 = config.module) === null || _config$module4 === void 0 ? void 0 : (_config$module4$rules = _config$module4.rules) === null || _config$module4$rules === void 0 ? void 0 : _config$module4$rules.flatMap(rule => typeof rule == 'object' && 'test' in rule ? rule : []).filter(rule => mdxRegexps.some(test => {
       var _rule$test2;
 
       return ((_rule$test2 = rule.test) === null || _rule$test2 === void 0 ? void 0 : _rule$test2.toString()) == test.toString();
     })).forEach(rule => rule.use = mdxLoaders); // NOTE Exclude source-loader
 
     config.module = { ...config.module,
-      rules: (_config$module$rules$ = (_config$module5 = config.module) === null || _config$module5 === void 0 ? void 0 : _config$module5.rules.filter(rule => !(typeof rule.loader == 'string' && /@storybook(\/|\\)source-loader/.test(rule.loader)))) !== null && _config$module$rules$ !== void 0 ? _config$module$rules$ : []
+      rules: ((_config$module5 = config.module) === null || _config$module5 === void 0 ? void 0 : (_config$module5$rules = _config$module5.rules) === null || _config$module5$rules === void 0 ? void 0 : _config$module5$rules.flatMap(rule => typeof rule == 'object' && 'test' in rule ? rule : []).filter(rule => !(typeof rule.loader == 'string' && /@storybook(\/|\\)source-loader/.test(rule.loader)))) ?? []
     };
   }
 }
 
-async function getWebpackConfigForStorybook_pre6_2(framework, configDir, outputDir) {
-  const {
-    default: storybookFrameworkOptions
-  } = await import(resolveFromStorybook(`@storybook/${framework}/dist/server/options`)); // eslint-disable-next-line node/no-missing-import, @typescript-eslint/no-unsafe-assignment, import/no-unresolved
-
-  const {
-    default: getConfig
-  } = await import(resolveFromStorybook('@storybook/core/dist/server/config')); // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
-
-  return getConfig({
-    // NOTE: 6.1 storybook don't support quite any more. But we still have older versions
-    quiet: true,
-    configType: 'PRODUCTION',
-    outputDir,
-    cache: {},
-    // eslint-disable-next-line node/no-missing-require
-    corePresets: [resolveFromStorybook('@storybook/core/dist/server/preview/preview-preset')],
-    overridePresets: [...(hasDocsAddon() ? [require.resolve('./mdx-loader')] : []), // eslint-disable-next-line node/no-missing-require
-    resolveFromStorybook('@storybook/core/dist/server/preview/custom-webpack-preset')],
-    ...storybookFrameworkOptions,
-    configDir
-  });
-}
-
 async function getWebpackConfigForStorybook_6_2(framework, configDir, outputDir) {
   const {
     default: storybookFrameworkOptions
@@ -182,7 +159,7 @@ export default async function compile(config, {
   debug,
   ui
 }) {
-  var _storybookWebpackConf, _storybookWebpackConf2, _storybookWebpackConf3, _extensions$map, _storybookWebpackConf4, _storybookWebpackConf5, _storybookWebpackConf6;
+  var _storybookWebpackConf, _storybookWebpackConf2, _storybookWebpackConf3, _extensions$map, _storybookWebpackConf4, _storybookWebpackConf5;
 
   const storybookFramework = getStorybookFramework();
   const outputDir = path.join(getCreeveyCache(), 'storybook');
@@ -205,9 +182,9 @@ export default async function compile(config, {
   process.env.NODE_ENV = 'production'; // NOTE Remove addons by monkey patching, only for new config file (main.js)
 
   const areAddonsRemoved = await removeAddons();
-  const getWebpackConfig = isStorybookVersionLessThan(6, 2) ? getWebpackConfigForStorybook_pre6_2 : getWebpackConfigForStorybook_6_2;
+  const getWebpackConfig = getWebpackConfigForStorybook_6_2;
   const storybookWebpackConfig = await getWebpackConfig(storybookFramework, config.storybookDir, outputDir);
-  const extensions = (_storybookWebpackConf = (_storybookWebpackConf2 = storybookWebpackConfig.resolve) === null || _storybookWebpackConf2 === void 0 ? void 0 : _storybookWebpackConf2.extensions) !== null && _storybookWebpackConf !== void 0 ? _storybookWebpackConf : fallbackExtensions;
+  const extensions = ((_storybookWebpackConf = storybookWebpackConfig.resolve) === null || _storybookWebpackConf === void 0 ? void 0 : _storybookWebpackConf.extensions) ?? fallbackExtensions;
   delete storybookWebpackConfig.optimization;
   storybookWebpackConfig.devtool = false;
   storybookWebpackConfig.performance = false;
@@ -222,18 +199,21 @@ export default async function compile(config, {
 
   if (hasDocsAddon()) await applyMdxLoader(storybookWebpackConfig, areAddonsRemoved, creeveyLoader); // NOTE Add creevey-loader to cut off all unnecessary code except stories meta and tests
 
-  (_storybookWebpackConf3 = storybookWebpackConfig.module) === null || _storybookWebpackConf3 === void 0 ? void 0 : _storybookWebpackConf3.rules.unshift({
+  (_storybookWebpackConf2 = storybookWebpackConfig.module) === null || _storybookWebpackConf2 === void 0 ? void 0 : (_storybookWebpackConf3 = _storybookWebpackConf2.rules) === null || _storybookWebpackConf3 === void 0 ? void 0 : _storybookWebpackConf3.unshift({
     enforce: 'pre',
     test: new RegExp(`\\.(${(_extensions$map = extensions.map(x => x.slice(1))) === null || _extensions$map === void 0 ? void 0 : _extensions$map.join('|')})$`),
     exclude: /node_modules/,
     use: creeveyLoader
   });
-  const aliases = (_storybookWebpackConf4 = (_storybookWebpackConf5 = storybookWebpackConfig.resolve) === null || _storybookWebpackConf5 === void 0 ? void 0 : _storybookWebpackConf5.alias) !== null && _storybookWebpackConf4 !== void 0 ? _storybookWebpackConf4 : {};
+  const aliases = ((_storybookWebpackConf4 = storybookWebpackConfig.resolve) === null || _storybookWebpackConf4 === void 0 ? void 0 : _storybookWebpackConf4.alias) ?? {};
   const excluded = ['@storybook/addons', '@storybook/api', '@storybook/channel-postmessage', '@storybook/channels', '@storybook/client-api', '@storybook/client-logger', '@storybook/components', '@storybook/core-events', '@storybook/router', '@storybook/semver', '@storybook/theming']; // NOTE Exclude from bundle all modules from node_modules
 
-  storybookWebpackConfig.externals = [...Object.entries(aliases).filter(([alias]) => excluded.includes(alias)).map(([, aliasPath]) => ({
-    [aliasPath]: `commonjs ${aliasPath}`
-  })), // NOTE Replace `@storybook/${framework}` to ../../storybook.ts
+  storybookWebpackConfig.externals = [...(Array.isArray(aliases) ? aliases.map(({
+    name,
+    alias
+  }) => [name, alias]) : Object.entries(aliases)).filter(([alias]) => excluded.includes(alias)).flatMap(([, aliasPath]) => aliasPath == false ? [] : (Array.isArray(aliasPath) ? aliasPath : [aliasPath]).map(x => ({
+    [x]: `commonjs ${x}`
+  }))), // NOTE Replace `@storybook/${framework}` to ../../storybook.ts
   {
     [`@storybook/${storybookFramework}`]: `commonjs ${require.resolve('../../storybook/entry')}`
   }, nodeExternals({
@@ -241,17 +221,20 @@ export default async function compile(config, {
     allowlist: /(webpack|dummy-hmr|generated-stories-entry|generated-config-entry|generated-other-entry)/
   }), // TODO Don't work well with monorepos
   nodeExternals({
-    modulesDir: resolveFromStorybook('@storybook/core').split('@storybook')[0],
+    modulesDir: resolveFromStorybook('@storybook/core-client').split('@storybook')[0],
     includeAbsolutePaths: true,
     allowlist: /(webpack|dummy-hmr|generated-stories-entry|generated-config-entry|generated-other-entry)/
   })]; // NOTE Exclude some plugins
 
   const excludedPlugins = ['DocgenPlugin', 'ForkTsCheckerWebpackPlugin'];
-  storybookWebpackConfig.plugins = (_storybookWebpackConf6 = storybookWebpackConfig.plugins) === null || _storybookWebpackConf6 === void 0 ? void 0 : _storybookWebpackConf6.filter(plugin => !excludedPlugins.includes(plugin.constructor.name));
+  storybookWebpackConfig.plugins = (_storybookWebpackConf5 = storybookWebpackConfig.plugins) === null || _storybookWebpackConf5 === void 0 ? void 0 : _storybookWebpackConf5.filter(plugin => !excludedPlugins.includes(plugin.constructor.name));
   const storybookWebpackCompiler = webpack(storybookWebpackConfig);
 
   if (debug) {
-    dumpStats = stats => writeFile(path.join(config.reportDir, 'stats.json'), JSON.stringify(stats.toJson(), null, 2), noop);
+    dumpStats = stats => {
+      if (!stats) return;
+      writeFile(path.join(config.reportDir, 'stats.json'), JSON.stringify(stats.toJson(), null, 2), noop);
+    };
   }
 
   if (ui) {

package/lib/esm/server/loaders/webpack/creevey-loader.js

@@ -5,7 +5,6 @@ import { validate } from 'schema-utils';
 import { parse } from '@babel/parser';
 import traverse from '@babel/traverse';
 import generate from '@babel/generator';
-import { isStorybookVersionLessThan } from '../../storybook/helpers';
 import { commonVisitor, mdxVisitor, previewVisitor, storyVisitor, FileType } from '../babel/helpers';
 import { logger } from '../../logger';
 
@@ -57,11 +56,6 @@ function isPreview(context, options) {
   } = path.posix.parse(toPosix(context.resourcePath));
   const storybookDir = typeof options.storybookDir == 'string' ? toPosix(options.storybookDir) : '';
   const isConfigFile = resourceDir == storybookDir && (resourceName == 'preview' || resourceName == 'config');
-
-  if (isStorybookVersionLessThan(6)) {
-    return isEntry(context) && isConfigFile;
-  }
-
   const issuerResource = getIssuerResource(context);
   return Boolean(issuerResource && entries.has(issuerResource) && isConfigFile);
 }
@@ -93,12 +87,17 @@ let resourcePath = '';
 const entries = new Set();
 const stories = new Set();
 const reexportedStories = new Map();
-const isTest = process.env.__CREEVEY_ENV__ == 'test';
+
+const isTest = () => process.env.__CREEVEY_ENV__ == 'test';
+
 const defaultOptions = {
-  debug: isTest,
+  get debug() {
+    return isTest();
+  },
+
   storybookDir: process.cwd()
 };
-export default function (source) {
+export default function loader(source) {
   const options = this ? getOptions(this) || defaultOptions : defaultOptions;
   validate(schema, options, {
     name: 'Creevey Stories Loader'
@@ -125,7 +124,7 @@ export default function (source) {
     }
   }
 
-  if (isTest && !Number.isNaN(Number(process.env.CREEVEY_LOADER_FILE_TYPE))) {
+  if (isTest() && !Number.isNaN(Number(process.env.CREEVEY_LOADER_FILE_TYPE))) {
     fileType = Number(process.env.CREEVEY_LOADER_FILE_TYPE);
   }
 

package/lib/esm/server/loaders/webpack/dummy-hmr.js

@@ -1,15 +1,11 @@
-var _global$__CREEVEY_HMR;
-
-global.__CREEVEY_HMR_DATA__ = (_global$__CREEVEY_HMR = global.__CREEVEY_HMR_DATA__) !== null && _global$__CREEVEY_HMR !== void 0 ? _global$__CREEVEY_HMR : {};
+global.__CREEVEY_HMR_DATA__ = global.__CREEVEY_HMR_DATA__ ?? {};
 Object.entries(__webpack_require__.m).forEach(([key, moduleFn]) => {
   __webpack_require__.m[key] = new Proxy(moduleFn, {
     apply(target, thisArg, args) {
-      var _global$__CREEVEY_HMR2;
-
       const [module] = args;
       const {
         data
-      } = global.__CREEVEY_HMR_DATA__[module.i] = (_global$__CREEVEY_HMR2 = global.__CREEVEY_HMR_DATA__[module.i]) !== null && _global$__CREEVEY_HMR2 !== void 0 ? _global$__CREEVEY_HMR2 : {
+      } = global.__CREEVEY_HMR_DATA__[module.i] = global.__CREEVEY_HMR_DATA__[module.i] ?? {
         data: {}
       };
       Object.assign(module, {

package/lib/esm/server/loaders/webpack/mdx-loader.js

@@ -1,7 +1,7 @@
 /* eslint-disable */
 
 /* Copy-paste from storybook/addons/docs/src/frameworks/common/preset.ts */
-import { isStorybookVersionLessThan, resolveFromStorybook, resolveFromStorybookAddonDocs, resolveFromStorybookBuilderWebpack4, resolveFromStorybookCore } from '../../storybook/helpers';
+import { resolveFromStorybook, resolveFromStorybookAddonDocs, resolveFromStorybookBuilderWebpack4 } from '../../storybook/helpers';
 export let mdxLoaders = []; // for frameworks that are not working with react, we need to configure
 // the jsx to transpile mdx, for now there will be a flag for that
 // for more complex solutions we can find alone that we need to add '@babel/plugin-transform-react-jsx'
@@ -44,7 +44,7 @@ export function webpack(webpackConfig = {}, options = {}) {
     configureJSX = true
   } = options;
   mdxLoaders = [{
-    loader: isStorybookVersionLessThan(6, 2) ? resolveFromStorybookCore('babel-loader') : resolveFromStorybookBuilderWebpack4('babel-loader'),
+    loader: resolveFromStorybookBuilderWebpack4('babel-loader'),
     options: createBabelOptions({
       babelOptions,
       mdxBabelOptions,

package/lib/esm/server/loaders/webpack/start.js

@@ -9,7 +9,7 @@ export function startWebpackCompiler() {
     const webpackCompiler = cluster.fork();
     webpackCompiler.on('message', message => {
       if (!isWebpackMessage(message)) return;
-      Object.values(cluster.workers).filter(worker => worker != webpackCompiler).forEach(worker => worker === null || worker === void 0 ? void 0 : worker.send(message));
+      Object.values(cluster.workers ?? {}).filter(worker => worker != webpackCompiler).forEach(worker => worker === null || worker === void 0 ? void 0 : worker.send(message));
 
       switch (message.type) {
         case 'success':

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

@@ -86,9 +86,9 @@ export default async function (config, options, resolveApi) {
   });
   runner = await master(config, {
     watch: options.ui,
-    debug: options.debug
+    debug: options.debug,
+    port: options.port
   });
-  await runner.init();
 
   if (options.saveReport) {
     await copyStatics(config.reportDir);
@@ -111,9 +111,9 @@ export default async function (config, options, resolveApi) {
     }
 
     runner.once('stop', () => {
-      var _runner$status$tests, _runner6;
+      var _runner6;
 
-      const tests = Object.values((_runner$status$tests = (_runner6 = runner) === null || _runner6 === void 0 ? void 0 : _runner6.status.tests) !== null && _runner$status$tests !== void 0 ? _runner$status$tests : {});
+      const tests = Object.values(((_runner6 = runner) === null || _runner6 === void 0 ? void 0 : _runner6.status.tests) ?? {});
       const isSuccess = tests.filter(isDefined).filter(({
         skip
       }) => !skip).every(({

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

@@ -27,6 +27,7 @@ export default async function master(config, options) {
   } catch (error) {// Ignore error
   }
 
+  await runner.init();
   const tests = await loadTestsFromStories(Object.keys(config.browsers), listener => config.storiesProvider(config, options, listener), testsDiff => {
     runner.updateTests(testsDiff);
     saveTestsJson(runner.tests, config.reportDir);

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

@@ -1,12 +1,14 @@
-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 cluster from 'cluster';
+import cluster, { Worker as ClusterWorker } from 'cluster';
 import { EventEmitter } from 'events';
-import { isWorkerMessage, isTestMessage } from '../../types';
-import { sendTestMessage, sendShutdownMessage } from '../messages';
+import { isWorkerMessage } from '../../types';
+import { sendTestMessage, sendShutdownMessage, subscribeOnWorker } from '../messages';
 import { isShuttingDown } from '../utils';
 const FORK_RETRIES = 5;
 export default class Pool extends EventEmitter {
+  workers = [];
+  queue = [];
+  forcedStop = false;
+
   get isRunning() {
     return this.workers.length !== this.freeWorkers.length;
   }
@@ -14,19 +16,6 @@ export default class Pool extends EventEmitter {
   constructor(config, browser) {
     super();
     this.browser = browser;
-
-    _defineProperty(this, "maxRetries", void 0);
-
-    _defineProperty(this, "config", void 0);
-
-    _defineProperty(this, "workers", []);
-
-    _defineProperty(this, "queue", []);
-
-    _defineProperty(this, "forcedStop", false);
-
-    _defineProperty(this, "failFast", void 0);
-
     this.failFast = config.failFast;
     this.maxRetries = config.maxRetries;
     this.config = config.browsers[browser];
@@ -36,7 +25,7 @@ export default class Pool extends EventEmitter {
     const poolSize = this.config.limit || 1;
     this.workers = (await Promise.all(Array.from({
       length: poolSize
-    }).map(() => this.forkWorker()))).filter(workerOrError => workerOrError instanceof cluster.Worker);
+    }).map(() => this.forkWorker()))).filter(workerOrError => workerOrError instanceof ClusterWorker);
     if (this.workers.length != poolSize) throw new Error(`Can't instantiate workers for ${this.browser} due many errors`);
     this.workers.forEach(worker => this.exitHandler(worker));
   }
@@ -134,7 +123,7 @@ export default class Pool extends EventEmitter {
     worker.once('exit', async () => {
       if (isShuttingDown.current) return;
       const workerOrError = await this.forkWorker();
-      if (!(workerOrError instanceof cluster.Worker)) throw new Error(`Can't instantiate worker for ${this.browser} due many errors`);
+      if (!(workerOrError instanceof ClusterWorker)) throw new Error(`Can't instantiate worker for ${this.browser} due many errors`);
       this.exitHandler(workerOrError);
       this.workers[this.workers.indexOf(worker)] = workerOrError;
       this.process();
@@ -151,37 +140,37 @@ export default class Pool extends EventEmitter {
     return test.retries < this.maxRetries && !this.forcedStop;
   }
 
+  handleTestResult(worker, test, result) {
+    const shouldRetry = result.status == 'failed' && this.shouldRetry(test);
+
+    if (shouldRetry) {
+      test.retries += 1;
+      this.queue[this.failFast ? 'unshift' : 'push'](test);
+    }
+
+    this.sendStatus({
+      id: test.id,
+      status: shouldRetry ? 'retrying' : result.status,
+      result
+    });
+    worker.isRunning = false;
+    setImmediate(() => this.process());
+  }
+
   subscribe(worker, test) {
-    worker.once('message', message => {
-      if (!isWorkerMessage(message) && !isTestMessage(message)) return;
-      if (message.type != 'end' && message.type != 'error') return;
-      let result;
-
-      if (message.type == 'error') {
-        this.gracefullyKill(worker);
-        result = {
-          status: 'failed',
-          ...message.payload
-        };
-      } else {
-        result = message.payload;
-      }
-
-      const shouldRetry = result.status == 'failed' && this.shouldRetry(test);
-
-      if (shouldRetry) {
-        test.retries += 1;
-        this.queue[this.failFast ? 'unshift' : 'push'](test);
-      }
-
-      this.sendStatus({
-        id: test.id,
-        status: shouldRetry ? 'retrying' : result.status,
-        result
+    const subscriptions = [subscribeOnWorker(worker, 'worker', message => {
+      if (message.type != 'error') return;
+      subscriptions.forEach(unsubscribe => unsubscribe());
+      this.gracefullyKill(worker);
+      this.handleTestResult(worker, test, {
+        status: 'failed',
+        ...message.payload
       });
-      worker.isRunning = false;
-      this.process();
-    });
+    }), subscribeOnWorker(worker, 'test', message => {
+      if (message.type != 'end') return;
+      subscriptions.forEach(unsubscribe => unsubscribe());
+      this.handleTestResult(worker, test, message.payload);
+    })];
   }
 
 }