@storybook/addon-docs 7.0.0-beta.6 → 7.0.0-beta.8

package/README.md

@@ -140,8 +140,7 @@ module.exports = {
     {
       name: '@storybook/addon-docs',
       options: {
-        configureJSX: true,
-        babelOptions: {},
+        jsxOptions: {},
         csfPluginOptions: null,
         transcludeMarkdown: true,
       },
@@ -150,7 +149,7 @@ module.exports = {
 };
 ```
 
-The `configureJSX` option is useful when you're writing your docs in MDX and your project's babel config isn't already set up to handle JSX files. `babelOptions` is a way to further configure the babel processor when you're using `configureJSX`.
+`jsxOptions` are options that will be passed to `@babel/preset-react` for `.md` and `.mdx` files.
 
 `csfPluginOptions` is an object for configuring `@storybook/csf-plugin`. When set to `null` it tells docs not to run the `csf-plugin` at all, which can be used as an optimization, or if you're already using `csf-plugin` in your `main.js`.
 

package/dist/blocks.d.ts

@@ -0,0 +1 @@
+export * from '@storybook/blocks';

package/dist/blocks.js

@@ -0,0 +1 @@
+var L=Object.create;var s=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var k=Object.getOwnPropertyNames;var x=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var f=(e,r,o,d)=>{if(r&&typeof r=="object"||typeof r=="function")for(let l of k(r))!R.call(e,l)&&l!==o&&s(e,l,{get:()=>r[l],enumerable:!(d=v(r,l))||d.enumerable});return e},p=(e,r,o)=>(f(e,r,"default"),o&&f(o,r,"default")),A=(e,r,o)=>(o=e!=null?L(x(e)):{},f(r||!e||!e.__esModule?s(o,"default",{value:e,enumerable:!0}):o,e)),E=e=>f(s({},"__esModule",{value:!0}),e);var i={};module.exports=E(i);var h=A(require("global"),1),{LOGLEVEL:S,console:c}=h.default,n={trace:1,debug:2,info:3,warn:4,error:5,silent:10},T=S,g=n[T]||n.info,b={trace:(e,...r)=>g<=n.trace&&c.trace(e,...r),debug:(e,...r)=>g<=n.debug&&c.debug(e,...r),info:(e,...r)=>g<=n.info&&c.info(e,...r),warn:(e,...r)=>g<=n.warn&&c.warn(e,...r),error:(e,...r)=>g<=n.error&&c.error(e,...r),log:(e,...r)=>g<n.silent&&c.log(e,...r)},w=new Set,t=e=>(r,...o)=>{if(!w.has(r))return w.add(r),b[e](r,...o)};t.clear=()=>w.clear();t.trace=t("trace");t.debug=t("debug");t.info=t("info");t.warn=t("warn");t.error=t("error");t.log=t("log");var y=t("warn"),a=e=>(...r)=>{let o=[];if(r.length){let d=/<span\s+style=(['"])([^'"]*)\1\s*>/gi,l=/<\/span>/gi,m;for(o.push(r[0].replace(d,"%c").replace(l,"%c"));m=d.exec(r[0]);)o.push(m[2]),o.push("");for(let u=1;u<r.length;u++)o.push(r[u])}b[e].apply(b,o)};a.trace=a("trace");a.debug=a("debug");a.info=a("info");a.warn=a("warn");a.error=a("error");p(i,require("@storybook/blocks"),module.exports);y("Import from '@storybook/addon-docs/blocks' is deprecated. Please import from '@storybook/blocks' instead.");

package/dist/blocks.mjs

@@ -0,0 +1 @@
+import"./chunk-R4NKYYJA.mjs";import global from"global";var{LOGLEVEL,console}=global,levels={trace:1,debug:2,info:3,warn:4,error:5,silent:10},currentLogLevelString=LOGLEVEL,currentLogLevelNumber=levels[currentLogLevelString]||levels.info,logger={trace:(message,...rest)=>currentLogLevelNumber<=levels.trace&&console.trace(message,...rest),debug:(message,...rest)=>currentLogLevelNumber<=levels.debug&&console.debug(message,...rest),info:(message,...rest)=>currentLogLevelNumber<=levels.info&&console.info(message,...rest),warn:(message,...rest)=>currentLogLevelNumber<=levels.warn&&console.warn(message,...rest),error:(message,...rest)=>currentLogLevelNumber<=levels.error&&console.error(message,...rest),log:(message,...rest)=>currentLogLevelNumber<levels.silent&&console.log(message,...rest)},logged=new Set,once=type=>(message,...rest)=>{if(!logged.has(message))return logged.add(message),logger[type](message,...rest)};once.clear=()=>logged.clear();once.trace=once("trace");once.debug=once("debug");once.info=once("info");once.warn=once("warn");once.error=once("error");once.log=once("log");var deprecate=once("warn"),pretty=type=>(...args)=>{let argArray=[];if(args.length){let startTagRe=/<span\s+style=(['"])([^'"]*)\1\s*>/gi,endTagRe=/<\/span>/gi,reResultArray;for(argArray.push(args[0].replace(startTagRe,"%c").replace(endTagRe,"%c"));reResultArray=startTagRe.exec(args[0]);)argArray.push(reResultArray[2]),argArray.push("");for(let j=1;j<args.length;j++)argArray.push(args[j])}logger[type].apply(logger,argArray)};pretty.trace=pretty("trace");pretty.debug=pretty("debug");pretty.info=pretty("info");pretty.warn=pretty("warn");pretty.error=pretty("error");export*from"@storybook/blocks";deprecate("Import from '@storybook/addon-docs/blocks' is deprecated. Please import from '@storybook/blocks' instead.");

package/dist/preset.js

@@ -1,7 +1,13 @@
-var w=Object.create;var d=Object.defineProperty;var L=Object.getOwnPropertyDescriptor;var S=Object.getOwnPropertyNames;var $=Object.getPrototypeOf,h=Object.prototype.hasOwnProperty;var X=(e,r)=>{for(var o in r)d(e,o,{get:r[o],enumerable:!0})},y=(e,r,o,t)=>{if(r&&typeof r=="object"||typeof r=="function")for(let s of S(r))!h.call(e,s)&&s!==o&&d(e,s,{get:()=>r[s],enumerable:!(t=L(r,s))||t.enumerable});return e};var i=(e,r,o)=>(o=e!=null?w($(e)):{},y(r||!e||!e.__esModule?d(o,"default",{value:e,enumerable:!0}):o,e)),v=e=>y(d({},"__esModule",{value:!0}),e);var B={};X(B,{docs:()=>q,storyIndexers:()=>j,webpack:()=>R});module.exports=v(B);var g=i(require("fs-extra")),x=i(require("remark-slug")),b=i(require("remark-external-links")),k=require("ts-dedent"),O=require("@storybook/csf-tools");function m({mdxBabelOptions:e,configureJSX:r}){let o=(e==null?void 0:e.plugins)||[],t=o.filter(a=>{let l=Array.isArray(a)?a[0]:a;return typeof l=="string"?!l.includes("plugin-transform-react-jsx"):!0}),s=[require.resolve("@babel/plugin-transform-react-jsx"),{pragma:"React.createElement",pragmaFrag:"React.Fragment"}],n=r?[...t,s]:o;return{babelrc:!1,configFile:!1,...e,plugins:n}}async function A(e={},r){let o=await r.presets.apply("babelLoaderRef"),{module:t={}}=e,{mdxBabelOptions:s,configureJSX:n=!0,csfPluginOptions:a={},sourceLoaderOptions:l=null,transcludeMarkdown:I=!1}=r,u=await r.presets.apply("mdxLoaderOptions",{skipCsf:!0,mdxCompileOptions:{providerImportSource:"@storybook/addon-docs/mdx-react-shim",remarkPlugins:[x.default,b.default]}});if(l)throw new Error(k.dedent`
+var w=Object.create;var i=Object.defineProperty;var h=Object.getOwnPropertyDescriptor;var S=Object.getOwnPropertyNames;var L=Object.getPrototypeOf,P=Object.prototype.hasOwnProperty;var $=(o,s)=>{for(var e in s)i(o,e,{get:s[e],enumerable:!0})},m=(o,s,e,r)=>{if(s&&typeof s=="object"||typeof s=="function")for(let t of S(s))!P.call(o,t)&&t!==e&&i(o,t,{get:()=>s[t],enumerable:!(r=h(s,t))||r.enumerable});return o};var n=(o,s,e)=>(e=o!=null?w(L(o)):{},m(s||!o||!o.__esModule?i(e,"default",{value:o,enumerable:!0}):e,o)),J=o=>m(i({},"__esModule",{value:!0}),o);var B={};$(B,{docs:()=>T,storyIndexers:()=>M,webpack:()=>C});module.exports=J(B);var x=n(require("fs-extra")),y=n(require("remark-slug")),f=n(require("remark-external-links")),l=require("ts-dedent"),b=require("@storybook/csf-tools");async function X(o={},s){let{module:e={}}=o,{csfPluginOptions:r={},jsxOptions:t={},transcludeMarkdown:d=!1,sourceLoaderOptions:O=null,configureJsx:g,mdxBabelOptions:k}=s,a=await s.presets.apply("mdxLoaderOptions",{skipCsf:!0,mdxCompileOptions:{providerImportSource:"@storybook/addon-docs/mdx-react-shim",remarkPlugins:[y.default,f.default]},jsxOptions:t});if(O)throw new Error(l.dedent`
       Addon-docs no longer uses source-loader in 7.0.
 
       To update your configuration, please see migration instructions here:
 
       https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#dropped-source-loader--storiesof-static-snippets
-    `);let c=require.resolve("@storybook/mdx2-csf/loader"),p=t.rules||[];return I&&(p=[...p.filter(P=>{var f;return((f=P.test)==null?void 0:f.toString())!=="/\\.md$/"}),{test:/\.md$/,use:[{loader:o,options:m({mdxBabelOptions:s,configureJSX:n})},{loader:c,options:u}]}]),{...e,plugins:[...e.plugins||[],...a?[require("@storybook/csf-plugin").webpack(a)]:[]],module:{...t,rules:[...p,{test:/(stories|story)\.mdx$/,use:[{loader:o,options:m({mdxBabelOptions:s,configureJSX:n})},{loader:c,options:{...u,skipCsf:!1}}]},{test:/\.mdx$/,exclude:/(stories|story)\.mdx$/,use:[{loader:o,options:m({mdxBabelOptions:s,configureJSX:n})},{loader:c,options:u}]}]}}}var C=e=>[{test:/(stories|story)\.mdx$/,indexer:async(o,t)=>{let s=(await g.default.readFile(o,"utf-8")).toString(),{compile:n}=await import("@storybook/mdx2-csf");return s=await n(s,{}),(0,O.loadCsf)(s,{...t,fileName:o}).parse()}},...e||[]],F=e=>({...e,enabled:!0,defaultName:"Docs",docsPage:!0}),R=A,j=C,q=F;0&&(module.exports={docs,storyIndexers,webpack});
+    `);if(k||g)throw new Error(l.dedent`
+      Addon-docs no longer uses configureJsx or mdxBabelOptions in 7.0.
+
+      To update your configuration, please see migration instructions here:
+
+      https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#dropped-addon-docs-manual-babel-configuration
+    `);let p=require.resolve("@storybook/mdx2-csf/loader"),u=e.rules||[];return d&&(u=[...u.filter(I=>{var c;return((c=I.test)==null?void 0:c.toString())!=="/\\.md$/"}),{test:/\.md$/,use:[{loader:p,options:a}]}]),{...o,plugins:[...o.plugins||[],...r?[require("@storybook/csf-plugin").webpack(r)]:[]],module:{...e,rules:[...u,{test:/(stories|story)\.mdx$/,use:[{loader:p,options:{...a,skipCsf:!1}}]},{test:/\.mdx$/,exclude:/(stories|story)\.mdx$/,use:[{loader:p,options:a}]}]}}}var j=o=>[{test:/(stories|story)\.mdx$/,indexer:async(e,r)=>{let t=(await x.default.readFile(e,"utf-8")).toString(),{compile:d}=await import("@storybook/mdx2-csf");return t=await d(t,{}),(0,b.loadCsf)(t,{...r,fileName:e}).parse()}},...o||[]],A=o=>({...o,enabled:!0,defaultName:"Docs",docsPage:!0}),C=X,M=j,T=A;0&&(module.exports={docs,storyIndexers,webpack});

package/dist/preset.mjs

@@ -1,7 +1,13 @@
-import{__require}from"./chunk-R4NKYYJA.mjs";import fs from"fs-extra";import remarkSlug from"remark-slug";import remarkExternalLinks from"remark-external-links";import{dedent}from"ts-dedent";import{loadCsf}from"@storybook/csf-tools";function createBabelOptions({mdxBabelOptions,configureJSX}){let babelPlugins=mdxBabelOptions?.plugins||[],filteredBabelPlugins=babelPlugins.filter(p=>{let name=Array.isArray(p)?p[0]:p;return typeof name=="string"?!name.includes("plugin-transform-react-jsx"):!0}),jsxPlugin=[__require.resolve("@babel/plugin-transform-react-jsx"),{pragma:"React.createElement",pragmaFrag:"React.Fragment"}],plugins=configureJSX?[...filteredBabelPlugins,jsxPlugin]:babelPlugins;return{babelrc:!1,configFile:!1,...mdxBabelOptions,plugins}}async function webpack(webpackConfig={},options){let resolvedBabelLoader=await options.presets.apply("babelLoaderRef"),{module={}}=webpackConfig,{mdxBabelOptions,configureJSX=!0,csfPluginOptions={},sourceLoaderOptions=null,transcludeMarkdown=!1}=options,mdxLoaderOptions=await options.presets.apply("mdxLoaderOptions",{skipCsf:!0,mdxCompileOptions:{providerImportSource:"@storybook/addon-docs/mdx-react-shim",remarkPlugins:[remarkSlug,remarkExternalLinks]}});if(sourceLoaderOptions)throw new Error(dedent`
+import{__require}from"./chunk-R4NKYYJA.mjs";import fs from"fs-extra";import remarkSlug from"remark-slug";import remarkExternalLinks from"remark-external-links";import{dedent}from"ts-dedent";import{loadCsf}from"@storybook/csf-tools";async function webpack(webpackConfig={},options){let{module={}}=webpackConfig,{csfPluginOptions={},jsxOptions={},transcludeMarkdown=!1,sourceLoaderOptions=null,configureJsx,mdxBabelOptions}=options,mdxLoaderOptions=await options.presets.apply("mdxLoaderOptions",{skipCsf:!0,mdxCompileOptions:{providerImportSource:"@storybook/addon-docs/mdx-react-shim",remarkPlugins:[remarkSlug,remarkExternalLinks]},jsxOptions});if(sourceLoaderOptions)throw new Error(dedent`
       Addon-docs no longer uses source-loader in 7.0.
 
       To update your configuration, please see migration instructions here:
 
       https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#dropped-source-loader--storiesof-static-snippets
-    `);let mdxLoader=__require.resolve("@storybook/mdx2-csf/loader"),rules=module.rules||[];return transcludeMarkdown&&(rules=[...rules.filter(rule=>rule.test?.toString()!=="/\\.md$/"),{test:/\.md$/,use:[{loader:resolvedBabelLoader,options:createBabelOptions({mdxBabelOptions,configureJSX})},{loader:mdxLoader,options:mdxLoaderOptions}]}]),{...webpackConfig,plugins:[...webpackConfig.plugins||[],...csfPluginOptions?[__require("@storybook/csf-plugin").webpack(csfPluginOptions)]:[]],module:{...module,rules:[...rules,{test:/(stories|story)\.mdx$/,use:[{loader:resolvedBabelLoader,options:createBabelOptions({mdxBabelOptions,configureJSX})},{loader:mdxLoader,options:{...mdxLoaderOptions,skipCsf:!1}}]},{test:/\.mdx$/,exclude:/(stories|story)\.mdx$/,use:[{loader:resolvedBabelLoader,options:createBabelOptions({mdxBabelOptions,configureJSX})},{loader:mdxLoader,options:mdxLoaderOptions}]}]}}}var storyIndexers=indexers=>[{test:/(stories|story)\.mdx$/,indexer:async(fileName,opts)=>{let code=(await fs.readFile(fileName,"utf-8")).toString(),{compile}=await import("@storybook/mdx2-csf");return code=await compile(code,{}),loadCsf(code,{...opts,fileName}).parse()}},...indexers||[]],docs=docsOptions=>({...docsOptions,enabled:!0,defaultName:"Docs",docsPage:!0}),webpackX=webpack,storyIndexersX=storyIndexers,docsX=docs;export{docsX as docs,storyIndexersX as storyIndexers,webpackX as webpack};
+    `);if(mdxBabelOptions||configureJsx)throw new Error(dedent`
+      Addon-docs no longer uses configureJsx or mdxBabelOptions in 7.0.
+
+      To update your configuration, please see migration instructions here:
+
+      https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#dropped-addon-docs-manual-babel-configuration
+    `);let mdxLoader=__require.resolve("@storybook/mdx2-csf/loader"),rules=module.rules||[];return transcludeMarkdown&&(rules=[...rules.filter(rule=>rule.test?.toString()!=="/\\.md$/"),{test:/\.md$/,use:[{loader:mdxLoader,options:mdxLoaderOptions}]}]),{...webpackConfig,plugins:[...webpackConfig.plugins||[],...csfPluginOptions?[__require("@storybook/csf-plugin").webpack(csfPluginOptions)]:[]],module:{...module,rules:[...rules,{test:/(stories|story)\.mdx$/,use:[{loader:mdxLoader,options:{...mdxLoaderOptions,skipCsf:!1}}]},{test:/\.mdx$/,exclude:/(stories|story)\.mdx$/,use:[{loader:mdxLoader,options:mdxLoaderOptions}]}]}}}var storyIndexers=indexers=>[{test:/(stories|story)\.mdx$/,indexer:async(fileName,opts)=>{let code=(await fs.readFile(fileName,"utf-8")).toString(),{compile}=await import("@storybook/mdx2-csf");return code=await compile(code,{}),loadCsf(code,{...opts,fileName}).parse()}},...indexers||[]],docs=docsOptions=>({...docsOptions,enabled:!0,defaultName:"Docs",docsPage:!0}),webpackX=webpack,storyIndexersX=storyIndexers,docsX=docs;export{docsX as docs,storyIndexersX as storyIndexers,webpackX as webpack};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "7.0.0-beta.6",
+  "version": "7.0.0-beta.8",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
@@ -41,6 +41,11 @@
       "import": "./dist/preset.mjs",
       "types": "./dist/preset.d.ts"
     },
+    "./blocks": {
+      "require": "./dist/blocks.js",
+      "import": "./dist/blocks.mjs",
+      "types": "./dist/blocks.d.ts"
+    },
     "./dist/preview": {
       "require": "./dist/preview.js",
       "import": "./dist/preview.mjs",
@@ -99,16 +104,16 @@
     "@babel/plugin-transform-react-jsx": "^7.19.0",
     "@jest/transform": "^29.3.1",
     "@mdx-js/react": "^2.1.5",
-    "@storybook/blocks": "7.0.0-beta.6",
-    "@storybook/components": "7.0.0-beta.6",
-    "@storybook/csf-plugin": "7.0.0-beta.6",
-    "@storybook/csf-tools": "7.0.0-beta.6",
+    "@storybook/blocks": "7.0.0-beta.8",
+    "@storybook/components": "7.0.0-beta.8",
+    "@storybook/csf-plugin": "7.0.0-beta.8",
+    "@storybook/csf-tools": "7.0.0-beta.8",
     "@storybook/mdx2-csf": "next",
-    "@storybook/node-logger": "7.0.0-beta.6",
-    "@storybook/postinstall": "7.0.0-beta.6",
-    "@storybook/preview-api": "7.0.0-beta.6",
-    "@storybook/theming": "7.0.0-beta.6",
-    "@storybook/types": "7.0.0-beta.6",
+    "@storybook/node-logger": "7.0.0-beta.8",
+    "@storybook/postinstall": "7.0.0-beta.8",
+    "@storybook/preview-api": "7.0.0-beta.8",
+    "@storybook/theming": "7.0.0-beta.8",
+    "@storybook/types": "7.0.0-beta.8",
     "fs-extra": "^9.0.1",
     "global": "^4.4.0",
     "remark-external-links": "^8.0.0",
@@ -132,10 +137,11 @@
       "./src/index.ts",
       "./src/preset.ts",
       "./src/preview.ts",
+      "./src/blocks.ts",
       "./src/shims/mdx-react-shim.ts"
     ]
   },
-  "gitHead": "edcda9c064bcb77c903263fafcaee2bd369f429a",
+  "gitHead": "5340574d89a799ec10959edc16ca140852cf355c",
   "storybook": {
     "displayName": "Docs",
     "icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png",

package/postinstall/presets.js

@@ -24,9 +24,7 @@ export default function transformer(file, api) {
     ((dependencies && dependencies['react-scripts']) ||
       (devDependencies && devDependencies['react-scripts']))
   ) {
-    presetOptions = {
-      configureJSX: true,
-    };
+    presetOptions = {};
   }
 
   const j = api.jscodeshift;