creevey 0.7.39 → 0.9.0-beta.0

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

@@ -3,8 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.takeScreenshot = takeScreenshot;
 exports.updateStorybookGlobals = updateStorybookGlobals;
+exports.loadStoriesFromBrowser = loadStoriesFromBrowser;
 exports.getBrowser = getBrowser;
+exports.closeBrowser = closeBrowser;
 exports.switchStory = switchStory;
 
 var _chalk = _interopRequireDefault(require("chalk"));
@@ -39,6 +42,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const DOCKER_INTERNAL = 'host.docker.internal';
 let browserLogger = _logger.logger;
+let browserName = '';
+let browser = null;
+let creeveyServerHost = null;
 
 function getSessionData(grid, sessionId = '') {
   const gridUrl = new URL(grid);
@@ -65,9 +71,13 @@ function getSessionData(grid, sessionId = '') {
   }));
 }
 
+function getAddresses() {
+  return [DOCKER_INTERNAL].concat(...Object.values((0, _os.networkInterfaces)()).filter(_types.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((0, _os.networkInterfaces)()).filter(_types.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(_utils.LOCALHOST_REGEXP, ip);
@@ -366,14 +376,16 @@ async function selectStory(browser, {
   name
 }, waitForReady = false) {
   browserLogger.debug(`Triggering 'SetCurrentStory' event with storyId ${_chalk.default.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;
 }
 
 async function updateStorybookGlobals(browser, globals) {
@@ -413,7 +425,48 @@ async function openStorybookPage(browser, storybookUrl, resolver) {
   }
 }
 
-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;
+}
+
+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;
+}
+
+async function getBrowser(config, name) {
+  if (browser) return browser;
+  browserName = name;
+  const browserConfig = config.browsers[browserName];
   const {
     gridUrl = config.gridUrl,
     storybookUrl: address = config.storybookUrl,
@@ -423,14 +476,11 @@ 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 _seleniumWebdriver.Capabilities(userCapabilities);
-  capabilities.setPageLoadStrategy(_capabilities.PageLoadStrategy.NONE);
+  const capabilities = new _seleniumWebdriver.Capabilities({ ...userCapabilities,
+    pageLoadStrategy: _capabilities.PageLoadStrategy.NONE
+  });
   (0, _messages.subscribeOn)('shutdown', () => {
     var _browser;
 
@@ -445,7 +495,7 @@ 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.default.magenta(url.toString())}`);
+    browserLogger.debug(`(${name}) Connecting to Selenium ${_chalk.default.magenta(url.toString())}`);
     browser = await new _seleniumWebdriver.Builder().usingServer(gridUrl).withCapabilities(capabilities).build();
     const sessionId = (_await$browser$getSes = await browser.getSession()) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
     let browserHost = '';
@@ -459,14 +509,14 @@ async function getBrowser(config, browserConfig) {
       /* noop */
     }
 
-    browserLogger.debug(`(${browserName}) Connected successful with ${[_chalk.default.green(browserHost), _chalk.default.magenta(sessionId)].filter(Boolean).join(':')}`);
+    browserLogger.debug(`(${name}) Connected successful with ${[_chalk.default.green(browserHost), _chalk.default.magenta(sessionId)].filter(Boolean).join(':')}`);
     browserLogger = (0, _loglevel.getLogger)(sessionId);
 
     _loglevelPluginPrefix.default.apply(browserLogger, {
       format(level) {
         const levelColor = _logger.colors[level.toUpperCase()];
 
-        return `[${browserName}:${_chalk.default.gray(sessionId)}] ${levelColor(level)} =>`;
+        return `[${name}:${_chalk.default.gray(sessionId)}] ${levelColor(level)} =>`;
       }
 
     });
@@ -486,6 +536,7 @@ async function getBrowser(config, browserConfig) {
       var _browser3;
 
       (_browser3 = browser) === null || _browser3 === void 0 ? void 0 : _browser3.quit().catch(_types.noop);
+      browser = null;
       return null;
     }
 
@@ -499,6 +550,9 @@ async function getBrowser(config, browserConfig) {
     await updateStorybookGlobals(browser, _storybookGlobals);
   }
 
+  await browser.executeScript(function (workerId) {
+    window.__CREEVEY_WORKER_ID__ = workerId;
+  }, process.pid);
   return browser;
 }
 
@@ -514,12 +568,23 @@ async function updateStoryArgs(browser, story, updatedArgs) {
   }, story.id, updatedArgs, Events.UPDATE_STORY_ARGS, Events.STORY_RENDERED);
 }
 
+async function closeBrowser() {
+  if (!browser) return;
+
+  try {
+    await browser.quit();
+  } finally {
+    browser = null;
+  }
+}
+
 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) {
@@ -543,13 +608,6 @@ async function switchStory() {
     ignoreElements
   } = (_parameters$creevey = parameters.creevey) !== null && _parameters$creevey !== void 0 ? _parameters$creevey : {};
   browserLogger.debug(`Switching to story ${_chalk.default.cyan(kind)}/${_chalk.default.cyan(name)} by id ${_chalk.default.magenta(id)}`);
-  await resetMousePosition(this.browser);
-  await selectStory(this.browser, {
-    id,
-    kind,
-    name
-  }, waitForReady);
-  browserLogger.debug(`Story ${_chalk.default.magenta(id)} ready for capturing`);
   if (captureElement) Object.defineProperty(this, 'captureElement', {
     enumerable: true,
     configurable: true,
@@ -561,6 +619,46 @@ 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 = (0, _messages.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));
+      (0, _messages.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.default.magenta(id)} ready for capturing`);
 }
 
 async function insertIgnoreStyles(browser, ignoreElements) {

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

@@ -51,7 +51,7 @@ async function createSelenoidConfig(browsers, {
     selenoidConfig[browserName].versions[version] = {
       image: useDocker ? dockerImage : webdriverCommand,
       port: '4444',
-      path: !useDocker || ['chrome', 'opera', 'webkit'].includes(browserName) ? '/' : '/wd/hub'
+      path: !useDocker || ['chrome', 'opera', 'webkit', 'MicrosoftEdge'].includes(browserName) ? '/' : '/wd/hub'
     };
   });
   await mkdirAsync(selenoidConfigDir, {

package/lib/cjs/server/stories.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.flatStories = flatStories;
 exports.loadTestsFromStories = loadTestsFromStories;
 exports.saveStoriesJson = saveStoriesJson;
 exports.saveTestsJson = saveTestsJson;
@@ -29,7 +28,12 @@ function storyTestFabric(delay, testFn) {
     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());
   };
 }
 
@@ -55,78 +59,65 @@ 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;
-} // TODO use the storybook version, after the fix of skip option API
-
-
-function flatStories({
-  globalParameters,
-  kindParameters,
-  stories
-}) {
-  Object.values(stories).forEach(story => {
-    // NOTE: Copy-paste merge parameters from storybook
-    story.parameters = (0, _lodash.mergeWith)({}, globalParameters, kindParameters[story.kind], story.parameters, (objValue, srcValue) => Array.isArray(objValue) ? objValue.concat(srcValue) : undefined);
-  });
-  return stories;
 }
 
 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 = (0, _helpers.isStorybookVersionLessThan)(6) ? data.stories : flatStories(data);
-  const tests = convertStories(browsers, stories);
+  const tests = browsers.reduce((tests, browser) => Object.assign(tests, convertStories(browser, stories)), {});
   Object.values(tests).filter(_types.isDefined).forEach(({
     id,
     story: {

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.raw = exports.getStorybook = exports.setAddon = exports.clearDecorators = exports.addParameters = exports.addDecorator = exports.configure = exports.storiesOf = exports.forceReRender = exports.clientApi = exports.channel = void 0;
 
+var _addons = require("@storybook/addons");
+
 var _helpers = require("./helpers");
 
 var _api$channel, _api$context;
@@ -16,10 +18,8 @@ const core = require((0, _helpers.resolveFromStorybook)('@storybook/core')); //@
 
 
 const start = (0, _helpers.isStorybookVersionLessThan)(6, 2) ? core.default.start : core.start;
-const api = start(() => void 0); //@ts-expect-error: 6.x has { channel }, but 5.x has { context: { channel } }
-// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-
-const channel = (_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;
+const api = start(() => void 0);
+const channel = (0, _helpers.isStorybookVersionLessThan)(6, 4) ? (_api$channel = api.channel) !== null && _api$channel !== void 0 ? _api$channel : (_api$context = api.context) === null || _api$context === void 0 ? void 0 : _api$context.channel : _addons.addons.getChannel();
 exports.channel = channel;
 const clientApi = api.clientApi;
 exports.clientApi = clientApi;
@@ -38,6 +38,7 @@ const configure = (...args) => {
   if ((0, _helpers.isStorybookVersionLessThan)(5, 2)) {
     //NOTE: Storybook <= 5.1 pass args as is
     //@ts-expect-error: ignore it
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
     return api.configApi.configure(...args);
   }
 

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

@@ -7,6 +7,7 @@ exports.hasDocsAddon = hasDocsAddon;
 exports.hasSvelteCSFAddon = hasSvelteCSFAddon;
 exports.getStorybookVersion = getStorybookVersion;
 exports.isStorybookVersionLessThan = isStorybookVersionLessThan;
+exports.isStorybookVersionGreaterThan = isStorybookVersionGreaterThan;
 exports.isStorybookVersion = isStorybookVersion;
 exports.getStorybookFramework = getStorybookFramework;
 exports.importStorybookConfig = importStorybookConfig;
@@ -97,17 +98,24 @@ function isStorybookVersionLessThan(major, minor) {
   return Number(sbMajor) < major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) < minor;
 }
 
-function isStorybookVersion(major, minor) {
+function isStorybookVersionGreaterThan(major, minor) {
   var _process$env$__CREEVE2;
 
   const [sbMajor, sbMinor] = ((_process$env$__CREEVE2 = process.env.__CREEVEY_STORYBOOK_VERSION__) !== null && _process$env$__CREEVE2 !== void 0 ? _process$env$__CREEVE2 : getStorybookVersion()).split('.');
+  return Number(sbMajor) > major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) > minor;
+}
+
+function isStorybookVersion(major, minor) {
+  var _process$env$__CREEVE3;
+
+  const [sbMajor, sbMinor] = ((_process$env$__CREEVE3 = process.env.__CREEVEY_STORYBOOK_VERSION__) !== null && _process$env$__CREEVE3 !== void 0 ? _process$env$__CREEVE3 : getStorybookVersion()).split('.');
   return Number(sbMajor) == major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) == minor;
 }
 
 function getStorybookFramework() {
-  var _process$env$__CREEVE3;
+  var _process$env$__CREEVE4;
 
-  const framework = (_process$env$__CREEVE3 = process.env.__CREEVEY_STORYBOOK_FRAMEWORK__) !== null && _process$env$__CREEVE3 !== void 0 ? _process$env$__CREEVE3 : supportedFrameworks.find(framework => {
+  const framework = (_process$env$__CREEVE4 = process.env.__CREEVEY_STORYBOOK_FRAMEWORK__) !== null && _process$env$__CREEVE4 !== void 0 ? _process$env$__CREEVE4 : supportedFrameworks.find(framework => {
     try {
       return require.resolve(resolveFromStorybook(`@storybook/${framework}`));
     } catch (_) {

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

@@ -0,0 +1,78 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadStories = loadStories;
+
+var _cluster = _interopRequireWildcard(require("cluster"));
+
+var _selenium = require("../../selenium");
+
+var _messages = require("../../messages");
+
+var _shared = require("../../../shared");
+
+var _types = require("../../../types");
+
+var _logger = require("../../logger");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+async function loadStories(_config, {
+  port
+}, storiesListener) {
+  if (_cluster.isMaster) {
+    return new Promise(resolve => {
+      const worker = Object.values(_cluster.default.workers).filter(_types.isDefined).find(worker => worker.isConnected());
+
+      if (worker) {
+        const unsubscribe = (0, _messages.subscribeOnWorker)(worker, 'stories', message => {
+          if (message.type == 'set') {
+            const {
+              stories,
+              oldTests
+            } = message.payload;
+            if (oldTests.length > 0) _logger.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);
+          }
+        });
+        (0, _messages.sendStoriesMessage)(worker, {
+          type: 'get'
+        });
+      }
+
+      (0, _messages.subscribeOn)('stories', message => {
+        // TODO updates only one browser :(
+        if (message.type == 'update') storiesListener(new Map(message.payload));
+      });
+    });
+  } else {
+    (0, _messages.subscribeOn)('stories', message => {
+      if (message.type == 'get') (0, _messages.emitStoriesMessage)({
+        type: 'set',
+        payload: {
+          stories,
+          oldTests: storiesWithOldTests
+        }
+      });
+      if (message.type == 'update') storiesListener(new Map(message.payload));
+    });
+    const stories = (0, _shared.deserializeRawStories)(await (0, _selenium.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/cjs/server/storybook/providers/hybrid.js

@@ -0,0 +1,79 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadStories = loadStories;
+
+var _chokidar = _interopRequireDefault(require("chokidar"));
+
+var _browser = require("./browser");
+
+var _logger = require("../../logger");
+
+var _parser = _interopRequireDefault(require("../../parser"));
+
+var _utils = require("../../../server/utils");
+
+var _shared = require("../../../shared");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+async function loadStories(_config, {
+  port
+}, storiesListener) {
+  let creeveyParamsByStoryId = {};
+
+  const mergeParamsFromTestsToStory = (story, creeveyParams) => {
+    if (story.parameters) {
+      story.parameters.creevey = (0, _shared.combineParameters)(story.parameters.creevey || {}, creeveyParams);
+    }
+  };
+
+  const stories = await (0, _browser.loadStories)(_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 = (0, _utils.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.default.watch(testFiles).on('change', filePath => {
+      _logger.logger.debug(`changed: ${filePath}`); // doesn't work, always returns {} due modules caching
+      // see https://github.com/nodejs/modules/issues/307
+
+
+      void (0, _parser.default)(testFiles).then(data => listener(data));
+    });
+  }
+
+  return (0, _parser.default)(testFiles);
+}