@storybook/core-server 7.0.0-alpha.10 → 7.0.0-alpha.13

package/dist/cjs/build-dev.js

@@ -106,7 +106,7 @@ async function buildDevStandalone(options) {
 
   _nodeLogger.logger.info('=> Loading presets');
 
-  var presets = (0, _coreCommon.loadAllPresets)(_objectSpread({
+  var presets = await (0, _coreCommon.loadAllPresets)(_objectSpread({
     corePresets: corePresets,
     overridePresets: []
   }, options));
@@ -118,7 +118,7 @@ async function buildDevStandalone(options) {
       previewBuilder = _await$getBuilders2[0],
       managerBuilder = _await$getBuilders2[1];
 
-  presets = (0, _coreCommon.loadAllPresets)(_objectSpread({
+  presets = await (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));
@@ -143,14 +143,12 @@ async function buildDevStandalone(options) {
 
   if (options.webpackStatsJson) {
     var target = options.webpackStatsJson === true ? options.outputDir : options.webpackStatsJson;
-    await (0, _outputStats.outputStats)(target, previewStats, managerStats);
+    await (0, _outputStats.outputStats)(target, previewStats);
   }
 
   if (options.smokeTest) {
-    var warnings = []; // @ts-ignore
-
-    warnings.push(...(managerStats && managerStats.toJson().warnings || [])); // @ts-ignore
-
+    var warnings = [];
+    warnings.push(...(managerStats && managerStats.toJson().warnings || []));
     warnings.push(...(managerStats && previewStats.toJson().warnings || []));
     var problems = warnings.filter(function (warning) {
       return !warning.message.includes(`export 'useInsertionEffect'`);

package/dist/cjs/build-static.js

@@ -11,11 +11,11 @@ require("core-js/modules/es.promise.js");
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _fsExtra = require("fs-extra");
 
-var _path = _interopRequireWildcard(require("path"));
+var _path = require("path");
 
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+var _tsDedent = require("ts-dedent");
 
 var _global = _interopRequireDefault(require("global"));
 
@@ -57,10 +57,6 @@ 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; }
 
-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;
 
@@ -75,25 +71,18 @@ async function buildStaticStandalone(options) {
     throw new Error("Won't copy root directory. Check your staticDirs!");
   }
 
-  options.outputDir = _path.default.isAbsolute(options.outputDir) ? options.outputDir : _path.default.join(process.cwd(), options.outputDir);
-  options.configDir = _path.default.resolve(options.configDir);
+  options.outputDir = (0, _path.isAbsolute)(options.outputDir) ? options.outputDir : (0, _path.join)(process.cwd(), options.outputDir);
+  options.configDir = (0, _path.resolve)(options.configDir);
   /* eslint-enable no-param-reassign */
 
-  var defaultFavIcon = require.resolve('@storybook/core-server/public/favicon.ico');
-
-  _nodeLogger.logger.info((0, _chalk.default)`=> Cleaning outputDir: {cyan ${options.outputDir}}`);
+  _nodeLogger.logger.info((0, _chalk.default)`=> Cleaning outputDir: {cyan ${options.outputDir.replace(process.cwd(), '')}}`);
 
   if (options.outputDir === '/') {
     throw new Error("Won't remove directory '/'. Check your outputDir!");
   }
 
-  await _fsExtra.default.emptyDir(options.outputDir);
-  await _fsExtra.default.copyFile(defaultFavIcon, _path.default.join(options.outputDir, _path.default.basename(defaultFavIcon)));
-
-  var _await$import = await Promise.resolve().then(function () {
-    return _interopRequireWildcard(require('@storybook/manager-webpack5/prebuilt-manager'));
-  }),
-      getPrebuiltDir = _await$import.getPrebuiltDir;
+  await (0, _fsExtra.emptyDir)(options.outputDir);
+  await (0, _fsExtra.ensureDir)(options.outputDir);
 
   var _loadMainConfig = (0, _coreCommon.loadMainConfig)(options),
       framework = _loadMainConfig.framework;
@@ -109,7 +98,7 @@ async function buildStaticStandalone(options) {
 
   _nodeLogger.logger.info('=> Loading presets');
 
-  var presets = (0, _coreCommon.loadAllPresets)(_objectSpread({
+  var presets = await (0, _coreCommon.loadAllPresets)(_objectSpread({
     corePresets: [require.resolve('./presets/common-preset'), ...corePresets],
     overridePresets: []
   }, options));
@@ -121,14 +110,27 @@ async function buildStaticStandalone(options) {
       previewBuilder = _await$getBuilders2[0],
       managerBuilder = _await$getBuilders2[1];
 
-  presets = (0, _coreCommon.loadAllPresets)(_objectSpread({
+  presets = await (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');
+
+  var _await$Promise$all = await Promise.all([presets.apply('features'), presets.apply('core'), presets.apply('staticDirs'), presets.apply('storyIndexers', []), presets.apply('stories'), presets.apply('docs', {})]),
+      _await$Promise$all2 = _slicedToArray(_await$Promise$all, 6),
+      features = _await$Promise$all2[0],
+      core = _await$Promise$all2[1],
+      staticDirs = _await$Promise$all2[2],
+      storyIndexers = _await$Promise$all2[3],
+      stories = _await$Promise$all2[4],
+      docsOptions = _await$Promise$all2[5];
+
+  var fullOptions = _objectSpread(_objectSpread({}, options), {}, {
+    presets: presets,
+    features: features
+  });
 
   if (staticDirs && options.staticDir) {
-    throw new Error((0, _tsDedent.default)`
+    throw new Error((0, _tsDedent.dedent)`
       Conflict when trying to read staticDirs:
       * Storybook's configuration option: 'staticDirs'
       * Storybook's CLI flag: '--staticDir' or '-s'
@@ -137,17 +139,23 @@ async function buildStaticStandalone(options) {
     `);
   }
 
+  var effects = [];
+  _global.default.FEATURES = features;
+  await managerBuilder.build({
+    startTime: process.hrtime(),
+    options: fullOptions
+  });
+
   if (staticDirs) {
-    await (0, _copyAllStaticFiles.copyAllStaticFilesRelativeToMain)(staticDirs, options.outputDir, options.configDir);
+    effects.push((0, _copyAllStaticFiles.copyAllStaticFilesRelativeToMain)(staticDirs, options.outputDir, options.configDir));
   }
 
   if (options.staticDir) {
-    await (0, _copyAllStaticFiles.copyAllStaticFiles)(options.staticDir, options.outputDir);
+    effects.push((0, _copyAllStaticFiles.copyAllStaticFiles)(options.staticDir, options.outputDir));
   }
 
-  var features = await presets.apply('features');
-  _global.default.FEATURES = features;
-  var extractTasks = [];
+  var coreServerPublicDir = (0, _path.join)((0, _path.dirname)(require.resolve('@storybook/core-server/package.json')), 'public');
+  effects.push((0, _fsExtra.copy)(coreServerPublicDir, options.outputDir));
   var initializedStoryIndexGenerator = Promise.resolve(undefined);
 
   if ((features !== null && features !== void 0 && features.buildStoriesJson || features !== null && features !== void 0 && features.storyStoreV7) && !options.ignorePreview) {
@@ -156,24 +164,22 @@ async function buildStaticStandalone(options) {
       configDir: options.configDir,
       workingDir: workingDir
     };
-    var normalizedStories = (0, _coreCommon.normalizeStories)(await presets.apply('stories'), directories);
-    var storyIndexers = await presets.apply('storyIndexers', []);
+    var normalizedStories = (0, _coreCommon.normalizeStories)(stories, directories);
     var generator = new _StoryIndexGenerator.StoryIndexGenerator(normalizedStories, _objectSpread(_objectSpread({}, directories), {}, {
       storyIndexers: storyIndexers,
+      docs: docsOptions,
       storiesV2Compatibility: !(features !== null && features !== void 0 && features.breakingChangesV7) && !(features !== null && features !== void 0 && features.storyStoreV7),
       storyStoreV7: !!(features !== null && features !== void 0 && features.storyStoreV7)
     }));
     initializedStoryIndexGenerator = generator.initialize().then(function () {
       return generator;
     });
-    extractTasks.push((0, _storiesJson.extractStoriesJson)(_path.default.join(options.outputDir, 'stories.json'), initializedStoryIndexGenerator, _storiesJson.convertToIndexV3));
-    extractTasks.push((0, _storiesJson.extractStoriesJson)(_path.default.join(options.outputDir, 'index.json'), initializedStoryIndexGenerator));
+    effects.push((0, _storiesJson.extractStoriesJson)((0, _path.join)(options.outputDir, 'stories.json'), initializedStoryIndexGenerator, _storiesJson.convertToIndexV3));
+    effects.push((0, _storiesJson.extractStoriesJson)((0, _path.join)(options.outputDir, 'index.json'), initializedStoryIndexGenerator));
   }
 
-  var core = await presets.apply('core');
-
   if (!(core !== null && core !== void 0 && core.disableTelemetry)) {
-    initializedStoryIndexGenerator.then(async function (generator) {
+    effects.push(initializedStoryIndexGenerator.then(async function (generator) {
       if (!generator) {
         return;
       }
@@ -185,60 +191,33 @@ async function buildStaticStandalone(options) {
           version: storyIndex.v
         }
       } : undefined;
-      (0, _telemetry.telemetry)('build', payload, {
+      await (0, _telemetry.telemetry)('build', payload, {
         configDir: options.configDir
       });
-    });
+    }));
   }
 
   if (!(core !== null && core !== void 0 && core.disableProjectJson)) {
-    extractTasks.push((0, _metadata.extractStorybookMetadata)(_path.default.join(options.outputDir, 'project.json'), options.configDir));
+    effects.push((0, _metadata.extractStorybookMetadata)((0, _path.join)(options.outputDir, 'project.json'), options.configDir));
   }
 
-  var fullOptions = _objectSpread(_objectSpread({}, options), {}, {
-    presets: presets,
-    features: features
-  });
-
   if (options.debugWebpack) {
     (0, _coreCommon.logConfig)('Preview webpack config', await previewBuilder.getConfig(fullOptions));
-    (0, _coreCommon.logConfig)('Manager webpack config', await managerBuilder.getConfig(fullOptions));
   }
 
-  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
-
-  var manager = prebuiltDir ? _fsExtra.default.copy(prebuiltDir, options.outputDir, {
-    dereference: true
-  }).then(function () {}) : managerBuilder.build({
-    startTime: startTime,
-    options: fullOptions
-  });
-
   if (options.ignorePreview) {
     _nodeLogger.logger.info(`=> Not building preview`);
   }
 
-  var preview = options.ignorePreview ? Promise.resolve() : previewBuilder.build({
-    startTime: startTime,
+  await Promise.all([...(options.ignorePreview ? [] : [previewBuilder.build({
+    startTime: process.hrtime(),
     options: fullOptions
-  });
-
-  var _await$Promise$all = await Promise.all([manager.catch(async function (err) {
-    await (previewBuilder === null || previewBuilder === void 0 ? void 0 : previewBuilder.bail());
-    throw err;
-  }), preview.catch(async function (err) {
-    await (managerBuilder === null || managerBuilder === void 0 ? void 0 : managerBuilder.bail());
-    throw err;
-  }), ...extractTasks]),
-      _await$Promise$all2 = _slicedToArray(_await$Promise$all, 2),
-      managerStats = _await$Promise$all2[0],
-      previewStats = _await$Promise$all2[1];
-
-  if (options.webpackStatsJson) {
-    var target = options.webpackStatsJson === true ? options.outputDir : options.webpackStatsJson;
-    await (0, _outputStats.outputStats)(target, previewStats, managerStats);
-  }
+  }).then(async function (previewStats) {
+    if (options.webpackStatsJson) {
+      var target = options.webpackStatsJson === true ? options.outputDir : options.webpackStatsJson;
+      await (0, _outputStats.outputStats)(target, previewStats);
+    }
+  })]), ...effects]);
 
   _nodeLogger.logger.info(`=> Output directory: ${options.outputDir}`);
 }

package/dist/cjs/dev-server.js

@@ -87,8 +87,10 @@ async function storybookDevServer(options) {
       };
       var normalizedStories = (0, _coreCommon.normalizeStories)(await options.presets.apply('stories'), directories);
       var storyIndexers = await options.presets.apply('storyIndexers', []);
+      var docsOptions = await options.presets.apply('docs', {});
       var generator = new _StoryIndexGenerator.StoryIndexGenerator(normalizedStories, _objectSpread(_objectSpread({}, directories), {}, {
         storyIndexers: storyIndexers,
+        docs: docsOptions,
         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
@@ -191,7 +193,6 @@ async function storybookDevServer(options) {
 
   if (options.debugWebpack) {
     (0, _coreCommon.logConfig)('Preview webpack config', await previewBuilder.getConfig(options));
-    (0, _coreCommon.logConfig)('Manager webpack config', await managerBuilder.getConfig(options));
   }
 
   var preview = options.ignorePreview ? Promise.resolve() : previewBuilder.start({

package/dist/cjs/index.js

@@ -5,23 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {
   getPreviewHeadTemplate: true,
-  getManagerHeadTemplate: true,
-  getManagerMainTemplate: true,
   getPreviewBodyTemplate: true,
   getPreviewMainTemplate: true
 };
-Object.defineProperty(exports, "getManagerHeadTemplate", {
-  enumerable: true,
-  get: function () {
-    return _coreCommon.getManagerHeadTemplate;
-  }
-});
-Object.defineProperty(exports, "getManagerMainTemplate", {
-  enumerable: true,
-  get: function () {
-    return _coreCommon.getManagerMainTemplate;
-  }
-});
 Object.defineProperty(exports, "getPreviewBodyTemplate", {
   enumerable: true,
   get: function () {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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;
+exports.typescript = exports.title = exports.storyIndexers = exports.previewMainTemplate = exports.previewHead = exports.previewEntries = exports.previewBody = exports.logLevel = exports.features = exports.env = exports.core = exports.config = exports.babel = void 0;
 
 require("core-js/modules/es.promise.js");
 
@@ -28,6 +28,12 @@ var babel = async function (_, options) {
 
 exports.babel = babel;
 
+var title = function (previous, options) {
+  return previous || options.packageJson.name || false;
+};
+
+exports.title = title;
+
 var logLevel = function (previous, options) {
   return previous || options.loglevel || 'info';
 };
@@ -68,12 +74,6 @@ var previewMainTemplate = function () {
 
 exports.previewMainTemplate = previewMainTemplate;
 
-var managerMainTemplate = function () {
-  return (0, _coreCommon.getManagerMainTemplate)();
-};
-
-exports.managerMainTemplate = managerMainTemplate;
-
 var previewEntries = function (entries = []) {
   entries.push(require.resolve('@storybook/core-client/dist/esm/globals/globals'));
   return entries;

package/dist/cjs/utils/StoryIndexGenerator.js

@@ -56,6 +56,25 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var makeAbsolute = function (otherImport, normalizedPath, workingDir) {
   return otherImport.startsWith('.') ? (0, _slash.default)(_path.default.resolve(workingDir, (0, _coreCommon.normalizeStoryPath)(_path.default.join(_path.default.dirname(normalizedPath), otherImport)))) : otherImport;
 };
+/**
+ * The StoryIndexGenerator extracts stories and docs entries for each file matching
+ * (one or more) stories "specifiers", as defined in main.js.
+ *
+ * The output is a set of entries (see above for the types).
+ *
+ * Each file is treated as a stories or a (modern) docs file.
+ *
+ * A stories file is indexed by an indexer (passed in), which produces a list of stories.
+ *   - If the stories have the `parameters.docsOnly` setting, they are disregarded.
+ *   - If the indexer is a "docs template" indexer, OR docsPage is enabled,
+ *       a templated docs entry is added pointing to the story file.
+ *
+ * A (modern) docs file is indexed, a standalone docs entry is added.
+ *
+ * The entries are "uniq"-ed and sorted. Stories entries are preferred to docs entries and
+ * standalone docs entries are preferred to templates (with warnings).
+ */
+
 
 class StoryIndexGenerator {
   // An internal cache mapping specifiers to a set of path=><set of stories>
@@ -103,14 +122,15 @@ class StoryIndexGenerator {
    */
 
 
-  async updateExtracted(updater) {
+  async updateExtracted(updater, overwrite = false) {
     var _this2 = this;
 
     await Promise.all(this.specifiers.map(async function (specifier) {
       var entry = _this2.specifierToCache.get(specifier);
 
       return Promise.all(Object.keys(entry).map(async function (absolutePath) {
-        entry[absolutePath] = entry[absolutePath] || (await updater(specifier, absolutePath));
+        if (entry[absolutePath] && !overwrite) return;
+        entry[absolutePath] = await updater(specifier, absolutePath, entry[absolutePath]);
       }));
     }));
   }
@@ -129,9 +149,13 @@ class StoryIndexGenerator {
     await this.updateExtracted(async function (specifier, absolutePath) {
       return _this3.isDocsMdx(absolutePath) ? false : _this3.extractStories(specifier, absolutePath);
     });
-    await this.updateExtracted(async function (specifier, absolutePath) {
-      return _this3.extractDocs(specifier, absolutePath);
-    });
+
+    if (this.options.docs.enabled) {
+      await this.updateExtracted(async function (specifier, absolutePath) {
+        return _this3.extractDocs(specifier, absolutePath);
+      });
+    }
+
     return this.specifiers.flatMap(function (specifier) {
       var cache = _this3.specifierToCache.get(specifier);
 
@@ -172,6 +196,79 @@ class StoryIndexGenerator {
     return dependencies;
   }
 
+  async extractStories(specifier, absolutePath) {
+    var relativePath = _path.default.relative(this.options.workingDir, absolutePath);
+
+    var entries = [];
+
+    try {
+      var importPath = (0, _slash.default)((0, _coreCommon.normalizeStoryPath)(relativePath));
+
+      var makeTitle = function (userTitle) {
+        return (0, _store.userOrAutoTitleFromSpecifier)(importPath, specifier, userTitle);
+      };
+
+      var storyIndexer = this.options.storyIndexers.find(function (indexer) {
+        return indexer.test.exec(absolutePath);
+      });
+
+      if (!storyIndexer) {
+        throw new Error(`No matching story indexer found for ${absolutePath}`);
+      }
+
+      var csf = await storyIndexer.indexer(absolutePath, {
+        makeTitle: makeTitle
+      });
+      csf.stories.forEach(function ({
+        id: id,
+        name: name,
+        parameters: parameters
+      }) {
+        if (!(parameters !== null && parameters !== void 0 && parameters.docsOnly)) {
+          entries.push({
+            id: id,
+            title: csf.meta.title,
+            name: name,
+            importPath: importPath,
+            type: 'story'
+          });
+        }
+      });
+
+      if (this.options.docs.enabled) {
+        // We always add a template for *.stories.mdx, but only if docs page is enabled for
+        // regular CSF files
+        if (storyIndexer.addDocsTemplate || this.options.docs.docsPage) {
+          var name = this.options.docs.defaultName;
+          var id = (0, _csf.toId)(csf.meta.title, name);
+          entries.unshift({
+            id: id,
+            title: csf.meta.title,
+            name: name,
+            importPath: importPath,
+            type: 'docs',
+            storiesImports: [],
+            standalone: false
+          });
+        }
+      }
+    } catch (err) {
+      if (err.name === 'NoMetaError') {
+        _nodeLogger.logger.info(`💡 Skipping ${relativePath}: ${err}`);
+      } else {
+        _nodeLogger.logger.warn(`🚨 Extraction error on ${relativePath}: ${err}`);
+
+        throw err;
+      }
+    }
+
+    return {
+      entries: entries,
+      type: 'stories',
+      dependents: []
+    };
+  }
+
   async extractDocs(specifier, absolutePath) {
     var _this4 = this;
 
@@ -193,9 +290,10 @@ class StoryIndexGenerator {
       var _await$require = await require('@storybook/docs-mdx'),
           analyze = _await$require.analyze;
 
-      var content = await _fsExtra.default.readFile(absolutePath, 'utf8'); // { title?, of?, imports? }
+      var content = await _fsExtra.default.readFile(absolutePath, 'utf8');
+      var result = analyze(content); // Templates are not indexed
 
-      var result = analyze(content);
+      if (result.isTemplate) return false;
       var absoluteImports = result.imports.map(function (p) {
         return makeAbsolute(p, normalizedPath, _this4.options.workingDir);
       }); // Go through the cache and collect all of the cache entries that this docs file depends on.
@@ -225,8 +323,8 @@ class StoryIndexGenerator {
       dependencies.forEach(function (dep) {
         dep.dependents.push(absolutePath);
       });
-      var title = (0, _store.userOrAutoTitleFromSpecifier)(importPath, specifier, result.title || ofTitle);
-      var name = 'docs';
+      var title = ofTitle || (0, _store.userOrAutoTitleFromSpecifier)(importPath, specifier, result.title);
+      var name = result.name || this.options.docs.defaultName;
       var id = (0, _csf.toId)(title, name);
       var docsEntry = {
         id: id,
@@ -236,7 +334,8 @@ class StoryIndexGenerator {
         storiesImports: dependencies.map(function (dep) {
           return dep.entries[0].importPath;
         }),
-        type: 'docs'
+        type: 'docs',
+        standalone: true
       };
       return docsEntry;
     } catch (err) {
@@ -246,74 +345,62 @@ class StoryIndexGenerator {
     }
   }
 
-  async index(filePath, options) {
-    var storyIndexer = this.options.storyIndexers.find(function (indexer) {
-      return indexer.test.exec(filePath);
-    });
+  chooseDuplicate(firstEntry, secondEntry) {
+    var firstIsBetter = true;
 
-    if (!storyIndexer) {
-      throw new Error(`No matching story indexer found for ${filePath}`);
+    if (secondEntry.type === 'story') {
+      firstIsBetter = false;
+    } else if (secondEntry.standalone && firstEntry.type === 'docs' && !firstEntry.standalone) {
+      firstIsBetter = false;
     }
 
-    return storyIndexer.indexer(filePath, options);
-  }
-
-  async extractStories(specifier, absolutePath) {
-    var relativePath = _path.default.relative(this.options.workingDir, absolutePath);
-
-    var entries = [];
+    var betterEntry = firstIsBetter ? firstEntry : secondEntry;
+    var worseEntry = firstIsBetter ? secondEntry : firstEntry;
+    var changeDocsName = 'Use `<Meta of={} name="Other Name">` to distinguish them.'; // This shouldn't be possible, but double check and use for typing
 
-    try {
-      var importPath = (0, _slash.default)((0, _coreCommon.normalizeStoryPath)(relativePath));
+    if (worseEntry.type === 'story') throw new Error(`Duplicate stories with id: ${firstEntry.id}`);
 
-      var makeTitle = function (userTitle) {
-        return (0, _store.userOrAutoTitleFromSpecifier)(importPath, specifier, userTitle);
-      };
+    if (betterEntry.type === 'story') {
+      var worseDescriptor = worseEntry.standalone ? `component docs page` : `automatically generated docs page`;
 
-      var csf = await this.index(absolutePath, {
-        makeTitle: makeTitle
-      });
-      csf.stories.forEach(function ({
-        id: id,
-        name: name,
-        parameters: parameters
-      }) {
-        var base = {
-          id: id,
-          title: csf.meta.title,
-          name: name,
-          importPath: importPath
-        };
-        var entry = parameters !== null && parameters !== void 0 && parameters.docsOnly ? _objectSpread(_objectSpread({}, base), {}, {
-          type: 'docs',
-          storiesImports: [],
-          legacy: true
-        }) : _objectSpread(_objectSpread({}, base), {}, {
-          type: 'story'
-        });
-        entries.push(entry);
-      });
-    } catch (err) {
-      if (err.name === 'NoMetaError') {
-        _nodeLogger.logger.info(`💡 Skipping ${relativePath}: ${err}`);
+      if (betterEntry.name === this.options.docs.defaultName) {
+        _nodeLogger.logger.warn(`🚨 You have a story for ${betterEntry.title} with the same name as your default docs entry name (${betterEntry.name}), so the docs page is being dropped. Consider changing the story name.`);
       } else {
-        _nodeLogger.logger.warn(`🚨 Extraction error on ${relativePath}: ${err}`);
-
-        throw err;
+        _nodeLogger.logger.warn(`🚨 You have a story for ${betterEntry.title} with the same name as your ${worseDescriptor} (${worseEntry.name}), so the docs page is being dropped. ${changeDocsName}`);
       }
+    } else if (betterEntry.standalone) {
+      // Both entries are standalone but pointing at the same place
+      if (worseEntry.standalone) {
+        _nodeLogger.logger.warn(`🚨 You have two component docs pages with the same name ${betterEntry.title}:${betterEntry.name}. ${changeDocsName}`);
+      } // If one entry is standalone (i.e. .mdx of={}) we are OK with it overriding a template
+      //   - docs page templates, this is totally fine and expected
+      //   - not sure if it is even possible to have a .mdx of={} pointing at a stories.mdx file
+
+    } else {
+      // If both entries are templates (e.g. you have two CSF files with the same title), then
+      //   we need to merge the entries. We'll use the the first one's name and importPath,
+      //   but ensure we include both as storiesImports so they are both loaded before rendering
+      //   the story (for the <Stories> block & friends)
+      return _objectSpread(_objectSpread({}, betterEntry), {}, {
+        storiesImports: [...betterEntry.storiesImports, worseEntry.importPath, ...worseEntry.storiesImports]
+      });
     }
 
-    return {
-      entries: entries,
-      type: 'stories',
-      dependents: []
-    };
+    return betterEntry;
   }
 
   async sortStories(storiesList) {
+    var _this5 = this;
+
     var entries = {};
     storiesList.forEach(function (entry) {
-      entries[entry.id] = entry;
+      var existing = entries[entry.id];
+
+      if (existing) {
+        entries[entry.id] = _this5.chooseDuplicate(existing, entry);
+      } else {
+        entries[entry.id] = entry;
+      }
     });
     var sortableStories = Object.values(entries); // Skip sorting if we're in v6 mode because we don't have
     // all the info we need here
@@ -371,7 +458,7 @@ class StoryIndexGenerator {
   }
 
   invalidate(specifier, importPath, removed) {
-    var _this5 = this;
+    var _this6 = this;
 
     var absolutePath = (0, _slash.default)(_path.default.resolve(this.options.workingDir, importPath));
     var cache = this.specifierToCache.get(specifier);
@@ -402,7 +489,7 @@ class StoryIndexGenerator {
     if (removed) {
       if (cacheEntry && cacheEntry.type === 'docs') {
         var absoluteImports = cacheEntry.storiesImports.map(function (p) {
-          return _path.default.resolve(_this5.options.workingDir, p);
+          return _path.default.resolve(_this6.options.workingDir, p);
         });
         var dependencies = this.findDependencies(absoluteImports);
         dependencies.forEach(function (dep) {
@@ -419,10 +506,10 @@ class StoryIndexGenerator {
   }
 
   async getStorySortParameter() {
-    var _this6 = this;
+    var _this7 = this;
 
     var previewFile = ['js', 'jsx', 'ts', 'tsx'].map(function (ext) {
-      return _path.default.join(_this6.options.configDir, `preview.${ext}`);
+      return _path.default.join(_this7.options.configDir, `preview.${ext}`);
     }).find(function (fname) {
       return _fsExtra.default.existsSync(fname);
     });