@storybook/core-server 7.0.0-alpha.11 → 7.0.0-alpha.16

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));
@@ -147,10 +147,8 @@ async function buildDevStandalone(options) {
   }
 
   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

@@ -98,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));
@@ -110,18 +110,19 @@ 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 _await$Promise$all = await Promise.all([presets.apply('features'), presets.apply('core'), presets.apply('staticDirs'), presets.apply('storyIndexers', []), presets.apply('stories')]),
-      _await$Promise$all2 = _slicedToArray(_await$Promise$all, 5),
+  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];
+      stories = _await$Promise$all2[4],
+      docsOptions = _await$Promise$all2[5];
 
   var fullOptions = _objectSpread(_objectSpread({}, options), {}, {
     presets: presets,
@@ -166,6 +167,7 @@ async function buildStaticStandalone(options) {
     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)
     }));

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

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);
     });

package/dist/cjs/utils/__mockdata__/duplicate/A.stories.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.StoryOne = void 0;
+var component = {};
+var _default = {
+  component: component,
+  title: 'duplicate/A'
+};
+exports.default = _default;
+var StoryOne = {};
+exports.StoryOne = StoryOne;

package/dist/cjs/utils/__mockdata__/duplicate/SecondA.stories.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.StoryTwo = void 0;
+var component = {};
+var _default = {
+  component: component,
+  title: 'duplicate/A'
+};
+exports.default = _default;
+var StoryTwo = {};
+exports.StoryTwo = StoryTwo;

package/dist/esm/build-dev.js

@@ -82,7 +82,7 @@ export async function buildDevStandalone(options) {
   }
 
   logger.info('=> Loading presets');
-  var presets = loadAllPresets(_objectSpread({
+  var presets = await loadAllPresets(_objectSpread({
     corePresets: corePresets,
     overridePresets: []
   }, options));
@@ -94,7 +94,7 @@ export async function buildDevStandalone(options) {
       previewBuilder = _await$getBuilders2[0],
       managerBuilder = _await$getBuilders2[1];
 
-  presets = loadAllPresets(_objectSpread({
+  presets = await loadAllPresets(_objectSpread({
     corePresets: [require.resolve('./presets/common-preset'), ...managerBuilder.corePresets, ...previewBuilder.corePresets, ...corePresets, require.resolve('./presets/babel-cache-preset')],
     overridePresets: previewBuilder.overridePresets
   }, options));
@@ -123,10 +123,8 @@ export async function buildDevStandalone(options) {
   }
 
   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/esm/build-static.js

@@ -72,7 +72,7 @@ export async function buildStaticStandalone(options) {
   }
 
   logger.info('=> Loading presets');
-  var presets = loadAllPresets(_objectSpread({
+  var presets = await loadAllPresets(_objectSpread({
     corePresets: [require.resolve('./presets/common-preset'), ...corePresets],
     overridePresets: []
   }, options));
@@ -84,18 +84,19 @@ export async function buildStaticStandalone(options) {
       previewBuilder = _await$getBuilders2[0],
       managerBuilder = _await$getBuilders2[1];
 
-  presets = loadAllPresets(_objectSpread({
+  presets = await loadAllPresets(_objectSpread({
     corePresets: [require.resolve('./presets/common-preset'), ...(managerBuilder.corePresets || []), ...(previewBuilder.corePresets || []), ...corePresets, require.resolve('./presets/babel-cache-preset')],
     overridePresets: previewBuilder.overridePresets || []
   }, options));
 
-  var _await$Promise$all = await Promise.all([presets.apply('features'), presets.apply('core'), presets.apply('staticDirs'), presets.apply('storyIndexers', []), presets.apply('stories')]),
-      _await$Promise$all2 = _slicedToArray(_await$Promise$all, 5),
+  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];
+      stories = _await$Promise$all2[4],
+      docsOptions = _await$Promise$all2[5];
 
   var fullOptions = _objectSpread(_objectSpread({}, options), {}, {
     presets: presets,
@@ -140,6 +141,7 @@ export async function buildStaticStandalone(options) {
     var normalizedStories = normalizeStories(stories, directories);
     var generator = new 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)
     }));

package/dist/esm/dev-server.js

@@ -54,8 +54,10 @@ export async function storybookDevServer(options) {
       };
       var normalizedStories = 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(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

package/dist/esm/utils/StoryIndexGenerator.js

@@ -30,10 +30,30 @@ import { normalizeStoryPath } from '@storybook/core-common';
 import { logger } from '@storybook/node-logger';
 import { getStorySortParameter } from '@storybook/csf-tools';
 import { toId } from '@storybook/csf';
+/** A .mdx file will produce a "standalone" docs entry */
 
 var makeAbsolute = function (otherImport, normalizedPath, workingDir) {
   return otherImport.startsWith('.') ? slash(path.resolve(workingDir, normalizeStoryPath(path.join(path.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).
+ */
+
 
 export class StoryIndexGenerator {
   // An internal cache mapping specifiers to a set of path=><set of stories>
@@ -79,14 +99,15 @@ export 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]);
       }));
     }));
   }
@@ -105,9 +126,13 @@ export 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);
 
@@ -148,6 +173,77 @@ export class StoryIndexGenerator {
     return dependencies;
   }
 
+  async extractStories(specifier, absolutePath) {
+    var relativePath = path.relative(this.options.workingDir, absolutePath);
+    var entries = [];
+
+    try {
+      var importPath = slash(normalizeStoryPath(relativePath));
+
+      var makeTitle = function (userTitle) {
+        return 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 = 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') {
+        logger.info(`💡 Skipping ${relativePath}: ${err}`);
+      } else {
+        logger.warn(`🚨 Extraction error on ${relativePath}: ${err}`);
+        throw err;
+      }
+    }
+
+    return {
+      entries: entries,
+      type: 'stories',
+      dependents: []
+    };
+  }
+
   async extractDocs(specifier, absolutePath) {
     var _this4 = this;
 
@@ -169,9 +265,10 @@ export class StoryIndexGenerator {
       var _await$require = await require('@storybook/docs-mdx'),
           analyze = _await$require.analyze;
 
-      var content = await fs.readFile(absolutePath, 'utf8'); // { title?, of?, imports? }
+      var content = await fs.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.
@@ -201,8 +298,8 @@ export class StoryIndexGenerator {
       dependencies.forEach(function (dep) {
         dep.dependents.push(absolutePath);
       });
-      var title = userOrAutoTitleFromSpecifier(importPath, specifier, result.title || ofTitle);
-      var name = 'docs';
+      var title = ofTitle || userOrAutoTitleFromSpecifier(importPath, specifier, result.title);
+      var name = result.name || this.options.docs.defaultName;
       var id = toId(title, name);
       var docsEntry = {
         id: id,
@@ -212,7 +309,8 @@ export class StoryIndexGenerator {
         storiesImports: dependencies.map(function (dep) {
           return dep.entries[0].importPath;
         }),
-        type: 'docs'
+        type: 'docs',
+        standalone: true
       };
       return docsEntry;
     } catch (err) {
@@ -221,72 +319,62 @@ export 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);
-  }
+    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
 
-  async extractStories(specifier, absolutePath) {
-    var relativePath = path.relative(this.options.workingDir, absolutePath);
-    var entries = [];
+    if (worseEntry.type === 'story') throw new Error(`Duplicate stories with id: ${firstEntry.id}`);
 
-    try {
-      var importPath = slash(normalizeStoryPath(relativePath));
+    if (betterEntry.type === 'story') {
+      var worseDescriptor = worseEntry.standalone ? `component docs page` : `automatically generated docs page`;
 
-      var makeTitle = function (userTitle) {
-        return userOrAutoTitleFromSpecifier(importPath, specifier, userTitle);
-      };
-
-      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') {
-        logger.info(`💡 Skipping ${relativePath}: ${err}`);
+      if (betterEntry.name === this.options.docs.defaultName) {
+        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 {
-        logger.warn(`🚨 Extraction error on ${relativePath}: ${err}`);
-        throw err;
+        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) {
+        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
@@ -344,7 +432,7 @@ export class StoryIndexGenerator {
   }
 
   invalidate(specifier, importPath, removed) {
-    var _this5 = this;
+    var _this6 = this;
 
     var absolutePath = slash(path.resolve(this.options.workingDir, importPath));
     var cache = this.specifierToCache.get(specifier);
@@ -375,7 +463,7 @@ export class StoryIndexGenerator {
     if (removed) {
       if (cacheEntry && cacheEntry.type === 'docs') {
         var absoluteImports = cacheEntry.storiesImports.map(function (p) {
-          return path.resolve(_this5.options.workingDir, p);
+          return path.resolve(_this6.options.workingDir, p);
         });
         var dependencies = this.findDependencies(absoluteImports);
         dependencies.forEach(function (dep) {
@@ -392,10 +480,10 @@ export class StoryIndexGenerator {
   }
 
   async getStorySortParameter() {
-    var _this6 = this;
+    var _this7 = this;
 
     var previewFile = ['js', 'jsx', 'ts', 'tsx'].map(function (ext) {
-      return path.join(_this6.options.configDir, `preview.${ext}`);
+      return path.join(_this7.options.configDir, `preview.${ext}`);
     }).find(function (fname) {
       return fs.existsSync(fname);
     });

package/dist/esm/utils/__mockdata__/duplicate/A.stories.js

@@ -0,0 +1,6 @@
+var component = {};
+export default {
+  component: component,
+  title: 'duplicate/A'
+};
+export var StoryOne = {};

package/dist/esm/utils/__mockdata__/duplicate/SecondA.stories.js

@@ -0,0 +1,6 @@
+var component = {};
+export default {
+  component: component,
+  title: 'duplicate/A'
+};
+export var StoryTwo = {};

package/dist/types/dev-server.d.ts

@@ -1,15 +1,15 @@
 import { Router } from 'express';
-import type { Options } from '@storybook/core-common';
+import { Options } from '@storybook/core-common';
 export declare const router: Router;
 export declare const DEBOUNCE = 100;
 export declare function storybookDevServer(options: Options): Promise<{
     previewResult: void | {
-        stats: unknown;
+        stats?: import("@storybook/core-common").Stats;
         totalTime: [number, number];
         bail: (e?: Error) => Promise<void>;
     };
     managerResult: void | {
-        stats: unknown;
+        stats?: import("@storybook/core-common").Stats;
         totalTime: [number, number];
         bail: (e?: Error) => Promise<void>;
     };

package/dist/types/utils/StoryIndexGenerator.d.ts

@@ -1,12 +1,32 @@
-import type { Path, StoryIndex, IndexEntry, DocsIndexEntry } from '@storybook/store';
-import type { StoryIndexer, IndexerOptions, NormalizedStoriesSpecifier } from '@storybook/core-common';
-declare type DocsCacheEntry = DocsIndexEntry;
+import type { Path, StoryIndex, IndexEntry, StoryIndexEntry, StandaloneDocsIndexEntry, TemplateDocsIndexEntry } from '@storybook/store';
+import type { StoryIndexer, NormalizedStoriesSpecifier, DocsOptions } from '@storybook/core-common';
+/** A .mdx file will produce a "standalone" docs entry */
+declare type DocsCacheEntry = StandaloneDocsIndexEntry;
+/** A *.stories.* file will produce a list of stories and possibly a docs entry */
 declare type StoriesCacheEntry = {
-    entries: IndexEntry[];
+    entries: (StoryIndexEntry | TemplateDocsIndexEntry)[];
     dependents: Path[];
     type: 'stories';
 };
 declare type CacheEntry = false | StoriesCacheEntry | DocsCacheEntry;
+/**
+ * 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).
+ */
 export declare class StoryIndexGenerator {
     readonly specifiers: NormalizedStoriesSpecifier[];
     readonly options: {
@@ -15,6 +35,7 @@ export declare class StoryIndexGenerator {
         storiesV2Compatibility: boolean;
         storyStoreV7: boolean;
         storyIndexers: StoryIndexer[];
+        docs: DocsOptions;
     };
     private specifierToCache;
     private lastIndex?;
@@ -24,18 +45,19 @@ export declare class StoryIndexGenerator {
         storiesV2Compatibility: boolean;
         storyStoreV7: boolean;
         storyIndexers: StoryIndexer[];
+        docs: DocsOptions;
     });
     initialize(): Promise<void>;
     /**
      * Run the updater function over all the empty cache entries
      */
-    updateExtracted(updater: (specifier: NormalizedStoriesSpecifier, absolutePath: Path) => Promise<CacheEntry>): Promise<void>;
+    updateExtracted(updater: (specifier: NormalizedStoriesSpecifier, absolutePath: Path, existingEntry: CacheEntry) => Promise<CacheEntry>, overwrite?: boolean): Promise<void>;
     isDocsMdx(absolutePath: Path): boolean;
     ensureExtracted(): Promise<IndexEntry[]>;
     findDependencies(absoluteImports: Path[]): StoriesCacheEntry[];
-    extractDocs(specifier: NormalizedStoriesSpecifier, absolutePath: Path): Promise<DocsIndexEntry>;
-    index(filePath: string, options: IndexerOptions): Promise<import("@storybook/core-common").StoryIndex>;
     extractStories(specifier: NormalizedStoriesSpecifier, absolutePath: Path): Promise<StoriesCacheEntry>;
+    extractDocs(specifier: NormalizedStoriesSpecifier, absolutePath: Path): Promise<false | StandaloneDocsIndexEntry>;
+    chooseDuplicate(firstEntry: IndexEntry, secondEntry: IndexEntry): IndexEntry;
     sortStories(storiesList: IndexEntry[]): Promise<Record<string, IndexEntry>>;
     getIndex(): Promise<StoryIndex>;
     invalidate(specifier: NormalizedStoriesSpecifier, importPath: Path, removed: boolean): void;

package/dist/types/utils/get-builders.d.ts

@@ -1,2 +1,2 @@
 import type { Options, Builder } from '@storybook/core-common';
-export declare function getBuilders({ presets, configDir, }: Options): Promise<Builder<unknown, unknown>[]>;
+export declare function getBuilders({ presets, configDir, }: Options): Promise<Builder<unknown>[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-server",
-  "version": "7.0.0-alpha.11",
+  "version": "7.0.0-alpha.16",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -35,17 +35,17 @@
   "dependencies": {
     "@aw-web-design/x-default-browser": "1.4.88",
     "@discoveryjs/json-ext": "^0.5.3",
-    "@storybook/builder-manager": "7.0.0-alpha.11",
-    "@storybook/core-client": "7.0.0-alpha.11",
-    "@storybook/core-common": "7.0.0-alpha.11",
-    "@storybook/core-events": "7.0.0-alpha.11",
+    "@storybook/builder-manager": "7.0.0-alpha.16",
+    "@storybook/core-client": "7.0.0-alpha.16",
+    "@storybook/core-common": "7.0.0-alpha.16",
+    "@storybook/core-events": "7.0.0-alpha.16",
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
-    "@storybook/csf-tools": "7.0.0-alpha.11",
-    "@storybook/docs-mdx": "0.0.1-canary.1.4bea5cc.0",
-    "@storybook/node-logger": "7.0.0-alpha.11",
+    "@storybook/csf-tools": "7.0.0-alpha.16",
+    "@storybook/docs-mdx": "0.0.1-canary.12433cf.0",
+    "@storybook/node-logger": "7.0.0-alpha.16",
     "@storybook/semver": "^7.3.2",
-    "@storybook/store": "7.0.0-alpha.11",
-    "@storybook/telemetry": "7.0.0-alpha.11",
+    "@storybook/store": "7.0.0-alpha.16",
+    "@storybook/telemetry": "7.0.0-alpha.16",
     "@types/node": "^14.0.10 || ^16.0.0",
     "@types/node-fetch": "^2.5.7",
     "@types/pretty-hrtime": "^1.0.0",
@@ -78,7 +78,7 @@
     "ws": "^8.2.3"
   },
   "devDependencies": {
-    "@storybook/builder-webpack5": "7.0.0-alpha.11",
+    "@storybook/builder-webpack5": "7.0.0-alpha.16",
     "@types/compression": "^1.7.0",
     "@types/ip": "^1.1.0",
     "@types/serve-favicon": "^2.5.2",
@@ -101,5 +101,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "688d338903e84a7e83cb104472e868e734399f65"
+  "gitHead": "df30e7db2b251418af106345e5722477f057ec36"
 }