creevey 0.8.0-beta.0 → 0.9.0-beta.0

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

@@ -9,11 +9,14 @@ import { Builder, By, Capabilities, Origin } from 'selenium-webdriver';
 import { PageLoadStrategy } from 'selenium-webdriver/lib/capabilities';
 import { isDefined, noop } from '../../types';
 import { colors, logger } from '../logger';
-import { subscribeOn } from '../messages';
+import { emitStoriesMessage, subscribeOn } from '../messages';
 import { importStorybookCoreEvents, isStorybookVersionLessThan } from '../storybook/helpers';
 import { isShuttingDown, LOCALHOST_REGEXP, runSequence } from '../utils';
 const DOCKER_INTERNAL = 'host.docker.internal';
 let browserLogger = logger;
+let browserName = '';
+let browser = null;
+let creeveyServerHost = null;
 
 function getSessionData(grid, sessionId = '') {
   const gridUrl = new URL(grid);
@@ -40,9 +43,13 @@ function getSessionData(grid, sessionId = '') {
   }));
 }
 
+function getAddresses() {
+  return [DOCKER_INTERNAL].concat(...Object.values(networkInterfaces()).filter(isDefined).map(network => network.filter(info => info.family == 'IPv4').map(info => info.address)));
+}
+
 async function resolveStorybookUrl(storybookUrl, checkUrl) {
   browserLogger.debug('Resolving storybook url');
-  const addresses = [DOCKER_INTERNAL].concat(...Object.values(networkInterfaces()).filter(isDefined).map(network => network.filter(info => info.family == 'IPv4').map(info => info.address)));
+  const addresses = getAddresses();
 
   for (const ip of addresses) {
     const resolvedUrl = storybookUrl.replace(LOCALHOST_REGEXP, ip);
@@ -283,7 +290,7 @@ async function takeCompositeScreenshot(browser, windowRect, elementRect) {
   return PNG.sync.write(compositeImage).toString('base64');
 }
 
-async function takeScreenshot(browser, captureElement, ignoreElements) {
+export async function takeScreenshot(browser, captureElement, ignoreElements) {
   let screenshot;
   const ignoreStyles = await insertIgnoreStyles(browser, ignoreElements);
 
@@ -341,14 +348,16 @@ async function selectStory(browser, {
   name
 }, waitForReady = false) {
   browserLogger.debug(`Triggering 'SetCurrentStory' event with storyId ${chalk.magenta(id)}`);
-  const errorMessage = await browser.executeAsyncScript(function (id, kind, name, shouldWaitForReady, callback) {
+  const result = await browser.executeAsyncScript(function (id, kind, name, shouldWaitForReady, callback) {
     if (typeof window.__CREEVEY_SELECT_STORY__ == 'undefined') {
-      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.");
+      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);
   }, id, kind, name, waitForReady);
+  const [errorMessage, isCaptureCalled = false] = result || [];
   if (errorMessage) throw new Error(errorMessage);
+  return isCaptureCalled;
 }
 
 export async function updateStorybookGlobals(browser, globals) {
@@ -388,7 +397,47 @@ async function openStorybookPage(browser, storybookUrl, resolver) {
   }
 }
 
-export async function getBrowser(config, browserConfig) {
+async function resolveCreeveyHost(browser, port) {
+  if (creeveyServerHost != null) return creeveyServerHost;
+  const addresses = getAddresses();
+  creeveyServerHost = await browser.executeAsyncScript(function (hosts, port, callback) {
+    void Promise.all(hosts.map(function (host) {
+      return new Promise(function (resolve, reject) {
+        setTimeout(reject, 10000); // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+
+        fetch('http://' + host + ':' + port + '/ping').then(resolve).catch(reject);
+      }).then(function (response) {
+        return response.text();
+      }).then(function (pong) {
+        return pong == 'pong' ? host : null;
+      }).catch(function () {
+        return null;
+      });
+    })).then(function (hosts) {
+      callback(hosts.find(function (host) {
+        return host != null;
+      }));
+    });
+  }, addresses, port);
+  if (creeveyServerHost == null) throw new Error("Can't reach creevey server from a browser");
+  return creeveyServerHost;
+}
+
+export async function loadStoriesFromBrowser(port) {
+  if (!browser) throw new Error("Can't get stories from browser if webdriver isn't connected");
+  const host = await resolveCreeveyHost(browser, port);
+  const stories = await browser.executeAsyncScript(function (creeveyHost, creeveyPort, callback) {
+    window.__CREEVEY_SERVER_HOST__ = creeveyHost;
+    window.__CREEVEY_SERVER_PORT__ = creeveyPort;
+    void window.__CREEVEY_GET_STORIES__().then(callback);
+  }, host, port);
+  if (!stories) throw new Error("Can't get stories, it seems creevey or storybook API isn't available");
+  return stories;
+}
+export async function getBrowser(config, name) {
+  if (browser) return browser;
+  browserName = name;
+  const browserConfig = config.browsers[browserName];
   const {
     gridUrl = config.gridUrl,
     storybookUrl: address = config.storybookUrl,
@@ -398,14 +447,11 @@ export async function getBrowser(config, browserConfig) {
     ...userCapabilities
   } = browserConfig;
   void limit;
-  const {
-    browserName
-  } = userCapabilities;
-  const realAddress = address;
-  let browser = null; // TODO Define some capabilities explicitly and define typings
+  const realAddress = address; // TODO Define some capabilities explicitly and define typings
 
-  const capabilities = new Capabilities(userCapabilities);
-  capabilities.setPageLoadStrategy(PageLoadStrategy.NONE);
+  const capabilities = new Capabilities({ ...userCapabilities,
+    pageLoadStrategy: PageLoadStrategy.NONE
+  });
   subscribeOn('shutdown', () => {
     var _browser;
 
@@ -420,7 +466,7 @@ export async function getBrowser(config, browserConfig) {
     const url = new URL(gridUrl);
     url.username = url.username ? '********' : '';
     url.password = url.password ? '********' : '';
-    browserLogger.debug(`(${browserName}) Connecting to Selenium ${chalk.magenta(url.toString())}`);
+    browserLogger.debug(`(${name}) Connecting to Selenium ${chalk.magenta(url.toString())}`);
     browser = await new Builder().usingServer(gridUrl).withCapabilities(capabilities).build();
     const sessionId = (_await$browser$getSes = await browser.getSession()) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
     let browserHost = '';
@@ -434,12 +480,12 @@ export async function getBrowser(config, browserConfig) {
       /* noop */
     }
 
-    browserLogger.debug(`(${browserName}) Connected successful with ${[chalk.green(browserHost), chalk.magenta(sessionId)].filter(Boolean).join(':')}`);
+    browserLogger.debug(`(${name}) Connected successful with ${[chalk.green(browserHost), chalk.magenta(sessionId)].filter(Boolean).join(':')}`);
     browserLogger = getLogger(sessionId);
     prefix.apply(browserLogger, {
       format(level) {
         const levelColor = colors[level.toUpperCase()];
-        return `[${browserName}:${chalk.gray(sessionId)}] ${levelColor(level)} =>`;
+        return `[${name}:${chalk.gray(sessionId)}] ${levelColor(level)} =>`;
       }
 
     });
@@ -458,6 +504,7 @@ export async function getBrowser(config, browserConfig) {
       var _browser3;
 
       (_browser3 = browser) === null || _browser3 === void 0 ? void 0 : _browser3.quit().catch(noop);
+      browser = null;
       return null;
     }
 
@@ -471,6 +518,9 @@ export async function getBrowser(config, browserConfig) {
     await updateStorybookGlobals(browser, _storybookGlobals);
   }
 
+  await browser.executeScript(function (workerId) {
+    window.__CREEVEY_WORKER_ID__ = workerId;
+  }, process.pid);
   return browser;
 }
 
@@ -486,12 +536,22 @@ async function updateStoryArgs(browser, story, updatedArgs) {
   }, story.id, updatedArgs, Events.UPDATE_STORY_ARGS, Events.STORY_RENDERED);
 }
 
+export async function closeBrowser() {
+  if (!browser) return;
+
+  try {
+    await browser.quit();
+  } finally {
+    browser = null;
+  }
+}
 export async function switchStory() {
   var _this$currentTest, _this$currentTest$ctx, _parameters$creevey;
 
   let testOrSuite = this.currentTest;
   if (!testOrSuite) throw new Error("Can't switch story, because test context doesn't have 'currentTest' field");
   this.testScope.length = 0;
+  this.screenshots.length = 0;
   this.testScope.push(this.browserName);
 
   while ((_testOrSuite = testOrSuite) !== null && _testOrSuite !== void 0 && _testOrSuite.title) {
@@ -515,13 +575,6 @@ export async function switchStory() {
     ignoreElements
   } = (_parameters$creevey = parameters.creevey) !== null && _parameters$creevey !== void 0 ? _parameters$creevey : {};
   browserLogger.debug(`Switching to story ${chalk.cyan(kind)}/${chalk.cyan(name)} by id ${chalk.magenta(id)}`);
-  await resetMousePosition(this.browser);
-  await selectStory(this.browser, {
-    id,
-    kind,
-    name
-  }, waitForReady);
-  browserLogger.debug(`Story ${chalk.magenta(id)} ready for capturing`);
   if (captureElement) Object.defineProperty(this, 'captureElement', {
     enumerable: true,
     configurable: true,
@@ -533,6 +586,46 @@ export async function switchStory() {
   this.updateStoryArgs = updatedArgs => updateStoryArgs(this.browser, story, updatedArgs);
 
   this.testScope.reverse();
+  let storyPlayResolver;
+  let waitForComplete = new Promise(resolve => storyPlayResolver = resolve);
+  const unsubscribe = subscribeOn('stories', message => {
+    var _payload$captureEleme, _payload$ignoreElemen;
+
+    if (message.type != 'capture') return;
+    const {
+      payload = {},
+      payload: {
+        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 => {
+      this.screenshots.push({
+        imageName,
+        screenshot
+      });
+      void this.browser.executeAsyncScript(function (callback) {
+        window.__CREEVEY_HAS_PLAY_COMPLETED_YET__(callback);
+      }).then(isCompleted => storyPlayResolver(isCompleted));
+      emitStoriesMessage({
+        type: 'capture'
+      });
+    });
+  });
+  await resetMousePosition(this.browser);
+  const isCaptureCalled = await selectStory(this.browser, {
+    id,
+    kind,
+    name
+  }, waitForReady);
+
+  if (isCaptureCalled) {
+    while (!(await waitForComplete)) {
+      waitForComplete = new Promise(resolve => storyPlayResolver = resolve);
+    }
+  }
+
+  unsubscribe();
+  browserLogger.debug(`Story ${chalk.magenta(id)} ready for capturing`);
 }
 
 async function insertIgnoreStyles(browser, ignoreElements) {

package/lib/esm/server/stories.js

@@ -4,15 +4,19 @@ import { createHash } from 'crypto';
 import { mapValues, pick } from 'lodash';
 import { isDefined, isFunction, isObject } from '../types';
 import { shouldSkip, removeProps } from './utils';
-import { isStorybookVersionGreaterThan, isStorybookVersionLessThan } from './storybook/helpers';
-import { denormalizeStoryParameters } from '../shared';
+import { isStorybookVersionLessThan } from './storybook/helpers';
 
 function storyTestFabric(delay, testFn) {
   return async function storyTest() {
     var _testFn$call;
 
     delay ? await new Promise(resolve => setTimeout(resolve, delay)) : void 0;
-    await ((_testFn$call = testFn === null || testFn === void 0 ? void 0 : testFn.call(this)) !== null && _testFn$call !== void 0 ? _testFn$call : this.expect(await this.takeScreenshot()).to.matchImage());
+    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, {
+      imageName,
+      screenshot
+    }, index) => ({ ...screenshots,
+      [imageName !== null && imageName !== void 0 ? imageName : `screenshot_${index}`]: screenshot
+    }), {})).to.matchImages() : this.expect(await this.takeScreenshot()).to.matchImage());
   };
 }
 
@@ -38,42 +42,40 @@ function createCreeveyTest(browser, storyMeta, skipOptions, testName) {
   };
 }
 
-function convertStories(browsers, stories) {
+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;
-    browsers.forEach(browserName => {
-      var _storyMeta$parameters;
-
-      const {
-        delay: delayParam,
-        tests: storyTests,
-        skip
-      } = (_storyMeta$parameters = storyMeta.parameters.creevey) !== null && _storyMeta$parameters !== void 0 ? _storyMeta$parameters : {};
-      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]
-      // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> browser -> [images.png]
-
-      if (!storyTests) {
-        const test = createCreeveyTest(browserName, storyMeta, skip);
-        tests[test.id] = { ...test,
-          storyId: storyMeta.id,
-          story: storyMeta,
-          fn: storyTestFabric(delay)
-        };
-        return;
-      }
+    const {
+      delay: delayParam,
+      tests: storyTests,
+      skip
+    } = (_storyMeta$parameters = storyMeta.parameters.creevey) !== null && _storyMeta$parameters !== void 0 ? _storyMeta$parameters : {};
+    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]
+    // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> browser -> [images.png]
+
+    if (!storyTests) {
+      const test = createCreeveyTest(browserName, storyMeta, skip);
+      tests[test.id] = { ...test,
+        storyId: storyMeta.id,
+        story: storyMeta,
+        fn: storyTestFabric(delay)
+      };
+      return;
+    }
 
-      Object.entries(storyTests).forEach(([testName, testFn]) => {
-        const test = createCreeveyTest(browserName, storyMeta, skip, testName);
-        tests[test.id] = { ...test,
-          storyId: storyMeta.id,
-          story: storyMeta,
-          fn: storyTestFabric(delay, testFn)
-        };
-      });
+    Object.entries(storyTests).forEach(([testName, testFn]) => {
+      const test = createCreeveyTest(browserName, storyMeta, skip, testName);
+      tests[test.id] = { ...test,
+        storyId: storyMeta.id,
+        story: storyMeta,
+        fn: storyTestFabric(delay, testFn)
+      };
     });
   });
   return tests;
@@ -81,22 +83,24 @@ function convertStories(browsers, stories) {
 
 export async function loadTestsFromStories(browsers, provider, update) {
   const testIdsByFiles = new Map();
-  const data = await provider(storiesByFiles => {
+  const stories = await provider(storiesByFiles => {
     const testsDiff = {};
-    Array.from(storiesByFiles.entries()).forEach(([filename, stories]) => {
-      var _testIdsByFiles$get$f, _testIdsByFiles$get;
-
-      const tests = convertStories(browsers, 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 : [];
-      if (changed.length == 0) testIdsByFiles.delete(filename);else testIdsByFiles.set(filename, changed);
-      Object.assign(testsDiff, tests);
-      removed.forEach(testId => testsDiff[testId] = undefined);
+    const tests = {};
+    browsers.forEach(browser => {
+      Array.from(storiesByFiles.entries()).forEach(([filename, stories]) => {
+        var _testIdsByFiles$get$f, _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 : [];
+        if (changed.length == 0) testIdsByFiles.delete(filename);else testIdsByFiles.set(filename, changed);
+        Object.assign(testsDiff, tests);
+        removed.forEach(testId => testsDiff[testId] = undefined);
+      });
     });
     update === null || update === void 0 ? void 0 : update(testsDiff);
   });
-  const stories = isStorybookVersionLessThan(6) || isStorybookVersionGreaterThan(6, 3) ? data.stories : denormalizeStoryParameters(data);
-  const tests = convertStories(browsers, stories);
+  const tests = browsers.reduce((tests, browser) => Object.assign(tests, convertStories(browser, stories)), {});
   Object.values(tests).filter(isDefined).forEach(({
     id,
     story: {

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

@@ -0,0 +1,61 @@
+import cluster, { isMaster } 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) {
+    return new Promise(resolve => {
+      const worker = Object.values(cluster.workers).filter(isDefined).find(worker => worker.isConnected());
+
+      if (worker) {
+        const unsubscribe = subscribeOnWorker(worker, 'stories', message => {
+          if (message.type == 'set') {
+            const {
+              stories,
+              oldTests
+            } = message.payload;
+            if (oldTests.length > 0) logger.warn(`If you use browser stories provider of CSFv3 Storybook feature\n` + `Creevey will not load tests defined in story parameters from following stories:\n` + oldTests.join('\n'));
+            unsubscribe();
+            resolve(stories);
+          }
+        });
+        sendStoriesMessage(worker, {
+          type: 'get'
+        });
+      }
+
+      subscribeOn('stories', message => {
+        // TODO updates only one browser :(
+        if (message.type == 'update') storiesListener(new Map(message.payload));
+      });
+    });
+  } else {
+    subscribeOn('stories', message => {
+      if (message.type == 'get') emitStoriesMessage({
+        type: 'set',
+        payload: {
+          stories,
+          oldTests: storiesWithOldTests
+        }
+      });
+      if (message.type == 'update') storiesListener(new Map(message.payload));
+    });
+    const stories = deserializeRawStories(await loadStoriesFromBrowser(port));
+    const storiesWithOldTests = [];
+    Object.values(stories).forEach(story => {
+      var _parameters, _parameters$creevey;
+
+      if ((_parameters = story.parameters) !== null && _parameters !== void 0 && (_parameters$creevey = _parameters.creevey) !== null && _parameters$creevey !== void 0 && _parameters$creevey.tests) {
+        var _parameters2, _parameters2$creevey;
+
+        (_parameters2 = story.parameters) === null || _parameters2 === void 0 ? true : (_parameters2$creevey = _parameters2.creevey) === null || _parameters2$creevey === void 0 ? true : delete _parameters2$creevey.tests;
+        storiesWithOldTests.push(`${story.kind}/${story.name}`);
+      }
+    });
+    return stories;
+  }
+}

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

@@ -0,0 +1,63 @@
+import chokidar from 'chokidar';
+import { loadStories as browserProvider } from './browser';
+import { logger } from '../../logger';
+import parse from '../../parser';
+import { readDirRecursive } from '../../../server/utils';
+import { combineParameters } from '../../../shared';
+export async function loadStories(_config, {
+  port
+}, storiesListener) {
+  let creeveyParamsByStoryId = {};
+
+  const mergeParamsFromTestsToStory = (story, creeveyParams) => {
+    if (story.parameters) {
+      story.parameters.creevey = combineParameters(story.parameters.creevey || {}, creeveyParams);
+    }
+  };
+
+  const stories = await browserProvider(_config, {
+    port
+  }, updatedStoriesByFiles => {
+    Array.from(updatedStoriesByFiles.entries()).forEach(([, storiesArray]) => {
+      storiesArray.forEach(story => {
+        const creeveyParams = creeveyParamsByStoryId[story.id];
+
+        if (creeveyParams) {
+          mergeParamsFromTestsToStory(story, creeveyParams);
+        }
+      });
+    });
+    storiesListener(updatedStoriesByFiles);
+  }); // TODO fix test files hot reloading
+
+  creeveyParamsByStoryId = await parseParams(_config
+  /*, (data) => console.log(data) */
+  );
+  Object.entries(stories).forEach(([storyId, story]) => {
+    mergeParamsFromTestsToStory(story, creeveyParamsByStoryId[storyId]);
+  });
+  return stories;
+}
+
+function parseParams(config, listener) {
+  if (!config.testDir) {
+    return Promise.resolve({});
+  }
+
+  const testFiles = readDirRecursive(config.testDir).filter(file => {
+    var _config$testRegex;
+
+    return (_config$testRegex = config.testRegex) === null || _config$testRegex === void 0 ? void 0 : _config$testRegex.test(file);
+  });
+
+  if (listener) {
+    chokidar.watch(testFiles).on('change', filePath => {
+      logger.debug(`changed: ${filePath}`); // doesn't work, always returns {} due modules caching
+      // see https://github.com/nodejs/modules/issues/307
+
+      void parse(testFiles).then(data => listener(data));
+    });
+  }
+
+  return parse(testFiles);
+}

package/lib/esm/server/storybook/{nodejs-provider.js → providers/nodejs.js}

@@ -2,15 +2,15 @@
 import path from 'path';
 import { isWorker, isMaster } 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 { logger } from '../logger';
-import { denormalizeStoryParameters } from '../../shared';
+import { noop } from '../../../types';
+import { getCreeveyCache } from '../../utils';
+import { subscribeOn } from '../../messages';
+import { importStorybookClientLogger, importStorybookConfig, importStorybookCoreCommon, importStorybookCoreEvents, isStorybookVersionGreaterThan, isStorybookVersionLessThan } from '../helpers';
+import { logger } from '../../logger';
+import { denormalizeStoryParameters } from '../../../shared';
 
 async function initStorybookEnvironment() {
-  // @ts-ignore
+  // @ts-expect-error There is no @types/global-jsdom package
   (await import('global-jsdom')).default(undefined, {
     url: 'http://localhost'
   }); // NOTE Cutoff `jsdom` part from userAgent, because storybook check enviroment and create events channel if runs in browser
@@ -28,7 +28,7 @@ async function initStorybookEnvironment() {
   if (isWorker) logger.warn = noop; // NOTE: disable logger for 5.x storybook
 
   logger.debug = noop;
-  return import('./entry');
+  return import('../entry');
 }
 
 function watchStories(channel, watcher, initialFiles) {
@@ -90,8 +90,8 @@ async function loadStoriesDirectly(config, {
   const {
     addParameters,
     configure
-  } = await import('./entry');
-  const requireContext = await (await import('../loaders/babel/register')).default(config, debug);
+  } = await import('../entry');
+  const requireContext = await (await import('../../loaders/babel/register')).default(config, debug);
 
   const preview = (() => {
     try {
@@ -167,7 +167,8 @@ async function loadStoriesDirectly(config, {
     void startStorybook();
   });
   void startStorybook();
-}
+} // TODO Do we need to support multiple storybooks here?
+
 
 export async function loadStories(config, {
   watch,
@@ -180,7 +181,7 @@ export async function loadStories(config, {
   } = storybookApi;
   channel.removeAllListeners(Events.CURRENT_STORY_WAS_SET);
   channel.on('storiesUpdated', storiesListener);
-  let watcher = null;
+  let watcher;
   if (watch) watcher = chokidar.watch([], {
     ignoreInitial: true
   });
@@ -189,7 +190,7 @@ export async function loadStories(config, {
       const stories = isStorybookVersionLessThan(6) || isStorybookVersionGreaterThan(6, 3) ? data.stories : denormalizeStoryParameters(data);
       const files = new Set(Object.values(stories).map(story => story.parameters.fileName));
       if (watcher) channel.on(Events.SET_STORIES, watchStories(channel, watcher, files));
-      resolve(data);
+      resolve(stories);
     });
   });
   if (config.useWebpackToExtractTests) loadStoriesFromBundle(watch);else void loadStoriesDirectly(config, {
@@ -197,4 +198,20 @@ export async function loadStories(config, {
     debug
   });
   return loadPromise;
+}
+export async function extractStoriesData(config, {
+  watch,
+  debug
+}) {
+  const storybookApi = await initStorybookEnvironment();
+  const Events = await importStorybookCoreEvents();
+  const {
+    channel
+  } = storybookApi;
+  channel.removeAllListeners(Events.CURRENT_STORY_WAS_SET);
+  const loadPromise = new Promise(resolve => channel.once(Events.SET_STORIES, resolve));
+  if (config.useWebpackToExtractTests) loadStoriesFromBundle(watch);else void loadStoriesDirectly(config, {
+    debug
+  });
+  return loadPromise;
 }

package/lib/esm/server/utils.js

@@ -1,4 +1,4 @@
-import { createWriteStream, existsSync, readFileSync, unlink } from 'fs';
+import { createWriteStream, existsSync, readFileSync, readdirSync, unlink } from 'fs';
 import cluster from 'cluster';
 import { isDefined, noop, isFunction } from '../types';
 import { emitShutdownMessage, sendShutdownMessage } from './messages';
@@ -138,4 +138,9 @@ export function removeProps(obj, propPath) {
     if (typeof prop == 'string') delete obj[prop];
     if (isFunction(prop)) Object.keys(obj).filter(prop).forEach(key => delete obj[key]);
   }
+}
+export function readDirRecursive(dirPath) {
+  return [].concat(...readdirSync(dirPath, {
+    withFileTypes: true
+  }).map(dirent => dirent.isDirectory() ? readDirRecursive(`${dirPath}/${dirent.name}`) : [`${dirPath}/${dirent.name}`]));
 }

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

@@ -47,14 +47,10 @@ function removeTestOrSuite(testOrSuite) {
 
 export async function addTestsFromStories(rootSuite, config, {
   browser,
-  watch,
-  debug
+  ...options
 }) {
   const mochaTestsById = new Map();
-  const tests = await loadTestsFromStories([browser], listener => config.storiesProvider(config, {
-    watch,
-    debug
-  }, listener), testsDiff => Object.entries(testsDiff).forEach(([id, newTest]) => {
+  const tests = await loadTestsFromStories([browser], listener => config.storiesProvider(config, options, listener), testsDiff => Object.entries(testsDiff).forEach(([id, newTest]) => {
     const oldTest = mochaTestsById.get(id);
     mochaTestsById.delete(id);
     if (oldTest) removeTestOrSuite(oldTest);