creevey 0.9.0-beta.13 → 0.9.0-beta.14

package/lib/cjs/client/addon/components/Tools.js

@@ -4,25 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Tools = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _components = require("@storybook/components");
-
 var _Icons = require("./Icons");
-
 var _qs = require("qs");
-
 var _theming = require("@storybook/theming");
-
 var _types = require("../../../types");
-
 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 (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 _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 Button = (0, _theming.styled)(_components.IconButton)({
   '&:disabled': {
     opacity: 0.5,
@@ -32,7 +22,6 @@ const Button = (0, _theming.styled)(_components.IconButton)({
     color: 'inherit'
   }
 });
-
 const Tools = _ref => {
   let {
     manager
@@ -57,29 +46,30 @@ const Tools = _ref => {
     return unsubscribe;
   }, [manager]);
   if (!test) return null;
-
   function renderButton(type, title, onClick, icon) {
     const handleClick = () => {
       setButtonClicked(type);
       onClick();
     };
-
     const disabled = isRunning && buttonClicked != null && buttonClicked !== type;
-    return /*#__PURE__*/_react.default.createElement(Button, {
-      onClick: () => {
-        isRunning ? manager.onStop() : handleClick();
-      },
-      title: disabled ? '' : title,
-      disabled: disabled
-    }, buttonClicked === type && isRunning ? /*#__PURE__*/_react.default.createElement(_components.Icons, {
-      icon: 'stop'
-    }) : icon);
+    return (
+      /*#__PURE__*/
+      // @ts-expect-error Fixed in https://github.com/storybookjs/storybook/pull/26623
+      _react.default.createElement(Button, {
+        onClick: () => {
+          isRunning ? manager.onStop() : handleClick();
+        },
+        title: disabled ? '' : title,
+        disabled: disabled
+      }, buttonClicked === type && isRunning ? /*#__PURE__*/_react.default.createElement(_components.Icons, {
+        icon: 'stop'
+      }) : icon)
+    );
   }
-
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_components.IconButton, {
-    href: "http://localhost:".concat(__CREEVEY_CLIENT_PORT__ || __CREEVEY_SERVER_PORT__ || 3000, "/?").concat((0, _qs.stringify)({
+    href: `http://localhost:${__CREEVEY_CLIENT_PORT__ || __CREEVEY_SERVER_PORT__ || 3000}/?${(0, _qs.stringify)({
       testPath: (0, _helpers.getTestPath)(test)
-    })),
+    })}`,
     target: "_blank",
     title: "Show in Creevey UI"
   }, /*#__PURE__*/_react.default.createElement(_components.Icons, {
@@ -91,5 +81,4 @@ const Tools = _ref => {
     icon: "play"
   })));
 };
-
 exports.Tools = Tools;

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

@@ -4,8 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.decorators = void 0;
-
 var _withCreevey = require("./withCreevey");
-
-const decorators = [(0, _withCreevey.withCreevey)()];
-exports.decorators = decorators;
+const decorators = exports.decorators = [(0, _withCreevey.withCreevey)()];

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

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _withCreevey = require("./withCreevey");
-
 Object.keys(_withCreevey).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _withCreevey[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_withCreevey).forEach(function (key) {
     }
   });
 });
-
 var _readyForCapture = require("./readyForCapture");
-
 Object.keys(_readyForCapture).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _readyForCapture[key]) return;

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

@@ -3,15 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.config = config;
-exports.managerEntries = managerEntries;
-
-function config() {
-  let entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return [...entry, require.resolve('./decorator')];
-}
-
-function managerEntries() {
-  let entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return [...entry, require.resolve('./register')];
-}
+exports.previewAnnotations = exports.managerEntries = void 0;
+const previewAnnotations = exports.previewAnnotations = [require.resolve('./preview')];
+const managerEntries = exports.managerEntries = [require.resolve('./register')];

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

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _withCreevey = require("./withCreevey");
-
 const preview = {
   decorators: [(0, _withCreevey.withCreevey)()]
 };
-var _default = preview;
-exports.default = _default;
+var _default = exports.default = preview;

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

@@ -4,9 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.readyForCapture = readyForCapture;
-
 function readyForCapture() {
-  var _window$__CREEVEY_SET, _window;
-
-  (_window$__CREEVEY_SET = (_window = window).__CREEVEY_SET_READY_FOR_CAPTURE__) === null || _window$__CREEVEY_SET === void 0 ? void 0 : _window$__CREEVEY_SET.call(_window);
+  window.__CREEVEY_SET_READY_FOR_CAPTURE__?.();
 }

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

@@ -5,64 +5,49 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ADDON_ID = void 0;
 exports.registerCreeveyPanels = registerCreeveyPanels;
-
-var _addons = require("@storybook/addons");
-
+var _managerApi = require("@storybook/manager-api");
 var _react = _interopRequireDefault(require("react"));
-
 var _Addon = require("./components/Addon");
-
 var _Tools = require("./components/Tools");
-
 var _Manager = require("./Manager");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const ADDON_ID = 'creevey';
-exports.ADDON_ID = ADDON_ID;
-
-_addons.addons.register(ADDON_ID, api => {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const ADDON_ID = exports.ADDON_ID = 'creevey';
+_managerApi.addons.register(ADDON_ID, api => {
   void registerCreeveyPanels(api);
 });
-
 async function registerCreeveyPanels(storybookApi) {
   const manager = new _Manager.CreeveyManager(storybookApi);
-
-  _addons.addons.addPanel("".concat(ADDON_ID, "/panel/run"), {
-    title: "Creevey/Run",
+  _managerApi.addons.add(`${ADDON_ID}/panel/run`, {
+    title: `Creevey/Run`,
     match: _ref => {
       let {
         viewMode
       } = _ref;
       return !!(viewMode && /^story$/.exec(viewMode));
     },
-    type: _addons.types.TOOL,
+    type: _managerApi.types.TOOL,
     // eslint-disable-next-line react/display-name
     render: () => /*#__PURE__*/_react.default.createElement(_Tools.Tools, {
       manager
     })
   });
-
   await manager.initAll();
   const browsers = manager.getBrowsers();
   browsers.forEach(browser => {
-    const panelId = "".concat(ADDON_ID, "/panel/").concat(browser);
+    const panelId = `${ADDON_ID}/panel/${browser}`;
     const title = manager.getTabTitle(browser);
-
-    _addons.addons.addPanel(panelId, {
+    _managerApi.addons.add(panelId, {
       title,
-      type: _addons.types.PANEL,
+      type: _managerApi.types.PANEL,
       paramKey: browser,
       // NOTE key = PANEL_ID needs to correct render button in addons panel
       // eslint-disable-next-line react/display-name
       render: _ref2 => {
         let {
-          active,
-          key
+          active
         } = _ref2;
         return /*#__PURE__*/_react.default.createElement(_Addon.Addon, {
           active,
-          key,
           manager,
           browser
         });

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

@@ -5,31 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getEmojiByTestStatus = getEmojiByTestStatus;
 exports.isInternetExplorer = void 0;
-
 function getEmojiByTestStatus(status) {
   let skip = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
   switch (status) {
     case 'failed':
       {
         return '❌';
       }
-
     case 'success':
       {
         return '✔';
       }
-
     case 'running':
       {
         return '🟡';
       }
-
     case 'pending':
       {
         return '🕗';
       }
-
     default:
       {
         if (skip) return '⏸';
@@ -37,6 +31,4 @@ function getEmojiByTestStatus(status) {
       }
   }
 }
-
-const isInternetExplorer = navigator.userAgent.includes('Trident/');
-exports.isInternetExplorer = isInternetExplorer;
+const isInternetExplorer = exports.isInternetExplorer = navigator.userAgent.includes('Trident/');

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

@@ -5,40 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 (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; }
-
-// import { buildQueries, within } from '@storybook/testing-library';
-// import { isInternetExplorer } from './utils';
-if (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
-  const {
-    NativeEventSource,
-    EventSourcePolyfill
-  } = polyfill; // 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;
 }
-
-const 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";
-
+`;
 async function resetCurrentStory(channel) {
   setTimeout(() => channel.emit(Events.SET_CURRENT_STORY, {
     storyId: true,
@@ -47,11 +33,9 @@ async function resetCurrentStory(channel) {
   }), 0);
   return new Promise(resolve => channel.once(Events.STORY_MISSING, resolve));
 }
-
 function catchRenderError(channel) {
   let rejectCallback;
   const promise = new Promise((_resolve, reject) => rejectCallback = reject);
-
   function errorHandler(_ref) {
     let {
       title,
@@ -62,65 +46,51 @@ function catchRenderError(channel) {
       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) {
   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;
   const areFontsLoading = Array.from(document.fonts).some(font => font.status == 'loading');
-
   if (areFontsLoading) {
     return new Promise(resolve => {
       const fontsLoadedHandler = () => {
         document.fonts.removeEventListener('loadingdone', fontsLoadedHandler);
         resolve();
       };
-
       document.fonts.addEventListener('loadingdone', fontsLoadedHandler);
     });
   }
 }
-
 function waitForCaptureCall() {
   return new Promise(resolve => captureResolver = resolve);
 }
-
 function initCreeveyState() {
-  var _window$localStorage$;
-
-  const 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;
@@ -134,18 +104,16 @@ function initCreeveyState() {
     }));
   });
 }
-
 let isTestBrowser = false;
 let captureResolver;
 let waitForCreevey;
 let creeveyReady;
 let setStoriesCounter = 0;
-
 function withCreevey() {
+  const addonsChannel = () => window.__STORYBOOK_ADDONS_CHANNEL__;
   let currentStory = '';
   let isAnimationDisabled = false;
   initCreeveyState();
-
   function disableAnimation() {
     isAnimationDisabled = true;
     const style = document.createElement('style');
@@ -154,50 +122,30 @@ function withCreevey() {
     style.appendChild(textNode);
     document.head.appendChild(style);
   }
-
   async function getStories() {
-    var _window$__STORYBOOK_S;
-
-    const storiesPromise = new Promise(resolve => _addons.addons.getChannel().once(Events.SET_STORIES, data => resolve((0, _shared.serializeRawStories)((0, _shared.denormalizeStoryParameters)(data)))));
-    const store = (_window$__STORYBOOK_S = window.__STORYBOOK_STORY_STORE__) !== null && _window$__STORYBOOK_S !== void 0 ? _window$__STORYBOOK_S : {};
-
-    if (store.cacheAllCSFFiles) {
-      await store.cacheAllCSFFiles();
-
-      _addons.addons.getChannel().emit(Events.SET_STORIES, store.getSetStoriesPayload());
-    } else return;
-
-    _addons.addons.getChannel().on(Events.SET_STORIES, data => {
-      // TODO Figure out how to get only updated stories
-      // TODO Subscribe on hmr? like use dummy-hmr
-      setStoriesCounter += 1;
-      const stories = (0, _shared.serializeRawStories)((0, _shared.denormalizeStoryParameters)(data));
-      const storiesByFiles = new Map();
-      Object.values(stories).forEach(story => {
-        const 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,
-          stories: [...storiesByFiles.entries()]
-        })
-      });
+    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]);
     });
-
-    return storiesPromise;
+    void fetch(`http://${(0, _helpers.getConnectionUrl)()}/stories`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        setStoriesCounter,
+        stories: [...storiesByFiles.entries()]
+      })
+    });
+    return stories;
   }
-
   async function selectStory(storyId, kind, name, shouldWaitForReady, callback) {
     if (!isAnimationDisabled) disableAnimation();
     isTestBrowser = true;
-
-    const channel = _addons.addons.getChannel();
-
+    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;
@@ -209,7 +157,6 @@ function withCreevey() {
       name,
       kind
     }), 0);
-
     try {
       await Promise.race([(async () => {
         await Promise.race([renderPromise, capturePromise]);
@@ -218,47 +165,48 @@ function withCreevey() {
       })(), errorPromise]);
       callback([null, isCaptureCalled]);
     } catch (reason) {
-      var _reason$stack;
-
       // 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.stack) !== null && _reason$stack !== void 0 ? _reason$stack : reason.message : (0, _types.isObject)(reason) ? "".concat(reason.message, "\n    ").concat(reason.stack) : reason;
+      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, {
+    addonsChannel().emit(Events.UPDATE_GLOBALS, {
       globals
     });
   }
-
   function insertIgnoreStyles(ignoreSelectors) {
     const stylesElement = document.createElement('style');
     stylesElement.setAttribute('type', 'text/css');
     document.head.appendChild(stylesElement);
     ignoreSelectors.forEach(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      ");
+      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();
     let isCaptureCalled = false;
     let isPlayCompleted = false;
-
-    const channel = _addons.addons.getChannel();
-
+    const channel = addonsChannel();
     void waitForStoryRendered(channel).then(() => {
       if (isCaptureCalled) return;
       isPlayCompleted = true;
@@ -270,61 +218,35 @@ function withCreevey() {
       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: (getStory, context) => {
-      var _ref2;
-
       // TODO Define proper types, like captureElement is a promise
       const {
         captureElement
-      } = context.parameters.creevey = (_ref2 = context.parameters.creevey) !== null && _ref2 !== void 0 ? _ref2 : {};
+      } = context.parameters.creevey = context.parameters.creevey ?? {};
       Object.defineProperty(context.parameters.creevey, 'captureElement', {
         get() {
           switch (true) {
             case captureElement === undefined:
               return Promise.resolve(context.canvasElement);
-
             case captureElement === null:
               return Promise.resolve(document.documentElement);
-
             case typeof captureElement == 'string':
               return Promise.resolve(context.canvasElement.querySelector(captureElement));
-            // return isInternetExplorer // some code from testing-library makes IE hang
-            //   ? Promise.resolve(context.canvasElement.querySelector(captureElement as string))
-            //   : within<typeof queries>(context.canvasElement, queries).findByQuery(captureElement as string);
-
             case typeof captureElement == 'function':
               // TODO Define type for it
               return Promise.resolve(captureElement(context));
           }
         },
-
         enumerable: true,
         configurable: true
       });
@@ -332,12 +254,11 @@ function withCreevey() {
     }
   });
 }
-
 async function capture(options) {
   if (!isTestBrowser) return;
   captureResolver();
   waitForCreevey = new Promise(resolve => creeveyReady = resolve);
-  await fetch("http://".concat((0, _helpers.getConnectionUrl)(), "/capture"), {
+  await fetch(`http://${(0, _helpers.getConnectionUrl)()}/capture`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json'