creevey 0.7.37 → 0.8.0-beta.0

package/lib/esm/server/stories.js

@@ -1,15 +1,11 @@
 import path from 'path';
 import { mkdirSync, writeFileSync } from 'fs';
-import { isWorker, isMaster } from 'cluster';
 import { createHash } from 'crypto';
-import chokidar from 'chokidar';
-import { isDefined, isFunction, isObject, noop } from '../types';
-import { shouldSkip, getCreeveyCache, removeProps } from './utils';
-import { mergeWith } from 'lodash';
-import { subscribeOn } from './messages';
-import { importStorybookClientLogger, importStorybookConfig, importStorybookCoreCommon, importStorybookCoreEvents, isStorybookVersionLessThan } from './storybook/helpers';
-import { logger } from './logger';
-export let storybookApi = null;
+import { mapValues, pick } from 'lodash';
+import { isDefined, isFunction, isObject } from '../types';
+import { shouldSkip, removeProps } from './utils';
+import { isStorybookVersionGreaterThan, isStorybookVersionLessThan } from './storybook/helpers';
+import { denormalizeStoryParameters } from '../shared';
 
 function storyTestFabric(delay, testFn) {
   return async function storyTest() {
@@ -83,214 +79,9 @@ function convertStories(browsers, stories) {
   return tests;
 }
 
-async function initStorybookEnvironment() {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-  (await import('jsdom-global')).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 importStorybookClientLogger(); // NOTE: Disable duplication warnings for >=6.2 storybook
-
-  if (isWorker) logger.warn = noop; // NOTE: disable logger for 5.x storybook
-
-  logger.debug = noop;
-  return import('./storybook/entry');
-}
-
-function watchStories(channel, watcher, initialFiles) {
-  const watchingFiles = initialFiles;
-  let storiesByFiles = new Map();
-  subscribeOn('shutdown', () => void watcher.close());
-  watcher.add(Array.from(watchingFiles));
-  watcher.on('change', filePath => storiesByFiles.set(path.isAbsolute(filePath) ? filePath : `./${filePath.replace(/\\/g, '/')}`, []));
-  watcher.on('unlink', filePath => storiesByFiles.set(path.isAbsolute(filePath) ? filePath : `./${filePath.replace(/\\/g, '/')}`, []));
-  return data => {
-    const stories = isStorybookVersionLessThan(6) ? data.stories : flatStories(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();
-  };
-} // TODO use the storybook version, after the fix of skip option API
-
-
-function flatStories({
-  globalParameters,
-  kindParameters,
-  stories
-}) {
-  Object.values(stories).forEach(story => {
-    // NOTE: Copy-paste merge parameters from storybook
-    story.parameters = mergeWith({}, globalParameters, kindParameters[story.kind], story.parameters, (objValue, srcValue) => Array.isArray(objValue) ? objValue.concat(srcValue) : undefined);
-  });
-  return stories;
-}
-
-function loadStoriesFromBundle(watch) {
-  const bundlePath = path.join(getCreeveyCache(), 'storybook/main.js');
-
-  if (watch) {
-    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];
-      import(bundlePath);
-    });
-  }
-
-  import(bundlePath);
-}
-
-async function loadStoriesDirectly(config, {
-  watcher,
-  debug
-}) {
-  const {
-    toRequireContext
-  } = await importStorybookCoreCommon();
-  const {
-    addParameters,
-    configure
-  } = await import('./storybook/entry');
-  const requireContext = await (await import('./loaders/babel/register')).default(config, debug);
-
-  const preview = (() => {
-    try {
-      return require.resolve(`${config.storybookDir}/preview`);
-    } catch (_) {
-      /* noop */
-    }
-  })();
-
-  const {
-    stories
-  } = await importStorybookConfig();
-  const contexts = stories.map(input => {
-    const {
-      path: storiesPath,
-      recursive,
-      match
-    } = toRequireContext(input);
-    watcher === null || watcher === void 0 ? void 0 : watcher.add(path.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 import(preview);
-      if (parameters) addParameters(parameters);
-      if (globals) addParameters({
-        globals
-      });
-      if (globalTypes) addParameters({
-        globalTypes
-      });
-    }
-
-    try {
-      configure(contexts.map(ctx => ctx()), module, false);
-    } catch (error) {
-      if (isMaster) 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 loadStorybook(config, {
-  watch,
-  debug
-}, storiesListener) {
-  storybookApi = await initStorybookEnvironment();
-  const Events = await importStorybookCoreEvents();
-  const {
-    channel
-  } = storybookApi;
-  channel.removeAllListeners(Events.CURRENT_STORY_WAS_SET);
-  channel.on('storiesUpdated', storiesListener);
-  let watcher = null;
-  if (watch) watcher = chokidar.watch([], {
-    ignoreInitial: true
-  });
-  const loadPromise = new Promise(resolve => {
-    channel.once(Events.SET_STORIES, data => {
-      const stories = isStorybookVersionLessThan(6) ? data.stories : flatStories(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(stories);
-    });
-  });
-  if (config.useWebpackToExtractTests) loadStoriesFromBundle(watch);else void loadStoriesDirectly(config, {
-    watcher,
-    debug
-  });
-  return loadPromise;
-}
-
-export async function loadTestsFromStories(config, browsers, {
-  watch = false,
-  debug = false,
-  update
-}) {
+export async function loadTestsFromStories(browsers, provider, update) {
   const testIdsByFiles = new Map();
-  const stories = await loadStorybook(config, {
-    debug,
-    watch
-  }, storiesByFiles => {
+  const data = await provider(storiesByFiles => {
     const testsDiff = {};
     Array.from(storiesByFiles.entries()).forEach(([filename, stories]) => {
       var _testIdsByFiles$get$f, _testIdsByFiles$get;
@@ -304,6 +95,7 @@ export async function loadTestsFromStories(config, browsers, {
     });
     update === null || update === void 0 ? void 0 : update(testsDiff);
   });
+  const stories = isStorybookVersionLessThan(6) || isStorybookVersionGreaterThan(6, 3) ? data.stories : denormalizeStoryParameters(data);
   const tests = convertStories(browsers, stories);
   Object.values(tests).filter(isDefined).forEach(({
     id,
@@ -321,11 +113,23 @@ export async function loadTestsFromStories(config, browsers, {
   });
   return tests;
 }
-export function saveStoriesJson(extract) {
-  var _storybookApi, _storiesData$stories;
+export function saveStoriesJson(storiesData, extract) {
+  var _storiesData$stories;
 
   const outputDir = typeof extract == 'boolean' ? 'storybook-static' : extract;
-  const storiesData = (_storybookApi = storybookApi) === null || _storybookApi === void 0 ? void 0 : _storybookApi.clientApi.store().getStoriesJsonData(); // TODO Fix args stories
+
+  if (!isStorybookVersionLessThan(6)) {
+    // NOTE Copy-pasted from Storybook's `getStoriesJsonData` method
+    const allowed = ['fileName', 'docsOnly', 'framework', '__id', '__isArgsStory'];
+    storiesData.globalParameters = pick(storiesData.globalParameters, allowed); // @ts-expect-error ignore error
+
+    storiesData.kindParameters = mapValues(storiesData.kindParameters, v => pick(v, allowed)); // @ts-expect-error ignore error
+
+    storiesData.stories = mapValues(storiesData.stories, v => ({ ...pick(v, ['id', 'name', 'kind', 'story']),
+      parameters: pick(v.parameters, allowed)
+    }));
+  } // TODO Fix args stories
+
 
   removeProps(storiesData !== null && storiesData !== void 0 ? storiesData : {}, ['stories', () => true, 'parameters', '__isArgsStory']);
   Object.values((_storiesData$stories = storiesData === null || storiesData === void 0 ? void 0 : storiesData.stories) !== null && _storiesData$stories !== void 0 ? _storiesData$stories : {}).forEach(story => isObject(story) && 'parameters' in story && isObject(story.parameters) && delete story.parameters.__isArgsStory);

package/lib/esm/server/storybook/entry.js

@@ -1,5 +1,6 @@
 var _api$channel, _api$context;
 
+import { addons } from '@storybook/addons';
 import { getStorybookFramework, isStorybookVersionLessThan, resolveFromStorybook } from './helpers';
 const framework = getStorybookFramework(); // eslint-disable-next-line @typescript-eslint/no-var-requires
 
@@ -8,10 +9,8 @@ const core = require(resolveFromStorybook('@storybook/core')); //@ts-expect-erro
 
 
 const start = isStorybookVersionLessThan(6, 2) ? core.default.start : core.start;
-const api = start(() => void 0); //@ts-expect-error: 6.x has { channel }, but 5.x has { context: { channel } }
-// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-
-export const channel = (_api$channel = api.channel) !== null && _api$channel !== void 0 ? _api$channel : (_api$context = api.context) === null || _api$context === void 0 ? void 0 : _api$context.channel;
+const api = start(() => void 0);
+export const channel = isStorybookVersionLessThan(6, 4) ? (_api$channel = api.channel) !== null && _api$channel !== void 0 ? _api$channel : (_api$context = api.context) === null || _api$context === void 0 ? void 0 : _api$context.channel : addons.getChannel();
 export const clientApi = api.clientApi;
 export const forceReRender = api.forceReRender;
 export const storiesOf = (kind, m) => {
@@ -23,6 +22,7 @@ export const configure = (...args) => {
   if (isStorybookVersionLessThan(5, 2)) {
     //NOTE: Storybook <= 5.1 pass args as is
     //@ts-expect-error: ignore it
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
     return api.configApi.configure(...args);
   }
 

package/lib/esm/server/storybook/helpers.js

@@ -45,16 +45,22 @@ export function isStorybookVersionLessThan(major, minor) {
   const [sbMajor, sbMinor] = ((_process$env$__CREEVE = process.env.__CREEVEY_STORYBOOK_VERSION__) !== null && _process$env$__CREEVE !== void 0 ? _process$env$__CREEVE : getStorybookVersion()).split('.');
   return Number(sbMajor) < major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) < minor;
 }
-export function isStorybookVersion(major, minor) {
+export function isStorybookVersionGreaterThan(major, minor) {
   var _process$env$__CREEVE2;
 
   const [sbMajor, sbMinor] = ((_process$env$__CREEVE2 = process.env.__CREEVEY_STORYBOOK_VERSION__) !== null && _process$env$__CREEVE2 !== void 0 ? _process$env$__CREEVE2 : getStorybookVersion()).split('.');
+  return Number(sbMajor) > major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) > minor;
+}
+export function isStorybookVersion(major, minor) {
+  var _process$env$__CREEVE3;
+
+  const [sbMajor, sbMinor] = ((_process$env$__CREEVE3 = process.env.__CREEVEY_STORYBOOK_VERSION__) !== null && _process$env$__CREEVE3 !== void 0 ? _process$env$__CREEVE3 : getStorybookVersion()).split('.');
   return Number(sbMajor) == major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) == minor;
 }
 export function getStorybookFramework() {
-  var _process$env$__CREEVE3;
+  var _process$env$__CREEVE4;
 
-  const framework = (_process$env$__CREEVE3 = process.env.__CREEVEY_STORYBOOK_FRAMEWORK__) !== null && _process$env$__CREEVE3 !== void 0 ? _process$env$__CREEVE3 : supportedFrameworks.find(framework => {
+  const framework = (_process$env$__CREEVE4 = process.env.__CREEVEY_STORYBOOK_FRAMEWORK__) !== null && _process$env$__CREEVE4 !== void 0 ? _process$env$__CREEVE4 : supportedFrameworks.find(framework => {
     try {
       return require.resolve(resolveFromStorybook(`@storybook/${framework}`));
     } catch (_) {
@@ -70,5 +76,31 @@ export const storybookConfigRef = {
   }
 };
 export async function importStorybookConfig() {
-  return storybookConfigRef.current = (await import(require.resolve(`${storybookDirRef.current}/main`))).default;
+  const configPath = `${storybookDirRef.current}/main`;
+
+  try {
+    return storybookConfigRef.current = (await import(require.resolve(configPath))).default;
+  } catch (_) {
+    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'; // 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) ? configPath : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    getInterpretedFile(configPath); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+
+    return storybookConfigRef.current = serverRequire(mainConfigFile);
+  }
+}
+export async function isCSFv3Enabled() {
+  var _await$importStoryboo, _await$importStoryboo2, _await$importStoryboo3;
+
+  return (_await$importStoryboo = (_await$importStoryboo2 = await importStorybookConfig()) === null || _await$importStoryboo2 === void 0 ? void 0 : (_await$importStoryboo3 = _await$importStoryboo2.features) === null || _await$importStoryboo3 === void 0 ? void 0 : _await$importStoryboo3.previewCsfV3) !== null && _await$importStoryboo !== void 0 ? _await$importStoryboo : false;
 }

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

@@ -0,0 +1,200 @@
+/* eslint-disable @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/ban-ts-comment */
+import path from 'path';
+import { isWorker, isMaster } from 'cluster';
+import chokidar from 'chokidar';
+import { noop } from '../../types';
+import { getCreeveyCache } from '../utils';
+import { subscribeOn } from '../messages';
+import { importStorybookClientLogger, importStorybookConfig, importStorybookCoreCommon, importStorybookCoreEvents, isStorybookVersionGreaterThan, isStorybookVersionLessThan } from './helpers';
+import { logger } from '../logger';
+import { denormalizeStoryParameters } from '../../shared';
+
+async function initStorybookEnvironment() {
+  // @ts-ignore
+  (await import('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 importStorybookClientLogger(); // NOTE: Disable duplication warnings for >=6.2 storybook
+
+  if (isWorker) logger.warn = noop; // NOTE: disable logger for 5.x storybook
+
+  logger.debug = noop;
+  return import('./entry');
+}
+
+function watchStories(channel, watcher, initialFiles) {
+  const watchingFiles = initialFiles;
+  let storiesByFiles = new Map();
+  subscribeOn('shutdown', () => void watcher.close());
+  watcher.add(Array.from(watchingFiles));
+  watcher.on('change', filePath => storiesByFiles.set(path.isAbsolute(filePath) ? filePath : `./${filePath.replace(/\\/g, '/')}`, []));
+  watcher.on('unlink', filePath => storiesByFiles.set(path.isAbsolute(filePath) ? filePath : `./${filePath.replace(/\\/g, '/')}`, []));
+  return data => {
+    const stories = isStorybookVersionLessThan(6) || isStorybookVersionGreaterThan(6, 3) ? data.stories : 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.join(getCreeveyCache(), 'storybook/main.js');
+
+  if (watch) {
+    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];
+      import(bundlePath);
+    });
+  }
+
+  import(bundlePath);
+}
+
+async function loadStoriesDirectly(config, {
+  watcher,
+  debug
+}) {
+  const {
+    toRequireContext,
+    normalizeStoriesEntry
+  } = await importStorybookCoreCommon();
+  const {
+    addParameters,
+    configure
+  } = await import('./entry');
+  const requireContext = await (await import('../loaders/babel/register')).default(config, debug);
+
+  const preview = (() => {
+    try {
+      return require.resolve(`${config.storybookDir}/preview`);
+    } catch (_) {
+      /* noop */
+    }
+  })();
+
+  const {
+    stories
+  } = await importStorybookConfig();
+  const contexts = stories.map(entry => {
+    const normalizedEntry = 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.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 import(preview);
+      if (parameters) addParameters(parameters);
+      if (globals) addParameters({
+        globals
+      });
+      if (globalTypes) addParameters({
+        globalTypes
+      });
+    }
+
+    try {
+      configure(contexts.map(ctx => ctx()), module, false);
+    } catch (error) {
+      if (isMaster) 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();
+}
+
+export async function loadStories(config, {
+  watch,
+  debug
+}, storiesListener) {
+  const storybookApi = await initStorybookEnvironment();
+  const Events = await importStorybookCoreEvents();
+  const {
+    channel
+  } = storybookApi;
+  channel.removeAllListeners(Events.CURRENT_STORY_WAS_SET);
+  channel.on('storiesUpdated', storiesListener);
+  let watcher = null;
+  if (watch) watcher = chokidar.watch([], {
+    ignoreInitial: true
+  });
+  const loadPromise = new Promise(resolve => {
+    channel.once(Events.SET_STORIES, data => {
+      const stories = isStorybookVersionLessThan(6) || isStorybookVersionGreaterThan(6, 3) ? data.stories : 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/esm/server/utils.js

@@ -9,6 +9,7 @@ export const isShuttingDown = {
 };
 export const LOCALHOST_REGEXP = /(localhost|127\.0\.0\.1)/i;
 export const extensions = ['.js', '.jsx', '.ts', '.tsx'];
+export const skipOptionKeys = ['in', 'kinds', 'stories', 'tests', 'reason'];
 
 function matchBy(pattern, value) {
   return typeof pattern == 'string' && pattern == value || Array.isArray(pattern) && pattern.includes(value) || pattern instanceof RegExp && pattern.test(value) || !isDefined(pattern);
@@ -20,9 +21,30 @@ export 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/esm/server/worker/helpers.js

@@ -51,15 +51,14 @@ export async function addTestsFromStories(rootSuite, config, {
   debug
 }) {
   const mochaTestsById = new Map();
-  const tests = await loadTestsFromStories(config, [browser], {
+  const tests = await 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(isDefined).forEach(test => mochaTestsById.set(test.id, addTest(rootSuite, test)));
 }

package/lib/esm/server/worker/worker.js

@@ -22,8 +22,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/esm/shared.js

@@ -0,0 +1,22 @@
+import { mapValues, mergeWith } from 'lodash';
+// NOTE: Copy-paste from storybook/api
+export const combineParameters = (...parameterSets) => // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+mergeWith({}, ...parameterSets, (_, srcValue) => {
+  // Treat arrays as scalars:
+  if (Array.isArray(srcValue)) return srcValue;
+  return undefined;
+}); // NOTE: Copy-paste from storybook/api
+
+export const denormalizeStoryParameters = ({
+  globalParameters,
+  kindParameters,
+  stories
+}) => {
+  return 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)
+    };
+  });
+};

package/lib/types/cli.d.ts

@@ -1 +1 @@
-#!/usr/bin/env node
+#!/usr/bin/env node