@storybook/addon-docs 6.5.9 → 7.0.0-alpha.2

package/dist/esm/preset.js

@@ -1,197 +1,132 @@
-import "regenerator-runtime/runtime.js";
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-import "core-js/modules/es.array.concat.js";
-import "core-js/modules/es.object.assign.js";
-import "core-js/modules/es.array.filter.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.regexp.to-string.js";
-import "core-js/modules/es.regexp.constructor.js";
-import "core-js/modules/es.symbol.js";
-import "core-js/modules/es.symbol.description.js";
-import "core-js/modules/es.symbol.iterator.js";
-import "core-js/modules/es.array.iterator.js";
-import "core-js/modules/es.string.iterator.js";
-import "core-js/modules/web.dom-collections.iterator.js";
-import "core-js/modules/es.array.from.js";
-import "core-js/modules/es.array.slice.js";
-import "core-js/modules/es.function.name.js";
-import "core-js/modules/es.promise.js";
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-import path from 'path';
+import fs from 'fs-extra';
 import remarkSlug from 'remark-slug';
 import remarkExternalLinks from 'remark-external-links';
 import global from 'global';
-import { logger } from '@storybook/node-logger'; // for frameworks that are not working with react, we need to configure
+import { logger } from '@storybook/node-logger';
+import { loadCsf } from '@storybook/csf-tools'; // for frameworks that are not working with react, we need to configure
 // the jsx to transpile mdx, for now there will be a flag for that
 // for more complex solutions we can find alone that we need to add '@babel/plugin-transform-react-jsx'
 
-function createBabelOptions(_ref) {
-  var babelOptions = _ref.babelOptions,
-      mdxBabelOptions = _ref.mdxBabelOptions,
-      configureJSX = _ref.configureJSX;
-  var babelPlugins = (mdxBabelOptions === null || mdxBabelOptions === void 0 ? void 0 : mdxBabelOptions.plugins) || (babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.plugins) || [];
-  var jsxPlugin = [require.resolve('@babel/plugin-transform-react-jsx'), {
+function createBabelOptions({
+  babelOptions,
+  mdxBabelOptions,
+  configureJSX
+}) {
+  const babelPlugins = mdxBabelOptions?.plugins || babelOptions?.plugins || [];
+  const jsxPlugin = [require.resolve('@babel/plugin-transform-react-jsx'), {
     pragma: 'React.createElement',
     pragmaFrag: 'React.Fragment'
   }];
-  var plugins = configureJSX ? [].concat(_toConsumableArray(babelPlugins), [jsxPlugin]) : babelPlugins;
+  const plugins = configureJSX ? [...babelPlugins, jsxPlugin] : babelPlugins;
   return Object.assign({
     // don't use the root babelrc by default (users can override this in mdxBabelOptions)
     babelrc: false,
     configFile: false
   }, babelOptions, mdxBabelOptions, {
-    plugins: plugins
+    plugins
   });
 }
 
-export function webpack() {
-  return _webpack.apply(this, arguments);
+export async function webpack(webpackConfig = {}, options) {
+  const resolvedBabelLoader = require.resolve('babel-loader');
+
+  const {
+    module = {}
+  } = webpackConfig; // it will reuse babel options that are already in use in storybook
+  // also, these babel options are chained with other presets.
+
+  const {
+    babelOptions,
+    mdxBabelOptions,
+    configureJSX = true,
+    sourceLoaderOptions = {
+      injectStoryParameters: true
+    },
+    transcludeMarkdown = false
+  } = options;
+  const mdxLoaderOptions = {
+    skipCsf: true,
+    remarkPlugins: [remarkSlug, remarkExternalLinks]
+  };
+  const mdxVersion = global.FEATURES?.previewMdx2 ? 'MDX2' : 'MDX1';
+  logger.info(`Addon-docs: using ${mdxVersion}`);
+  const mdxLoader = global.FEATURES?.previewMdx2 ? require.resolve('@storybook/mdx2-csf/loader') : require.resolve('@storybook/mdx1-csf/loader'); // set `sourceLoaderOptions` to `null` to disable for manual configuration
+
+  const sourceLoader = sourceLoaderOptions ? [{
+    test: /\.(stories|story)\.[tj]sx?$/,
+    loader: require.resolve('@storybook/source-loader'),
+    options: Object.assign({}, sourceLoaderOptions, {
+      inspectLocalDependencies: true
+    }),
+    enforce: 'pre'
+  }] : [];
+  let rules = module.rules || [];
+
+  if (transcludeMarkdown) {
+    rules = [...rules.filter(rule => rule.test?.toString() !== '/\\.md$/'), {
+      test: /\.md$/,
+      use: [{
+        loader: resolvedBabelLoader,
+        options: createBabelOptions({
+          babelOptions,
+          mdxBabelOptions,
+          configureJSX
+        })
+      }, {
+        loader: mdxLoader,
+        options: mdxLoaderOptions
+      }]
+    }];
+  }
+
+  const result = Object.assign({}, webpackConfig, {
+    module: Object.assign({}, module, {
+      rules: [...rules, {
+        test: /(stories|story)\.mdx$/,
+        use: [{
+          loader: resolvedBabelLoader,
+          options: createBabelOptions({
+            babelOptions,
+            mdxBabelOptions,
+            configureJSX
+          })
+        }, {
+          loader: mdxLoader
+        }]
+      }, {
+        test: /\.mdx$/,
+        exclude: /(stories|story)\.mdx$/,
+        use: [{
+          loader: resolvedBabelLoader,
+          options: createBabelOptions({
+            babelOptions,
+            mdxBabelOptions,
+            configureJSX
+          })
+        }, {
+          loader: mdxLoader,
+          options: mdxLoaderOptions
+        }]
+      }, ...sourceLoader]
+    })
+  });
+  return result;
 }
-
-function _webpack() {
-  _webpack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var _global$FEATURES, _global$FEATURES2;
-
-    var webpackConfig,
-        options,
-        resolvedBabelLoader,
-        _webpackConfig$module,
-        module,
-        babelOptions,
-        mdxBabelOptions,
-        _options$configureJSX,
-        configureJSX,
-        _options$sourceLoader,
-        sourceLoaderOptions,
-        _options$transcludeMa,
-        transcludeMarkdown,
-        mdxLoaderOptions,
-        mdxVersion,
-        mdxLoader,
-        sourceLoader,
-        rules,
-        result,
-        _args = arguments;
-
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            webpackConfig = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            options = _args.length > 1 ? _args[1] : undefined;
-            resolvedBabelLoader = require.resolve('babel-loader');
-            _webpackConfig$module = webpackConfig.module, module = _webpackConfig$module === void 0 ? {} : _webpackConfig$module; // it will reuse babel options that are already in use in storybook
-            // also, these babel options are chained with other presets.
-
-            babelOptions = options.babelOptions, mdxBabelOptions = options.mdxBabelOptions, _options$configureJSX = options.configureJSX, configureJSX = _options$configureJSX === void 0 ? true : _options$configureJSX, _options$sourceLoader = options.sourceLoaderOptions, sourceLoaderOptions = _options$sourceLoader === void 0 ? {
-              injectStoryParameters: true
-            } : _options$sourceLoader, _options$transcludeMa = options.transcludeMarkdown, transcludeMarkdown = _options$transcludeMa === void 0 ? false : _options$transcludeMa;
-            mdxLoaderOptions = {
-              skipCsf: true,
-              remarkPlugins: [remarkSlug, remarkExternalLinks]
-            };
-            mdxVersion = (_global$FEATURES = global.FEATURES) !== null && _global$FEATURES !== void 0 && _global$FEATURES.previewMdx2 ? 'MDX2' : 'MDX1';
-            logger.info("Addon-docs: using ".concat(mdxVersion));
-            mdxLoader = (_global$FEATURES2 = global.FEATURES) !== null && _global$FEATURES2 !== void 0 && _global$FEATURES2.previewMdx2 ? require.resolve('@storybook/mdx2-csf/loader') : require.resolve('@storybook/mdx1-csf/loader'); // set `sourceLoaderOptions` to `null` to disable for manual configuration
-
-            sourceLoader = sourceLoaderOptions ? [{
-              test: /\.(stories|story)\.[tj]sx?$/,
-              loader: require.resolve('@storybook/source-loader'),
-              options: Object.assign({}, sourceLoaderOptions, {
-                inspectLocalDependencies: true
-              }),
-              enforce: 'pre'
-            }] : [];
-            rules = module.rules || [];
-
-            if (transcludeMarkdown) {
-              rules = [].concat(_toConsumableArray(rules.filter(function (rule) {
-                var _rule$test;
-
-                return ((_rule$test = rule.test) === null || _rule$test === void 0 ? void 0 : _rule$test.toString()) !== '/\\.md$/';
-              })), [{
-                test: /\.md$/,
-                use: [{
-                  loader: resolvedBabelLoader,
-                  options: createBabelOptions({
-                    babelOptions: babelOptions,
-                    mdxBabelOptions: mdxBabelOptions,
-                    configureJSX: configureJSX
-                  })
-                }, {
-                  loader: mdxLoader,
-                  options: mdxLoaderOptions
-                }]
-              }]);
-            }
-
-            result = Object.assign({}, webpackConfig, {
-              module: Object.assign({}, module, {
-                rules: [].concat(_toConsumableArray(rules), [{
-                  test: /\.js$/,
-                  include: new RegExp("node_modules\\".concat(path.sep, "acorn-jsx")),
-                  use: [{
-                    loader: resolvedBabelLoader,
-                    options: {
-                      presets: [[require.resolve('@babel/preset-env'), {
-                        modules: 'commonjs'
-                      }]]
-                    }
-                  }]
-                }, {
-                  test: /(stories|story)\.mdx$/,
-                  use: [{
-                    loader: resolvedBabelLoader,
-                    options: createBabelOptions({
-                      babelOptions: babelOptions,
-                      mdxBabelOptions: mdxBabelOptions,
-                      configureJSX: configureJSX
-                    })
-                  }, {
-                    loader: mdxLoader
-                  }]
-                }, {
-                  test: /\.mdx$/,
-                  exclude: /(stories|story)\.mdx$/,
-                  use: [{
-                    loader: resolvedBabelLoader,
-                    options: createBabelOptions({
-                      babelOptions: babelOptions,
-                      mdxBabelOptions: mdxBabelOptions,
-                      configureJSX: configureJSX
-                    })
-                  }, {
-                    loader: mdxLoader,
-                    options: mdxLoaderOptions
-                  }]
-                }], sourceLoader)
-              })
-            });
-            return _context.abrupt("return", result);
-
-          case 14:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _webpack.apply(this, arguments);
-}
+export const storyIndexers = async indexers => {
+  const mdxIndexer = async (fileName, opts) => {
+    let code = (await fs.readFile(fileName, 'utf-8')).toString(); // @ts-ignore
+
+    const {
+      compile
+    } = global.FEATURES?.previewMdx2 ? await import('@storybook/mdx2-csf') : await import('@storybook/mdx1-csf');
+    code = await compile(code, {});
+    return loadCsf(code, Object.assign({}, opts, {
+      fileName
+    })).parse();
+  };
+
+  return [{
+    test: /(stories|story)\.mdx$/,
+    indexer: mdxIndexer
+  }, ...(indexers || [])];
+};

package/dist/esm/preview.js

@@ -1,64 +1,6 @@
-import "regenerator-runtime/runtime.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-export var parameters = {
+export const parameters = {
   docs: {
-    getContainer: function () {
-      var _getContainer = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return import('./blocks');
-
-              case 2:
-                return _context.abrupt("return", _context.sent.DocsContainer);
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      function getContainer() {
-        return _getContainer.apply(this, arguments);
-      }
-
-      return getContainer;
-    }(),
-    getPage: function () {
-      var _getPage = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-        return regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return import('./blocks');
-
-              case 2:
-                return _context2.abrupt("return", _context2.sent.DocsPage);
-
-              case 3:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      }));
-
-      function getPage() {
-        return _getPage.apply(this, arguments);
-      }
-
-      return getPage;
-    }()
+    getContainer: async () => (await import('./blocks')).DocsContainer,
+    getPage: async () => (await import('./blocks')).DocsPage
   }
 };

package/dist/esm/shared.js

@@ -1,8 +1,8 @@
-export var ADDON_ID = 'storybook/docs';
-export var PANEL_ID = "".concat(ADDON_ID, "/panel");
-export var PARAM_KEY = "docs";
-export var SNIPPET_RENDERED = "".concat(ADDON_ID, "/snippet-rendered");
-export var SourceType;
+export const ADDON_ID = 'storybook/docs';
+export const PANEL_ID = `${ADDON_ID}/panel`;
+export const PARAM_KEY = `docs`;
+export const SNIPPET_RENDERED = `${ADDON_ID}/snippet-rendered`;
+export let SourceType;
 
 (function (SourceType) {
   SourceType["AUTO"] = "auto";

package/dist/{ts3.9 → types}/blocks/Story.d.ts

@@ -1,7 +1,7 @@
 import { FunctionComponent, ReactNode, ElementType, ComponentProps } from 'react';
 import { Story as PureStory } from '@storybook/components';
 import { StoryId, StoryAnnotations, AnyFramework } from '@storybook/csf';
-import { Story as StoryType } from '@storybook/store';
+import type { Story as StoryType } from '@storybook/store';
 import { DocsContextProps } from './DocsContext';
 export declare const storyBlockIdFromId: (storyId: string) => string;
 declare type PureStoryProps = ComponentProps<typeof PureStory>;
@@ -23,6 +23,6 @@ declare type StoryImportProps = {
 export declare type StoryProps = (StoryDefProps | StoryRefProps | StoryImportProps) & CommonProps;
 export declare const lookupStoryId: (storyName: string, { mdxStoryNameToKey, mdxComponentAnnotations }: DocsContextProps) => string;
 export declare const getStoryId: (props: StoryProps, context: DocsContextProps) => StoryId;
-export declare const getStoryProps: <TFramework extends AnyFramework>({ height, inline }: StoryProps, story: StoryType<TFramework>, context: DocsContextProps<TFramework>, onStoryFnCalled: () => void) => PureStoryProps;
+export declare const getStoryProps: <TFramework extends AnyFramework>({ height, inline }: StoryProps, story: StoryType<TFramework>) => PureStoryProps;
 declare const Story: FunctionComponent<StoryProps>;
 export { Story };

package/dist/{ts3.9 → types}/preset.d.ts

@@ -1,4 +1,4 @@
-import type { Options } from '@storybook/core-common';
+import type { Options, StoryIndexer } from '@storybook/core-common';
 declare type BabelParams = {
     babelOptions?: any;
     mdxBabelOptions?: any;
@@ -8,4 +8,5 @@ export declare function webpack(webpackConfig: any, options: Options & BabelPara
     sourceLoaderOptions: any;
     transcludeMarkdown: boolean;
 }): Promise<any>;
+export declare const storyIndexers: (indexers?: StoryIndexer[]) => Promise<StoryIndexer[]>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "6.5.9",
+  "version": "7.0.0-alpha.2",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
@@ -26,14 +26,7 @@
   "license": "MIT",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
-  "types": "dist/ts3.9/index.d.ts",
-  "typesVersions": {
-    "<3.8": {
-      "dist/ts3.9/*": [
-        "dist/ts3.4/*"
-      ]
-    }
-  },
+  "types": "dist/types/index.d.ts",
   "files": [
     "dist/**/*",
     "angular/**/*",
@@ -59,21 +52,22 @@
     "@babel/preset-env": "^7.12.11",
     "@jest/transform": "^26.6.2",
     "@mdx-js/react": "^1.6.22",
-    "@storybook/addons": "6.5.9",
-    "@storybook/api": "6.5.9",
-    "@storybook/components": "6.5.9",
-    "@storybook/core-common": "6.5.9",
-    "@storybook/core-events": "6.5.9",
+    "@storybook/addons": "7.0.0-alpha.2",
+    "@storybook/api": "7.0.0-alpha.2",
+    "@storybook/components": "7.0.0-alpha.2",
+    "@storybook/core-common": "7.0.0-alpha.2",
+    "@storybook/core-events": "7.0.0-alpha.2",
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
-    "@storybook/docs-tools": "6.5.9",
+    "@storybook/csf-tools": "7.0.0-alpha.2",
+    "@storybook/docs-tools": "7.0.0-alpha.2",
     "@storybook/mdx1-csf": "^0.0.1",
-    "@storybook/node-logger": "6.5.9",
-    "@storybook/postinstall": "6.5.9",
-    "@storybook/preview-web": "6.5.9",
-    "@storybook/source-loader": "6.5.9",
-    "@storybook/store": "6.5.9",
-    "@storybook/theming": "6.5.9",
-    "babel-loader": "^8.0.0",
+    "@storybook/node-logger": "7.0.0-alpha.2",
+    "@storybook/postinstall": "7.0.0-alpha.2",
+    "@storybook/preview-web": "7.0.0-alpha.2",
+    "@storybook/source-loader": "7.0.0-alpha.2",
+    "@storybook/store": "7.0.0-alpha.2",
+    "@storybook/theming": "7.0.0-alpha.2",
+    "babel-loader": "^8.2.5",
     "core-js": "^3.8.2",
     "fast-deep-equal": "^3.1.3",
     "global": "^4.4.0",
@@ -108,8 +102,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e2673f765722cbb542ef1b5cf8d533c8e746a127",
-  "sbmodern": "dist/modern/index.js",
+  "gitHead": "44920e2b6bd51981bac5124743c29fb9f5517e44",
   "storybook": {
     "displayName": "Docs",
     "icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png",

package/dist/modern/blocks/Anchor.js

@@ -1,8 +0,0 @@
-import React from 'react';
-export const anchorBlockIdFromId = storyId => `anchor--${storyId}`;
-export const Anchor = ({
-  storyId,
-  children
-}) => /*#__PURE__*/React.createElement("div", {
-  id: anchorBlockIdFromId(storyId)
-}, children);