creevey 0.7.37 → 0.8.0-beta.0

package/lib/cjs/index.js

@@ -3,11 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  nodejsStoriesProvider: true
+};
+Object.defineProperty(exports, "nodejsStoriesProvider", {
+  enumerable: true,
+  get: function () {
+    return _nodejsProvider.loadStories;
+  }
+});
 
 var _types = require("./types");
 
 Object.keys(_types).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _types[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -21,6 +31,7 @@ var _withCreevey = require("./client/addon/withCreevey");
 
 Object.keys(_withCreevey).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _withCreevey[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -28,4 +39,6 @@ Object.keys(_withCreevey).forEach(function (key) {
       return _withCreevey[key];
     }
   });
-});
+});
+
+var _nodejsProvider = require("./server/storybook/nodejs-provider");

package/lib/cjs/server/config.js

@@ -12,6 +12,8 @@ var _path = _interopRequireDefault(require("path"));
 
 var _helpers = require("./storybook/helpers");
 
+var _nodejsProvider = require("./storybook/nodejs-provider");
+
 var _types = require("../types");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -79,6 +81,7 @@ async function readConfig(options) {
   if ((0, _types.isDefined)(configPath)) Object.assign(userConfig, (await Promise.resolve(`${configPath}`).then(s => _interopRequireWildcard(require(s)))).default);
   _helpers.storybookDirRef.current = userConfig.storybookDir;
   if ((0, _helpers.isStorybookVersionLessThan)(6, 2)) userConfig.useWebpackToExtractTests = true;
+  if (!userConfig.storiesProvider) userConfig.storiesProvider = (await (0, _helpers.isCSFv3Enabled)()) ? _nodejsProvider.loadStories : _nodejsProvider.loadStories;
   if (options.failFast != undefined) userConfig.failFast = Boolean(options.failFast);
   if (options.reportDir) userConfig.reportDir = _path.default.resolve(options.reportDir);
   if (options.screenDir) userConfig.screenDir = _path.default.resolve(options.screenDir); // NOTE: Hack to pass typescript checking

package/lib/cjs/server/extract.js

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

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

@@ -90,7 +90,8 @@ function getRequireContext(rootDir) {
 }
 
 async function register(config, debug = false) {
-  const requireContext = getRequireContext(config.storybookDir);
+  const rootDir = (0, _helpers.isStorybookVersionLessThan)(6, 4) ? config.storybookDir : process.cwd();
+  const requireContext = getRequireContext(rootDir);
   const preview = (0, _path.resolve)(config.storybookDir, 'preview');
   if ((0, _helpers.hasDocsAddon)()) await (await Promise.resolve().then(() => _interopRequireWildcard(require('../hooks/mdx')))).addMDXHook(() => story);
   if ((0, _helpers.hasSvelteCSFAddon)()) await (await Promise.resolve().then(() => _interopRequireWildcard(require('../hooks/svelte')))).addSvelteHook(() => story); // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call

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

@@ -179,27 +179,11 @@ async function getWebpackConfigForStorybook_6_2(framework, configDir, outputDir)
   });
 }
 
-async function removeAddons(configDir) {
-  const storybookUtilsPath = (0, _helpers.isStorybookVersionLessThan)(6, 2) ? '@storybook/core/dist/server/utils' : '@storybook/core-common/dist/cjs/utils';
-  const serverRequireModule = (0, _helpers.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 Promise.resolve(`${(0, _helpers.resolveFromStorybook)(`${storybookUtilsPath}/interpret-files`)}`).then(s => _interopRequireWildcard(require(s))); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-
-    const {
-      default: serverRequireFallback,
-      serverRequire = serverRequireFallback
-    } = await Promise.resolve(`${(0, _helpers.resolveFromStorybook)(`${storybookUtilsPath}/${serverRequireModule}`)}`).then(s => _interopRequireWildcard(require(s))); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-
-    const mainConfigFile = (0, _helpers.isStorybookVersionLessThan)(6, 1) ? _path.default.join(configDir, 'main') : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    getInterpretedFile(_path.default.join(configDir, 'main')); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-
-    const config = serverRequire(mainConfigFile);
+    const config = await (0, _helpers.importStorybookConfig)();
 
     if (((_config$core = config.core) === null || _config$core === void 0 ? void 0 : _config$core.builder) == 'webpack5') {
       _logger.logger.warn("Be aware Creevey doesn't fully support webpack@5, some feature might not work well");
@@ -243,7 +227,7 @@ 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 = (0, _helpers.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 : _utils.extensions;

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

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

package/lib/cjs/server/master/master.js

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

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

@@ -7,33 +7,33 @@ exports.updateStorybookGlobals = updateStorybookGlobals;
 exports.getBrowser = getBrowser;
 exports.switchStory = switchStory;
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
 var _http = _interopRequireDefault(require("http"));
 
 var _https = _interopRequireDefault(require("https"));
 
-var _pngjs = require("pngjs");
-
 var _loglevel = require("loglevel");
 
 var _loglevelPluginPrefix = _interopRequireDefault(require("loglevel-plugin-prefix"));
 
-var _seleniumWebdriver = require("selenium-webdriver");
-
-var _types = require("../../types");
-
-var _messages = require("../messages");
-
 var _os = require("os");
 
-var _utils = require("../utils");
+var _pngjs = require("pngjs");
+
+var _seleniumWebdriver = require("selenium-webdriver");
 
 var _capabilities = require("selenium-webdriver/lib/capabilities");
 
-var _helpers = require("../storybook/helpers");
+var _types = require("../../types");
 
 var _logger = require("../logger");
 
-var _chalk = _interopRequireDefault(require("chalk"));
+var _messages = require("../messages");
+
+var _helpers = require("../storybook/helpers");
+
+var _utils = require("../utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -502,6 +502,18 @@ async function getBrowser(config, browserConfig) {
   return browser;
 }
 
+async function updateStoryArgs(browser, story, updatedArgs) {
+  const Events = await (0, _helpers.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);
+}
+
 async function switchStory() {
   var _this$currentTest, _this$currentTest$ctx, _parameters$creevey;
 
@@ -546,6 +558,8 @@ async function switchStory() {
 
   this.takeScreenshot = () => takeScreenshot(this.browser, captureElement, ignoreElements);
 
+  this.updateStoryArgs = updatedArgs => updateStoryArgs(this.browser, story, updatedArgs);
+
   this.testScope.reverse();
 }
 

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

@@ -51,7 +51,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, {

package/lib/cjs/server/stories.js

@@ -6,39 +6,25 @@ Object.defineProperty(exports, "__esModule", {
 exports.loadTestsFromStories = loadTestsFromStories;
 exports.saveStoriesJson = saveStoriesJson;
 exports.saveTestsJson = saveTestsJson;
-exports.storybookApi = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
 var _fs = require("fs");
 
-var _cluster = require("cluster");
-
 var _crypto = require("crypto");
 
-var _chokidar = _interopRequireDefault(require("chokidar"));
+var _lodash = require("lodash");
 
 var _types = require("../types");
 
 var _utils = require("./utils");
 
-var _lodash = require("lodash");
-
-var _messages = require("./messages");
-
 var _helpers = require("./storybook/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; }
-
-let storybookApi = null;
-exports.storybookApi = storybookApi;
-
 function storyTestFabric(delay, testFn) {
   return async function storyTest() {
     var _testFn$call;
@@ -111,214 +97,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 Promise.resolve().then(() => _interopRequireWildcard(require('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 (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('./storybook/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) ? 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 = (0, _lodash.mergeWith)({}, globalParameters, kindParameters[story.kind], story.parameters, (objValue, srcValue) => Array.isArray(objValue) ? objValue.concat(srcValue) : undefined);
-  });
-  return stories;
-}
-
-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
-  } = await (0, _helpers.importStorybookCoreCommon)();
-  const {
-    addParameters,
-    configure
-  } = await Promise.resolve().then(() => _interopRequireWildcard(require('./storybook/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(input => {
-    const {
-      path: storiesPath,
-      recursive,
-      match
-    } = toRequireContext(input);
-    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 loadStorybook(config, {
-  watch,
-  debug
-}, storiesListener) {
-  exports.storybookApi = 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) ? 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;
-}
-
-async function loadTestsFromStories(config, browsers, {
-  watch = false,
-  debug = false,
-  update
-}) {
+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;
@@ -332,6 +113,7 @@ async function loadTestsFromStories(config, browsers, {
     });
     update === null || update === void 0 ? void 0 : update(testsDiff);
   });
+  const stories = (0, _helpers.isStorybookVersionLessThan)(6) || (0, _helpers.isStorybookVersionGreaterThan)(6, 3) ? data.stories : (0, _shared.denormalizeStoryParameters)(data);
   const tests = convertStories(browsers, stories);
   Object.values(tests).filter(_types.isDefined).forEach(({
     id,
@@ -350,11 +132,23 @@ async function loadTestsFromStories(config, browsers, {
   return tests;
 }
 
-function saveStoriesJson(extract) {
-  var _storybookApi, _storiesData$stories;
+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 (!(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
+
+    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);

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.raw = exports.getStorybook = exports.setAddon = exports.clearDecorators = exports.addParameters = exports.addDecorator = exports.configure = exports.storiesOf = exports.forceReRender = exports.clientApi = exports.channel = void 0;
 
+var _addons = require("@storybook/addons");
+
 var _helpers = require("./helpers");
 
 var _api$channel, _api$context;
@@ -16,10 +18,8 @@ const core = require((0, _helpers.resolveFromStorybook)('@storybook/core')); //@
 
 
 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 = (_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);
+const channel = (0, _helpers.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.addons.getChannel();
 exports.channel = channel;
 const clientApi = api.clientApi;
 exports.clientApi = clientApi;
@@ -38,6 +38,7 @@ const configure = (...args) => {
   if ((0, _helpers.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/cjs/server/storybook/helpers.js

@@ -7,9 +7,11 @@ exports.hasDocsAddon = hasDocsAddon;
 exports.hasSvelteCSFAddon = hasSvelteCSFAddon;
 exports.getStorybookVersion = getStorybookVersion;
 exports.isStorybookVersionLessThan = isStorybookVersionLessThan;
+exports.isStorybookVersionGreaterThan = isStorybookVersionGreaterThan;
 exports.isStorybookVersion = isStorybookVersion;
 exports.getStorybookFramework = getStorybookFramework;
 exports.importStorybookConfig = importStorybookConfig;
+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;
 
 var _path = _interopRequireDefault(require("path"));
@@ -96,17 +98,24 @@ function isStorybookVersionLessThan(major, minor) {
   return Number(sbMajor) < major || minor != undefined && Number(sbMajor) == major && Number(sbMinor) < minor;
 }
 
-function isStorybookVersion(major, minor) {
+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;
+}
+
+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;
 }
 
 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 (_) {
@@ -125,5 +134,32 @@ const storybookConfigRef = {
 exports.storybookConfigRef = storybookConfigRef;
 
 async function importStorybookConfig() {
-  return storybookConfigRef.current = (await Promise.resolve(`${require.resolve(`${storybookDirRef.current}/main`)}`).then(s => _interopRequireWildcard(require(s)))).default;
+  const configPath = `${storybookDirRef.current}/main`;
+
+  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 {
+      getInterpretedFile
+    } = await Promise.resolve(`${resolveFromStorybook(`${storybookUtilsPath}/interpret-files`)}`).then(s => _interopRequireWildcard(require(s))); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+
+    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
+
+    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);
+  }
+}
+
+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;
 }