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

package/lib/esm/client/addon/components/Icons.js

@@ -1,7 +1,9 @@
 import React from 'react';
-export var NextIcon = function NextIcon(_ref) {
-  var width = _ref.width,
-      height = _ref.height;
+export const NextIcon = _ref => {
+  let {
+    width,
+    height
+  } = _ref;
   return /*#__PURE__*/React.createElement("svg", {
     version: "1.1",
     width: width,
@@ -12,9 +14,11 @@ export var NextIcon = function NextIcon(_ref) {
     fill: "currentColor"
   }));
 };
-export var ForwardIcon = function ForwardIcon(_ref2) {
-  var width = _ref2.width,
-      height = _ref2.height;
+export const ForwardIcon = _ref2 => {
+  let {
+    width,
+    height
+  } = _ref2;
   return /*#__PURE__*/React.createElement("svg", {
     version: "1.1",
     width: width,

package/lib/esm/client/addon/components/Panel.js

@@ -4,40 +4,42 @@ import { ResultsPage } from '../../shared/components/ResultsPage';
 import { styled } from '@storybook/theming';
 import { getTestPath } from '../../shared/helpers';
 import TestSelect from './TestSelect';
-var Wrapper = styled.div(function (_ref) {
-  var isRunning = _ref.isRunning;
+const Wrapper = styled.div(_ref => {
+  let {
+    isRunning
+  } = _ref;
   return {
     opacity: isRunning ? 0.5 : 1,
     height: '100%'
   };
 });
-var TestSelectContainer = styled.div(function (_ref2) {
-  var theme = _ref2.theme;
+const TestSelectContainer = styled.div(_ref2 => {
+  let {
+    theme
+  } = _ref2;
   return {
     padding: '8px',
-    border: "1px solid ".concat(theme.appBorderColor)
+    border: `1px solid ${theme.appBorderColor}`
   };
 });
-export var Panel = function Panel(_ref3) {
-  var _result$results, _result$results$lengt, _result$results2;
-
-  var tests = _ref3.tests,
-      selectedTestId = _ref3.selectedTestId,
-      onChangeTest = _ref3.onChangeTest,
-      onImageApprove = _ref3.onImageApprove;
-  var result = tests.find(function (x) {
-    return x.id === selectedTestId;
-  });
-  var isRunning = (result === null || result === void 0 ? void 0 : result.status) === 'running';
+export const Panel = _ref3 => {
+  let {
+    tests,
+    selectedTestId,
+    onChangeTest,
+    onImageApprove
+  } = _ref3;
+  const result = tests.find(x => x.id === selectedTestId);
+  const isRunning = result?.status === 'running';
   return /*#__PURE__*/React.createElement("div", null, tests.length > 1 && /*#__PURE__*/React.createElement(TestSelectContainer, null, /*#__PURE__*/React.createElement(TestSelect, {
     tests: tests,
     selectedTestId: selectedTestId,
     onChangeTest: onChangeTest
-  })), isRunning && /*#__PURE__*/React.createElement(Loader, null), result !== null && result !== void 0 && (_result$results = result.results) !== null && _result$results !== void 0 && _result$results.length ? /*#__PURE__*/React.createElement(Wrapper, {
+  })), isRunning && /*#__PURE__*/React.createElement(Loader, null), result?.results?.length ? /*#__PURE__*/React.createElement(Wrapper, {
     isRunning: isRunning
   }, /*#__PURE__*/React.createElement(ResultsPage, {
     height: '100%',
-    key: "".concat(result.id, "_").concat((_result$results$lengt = (_result$results2 = result.results) === null || _result$results2 === void 0 ? void 0 : _result$results2.length) !== null && _result$results$lengt !== void 0 ? _result$results$lengt : 0) // TODO
+    key: `${result.id}_${result.results?.length ?? 0}` // TODO
     ,
     id: result.id,
     path: getTestPath(result) // TODO Memo?

package/lib/esm/client/addon/components/TestSelect.js

@@ -2,8 +2,10 @@ import { Button, Icons, TooltipLinkList, WithTooltip } from '@storybook/componen
 import { styled } from '@storybook/theming';
 import React from 'react';
 import { getEmojiByTestStatus } from '../utils';
-var LinkIconContainer = styled.span(function (_ref) {
-  var theme = _ref.theme;
+const LinkIconContainer = styled.span(_ref => {
+  let {
+    theme
+  } = _ref;
   return {
     display: 'inline-block',
     width: '20px',
@@ -12,32 +14,26 @@ var LinkIconContainer = styled.span(function (_ref) {
   };
 });
 export default function TestSelect(props) {
-  var _props$tests$find$tes, _props$tests$find;
-
-  var testName = (_props$tests$find$tes = (_props$tests$find = props.tests.find(function (x) {
-    return x.id === props.selectedTestId;
-  })) === null || _props$tests$find === void 0 ? void 0 : _props$tests$find.testName) !== null && _props$tests$find$tes !== void 0 ? _props$tests$find$tes : '';
+  const testName = props.tests.find(x => x.id === props.selectedTestId)?.testName ?? '';
   return /*#__PURE__*/React.createElement(WithTooltip, {
     trigger: "click",
     placement: "bottom",
     closeOnClick: true,
-    tooltip: function tooltip(_ref2) {
-      var onHide = _ref2.onHide;
+    tooltip: _ref2 => {
+      let {
+        onHide
+      } = _ref2;
       return /*#__PURE__*/React.createElement(TooltipLinkList, {
-        links: props.tests.map(function (x) {
-          var _x$testName;
-
-          return {
-            id: x.id,
-            title: (_x$testName = x.testName) !== null && _x$testName !== void 0 ? _x$testName : '',
-            active: props.selectedTestId === x.id,
-            onClick: function onClick() {
-              props.onChangeTest(x.id);
-              onHide();
-            },
-            left: /*#__PURE__*/React.createElement(LinkIconContainer, null, getEmojiByTestStatus(x.status, x.skip))
-          };
-        })
+        links: props.tests.map(x => ({
+          id: x.id,
+          title: x.testName ?? '',
+          active: props.selectedTestId === x.id,
+          onClick: () => {
+            props.onChangeTest(x.id);
+            onHide();
+          },
+          left: /*#__PURE__*/React.createElement(LinkIconContainer, null, getEmojiByTestStatus(x.status, x.skip))
+        }))
       });
     }
   }, /*#__PURE__*/React.createElement(Button, {

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

@@ -1,15 +1,3 @@
-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 _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 _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 _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; }
-
 import React, { Fragment, useState, useEffect } from 'react';
 import { IconButton, Icons, Separator } from '@storybook/components';
 import { ForwardIcon, NextIcon } from './Icons';
@@ -17,7 +5,7 @@ import { stringify } from 'qs';
 import { styled } from '@storybook/theming';
 import { isDefined } from '../../../types';
 import { getTestPath, useForceUpdate } from '../../shared/helpers';
-var Button = styled(IconButton)({
+const Button = styled(IconButton)({
   '&:disabled': {
     opacity: 0.5,
     cursor: 'default'
@@ -26,58 +14,54 @@ var Button = styled(IconButton)({
     color: 'inherit'
   }
 });
-export var Tools = function Tools(_ref) {
-  var manager = _ref.manager;
-
-  var _useState = useState(),
-      _useState2 = _slicedToArray(_useState, 2),
-      buttonClicked = _useState2[0],
-      setButtonClicked = _useState2[1];
-
-  var _useState3 = useState(manager.status.isRunning),
-      _useState4 = _slicedToArray(_useState3, 2),
-      isRunning = _useState4[0],
-      setRunning = _useState4[1];
-
-  var forceUpdate = useForceUpdate();
-  var test = manager.getCurrentTest();
-  useEffect(function () {
-    var unsubscribe = manager.onChangeTest(function () {
+export const Tools = _ref => {
+  let {
+    manager
+  } = _ref;
+  const [buttonClicked, setButtonClicked] = useState();
+  const [isRunning, setRunning] = useState(manager.status.isRunning);
+  const forceUpdate = useForceUpdate();
+  const test = manager.getCurrentTest();
+  useEffect(() => {
+    const unsubscribe = manager.onChangeTest(() => {
       forceUpdate();
     });
     return unsubscribe;
   }, [manager, forceUpdate]);
-  useEffect(function () {
-    var unsubscribe = manager.onUpdateStatus(function (_ref2) {
-      var isRunning = _ref2.isRunning;
+  useEffect(() => {
+    const unsubscribe = manager.onUpdateStatus(_ref2 => {
+      let {
+        isRunning
+      } = _ref2;
       if (isDefined(isRunning)) setRunning(isRunning);
     });
     return unsubscribe;
   }, [manager]);
   if (!test) return null;
-
   function renderButton(type, title, onClick, icon) {
-    var handleClick = function handleClick() {
+    const handleClick = () => {
       setButtonClicked(type);
       onClick();
     };
-
-    var disabled = isRunning && buttonClicked != null && buttonClicked !== type;
-    return /*#__PURE__*/React.createElement(Button, {
-      onClick: function onClick() {
-        isRunning ? manager.onStop() : handleClick();
-      },
-      title: disabled ? '' : title,
-      disabled: disabled
-    }, buttonClicked === type && isRunning ? /*#__PURE__*/React.createElement(Icons, {
-      icon: 'stop'
-    }) : icon);
+    const disabled = isRunning && buttonClicked != null && buttonClicked !== type;
+    return (
+      /*#__PURE__*/
+      // @ts-expect-error Fixed in https://github.com/storybookjs/storybook/pull/26623
+      React.createElement(Button, {
+        onClick: () => {
+          isRunning ? manager.onStop() : handleClick();
+        },
+        title: disabled ? '' : title,
+        disabled: disabled
+      }, buttonClicked === type && isRunning ? /*#__PURE__*/React.createElement(Icons, {
+        icon: 'stop'
+      }) : icon)
+    );
   }
-
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(IconButton, {
-    href: "http://localhost:".concat(__CREEVEY_CLIENT_PORT__ || __CREEVEY_SERVER_PORT__, "/?").concat(stringify({
+    href: `http://localhost:${__CREEVEY_CLIENT_PORT__ || __CREEVEY_SERVER_PORT__ || 3000}/?${stringify({
       testPath: getTestPath(test)
-    })),
+    })}`,
     target: "_blank",
     title: "Show in Creevey UI"
   }, /*#__PURE__*/React.createElement(Icons, {

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

@@ -1,2 +1,2 @@
 import { withCreevey } from './withCreevey';
-export var decorators = [withCreevey()];
+export const decorators = [withCreevey()];

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

@@ -0,0 +1,2 @@
+export * from './withCreevey';
+export * from './readyForCapture';

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

@@ -1,56 +1,2 @@
-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; }
-
-import path from 'path';
-import { exec } from 'shelljs';
-import { DefinePlugin as FallbackDefinePlugin } from 'webpack';
-import { isStorybookVersionLessThan, resolveFromStorybookCore, resolveFromStorybookCoreServer } from '../../server/storybook/helpers';
-export function config() {
-  var entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return [].concat(_toConsumableArray(entry), [require.resolve('./decorator')]);
-}
-export function managerEntries() {
-  var entry = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return [].concat(_toConsumableArray(entry), [require.resolve('./register')]);
-}
-export function managerWebpack(config, options) {
-  var _options$presets$appl, _options$presets;
-
-  // TODO How to execute with non-webpack bundlers
-  if (options.configType == 'PRODUCTION' && !isStorybookVersionLessThan(6, 2) && options.skipExtract != true) {
-    var args = [];
-    if (options.creeveyPreExtract) args.push("--require \"".concat(options.creeveyPreExtract, "\""));
-    args.push(path.join(__dirname, '../../cli'));
-    args.push("--extract \"".concat(options.outputDir, "\""));
-    if (options.creeveyConfigPath) args.push("--config \"".concat(options.creeveyConfigPath, "\""));
-    exec("node ".concat(args.join(' ')), {
-      async: true
-    });
-  }
-
-  return ((_options$presets$appl = (_options$presets = options.presets) === null || _options$presets === void 0 ? void 0 : _options$presets.apply('webpackInstance')) !== null && _options$presets$appl !== void 0 ? _options$presets$appl : Promise.resolve(undefined)).then(function (webpack) {
-    return webpack !== null && webpack !== void 0 ? webpack : import(isStorybookVersionLessThan(6, 2) ? resolveFromStorybookCore('webpack') : resolveFromStorybookCoreServer('webpack'));
-  }).then(function (webpack) {
-    var _config$plugins, _options$creeveyPort;
-
-    var _ref = webpack !== null && webpack !== void 0 ? webpack : {},
-        _ref$DefinePlugin = _ref.DefinePlugin,
-        DefinePlugin = _ref$DefinePlugin === void 0 ? FallbackDefinePlugin : _ref$DefinePlugin;
-
-    (_config$plugins = config.plugins) === null || _config$plugins === void 0 ? void 0 : _config$plugins.push(new DefinePlugin({
-      __CREEVEY_SERVER_HOST__: options.creeveyHost,
-      __CREEVEY_SERVER_PORT__: (_options$creeveyPort = options.creeveyPort) !== null && _options$creeveyPort !== void 0 ? _options$creeveyPort : 3000,
-      __CREEVEY_CLIENT_PORT__: options.clientPort
-    }));
-    return config;
-  });
-}
+export const previewAnnotations = [require.resolve('./preview')];
+export const managerEntries = [require.resolve('./register')];

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

@@ -0,0 +1,5 @@
+import { withCreevey } from './withCreevey';
+const preview = {
+  decorators: [withCreevey()]
+};
+export default preview;

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

@@ -1,5 +1,3 @@
 export 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/esm/client/addon/register.js

@@ -1,75 +1,49 @@
-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); }); }; }
-
-import { addons, types } from '@storybook/addons';
+import { addons, types } from '@storybook/manager-api';
 import React from 'react';
 import { Addon } from './components/Addon';
 import { Tools } from './components/Tools';
 import { CreeveyManager } from './Manager';
-export var ADDON_ID = 'creevey';
-addons.register(ADDON_ID, function (api) {
+export const ADDON_ID = 'creevey';
+addons.register(ADDON_ID, api => {
   void registerCreeveyPanels(api);
 });
-export function registerCreeveyPanels(_x) {
-  return _registerCreeveyPanels.apply(this, arguments);
-}
-
-function _registerCreeveyPanels() {
-  _registerCreeveyPanels = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(storybookApi) {
-    var manager, browsers;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            manager = new CreeveyManager(storybookApi);
-            addons.addPanel("".concat(ADDON_ID, "/panel/run"), {
-              title: "Creevey/Run",
-              match: function match(_ref) {
-                var viewMode = _ref.viewMode;
-                return !!(viewMode && /^story$/.exec(viewMode));
-              },
-              type: types.TOOL,
-              // eslint-disable-next-line react/display-name
-              render: function render() {
-                return /*#__PURE__*/React.createElement(Tools, {
-                  manager: manager
-                });
-              }
-            });
-            _context.next = 4;
-            return manager.initAll();
-
-          case 4:
-            browsers = manager.getBrowsers();
-            browsers.forEach(function (browser) {
-              var panelId = "".concat(ADDON_ID, "/panel/").concat(browser);
-              var title = manager.getTabTitle(browser);
-              addons.addPanel(panelId, {
-                title: title,
-                type: types.PANEL,
-                paramKey: browser,
-                // NOTE key = PANEL_ID needs to correct render button in addons panel
-                // eslint-disable-next-line react/display-name
-                render: function render(_ref2) {
-                  var active = _ref2.active,
-                      key = _ref2.key;
-                  return /*#__PURE__*/React.createElement(Addon, {
-                    active: active,
-                    key: key,
-                    manager: manager,
-                    browser: browser
-                  });
-                }
-              });
-            });
-
-          case 6:
-          case "end":
-            return _context.stop();
-        }
+export async function registerCreeveyPanels(storybookApi) {
+  const manager = new CreeveyManager(storybookApi);
+  addons.add(`${ADDON_ID}/panel/run`, {
+    title: `Creevey/Run`,
+    match: _ref => {
+      let {
+        viewMode
+      } = _ref;
+      return !!(viewMode && /^story$/.exec(viewMode));
+    },
+    type: types.TOOL,
+    // eslint-disable-next-line react/display-name
+    render: () => /*#__PURE__*/React.createElement(Tools, {
+      manager
+    })
+  });
+  await manager.initAll();
+  const browsers = manager.getBrowsers();
+  browsers.forEach(browser => {
+    const panelId = `${ADDON_ID}/panel/${browser}`;
+    const title = manager.getTabTitle(browser);
+    addons.add(panelId, {
+      title,
+      type: 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
+        } = _ref2;
+        return /*#__PURE__*/React.createElement(Addon, {
+          active,
+          manager,
+          browser
+        });
       }
-    }, _callee);
-  }));
-  return _registerCreeveyPanels.apply(this, arguments);
+    });
+  });
 }

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

@@ -1,31 +1,27 @@
 export function getEmojiByTestStatus(status) {
-  var skip = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
+  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 '⏸';
         return '';
       }
   }
-}
+}
+export const isInternetExplorer = navigator.userAgent.includes('Trident/');