@storybook/core-server 7.0.0-alpha.4 → 7.0.0-alpha.7

package/dist/cjs/build-static.js

@@ -11,8 +11,6 @@ require("core-js/modules/es.promise.js");
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
-var _cpy = _interopRequireDefault(require("cpy"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
 var _path = _interopRequireWildcard(require("path"));
@@ -90,7 +88,7 @@ async function buildStaticStandalone(options) {
   }
 
   await _fsExtra.default.emptyDir(options.outputDir);
-  await (0, _cpy.default)(defaultFavIcon, 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'));
@@ -168,7 +166,8 @@ async function buildStaticStandalone(options) {
     initializedStoryIndexGenerator = generator.initialize().then(function () {
       return generator;
     });
-    extractTasks.push((0, _storiesJson.extractStoriesJson)(_path.default.join(options.outputDir, 'stories.json'), initializedStoryIndexGenerator));
+    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));
   }
 
   var core = await presets.apply('core');
@@ -182,7 +181,7 @@ async function buildStaticStandalone(options) {
       var storyIndex = await generator.getIndex();
       var payload = storyIndex ? {
         storyIndex: {
-          storyCount: Object.keys(storyIndex.stories).length,
+          storyCount: Object.keys(storyIndex.entries).length,
           version: storyIndex.v
         }
       } : undefined;
@@ -209,9 +208,8 @@ async function buildStaticStandalone(options) {
   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 ? (0, _cpy.default)('**', options.outputDir, {
-    cwd: prebuiltDir,
-    parents: true
+  var manager = prebuiltDir ? _fsExtra.default.copy(prebuiltDir, options.outputDir, {
+    dereference: true
   }).then(function () {}) : managerBuilder.build({
     startTime: startTime,
     options: fullOptions

package/dist/cjs/dev-server.js

@@ -121,7 +121,7 @@ async function storybookDevServer(options) {
       var storyIndex = await generator.getIndex();
       var payload = storyIndex ? {
         storyIndex: {
-          storyCount: Object.keys(storyIndex.stories).length,
+          storyCount: Object.keys(storyIndex.entries).length,
           version: storyIndex.v
         }
       } : undefined;

package/dist/cjs/utils/StoryIndexGenerator.js

@@ -11,10 +11,6 @@ require("core-js/modules/es.promise.js");
 
 require("core-js/modules/es.array.sort.js");
 
-require("core-js/modules/es.array.flat.js");
-
-require("core-js/modules/es.array.unscopables.flat.js");
-
 require("core-js/modules/es.array.flat-map.js");
 
 require("core-js/modules/es.array.unscopables.flat-map.js");
@@ -35,13 +31,9 @@ var _nodeLogger = require("@storybook/node-logger");
 
 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; }
+var _csf = require("@storybook/csf");
 
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -55,6 +47,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+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; }
+
+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;
+};
+
 class StoryIndexGenerator {
   // An internal cache mapping specifiers to a set of path=><set of stories>
   // Later, we'll combine each of these subsets together to form the full index
@@ -64,9 +66,9 @@ class StoryIndexGenerator {
   constructor(specifiers, options) {
     this.specifiers = specifiers;
     this.options = options;
-    this.storyIndexEntries = void 0;
+    this.specifierToCache = void 0;
     this.lastIndex = void 0;
-    this.storyIndexEntries = new Map();
+    this.specifierToCache = new Map();
   }
 
   async initialize() {
@@ -91,22 +93,157 @@ class StoryIndexGenerator {
         pathToSubIndex[absolutePath] = false;
       });
 
-      _this.storyIndexEntries.set(specifier, pathToSubIndex);
+      _this.specifierToCache.set(specifier, pathToSubIndex);
     })); // Extract stories for each file
 
     await this.ensureExtracted();
   }
+  /**
+   * Run the updater function over all the empty cache entries
+   */
 
-  async ensureExtracted() {
+
+  async updateExtracted(updater) {
     var _this2 = this;
 
-    return (await Promise.all(this.specifiers.map(async function (specifier) {
-      var entry = _this2.storyIndexEntries.get(specifier);
+    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) {
-        return entry[absolutePath] || _this2.extractStories(specifier, absolutePath);
+        entry[absolutePath] = entry[absolutePath] || (await updater(specifier, absolutePath));
       }));
-    }))).flat();
+    }));
+  }
+
+  isDocsMdx(absolutePath) {
+    return /(?<!\.stories)\.mdx$/i.test(absolutePath);
+  }
+
+  async ensureExtracted() {
+    var _this3 = this;
+
+    // First process all the story files. Then, in a second pass,
+    // process the docs files. The reason for this is that the docs
+    // files may use the `<Meta of={XStories} />` syntax, which requires
+    // that the story file that contains the meta be processed first.
+    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);
+    });
+    return this.specifiers.flatMap(function (specifier) {
+      var cache = _this3.specifierToCache.get(specifier);
+
+      return Object.values(cache).flatMap(function (entry) {
+        if (!entry) return [];
+        if (entry.type === 'docs') return [entry];
+        return entry.entries;
+      });
+    });
+  }
+
+  findDependencies(absoluteImports) {
+    var dependencies = [];
+    var foundImports = new Set();
+    this.specifierToCache.forEach(function (cache) {
+      var fileNames = Object.keys(cache).filter(function (fileName) {
+        var foundImport = absoluteImports.find(function (storyImport) {
+          return fileName.startsWith(storyImport);
+        });
+        if (foundImport) foundImports.add(foundImport);
+        return !!foundImport;
+      });
+      fileNames.forEach(function (fileName) {
+        var cacheEntry = cache[fileName];
+
+        if (cacheEntry && cacheEntry.type === 'stories') {
+          dependencies.push(cacheEntry);
+        } else {
+          throw new Error(`Unexpected dependency: ${cacheEntry}`);
+        }
+      });
+    }); // imports can include non-story imports, so it's ok if
+    // there are fewer foundImports than absoluteImports
+    // if (absoluteImports.length !== foundImports.size) {
+    //   throw new Error(`Missing dependencies: ${absoluteImports.filter((p) => !foundImports.has(p))}`));
+    // }
+
+    return dependencies;
+  }
+
+  async extractDocs(specifier, absolutePath) {
+    var _this4 = this;
+
+    var relativePath = _path.default.relative(this.options.workingDir, absolutePath);
+
+    try {
+      if (!this.options.storyStoreV7) {
+        throw new Error(`You cannot use \`.mdx\` files without using \`storyStoreV7\`.`);
+      }
+
+      var normalizedPath = (0, _coreCommon.normalizeStoryPath)(relativePath);
+      var importPath = (0, _slash.default)(normalizedPath); // This `await require(...)` is a bit of a hack. It's necessary because
+      // `docs-mdx` depends on ESM code, which must be asynchronously imported
+      // to be used in CJS. Unfortunately, we cannot use `import()` here, because
+      // it will be transpiled down to `require()` by Babel. So instead, we require
+      // a CJS export from `@storybook/docs-mdx` that does the `async import` for us.
+      // eslint-disable-next-line global-require
+
+      var _await$require = await require('@storybook/docs-mdx'),
+          analyze = _await$require.analyze;
+
+      var content = await _fsExtra.default.readFile(absolutePath, 'utf8'); // { title?, of?, imports? }
+
+      var result = analyze(content);
+      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.
+      // We'll use this to make sure this docs cache entry is invalidated when any of its dependents
+      // are invalidated.
+
+      var dependencies = this.findDependencies(absoluteImports); // Also, if `result.of` is set, it means that we're using the `<Meta of={XStories} />` syntax,
+      // so find the `title` defined the file that `meta` points to.
+
+      var ofTitle;
+
+      if (result.of) {
+        var absoluteOf = makeAbsolute(result.of, normalizedPath, this.options.workingDir);
+        dependencies.forEach(function (dep) {
+          if (dep.entries.length > 0) {
+            var first = dep.entries[0];
+
+            if (_path.default.resolve(_this4.options.workingDir, first.importPath).startsWith(absoluteOf)) {
+              ofTitle = first.title;
+            }
+          }
+        });
+        if (!ofTitle) throw new Error(`Could not find "${result.of}" for docs file "${relativePath}".`);
+      } // Track that we depend on this for easy invalidation later.
+
+
+      dependencies.forEach(function (dep) {
+        dep.dependents.push(absolutePath);
+      });
+      var title = (0, _store.userOrAutoTitleFromSpecifier)(importPath, specifier, result.title || ofTitle);
+      var name = 'docs';
+      var id = (0, _csf.toId)(title, name);
+      var docsEntry = {
+        id: id,
+        title: title,
+        name: name,
+        importPath: importPath,
+        storiesImports: dependencies.map(function (dep) {
+          return dep.entries[0].importPath;
+        }),
+        type: 'docs'
+      };
+      return docsEntry;
+    } catch (err) {
+      _nodeLogger.logger.warn(`🚨 Extraction error on ${relativePath}: ${err}`);
+
+      throw err;
+    }
   }
 
   async index(filePath, options) {
@@ -124,8 +261,7 @@ class StoryIndexGenerator {
   async extractStories(specifier, absolutePath) {
     var relativePath = _path.default.relative(this.options.workingDir, absolutePath);
 
-    var fileStories = {};
-    var entry = this.storyIndexEntries.get(specifier);
+    var entries = [];
 
     try {
       var importPath = (0, _slash.default)((0, _coreCommon.normalizeStoryPath)(relativePath));
@@ -139,14 +275,23 @@ class StoryIndexGenerator {
       });
       csf.stories.forEach(function ({
         id: id,
-        name: name
+        name: name,
+        parameters: parameters
       }) {
-        fileStories[id] = {
+        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') {
@@ -158,16 +303,19 @@ class StoryIndexGenerator {
       }
     }
 
-    entry[absolutePath] = fileStories;
-    return fileStories;
+    return {
+      entries: entries,
+      type: 'stories',
+      dependents: []
+    };
   }
 
   async sortStories(storiesList) {
-    var stories = {};
-    storiesList.forEach(function (subStories) {
-      Object.assign(stories, subStories);
+    var entries = {};
+    storiesList.forEach(function (entry) {
+      entries[entry.id] = entry;
     });
-    var sortableStories = Object.values(stories); // Skip sorting if we're in v6 mode because we don't have
+    var sortableStories = Object.values(entries); // Skip sorting if we're in v6 mode because we don't have
     // all the info we need here
 
     if (this.options.storyStoreV7) {
@@ -194,14 +342,15 @@ class StoryIndexGenerator {
       var titleToStoryCount = Object.values(sorted).reduce(function (acc, story) {
         acc[story.title] = (acc[story.title] || 0) + 1;
         return acc;
-      }, {});
+      }, {}); // @ts-ignore
+
       compat = Object.entries(sorted).reduce(function (acc, entry) {
         var _entry = _slicedToArray(entry, 2),
             id = _entry[0],
             story = _entry[1];
 
+        if (story.type === 'docs') return acc;
         acc[id] = _objectSpread(_objectSpread({}, story), {}, {
-          id: id,
           kind: story.title,
           story: story.name,
           parameters: {
@@ -215,30 +364,65 @@ class StoryIndexGenerator {
     }
 
     this.lastIndex = {
-      v: 3,
-      stories: compat
+      v: 4,
+      entries: compat
     };
     return this.lastIndex;
   }
 
   invalidate(specifier, importPath, removed) {
+    var _this5 = this;
+
     var absolutePath = (0, _slash.default)(_path.default.resolve(this.options.workingDir, importPath));
-    var pathToEntries = this.storyIndexEntries.get(specifier);
+    var cache = this.specifierToCache.get(specifier);
+    var cacheEntry = cache[absolutePath];
+
+    if (cacheEntry && cacheEntry.type === 'stories') {
+      var dependents = cacheEntry.dependents;
+      var invalidated = new Set(); // the dependent can be in ANY cache, so we loop over all of them
+
+      this.specifierToCache.forEach(function (otherCache) {
+        dependents.forEach(function (dep) {
+          if (otherCache[dep]) {
+            invalidated.add(dep); // eslint-disable-next-line no-param-reassign
+
+            otherCache[dep] = false;
+          }
+        });
+      });
+      var notFound = dependents.filter(function (dep) {
+        return !invalidated.has(dep);
+      });
+
+      if (notFound.length > 0) {
+        throw new Error(`Could not invalidate ${notFound.length} deps: ${notFound.join(', ')}`);
+      }
+    }
 
     if (removed) {
-      delete pathToEntries[absolutePath];
+      if (cacheEntry && cacheEntry.type === 'docs') {
+        var absoluteImports = cacheEntry.storiesImports.map(function (p) {
+          return _path.default.resolve(_this5.options.workingDir, p);
+        });
+        var dependencies = this.findDependencies(absoluteImports);
+        dependencies.forEach(function (dep) {
+          return dep.dependents.splice(dep.dependents.indexOf(absolutePath), 1);
+        });
+      }
+
+      delete cache[absolutePath];
     } else {
-      pathToEntries[absolutePath] = false;
+      cache[absolutePath] = false;
     }
 
     this.lastIndex = null;
   }
 
   async getStorySortParameter() {
-    var _this3 = this;
+    var _this6 = this;
 
     var previewFile = ['js', 'jsx', 'ts', 'tsx'].map(function (ext) {
-      return _path.default.join(_this3.options.configDir, `preview.${ext}`);
+      return _path.default.join(_this6.options.configDir, `preview.${ext}`);
     }).find(function (fname) {
       return _fsExtra.default.existsSync(fname);
     });
@@ -254,7 +438,7 @@ class StoryIndexGenerator {
 
 
   storyFileNames() {
-    return Array.from(this.storyIndexEntries.values()).flatMap(function (r) {
+    return Array.from(this.specifierToCache.values()).flatMap(function (r) {
       return Object.keys(r);
     });
   }

package/dist/cjs/utils/open-in-browser.js

@@ -19,7 +19,9 @@ var _tsDedent = _interopRequireDefault(require("ts-dedent"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// @ts-ignore
 // betterOpn alias used because also loading open
+// @ts-ignore
 function openInBrowser(address) {
   (0, _xDefaultBrowser.default)(async function (err, res) {
     try {

package/dist/cjs/utils/stories-json.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEBOUNCE = void 0;
+exports.convertToIndexV3 = exports.DEBOUNCE = void 0;
 exports.extractStoriesJson = extractStoriesJson;
 exports.useStoriesJson = useStoriesJson;
 
@@ -11,21 +11,33 @@ require("core-js/modules/es.promise.js");
 
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
-var _lodash = require("lodash");
+var _debounce = _interopRequireDefault(require("lodash/debounce"));
 
 var _coreEvents = require("@storybook/core-events");
 
 var _watchStorySpecifiers = require("./watch-story-specifiers");
 
+var _excluded = ["type"];
+
 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; }
+
+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 _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; }
+
 var DEBOUNCE = 100;
 exports.DEBOUNCE = DEBOUNCE;
 
-async function extractStoriesJson(outputFile, initializedStoryIndexGenerator) {
+async function extractStoriesJson(outputFile, initializedStoryIndexGenerator, transform) {
   var generator = await initializedStoryIndexGenerator;
   var storyIndex = await generator.getIndex();
-  await _fsExtra.default.writeJson(outputFile, storyIndex);
+  await _fsExtra.default.writeJson(outputFile, transform ? transform(storyIndex) : storyIndex);
 }
 
 function useStoriesJson({
@@ -35,7 +47,7 @@ function useStoriesJson({
   serverChannel: serverChannel,
   normalizedStories: normalizedStories
 }) {
-  var maybeInvalidate = (0, _lodash.debounce)(function () {
+  var maybeInvalidate = (0, _debounce.default)(function () {
     return serverChannel.emit(_coreEvents.STORY_INDEX_INVALIDATED);
   }, DEBOUNCE, {
     leading: true
@@ -47,15 +59,55 @@ function useStoriesJson({
     generator.invalidate(specifier, path, removed);
     maybeInvalidate();
   });
+  router.use('/index.json', async function (req, res) {
+    try {
+      var generator = await initializedStoryIndexGenerator;
+
+      var _index = await generator.getIndex();
+
+      res.header('Content-Type', 'application/json');
+      res.send(JSON.stringify(_index));
+    } catch (err) {
+      res.status(500);
+      res.send(err.message);
+    }
+  });
   router.use('/stories.json', async function (req, res) {
     try {
       var generator = await initializedStoryIndexGenerator;
-      var index = await generator.getIndex();
+
+      var _index2 = convertToIndexV3(await generator.getIndex());
+
       res.header('Content-Type', 'application/json');
-      res.send(JSON.stringify(index));
+      res.send(JSON.stringify(_index2));
     } catch (err) {
       res.status(500);
       res.send(err.message);
     }
   });
-}
+}
+
+var convertToIndexV3 = function (index) {
+  var entries = index.entries;
+  var stories = Object.entries(entries).reduce(function (acc, [id, entry]) {
+    var type = entry.type,
+        rest = _objectWithoutProperties(entry, _excluded);
+
+    acc[id] = _objectSpread(_objectSpread({}, rest), {}, {
+      kind: rest.title,
+      story: rest.name,
+      parameters: {
+        __id: rest.id,
+        docsOnly: type === 'docs',
+        fileName: rest.importPath
+      }
+    });
+    return acc;
+  }, {});
+  return {
+    v: 3,
+    stories: stories
+  };
+};
+
+exports.convertToIndexV3 = convertToIndexV3;

package/dist/cjs/utils/watch-story-specifiers.js

@@ -17,8 +17,11 @@ var _path = _interopRequireDefault(require("path"));
 
 var _globby = _interopRequireDefault(require("globby"));
 
+var _uniq = _interopRequireDefault(require("lodash/uniq"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// @ts-ignore
 var isDirectory = function (directory) {
   try {
     return _fs.default.lstatSync(directory).isDirectory();
@@ -43,9 +46,9 @@ function watchStorySpecifiers(specifiers, options, onInvalidate) {
     ignored: ['**/.git', 'node_modules']
   });
   wp.watch({
-    directories: specifiers.map(function (ns) {
+    directories: (0, _uniq.default)(specifiers.map(function (ns) {
       return ns.directory;
-    })
+    }))
   });
 
   async function onChangeOrRemove(watchpackPath, removed) {

package/dist/esm/build-static.js

@@ -19,7 +19,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import "core-js/modules/es.promise.js";
 import "core-js/modules/es.symbol.description.js";
 import chalk from 'chalk';
-import cpy from 'cpy';
 import fs from 'fs-extra';
 import path, { join } from 'path';
 import dedent from 'ts-dedent';
@@ -30,7 +29,7 @@ import { loadAllPresets, normalizeStories, logConfig, loadMainConfig } from '@st
 import { outputStats } from './utils/output-stats';
 import { copyAllStaticFiles, copyAllStaticFilesRelativeToMain } from './utils/copy-all-static-files';
 import { getBuilders } from './utils/get-builders';
-import { extractStoriesJson } from './utils/stories-json';
+import { extractStoriesJson, convertToIndexV3 } from './utils/stories-json';
 import { extractStorybookMetadata } from './utils/metadata';
 import { StoryIndexGenerator } from './utils/StoryIndexGenerator';
 export async function buildStaticStandalone(options) {
@@ -60,7 +59,7 @@ export async function buildStaticStandalone(options) {
   }
 
   await fs.emptyDir(options.outputDir);
-  await cpy(defaultFavIcon, options.outputDir);
+  await fs.copyFile(defaultFavIcon, path.join(options.outputDir, path.basename(defaultFavIcon)));
 
   var _await$import = await import('@storybook/manager-webpack5/prebuilt-manager'),
       getPrebuiltDir = _await$import.getPrebuiltDir;
@@ -135,7 +134,8 @@ export async function buildStaticStandalone(options) {
     initializedStoryIndexGenerator = generator.initialize().then(function () {
       return generator;
     });
-    extractTasks.push(extractStoriesJson(path.join(options.outputDir, 'stories.json'), initializedStoryIndexGenerator));
+    extractTasks.push(extractStoriesJson(path.join(options.outputDir, 'stories.json'), initializedStoryIndexGenerator, convertToIndexV3));
+    extractTasks.push(extractStoriesJson(path.join(options.outputDir, 'index.json'), initializedStoryIndexGenerator));
   }
 
   var core = await presets.apply('core');
@@ -149,7 +149,7 @@ export async function buildStaticStandalone(options) {
       var storyIndex = await generator.getIndex();
       var payload = storyIndex ? {
         storyIndex: {
-          storyCount: Object.keys(storyIndex.stories).length,
+          storyCount: Object.keys(storyIndex.entries).length,
           version: storyIndex.v
         }
       } : undefined;
@@ -176,9 +176,8 @@ export async function buildStaticStandalone(options) {
   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 ? cpy('**', options.outputDir, {
-    cwd: prebuiltDir,
-    parents: true
+  var manager = prebuiltDir ? fs.copy(prebuiltDir, options.outputDir, {
+    dereference: true
   }).then(function () {}) : managerBuilder.build({
     startTime: startTime,
     options: fullOptions

package/dist/esm/dev-server.js

@@ -88,7 +88,7 @@ export async function storybookDevServer(options) {
       var storyIndex = await generator.getIndex();
       var payload = storyIndex ? {
         storyIndex: {
-          storyCount: Object.keys(storyIndex.stories).length,
+          storyCount: Object.keys(storyIndex.entries).length,
           version: storyIndex.v
         }
       } : undefined;

package/dist/esm/index.js

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/triple-slash-reference
+/// <reference path="./typings.d.ts" />
 import { getPreviewHeadTemplate, getManagerHeadTemplate, getManagerMainTemplate, getPreviewBodyTemplate, getPreviewMainTemplate } from '@storybook/core-common';
 export { getPreviewHeadTemplate, getManagerHeadTemplate, getManagerMainTemplate, getPreviewBodyTemplate, getPreviewMainTemplate };
 export * from './build-static';

package/dist/esm/utils/StoryIndexGenerator.js

@@ -1,9 +1,3 @@
-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 _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."); }
@@ -16,10 +10,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+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; }
+
 import "core-js/modules/es.promise.js";
 import "core-js/modules/es.array.sort.js";
-import "core-js/modules/es.array.flat.js";
-import "core-js/modules/es.array.unscopables.flat.js";
 import "core-js/modules/es.array.flat-map.js";
 import "core-js/modules/es.array.unscopables.flat-map.js";
 import "core-js/modules/es.symbol.description.js";
@@ -31,6 +29,12 @@ import { userOrAutoTitleFromSpecifier, sortStoriesV7 } from '@storybook/store';
 import { normalizeStoryPath } from '@storybook/core-common';
 import { logger } from '@storybook/node-logger';
 import { getStorySortParameter } from '@storybook/csf-tools';
+import { toId } from '@storybook/csf';
+
+var makeAbsolute = function (otherImport, normalizedPath, workingDir) {
+  return otherImport.startsWith('.') ? slash(path.resolve(workingDir, normalizeStoryPath(path.join(path.dirname(normalizedPath), otherImport)))) : otherImport;
+};
+
 export class StoryIndexGenerator {
   // An internal cache mapping specifiers to a set of path=><set of stories>
   // Later, we'll combine each of these subsets together to form the full index
@@ -40,9 +44,9 @@ export class StoryIndexGenerator {
   constructor(specifiers, options) {
     this.specifiers = specifiers;
     this.options = options;
-    this.storyIndexEntries = void 0;
+    this.specifierToCache = void 0;
     this.lastIndex = void 0;
-    this.storyIndexEntries = new Map();
+    this.specifierToCache = new Map();
   }
 
   async initialize() {
@@ -65,22 +69,156 @@ export class StoryIndexGenerator {
         pathToSubIndex[absolutePath] = false;
       });
 
-      _this.storyIndexEntries.set(specifier, pathToSubIndex);
+      _this.specifierToCache.set(specifier, pathToSubIndex);
     })); // Extract stories for each file
 
     await this.ensureExtracted();
   }
+  /**
+   * Run the updater function over all the empty cache entries
+   */
 
-  async ensureExtracted() {
+
+  async updateExtracted(updater) {
     var _this2 = this;
 
-    return (await Promise.all(this.specifiers.map(async function (specifier) {
-      var entry = _this2.storyIndexEntries.get(specifier);
+    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) {
-        return entry[absolutePath] || _this2.extractStories(specifier, absolutePath);
+        entry[absolutePath] = entry[absolutePath] || (await updater(specifier, absolutePath));
       }));
-    }))).flat();
+    }));
+  }
+
+  isDocsMdx(absolutePath) {
+    return /(?<!\.stories)\.mdx$/i.test(absolutePath);
+  }
+
+  async ensureExtracted() {
+    var _this3 = this;
+
+    // First process all the story files. Then, in a second pass,
+    // process the docs files. The reason for this is that the docs
+    // files may use the `<Meta of={XStories} />` syntax, which requires
+    // that the story file that contains the meta be processed first.
+    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);
+    });
+    return this.specifiers.flatMap(function (specifier) {
+      var cache = _this3.specifierToCache.get(specifier);
+
+      return Object.values(cache).flatMap(function (entry) {
+        if (!entry) return [];
+        if (entry.type === 'docs') return [entry];
+        return entry.entries;
+      });
+    });
+  }
+
+  findDependencies(absoluteImports) {
+    var dependencies = [];
+    var foundImports = new Set();
+    this.specifierToCache.forEach(function (cache) {
+      var fileNames = Object.keys(cache).filter(function (fileName) {
+        var foundImport = absoluteImports.find(function (storyImport) {
+          return fileName.startsWith(storyImport);
+        });
+        if (foundImport) foundImports.add(foundImport);
+        return !!foundImport;
+      });
+      fileNames.forEach(function (fileName) {
+        var cacheEntry = cache[fileName];
+
+        if (cacheEntry && cacheEntry.type === 'stories') {
+          dependencies.push(cacheEntry);
+        } else {
+          throw new Error(`Unexpected dependency: ${cacheEntry}`);
+        }
+      });
+    }); // imports can include non-story imports, so it's ok if
+    // there are fewer foundImports than absoluteImports
+    // if (absoluteImports.length !== foundImports.size) {
+    //   throw new Error(`Missing dependencies: ${absoluteImports.filter((p) => !foundImports.has(p))}`));
+    // }
+
+    return dependencies;
+  }
+
+  async extractDocs(specifier, absolutePath) {
+    var _this4 = this;
+
+    var relativePath = path.relative(this.options.workingDir, absolutePath);
+
+    try {
+      if (!this.options.storyStoreV7) {
+        throw new Error(`You cannot use \`.mdx\` files without using \`storyStoreV7\`.`);
+      }
+
+      var normalizedPath = normalizeStoryPath(relativePath);
+      var importPath = slash(normalizedPath); // This `await require(...)` is a bit of a hack. It's necessary because
+      // `docs-mdx` depends on ESM code, which must be asynchronously imported
+      // to be used in CJS. Unfortunately, we cannot use `import()` here, because
+      // it will be transpiled down to `require()` by Babel. So instead, we require
+      // a CJS export from `@storybook/docs-mdx` that does the `async import` for us.
+      // eslint-disable-next-line global-require
+
+      var _await$require = await require('@storybook/docs-mdx'),
+          analyze = _await$require.analyze;
+
+      var content = await fs.readFile(absolutePath, 'utf8'); // { title?, of?, imports? }
+
+      var result = analyze(content);
+      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.
+      // We'll use this to make sure this docs cache entry is invalidated when any of its dependents
+      // are invalidated.
+
+      var dependencies = this.findDependencies(absoluteImports); // Also, if `result.of` is set, it means that we're using the `<Meta of={XStories} />` syntax,
+      // so find the `title` defined the file that `meta` points to.
+
+      var ofTitle;
+
+      if (result.of) {
+        var absoluteOf = makeAbsolute(result.of, normalizedPath, this.options.workingDir);
+        dependencies.forEach(function (dep) {
+          if (dep.entries.length > 0) {
+            var first = dep.entries[0];
+
+            if (path.resolve(_this4.options.workingDir, first.importPath).startsWith(absoluteOf)) {
+              ofTitle = first.title;
+            }
+          }
+        });
+        if (!ofTitle) throw new Error(`Could not find "${result.of}" for docs file "${relativePath}".`);
+      } // Track that we depend on this for easy invalidation later.
+
+
+      dependencies.forEach(function (dep) {
+        dep.dependents.push(absolutePath);
+      });
+      var title = userOrAutoTitleFromSpecifier(importPath, specifier, result.title || ofTitle);
+      var name = 'docs';
+      var id = toId(title, name);
+      var docsEntry = {
+        id: id,
+        title: title,
+        name: name,
+        importPath: importPath,
+        storiesImports: dependencies.map(function (dep) {
+          return dep.entries[0].importPath;
+        }),
+        type: 'docs'
+      };
+      return docsEntry;
+    } catch (err) {
+      logger.warn(`🚨 Extraction error on ${relativePath}: ${err}`);
+      throw err;
+    }
   }
 
   async index(filePath, options) {
@@ -97,8 +235,7 @@ export class StoryIndexGenerator {
 
   async extractStories(specifier, absolutePath) {
     var relativePath = path.relative(this.options.workingDir, absolutePath);
-    var fileStories = {};
-    var entry = this.storyIndexEntries.get(specifier);
+    var entries = [];
 
     try {
       var importPath = slash(normalizeStoryPath(relativePath));
@@ -112,14 +249,23 @@ export class StoryIndexGenerator {
       });
       csf.stories.forEach(function ({
         id: id,
-        name: name
+        name: name,
+        parameters: parameters
       }) {
-        fileStories[id] = {
+        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') {
@@ -130,16 +276,19 @@ export class StoryIndexGenerator {
       }
     }
 
-    entry[absolutePath] = fileStories;
-    return fileStories;
+    return {
+      entries: entries,
+      type: 'stories',
+      dependents: []
+    };
   }
 
   async sortStories(storiesList) {
-    var stories = {};
-    storiesList.forEach(function (subStories) {
-      Object.assign(stories, subStories);
+    var entries = {};
+    storiesList.forEach(function (entry) {
+      entries[entry.id] = entry;
     });
-    var sortableStories = Object.values(stories); // Skip sorting if we're in v6 mode because we don't have
+    var sortableStories = Object.values(entries); // Skip sorting if we're in v6 mode because we don't have
     // all the info we need here
 
     if (this.options.storyStoreV7) {
@@ -166,14 +315,15 @@ export class StoryIndexGenerator {
       var titleToStoryCount = Object.values(sorted).reduce(function (acc, story) {
         acc[story.title] = (acc[story.title] || 0) + 1;
         return acc;
-      }, {});
+      }, {}); // @ts-ignore
+
       compat = Object.entries(sorted).reduce(function (acc, entry) {
         var _entry = _slicedToArray(entry, 2),
             id = _entry[0],
             story = _entry[1];
 
+        if (story.type === 'docs') return acc;
         acc[id] = _objectSpread(_objectSpread({}, story), {}, {
-          id: id,
           kind: story.title,
           story: story.name,
           parameters: {
@@ -187,30 +337,65 @@ export class StoryIndexGenerator {
     }
 
     this.lastIndex = {
-      v: 3,
-      stories: compat
+      v: 4,
+      entries: compat
     };
     return this.lastIndex;
   }
 
   invalidate(specifier, importPath, removed) {
+    var _this5 = this;
+
     var absolutePath = slash(path.resolve(this.options.workingDir, importPath));
-    var pathToEntries = this.storyIndexEntries.get(specifier);
+    var cache = this.specifierToCache.get(specifier);
+    var cacheEntry = cache[absolutePath];
+
+    if (cacheEntry && cacheEntry.type === 'stories') {
+      var dependents = cacheEntry.dependents;
+      var invalidated = new Set(); // the dependent can be in ANY cache, so we loop over all of them
+
+      this.specifierToCache.forEach(function (otherCache) {
+        dependents.forEach(function (dep) {
+          if (otherCache[dep]) {
+            invalidated.add(dep); // eslint-disable-next-line no-param-reassign
+
+            otherCache[dep] = false;
+          }
+        });
+      });
+      var notFound = dependents.filter(function (dep) {
+        return !invalidated.has(dep);
+      });
+
+      if (notFound.length > 0) {
+        throw new Error(`Could not invalidate ${notFound.length} deps: ${notFound.join(', ')}`);
+      }
+    }
 
     if (removed) {
-      delete pathToEntries[absolutePath];
+      if (cacheEntry && cacheEntry.type === 'docs') {
+        var absoluteImports = cacheEntry.storiesImports.map(function (p) {
+          return path.resolve(_this5.options.workingDir, p);
+        });
+        var dependencies = this.findDependencies(absoluteImports);
+        dependencies.forEach(function (dep) {
+          return dep.dependents.splice(dep.dependents.indexOf(absolutePath), 1);
+        });
+      }
+
+      delete cache[absolutePath];
     } else {
-      pathToEntries[absolutePath] = false;
+      cache[absolutePath] = false;
     }
 
     this.lastIndex = null;
   }
 
   async getStorySortParameter() {
-    var _this3 = this;
+    var _this6 = this;
 
     var previewFile = ['js', 'jsx', 'ts', 'tsx'].map(function (ext) {
-      return path.join(_this3.options.configDir, `preview.${ext}`);
+      return path.join(_this6.options.configDir, `preview.${ext}`);
     }).find(function (fname) {
       return fs.existsSync(fname);
     });
@@ -226,7 +411,7 @@ export class StoryIndexGenerator {
 
 
   storyFileNames() {
-    return Array.from(this.storyIndexEntries.values()).flatMap(function (r) {
+    return Array.from(this.specifierToCache.values()).flatMap(function (r) {
       return Object.keys(r);
     });
   }

package/dist/esm/utils/open-in-browser.js

@@ -1,8 +1,10 @@
 import "core-js/modules/es.promise.js";
-import { logger } from '@storybook/node-logger';
+import { logger } from '@storybook/node-logger'; // @ts-ignore
+
 import betterOpn from 'better-opn'; // betterOpn alias used because also loading open
 
-import open from 'open';
+import open from 'open'; // @ts-ignore
+
 import getDefaultBrowser from 'x-default-browser';
 import dedent from 'ts-dedent';
 export function openInBrowser(address) {

package/dist/esm/utils/stories-json.js

@@ -1,13 +1,25 @@
+var _excluded = ["type"];
+
+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 _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; }
+
 import "core-js/modules/es.promise.js";
 import fs from 'fs-extra';
-import { debounce } from 'lodash';
+import debounce from 'lodash/debounce';
 import { STORY_INDEX_INVALIDATED } from '@storybook/core-events';
 import { watchStorySpecifiers } from './watch-story-specifiers';
 export var DEBOUNCE = 100;
-export async function extractStoriesJson(outputFile, initializedStoryIndexGenerator) {
+export async function extractStoriesJson(outputFile, initializedStoryIndexGenerator, transform) {
   var generator = await initializedStoryIndexGenerator;
   var storyIndex = await generator.getIndex();
-  await fs.writeJson(outputFile, storyIndex);
+  await fs.writeJson(outputFile, transform ? transform(storyIndex) : storyIndex);
 }
 export function useStoriesJson({
   router: router,
@@ -28,15 +40,52 @@ export function useStoriesJson({
     generator.invalidate(specifier, path, removed);
     maybeInvalidate();
   });
+  router.use('/index.json', async function (req, res) {
+    try {
+      var generator = await initializedStoryIndexGenerator;
+
+      var _index = await generator.getIndex();
+
+      res.header('Content-Type', 'application/json');
+      res.send(JSON.stringify(_index));
+    } catch (err) {
+      res.status(500);
+      res.send(err.message);
+    }
+  });
   router.use('/stories.json', async function (req, res) {
     try {
       var generator = await initializedStoryIndexGenerator;
-      var index = await generator.getIndex();
+
+      var _index2 = convertToIndexV3(await generator.getIndex());
+
       res.header('Content-Type', 'application/json');
-      res.send(JSON.stringify(index));
+      res.send(JSON.stringify(_index2));
     } catch (err) {
       res.status(500);
       res.send(err.message);
     }
   });
-}
+}
+export var convertToIndexV3 = function (index) {
+  var entries = index.entries;
+  var stories = Object.entries(entries).reduce(function (acc, [id, entry]) {
+    var type = entry.type,
+        rest = _objectWithoutProperties(entry, _excluded);
+
+    acc[id] = _objectSpread(_objectSpread({}, rest), {}, {
+      kind: rest.title,
+      story: rest.name,
+      parameters: {
+        __id: rest.id,
+        docsOnly: type === 'docs',
+        fileName: rest.importPath
+      }
+    });
+    return acc;
+  }, {});
+  return {
+    v: 3,
+    stories: stories
+  };
+};

package/dist/esm/utils/watch-story-specifiers.js

@@ -1,9 +1,11 @@
 import "core-js/modules/es.promise.js";
+// @ts-ignore
 import Watchpack from 'watchpack';
 import slash from 'slash';
 import fs from 'fs';
 import path from 'path';
 import glob from 'globby';
+import uniq from 'lodash/uniq';
 
 var isDirectory = function (directory) {
   try {
@@ -29,9 +31,9 @@ export function watchStorySpecifiers(specifiers, options, onInvalidate) {
     ignored: ['**/.git', 'node_modules']
   });
   wp.watch({
-    directories: specifiers.map(function (ns) {
+    directories: uniq(specifiers.map(function (ns) {
       return ns.directory;
-    })
+    }))
   });
 
   async function onChangeOrRemove(watchpackPath, removed) {

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference path="../../src/typings.d.ts" />
 import { getPreviewHeadTemplate, getManagerHeadTemplate, getManagerMainTemplate, getPreviewBodyTemplate, getPreviewMainTemplate } from '@storybook/core-common';
 export { getPreviewHeadTemplate, getManagerHeadTemplate, getManagerMainTemplate, getPreviewBodyTemplate, getPreviewMainTemplate, };
 export * from './build-static';

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

@@ -1,5 +1,12 @@
-import type { Path, StoryIndex } from '@storybook/store';
+import type { Path, StoryIndex, IndexEntry, DocsIndexEntry } from '@storybook/store';
 import type { StoryIndexer, IndexerOptions, NormalizedStoriesSpecifier } from '@storybook/core-common';
+declare type DocsCacheEntry = DocsIndexEntry;
+declare type StoriesCacheEntry = {
+    entries: IndexEntry[];
+    dependents: Path[];
+    type: 'stories';
+};
+declare type CacheEntry = false | StoriesCacheEntry | DocsCacheEntry;
 export declare class StoryIndexGenerator {
     readonly specifiers: NormalizedStoriesSpecifier[];
     readonly options: {
@@ -9,7 +16,7 @@ export declare class StoryIndexGenerator {
         storyStoreV7: boolean;
         storyIndexers: StoryIndexer[];
     };
-    private storyIndexEntries;
+    private specifierToCache;
     private lastIndex?;
     constructor(specifiers: NormalizedStoriesSpecifier[], options: {
         workingDir: Path;
@@ -19,12 +26,20 @@ export declare class StoryIndexGenerator {
         storyIndexers: StoryIndexer[];
     });
     initialize(): Promise<void>;
-    ensureExtracted(): Promise<StoryIndex['stories'][]>;
+    /**
+     * Run the updater function over all the empty cache entries
+     */
+    updateExtracted(updater: (specifier: NormalizedStoriesSpecifier, absolutePath: Path) => Promise<CacheEntry>): 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<Record<string, import("@storybook/store").StoryIndexEntry>>;
-    sortStories(storiesList: StoryIndex['stories'][]): Promise<Record<string, import("@storybook/store").StoryIndexEntry>>;
+    extractStories(specifier: NormalizedStoriesSpecifier, absolutePath: Path): Promise<StoriesCacheEntry>;
+    sortStories(storiesList: IndexEntry[]): Promise<Record<string, IndexEntry>>;
     getIndex(): Promise<StoryIndex>;
     invalidate(specifier: NormalizedStoriesSpecifier, importPath: Path, removed: boolean): void;
     getStorySortParameter(): Promise<any>;
     storyFileNames(): string[];
 }
+export {};

package/dist/types/utils/stories-json.d.ts

@@ -1,9 +1,10 @@
 import { Router } from 'express';
 import type { NormalizedStoriesSpecifier } from '@storybook/core-common';
+import type { StoryIndex, StoryIndexV3 } from '@storybook/store';
 import { StoryIndexGenerator } from './StoryIndexGenerator';
 import { ServerChannel } from './get-server-channel';
 export declare const DEBOUNCE = 100;
-export declare function extractStoriesJson(outputFile: string, initializedStoryIndexGenerator: Promise<StoryIndexGenerator>): Promise<void>;
+export declare function extractStoriesJson(outputFile: string, initializedStoryIndexGenerator: Promise<StoryIndexGenerator>, transform?: (index: StoryIndex) => any): Promise<void>;
 export declare function useStoriesJson({ router, initializedStoryIndexGenerator, workingDir, serverChannel, normalizedStories, }: {
     router: Router;
     initializedStoryIndexGenerator: Promise<StoryIndexGenerator>;
@@ -11,3 +12,4 @@ export declare function useStoriesJson({ router, initializedStoryIndexGenerator,
     workingDir?: string;
     normalizedStories: NormalizedStoriesSpecifier[];
 }): void;
+export declare const convertToIndexV3: (index: StoryIndex) => StoryIndexV3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-server",
-  "version": "7.0.0-alpha.4",
+  "version": "7.0.0-alpha.7",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -33,16 +33,17 @@
   },
   "dependencies": {
     "@discoveryjs/json-ext": "^0.5.3",
-    "@storybook/core-client": "7.0.0-alpha.4",
-    "@storybook/core-common": "7.0.0-alpha.4",
-    "@storybook/core-events": "7.0.0-alpha.4",
+    "@storybook/core-client": "7.0.0-alpha.7",
+    "@storybook/core-common": "7.0.0-alpha.7",
+    "@storybook/core-events": "7.0.0-alpha.7",
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
-    "@storybook/csf-tools": "7.0.0-alpha.4",
-    "@storybook/manager-webpack5": "7.0.0-alpha.4",
-    "@storybook/node-logger": "7.0.0-alpha.4",
+    "@storybook/csf-tools": "7.0.0-alpha.7",
+    "@storybook/docs-mdx": "0.0.1-canary.1.4bea5cc.0",
+    "@storybook/manager-webpack5": "7.0.0-alpha.7",
+    "@storybook/node-logger": "7.0.0-alpha.7",
     "@storybook/semver": "^7.3.2",
-    "@storybook/store": "7.0.0-alpha.4",
-    "@storybook/telemetry": "7.0.0-alpha.4",
+    "@storybook/store": "7.0.0-alpha.7",
+    "@storybook/telemetry": "7.0.0-alpha.7",
     "@types/node": "^14.0.10 || ^16.0.0",
     "@types/node-fetch": "^2.5.7",
     "@types/pretty-hrtime": "^1.0.0",
@@ -53,7 +54,6 @@
     "commander": "^6.2.1",
     "compression": "^1.7.4",
     "core-js": "^3.8.2",
-    "cpy": "^8.1.2",
     "detect-port": "^1.3.0",
     "express": "^4.17.1",
     "fs-extra": "^9.0.1",
@@ -77,7 +77,7 @@
     "x-default-browser": "^0.4.0"
   },
   "devDependencies": {
-    "@storybook/builder-webpack5": "7.0.0-alpha.4",
+    "@storybook/builder-webpack5": "7.0.0-alpha.7",
     "@types/compression": "^1.7.0",
     "@types/ip": "^1.1.0",
     "@types/serve-favicon": "^2.5.2",
@@ -102,5 +102,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00"
+  "gitHead": "d334cabd251cd0ed8b845a87707dc84f007d4074"
 }

package/typings.d.ts

@@ -1,13 +0,0 @@
-declare module 'global';
-declare module '@storybook/semver';
-declare module 'lazy-universal-dotenv';
-declare module 'pnp-webpack-plugin';
-declare module '@storybook/theming/paths';
-declare module '@storybook/ui/paths';
-declare module 'better-opn';
-declare module 'open';
-declare module 'x-default-browser';
-declare module '@storybook/ui';
-declare module '@discoveryjs/json-ext';
-declare module 'watchpack';
-