@storybook/addon-docs 6.5.0-alpha.46 → 6.5.0-alpha.49

package/angular/index.d.ts

@@ -1 +1 @@
-export * from '../dist/ts3.9/frameworks/angular/index.d';
+export declare const setCompodocJson: (compodocJson: any) => void;

package/angular/index.js

@@ -1 +1,7 @@
-module.exports = require('../dist/esm/frameworks/angular/index');
+/* eslint-disable no-underscore-dangle */
+/* global window */
+
+export const setCompodocJson = (compodocJson) => {
+  // @ts-ignore
+  window.__STORYBOOK_COMPODOC_JSON__ = compodocJson;
+};

package/dist/cjs/blocks/Description.js

@@ -35,12 +35,12 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _components = require("@storybook/components");
 
+var _docsTools = require("@storybook/docs-tools");
+
 var _DocsContext = require("./DocsContext");
 
 var _types = require("./types");
 
-var _docgen = require("../lib/docgen");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -57,11 +57,11 @@ exports.DescriptionType = DescriptionType;
 })(DescriptionType || (exports.DescriptionType = DescriptionType = {}));
 
 var getNotes = function getNotes(notes) {
-  return notes && (typeof notes === 'string' ? notes : (0, _docgen.str)(notes.markdown) || (0, _docgen.str)(notes.text));
+  return notes && (typeof notes === 'string' ? notes : (0, _docsTools.str)(notes.markdown) || (0, _docsTools.str)(notes.text));
 };
 
 var getInfo = function getInfo(info) {
-  return info && (typeof info === 'string' ? info : (0, _docgen.str)(info.text));
+  return info && (typeof info === 'string' ? info : (0, _docsTools.str)(info.text));
 };
 
 var noDescription = function noDescription(component) {

package/dist/cjs/blocks/Story.js

@@ -181,28 +181,8 @@ var Story = function Story(props) {
     var cleanup;
 
     if (story && storyRef.current) {
-      var componentId = story.componentId,
-          id = story.id,
-          title = story.title,
-          name = story.name;
-      var renderContext = {
-        componentId: componentId,
-        title: title,
-        kind: title,
-        id: id,
-        name: name,
-        story: name,
-        // TODO what to do when these fail?
-        showMain: function showMain() {},
-        showError: function showError() {},
-        showException: function showException() {}
-      };
-      cleanup = context.renderStoryToElement({
-        story: story,
-        renderContext: renderContext,
-        element: storyRef.current,
-        viewMode: 'docs'
-      });
+      var element = storyRef.current;
+      cleanup = context.renderStoryToElement(story, element);
       setShowLoader(false);
     }
 

package/dist/cjs/frameworks/common/config.js

@@ -21,7 +21,7 @@ require("core-js/modules/es.symbol.iterator.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parameters = exports.argTypesEnhancers = void 0;
+exports.parameters = void 0;
 
 require("regenerator-runtime/runtime.js");
 
@@ -29,8 +29,6 @@ require("core-js/modules/es.object.to-string.js");
 
 require("core-js/modules/es.promise.js");
 
-var _enhanceArgTypes = require("./enhanceArgTypes");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -101,6 +99,4 @@ var parameters = {
     iframeHeight: 100
   }
 };
-exports.parameters = parameters;
-var argTypesEnhancers = [_enhanceArgTypes.enhanceArgTypes];
-exports.argTypesEnhancers = argTypesEnhancers;
+exports.parameters = parameters;

package/dist/cjs/frameworks/common/preset.js

@@ -51,6 +51,8 @@ var _remarkExternalLinks = _interopRequireDefault(require("remark-external-links
 
 var _global = _interopRequireDefault(require("global"));
 
+var _nodeLogger = require("@storybook/node-logger");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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); } }
@@ -69,11 +71,6 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 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; }
 
-var _console = console,
-    log = _console.log; // 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,
@@ -154,7 +151,9 @@ function _webpack() {
               remarkPlugins: [_remarkSlug.default, _remarkExternalLinks.default]
             };
             mdxVersion = (_global$FEATURES = _global.default.FEATURES) !== null && _global$FEATURES !== void 0 && _global$FEATURES.previewMdx2 ? 'MDX2' : 'MDX1';
-            log("Addon-docs: using ".concat(mdxVersion));
+
+            _nodeLogger.logger.info("Addon-docs: using ".concat(mdxVersion));
+
             mdxLoader = (_global$FEATURES2 = _global.default.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 ? [{

package/dist/esm/blocks/Description.js

@@ -5,9 +5,9 @@ import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.object.assign.js";
 import React, { useContext } from 'react';
 import { Description } from '@storybook/components';
+import { str } from '@storybook/docs-tools';
 import { DocsContext } from './DocsContext';
 import { CURRENT_SELECTION } from './types';
-import { str } from '../lib/docgen';
 export var DescriptionType;
 
 (function (DescriptionType) {

package/dist/esm/blocks/Story.js

@@ -125,28 +125,8 @@ var Story = function Story(props) {
     var cleanup;
 
     if (story && storyRef.current) {
-      var componentId = story.componentId,
-          id = story.id,
-          title = story.title,
-          name = story.name;
-      var renderContext = {
-        componentId: componentId,
-        title: title,
-        kind: title,
-        id: id,
-        name: name,
-        story: name,
-        // TODO what to do when these fail?
-        showMain: function showMain() {},
-        showError: function showError() {},
-        showException: function showException() {}
-      };
-      cleanup = context.renderStoryToElement({
-        story: story,
-        renderContext: renderContext,
-        element: storyRef.current,
-        viewMode: 'docs'
-      });
+      var element = storyRef.current;
+      cleanup = context.renderStoryToElement(story, element);
       setShowLoader(false);
     }
 

package/dist/esm/frameworks/common/config.js

@@ -6,7 +6,6 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 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 { enhanceArgTypes } from './enhanceArgTypes';
 export var parameters = {
   docs: {
     inlineStories: false,
@@ -64,5 +63,4 @@ export var parameters = {
     }(),
     iframeHeight: 100
   }
-};
-export var argTypesEnhancers = [enhanceArgTypes];
+};

package/dist/esm/frameworks/common/preset.js

@@ -39,8 +39,7 @@ import path from 'path';
 import remarkSlug from 'remark-slug';
 import remarkExternalLinks from 'remark-external-links';
 import global from 'global';
-var _console = console,
-    log = _console.log; // for frameworks that are not working with react, we need to configure
+import { logger } from '@storybook/node-logger'; // 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'
 
@@ -124,7 +123,7 @@ function _webpack() {
               remarkPlugins: [remarkSlug, remarkExternalLinks]
             };
             mdxVersion = (_global$FEATURES = global.FEATURES) !== null && _global$FEATURES !== void 0 && _global$FEATURES.previewMdx2 ? 'MDX2' : 'MDX1';
-            log("Addon-docs: using ".concat(mdxVersion));
+            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 ? [{

package/dist/modern/blocks/Description.js

@@ -1,8 +1,8 @@
 import React, { useContext } from 'react';
 import { Description } from '@storybook/components';
+import { str } from '@storybook/docs-tools';
 import { DocsContext } from './DocsContext';
 import { CURRENT_SELECTION } from './types';
-import { str } from '../lib/docgen';
 export let DescriptionType;
 
 (function (DescriptionType) {

package/dist/modern/blocks/Story.js

@@ -95,30 +95,8 @@ const Story = props => {
     let cleanup;
 
     if (story && storyRef.current) {
-      const {
-        componentId,
-        id,
-        title,
-        name
-      } = story;
-      const renderContext = {
-        componentId,
-        title,
-        kind: title,
-        id,
-        name,
-        story: name,
-        // TODO what to do when these fail?
-        showMain: () => {},
-        showError: () => {},
-        showException: () => {}
-      };
-      cleanup = context.renderStoryToElement({
-        story,
-        renderContext,
-        element: storyRef.current,
-        viewMode: 'docs'
-      });
+      const element = storyRef.current;
+      cleanup = context.renderStoryToElement(story, element);
       setShowLoader(false);
     }
 

package/dist/modern/frameworks/common/config.js

@@ -1,4 +1,3 @@
-import { enhanceArgTypes } from './enhanceArgTypes';
 export const parameters = {
   docs: {
     inlineStories: false,
@@ -6,5 +5,4 @@ export const parameters = {
     getPage: async () => (await import('../../blocks')).DocsPage,
     iframeHeight: 100
   }
-};
-export const argTypesEnhancers = [enhanceArgTypes];
+};

package/dist/modern/frameworks/common/preset.js

@@ -2,9 +2,7 @@ import path from 'path';
 import remarkSlug from 'remark-slug';
 import remarkExternalLinks from 'remark-external-links';
 import global from 'global';
-const {
-  log
-} = console; // for frameworks that are not working with react, we need to configure
+import { logger } from '@storybook/node-logger'; // 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'
 
@@ -59,7 +57,7 @@ export async function webpack(webpackConfig = {}, options) {
     remarkPlugins: [remarkSlug, remarkExternalLinks]
   };
   const mdxVersion = (_global$FEATURES = global.FEATURES) !== null && _global$FEATURES !== void 0 && _global$FEATURES.previewMdx2 ? 'MDX2' : 'MDX1';
-  log(`Addon-docs: using ${mdxVersion}`);
+  logger.info(`Addon-docs: using ${mdxVersion}`);
   const 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
 
   const sourceLoader = sourceLoaderOptions ? [{

package/dist/ts3.4/frameworks/common/config.d.ts

@@ -6,4 +6,3 @@ export declare const parameters: {
         iframeHeight: number;
     };
 };
-export declare const argTypesEnhancers: (<TFramework extends import("@storybook/csf").AnyFramework>(context: import("@storybook/csf").StoryContextForEnhancers<TFramework, import("@storybook/csf").Args>) => import("@storybook/csf").StrictArgTypes<import("@storybook/csf").Args> | import("@storybook/addons").Parameters)[];

package/dist/ts3.9/blocks/DocsContext.d.ts

@@ -1,5 +1,5 @@
 import { Context } from 'react';
-import { DocsContextProps } from '@storybook/preview-web';
-import { AnyFramework } from '@storybook/csf';
+import type { DocsContextProps } from '@storybook/preview-web';
+import type { AnyFramework } from '@storybook/csf';
 export type { DocsContextProps };
 export declare const DocsContext: Context<DocsContextProps<AnyFramework>>;

package/dist/ts3.9/blocks/enhanceSource.d.ts

@@ -1,3 +1,3 @@
-import { Parameters } from '@storybook/addons';
-import { Story } from '@storybook/store';
+import type { Parameters } from '@storybook/addons';
+import type { Story } from '@storybook/store';
 export declare const enhanceSource: (story: Story<any>) => Parameters;

package/dist/ts3.9/blocks/useStory.d.ts

@@ -1,5 +1,5 @@
-import { StoryId, AnyFramework } from '@storybook/csf';
-import { Story } from '@storybook/store';
+import type { StoryId, AnyFramework } from '@storybook/csf';
+import type { Story } from '@storybook/store';
 import { DocsContextProps } from './DocsContext';
 export declare function useStory<TFramework extends AnyFramework = AnyFramework>(storyId: StoryId, context: DocsContextProps<TFramework>): Story<TFramework> | void;
 export declare function useStories<TFramework extends AnyFramework = AnyFramework>(storyIds: StoryId[], context: DocsContextProps<TFramework>): (Story<TFramework> | void)[];

package/dist/ts3.9/frameworks/common/config.d.ts

@@ -6,4 +6,3 @@ export declare const parameters: {
         iframeHeight: number;
     };
 };
-export declare const argTypesEnhancers: (<TFramework extends import("@storybook/csf").AnyFramework>(context: import("@storybook/csf").StoryContextForEnhancers<TFramework, import("@storybook/csf").Args>) => import("@storybook/csf").StrictArgTypes<import("@storybook/csf").Args> | import("@storybook/addons").Parameters)[];

package/ember/index.js

@@ -1 +1,6 @@
-module.exports = require('../dist/esm/frameworks/ember');
+/* eslint-disable no-underscore-dangle */
+/* global window */
+
+export const setJSONDoc = (jsondoc) => {
+  window.__EMBER_GENERATED_DOC_JSON__ = jsondoc;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "6.5.0-alpha.46",
+  "version": "6.5.0-alpha.49",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
@@ -55,157 +55,62 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/generator": "^7.12.11",
-    "@babel/parser": "^7.12.11",
     "@babel/plugin-transform-react-jsx": "^7.12.12",
     "@babel/preset-env": "^7.12.11",
     "@jest/transform": "^26.6.2",
     "@mdx-js/react": "^1.6.22",
-    "@storybook/addons": "6.5.0-alpha.46",
-    "@storybook/api": "6.5.0-alpha.46",
-    "@storybook/builder-webpack4": "6.5.0-alpha.46",
-    "@storybook/client-logger": "6.5.0-alpha.46",
-    "@storybook/components": "6.5.0-alpha.46",
-    "@storybook/core": "6.5.0-alpha.46",
-    "@storybook/core-events": "6.5.0-alpha.46",
+    "@storybook/addons": "6.5.0-alpha.49",
+    "@storybook/api": "6.5.0-alpha.49",
+    "@storybook/components": "6.5.0-alpha.49",
+    "@storybook/core-common": "6.5.0-alpha.49",
+    "@storybook/core-events": "6.5.0-alpha.49",
     "@storybook/csf": "0.0.2--canary.87bc651.0",
-    "@storybook/csf-tools": "6.5.0-alpha.46",
+    "@storybook/docs-tools": "6.5.0-alpha.49",
     "@storybook/mdx1-csf": "canary",
-    "@storybook/node-logger": "6.5.0-alpha.46",
-    "@storybook/postinstall": "6.5.0-alpha.46",
-    "@storybook/preview-web": "6.5.0-alpha.46",
-    "@storybook/source-loader": "6.5.0-alpha.46",
-    "@storybook/store": "6.5.0-alpha.46",
-    "@storybook/theming": "6.5.0-alpha.46",
-    "acorn": "^7.4.1",
-    "acorn-jsx": "^5.3.1",
-    "acorn-walk": "^7.2.0",
+    "@storybook/node-logger": "6.5.0-alpha.49",
+    "@storybook/postinstall": "6.5.0-alpha.49",
+    "@storybook/preview-web": "6.5.0-alpha.49",
+    "@storybook/source-loader": "6.5.0-alpha.49",
+    "@storybook/store": "6.5.0-alpha.49",
+    "@storybook/theming": "6.5.0-alpha.49",
     "core-js": "^3.8.2",
-    "doctrine": "^3.0.0",
-    "escodegen": "^2.0.0",
     "fast-deep-equal": "^3.1.3",
     "global": "^4.4.0",
-    "html-tags": "^3.1.0",
-    "loader-utils": "^2.0.0",
     "lodash": "^4.17.21",
-    "nanoid": "^3.1.23",
-    "p-limit": "^3.1.0",
-    "prettier": ">=2.2.1 <=2.3.0",
-    "prop-types": "^15.7.2",
-    "react-element-to-jsx-string": "^14.3.4",
-    "regenerator-runtime": "^0.13.7",
     "remark-external-links": "^8.0.0",
     "remark-slug": "^6.0.0",
     "ts-dedent": "^2.0.0",
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@angular/core": "^11.2.14",
     "@babel/core": "^7.12.10",
-    "@emotion/core": "^10.3.1",
-    "@emotion/styled": "^10.0.27",
-    "@storybook/angular": "6.5.0-alpha.46",
-    "@storybook/html": "6.5.0-alpha.46",
     "@storybook/mdx2-csf": "canary",
-    "@storybook/react": "6.5.0-alpha.46",
-    "@storybook/vue": "6.5.0-alpha.46",
-    "@storybook/web-components": "6.5.0-alpha.46",
-    "@types/cross-spawn": "^6.0.2",
-    "@types/doctrine": "^0.0.3",
-    "@types/estree": "^0.0.44",
-    "@types/loader-utils": "^2.0.0",
-    "@types/prop-types": "^15.7.3",
-    "@types/tmp": "^0.2.0",
     "@types/util-deprecate": "^1.0.0",
     "babel-loader": "^8.0.0",
-    "babel-plugin-react-docgen": "^4.2.1",
-    "cross-spawn": "^7.0.3",
-    "jest": "^26.6.3",
-    "jest-specific-snapshot": "^4.0.0",
-    "lit-element": "^3.0.2",
-    "lit-html": "^2.0.2",
-    "require-from-string": "^2.0.2",
-    "rxjs": "^6.6.3",
-    "styled-components": "^5.2.1",
-    "sveltedoc-parser": "4.1.0",
-    "tmp": "^0.2.1",
-    "vue": "^2.6.10",
-    "webpack": "4",
-    "zone.js": "^0.11.3"
+    "webpack": "4"
   },
   "peerDependencies": {
-    "@storybook/angular": "6.5.0-alpha.46",
-    "@storybook/html": "6.5.0-alpha.46",
     "@storybook/mdx2-csf": "*",
-    "@storybook/react": "6.5.0-alpha.46",
-    "@storybook/vue": "6.5.0-alpha.46",
-    "@storybook/vue3": "6.5.0-alpha.46",
-    "@storybook/web-components": "6.5.0-alpha.46",
-    "lit": "^2.0.0",
-    "lit-html": "^1.4.1 || ^2.0.0",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0",
-    "svelte": "^3.31.2",
-    "sveltedoc-parser": "^4.1.0",
-    "vue": "^2.6.10 || ^3.0.0",
     "webpack": "*"
   },
   "peerDependenciesMeta": {
-    "@storybook/angular": {
-      "optional": true
-    },
     "@storybook/builder-webpack4": {
       "optional": true
     },
     "@storybook/builder-webpack5": {
       "optional": true
     },
-    "@storybook/html": {
-      "optional": true
-    },
-    "@storybook/manager-webpack4": {
-      "optional": true
-    },
-    "@storybook/manager-webpack5": {
-      "optional": true
-    },
     "@storybook/mdx2-csf": {
       "optional": true
     },
-    "@storybook/react": {
-      "optional": true
-    },
-    "@storybook/vue": {
-      "optional": true
-    },
-    "@storybook/vue3": {
-      "optional": true
-    },
-    "@storybook/web-components": {
-      "optional": true
-    },
-    "lit": {
-      "optional": true
-    },
-    "lit-html": {
-      "optional": true
-    },
     "react": {
       "optional": true
     },
     "react-dom": {
       "optional": true
     },
-    "svelte": {
-      "optional": true
-    },
-    "sveltedoc-parser": {
-      "optional": true
-    },
-    "vue": {
-      "optional": true
-    },
     "webpack": {
       "optional": true
     }
@@ -213,7 +118,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a64dc8426d21a70970728878c3bba0ac0a377a48",
+  "gitHead": "5cd3cd92ff4ab3dce81726f0d3913d7077926bee",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Docs",

package/preset.js

@@ -1,16 +1,16 @@
-const getFrameworkPresets = (framework) => {
-  try {
-    return [require.resolve(`./dist/cjs/frameworks/${framework}/preset`)];
-  } catch (err) {
-    // there is no custom config for the user's framework, do nothing
-    return [];
-  }
-};
+const { findDistEsm } = require('@storybook/core-common');
+const { webpack } = require('./dist/cjs/frameworks/common/preset');
+
+function managerEntries(entry = [], options) {
+  return [...entry, findDistEsm(__dirname, 'register')];
+}
+
+function config(entry = [], options = {}) {
+  return [findDistEsm(__dirname, 'frameworks/common/config'), ...entry];
+}
 
-module.exports = (storybookOptions, presetOptions) => {
-  return [
-    { name: require.resolve('./common-preset'), options: presetOptions },
-    { name: require.resolve('./dist/cjs/frameworks/common/preset'), options: presetOptions },
-    ...getFrameworkPresets(storybookOptions.framework),
-  ];
+module.exports = {
+  webpack,
+  managerEntries,
+  config,
 };

package/common-preset.js

@@ -1,19 +0,0 @@
-function managerEntries(entry = [], options) {
-  return [...entry, require.resolve('./dist/esm/register')];
-}
-
-function config(entry = [], options = {}) {
-  const { framework } = options;
-  const docsConfig = [require.resolve('./dist/esm/frameworks/common/config')];
-  try {
-    docsConfig.push(require.resolve(`./dist/esm/frameworks/${framework}/config`));
-  } catch (err) {
-    // there is no custom config for the user's framework, do nothing
-  }
-  return [...docsConfig, ...entry];
-}
-
-module.exports = {
-  managerEntries,
-  config,
-};