creevey 0.8.0-beta.0 → 0.8.0

package/lib/cjs/client/web/main.js.LICENSE.txt

@@ -0,0 +1,49 @@
+/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+
+/** @license React v0.20.2
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v17.0.2
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v17.0.2
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */

package/lib/cjs/creevey.js

@@ -19,10 +19,8 @@ var _logger = require("./server/logger");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function shutdownOnException(reason) {
-  var _reason$stack;
-
   if (_utils.isShuttingDown.current) return;
-  const error = reason instanceof Error ? (_reason$stack = reason.stack) !== null && _reason$stack !== void 0 ? _reason$stack : reason.message : reason;
+  const error = reason instanceof Error ? reason.stack ?? reason.message : reason;
 
   _logger.logger.error(error);
 
@@ -33,13 +31,13 @@ function shutdownOnException(reason) {
       error
     }
   });
-  if (_cluster.default.isMaster && !_utils.isShuttingDown.current) void (0, _utils.shutdownWorkers)();
+  if (_cluster.default.isPrimary && !_utils.isShuttingDown.current) void (0, _utils.shutdownWorkers)();
 }
 
 process.on('uncaughtException', shutdownOnException);
 process.on('unhandledRejection', shutdownOnException);
 if (_cluster.default.isWorker) process.on('SIGINT', _types.noop);
-if (_cluster.default.isMaster) process.on('SIGINT', _utils.shutdown);
+if (_cluster.default.isPrimary) process.on('SIGINT', _utils.shutdown);
 const argv = (0, _minimist.default)(process.argv.slice(2), {
   string: ['browser', 'config', 'reporter', 'reportDir', 'screenDir'],
   boolean: ['debug', 'ui', 'saveReport', 'webpack', 'tests'],

package/lib/cjs/index.js

@@ -4,12 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
+  browserStoriesProvider: true,
   nodejsStoriesProvider: true
 };
+Object.defineProperty(exports, "browserStoriesProvider", {
+  enumerable: true,
+  get: function () {
+    return _browser.loadStories;
+  }
+});
 Object.defineProperty(exports, "nodejsStoriesProvider", {
   enumerable: true,
   get: function () {
-    return _nodejsProvider.loadStories;
+    return _nodejs.loadStories;
   }
 });
 
@@ -27,18 +34,6 @@ Object.keys(_types).forEach(function (key) {
   });
 });
 
-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,
-    get: function () {
-      return _withCreevey[key];
-    }
-  });
-});
+var _browser = require("./server/storybook/providers/browser");
 
-var _nodejsProvider = require("./server/storybook/nodejs-provider");
+var _nodejs = require("./server/storybook/providers/nodejs");

package/lib/cjs/server/config.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.readConfig = readConfig;
 exports.defaultConfig = exports.defaultBrowser = void 0;
+exports.readConfig = readConfig;
 
 var _fs = _interopRequireDefault(require("fs"));
 
@@ -12,7 +12,9 @@ var _path = _interopRequireDefault(require("path"));
 
 var _helpers = require("./storybook/helpers");
 
-var _nodejsProvider = require("./storybook/nodejs-provider");
+var _nodejs = require("./storybook/providers/nodejs");
+
+var _browser = require("./storybook/providers/browser");
 
 var _types = require("../types");
 
@@ -80,8 +82,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 (!userConfig.storiesProvider) userConfig.storiesProvider = (await (0, _helpers.isCSFv3Enabled)()) ? _browser.loadStories : _nodejs.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/docker.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 exports.pullImages = pullImages;
 exports.runImage = runImage;
-exports.default = _default;
 
-var _cluster = _interopRequireWildcard(require("cluster"));
+var _cluster = _interopRequireDefault(require("cluster"));
 
 var _types = require("../types");
 
@@ -25,10 +25,6 @@ var _logger = require("./logger");
 
 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; }
-
 const docker = new _dockerode.default();
 
 class DevNull extends _stream.Writable {
@@ -117,7 +113,7 @@ async function runImage(image, args, options, debug) {
 }
 
 async function _default(config, browser, startContainer) {
-  if (_cluster.isMaster) {
+  if (_cluster.default.isPrimary) {
     const host = await startContainer();
     let gridUrl = 'http://localhost:4444/wd/hub';
     gridUrl = _utils.isInsideDocker ? gridUrl.replace(_utils.LOCALHOST_REGEXP, host) : gridUrl;

package/lib/cjs/server/extract.js

@@ -9,6 +9,8 @@ var _messages = require("./messages");
 
 var _stories = require("./stories");
 
+var _nodejs = require("./storybook/providers/nodejs");
+
 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; }
@@ -29,12 +31,13 @@ async function extract(config, options) {
     });
   }
 
-  const tests = await (0, _stories.loadTestsFromStories)(Object.keys(config.browsers), async listener => {
-    const stories = await config.storiesProvider(config, {
+  const tests = await (0, _stories.loadTestsFromStories)(Object.keys(config.browsers), async () => {
+    const data = await (0, _nodejs.extractStoriesData)(config, {
       watch: false,
       debug: options.debug
-    }, listener);
-    if (options.extract) (0, _stories.saveStoriesJson)(stories, options.extract);
+    });
+    const stories = data.stories;
+    if (options.extract) (0, _stories.saveStoriesJson)(data, options.extract);
     return stories;
   });
   if (options.tests) (0, _stories.saveTestsJson)(tests); // eslint-disable-next-line no-process-exit

package/lib/cjs/server/index.js

@@ -9,8 +9,6 @@ var _cluster = _interopRequireDefault(require("cluster"));
 
 var _config = require("./config");
 
-var _types = require("../types");
-
 var _logger = require("./logger");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -39,8 +37,7 @@ async function _default(options) {
     ui,
     port
   } = options;
-  if (!config) return;
-  const resolveApi = ui && _cluster.default.isMaster ? (await Promise.resolve().then(() => _interopRequireWildcard(require('./master/server')))).default(config.reportDir, port) : _types.noop; // NOTE: We don't need docker nor selenoid for webpack or update options
+  if (!config) return; // NOTE: We don't need docker nor selenoid for webpack or update options
 
   if (!(config.gridUrl || Object.values(config.browsers).every(({
     gridUrl
@@ -66,10 +63,11 @@ async function _default(options) {
         return (await Promise.resolve().then(() => _interopRequireWildcard(require('./loaders/webpack/compile')))).default(config, options);
       }
 
-    case _cluster.default.isMaster:
+    case _cluster.default.isPrimary:
       {
         _logger.logger.info('Starting Master Process');
 
+        const resolveApi = (await Promise.resolve().then(() => _interopRequireWildcard(require('./master/server')))).default(config.reportDir, port, ui);
         return (await Promise.resolve().then(() => _interopRequireWildcard(require('./master')))).default(config, options, resolveApi);
       }
 

package/lib/cjs/server/loaders/babel/creevey-plugin.js

@@ -20,9 +20,7 @@ const reexportedStories = new Map();
 function _default() {
   return {
     pre() {
-      var _this$opts$parents;
-
-      const parents = (_this$opts$parents = this.opts.parents()) !== null && _this$opts$parents !== void 0 ? _this$opts$parents : [];
+      const parents = this.opts.parents() ?? [];
       const story = this.opts.story();
       this.resourcePath = this.filename;
       this.fileType = _helpers.FileType.Invalid; // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.storyVisitor = exports.mdxVisitor = exports.previewVisitor = exports.commonVisitor = exports.FileType = void 0;
+exports.storyVisitor = exports.previewVisitor = exports.mdxVisitor = exports.commonVisitor = exports.FileType = void 0;
 
 var t = _interopRequireWildcard(require("@babel/types"));
 
@@ -69,11 +69,9 @@ function getPropertyPath(path, name) {
 
 function getDeclaratorPath(path) {
   if (path !== null && path !== void 0 && path.isIdentifier()) {
-    var _path$scope$getBindin;
-
     const {
       path: bindingPath
-    } = (_path$scope$getBindin = path.scope.getBinding(path.node.name)) !== null && _path$scope$getBindin !== void 0 ? _path$scope$getBindin : {};
+    } = path.scope.getBinding(path.node.name) ?? {};
     if (bindingPath !== null && bindingPath !== void 0 && bindingPath.isVariableDeclarator() || bindingPath !== null && bindingPath !== void 0 && bindingPath.isFunctionDeclaration() || bindingPath !== null && bindingPath !== void 0 && bindingPath.isImportSpecifier()) return bindingPath;
   }
 }
@@ -112,7 +110,7 @@ function removeAllPropsExcept(path, propNames) {
 }
 
 function removeAllPropAssignsExcept(propAssigns, propNames) {
-  for (const [assignPath, props] of propAssigns !== null && propAssigns !== void 0 ? propAssigns : []) {
+  for (const [assignPath, props] of propAssigns ?? []) {
     const restNames = props.reduce((subPropNames, prop) => {
       const propName = subPropNames.find(names => {
         const name = Array.isArray(names) ? names[0] : names;
@@ -150,13 +148,11 @@ function getAssignmentPathWithProps(refPath) {
 function getPropertyAssignmentPaths(idPaths) {
   const assignPaths = new Map();
   idPaths.forEach(idPath => {
-    var _idPath$scope$getBind, _idPath$scope$getBind2;
+    var _idPath$scope$getBind;
 
-    const referencePaths = (_idPath$scope$getBind = (_idPath$scope$getBind2 = idPath.scope.getBinding(idPath.node.name)) === null || _idPath$scope$getBind2 === void 0 ? void 0 : _idPath$scope$getBind2.referencePaths) !== null && _idPath$scope$getBind !== void 0 ? _idPath$scope$getBind : [];
+    const referencePaths = ((_idPath$scope$getBind = idPath.scope.getBinding(idPath.node.name)) === null || _idPath$scope$getBind === void 0 ? void 0 : _idPath$scope$getBind.referencePaths) ?? [];
     referencePaths.forEach(refPath => {
-      var _getAssignmentPathWit;
-
-      const [assignmentPath, props] = (_getAssignmentPathWit = getAssignmentPathWithProps(refPath)) !== null && _getAssignmentPathWit !== void 0 ? _getAssignmentPathWit : [];
+      const [assignmentPath, props] = getAssignmentPathWithProps(refPath) ?? [];
       if (assignmentPath && props) assignPaths.set(assignmentPath, props);
     });
   });
@@ -346,12 +342,12 @@ const previewVisitor = {
 exports.previewVisitor = previewVisitor;
 const mdxVisitor = {
   FunctionDeclaration(functionPath) {
-    var _functionPath$get$nod, _rootPath$scope$getBi, _rootPath$scope$getBi2;
+    var _functionPath$get$nod, _rootPath$scope$getBi;
 
     const functionName = (_functionPath$get$nod = functionPath.get('id').node) === null || _functionPath$get$nod === void 0 ? void 0 : _functionPath$get$nod.name;
     if (functionName != 'MDXContent') return;
     const rootPath = findRootPath(functionPath);
-    const refs = (_rootPath$scope$getBi = rootPath === null || rootPath === void 0 ? void 0 : (_rootPath$scope$getBi2 = rootPath.scope.getBinding(functionName)) === null || _rootPath$scope$getBi2 === void 0 ? void 0 : _rootPath$scope$getBi2.referencePaths) !== null && _rootPath$scope$getBi !== void 0 ? _rootPath$scope$getBi : [];
+    const refs = (rootPath === null || rootPath === void 0 ? void 0 : (_rootPath$scope$getBi = rootPath.scope.getBinding(functionName)) === null || _rootPath$scope$getBi === void 0 ? void 0 : _rootPath$scope$getBi.referencePaths) ?? [];
     refs.forEach(refPath => {
       var _findRootPath;
 
@@ -377,10 +373,8 @@ const storyVisitor = {
   },
 
   ExportAllDeclaration(allPath) {
-    var _this$reexportedStori;
-
     const request = allPath.get('source').node.value;
-    this.reexportedStories.set(this.resourcePath, ((_this$reexportedStori = this.reexportedStories.get(this.resourcePath)) !== null && _this$reexportedStori !== void 0 ? _this$reexportedStori : new Set()).add(request));
+    this.reexportedStories.set(this.resourcePath, (this.reexportedStories.get(this.resourcePath) ?? new Set()).add(request));
     this.visitedTopPaths.add(allPath);
   },
 
@@ -414,9 +408,9 @@ const storyVisitor = {
       const storiesIdPath = (_rootPath$get$find = rootPath.get('declarations').find(decl => decl.get('init') == rootCallPath)) === null || _rootPath$get$find === void 0 ? void 0 : _rootPath$get$find.get('id');
 
       if (storiesIdPath !== null && storiesIdPath !== void 0 && storiesIdPath.isIdentifier()) {
-        var _storiesIdPath$scope$, _storiesIdPath$scope$2;
+        var _storiesIdPath$scope$;
 
-        ((_storiesIdPath$scope$ = (_storiesIdPath$scope$2 = storiesIdPath.scope.getBinding(storiesIdPath.node.name)) === null || _storiesIdPath$scope$2 === void 0 ? void 0 : _storiesIdPath$scope$2.referencePaths) !== null && _storiesIdPath$scope$ !== void 0 ? _storiesIdPath$scope$ : []).forEach(cleanUpStoriesOfCallChain);
+        (((_storiesIdPath$scope$ = storiesIdPath.scope.getBinding(storiesIdPath.node.name)) === null || _storiesIdPath$scope$ === void 0 ? void 0 : _storiesIdPath$scope$.referencePaths) ?? []).forEach(cleanUpStoriesOfCallChain);
       }
     }
 
@@ -425,11 +419,9 @@ const storyVisitor = {
 
   Identifier(identifierPath) {
     if (isExports(identifierPath)) {
-      var _getAssignmentPathWit2;
-
       const rootPath = findRootPath(identifierPath);
       if (rootPath) this.visitedTopPaths.add(rootPath);
-      const [assignmentPath, props] = (_getAssignmentPathWit2 = getAssignmentPathWithProps(identifierPath)) !== null && _getAssignmentPathWit2 !== void 0 ? _getAssignmentPathWit2 : [];
+      const [assignmentPath, props] = getAssignmentPathWithProps(identifierPath) ?? [];
 
       if (assignmentPath && props) {
         if (props.length == 1 && props[0] != 'default') {
@@ -449,11 +441,9 @@ const storyVisitor = {
     }
 
     if (isModuleExports(identifierPath)) {
-      var _getAssignmentPathWit3;
-
       const rootPath = findRootPath(identifierPath);
       if (rootPath) this.visitedTopPaths.add(rootPath);
-      const [assignmentPath, props] = (_getAssignmentPathWit3 = getAssignmentPathWithProps(identifierPath)) !== null && _getAssignmentPathWit3 !== void 0 ? _getAssignmentPathWit3 : [];
+      const [assignmentPath, props] = getAssignmentPathWithProps(identifierPath) ?? [];
 
       if (assignmentPath && props) {
         if (props.length == 1 && props[0] == 'exports') {

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

@@ -59,12 +59,10 @@ function getRequireContext(rootDir) {
       _fs.default.readdirSync(dirPath, {
         withFileTypes: true
       }).forEach(dirent => {
-        var _filter$test;
-
         const filename = dirent.name;
         const filePath = (0, _path.join)(dirPath, filename);
         if (dirent.isDirectory() && deep) return traverse(filePath);
-        if (dirent.isFile() && ((_filter$test = filter === null || filter === void 0 ? void 0 : filter.test(`./${(0, _path.relative)(contextPath, filePath)}`)) !== null && _filter$test !== void 0 ? _filter$test : true)) return ids.push(filePath);
+        if (dirent.isFile() && ((filter === null || filter === void 0 ? void 0 : filter.test(`./${(0, _path.relative)(contextPath, filePath)}`)) ?? true)) return ids.push(filePath);
       });
     };
 
@@ -90,7 +88,7 @@ function getRequireContext(rootDir) {
 }
 
 async function register(config, debug = false) {
-  const rootDir = (0, _helpers.isStorybookVersionLessThan)(6, 4) ? config.storybookDir : process.cwd();
+  const rootDir = 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);

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

@@ -33,6 +33,8 @@ let isInitiated = false;
 let dumpStats = _types.noop;
 
 function handleWebpackBuild(error, stats) {
+  var _stats$toJson$warning;
+
   dumpStats(stats);
 
   if (error || !stats || stats.hasErrors()) {
@@ -43,17 +45,16 @@ function handleWebpackBuild(error, stats) {
     if (error) return console.error(error.message);
 
     if (stats && (stats.hasErrors() || stats.hasWarnings())) {
-      const {
-        warnings,
-        errors
-      } = stats.toJson();
-      errors.forEach(e => console.error(e));
-      warnings.forEach(e => console.error(e));
+      var _statsJson$errors, _statsJson$warnings;
+
+      const statsJson = stats.toJson();
+      (_statsJson$errors = statsJson.errors) === null || _statsJson$errors === void 0 ? void 0 : _statsJson$errors.forEach(e => console.error(e));
+      (_statsJson$warnings = statsJson.warnings) === null || _statsJson$warnings === void 0 ? void 0 : _statsJson$warnings.forEach(e => console.error(e));
       return;
     }
   }
 
-  stats.toJson().warnings.forEach(e => console.warn(e));
+  stats === null || stats === void 0 ? void 0 : (_stats$toJson$warning = stats.toJson().warnings) === null || _stats$toJson$warning === void 0 ? void 0 : _stats$toJson$warning.forEach(e => console.warn(e));
 
   if (!isInitiated) {
     isInitiated = true;
@@ -74,72 +75,48 @@ async function applyMdxLoader(config, areAddonsRemoved, loader) {
     mdxLoaders
   } = await Promise.resolve().then(() => _interopRequireWildcard(require('./mdx-loader')));
   mdxLoaders.splice(1, 0, loader);
-  const mdxRegexps = (0, _helpers.isStorybookVersionLessThan)(6, 2) ? [/\.(stories|story).mdx$/, /\.(stories|story)\.mdx$/] : [/(stories|story)\.mdx$/]; // NOTE replace md/mdx to null loader
+  const mdxRegexps = [/(stories|story)\.mdx$/]; // NOTE replace md/mdx to null loader
 
   const mdRegexps = [/\.md$/, /\.mdx$/];
 
   if (areAddonsRemoved) {
-    var _config$module2;
+    var _config$module2, _config$module2$rules;
 
     mdRegexps.forEach(test => {
-      var _config$module;
+      var _config$module, _config$module$rules;
 
-      return (_config$module = config.module) === null || _config$module === void 0 ? void 0 : _config$module.rules.unshift({
+      return (_config$module = config.module) === null || _config$module === void 0 ? void 0 : (_config$module$rules = _config$module.rules) === null || _config$module$rules === void 0 ? void 0 : _config$module$rules.unshift({
         test,
         exclude: /(stories|story)\.mdx$/,
         use: require.resolve('null-loader')
       });
     });
-    (_config$module2 = config.module) === null || _config$module2 === void 0 ? void 0 : _config$module2.rules.unshift({
+    (_config$module2 = config.module) === null || _config$module2 === void 0 ? void 0 : (_config$module2$rules = _config$module2.rules) === null || _config$module2$rules === void 0 ? void 0 : _config$module2$rules.unshift({
       test: /(stories|story)\.mdx$/,
       use: mdxLoaders
     });
   } else {
-    var _config$module3, _config$module4, _config$module$rules$, _config$module5;
+    var _config$module3, _config$module3$rules, _config$module4, _config$module4$rules, _config$module5, _config$module5$rules;
 
     // NOTE Exclude addons' entry points
     config.entry = Array.isArray(config.entry) ? config.entry.filter(entry => !/@storybook(\/|\\)addon/.test(entry)) : config.entry;
-    (_config$module3 = config.module) === null || _config$module3 === void 0 ? void 0 : _config$module3.rules.filter(rule => mdRegexps.some(test => {
+    (_config$module3 = config.module) === null || _config$module3 === void 0 ? void 0 : (_config$module3$rules = _config$module3.rules) === null || _config$module3$rules === void 0 ? void 0 : _config$module3$rules.flatMap(rule => typeof rule == 'object' && 'test' in rule ? rule : []).filter(rule => mdRegexps.some(test => {
       var _rule$test;
 
       return ((_rule$test = rule.test) === null || _rule$test === void 0 ? void 0 : _rule$test.toString()) == test.toString();
     })).forEach(rule => rule.use = require.resolve('null-loader'));
-    (_config$module4 = config.module) === null || _config$module4 === void 0 ? void 0 : _config$module4.rules.filter(rule => mdxRegexps.some(test => {
+    (_config$module4 = config.module) === null || _config$module4 === void 0 ? void 0 : (_config$module4$rules = _config$module4.rules) === null || _config$module4$rules === void 0 ? void 0 : _config$module4$rules.flatMap(rule => typeof rule == 'object' && 'test' in rule ? rule : []).filter(rule => mdxRegexps.some(test => {
       var _rule$test2;
 
       return ((_rule$test2 = rule.test) === null || _rule$test2 === void 0 ? void 0 : _rule$test2.toString()) == test.toString();
     })).forEach(rule => rule.use = mdxLoaders); // NOTE Exclude source-loader
 
     config.module = { ...config.module,
-      rules: (_config$module$rules$ = (_config$module5 = config.module) === null || _config$module5 === void 0 ? void 0 : _config$module5.rules.filter(rule => !(typeof rule.loader == 'string' && /@storybook(\/|\\)source-loader/.test(rule.loader)))) !== null && _config$module$rules$ !== void 0 ? _config$module$rules$ : []
+      rules: ((_config$module5 = config.module) === null || _config$module5 === void 0 ? void 0 : (_config$module5$rules = _config$module5.rules) === null || _config$module5$rules === void 0 ? void 0 : _config$module5$rules.flatMap(rule => typeof rule == 'object' && 'test' in rule ? rule : []).filter(rule => !(typeof rule.loader == 'string' && /@storybook(\/|\\)source-loader/.test(rule.loader)))) ?? []
     };
   }
 }
 
-async function getWebpackConfigForStorybook_pre6_2(framework, configDir, outputDir) {
-  const {
-    default: storybookFrameworkOptions
-  } = await Promise.resolve(`${(0, _helpers.resolveFromStorybook)(`@storybook/${framework}/dist/server/options`)}`).then(s => _interopRequireWildcard(require(s))); // eslint-disable-next-line node/no-missing-import, @typescript-eslint/no-unsafe-assignment, import/no-unresolved
-
-  const {
-    default: getConfig
-  } = await Promise.resolve(`${(0, _helpers.resolveFromStorybook)('@storybook/core/dist/server/config')}`).then(s => _interopRequireWildcard(require(s))); // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
-
-  return getConfig({
-    // NOTE: 6.1 storybook don't support quite any more. But we still have older versions
-    quiet: true,
-    configType: 'PRODUCTION',
-    outputDir,
-    cache: {},
-    // eslint-disable-next-line node/no-missing-require
-    corePresets: [(0, _helpers.resolveFromStorybook)('@storybook/core/dist/server/preview/preview-preset')],
-    overridePresets: [...((0, _helpers.hasDocsAddon)() ? [require.resolve('./mdx-loader')] : []), // eslint-disable-next-line node/no-missing-require
-    (0, _helpers.resolveFromStorybook)('@storybook/core/dist/server/preview/custom-webpack-preset')],
-    ...storybookFrameworkOptions,
-    configDir
-  });
-}
-
 async function getWebpackConfigForStorybook_6_2(framework, configDir, outputDir) {
   const {
     default: storybookFrameworkOptions
@@ -204,7 +181,7 @@ async function compile(config, {
   debug,
   ui
 }) {
-  var _storybookWebpackConf, _storybookWebpackConf2, _storybookWebpackConf3, _extensions$map, _storybookWebpackConf4, _storybookWebpackConf5, _storybookWebpackConf6;
+  var _storybookWebpackConf, _storybookWebpackConf2, _storybookWebpackConf3, _extensions$map, _storybookWebpackConf4, _storybookWebpackConf5;
 
   const storybookFramework = (0, _helpers.getStorybookFramework)();
 
@@ -228,9 +205,9 @@ 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();
-  const getWebpackConfig = (0, _helpers.isStorybookVersionLessThan)(6, 2) ? getWebpackConfigForStorybook_pre6_2 : getWebpackConfigForStorybook_6_2;
+  const getWebpackConfig = 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;
+  const extensions = ((_storybookWebpackConf = storybookWebpackConfig.resolve) === null || _storybookWebpackConf === void 0 ? void 0 : _storybookWebpackConf.extensions) ?? _utils.extensions;
   delete storybookWebpackConfig.optimization;
   storybookWebpackConfig.devtool = false;
   storybookWebpackConfig.performance = false;
@@ -245,18 +222,21 @@ async function compile(config, {
 
   if ((0, _helpers.hasDocsAddon)()) await applyMdxLoader(storybookWebpackConfig, areAddonsRemoved, creeveyLoader); // NOTE Add creevey-loader to cut off all unnecessary code except stories meta and tests
 
-  (_storybookWebpackConf3 = storybookWebpackConfig.module) === null || _storybookWebpackConf3 === void 0 ? void 0 : _storybookWebpackConf3.rules.unshift({
+  (_storybookWebpackConf2 = storybookWebpackConfig.module) === null || _storybookWebpackConf2 === void 0 ? void 0 : (_storybookWebpackConf3 = _storybookWebpackConf2.rules) === null || _storybookWebpackConf3 === void 0 ? void 0 : _storybookWebpackConf3.unshift({
     enforce: 'pre',
     test: new RegExp(`\\.(${(_extensions$map = extensions.map(x => x.slice(1))) === null || _extensions$map === void 0 ? void 0 : _extensions$map.join('|')})$`),
     exclude: /node_modules/,
     use: creeveyLoader
   });
-  const aliases = (_storybookWebpackConf4 = (_storybookWebpackConf5 = storybookWebpackConfig.resolve) === null || _storybookWebpackConf5 === void 0 ? void 0 : _storybookWebpackConf5.alias) !== null && _storybookWebpackConf4 !== void 0 ? _storybookWebpackConf4 : {};
+  const aliases = ((_storybookWebpackConf4 = storybookWebpackConfig.resolve) === null || _storybookWebpackConf4 === void 0 ? void 0 : _storybookWebpackConf4.alias) ?? {};
   const excluded = ['@storybook/addons', '@storybook/api', '@storybook/channel-postmessage', '@storybook/channels', '@storybook/client-api', '@storybook/client-logger', '@storybook/components', '@storybook/core-events', '@storybook/router', '@storybook/semver', '@storybook/theming']; // NOTE Exclude from bundle all modules from node_modules
 
-  storybookWebpackConfig.externals = [...Object.entries(aliases).filter(([alias]) => excluded.includes(alias)).map(([, aliasPath]) => ({
-    [aliasPath]: `commonjs ${aliasPath}`
-  })), // NOTE Replace `@storybook/${framework}` to ../../storybook.ts
+  storybookWebpackConfig.externals = [...(Array.isArray(aliases) ? aliases.map(({
+    name,
+    alias
+  }) => [name, alias]) : Object.entries(aliases)).filter(([alias]) => excluded.includes(alias)).flatMap(([, aliasPath]) => aliasPath == false ? [] : (Array.isArray(aliasPath) ? aliasPath : [aliasPath]).map(x => ({
+    [x]: `commonjs ${x}`
+  }))), // NOTE Replace `@storybook/${framework}` to ../../storybook.ts
   {
     [`@storybook/${storybookFramework}`]: `commonjs ${require.resolve('../../storybook/entry')}`
   }, (0, _webpackNodeExternals.default)({
@@ -264,17 +244,20 @@ async function compile(config, {
     allowlist: /(webpack|dummy-hmr|generated-stories-entry|generated-config-entry|generated-other-entry)/
   }), // TODO Don't work well with monorepos
   (0, _webpackNodeExternals.default)({
-    modulesDir: (0, _helpers.resolveFromStorybook)('@storybook/core').split('@storybook')[0],
+    modulesDir: (0, _helpers.resolveFromStorybook)('@storybook/core-client').split('@storybook')[0],
     includeAbsolutePaths: true,
     allowlist: /(webpack|dummy-hmr|generated-stories-entry|generated-config-entry|generated-other-entry)/
   })]; // NOTE Exclude some plugins
 
   const excludedPlugins = ['DocgenPlugin', 'ForkTsCheckerWebpackPlugin'];
-  storybookWebpackConfig.plugins = (_storybookWebpackConf6 = storybookWebpackConfig.plugins) === null || _storybookWebpackConf6 === void 0 ? void 0 : _storybookWebpackConf6.filter(plugin => !excludedPlugins.includes(plugin.constructor.name));
+  storybookWebpackConfig.plugins = (_storybookWebpackConf5 = storybookWebpackConfig.plugins) === null || _storybookWebpackConf5 === void 0 ? void 0 : _storybookWebpackConf5.filter(plugin => !excludedPlugins.includes(plugin.constructor.name));
   const storybookWebpackCompiler = (0, _webpack.default)(storybookWebpackConfig);
 
   if (debug) {
-    dumpStats = stats => (0, _fs.writeFile)(_path.default.join(config.reportDir, 'stats.json'), JSON.stringify(stats.toJson(), null, 2), _types.noop);
+    dumpStats = stats => {
+      if (!stats) return;
+      (0, _fs.writeFile)(_path.default.join(config.reportDir, 'stats.json'), JSON.stringify(stats.toJson(), null, 2), _types.noop);
+    };
   }
 
   if (ui) {