creevey 0.9.0-beta.2 → 0.9.0-beta.20

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

@@ -3,472 +3,245 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.withCreevey = withCreevey;
 exports.capture = capture;
-
+exports.withCreevey = withCreevey;
 var Events = _interopRequireWildcard(require("@storybook/core-events"));
-
-var polyfill = _interopRequireWildcard(require("event-source-polyfill"));
-
-var _addons = require("@storybook/addons");
-
+var _previewApi = require("@storybook/preview-api");
 var _types = require("../../types");
-
 var _shared = require("../../shared");
-
 var _helpers = require("../shared/helpers");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(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; }
-
-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); }); }; }
-
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-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
-  // You don't get hot reload in IE11. So put polyfill for that to better UX
-  // Don't load in nodejs environment
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  var NativeEventSource = polyfill.NativeEventSource,
-      EventSourcePolyfill = polyfill.EventSourcePolyfill; // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-
-  window.EventSource = NativeEventSource || EventSourcePolyfill;
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const disableAnimationsStyles = `
+*,
+*:hover,
+*::before,
+*::after {
+  animation-delay: -0.0001ms !important;
+  animation-duration: 0s !important;
+  animation-play-state: paused !important;
+  cursor: none !important;
+  caret-color: transparent !important;
+  transition: 0s !important;
 }
-
-var disableAnimationsStyles = "\n*,\n*:hover,\n*::before,\n*::after {\n  animation-delay: -0.0001ms !important;\n  animation-duration: 0s !important;\n  animation-play-state: paused !important;\n  cursor: none !important;\n  caret-color: transparent !important;\n  transition: 0s !important;\n}\n";
-
-function resetCurrentStory(_x) {
-  return _resetCurrentStory.apply(this, arguments);
+`;
+async function resetCurrentStory(channel) {
+  setTimeout(() => channel.emit(Events.SET_CURRENT_STORY, {
+    storyId: true,
+    name: '',
+    kind: ''
+  }), 0);
+  return new Promise(resolve => channel.once(Events.STORY_MISSING, resolve));
 }
-
-function _resetCurrentStory() {
-  _resetCurrentStory = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(channel) {
-    return regeneratorRuntime.wrap(function _callee4$(_context4) {
-      while (1) {
-        switch (_context4.prev = _context4.next) {
-          case 0:
-            setTimeout(function () {
-              return channel.emit(Events.SET_CURRENT_STORY, {
-                storyId: true,
-                name: '',
-                kind: ''
-              });
-            }, 0);
-            return _context4.abrupt("return", new Promise(function (resolve) {
-              return channel.once(Events.STORY_MISSING, resolve);
-            }));
-
-          case 2:
-          case "end":
-            return _context4.stop();
-        }
-      }
-    }, _callee4);
-  }));
-  return _resetCurrentStory.apply(this, arguments);
-}
-
 function catchRenderError(channel) {
-  var rejectCallback;
-  var promise = new Promise(function (_resolve, reject) {
-    return rejectCallback = reject;
-  });
-
+  let rejectCallback;
+  const promise = new Promise((_resolve, reject) => rejectCallback = reject);
   function errorHandler(_ref) {
-    var title = _ref.title,
-        description = _ref.description;
+    let {
+      title,
+      description
+    } = _ref;
     rejectCallback({
       message: title,
       stack: description
     });
   }
-
   function exceptionHandler(exception) {
     rejectCallback(exception);
   }
-
   function removeHandlers() {
     channel.off(Events.STORY_ERRORED, errorHandler);
     channel.off(Events.STORY_THREW_EXCEPTION, errorHandler);
   }
-
   channel.once(Events.STORY_ERRORED, errorHandler);
   channel.once(Events.STORY_THREW_EXCEPTION, exceptionHandler);
   return Object.assign(promise, {
     cancel: removeHandlers
   });
 }
-
 function waitForStoryRendered(channel) {
-  var resolveCallback;
-  var promise = new Promise(function (resolve) {
-    return resolveCallback = resolve;
-  });
-
+  let resolveCallback;
+  const promise = new Promise(resolve => resolveCallback = resolve);
   function renderHandler() {
     resolveCallback();
   }
-
   function removeHandlers() {
     channel.off(Events.STORY_RENDERED, renderHandler);
   }
-
   channel.once(Events.STORY_RENDERED, renderHandler);
   return Object.assign(promise, {
     cancel: removeHandlers
   });
 }
-
 function waitForFontsLoaded() {
   if (!document.fonts) return;
-  var areFontsLoading = Array.from(document.fonts).some(function (font) {
-    return font.status == 'loading';
-  });
-
+  const areFontsLoading = Array.from(document.fonts).some(font => font.status == 'loading');
   if (areFontsLoading) {
-    return new Promise(function (resolve) {
-      var fontsLoadedHandler = function fontsLoadedHandler() {
+    return new Promise(resolve => {
+      const fontsLoadedHandler = () => {
         document.fonts.removeEventListener('loadingdone', fontsLoadedHandler);
         resolve();
       };
-
       document.fonts.addEventListener('loadingdone', fontsLoadedHandler);
     });
   }
 }
-
 function waitForCaptureCall() {
-  return new Promise(function (resolve) {
-    return captureResolver = resolve;
-  });
+  return new Promise(resolve => 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$ : '{}');
+  const prevState = JSON.parse(window.localStorage.getItem('Creevey_Tests') ?? '{}');
   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.addEventListener('beforeunload', () => {
     window.localStorage.setItem('Creevey_Tests', JSON.stringify({
       creeveyHost: window.__CREEVEY_SERVER_HOST__,
       creeveyPort: window.__CREEVEY_SERVER_PORT__,
-      setStoriesCounter: setStoriesCounter,
-      isTestBrowser: isTestBrowser
+      setStoriesCounter,
+      isTestBrowser
     }));
   });
 }
-
-var isTestBrowser = false;
-var captureResolver;
-var waitForCreevey;
-var creeveyReady;
-var setStoriesCounter = 0;
-
+let isTestBrowser = false;
+let captureResolver;
+let waitForCreevey;
+let creeveyReady;
+let setStoriesCounter = 0;
 function withCreevey() {
-  var currentStory = '';
-  var isAnimationDisabled = false;
+  const addonsChannel = () => window.__STORYBOOK_ADDONS_CHANNEL__;
+  let currentStory = '';
+  let isAnimationDisabled = false;
   initCreeveyState();
-
   function disableAnimation() {
     isAnimationDisabled = true;
-    var style = document.createElement('style');
-    var textNode = document.createTextNode(disableAnimationsStyles);
+    const style = document.createElement('style');
+    const textNode = document.createTextNode(disableAnimationsStyles);
     style.setAttribute('type', 'text/css');
     style.appendChild(textNode);
     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.addons.getChannel().once(Events.SET_STORIES, function (data) {
-                  return resolve((0, _shared.serializeRawStories)((0, _shared.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.addons.getChannel().emit(Events.SET_STORIES, store.getSetStoriesPayload());
-
-              _context.next = 13;
-              break;
-
-            case 12:
-              return _context.abrupt("return");
-
-            case 13:
-              _addons.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 = (0, _shared.serializeRawStories)((0, _shared.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((0, _helpers.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);
+  async function getStories() {
+    const stories = (0, _shared.serializeRawStories)(await window.__STORYBOOK_PREVIEW__.extract());
+    const storiesByFiles = new Map();
+    Object.values(stories).forEach(story => {
+      const fileName = story.parameters.fileName;
+      const storiesFromFile = storiesByFiles.get(fileName);
+      if (storiesFromFile) storiesFromFile.push(story);else storiesByFiles.set(fileName, [story]);
+    });
+    void fetch(`http://${(0, _helpers.getConnectionUrl)()}/stories`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        setStoriesCounter,
+        stories: [...storiesByFiles.entries()]
+      })
+    });
+    return stories;
   }
-
-  function _selectStory() {
-    _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 _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              if (!isAnimationDisabled) disableAnimation();
-              isTestBrowser = true;
-              channel = _addons.addons.getChannel();
-              waitForReady = shouldWaitForReady ? new Promise(function (resolve) {
-                return window.__CREEVEY_SET_READY_FOR_CAPTURE__ = resolve;
-              }) : Promise.resolve();
-
-              if (!(storyId == currentStory)) {
-                _context3.next = 9;
-                break;
-              }
-
-              _context3.next = 7;
-              return resetCurrentStory(channel);
-
-            case 7:
-              _context3.next = 10;
-              break;
-
-            case 9:
-              currentStory = storyId;
-
-            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,
-                  name: name,
-                  kind: kind
-                });
-              }, 0);
-              _context3.prev = 15;
-              _context3.next = 18;
-              return Promise.race([_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-                return regeneratorRuntime.wrap(function _callee2$(_context2) {
-                  while (1) {
-                    switch (_context2.prev = _context2.next) {
-                      case 0:
-                        _context2.next = 2;
-                        return Promise.race([renderPromise, capturePromise]);
-
-                      case 2:
-                        _context2.next = 4;
-                        return waitForFontsLoaded();
-
-                      case 4:
-                        _context2.next = 6;
-                        return waitForReady;
-
-                      case 6:
-                      case "end":
-                        return _context2.stop();
-                    }
-                  }
-                }, _callee2);
-              }))(), errorPromise]);
-
-            case 18:
-              callback([null, isCaptureCalled]);
-              _context3.next = 25;
-              break;
-
-            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 = _context3.t0 instanceof Error ? (_reason$stack = _context3.t0.stack) !== null && _reason$stack !== void 0 ? _reason$stack : _context3.t0.message : (0, _types.isObject)(_context3.t0) ? "".concat(_context3.t0.message, "\n    ").concat(_context3.t0.stack) : _context3.t0;
-              callback([errorMessage]);
-
-            case 25:
-              _context3.prev = 25;
-              renderPromise.cancel();
-              errorPromise.cancel();
-              return _context3.finish(25);
-
-            case 29:
-            case "end":
-              return _context3.stop();
-          }
-        }
-      }, _callee3, null, [[15, 21, 25, 29]]);
-    }));
-    return _selectStory.apply(this, arguments);
+  async function selectStory(storyId, kind, name, shouldWaitForReady, callback) {
+    if (!isAnimationDisabled) disableAnimation();
+    isTestBrowser = true;
+    const channel = addonsChannel();
+    const waitForReady = shouldWaitForReady ? new Promise(resolve => window.__CREEVEY_SET_READY_FOR_CAPTURE__ = resolve) : Promise.resolve();
+    if (storyId == currentStory) await resetCurrentStory(channel);else currentStory = storyId;
+    let isCaptureCalled = false;
+    const renderPromise = waitForStoryRendered(channel);
+    const errorPromise = catchRenderError(channel);
+    const capturePromise = waitForCaptureCall().then(() => isCaptureCalled = true);
+    setTimeout(() => channel.emit(Events.SET_CURRENT_STORY, {
+      storyId,
+      name,
+      kind
+    }), 0);
+    try {
+      await Promise.race([(async () => {
+        await Promise.race([renderPromise, capturePromise]);
+        await waitForFontsLoaded();
+        await waitForReady;
+      })(), errorPromise]);
+      callback([null, isCaptureCalled]);
+    } catch (reason) {
+      // 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
+      const errorMessage = reason instanceof Error ? reason.stack ?? reason.message : (0, _types.isObject)(reason) ? `${reason.message}\n    ${reason.stack}` : reason;
+      callback([errorMessage]);
+    } finally {
+      renderPromise.cancel();
+      errorPromise.cancel();
+    }
   }
-
   function updateGlobals(globals) {
-    _addons.addons.getChannel().emit(Events.UPDATE_GLOBALS, {
-      globals: globals
+    addonsChannel().emit(Events.UPDATE_GLOBALS, {
+      globals
     });
   }
-
   function insertIgnoreStyles(ignoreSelectors) {
-    var stylesElement = document.createElement('style');
+    const stylesElement = document.createElement('style');
     stylesElement.setAttribute('type', 'text/css');
     document.head.appendChild(stylesElement);
-    ignoreSelectors.forEach(function (selector) {
-      stylesElement.innerHTML += "\n        ".concat(selector, " {\n          background: #000 !important;\n          box-shadow: none !important;\n          text-shadow: none !important;\n          outline: 0 !important;\n          color: rgba(0,0,0,0) !important;\n        }\n        ").concat(selector, " *, ").concat(selector, "::before, ").concat(selector, "::after {\n          visibility: hidden !important;\n        }\n      ");
+    ignoreSelectors.forEach(selector => {
+      stylesElement.innerHTML += `
+        ${selector} {
+          background: #000 !important;
+          box-shadow: none !important;
+          text-shadow: none !important;
+          outline: 0 !important;
+          color: rgba(0,0,0,0) !important;
+        }
+        ${selector} *, ${selector}::before, ${selector}::after {
+          visibility: hidden !important;
+        }
+      `;
     });
     return stylesElement;
   }
-
   function removeIgnoreStyles(ignoreStyles) {
-    var _ignoreStyles$parentN;
-
-    (_ignoreStyles$parentN = ignoreStyles.parentNode) === null || _ignoreStyles$parentN === void 0 ? void 0 : _ignoreStyles$parentN.removeChild(ignoreStyles);
+    ignoreStyles.parentNode?.removeChild(ignoreStyles);
   }
-
   function hasPlayCompletedYet(callback) {
     creeveyReady();
-    var isCaptureCalled = false;
-    var isPlayCompleted = false;
-
-    var channel = _addons.addons.getChannel();
-
-    void waitForStoryRendered(channel).then(function () {
+    let isCaptureCalled = false;
+    let isPlayCompleted = false;
+    const channel = addonsChannel();
+    void waitForStoryRendered(channel).then(() => {
       if (isCaptureCalled) return;
       isPlayCompleted = true;
       callback(true);
     });
-    void waitForCaptureCall().then(function () {
+    void waitForCaptureCall().then(() => {
       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__ = _types.noop; // const queryAllByQuery = (container: HTMLElement, query: string): HTMLElement[] =>
-  //   [...container.querySelectorAll(query)].filter((e) => e instanceof HTMLElement) as HTMLElement[];
-  // const getMultipleError = (_: Element | null, query: string): string => `Found multiple elements by query: ${query}`;
-  // const getMissingError = (_: Element | null, query: string): string => `Unable to find an element by query: ${query}`;
-  // const [queryByQuery, getAllByQuery, getByQuery, findAllByQuery, findByQuery] = buildQueries(
-  //   queryAllByQuery,
-  //   getMultipleError,
-  //   getMissingError,
-  // );
-  // const queries = {
-  //   queryByQuery,
-  //   getAllByQuery,
-  //   getByQuery,
-  //   findAllByQuery,
-  //   findByQuery,
-  // };
-
-  return (0, _addons.makeDecorator)({
+  window.__CREEVEY_SET_READY_FOR_CAPTURE__ = _types.noop;
+  return (0, _previewApi.makeDecorator)({
     name: 'withCreevey',
     parameterName: 'creevey',
-    wrapper: function wrapper(getStory, context) {
-      var _ref2;
-
+    wrapper: (getStory, context) => {
       // 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;
-
+      const {
+        captureElement
+      } = context.parameters.creevey = context.parameters.creevey ?? {};
       Object.defineProperty(context.parameters.creevey, 'captureElement', {
-        get: function get() {
+        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<typeof queries>(context.canvasElement, queries).findByQuery(captureElement as string);
-
+            case typeof captureElement == 'string':
+              return Promise.resolve(context.canvasElement.querySelector(captureElement));
             case typeof captureElement == 'function':
               // TODO Define type for it
               return Promise.resolve(captureElement(context));
@@ -481,51 +254,19 @@ function withCreevey() {
     }
   });
 }
-
-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((0, _helpers.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);
+async function capture(options) {
+  if (!isTestBrowser) return;
+  captureResolver();
+  waitForCreevey = new Promise(resolve => creeveyReady = resolve);
+  await fetch(`http://${(0, _helpers.getConnectionUrl)()}/capture`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify({
+      workerId: window.__CREEVEY_WORKER_ID__,
+      options
+    })
+  });
+  await waitForCreevey;
 }