@storybook/core-server 6.5.9 → 7.0.0-alpha.2

package/README.md

@@ -12,7 +12,6 @@ It contains:
 
 The "preview" (aka iframe) side is implemented in pluggable builders:
 
-- `@storybook/builder-webpack4`
 - `@storybook/builder-webpack5`
 
 These builders abstract both the webpack dependencies as well as the various core configurations and loader/plugin dependencies provided out of the box with Storybook.

package/dist/cjs/build-dev.js

@@ -5,28 +5,21 @@ require("core-js/modules/es.symbol.description.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildDev = buildDev;
 exports.buildDevStandalone = buildDevStandalone;
 
 require("core-js/modules/es.promise.js");
 
-var _nodeLogger = require("@storybook/node-logger");
-
-var _prompts = _interopRequireDefault(require("prompts"));
-
 var _coreCommon = require("@storybook/core-common");
 
-var _telemetry = require("@storybook/telemetry");
-
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+var _prompts = _interopRequireDefault(require("prompts"));
 
 var _global = _interopRequireDefault(require("global"));
 
-var _path = _interopRequireDefault(require("path"));
+var _path = require("path");
 
-var _devServer = require("./dev-server");
+var _nodeLogger = require("@storybook/node-logger");
 
-var _cli = require("./cli");
+var _devServer = require("./dev-server");
 
 var _releaseNotes = require("./utils/release-notes");
 
@@ -38,9 +31,7 @@ var _updateCheck = require("./utils/update-check");
 
 var _serverAddress = require("./utils/server-address");
 
-var _getPreviewBuilder = require("./utils/get-preview-builder");
-
-var _getManagerBuilder = require("./utils/get-manager-builder");
+var _getBuilders = require("./utils/get-builders");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -66,9 +57,7 @@ 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([(0, _serverAddress.getServerPort)(options.port), versionUpdates ? (0, _updateCheck.updateCheck)(version) : Promise.resolve({
     success: false,
@@ -98,15 +87,39 @@ async function buildDevStandalone(options) {
   options.versionCheck = versionCheck;
   options.releaseNotesData = releaseNotesData;
   options.configType = 'DEVELOPMENT';
-  options.configDir = _path.default.resolve(options.configDir);
-  options.outputDir = options.smokeTest ? (0, _coreCommon.resolvePathInStorybookCache)('public') : _path.default.resolve(options.outputDir || (0, _coreCommon.resolvePathInStorybookCache)('public'));
+  options.configDir = (0, _path.resolve)(options.configDir);
+  options.outputDir = options.smokeTest ? (0, _coreCommon.resolvePathInStorybookCache)('public') : (0, _path.resolve)(options.outputDir || (0, _coreCommon.resolvePathInStorybookCache)('public'));
   options.serverChannelUrl = (0, _serverAddress.getServerChannelUrl)(port, options);
   /* eslint-enable no-param-reassign */
 
-  var previewBuilder = await (0, _getPreviewBuilder.getPreviewBuilder)(options.configDir);
-  var managerBuilder = await (0, _getManagerBuilder.getManagerBuilder)(options.configDir);
+  var _loadMainConfig = (0, _coreCommon.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((0, _path.join)(frameworkName, 'preset'));
+  } else {
+    _nodeLogger.logger.warn(`you have not specified a framework in your ${options.configDir}/main.js`);
+  }
+
+  _nodeLogger.logger.info('=> Loading presets');
+
   var presets = (0, _coreCommon.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 (0, _getBuilders.getBuilders)(_objectSpread(_objectSpread({}, options), {}, {
+    presets: presets
+  })),
+      _await$getBuilders2 = _slicedToArray(_await$getBuilders, 2),
+      previewBuilder = _await$getBuilders2[0],
+      managerBuilder = _await$getBuilders2[1];
+
+  presets = (0, _coreCommon.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');
@@ -134,131 +147,33 @@ async function buildDevStandalone(options) {
   }
 
   if (options.smokeTest) {
-    // @ts-ignore
-    var managerWarnings = managerStats && managerStats.toJson().warnings || [];
-    if (managerWarnings.length > 0) _nodeLogger.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) _nodeLogger.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;
   (0, _outputStartupInformation.outputStartupInformation)({
     updateInfo: versionCheck,
     version: version,
-    name: frameworkName,
+    name: name,
     address: address,
     networkAddress: networkAddress,
     managerTotalTime: managerTotalTime,
     previewTotalTime: previewTotalTime
   });
-}
-
-async function buildDev(loadOptions) {
-  var cliOptions = await (0, _cli.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: _coreCommon.cache
-  });
-
-  try {
-    await buildDevStandalone(options);
-  } catch (error) {
-    var _error$compilation;
-
-    // this is a weird bugfix, somehow 'node-pre-gyp' is polluting the npmLog header
-    _nodeLogger.instance.heading = '';
-
-    if (error instanceof Error) {
-      if (error.error) {
-        _nodeLogger.logger.error(error.error);
-      } else if (error.stats && error.stats.compilation.errors) {
-        error.stats.compilation.errors.forEach(function (e) {
-          return _nodeLogger.logger.plain(e);
-        });
-      } else {
-        _nodeLogger.logger.error(error);
-      }
-    } else if ((_error$compilation = error.compilation) !== null && _error$compilation !== void 0 && _error$compilation.errors) {
-      error.compilation.errors.forEach(function (e) {
-        return _nodeLogger.logger.plain(e);
-      });
-    }
-
-    _nodeLogger.logger.line();
-
-    _nodeLogger.logger.warn(error.close ? (0, _tsDedent.default)`
-          FATAL broken build!, will close the process,
-          Fix the error below and restart storybook.
-        ` : (0, _tsDedent.default)`
-          Broken build, fix the error above.
-          You may need to refresh the browser.
-        `);
-
-    _nodeLogger.logger.line();
-
-    var presets = (0, _coreCommon.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 _coreCommon.cache.get('enableCrashreports');
-
-        if (valueFromCache !== undefined) {
-          enableCrashReports = valueFromCache;
-        } else {
-          var valueFromPrompt = await promptCrashReports(options);
-
-          if (valueFromPrompt !== undefined) {
-            enableCrashReports = valueFromPrompt;
-          }
-        }
-      }
-
-      await (0, _telemetry.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 (0, _prompts.default)({
-    type: 'confirm',
-    name: 'enableCrashReports',
-    message: `Would you like to send crash reports to Storybook?`,
-    initial: true
-  }),
-      enableCrashReports = _await$prompts2.enableCrashReports;
-
-  await _coreCommon.cache.set('enableCrashreports', enableCrashReports);
-  return enableCrashReports;
-};
+}

package/dist/cjs/build-static.js

@@ -5,7 +5,6 @@ require("core-js/modules/es.symbol.description.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildStatic = buildStatic;
 exports.buildStaticStandalone = buildStaticStandalone;
 
 require("core-js/modules/es.promise.js");
@@ -16,7 +15,7 @@ var _cpy = _interopRequireDefault(require("cpy"));
 
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
-var _path = _interopRequireDefault(require("path"));
+var _path = _interopRequireWildcard(require("path"));
 
 var _tsDedent = _interopRequireDefault(require("ts-dedent"));
 
@@ -28,15 +27,11 @@ var _telemetry = require("@storybook/telemetry");
 
 var _coreCommon = require("@storybook/core-common");
 
-var _cli = require("./cli");
-
 var _outputStats = require("./utils/output-stats");
 
 var _copyAllStaticFiles = require("./utils/copy-all-static-files");
 
-var _getPreviewBuilder = require("./utils/get-preview-builder");
-
-var _getManagerBuilder = require("./utils/get-manager-builder");
+var _getBuilders = require("./utils/get-builders");
 
 var _storiesJson = require("./utils/stories-json");
 
@@ -44,14 +39,8 @@ var _metadata = require("./utils/metadata");
 
 var _StoryIndexGenerator = require("./utils/StoryIndexGenerator");
 
-var _excluded = ["packageJson"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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."); }
@@ -64,18 +53,18 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-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; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 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; }
 
+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 buildStaticStandalone(options) {
-  var _options$staticDir, _core$builder;
+  var _options$staticDir;
 
   /* eslint-disable no-param-reassign */
   options.configType = 'PRODUCTION';
@@ -102,10 +91,40 @@ async function buildStaticStandalone(options) {
 
   await _fsExtra.default.emptyDir(options.outputDir);
   await (0, _cpy.default)(defaultFavIcon, options.outputDir);
-  var previewBuilder = await (0, _getPreviewBuilder.getPreviewBuilder)(options.configDir);
-  var managerBuilder = await (0, _getManagerBuilder.getManagerBuilder)(options.configDir);
+
+  var _await$import = await Promise.resolve().then(function () {
+    return _interopRequireWildcard(require('@storybook/manager-webpack5/prebuilt-manager'));
+  }),
+      getPrebuiltDir = _await$import.getPrebuiltDir;
+
+  var _loadMainConfig = (0, _coreCommon.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((0, _path.join)(frameworkName, 'preset'));
+  } else {
+    _nodeLogger.logger.warn(`you have not specified a framework in your ${options.configDir}/main.js`);
+  }
+
+  _nodeLogger.logger.info('=> Loading presets');
+
   var presets = (0, _coreCommon.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 (0, _getBuilders.getBuilders)(_objectSpread(_objectSpread({}, options), {}, {
+    presets: presets
+  })),
+      _await$getBuilders2 = _slicedToArray(_await$getBuilders, 2),
+      previewBuilder = _await$getBuilders2[0],
+      managerBuilder = _await$getBuilders2[1];
+
+  presets = (0, _coreCommon.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');
@@ -133,14 +152,16 @@ 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 = (0, _coreCommon.normalizeStories)(await presets.apply('stories'), directories);
+    var storyIndexers = await presets.apply('storyIndexers', []);
     var generator = new _StoryIndexGenerator.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
     }));
@@ -185,16 +206,6 @@ async function buildStaticStandalone(options) {
     (0, _coreCommon.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 Promise.resolve().then(function () {
-    return _interopRequireWildcard(require('@storybook/manager-webpack5/prebuilt-manager'));
-  }) : await Promise.resolve().then(function () {
-    return _interopRequireWildcard(require('@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
 
@@ -216,10 +227,10 @@ 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),
@@ -232,45 +243,4 @@ async function buildStaticStandalone(options) {
   }
 
   _nodeLogger.logger.info(`=> Output directory: ${options.outputDir}`);
-}
-
-async function buildStatic(_ref2) {
-  var packageJson = _ref2.packageJson,
-      loadOptions = _objectWithoutProperties(_ref2, _excluded);
-
-  var cliOptions = (0, _cli.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: _coreCommon.cache
-  });
-
-  try {
-    await buildStaticStandalone(options);
-  } catch (error) {
-    _nodeLogger.logger.error(error);
-
-    var presets = (0, _coreCommon.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 (0, _telemetry.telemetry)('error-build', {
-        error: error
-      }, {
-        immediate: true,
-        configDir: options.configDir,
-        enableCrashReports: options.enableCrashReports
-      });
-    }
-
-    process.exit(1);
-  }
 }

package/dist/cjs/dev-server.js

@@ -34,9 +34,7 @@ var _getServerChannel = require("./utils/get-server-channel");
 
 var _openInBrowser = require("./utils/open-in-browser");
 
-var _getPreviewBuilder = require("./utils/get-preview-builder");
-
-var _getManagerBuilder = require("./utils/get-manager-builder");
+var _getBuilders = require("./utils/get-builders");
 
 var _StoryIndexGenerator = require("./utils/StoryIndexGenerator");
 
@@ -88,7 +86,9 @@ async function storybookDevServer(options) {
         workingDir: workingDir
       };
       var normalizedStories = (0, _coreCommon.normalizeStories)(await options.presets.apply('stories'), directories);
+      var storyIndexers = await options.presets.apply('storyIndexers', []);
       var generator = new _StoryIndexGenerator.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
@@ -183,8 +183,11 @@ async function storybookDevServer(options) {
       return error ? reject(error) : resolve();
     });
   });
-  var previewBuilder = await (0, _getPreviewBuilder.getPreviewBuilder)(options.configDir);
-  var managerBuilder = await (0, _getManagerBuilder.getManagerBuilder)(options.configDir);
+
+  var _await$getBuilders = await (0, _getBuilders.getBuilders)(options),
+      _await$getBuilders2 = _slicedToArray(_await$getBuilders, 2),
+      previewBuilder = _await$getBuilders2[0],
+      managerBuilder = _await$getBuilders2[1];
 
   if (options.debugWebpack) {
     (0, _coreCommon.logConfig)('Preview webpack config', await previewBuilder.getConfig(options));
@@ -205,7 +208,7 @@ 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) => {
@@ -213,7 +216,7 @@ 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/cjs/presets/babel-cache-preset.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.managerBabel = exports.babel = void 0;
+exports.babel = void 0;
 
 var _coreCommon = require("@storybook/core-common");
 
@@ -23,6 +23,4 @@ var extend = function (babelConfig) {
 };
 
 var babel = extend;
-exports.babel = babel;
-var managerBabel = extend;
-exports.managerBabel = managerBabel;
+exports.babel = babel;

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

@@ -3,12 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.typescript = exports.previewMainTemplate = exports.previewHead = exports.previewEntries = exports.previewBody = exports.managerMainTemplate = exports.logLevel = exports.features = exports.env = exports.core = exports.config = exports.babel = void 0;
+exports.typescript = exports.storyIndexers = exports.previewMainTemplate = exports.previewHead = exports.previewEntries = exports.previewBody = exports.managerMainTemplate = exports.logLevel = exports.features = exports.env = exports.core = exports.config = exports.babel = void 0;
 
 require("core-js/modules/es.promise.js");
 
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+
 var _coreCommon = require("@storybook/core-common");
 
+var _csfTools = require("@storybook/csf-tools");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -16,18 +22,8 @@ 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; }
 
 var babel = async function (_, options) {
-  var _options$features;
-
-  var configDir = options.configDir,
-      presets = options.presets;
-
-  if ((_options$features = options.features) !== null && _options$features !== void 0 && _options$features.babelModeV7) {
-    return presets.apply('babelDefault', {}, options);
-  }
-
-  return (0, _coreCommon.loadCustomBabelConfig)(configDir, function () {
-    return presets.apply('babelDefault', (0, _coreCommon.getStorybookBabelConfig)(), options);
-  });
+  var presets = options.presets;
+  return presets.apply('babelDefault', {}, options);
 };
 
 exports.babel = babel;
@@ -78,8 +74,7 @@ var managerMainTemplate = function () {
 
 exports.managerMainTemplate = managerMainTemplate;
 
-var previewEntries = function (entries = [], options) {
-  if (!options.modern) entries.push(require.resolve('@storybook/core-client/dist/esm/globals/polyfills'));
+var previewEntries = function (entries = []) {
   entries.push(require.resolve('@storybook/core-client/dist/esm/globals/globals'));
   return entries;
 };
@@ -150,18 +145,31 @@ exports.config = config;
 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,
+    breakingChangesV7: true,
     interactionsDebugger: false,
-    babelModeV7: false,
-    argTypeTargetsV7: false,
+    babelModeV7: true,
+    argTypeTargetsV7: true,
     previewMdx2: false
   });
 };
 
-exports.features = features;
+exports.features = features;
+
+var storyIndexers = async function (indexers) {
+  var csfIndexer = async function (fileName, opts) {
+    var code = (await _fsExtra.default.readFile(fileName, 'utf-8')).toString();
+    return (0, _csfTools.loadCsf)(code, _objectSpread(_objectSpread({}, opts), {}, {
+      fileName: fileName
+    })).parse();
+  };
+
+  return [{
+    test: /(stories|story)\.[tj]sx?$/,
+    indexer: csfIndexer
+  }, ...(indexers || [])];
+};
+
+exports.storyIndexers = storyIndexers;

package/dist/cjs/standalone.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 require("core-js/modules/es.promise.js");
 
+var _readPkgUp = require("read-pkg-up");
+
 var _buildStatic = require("./build-static");
 
 var _buildDev = require("./build-dev");
@@ -21,8 +23,14 @@ async function build(options = {}, frameworkOptions = {}) {
   var _options$mode = options.mode,
       mode = _options$mode === void 0 ? 'dev' : _options$mode;
 
+  var _readUpSync = (0, _readPkgUp.sync)({
+    cwd: __dirname
+  }),
+      packageJson = _readUpSync.packageJson;
+
   var commonOptions = _objectSpread(_objectSpread(_objectSpread({}, options), frameworkOptions), {}, {
-    frameworkPresets: [...(options.frameworkPresets || []), ...(frameworkOptions.frameworkPresets || [])]
+    frameworkPresets: [...(options.frameworkPresets || []), ...(frameworkOptions.frameworkPresets || [])],
+    packageJson: packageJson
   });
 
   if (mode === 'dev') {