creevey 0.7.37 → 0.8.0-beta.0

package/lib/cjs/server/storybook/nodejs-provider.js

@@ -0,0 +1,220 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadStories = loadStories;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _cluster = require("cluster");
+
+var _chokidar = _interopRequireDefault(require("chokidar"));
+
+var _types = require("../../types");
+
+var _utils = require("../utils");
+
+var _messages = require("../messages");
+
+var _helpers = require("./helpers");
+
+var _logger = require("../logger");
+
+var _shared = require("../../shared");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+async function initStorybookEnvironment() {
+  // @ts-ignore
+  (await Promise.resolve().then(() => _interopRequireWildcard(require('global-jsdom')))).default(undefined, {
+    url: 'http://localhost'
+  }); // NOTE Cutoff `jsdom` part from userAgent, because storybook check enviroment and create events channel if runs in browser
+  // https://github.com/storybookjs/storybook/blob/v5.2.8/lib/core/src/client/preview/start.js#L98
+  // Example: "Mozilla/5.0 (linux) AppleWebKit/537.36 (KHTML, like Gecko) jsdom/15.2.1"
+
+  Object.defineProperty(window.navigator, 'userAgent', {
+    value: window.navigator.userAgent.split(' ').filter(token => !token.startsWith('jsdom')).join(' ')
+  }); // TODO Look at creevey debug flag
+
+  const {
+    logger
+  } = await (0, _helpers.importStorybookClientLogger)(); // NOTE: Disable duplication warnings for >=6.2 storybook
+
+  if (_cluster.isWorker) logger.warn = _types.noop; // NOTE: disable logger for 5.x storybook
+
+  logger.debug = _types.noop;
+  return Promise.resolve().then(() => _interopRequireWildcard(require('./entry')));
+}
+
+function watchStories(channel, watcher, initialFiles) {
+  const watchingFiles = initialFiles;
+  let storiesByFiles = new Map();
+  (0, _messages.subscribeOn)('shutdown', () => void watcher.close());
+  watcher.add(Array.from(watchingFiles));
+  watcher.on('change', filePath => storiesByFiles.set(_path.default.isAbsolute(filePath) ? filePath : `./${filePath.replace(/\\/g, '/')}`, []));
+  watcher.on('unlink', filePath => storiesByFiles.set(_path.default.isAbsolute(filePath) ? filePath : `./${filePath.replace(/\\/g, '/')}`, []));
+  return data => {
+    const stories = (0, _helpers.isStorybookVersionLessThan)(6) || (0, _helpers.isStorybookVersionGreaterThan)(6, 3) ? data.stories : (0, _shared.denormalizeStoryParameters)(data);
+    const files = new Set(Object.values(stories).map(story => story.parameters.fileName));
+    const addedFiles = Array.from(files).filter(filePath => !watchingFiles.has(filePath));
+    const removedFiles = Array.from(watchingFiles).filter(filePath => !files.has(filePath));
+    watcher.add(addedFiles);
+    addedFiles.forEach(filePath => {
+      watchingFiles.add(filePath);
+      storiesByFiles.set(filePath, []);
+    });
+    removedFiles.forEach(filePath => watchingFiles.delete(filePath));
+    Object.values(stories).forEach(story => {
+      var _storiesByFiles$get;
+
+      return (_storiesByFiles$get = storiesByFiles.get(story.parameters.fileName)) === null || _storiesByFiles$get === void 0 ? void 0 : _storiesByFiles$get.push(story);
+    });
+    channel.emit('storiesUpdated', storiesByFiles);
+    storiesByFiles = new Map();
+  };
+}
+
+function loadStoriesFromBundle(watch) {
+  const bundlePath = _path.default.join((0, _utils.getCreeveyCache)(), 'storybook/main.js');
+
+  if (watch) {
+    (0, _messages.subscribeOn)('webpack', message => {
+      if (message.type != 'rebuild succeeded') return;
+      Object.values(global.__CREEVEY_HMR_DATA__).filter(({
+        callback
+      }) => callback).forEach(({
+        data,
+        callback
+      }) => callback(data));
+      delete require.cache[bundlePath];
+      Promise.resolve(`${bundlePath}`).then(s => _interopRequireWildcard(require(s)));
+    });
+  }
+
+  Promise.resolve(`${bundlePath}`).then(s => _interopRequireWildcard(require(s)));
+}
+
+async function loadStoriesDirectly(config, {
+  watcher,
+  debug
+}) {
+  const {
+    toRequireContext,
+    normalizeStoriesEntry
+  } = await (0, _helpers.importStorybookCoreCommon)();
+  const {
+    addParameters,
+    configure
+  } = await Promise.resolve().then(() => _interopRequireWildcard(require('./entry')));
+  const requireContext = await (await Promise.resolve().then(() => _interopRequireWildcard(require('../loaders/babel/register')))).default(config, debug);
+
+  const preview = (() => {
+    try {
+      return require.resolve(`${config.storybookDir}/preview`);
+    } catch (_) {
+      /* noop */
+    }
+  })();
+
+  const {
+    stories
+  } = await (0, _helpers.importStorybookConfig)();
+  const contexts = stories.map(entry => {
+    const normalizedEntry = (0, _helpers.isStorybookVersionLessThan)(6, 4) ? entry : normalizeStoriesEntry(entry, {
+      configDir: config.storybookDir,
+      workingDir: process.cwd()
+    });
+    const {
+      path: storiesPath,
+      recursive,
+      match
+    } = toRequireContext(normalizedEntry);
+    watcher === null || watcher === void 0 ? void 0 : watcher.add(_path.default.resolve(config.storybookDir, storiesPath));
+    return () => requireContext(storiesPath, recursive, new RegExp(match));
+  });
+
+  let disposeCallback = data => void data;
+
+  Object.assign(module, {
+    hot: {
+      data: {},
+
+      accept() {
+        /* noop */
+      },
+
+      dispose(callback) {
+        disposeCallback = callback;
+      }
+
+    }
+  });
+
+  async function startStorybook() {
+    if (preview) {
+      const {
+        parameters,
+        globals,
+        globalTypes
+      } = await Promise.resolve(`${preview}`).then(s => _interopRequireWildcard(require(s)));
+      if (parameters) addParameters(parameters);
+      if (globals) addParameters({
+        globals
+      });
+      if (globalTypes) addParameters({
+        globalTypes
+      });
+    }
+
+    try {
+      configure(contexts.map(ctx => ctx()), module, false);
+    } catch (error) {
+      if (_cluster.isMaster) _logger.logger.error(error);
+    }
+  }
+
+  watcher === null || watcher === void 0 ? void 0 : watcher.add(config.storybookDir);
+  watcher === null || watcher === void 0 ? void 0 : watcher.on('all', (_event, filename) => {
+    var _module$hot;
+
+    disposeCallback((_module$hot = module.hot) === null || _module$hot === void 0 ? void 0 : _module$hot.data);
+    delete require.cache[filename];
+    void startStorybook();
+  });
+  void startStorybook();
+}
+
+async function loadStories(config, {
+  watch,
+  debug
+}, storiesListener) {
+  const storybookApi = await initStorybookEnvironment();
+  const Events = await (0, _helpers.importStorybookCoreEvents)();
+  const {
+    channel
+  } = storybookApi;
+  channel.removeAllListeners(Events.CURRENT_STORY_WAS_SET);
+  channel.on('storiesUpdated', storiesListener);
+  let watcher = null;
+  if (watch) watcher = _chokidar.default.watch([], {
+    ignoreInitial: true
+  });
+  const loadPromise = new Promise(resolve => {
+    channel.once(Events.SET_STORIES, data => {
+      const stories = (0, _helpers.isStorybookVersionLessThan)(6) || (0, _helpers.isStorybookVersionGreaterThan)(6, 3) ? data.stories : (0, _shared.denormalizeStoryParameters)(data);
+      const files = new Set(Object.values(stories).map(story => story.parameters.fileName));
+      if (watcher) channel.on(Events.SET_STORIES, watchStories(channel, watcher, files));
+      resolve(data);
+    });
+  });
+  if (config.useWebpackToExtractTests) loadStoriesFromBundle(watch);else void loadStoriesDirectly(config, {
+    watcher,
+    debug
+  });
+  return loadPromise;
+}

package/lib/cjs/server/utils.js

@@ -10,7 +10,7 @@ exports.getCreeveyCache = getCreeveyCache;
 exports.runSequence = runSequence;
 exports.testsToImages = testsToImages;
 exports.removeProps = removeProps;
-exports.downloadBinary = exports.isInsideDocker = exports.extensions = exports.LOCALHOST_REGEXP = exports.isShuttingDown = void 0;
+exports.downloadBinary = exports.isInsideDocker = exports.skipOptionKeys = exports.extensions = exports.LOCALHOST_REGEXP = exports.isShuttingDown = void 0;
 
 var _fs = require("fs");
 
@@ -34,6 +34,8 @@ const LOCALHOST_REGEXP = /(localhost|127\.0\.0\.1)/i;
 exports.LOCALHOST_REGEXP = LOCALHOST_REGEXP;
 const extensions = ['.js', '.jsx', '.ts', '.tsx'];
 exports.extensions = extensions;
+const skipOptionKeys = ['in', 'kinds', 'stories', 'tests', 'reason'];
+exports.skipOptionKeys = skipOptionKeys;
 
 function matchBy(pattern, value) {
   return typeof pattern == 'string' && pattern == value || Array.isArray(pattern) && pattern.includes(value) || pattern instanceof RegExp && pattern.test(value) || !(0, _types.isDefined)(pattern);
@@ -45,9 +47,30 @@ function shouldSkip(browser, meta, skipOptions, test) {
   }
 
   if (Array.isArray(skipOptions)) {
-    return skipOptions.map(skipOption => shouldSkip(browser, meta, skipOption, test)).find(Boolean) || false;
+    for (const skip of skipOptions) {
+      const reason = shouldSkip(browser, meta, skip, test);
+      if (reason) return reason;
+    }
+
+    return false;
+  }
+
+  let hasSkipOptionKeys = false;
+
+  for (const skipKey in skipOptions) {
+    if (skipOptionKeys.includes(skipKey)) {
+      hasSkipOptionKeys = true;
+      continue;
+    }
+
+    const reason = shouldSkip(browser, meta, {
+      reason: skipKey,
+      ...skipOptions[skipKey]
+    }, test);
+    if (reason) return reason;
   }
 
+  if (!hasSkipOptionKeys) return false;
   const {
     in: browsers,
     kinds,

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

@@ -60,15 +60,14 @@ async function addTestsFromStories(rootSuite, config, {
   debug
 }) {
   const mochaTestsById = new Map();
-  const tests = await (0, _stories.loadTestsFromStories)(config, [browser], {
+  const tests = await (0, _stories.loadTestsFromStories)([browser], listener => config.storiesProvider(config, {
     watch,
-    debug,
-    update: testsDiff => Object.entries(testsDiff).forEach(([id, newTest]) => {
-      const oldTest = mochaTestsById.get(id);
-      mochaTestsById.delete(id);
-      if (oldTest) removeTestOrSuite(oldTest);
-      if (newTest) mochaTestsById.set(id, addTest(rootSuite, newTest));
-    })
-  });
+    debug
+  }, listener), testsDiff => Object.entries(testsDiff).forEach(([id, newTest]) => {
+    const oldTest = mochaTestsById.get(id);
+    mochaTestsById.delete(id);
+    if (oldTest) removeTestOrSuite(oldTest);
+    if (newTest) mochaTestsById.set(id, addTest(rootSuite, newTest));
+  }));
   Object.values(tests).filter(_types.isDefined).forEach(test => mochaTestsById.set(test.id, addTest(rootSuite, test)));
 }

package/lib/cjs/server/worker/worker.js

@@ -45,8 +45,7 @@ async function getStat(filePath) {
   try {
     return await statAsync(filePath);
   } catch (error) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    if (error.code === 'ENOENT') {
+    if (typeof error == 'object' && error && error.code === 'ENOENT') {
       return null;
     }
 

package/lib/cjs/shared.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.denormalizeStoryParameters = exports.combineParameters = void 0;
+
+var _lodash = require("lodash");
+
+// NOTE: Copy-paste from storybook/api
+const combineParameters = (...parameterSets) => // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+(0, _lodash.mergeWith)({}, ...parameterSets, (_, srcValue) => {
+  // Treat arrays as scalars:
+  if (Array.isArray(srcValue)) return srcValue;
+  return undefined;
+}); // NOTE: Copy-paste from storybook/api
+
+
+exports.combineParameters = combineParameters;
+
+const denormalizeStoryParameters = ({
+  globalParameters,
+  kindParameters,
+  stories
+}) => {
+  return (0, _lodash.mapValues)(stories, storyData => {
+    var _kindParameters$story;
+
+    return { ...storyData,
+      parameters: combineParameters(globalParameters, (_kindParameters$story = kindParameters[storyData.kind]) !== null && _kindParameters$story !== void 0 ? _kindParameters$story : {}, storyData.parameters)
+    };
+  });
+};
+
+exports.denormalizeStoryParameters = denormalizeStoryParameters;

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

@@ -31,11 +31,12 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import { SET_STORIES, STORY_RENDERED } from '@storybook/core-events';
+import { denormalizeStoryParameters } from '../../shared';
 import { isDefined } from '../../types';
 import { initCreeveyClientApi } from '../shared/creeveyClientApi';
 import { calcStatus } from '../shared/helpers';
 import { ADDON_ID } from './register';
-import { getEmojiByTestStatus, denormalizeStoryParameters } from './utils';
+import { getEmojiByTestStatus } from './utils';
 export var CreeveyManager = /*#__PURE__*/function () {
   function CreeveyManager(storybookApi) {
     var _this = this;
@@ -230,7 +231,7 @@ export var CreeveyManager = /*#__PURE__*/function () {
 
     _defineProperty(this, "onSetStories", function (data) {
       // TODO: Send PR to storybook to fix this
-      var stories = data.v ? denormalizeStoryParameters(data) : data;
+      var stories = data.v ? denormalizeStoryParameters(data) : data.stories;
       _this.stories = stories;
     });
 

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

@@ -1,10 +1,3 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { mapValues, mergeWith } from 'lodash';
 export function getEmojiByTestStatus(status) {
   var skip = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
 
@@ -35,29 +28,4 @@ export function getEmojiByTestStatus(status) {
         return '';
       }
   }
-} // NOTE: Copy-paste from storybook/api
-
-export var combineParameters = function combineParameters() {
-  for (var _len = arguments.length, parameterSets = new Array(_len), _key = 0; _key < _len; _key++) {
-    parameterSets[_key] = arguments[_key];
-  }
-
-  return (// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-    mergeWith.apply(void 0, [{}].concat(parameterSets, [function (_, srcValue) {
-      // Treat arrays as scalars:
-      if (Array.isArray(srcValue)) return srcValue;
-      return undefined;
-    }]))
-  );
-}; // NOTE: Copy-paste from storybook/api
-
-export var denormalizeStoryParameters = function denormalizeStoryParameters(_ref) {
-  var globalParameters = _ref.globalParameters,
-      kindParameters = _ref.kindParameters,
-      stories = _ref.stories;
-  return mapValues(stories, function (storyData) {
-    return _objectSpread(_objectSpread({}, storyData), {}, {
-      parameters: combineParameters(globalParameters, kindParameters[storyData.kind], storyData.parameters)
-    });
-  });
-};
+}

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

@@ -4,7 +4,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 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); }
 
-import Events from '@storybook/core-events';
+import * as Events from '@storybook/core-events';
 import * as polyfill from 'event-source-polyfill';
 import { addons, makeDecorator } from '@storybook/addons';
 import { isObject, noop } from '../../types';

package/lib/esm/index.js

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

package/lib/esm/server/config.js

@@ -1,6 +1,8 @@
 import fs from 'fs';
 import path from 'path';
-import { isStorybookVersionLessThan, storybookDirRef } from './storybook/helpers';
+import { isCSFv3Enabled, isStorybookVersionLessThan, storybookDirRef } from './storybook/helpers';
+import { loadStories as nodejsStoriesProvider } from './storybook/nodejs-provider'; // import { loadStories as browserStoriesProvider } from './storybook/browser-provider';
+
 import { isDefined } from '../types';
 export const defaultBrowser = 'chrome';
 export const defaultConfig = {
@@ -58,6 +60,7 @@ 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 (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

@@ -16,10 +16,14 @@ export default async function extract(config, options) {
     });
   }
 
-  const tests = await loadTestsFromStories(config, Object.keys(config.browsers), {
-    debug: options.debug
+  const tests = await loadTestsFromStories(Object.keys(config.browsers), async listener => {
+    const stories = await config.storiesProvider(config, {
+      watch: false,
+      debug: options.debug
+    }, listener);
+    if (options.extract) saveStoriesJson(stories, options.extract);
+    return stories;
   });
-  if (options.extract) saveStoriesJson(options.extract);
   if (options.tests) saveTestsJson(tests); // eslint-disable-next-line no-process-exit
 
   process.exit(0);

package/lib/esm/server/loaders/babel/register.js

@@ -5,7 +5,7 @@ import { addHook } from 'pirates';
 import { isDefined } from '../../../types';
 import { extensions } from '../../utils';
 import plugin from './creevey-plugin';
-import { hasDocsAddon, hasSvelteCSFAddon } from '../../storybook/helpers';
+import { hasDocsAddon, hasSvelteCSFAddon, isStorybookVersionLessThan } from '../../storybook/helpers';
 let parents = null;
 let story = null; //@ts-expect-error private field doesn't have types
 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
@@ -69,7 +69,8 @@ function getRequireContext(rootDir) {
 }
 
 export default async function register(config, debug = false) {
-  const requireContext = getRequireContext(config.storybookDir);
+  const rootDir = isStorybookVersionLessThan(6, 4) ? config.storybookDir : process.cwd();
+  const requireContext = getRequireContext(rootDir);
   const preview = resolve(config.storybookDir, 'preview');
   if (hasDocsAddon()) await (await import('../hooks/mdx')).addMDXHook(() => story);
   if (hasSvelteCSFAddon()) await (await import('../hooks/svelte')).addSvelteHook(() => story); // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call

package/lib/esm/server/loaders/webpack/compile.js

@@ -3,7 +3,7 @@ import path from 'path';
 import webpack from 'webpack';
 import nodeExternals from 'webpack-node-externals';
 import { extensions as fallbackExtensions, getCreeveyCache } from '../../utils';
-import { getStorybookFramework, hasDocsAddon, isStorybookVersionLessThan, resolveFromStorybook } from '../../storybook/helpers';
+import { getStorybookFramework, hasDocsAddon, importStorybookConfig, isStorybookVersionLessThan, resolveFromStorybook } from '../../storybook/helpers';
 import { noop } from '../../../types';
 import { emitWebpackMessage, subscribeOn } from '../../messages';
 import { logger } from '../../logger';
@@ -157,27 +157,11 @@ async function getWebpackConfigForStorybook_6_2(framework, configDir, outputDir)
   });
 }
 
-async function removeAddons(configDir) {
-  const storybookUtilsPath = isStorybookVersionLessThan(6, 2) ? '@storybook/core/dist/server/utils' : '@storybook/core-common/dist/cjs/utils';
-  const serverRequireModule = isStorybookVersionLessThan(6, 2) ? 'server-require' : 'interpret-require';
-
+async function removeAddons() {
   try {
     var _config$core;
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const {
-      getInterpretedFile
-    } = await import(resolveFromStorybook(`${storybookUtilsPath}/interpret-files`)); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-
-    const {
-      default: serverRequireFallback,
-      serverRequire = serverRequireFallback
-    } = await import(resolveFromStorybook(`${storybookUtilsPath}/${serverRequireModule}`)); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-
-    const mainConfigFile = isStorybookVersionLessThan(6, 1) ? path.join(configDir, 'main') : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    getInterpretedFile(path.join(configDir, 'main')); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-
-    const config = serverRequire(mainConfigFile);
+    const config = await importStorybookConfig();
 
     if (((_config$core = config.core) === null || _config$core === void 0 ? void 0 : _config$core.builder) == 'webpack5') {
       logger.warn("Be aware Creevey doesn't fully support webpack@5, some feature might not work well");
@@ -220,7 +204,7 @@ export default async function compile(config, {
   };
   process.env.NODE_ENV = 'production'; // NOTE Remove addons by monkey patching, only for new config file (main.js)
 
-  const areAddonsRemoved = await removeAddons(config.storybookDir);
+  const areAddonsRemoved = await removeAddons();
   const getWebpackConfig = isStorybookVersionLessThan(6, 2) ? getWebpackConfigForStorybook_pre6_2 : getWebpackConfigForStorybook_6_2;
   const storybookWebpackConfig = await getWebpackConfig(storybookFramework, config.storybookDir, outputDir);
   const extensions = (_storybookWebpackConf = (_storybookWebpackConf2 = storybookWebpackConfig.resolve) === null || _storybookWebpackConf2 === void 0 ? void 0 : _storybookWebpackConf2.extensions) !== null && _storybookWebpackConf !== void 0 ? _storybookWebpackConf : fallbackExtensions;

package/lib/esm/server/loaders/webpack/creevey-loader.js

@@ -138,7 +138,7 @@ export default function (source) {
   } catch (error) {
     this && logger.warn('Failed to transform file', this.resourcePath);
 
-    if ('loc' in error) {
+    if (typeof error == 'object' && error && 'loc' in error) {
       logger.warn(codeFrameColumns(source, {
         start: error.loc
       }, {

package/lib/esm/server/master/master.js

@@ -27,11 +27,9 @@ export default async function master(config, options) {
   } catch (error) {// Ignore error
   }
 
-  const tests = await loadTestsFromStories(config, Object.keys(config.browsers), { ...options,
-    update: testsDiff => {
-      runner.updateTests(testsDiff);
-      saveTestsJson(runner.tests, config.reportDir);
-    }
+  const tests = await loadTestsFromStories(Object.keys(config.browsers), listener => config.storiesProvider(config, options, listener), testsDiff => {
+    runner.updateTests(testsDiff);
+    saveTestsJson(runner.tests, config.reportDir);
   });
   runner.tests = mergeTests(testsFromReport, tests);
   saveTestsJson(runner.tests, config.reportDir);

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

@@ -1,17 +1,17 @@
+import chalk from 'chalk';
 import http from 'http';
 import https from 'https';
-import { PNG } from 'pngjs';
 import { getLogger } from 'loglevel';
 import prefix from 'loglevel-plugin-prefix';
-import { Builder, By, Origin, Capabilities } from 'selenium-webdriver';
-import { noop, isDefined } from '../../types';
-import { subscribeOn } from '../messages';
 import { networkInterfaces } from 'os';
-import { runSequence, LOCALHOST_REGEXP, isShuttingDown } from '../utils';
+import { PNG } from 'pngjs';
+import { Builder, By, Capabilities, Origin } from 'selenium-webdriver';
 import { PageLoadStrategy } from 'selenium-webdriver/lib/capabilities';
-import { importStorybookCoreEvents, isStorybookVersionLessThan } from '../storybook/helpers';
+import { isDefined, noop } from '../../types';
 import { colors, logger } from '../logger';
-import chalk from 'chalk';
+import { subscribeOn } from '../messages';
+import { importStorybookCoreEvents, isStorybookVersionLessThan } from '../storybook/helpers';
+import { isShuttingDown, LOCALHOST_REGEXP, runSequence } from '../utils';
 const DOCKER_INTERNAL = 'host.docker.internal';
 let browserLogger = logger;
 
@@ -473,6 +473,19 @@ export async function getBrowser(config, browserConfig) {
 
   return browser;
 }
+
+async function updateStoryArgs(browser, story, updatedArgs) {
+  const Events = await importStorybookCoreEvents();
+  await browser.executeAsyncScript(function (storyId, updatedArgs, UPDATE_STORY_ARGS, STORY_RENDERED, callback) {
+    window.__STORYBOOK_ADDONS_CHANNEL__.once(STORY_RENDERED, callback);
+
+    window.__STORYBOOK_ADDONS_CHANNEL__.emit(UPDATE_STORY_ARGS, {
+      storyId,
+      updatedArgs
+    });
+  }, story.id, updatedArgs, Events.UPDATE_STORY_ARGS, Events.STORY_RENDERED);
+}
+
 export async function switchStory() {
   var _this$currentTest, _this$currentTest$ctx, _parameters$creevey;
 
@@ -517,6 +530,8 @@ export async function switchStory() {
 
   this.takeScreenshot = () => takeScreenshot(this.browser, captureElement, ignoreElements);
 
+  this.updateStoryArgs = updatedArgs => updateStoryArgs(this.browser, story, updatedArgs);
+
   this.testScope.reverse();
 }
 

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

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