@storybook/core-server 6.5.7 → 7.0.0-alpha.0

package/dist/cjs/utils/StoryIndexGenerator.js

@@ -80,9 +80,9 @@ class StoryIndexGenerator {
       files.sort().forEach(function (absolutePath) {
         var ext = _path.default.extname(absolutePath);
 
-        var relativePath = _path.default.relative(_this.options.workingDir, absolutePath);
+        if (ext === '.storyshot') {
+          var relativePath = _path.default.relative(_this.options.workingDir, absolutePath);
 
-        if (!['.js', '.jsx', '.ts', '.tsx', '.mdx'].includes(ext)) {
           _nodeLogger.logger.info(`Skipping ${ext} file ${relativePath}`);
 
           return;
@@ -109,6 +109,18 @@ class StoryIndexGenerator {
     }))).flat();
   }
 
+  async index(filePath, options) {
+    var storyIndexer = this.options.storyIndexers.find(function (indexer) {
+      return indexer.test.exec(filePath);
+    });
+
+    if (!storyIndexer) {
+      throw new Error(`No matching story indexer found for ${filePath}`);
+    }
+
+    return storyIndexer.indexer(filePath, options);
+  }
+
   async extractStories(specifier, absolutePath) {
     var relativePath = _path.default.relative(this.options.workingDir, absolutePath);
 
@@ -122,9 +134,9 @@ class StoryIndexGenerator {
         return (0, _store.userOrAutoTitleFromSpecifier)(importPath, specifier, userTitle);
       };
 
-      var csf = (await (0, _csfTools.readCsfOrMdx)(absolutePath, {
+      var csf = await this.index(absolutePath, {
         makeTitle: makeTitle
-      })).parse();
+      });
       csf.stories.forEach(function ({
         id: id,
         name: name

package/dist/cjs/utils/{get-manager-builder.js → get-builders.js}

@@ -3,43 +3,49 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getManagerBuilder = getManagerBuilder;
+exports.getBuilders = getBuilders;
 
 require("core-js/modules/es.promise.js");
 
-var _path = _interopRequireDefault(require("path"));
-
-var _coreCommon = require("@storybook/core-common");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 async function getManagerBuilder(configDir) {
-  var _core$builder;
-
-  var main = _path.default.resolve(configDir, 'main');
+  var builderPackage = require.resolve('@storybook/manager-webpack5', {
+    paths: [configDir]
+  });
 
-  var mainFile = (0, _coreCommon.getInterpretedFile)(main);
+  var managerBuilder = await Promise.resolve(`${builderPackage}`).then(function (s) {
+    return _interopRequireWildcard(require(s));
+  });
+  return managerBuilder;
+}
 
-  var _ref = mainFile ? (0, _coreCommon.serverRequire)(mainFile) : {
-    core: null
-  },
-      core = _ref.core;
+async function getPreviewBuilder(builderName, configDir) {
+  var builderPackage;
 
-  var builderName = typeof (core === null || core === void 0 ? void 0 : core.builder) === 'string' ? core.builder : core === null || core === void 0 ? void 0 : (_core$builder = core.builder) === null || _core$builder === void 0 ? void 0 : _core$builder.name; // Builder can be any string including community builders like `storybook-builder-vite`.
-  // - For now, `webpack5` triggers `manager-webpack5`
-  // - Everything else builds with `manager-webpack4`
-  //
-  // Unlike preview builders, manager building is not pluggable!
+  if (builderName) {
+    builderPackage = require.resolve(['webpack5'].includes(builderName) ? `@storybook/builder-${builderName}` : builderName, {
+      paths: [configDir]
+    });
+  } else {
+    throw new Error('no builder configured!');
+  }
 
-  var builderPackage = ['webpack5', '@storybook/builder-webpack5'].includes(builderName) ? require.resolve('@storybook/manager-webpack5', {
-    paths: [main]
-  }) : '@storybook/manager-webpack4';
-  var managerBuilder = await Promise.resolve(`${builderPackage}`).then(function (s) {
+  var previewBuilder = await Promise.resolve(`${builderPackage}`).then(function (s) {
     return _interopRequireWildcard(require(s));
   });
-  return managerBuilder;
+  return previewBuilder;
+}
+
+async function getBuilders({
+  presets: presets,
+  configDir: configDir
+}) {
+  var _core$builder;
+
+  var core = await presets.apply('core', undefined);
+  var builderName = typeof (core === null || core === void 0 ? void 0 : core.builder) === 'string' ? core.builder : core === null || core === void 0 ? void 0 : (_core$builder = core.builder) === null || _core$builder === void 0 ? void 0 : _core$builder.name;
+  return Promise.all([getPreviewBuilder(builderName, configDir), getManagerBuilder(configDir)]);
 }

package/dist/esm/build-dev.js

@@ -18,29 +18,23 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import "core-js/modules/es.promise.js";
 import "core-js/modules/es.symbol.description.js";
-import { logger, instance as npmLog } from '@storybook/node-logger';
+import { resolvePathInStorybookCache, loadAllPresets, cache, loadMainConfig } from '@storybook/core-common';
 import prompts from 'prompts';
-import { resolvePathInStorybookCache, loadAllPresets, cache } from '@storybook/core-common';
-import { telemetry } from '@storybook/telemetry';
-import dedent from 'ts-dedent';
 import global from 'global';
-import path from 'path';
+import { join, resolve } from 'path';
+import { logger } from '@storybook/node-logger';
 import { storybookDevServer } from './dev-server';
-import { getDevCli } from './cli';
 import { getReleaseNotesData, getReleaseNotesFailedState } from './utils/release-notes';
 import { outputStats } from './utils/output-stats';
 import { outputStartupInformation } from './utils/output-startup-information';
 import { updateCheck } from './utils/update-check';
 import { getServerPort, getServerChannelUrl } from './utils/server-address';
-import { getPreviewBuilder } from './utils/get-preview-builder';
-import { getManagerBuilder } from './utils/get-manager-builder';
+import { getBuilders } from './utils/get-builders';
 export async function buildDevStandalone(options) {
   var packageJson = options.packageJson,
       versionUpdates = options.versionUpdates,
       releaseNotes = options.releaseNotes;
-  var version = packageJson.version,
-      _packageJson$name = packageJson.name,
-      name = _packageJson$name === void 0 ? '' : _packageJson$name; // updateInfo and releaseNotesData are cached, so this is typically pretty fast
+  var version = packageJson.version; // updateInfo and releaseNotesData are cached, so this is typically pretty fast
 
   var _await$Promise$all = await Promise.all([getServerPort(options.port), versionUpdates ? updateCheck(version) : Promise.resolve({
     success: false,
@@ -70,15 +64,38 @@ export async function buildDevStandalone(options) {
   options.versionCheck = versionCheck;
   options.releaseNotesData = releaseNotesData;
   options.configType = 'DEVELOPMENT';
-  options.configDir = path.resolve(options.configDir);
-  options.outputDir = options.smokeTest ? resolvePathInStorybookCache('public') : path.resolve(options.outputDir || resolvePathInStorybookCache('public'));
+  options.configDir = resolve(options.configDir);
+  options.outputDir = options.smokeTest ? resolvePathInStorybookCache('public') : resolve(options.outputDir || resolvePathInStorybookCache('public'));
   options.serverChannelUrl = getServerChannelUrl(port, options);
   /* eslint-enable no-param-reassign */
 
-  var previewBuilder = await getPreviewBuilder(options.configDir);
-  var managerBuilder = await getManagerBuilder(options.configDir);
+  var _loadMainConfig = loadMainConfig(options),
+      framework = _loadMainConfig.framework;
+
+  var corePresets = [];
+  var frameworkName = typeof framework === 'string' ? framework : framework === null || framework === void 0 ? void 0 : framework.name;
+
+  if (frameworkName) {
+    corePresets.push(join(frameworkName, 'preset'));
+  } else {
+    logger.warn(`you have not specified a framework in your ${options.configDir}/main.js`);
+  }
+
+  logger.info('=> Loading presets');
   var presets = loadAllPresets(_objectSpread({
-    corePresets: [require.resolve('./presets/common-preset'), ...managerBuilder.corePresets, ...previewBuilder.corePresets, require.resolve('./presets/babel-cache-preset')],
+    corePresets: corePresets,
+    overridePresets: []
+  }, options));
+
+  var _await$getBuilders = await getBuilders(_objectSpread(_objectSpread({}, options), {}, {
+    presets: presets
+  })),
+      _await$getBuilders2 = _slicedToArray(_await$getBuilders, 2),
+      previewBuilder = _await$getBuilders2[0],
+      managerBuilder = _await$getBuilders2[1];
+
+  presets = loadAllPresets(_objectSpread({
+    corePresets: [require.resolve('./presets/common-preset'), ...managerBuilder.corePresets, ...previewBuilder.corePresets, ...corePresets, require.resolve('./presets/babel-cache-preset')],
     overridePresets: previewBuilder.overridePresets
   }, options));
   var features = await presets.apply('features');
@@ -106,127 +123,33 @@ export async function buildDevStandalone(options) {
   }
 
   if (options.smokeTest) {
-    // @ts-ignore
-    var managerWarnings = managerStats && managerStats.toJson().warnings || [];
-    if (managerWarnings.length > 0) logger.warn(`manager: ${JSON.stringify(managerWarnings, null, 2)}`); // I'm a little reticent to import webpack types in this file :shrug:
-    // @ts-ignore
-
-    var previewWarnings = previewStats && previewStats.toJson().warnings || [];
-    if (previewWarnings.length > 0) logger.warn(`preview: ${JSON.stringify(previewWarnings, null, 2)}`);
-    process.exit(managerWarnings.length > 0 || previewWarnings.length > 0 && !options.ignorePreview ? 1 : 0);
+    var warnings = []; // @ts-ignore
+
+    warnings.push(...(managerStats && managerStats.toJson().warnings || [])); // @ts-ignore
+
+    warnings.push(...(managerStats && previewStats.toJson().warnings || []));
+    var problems = warnings.filter(function (warning) {
+      return !warning.message.includes(`export 'useInsertionEffect'`);
+    }).filter(function (warning) {
+      return !warning.message.includes(`compilation but it's unused`);
+    }).filter(function (warning) {
+      return !warning.message.includes(`Conflicting values for 'process.env.NODE_ENV'`);
+    });
+    console.log(problems.map(function (p) {
+      return p.stack;
+    }));
+    process.exit(problems.length > 0 ? 1 : 0);
     return;
-  } // Get package name and capitalize it e.g. @storybook/react -> React
-
+  }
 
-  var packageName = name.split('@storybook/').length > 1 ? name.split('@storybook/')[1] : name;
-  var frameworkName = packageName.charAt(0).toUpperCase() + packageName.slice(1);
+  var name = frameworkName.split('@storybook/').length > 1 ? frameworkName.split('@storybook/')[1] : frameworkName;
   outputStartupInformation({
     updateInfo: versionCheck,
     version: version,
-    name: frameworkName,
+    name: name,
     address: address,
     networkAddress: networkAddress,
     managerTotalTime: managerTotalTime,
     previewTotalTime: previewTotalTime
   });
-}
-export async function buildDev(loadOptions) {
-  var cliOptions = await getDevCli(loadOptions.packageJson);
-
-  var options = _objectSpread(_objectSpread(_objectSpread({}, cliOptions), loadOptions), {}, {
-    configDir: loadOptions.configDir || cliOptions.configDir || './.storybook',
-    configType: 'DEVELOPMENT',
-    ignorePreview: !!cliOptions.previewUrl && !cliOptions.forceBuildPreview,
-    docsMode: !!cliOptions.docs,
-    cache: cache
-  });
-
-  try {
-    await buildDevStandalone(options);
-  } catch (error) {
-    var _error$compilation;
-
-    // this is a weird bugfix, somehow 'node-pre-gyp' is polluting the npmLog header
-    npmLog.heading = '';
-
-    if (error instanceof Error) {
-      if (error.error) {
-        logger.error(error.error);
-      } else if (error.stats && error.stats.compilation.errors) {
-        error.stats.compilation.errors.forEach(function (e) {
-          return logger.plain(e);
-        });
-      } else {
-        logger.error(error);
-      }
-    } else if ((_error$compilation = error.compilation) !== null && _error$compilation !== void 0 && _error$compilation.errors) {
-      error.compilation.errors.forEach(function (e) {
-        return logger.plain(e);
-      });
-    }
-
-    logger.line();
-    logger.warn(error.close ? dedent`
-          FATAL broken build!, will close the process,
-          Fix the error below and restart storybook.
-        ` : dedent`
-          Broken build, fix the error above.
-          You may need to refresh the browser.
-        `);
-    logger.line();
-    var presets = loadAllPresets(_objectSpread({
-      corePresets: [require.resolve('./presets/common-preset')],
-      overridePresets: []
-    }, options));
-    var core = await presets.apply('core');
-
-    if (!(core !== null && core !== void 0 && core.disableTelemetry)) {
-      var enableCrashReports;
-
-      if (core.enableCrashReports !== undefined) {
-        enableCrashReports = core.enableCrashReports;
-      } else {
-        var valueFromCache = await cache.get('enableCrashreports');
-
-        if (valueFromCache !== undefined) {
-          enableCrashReports = valueFromCache;
-        } else {
-          var valueFromPrompt = await promptCrashReports(options);
-
-          if (valueFromPrompt !== undefined) {
-            enableCrashReports = valueFromPrompt;
-          }
-        }
-      }
-
-      await telemetry('error-dev', {
-        error: error
-      }, {
-        immediate: true,
-        configDir: options.configDir,
-        enableCrashReports: enableCrashReports
-      });
-    }
-
-    process.exit(1);
-  }
-}
-
-var promptCrashReports = async function ({
-  packageJson: packageJson
-}) {
-  if (process.env.CI) {
-    return undefined;
-  }
-
-  var _await$prompts2 = await prompts({
-    type: 'confirm',
-    name: 'enableCrashReports',
-    message: `Would you like to send crash reports to Storybook?`,
-    initial: true
-  }),
-      enableCrashReports = _await$prompts2.enableCrashReports;
-
-  await cache.set('enableCrashreports', enableCrashReports);
-  return enableCrashReports;
-};
+}

package/dist/esm/build-static.js

@@ -1,10 +1,3 @@
-import "core-js/modules/es.symbol.description.js";
-var _excluded = ["packageJson"];
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -24,25 +17,24 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import "core-js/modules/es.promise.js";
+import "core-js/modules/es.symbol.description.js";
 import chalk from 'chalk';
 import cpy from 'cpy';
 import fs from 'fs-extra';
-import path from 'path';
+import path, { join } from 'path';
 import dedent from 'ts-dedent';
 import global from 'global';
 import { logger } from '@storybook/node-logger';
 import { telemetry } from '@storybook/telemetry';
-import { normalizeStories, loadAllPresets, cache, logConfig } from '@storybook/core-common';
-import { getProdCli } from './cli';
+import { loadAllPresets, normalizeStories, logConfig, loadMainConfig } from '@storybook/core-common';
 import { outputStats } from './utils/output-stats';
 import { copyAllStaticFiles, copyAllStaticFilesRelativeToMain } from './utils/copy-all-static-files';
-import { getPreviewBuilder } from './utils/get-preview-builder';
-import { getManagerBuilder } from './utils/get-manager-builder';
+import { getBuilders } from './utils/get-builders';
 import { extractStoriesJson } from './utils/stories-json';
 import { extractStorybookMetadata } from './utils/metadata';
 import { StoryIndexGenerator } from './utils/StoryIndexGenerator';
 export async function buildStaticStandalone(options) {
-  var _options$staticDir, _core$builder;
+  var _options$staticDir;
 
   /* eslint-disable no-param-reassign */
   options.configType = 'PRODUCTION';
@@ -69,10 +61,37 @@ export async function buildStaticStandalone(options) {
 
   await fs.emptyDir(options.outputDir);
   await cpy(defaultFavIcon, options.outputDir);
-  var previewBuilder = await getPreviewBuilder(options.configDir);
-  var managerBuilder = await getManagerBuilder(options.configDir);
+
+  var _await$import = await import('@storybook/manager-webpack5/prebuilt-manager'),
+      getPrebuiltDir = _await$import.getPrebuiltDir;
+
+  var _loadMainConfig = loadMainConfig(options),
+      framework = _loadMainConfig.framework;
+
+  var corePresets = [];
+  var frameworkName = typeof framework === 'string' ? framework : framework === null || framework === void 0 ? void 0 : framework.name;
+
+  if (frameworkName) {
+    corePresets.push(join(frameworkName, 'preset'));
+  } else {
+    logger.warn(`you have not specified a framework in your ${options.configDir}/main.js`);
+  }
+
+  logger.info('=> Loading presets');
   var presets = loadAllPresets(_objectSpread({
-    corePresets: [require.resolve('./presets/common-preset'), ...managerBuilder.corePresets, ...previewBuilder.corePresets, require.resolve('./presets/babel-cache-preset')],
+    corePresets: [require.resolve('./presets/common-preset'), ...corePresets],
+    overridePresets: []
+  }, options));
+
+  var _await$getBuilders = await getBuilders(_objectSpread(_objectSpread({}, options), {}, {
+    presets: presets
+  })),
+      _await$getBuilders2 = _slicedToArray(_await$getBuilders, 2),
+      previewBuilder = _await$getBuilders2[0],
+      managerBuilder = _await$getBuilders2[1];
+
+  presets = loadAllPresets(_objectSpread({
+    corePresets: [require.resolve('./presets/common-preset'), ...managerBuilder.corePresets, ...previewBuilder.corePresets, ...corePresets, require.resolve('./presets/babel-cache-preset')],
     overridePresets: previewBuilder.overridePresets
   }, options));
   var staticDirs = await presets.apply('staticDirs');
@@ -100,14 +119,16 @@ export async function buildStaticStandalone(options) {
   var extractTasks = [];
   var initializedStoryIndexGenerator = Promise.resolve(undefined);
 
-  if (features !== null && features !== void 0 && features.buildStoriesJson || features !== null && features !== void 0 && features.storyStoreV7) {
+  if ((features !== null && features !== void 0 && features.buildStoriesJson || features !== null && features !== void 0 && features.storyStoreV7) && !options.ignorePreview) {
     var workingDir = process.cwd();
     var directories = {
       configDir: options.configDir,
       workingDir: workingDir
     };
     var normalizedStories = normalizeStories(await presets.apply('stories'), directories);
+    var storyIndexers = await presets.apply('storyIndexers', []);
     var generator = new StoryIndexGenerator(normalizedStories, _objectSpread(_objectSpread({}, directories), {}, {
+      storyIndexers: storyIndexers,
       storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7),
       storyStoreV7: features === null || features === void 0 ? void 0 : features.storyStoreV7
     }));
@@ -152,12 +173,6 @@ export async function buildStaticStandalone(options) {
     logConfig('Manager webpack config', await managerBuilder.getConfig(fullOptions));
   }
 
-  var builderName = typeof (core === null || core === void 0 ? void 0 : core.builder) === 'string' ? core.builder : core === null || core === void 0 ? void 0 : (_core$builder = core.builder) === null || _core$builder === void 0 ? void 0 : _core$builder.name;
-
-  var _ref = builderName === 'webpack5' ? // eslint-disable-next-line import/no-extraneous-dependencies
-  await import('@storybook/manager-webpack5/prebuilt-manager') : await import('@storybook/manager-webpack4/prebuilt-manager'),
-      getPrebuiltDir = _ref.getPrebuiltDir;
-
   var prebuiltDir = await getPrebuiltDir(fullOptions);
   var startTime = process.hrtime(); // When using the prebuilt manager, we straight up copy it into the outputDir instead of building it
 
@@ -179,10 +194,10 @@ export async function buildStaticStandalone(options) {
   });
 
   var _await$Promise$all = await Promise.all([manager.catch(async function (err) {
-    await previewBuilder.bail();
+    await (previewBuilder === null || previewBuilder === void 0 ? void 0 : previewBuilder.bail());
     throw err;
   }), preview.catch(async function (err) {
-    await managerBuilder.bail();
+    await (managerBuilder === null || managerBuilder === void 0 ? void 0 : managerBuilder.bail());
     throw err;
   }), ...extractTasks]),
       _await$Promise$all2 = _slicedToArray(_await$Promise$all, 2),
@@ -195,43 +210,4 @@ export async function buildStaticStandalone(options) {
   }
 
   logger.info(`=> Output directory: ${options.outputDir}`);
-}
-export async function buildStatic(_ref2) {
-  var packageJson = _ref2.packageJson,
-      loadOptions = _objectWithoutProperties(_ref2, _excluded);
-
-  var cliOptions = getProdCli(packageJson);
-
-  var options = _objectSpread(_objectSpread(_objectSpread({}, cliOptions), loadOptions), {}, {
-    packageJson: packageJson,
-    configDir: loadOptions.configDir || cliOptions.configDir || './.storybook',
-    outputDir: loadOptions.outputDir || cliOptions.outputDir || './storybook-static',
-    ignorePreview: (!!loadOptions.ignorePreview || !!cliOptions.previewUrl) && !cliOptions.forceBuildPreview,
-    docsMode: !!cliOptions.docs,
-    configType: 'PRODUCTION',
-    cache: cache
-  });
-
-  try {
-    await buildStaticStandalone(options);
-  } catch (error) {
-    logger.error(error);
-    var presets = loadAllPresets(_objectSpread({
-      corePresets: [require.resolve('./presets/common-preset')],
-      overridePresets: []
-    }, options));
-    var core = await presets.apply('core');
-
-    if (!(core !== null && core !== void 0 && core.disableTelemetry)) {
-      await telemetry('error-build', {
-        error: error
-      }, {
-        immediate: true,
-        configDir: options.configDir,
-        enableCrashReports: options.enableCrashReports
-      });
-    }
-
-    process.exit(1);
-  }
 }

package/dist/esm/dev-server.js

@@ -30,8 +30,7 @@ import { useStoriesJson } from './utils/stories-json';
 import { useStorybookMetadata } from './utils/metadata';
 import { getServerChannel } from './utils/get-server-channel';
 import { openInBrowser } from './utils/open-in-browser';
-import { getPreviewBuilder } from './utils/get-preview-builder';
-import { getManagerBuilder } from './utils/get-manager-builder';
+import { getBuilders } from './utils/get-builders';
 import { StoryIndexGenerator } from './utils/StoryIndexGenerator'; // @ts-ignore
 
 export var router = new Router();
@@ -54,7 +53,9 @@ export async function storybookDevServer(options) {
         workingDir: workingDir
       };
       var normalizedStories = normalizeStories(await options.presets.apply('stories'), directories);
+      var storyIndexers = await options.presets.apply('storyIndexers', []);
       var generator = new StoryIndexGenerator(normalizedStories, _objectSpread(_objectSpread({}, directories), {}, {
+        storyIndexers: storyIndexers,
         workingDir: workingDir,
         storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7),
         storyStoreV7: features === null || features === void 0 ? void 0 : features.storyStoreV7
@@ -149,8 +150,11 @@ export async function storybookDevServer(options) {
       return error ? reject(error) : resolve();
     });
   });
-  var previewBuilder = await getPreviewBuilder(options.configDir);
-  var managerBuilder = await getManagerBuilder(options.configDir);
+
+  var _await$getBuilders = await getBuilders(options),
+      _await$getBuilders2 = _slicedToArray(_await$getBuilders, 2),
+      previewBuilder = _await$getBuilders2[0],
+      managerBuilder = _await$getBuilders2[1];
 
   if (options.debugWebpack) {
     logConfig('Preview webpack config', await previewBuilder.getConfig(options));
@@ -171,7 +175,7 @@ export async function storybookDevServer(options) {
   });
 
   var _await$Promise$all = await Promise.all([preview.catch(async function (err) {
-    await managerBuilder.bail();
+    await (managerBuilder === null || managerBuilder === void 0 ? void 0 : managerBuilder.bail());
     throw err;
   }), manager // TODO #13083 Restore this when compiling the preview is fast enough
   // .then((result) => {
@@ -179,7 +183,7 @@ export async function storybookDevServer(options) {
   //   return result;
   // })
   .catch(async function (err) {
-    await previewBuilder.bail();
+    await (previewBuilder === null || previewBuilder === void 0 ? void 0 : previewBuilder.bail());
     throw err;
   })]),
       _await$Promise$all2 = _slicedToArray(_await$Promise$all, 2),

package/dist/esm/presets/babel-cache-preset.js

@@ -14,5 +14,4 @@ var extend = function (babelConfig) {
   }, babelConfig);
 };
 
-export var babel = extend;
-export var managerBabel = extend;
+export var babel = extend;

package/dist/esm/presets/common-preset.js

@@ -5,20 +5,19 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import "core-js/modules/es.promise.js";
-import { getPreviewBodyTemplate, getPreviewHeadTemplate, getManagerMainTemplate, getPreviewMainTemplate, loadCustomBabelConfig, getStorybookBabelConfig, loadEnvs } from '@storybook/core-common';
+import fs from 'fs-extra';
+import { getPreviewBodyTemplate, getPreviewHeadTemplate, getManagerMainTemplate, getPreviewMainTemplate, getStorybookBabelConfig, loadEnvs } from '@storybook/core-common';
+import { loadCsf } from '@storybook/csf-tools';
 export var babel = async function (_, options) {
   var _options$features;
 
-  var configDir = options.configDir,
-      presets = options.presets;
+  var presets = options.presets;
 
   if ((_options$features = options.features) !== null && _options$features !== void 0 && _options$features.babelModeV7) {
     return presets.apply('babelDefault', {}, options);
   }
 
-  return loadCustomBabelConfig(configDir, function () {
-    return presets.apply('babelDefault', getStorybookBabelConfig(), options);
-  });
+  return presets.apply('babelDefault', getStorybookBabelConfig(), options);
 };
 export var logLevel = function (previous, options) {
   return previous || options.loglevel || 'info';
@@ -48,8 +47,7 @@ export var previewMainTemplate = function () {
 export var managerMainTemplate = function () {
   return getManagerMainTemplate();
 };
-export var previewEntries = function (entries = [], options) {
-  if (!options.modern) entries.push(require.resolve('@storybook/core-client/dist/esm/globals/polyfills'));
+export var previewEntries = function (entries = []) {
   entries.push(require.resolve('@storybook/core-client/dist/esm/globals/globals'));
   return entries;
 };
@@ -109,16 +107,27 @@ export var config = async function (base, options) {
 export var features = async function (existing) {
   return _objectSpread(_objectSpread({}, existing), {}, {
     postcss: true,
-    emotionAlias: false,
-    // TODO remove in 7.0, this no longer does anything
     warnOnLegacyHierarchySeparator: true,
     buildStoriesJson: false,
-    storyStoreV7: false,
-    modernInlineRender: false,
-    breakingChangesV7: false,
+    storyStoreV7: true,
+    modernInlineRender: true,
+    breakingChangesV7: true,
     interactionsDebugger: false,
-    babelModeV7: false,
-    argTypeTargetsV7: false,
+    babelModeV7: true,
+    argTypeTargetsV7: true,
     previewMdx2: false
   });
+};
+export var storyIndexers = async function (indexers) {
+  var csfIndexer = async function (fileName, opts) {
+    var code = (await fs.readFile(fileName, 'utf-8')).toString();
+    return loadCsf(code, _objectSpread(_objectSpread({}, opts), {}, {
+      fileName: fileName
+    })).parse();
+  };
+
+  return [{
+    test: /(stories|story)\.[tj]sx?$/,
+    indexer: csfIndexer
+  }, ...(indexers || [])];
 };