@storybook/addon-docs 7.0.0-alpha.37 → 7.0.0-alpha.39

package/dist/cjs/preset.js

@@ -30,11 +30,20 @@ function createBabelOptions({
   configureJSX
 }) {
   const babelPlugins = (mdxBabelOptions === null || mdxBabelOptions === void 0 ? void 0 : mdxBabelOptions.plugins) || (babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.plugins) || [];
+  const filteredBabelPlugins = babelPlugins.filter(p => {
+    const name = Array.isArray(p) ? p[0] : p;
+
+    if (typeof name === 'string') {
+      return !name.includes('plugin-transform-react-jsx');
+    }
+
+    return true;
+  });
   const jsxPlugin = [require.resolve('@babel/plugin-transform-react-jsx'), {
     pragma: 'React.createElement',
     pragmaFrag: 'React.Fragment'
   }];
-  const plugins = configureJSX ? [...babelPlugins, jsxPlugin] : babelPlugins;
+  const plugins = configureJSX ? [...filteredBabelPlugins, jsxPlugin] : babelPlugins;
   return Object.assign({
     // don't use the root babelrc by default (users can override this in mdxBabelOptions)
     babelrc: false,
@@ -47,8 +56,7 @@ function createBabelOptions({
 async function webpack(webpackConfig = {}, options) {
   var _global$FEATURES, _global$FEATURES2;
 
-  const resolvedBabelLoader = require.resolve('babel-loader');
-
+  const resolvedBabelLoader = await options.presets.apply('babelLoaderRef');
   const {
     module = {}
   } = webpackConfig; // it will reuse babel options that are already in use in storybook

package/dist/esm/preset.js

@@ -13,11 +13,20 @@ function createBabelOptions({
   configureJSX
 }) {
   const babelPlugins = mdxBabelOptions?.plugins || babelOptions?.plugins || [];
+  const filteredBabelPlugins = babelPlugins.filter(p => {
+    const name = Array.isArray(p) ? p[0] : p;
+
+    if (typeof name === 'string') {
+      return !name.includes('plugin-transform-react-jsx');
+    }
+
+    return true;
+  });
   const jsxPlugin = [require.resolve('@babel/plugin-transform-react-jsx'), {
     pragma: 'React.createElement',
     pragmaFrag: 'React.Fragment'
   }];
-  const plugins = configureJSX ? [...babelPlugins, jsxPlugin] : babelPlugins;
+  const plugins = configureJSX ? [...filteredBabelPlugins, jsxPlugin] : babelPlugins;
   return Object.assign({
     // don't use the root babelrc by default (users can override this in mdxBabelOptions)
     babelrc: false,
@@ -28,8 +37,7 @@ function createBabelOptions({
 }
 
 export async function webpack(webpackConfig = {}, options) {
-  const resolvedBabelLoader = require.resolve('babel-loader');
-
+  const resolvedBabelLoader = await options.presets.apply('babelLoaderRef');
   const {
     module = {}
   } = webpackConfig; // it will reuse babel options that are already in use in storybook

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "7.0.0-alpha.37",
+  "version": "7.0.0-alpha.39",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
@@ -50,38 +50,34 @@
   },
   "dependencies": {
     "@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": "7.0.0-alpha.37",
-    "@storybook/api": "7.0.0-alpha.37",
-    "@storybook/blocks": "7.0.0-alpha.37",
-    "@storybook/components": "7.0.0-alpha.37",
-    "@storybook/core-common": "7.0.0-alpha.37",
-    "@storybook/core-events": "7.0.0-alpha.37",
+    "@storybook/addons": "7.0.0-alpha.39",
+    "@storybook/api": "7.0.0-alpha.39",
+    "@storybook/blocks": "7.0.0-alpha.39",
+    "@storybook/components": "7.0.0-alpha.39",
+    "@storybook/core-common": "7.0.0-alpha.39",
+    "@storybook/core-events": "7.0.0-alpha.39",
     "@storybook/csf": "0.0.2--canary.49.258942b.0",
-    "@storybook/csf-tools": "7.0.0-alpha.37",
-    "@storybook/docs-tools": "7.0.0-alpha.37",
+    "@storybook/csf-tools": "7.0.0-alpha.39",
+    "@storybook/docs-tools": "7.0.0-alpha.39",
     "@storybook/mdx1-csf": "0.0.5-canary.13.9ce928a.0",
-    "@storybook/node-logger": "7.0.0-alpha.37",
-    "@storybook/postinstall": "7.0.0-alpha.37",
-    "@storybook/preview-web": "7.0.0-alpha.37",
-    "@storybook/source-loader": "7.0.0-alpha.37",
-    "@storybook/store": "7.0.0-alpha.37",
-    "@storybook/theming": "7.0.0-alpha.37",
-    "babel-loader": "^8.2.5",
+    "@storybook/node-logger": "7.0.0-alpha.39",
+    "@storybook/postinstall": "7.0.0-alpha.39",
+    "@storybook/preview-web": "7.0.0-alpha.39",
+    "@storybook/source-loader": "7.0.0-alpha.39",
+    "@storybook/store": "7.0.0-alpha.39",
+    "@storybook/theming": "7.0.0-alpha.39",
     "dequal": "^2.0.2",
+    "fs-extra": "^9.0.1",
     "global": "^4.4.0",
-    "lodash": "^4.17.21",
     "remark-external-links": "^8.0.0",
     "remark-slug": "^6.0.0",
-    "ts-dedent": "^2.0.0",
-    "util-deprecate": "^1.0.2"
+    "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",
     "@storybook/mdx2-csf": "0.0.4-canary.14.04ffbe8.0",
-    "@types/util-deprecate": "^1.0.0",
     "typescript": "~4.6.3"
   },
   "peerDependencies": {
@@ -103,7 +99,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "82667a655108283aafc828427f00bb3590a334e5",
+  "gitHead": "47386bd49d141ea70daac41ab3e4d52749fc5da9",
   "storybook": {
     "displayName": "Docs",
     "icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png",

package/blocks.d.ts

@@ -1,2 +0,0 @@
-export { ColorPalette, ColorItem, IconGallery, IconItem, Typeset } from '@storybook/components';
-export * from './dist/types/blocks/index.d';

package/blocks.js

@@ -1,14 +0,0 @@
-import deprecate from 'util-deprecate';
-import { dedent } from 'ts-dedent';
-
-const warnBlocksImport = deprecate(
-  () => {},
-  dedent`
-    Importing from '@storybook/addon-docs/blocks' is deprecated, import directly from '@storybook/addon-docs' instead:
-    
-    https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-scoped-blocks-imports
-`
-);
-warnBlocksImport();
-
-export * from './dist/esm/blocks';