creevey 0.7.39 → 0.9.0-beta.0

package/lib/esm/client/addon/withCreevey.js

@@ -1,3 +1,23 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -6,8 +26,11 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 
 import * as Events from '@storybook/core-events';
 import * as polyfill from 'event-source-polyfill';
+import { buildQueries, within } from '@storybook/testing-library';
 import { addons, makeDecorator } from '@storybook/addons';
 import { isObject, noop } from '../../types';
+import { denormalizeStoryParameters, serializeRawStories } from '../../shared';
+import { getConnectionUrl } from '../shared/helpers';
 
 if ((typeof process === "undefined" ? "undefined" : _typeof(process)) != 'object' || typeof process.version != 'string') {
   // NOTE If you don't use babel-polyfill or any other polyfills that add EventSource for IE11
@@ -27,10 +50,10 @@ function resetCurrentStory(_x) {
 }
 
 function _resetCurrentStory() {
-  _resetCurrentStory = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(channel) {
-    return regeneratorRuntime.wrap(function _callee3$(_context3) {
+  _resetCurrentStory = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(channel) {
+    return regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
             setTimeout(function () {
               return channel.emit(Events.SET_CURRENT_STORY, {
@@ -39,16 +62,16 @@ function _resetCurrentStory() {
                 kind: ''
               });
             }, 0);
-            return _context3.abrupt("return", new Promise(function (resolve) {
+            return _context4.abrupt("return", new Promise(function (resolve) {
               return channel.once(Events.STORY_MISSING, resolve);
             }));
 
           case 2:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
       }
-    }, _callee3);
+    }, _callee4);
   }));
   return _resetCurrentStory.apply(this, arguments);
 }
@@ -122,9 +145,39 @@ function waitForFontsLoaded() {
   }
 }
 
+function waitForCaptureCall() {
+  return new Promise(function (resolve) {
+    return captureResolver = resolve;
+  });
+}
+
+function initCreeveyState() {
+  var _window$localStorage$;
+
+  var prevState = JSON.parse((_window$localStorage$ = window.localStorage.getItem('Creevey_Tests')) !== null && _window$localStorage$ !== void 0 ? _window$localStorage$ : '{}');
+  if (prevState.creeveyHost) window.__CREEVEY_SERVER_HOST__ = prevState.creeveyHost;
+  if (prevState.creeveyPort) window.__CREEVEY_SERVER_PORT__ = prevState.creeveyPort;
+  if (prevState.setStoriesCounter) setStoriesCounter = prevState.setStoriesCounter;
+  if (prevState.isTestBrowser) isTestBrowser = prevState.isTestBrowser;
+  window.addEventListener('beforeunload', function () {
+    window.localStorage.setItem('Creevey_Tests', JSON.stringify({
+      creeveyHost: window.__CREEVEY_SERVER_HOST__,
+      creeveyPort: window.__CREEVEY_SERVER_PORT__,
+      setStoriesCounter: setStoriesCounter,
+      isTestBrowser: isTestBrowser
+    }));
+  });
+}
+
+var isTestBrowser = false;
+var captureResolver;
+var waitForCreevey;
+var creeveyReady;
+var setStoriesCounter = 0;
 export function withCreevey() {
   var currentStory = '';
   var isAnimationDisabled = false;
+  initCreeveyState();
 
   function disableAnimation() {
     isAnimationDisabled = true;
@@ -135,42 +188,129 @@ export function withCreevey() {
     document.head.appendChild(style);
   }
 
+  function getStories() {
+    return _getStories.apply(this, arguments);
+  }
+
+  function _getStories() {
+    _getStories = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var _window$__STORYBOOK_S;
+
+      var storiesPromise, store;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              storiesPromise = new Promise(function (resolve) {
+                return addons.getChannel().once(Events.SET_STORIES, function (data) {
+                  return resolve(serializeRawStories(denormalizeStoryParameters(data)));
+                });
+              });
+              store = (_window$__STORYBOOK_S = window.__STORYBOOK_STORY_STORE__) !== null && _window$__STORYBOOK_S !== void 0 ? _window$__STORYBOOK_S : {}; // @ts-expect-error `pushToManager` exists only in Storybook 6.0 - 6.3
+
+              if (!store.pushToManager) {
+                _context.next = 6;
+                break;
+              }
+
+              // @ts-expect-error `pushToManager` exists only in Storybook 6.0 - 6.3
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+              store.pushToManager();
+              _context.next = 13;
+              break;
+
+            case 6:
+              if (!store.cacheAllCSFFiles) {
+                _context.next = 12;
+                break;
+              }
+
+              _context.next = 9;
+              return store.cacheAllCSFFiles();
+
+            case 9:
+              addons.getChannel().emit(Events.SET_STORIES, store.getSetStoriesPayload());
+              _context.next = 13;
+              break;
+
+            case 12:
+              return _context.abrupt("return");
+
+            case 13:
+              addons.getChannel().on(Events.SET_STORIES, function (data) {
+                // TODO Figure out how to get only updated stories
+                // TODO Subscribe on hmr? like use dummy-hmr
+                setStoriesCounter += 1;
+                var stories = serializeRawStories(denormalizeStoryParameters(data));
+                var storiesByFiles = new Map();
+                Object.values(stories).forEach(function (story) {
+                  var storiesFromFile = storiesByFiles.get(story.parameters.fileName);
+                  if (storiesFromFile) storiesFromFile.push(story);else storiesByFiles.set(story.parameters.fileName, [story]);
+                });
+                void fetch("http://".concat(getConnectionUrl(), "/stories"), {
+                  method: 'POST',
+                  headers: {
+                    'Content-Type': 'application/json'
+                  },
+                  body: JSON.stringify({
+                    setStoriesCounter: setStoriesCounter,
+                    stories: _toConsumableArray(storiesByFiles.entries())
+                  })
+                });
+              });
+              return _context.abrupt("return", storiesPromise);
+
+            case 15:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _getStories.apply(this, arguments);
+  }
+
   function selectStory(_x2, _x3, _x4, _x5, _x6) {
     return _selectStory.apply(this, arguments);
   }
 
   function _selectStory() {
-    _selectStory = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(storyId, kind, name, shouldWaitForReady, callback) {
-      var channel, waitForReady, renderPromise, errorPromise, _reason$stack, errorMessage;
+    _selectStory = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(storyId, kind, name, shouldWaitForReady, callback) {
+      var channel, waitForReady, isCaptureCalled, renderPromise, errorPromise, capturePromise, _reason$stack, errorMessage;
 
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               if (!isAnimationDisabled) disableAnimation();
+              isTestBrowser = true;
               channel = addons.getChannel();
               waitForReady = shouldWaitForReady ? new Promise(function (resolve) {
                 return window.__CREEVEY_SET_READY_FOR_CAPTURE__ = resolve;
               }) : Promise.resolve();
 
               if (!(storyId == currentStory)) {
-                _context2.next = 8;
+                _context3.next = 9;
                 break;
               }
 
-              _context2.next = 6;
+              _context3.next = 7;
               return resetCurrentStory(channel);
 
-            case 6:
-              _context2.next = 9;
+            case 7:
+              _context3.next = 10;
               break;
 
-            case 8:
+            case 9:
               currentStory = storyId;
 
-            case 9:
+            case 10:
+              isCaptureCalled = false;
               renderPromise = waitForStoryRendered(channel);
               errorPromise = catchRenderError(channel);
+              capturePromise = waitForCaptureCall().then(function () {
+                return isCaptureCalled = true;
+              });
               setTimeout(function () {
                 return channel.emit(Events.SET_CURRENT_STORY, {
                   storyId: storyId,
@@ -178,57 +318,57 @@ export function withCreevey() {
                   kind: kind
                 });
               }, 0);
-              _context2.prev = 12;
-              _context2.next = 15;
-              return Promise.race([_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-                return regeneratorRuntime.wrap(function _callee$(_context) {
+              _context3.prev = 15;
+              _context3.next = 18;
+              return Promise.race([_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+                return regeneratorRuntime.wrap(function _callee2$(_context2) {
                   while (1) {
-                    switch (_context.prev = _context.next) {
+                    switch (_context2.prev = _context2.next) {
                       case 0:
-                        _context.next = 2;
-                        return renderPromise;
+                        _context2.next = 2;
+                        return Promise.race([renderPromise, capturePromise]);
 
                       case 2:
-                        _context.next = 4;
+                        _context2.next = 4;
                         return waitForFontsLoaded();
 
                       case 4:
-                        _context.next = 6;
+                        _context2.next = 6;
                         return waitForReady;
 
                       case 6:
                       case "end":
-                        return _context.stop();
+                        return _context2.stop();
                     }
                   }
-                }, _callee);
+                }, _callee2);
               }))(), errorPromise]);
 
-            case 15:
-              callback();
-              _context2.next = 22;
+            case 18:
+              callback([null, isCaptureCalled]);
+              _context3.next = 25;
               break;
 
-            case 18:
-              _context2.prev = 18;
-              _context2.t0 = _context2["catch"](12);
+            case 21:
+              _context3.prev = 21;
+              _context3.t0 = _context3["catch"](15);
               // NOTE Event `STORY_THREW_EXCEPTION` triggered only in react and vue frameworks and return Error instance
               // NOTE Event `STORY_ERRORED` return error-like object without `name` field
-              errorMessage = _context2.t0 instanceof Error ? (_reason$stack = _context2.t0.stack) !== null && _reason$stack !== void 0 ? _reason$stack : _context2.t0.message : isObject(_context2.t0) ? "".concat(_context2.t0.message, "\n    ").concat(_context2.t0.stack) : _context2.t0;
-              callback(errorMessage);
+              errorMessage = _context3.t0 instanceof Error ? (_reason$stack = _context3.t0.stack) !== null && _reason$stack !== void 0 ? _reason$stack : _context3.t0.message : isObject(_context3.t0) ? "".concat(_context3.t0.message, "\n    ").concat(_context3.t0.stack) : _context3.t0;
+              callback([errorMessage]);
 
-            case 22:
-              _context2.prev = 22;
+            case 25:
+              _context3.prev = 25;
               renderPromise.cancel();
               errorPromise.cancel();
-              return _context2.finish(22);
+              return _context3.finish(25);
 
-            case 26:
+            case 29:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, null, [[12, 18, 22, 26]]);
+      }, _callee3, null, [[15, 21, 25, 29]]);
     }));
     return _selectStory.apply(this, arguments);
   }
@@ -255,16 +395,138 @@ export function withCreevey() {
     (_ignoreStyles$parentN = ignoreStyles.parentNode) === null || _ignoreStyles$parentN === void 0 ? void 0 : _ignoreStyles$parentN.removeChild(ignoreStyles);
   }
 
+  function hasPlayCompletedYet(callback) {
+    creeveyReady();
+    var isCaptureCalled = false;
+    var isPlayCompleted = false;
+    var channel = addons.getChannel();
+    void waitForStoryRendered(channel).then(function () {
+      if (isCaptureCalled) return;
+      isPlayCompleted = true;
+      callback(true);
+    });
+    void waitForCaptureCall().then(function () {
+      if (isPlayCompleted) return;
+      isCaptureCalled = true;
+      callback(false);
+    });
+  }
+
+  window.__CREEVEY_GET_STORIES__ = getStories;
   window.__CREEVEY_SELECT_STORY__ = selectStory;
   window.__CREEVEY_UPDATE_GLOBALS__ = updateGlobals;
   window.__CREEVEY_INSERT_IGNORE_STYLES__ = insertIgnoreStyles;
   window.__CREEVEY_REMOVE_IGNORE_STYLES__ = removeIgnoreStyles;
+  window.__CREEVEY_HAS_PLAY_COMPLETED_YET__ = hasPlayCompletedYet;
   window.__CREEVEY_SET_READY_FOR_CAPTURE__ = noop;
+
+  var queryAllByQuery = function queryAllByQuery(container, query) {
+    return _toConsumableArray(container.querySelectorAll(query)).filter(function (e) {
+      return e instanceof HTMLElement;
+    });
+  };
+
+  var getMultipleError = function getMultipleError(_, query) {
+    return "Found multiple elements by query: ".concat(query);
+  };
+
+  var getMissingError = function getMissingError(_, query) {
+    return "Unable to find an element by query: ".concat(query);
+  };
+
+  var _buildQueries = buildQueries(queryAllByQuery, getMultipleError, getMissingError),
+      _buildQueries2 = _slicedToArray(_buildQueries, 5),
+      queryByQuery = _buildQueries2[0],
+      getAllByQuery = _buildQueries2[1],
+      getByQuery = _buildQueries2[2],
+      findAllByQuery = _buildQueries2[3],
+      findByQuery = _buildQueries2[4];
+
+  var queries = {
+    queryByQuery: queryByQuery,
+    getAllByQuery: getAllByQuery,
+    getByQuery: getByQuery,
+    findAllByQuery: findAllByQuery,
+    findByQuery: findByQuery
+  };
   return makeDecorator({
     name: 'withCreevey',
     parameterName: 'creevey',
     wrapper: function wrapper(getStory, context) {
+      var _ref2;
+
+      // TODO Define proper types, like captureElement is a promise
+      var _context$parameters$c = context.parameters.creevey = (_ref2 = context.parameters.creevey) !== null && _ref2 !== void 0 ? _ref2 : {},
+          captureElement = _context$parameters$c.captureElement;
+
+      Object.defineProperty(context.parameters.creevey, 'captureElement', {
+        get: function get() {
+          switch (true) {
+            case captureElement === undefined:
+              return Promise.resolve(context.canvasElement);
+
+            case captureElement === null:
+              return Promise.resolve(document.documentElement);
+
+            case typeof captureElement == 'string':
+              return within(context.canvasElement, queries).findByQuery(captureElement);
+
+            case typeof captureElement == 'function':
+              // TODO Define type for it
+              return Promise.resolve(captureElement(context));
+          }
+        },
+        enumerable: true,
+        configurable: true
+      });
       return getStory(context);
     }
   });
+}
+export function capture(_x7) {
+  return _capture.apply(this, arguments);
+}
+
+function _capture() {
+  _capture = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(options) {
+    return regeneratorRuntime.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            if (isTestBrowser) {
+              _context5.next = 2;
+              break;
+            }
+
+            return _context5.abrupt("return");
+
+          case 2:
+            captureResolver();
+            waitForCreevey = new Promise(function (resolve) {
+              return creeveyReady = resolve;
+            });
+            _context5.next = 6;
+            return fetch("http://".concat(getConnectionUrl(), "/capture"), {
+              method: 'POST',
+              headers: {
+                'Content-Type': 'application/json'
+              },
+              body: JSON.stringify({
+                workerId: window.__CREEVEY_WORKER_ID__,
+                options: options
+              })
+            });
+
+          case 6:
+            _context5.next = 8;
+            return waitForCreevey;
+
+          case 8:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+  return _capture.apply(this, arguments);
 }

package/lib/esm/client/shared/components/ImagesView/BlendView.js

@@ -2,6 +2,7 @@ import React, { useEffect, useRef } from 'react';
 import { getBorderColor, themeBorderColors } from './ImagesView';
 import { styled, withTheme } from '@storybook/theming';
 import { useApplyScale, useCalcScale, useLoadImages } from '../../helpers';
+import { readyForCapture } from '../../../addon/readyForCapture';
 var Container = styled.div({
   position: 'relative',
   display: 'flex',
@@ -41,9 +42,7 @@ export var BlendView = withTheme(function (_ref2) {
   useApplyScale(expectImageRef, scale, loaded);
   useApplyScale(actualImageRef, scale, loaded);
   useEffect(function () {
-    var _window$__CREEVEY_SET, _window;
-
-    if (loaded) (_window$__CREEVEY_SET = (_window = window).__CREEVEY_SET_READY_FOR_CAPTURE__) === null || _window$__CREEVEY_SET === void 0 ? void 0 : _window$__CREEVEY_SET.call(_window);
+    if (loaded) readyForCapture();
   }, [loaded]);
   return /*#__PURE__*/React.createElement(Container, null, /*#__PURE__*/React.createElement(ImageContainer, null, /*#__PURE__*/React.createElement(Image, {
     ref: expectImageRef,

package/lib/esm/client/shared/components/ImagesView/SideBySideView.js

@@ -15,6 +15,7 @@ import { getBorderColor, themeBorderColors } from './ImagesView';
 import { styled, withTheme } from '@storybook/theming';
 import { useApplyScale, useLoadImages, useResizeObserver, getBorderSize } from '../../helpers';
 import { Loader } from '@storybook/components';
+import { readyForCapture } from '../../../addon/readyForCapture';
 var Container = styled.div({
   display: 'flex',
   flexWrap: 'nowrap',
@@ -111,9 +112,7 @@ export var SideBySideView = withTheme(function (_ref3) {
   useApplyScale(expectImageRef, scale);
   useApplyScale(actualImageRef, scale);
   useEffect(function () {
-    var _window$__CREEVEY_SET, _window;
-
-    if (loaded) (_window$__CREEVEY_SET = (_window = window).__CREEVEY_SET_READY_FOR_CAPTURE__) === null || _window$__CREEVEY_SET === void 0 ? void 0 : _window$__CREEVEY_SET.call(_window);
+    if (loaded) readyForCapture();
   }, [loaded]);
   return /*#__PURE__*/React.createElement(Container, {
     ref: containerRef

package/lib/esm/client/shared/components/ImagesView/SlideView.js

@@ -15,6 +15,7 @@ import { styled, withTheme } from '@storybook/theming';
 import { getBorderColor, themeBorderColors } from './ImagesView';
 import { useApplyScale, useCalcScale, useLoadImages } from '../../helpers';
 import { Loader } from '@storybook/components';
+import { readyForCapture } from '../../../addon/readyForCapture';
 var Container = styled.div({
   position: 'relative',
   display: 'flex'
@@ -118,11 +119,10 @@ export var SlideView = withTheme(function (_ref3) {
     }
   }, [loaded]);
   useEffect(function () {
-    var _window$__CREEVEY_SET, _window;
-
-    if (loaded) (_window$__CREEVEY_SET = (_window = window).__CREEVEY_SET_READY_FOR_CAPTURE__) === null || _window$__CREEVEY_SET === void 0 ? void 0 : _window$__CREEVEY_SET.call(_window);
+    if (loaded) readyForCapture();
   }, [loaded]);
   return loaded ? /*#__PURE__*/React.createElement(Container, null, /*#__PURE__*/React.createElement(Input, {
+    "data-testid": "slider",
     type: "range",
     min: 0,
     max: 100,

package/lib/esm/client/shared/components/ImagesView/SwapView.js

@@ -15,6 +15,7 @@ import { getBorderColor, themeBorderColors } from './ImagesView';
 import { styled, withTheme } from '@storybook/theming';
 import { useApplyScale, useCalcScale, useLoadImages } from '../../helpers';
 import { Loader } from '@storybook/components';
+import { readyForCapture } from '../../../addon/readyForCapture';
 var Container = styled.div({
   position: 'relative',
   display: 'flex'
@@ -60,9 +61,7 @@ export var SwapView = withTheme(function (_ref2) {
     });
   }, []);
   useEffect(function () {
-    var _window$__CREEVEY_SET, _window;
-
-    if (loaded) (_window$__CREEVEY_SET = (_window = window).__CREEVEY_SET_READY_FOR_CAPTURE__) === null || _window$__CREEVEY_SET === void 0 ? void 0 : _window$__CREEVEY_SET.call(_window);
+    if (loaded) readyForCapture();
   }, [loaded]);
   return loaded ? /*#__PURE__*/React.createElement(Container, null, /*#__PURE__*/React.createElement(Image, {
     ref: expectImageRef,

package/lib/esm/client/shared/helpers.js

@@ -291,7 +291,7 @@ export function countTestsStatus(suite) {
   };
 }
 export function getConnectionUrl() {
-  return [window.location.hostname, typeof __CREEVEY_SERVER_PORT__ == 'undefined' ? window.location.port : __CREEVEY_SERVER_PORT__].filter(Boolean).join(':');
+  return [typeof __CREEVEY_SERVER_HOST__ == 'undefined' ? window.location.hostname : __CREEVEY_SERVER_HOST__, typeof __CREEVEY_SERVER_PORT__ == 'undefined' ? window.location.port : __CREEVEY_SERVER_PORT__].filter(Boolean).join(':');
 }
 export function getImageUrl(path, imageName) {
   // path => [kind, story, test, browser]

package/lib/esm/index.js

@@ -1,4 +1,7 @@
-export * from './types';
-export * from './client/addon/withCreevey'; // export { loadStories as browserStoriesProvider } from './server/storybook/browser-provider';
+export * from './types'; // export * from './client/addon/withCreevey';
+// export * from './client/addon/readyForCapture';
 
-export { loadStories as nodejsStoriesProvider } from './server/storybook/nodejs-provider';
+export { loadStories as browserStoriesProvider } from './server/storybook/providers/browser';
+export { loadStories as nodejsStoriesProvider } from './server/storybook/providers/nodejs';
+export { loadStories as hybridStoriesProvider } from './server/storybook/providers/hybrid';
+export * from './server/parser';

package/lib/esm/server/config.js

@@ -1,8 +1,8 @@
 import fs from 'fs';
 import path from 'path';
-import { isCSFv3Enabled, isStorybookVersionLessThan, storybookDirRef } from './storybook/helpers';
-import { loadStories as nodejsStoriesProvider } from './storybook/nodejs-provider'; // import { loadStories as browserStoriesProvider } from './storybook/browser-provider';
-
+import { isCSFv3Enabled, isStorybookVersionGreaterThan, isStorybookVersionLessThan, storybookDirRef } from './storybook/helpers';
+import { loadStories as nodejsStoriesProvider } from './storybook/providers/nodejs';
+import { loadStories as browserStoriesProvider } from './storybook/providers/browser';
 import { isDefined } from '../types';
 export const defaultBrowser = 'chrome';
 export const defaultConfig = {
@@ -25,7 +25,8 @@ export const defaultConfig = {
     [defaultBrowser]: true
   },
   hooks: {},
-  babelOptions: _ => _
+  babelOptions: _ => _,
+  testRegex: /.creevey.(t|j)s$/
 };
 
 function normalizeBrowserConfig(name, config) {
@@ -60,7 +61,8 @@ export async function readConfig(options) {
   if (isDefined(configPath)) Object.assign(userConfig, (await import(configPath)).default);
   storybookDirRef.current = userConfig.storybookDir;
   if (isStorybookVersionLessThan(6, 2)) userConfig.useWebpackToExtractTests = true;
-  if (!userConfig.storiesProvider) userConfig.storiesProvider = (await isCSFv3Enabled()) ? nodejsStoriesProvider : nodejsStoriesProvider;
+  if (!userConfig.storiesProvider) userConfig.storiesProvider = (await isCSFv3Enabled()) && isStorybookVersionGreaterThan(5) ? browserStoriesProvider : nodejsStoriesProvider;
+  if (userConfig.storiesProvider == browserStoriesProvider && isStorybookVersionLessThan(6)) throw new Error("Creevey browser stories provider doesn't support Storybook 5.x or older versions");
   if (options.failFast != undefined) userConfig.failFast = Boolean(options.failFast);
   if (options.reportDir) userConfig.reportDir = path.resolve(options.reportDir);
   if (options.screenDir) userConfig.screenDir = path.resolve(options.screenDir); // NOTE: Hack to pass typescript checking

package/lib/esm/server/extract.js

@@ -1,5 +1,8 @@
+import { denormalizeStoryParameters } from '../shared';
 import { subscribeOn } from './messages';
 import { loadTestsFromStories, saveStoriesJson, saveTestsJson } from './stories';
+import { isStorybookVersionGreaterThan, isStorybookVersionLessThan } from './storybook/helpers';
+import { extractStoriesData } from './storybook/providers/nodejs';
 export default async function extract(config, options) {
   if (config.useWebpackToExtractTests && process.env.__CREEVEY_ENV__ != 'test') {
     await new Promise((resolve, reject) => {
@@ -16,12 +19,13 @@ export default async function extract(config, options) {
     });
   }
 
-  const tests = await loadTestsFromStories(Object.keys(config.browsers), async listener => {
-    const stories = await config.storiesProvider(config, {
+  const tests = await loadTestsFromStories(Object.keys(config.browsers), async () => {
+    const data = await extractStoriesData(config, {
       watch: false,
       debug: options.debug
-    }, listener);
-    if (options.extract) saveStoriesJson(stories, options.extract);
+    });
+    const stories = isStorybookVersionLessThan(6) || isStorybookVersionGreaterThan(6, 3) ? data.stories : denormalizeStoryParameters(data);
+    if (options.extract) saveStoriesJson(data, options.extract);
     return stories;
   });
   if (options.tests) saveTestsJson(tests); // eslint-disable-next-line no-process-exit

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
@@ -51,6 +49,7 @@ export default async function (options) {
     case cluster.isMaster:
       {
         logger.info('Starting Master Process');
+        const resolveApi = (await import('./master/server')).default(config.reportDir, port, ui);
         return (await import('./master')).default(config, options, resolveApi);
       }