creevey 0.7.39 → 0.8.0-beta.1

package/lib/cjs/server/stories.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.flatStories = flatStories;
 exports.loadTestsFromStories = loadTestsFromStories;
 exports.saveStoriesJson = saveStoriesJson;
 exports.saveTestsJson = saveTestsJson;
@@ -20,16 +19,17 @@ var _types = require("../types");
 
 var _utils = require("./utils");
 
-var _helpers = require("./storybook/helpers");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function storyTestFabric(delay, testFn) {
   return async function storyTest() {
-    var _testFn$call;
-
     delay ? await new Promise(resolve => setTimeout(resolve, delay)) : void 0;
-    await ((_testFn$call = testFn === null || testFn === void 0 ? void 0 : testFn.call(this)) !== null && _testFn$call !== void 0 ? _testFn$call : this.expect(await this.takeScreenshot()).to.matchImage());
+    await (testFn ? testFn.call(this) : this.screenshots.length > 0 ? this.expect(this.screenshots.reduce((screenshots, {
+      imageName,
+      screenshot
+    }, index) => ({ ...screenshots,
+      [imageName ?? `screenshot_${index}`]: screenshot
+    }), {})).to.matchImages() : this.expect(await this.takeScreenshot()).to.matchImage());
   };
 }
 
@@ -55,78 +55,63 @@ function createCreeveyTest(browser, storyMeta, skipOptions, testName) {
   };
 }
 
-function convertStories(browsers, stories) {
+function convertStories(browserName, stories) {
   const tests = {};
   (Array.isArray(stories) ? stories : Object.values(stories)).forEach(storyMeta => {
     // TODO Skip docsOnly stories for now
     if (storyMeta.parameters.docsOnly) return;
-    browsers.forEach(browserName => {
-      var _storyMeta$parameters;
-
-      const {
-        delay: delayParam,
-        tests: storyTests,
-        skip
-      } = (_storyMeta$parameters = storyMeta.parameters.creevey) !== null && _storyMeta$parameters !== void 0 ? _storyMeta$parameters : {};
-      const delay = typeof delayParam == 'number' ? delayParam : delayParam !== null && delayParam !== void 0 && delayParam.for.includes(browserName) ? delayParam.ms : 0; // typeof tests === "undefined" => rootSuite -> kindSuite -> storyTest -> [browsers.png]
-      // typeof tests === "function"  => rootSuite -> kindSuite -> storyTest -> browser -> [images.png]
-      // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> [browsers.png]
-      // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> browser -> [images.png]
-
-      if (!storyTests) {
-        const test = createCreeveyTest(browserName, storyMeta, skip);
-        tests[test.id] = { ...test,
-          storyId: storyMeta.id,
-          story: storyMeta,
-          fn: storyTestFabric(delay)
-        };
-        return;
-      }
+    const {
+      delay: delayParam,
+      tests: storyTests,
+      skip
+    } = storyMeta.parameters.creevey ?? {};
+    const delay = typeof delayParam == 'number' ? delayParam : delayParam !== null && delayParam !== void 0 && delayParam.for.includes(browserName) ? delayParam.ms : 0; // typeof tests === "undefined" => rootSuite -> kindSuite -> storyTest -> [browsers.png]
+    // typeof tests === "function"  => rootSuite -> kindSuite -> storyTest -> browser -> [images.png]
+    // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> [browsers.png]
+    // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> browser -> [images.png]
+
+    if (!storyTests) {
+      const test = createCreeveyTest(browserName, storyMeta, skip);
+      tests[test.id] = { ...test,
+        storyId: storyMeta.id,
+        story: storyMeta,
+        fn: storyTestFabric(delay)
+      };
+      return;
+    }
 
-      Object.entries(storyTests).forEach(([testName, testFn]) => {
-        const test = createCreeveyTest(browserName, storyMeta, skip, testName);
-        tests[test.id] = { ...test,
-          storyId: storyMeta.id,
-          story: storyMeta,
-          fn: storyTestFabric(delay, testFn)
-        };
-      });
+    Object.entries(storyTests).forEach(([testName, testFn]) => {
+      const test = createCreeveyTest(browserName, storyMeta, skip, testName);
+      tests[test.id] = { ...test,
+        storyId: storyMeta.id,
+        story: storyMeta,
+        fn: storyTestFabric(delay, testFn)
+      };
     });
   });
   return tests;
-} // 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 = (0, _lodash.mergeWith)({}, globalParameters, kindParameters[story.kind], story.parameters, (objValue, srcValue) => Array.isArray(objValue) ? objValue.concat(srcValue) : undefined);
-  });
-  return stories;
 }
 
 async function loadTestsFromStories(browsers, provider, update) {
   const testIdsByFiles = new Map();
-  const data = await provider(storiesByFiles => {
+  const stories = await provider(storiesByFiles => {
     const testsDiff = {};
-    Array.from(storiesByFiles.entries()).forEach(([filename, stories]) => {
-      var _testIdsByFiles$get$f, _testIdsByFiles$get;
-
-      const tests = convertStories(browsers, stories);
-      const changed = Object.keys(tests);
-      const removed = (_testIdsByFiles$get$f = (_testIdsByFiles$get = testIdsByFiles.get(filename)) === null || _testIdsByFiles$get === void 0 ? void 0 : _testIdsByFiles$get.filter(testId => !tests[testId])) !== null && _testIdsByFiles$get$f !== void 0 ? _testIdsByFiles$get$f : [];
-      if (changed.length == 0) testIdsByFiles.delete(filename);else testIdsByFiles.set(filename, changed);
-      Object.assign(testsDiff, tests);
-      removed.forEach(testId => testsDiff[testId] = undefined);
+    const tests = {};
+    browsers.forEach(browser => {
+      Array.from(storiesByFiles.entries()).forEach(([filename, stories]) => {
+        var _testIdsByFiles$get;
+
+        Object.assign(tests, convertStories(browser, stories));
+        const changed = Object.keys(tests);
+        const removed = ((_testIdsByFiles$get = testIdsByFiles.get(filename)) === null || _testIdsByFiles$get === void 0 ? void 0 : _testIdsByFiles$get.filter(testId => !tests[testId])) ?? [];
+        if (changed.length == 0) testIdsByFiles.delete(filename);else testIdsByFiles.set(filename, changed);
+        Object.assign(testsDiff, tests);
+        removed.forEach(testId => testsDiff[testId] = undefined);
+      });
     });
     update === null || update === void 0 ? void 0 : update(testsDiff);
   });
-  const stories = (0, _helpers.isStorybookVersionLessThan)(6) ? data.stories : flatStories(data);
-  const tests = convertStories(browsers, stories);
+  const tests = browsers.reduce((tests, browser) => Object.assign(tests, convertStories(browser, stories)), {});
   Object.values(tests).filter(_types.isDefined).forEach(({
     id,
     story: {
@@ -134,36 +119,25 @@ async function loadTestsFromStories(browsers, provider, update) {
         fileName
       }
     }
-  }) => {
-    var _testIdsByFiles$get2;
-
-    return (// TODO Don't use filename as a key, due possible collisions if two require.context with same structure of modules are defined
-      testIdsByFiles.set(fileName, [...((_testIdsByFiles$get2 = testIdsByFiles.get(fileName)) !== null && _testIdsByFiles$get2 !== void 0 ? _testIdsByFiles$get2 : []), id])
-    );
-  });
+  }) => // TODO Don't use filename as a key, due possible collisions if two require.context with same structure of modules are defined
+  testIdsByFiles.set(fileName, [...(testIdsByFiles.get(fileName) ?? []), id]));
   return tests;
 }
 
 function saveStoriesJson(storiesData, extract) {
-  var _storiesData$stories;
-
-  const outputDir = typeof extract == 'boolean' ? 'storybook-static' : extract;
-
-  if (!(0, _helpers.isStorybookVersionLessThan)(6)) {
-    // NOTE Copy-pasted from Storybook's `getStoriesJsonData` method
-    const allowed = ['fileName', 'docsOnly', 'framework', '__id', '__isArgsStory'];
-    storiesData.globalParameters = (0, _lodash.pick)(storiesData.globalParameters, allowed); // @ts-expect-error ignore error
+  const outputDir = typeof extract == 'boolean' ? 'storybook-static' : extract; // NOTE Copy-pasted from Storybook's `getStoriesJsonData` method
 
-    storiesData.kindParameters = (0, _lodash.mapValues)(storiesData.kindParameters, v => (0, _lodash.pick)(v, allowed)); // @ts-expect-error ignore error
+  const allowed = ['fileName', 'docsOnly', 'framework', '__id', '__isArgsStory'];
+  storiesData.globalParameters = (0, _lodash.pick)(storiesData.globalParameters, allowed); // @ts-expect-error ignore error
 
-    storiesData.stories = (0, _lodash.mapValues)(storiesData.stories, v => ({ ...(0, _lodash.pick)(v, ['id', 'name', 'kind', 'story']),
-      parameters: (0, _lodash.pick)(v.parameters, allowed)
-    }));
-  } // TODO Fix args stories
+  storiesData.kindParameters = (0, _lodash.mapValues)(storiesData.kindParameters, v => (0, _lodash.pick)(v, allowed)); // @ts-expect-error ignore error
 
+  storiesData.stories = (0, _lodash.mapValues)(storiesData.stories, v => ({ ...(0, _lodash.pick)(v, ['id', 'name', 'kind', 'story']),
+    parameters: (0, _lodash.pick)(v.parameters, allowed)
+  })); // TODO Fix args stories
 
-  (0, _utils.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 => (0, _types.isObject)(story) && 'parameters' in story && (0, _types.isObject)(story.parameters) && delete story.parameters.__isArgsStory);
+  (0, _utils.removeProps)(storiesData ?? {}, ['stories', () => true, 'parameters', '__isArgsStory']);
+  Object.values((storiesData === null || storiesData === void 0 ? void 0 : storiesData.stories) ?? {}).forEach(story => (0, _types.isObject)(story) && 'parameters' in story && (0, _types.isObject)(story.parameters) && delete story.parameters.__isArgsStory);
   (0, _fs.mkdirSync)(outputDir, {
     recursive: true
   });

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

@@ -3,23 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.raw = exports.getStorybook = exports.setAddon = exports.clearDecorators = exports.addParameters = exports.addDecorator = exports.configure = exports.storiesOf = exports.forceReRender = exports.clientApi = exports.channel = void 0;
+exports.storiesOf = exports.setAddon = exports.raw = exports.getStorybook = exports.forceReRender = exports.configure = exports.clientApi = exports.clearDecorators = exports.channel = exports.addParameters = exports.addDecorator = void 0;
 
-var _helpers = require("./helpers");
+var _addons = require("@storybook/addons");
 
-var _api$channel, _api$context;
+var _helpers = require("./helpers");
 
 const framework = (0, _helpers.getStorybookFramework)(); // eslint-disable-next-line @typescript-eslint/no-var-requires
 
-const core = require((0, _helpers.resolveFromStorybook)('@storybook/core')); //@ts-expect-error: 6.2 use named exports
-// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+const core = require((0, _helpers.resolveFromStorybook)('@storybook/core'));
 
+const start = core.start;
+const api = start(() => void 0);
 
-const start = (0, _helpers.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
+const channel = _addons.addons.getChannel();
 
-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;
 exports.channel = channel;
 const clientApi = api.clientApi;
 exports.clientApi = clientApi;
@@ -35,20 +33,8 @@ const storiesOf = (kind, m) => {
 exports.storiesOf = storiesOf;
 
 const configure = (...args) => {
-  if ((0, _helpers.isStorybookVersionLessThan)(5, 2)) {
-    //NOTE: Storybook <= 5.1 pass args as is
-    //@ts-expect-error: ignore it
-    return api.configApi.configure(...args);
-  }
-
-  if ((0, _helpers.isStorybookVersionLessThan)(6)) {
-    //NOTE: Storybook <= 5.3 pass `framework` as last argument
-    //@ts-expect-error: ignore it
-    return api.configure(...args, framework);
-  } //NOTE Storybook 6.x pass `framework` as first argument
+  //NOTE Storybook 6.x pass `framework` as first argument
   //@ts-expect-error: ignore it
-
-
   return api.configure(framework, ...args);
 };
 

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

@@ -3,15 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getStorybookFramework = getStorybookFramework;
+exports.getStorybookVersion = getStorybookVersion;
 exports.hasDocsAddon = hasDocsAddon;
 exports.hasSvelteCSFAddon = hasSvelteCSFAddon;
-exports.getStorybookVersion = getStorybookVersion;
-exports.isStorybookVersionLessThan = isStorybookVersionLessThan;
-exports.isStorybookVersion = isStorybookVersion;
-exports.getStorybookFramework = getStorybookFramework;
+exports.importStorybookClientLogger = void 0;
 exports.importStorybookConfig = importStorybookConfig;
+exports.importStorybookCoreEvents = exports.importStorybookCoreCommon = void 0;
 exports.isCSFv3Enabled = isCSFv3Enabled;
-exports.storybookConfigRef = exports.importStorybookCoreEvents = exports.importStorybookCoreCommon = exports.importStorybookClientLogger = exports.resolveFromStorybookCoreServer = exports.resolveFromStorybookCore = exports.resolveFromStorybookBuilderWebpack4 = exports.resolveFromStorybookAddonDocs = exports.resolveFromStorybook = exports.storybookDirRef = void 0;
+exports.isStorybookVersion = isStorybookVersion;
+exports.isStorybookVersionGreaterThan = isStorybookVersionGreaterThan;
+exports.isStorybookVersionLessThan = isStorybookVersionLessThan;
+exports.storybookDirRef = exports.storybookConfigRef = exports.resolveFromStorybookCoreServer = exports.resolveFromStorybookCore = exports.resolveFromStorybookBuilderWebpack4 = exports.resolveFromStorybookAddonDocs = exports.resolveFromStorybook = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -91,23 +94,22 @@ function getStorybookVersion() {
 }
 
 function isStorybookVersionLessThan(major, minor) {
-  var _process$env$__CREEVE;
-
-  const [sbMajor, sbMinor] = ((_process$env$__CREEVE = process.env.__CREEVEY_STORYBOOK_VERSION__) !== null && _process$env$__CREEVE !== void 0 ? _process$env$__CREEVE : getStorybookVersion()).split('.');
+  const [sbMajor, sbMinor] = (process.env.__CREEVEY_STORYBOOK_VERSION__ ?? getStorybookVersion()).split('.');
   return Number(sbMajor) < major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) < minor;
 }
 
-function isStorybookVersion(major, minor) {
-  var _process$env$__CREEVE2;
+function isStorybookVersionGreaterThan(major, minor) {
+  const [sbMajor, sbMinor] = (process.env.__CREEVEY_STORYBOOK_VERSION__ ?? getStorybookVersion()).split('.');
+  return Number(sbMajor) > major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) > minor;
+}
 
-  const [sbMajor, sbMinor] = ((_process$env$__CREEVE2 = process.env.__CREEVEY_STORYBOOK_VERSION__) !== null && _process$env$__CREEVE2 !== void 0 ? _process$env$__CREEVE2 : getStorybookVersion()).split('.');
+function isStorybookVersion(major, minor) {
+  const [sbMajor, sbMinor] = (process.env.__CREEVEY_STORYBOOK_VERSION__ ?? getStorybookVersion()).split('.');
   return Number(sbMajor) == major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) == minor;
 }
 
 function getStorybookFramework() {
-  var _process$env$__CREEVE3;
-
-  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.__CREEVEY_STORYBOOK_FRAMEWORK__ ?? supportedFrameworks.find(framework => {
     try {
       return require.resolve(resolveFromStorybook(`@storybook/${framework}`));
     } catch (_) {
@@ -131,8 +133,8 @@ async function importStorybookConfig() {
   try {
     return storybookConfigRef.current = (await Promise.resolve(`${require.resolve(configPath)}`).then(s => _interopRequireWildcard(require(s)))).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 storybookUtilsPath = '@storybook/core-common/dist/cjs/utils';
+    const serverRequireModule = 'interpret-require'; // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 
     const {
       getInterpretedFile
@@ -141,17 +143,16 @@ async function importStorybookConfig() {
     const {
       default: serverRequireFallback,
       serverRequire = serverRequireFallback
-    } = await Promise.resolve(`${resolveFromStorybook(`${storybookUtilsPath}/${serverRequireModule}`)}`).then(s => _interopRequireWildcard(require(s))); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    } = await Promise.resolve(`${resolveFromStorybook(`${storybookUtilsPath}/${serverRequireModule}`)}`).then(s => _interopRequireWildcard(require(s))); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
 
-    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
+    const mainConfigFile = getInterpretedFile(configPath); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
 
     return storybookConfigRef.current = serverRequire(mainConfigFile);
   }
 }
 
 async function isCSFv3Enabled() {
-  var _await$importStoryboo, _await$importStoryboo2, _await$importStoryboo3;
+  var _await$importStoryboo, _await$importStoryboo2;
 
-  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;
+  return ((_await$importStoryboo = await importStorybookConfig()) === null || _await$importStoryboo === void 0 ? void 0 : (_await$importStoryboo2 = _await$importStoryboo.features) === null || _await$importStoryboo2 === void 0 ? void 0 : _await$importStoryboo2.previewCsfV3) ?? false;
 }

package/lib/cjs/server/storybook/providers/browser.js

@@ -0,0 +1,74 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadStories = loadStories;
+
+var _cluster = _interopRequireDefault(require("cluster"));
+
+var _selenium = require("../../selenium");
+
+var _messages = require("../../messages");
+
+var _types = require("../../../types");
+
+var _logger = require("../../logger");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+async function loadStories(_config, {
+  port
+}, storiesListener) {
+  if (_cluster.default.isPrimary) {
+    return new Promise(resolve => {
+      const worker = Object.values(_cluster.default.workers ?? {}).filter(_types.isDefined).find(worker => worker.isConnected());
+
+      if (worker) {
+        const unsubscribe = (0, _messages.subscribeOnWorker)(worker, 'stories', message => {
+          if (message.type == 'set') {
+            const {
+              stories,
+              oldTests
+            } = message.payload;
+            if (oldTests.length > 0) _logger.logger.warn(`If you use browser stories provider of CSFv3 Storybook feature\n` + `Creevey will not load tests defined in story parameters from following stories:\n` + oldTests.join('\n'));
+            unsubscribe();
+            resolve(stories);
+          }
+        });
+        (0, _messages.sendStoriesMessage)(worker, {
+          type: 'get'
+        });
+      }
+
+      (0, _messages.subscribeOn)('stories', message => {
+        // TODO updates only one browser :(
+        if (message.type == 'update') storiesListener(new Map(message.payload));
+      });
+    });
+  } else {
+    (0, _messages.subscribeOn)('stories', message => {
+      if (message.type == 'get') (0, _messages.emitStoriesMessage)({
+        type: 'set',
+        payload: {
+          stories,
+          oldTests: storiesWithOldTests
+        }
+      });
+      if (message.type == 'update') storiesListener(new Map(message.payload));
+    });
+    const stories = await (0, _selenium.loadStoriesFromBrowser)(port);
+    const storiesWithOldTests = [];
+    Object.values(stories).forEach(story => {
+      var _parameters, _parameters$creevey;
+
+      if ((_parameters = story.parameters) !== null && _parameters !== void 0 && (_parameters$creevey = _parameters.creevey) !== null && _parameters$creevey !== void 0 && _parameters$creevey.tests) {
+        var _parameters2, _parameters2$creevey;
+
+        (_parameters2 = story.parameters) === null || _parameters2 === void 0 ? true : (_parameters2$creevey = _parameters2.creevey) === null || _parameters2$creevey === void 0 ? true : delete _parameters2$creevey.tests;
+        storiesWithOldTests.push(`${story.kind}/${story.name}`);
+      }
+    });
+    return stories;
+  }
+}

package/lib/cjs/server/storybook/{nodejs-provider.js → providers/nodejs.js}

@@ -3,25 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.extractStoriesData = extractStoriesData;
 exports.loadStories = loadStories;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _cluster = require("cluster");
+var _cluster = _interopRequireDefault(require("cluster"));
 
 var _chokidar = _interopRequireDefault(require("chokidar"));
 
-var _types = require("../../types");
+var _types = require("../../../types");
 
-var _utils = require("../utils");
+var _utils = require("../../utils");
 
-var _messages = require("../messages");
+var _messages = require("../../messages");
 
-var _helpers = require("./helpers");
+var _helpers = require("../helpers");
 
-var _logger = require("../logger");
-
-var _stories = require("../stories");
+var _logger = require("../../logger");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -30,7 +29,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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
+  // @ts-expect-error There is no @types/global-jsdom package
   (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
@@ -45,10 +44,10 @@ async function initStorybookEnvironment() {
     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
+  if (_cluster.default.isWorker) logger.warn = _types.noop; // NOTE: disable logger for 5.x storybook
 
   logger.debug = _types.noop;
-  return Promise.resolve().then(() => _interopRequireWildcard(require('./entry')));
+  return Promise.resolve().then(() => _interopRequireWildcard(require('../entry')));
 }
 
 function watchStories(channel, watcher, initialFiles) {
@@ -59,7 +58,7 @@ function watchStories(channel, watcher, initialFiles) {
   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) ? data.stories : (0, _stories.flatStories)(data);
+    const stories = data.stories;
     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));
@@ -104,13 +103,14 @@ async function loadStoriesDirectly(config, {
   debug
 }) {
   const {
-    toRequireContext
+    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);
+  } = 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 {
@@ -123,12 +123,16 @@ async function loadStoriesDirectly(config, {
   const {
     stories
   } = await (0, _helpers.importStorybookConfig)();
-  const contexts = stories.map(input => {
+  const contexts = stories.map(entry => {
+    const normalizedEntry = normalizeStoriesEntry(entry, {
+      configDir: config.storybookDir,
+      workingDir: process.cwd()
+    });
     const {
       path: storiesPath,
       recursive,
       match
-    } = toRequireContext(input);
+    } = toRequireContext(normalizedEntry);
     watcher === null || watcher === void 0 ? void 0 : watcher.add(_path.default.resolve(config.storybookDir, storiesPath));
     return () => requireContext(storiesPath, recursive, new RegExp(match));
   });
@@ -169,7 +173,7 @@ async function loadStoriesDirectly(config, {
     try {
       configure(contexts.map(ctx => ctx()), module, false);
     } catch (error) {
-      if (_cluster.isMaster) _logger.logger.error(error);
+      if (_cluster.default.isPrimary) _logger.logger.error(error);
     }
   }
 
@@ -182,7 +186,8 @@ async function loadStoriesDirectly(config, {
     void startStorybook();
   });
   void startStorybook();
-}
+} // TODO Do we need to support multiple storybooks here?
+
 
 async function loadStories(config, {
   watch,
@@ -195,16 +200,16 @@ async function loadStories(config, {
   } = storybookApi;
   channel.removeAllListeners(Events.CURRENT_STORY_WAS_SET);
   channel.on('storiesUpdated', storiesListener);
-  let watcher = null;
+  let watcher;
   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) ? data.stories : (0, _stories.flatStories)(data);
+      const stories = data.stories;
       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);
+      resolve(stories);
     });
   });
   if (config.useWebpackToExtractTests) loadStoriesFromBundle(watch);else void loadStoriesDirectly(config, {
@@ -212,4 +217,21 @@ async function loadStories(config, {
     debug
   });
   return loadPromise;
+}
+
+async function extractStoriesData(config, {
+  watch,
+  debug
+}) {
+  const storybookApi = await initStorybookEnvironment();
+  const Events = await (0, _helpers.importStorybookCoreEvents)();
+  const {
+    channel
+  } = storybookApi;
+  channel.removeAllListeners(Events.CURRENT_STORY_WAS_SET);
+  const loadPromise = new Promise(resolve => channel.once(Events.SET_STORIES, resolve));
+  if (config.useWebpackToExtractTests) loadStoriesFromBundle(watch);else void loadStoriesDirectly(config, {
+    debug
+  });
+  return loadPromise;
 }

package/lib/cjs/server/update.js

@@ -31,11 +31,7 @@ function tryToLoadTestsData(filename) {
 const actualRegex = /^(.*)-actual-(\d+)\.png$/i;
 
 function approve(dirents, srcPath, dstPath, testPaths, isMatch) {
-  dirents.filter(dirent => dirent.isFile()).map(dirent => actualRegex.exec(dirent.name)).filter(_types.isDefined).filter(([fileName, imageName]) => !testPaths || testPaths.find(([token]) => token == imageName) && isMatch(_path.default.join(srcPath, fileName))).reduce((images, [, imageName, retry]) => {
-    var _images$get;
-
-    return Number(retry) > ((_images$get = images.get(imageName)) !== null && _images$get !== void 0 ? _images$get : -1) ? images.set(imageName, Number(retry)) : images;
-  }, new Map()).forEach((retry, imageName) => {
+  dirents.filter(dirent => dirent.isFile()).map(dirent => actualRegex.exec(dirent.name)).filter(_types.isDefined).filter(([fileName, imageName]) => !testPaths || testPaths.find(([token]) => token == imageName) && isMatch(_path.default.join(srcPath, fileName))).reduce((images, [, imageName, retry]) => Number(retry) > (images.get(imageName) ?? -1) ? images.set(imageName, Number(retry)) : images, new Map()).forEach((retry, imageName) => {
     (0, _fs.mkdirSync)(dstPath, {
       recursive: true
     });