fix: webpack configs inherit mdx

ccontrols · Jun 26, 2020 · 826c1b8 · 826c1b8
1 parent d2d968f
commit 826c1b8
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 19 deletions.
diff --git a/core/webpack-configs/src/instrument/index.ts b/core/webpack-configs/src/instrument/index.ts
@@ -17,25 +17,23 @@ export const instrument: Configuration = {
       {
         test: /\.(md|mdx)$/,
         exclude: [/node_modules/],
-        use: [
-          {
-            loader: 'babel-loader',
-            options: {
-              presets: [
-                [require.resolve('@babel/preset-env'), { modules: 'commonjs' }],
-                require.resolve('@babel/preset-react'),
-              ],
-            },
-          },
-          {
-            loader: '@component-controls/loader/loader',
-            options: {
-              mdx: {
-                transformMDX: true,
-              },
-            },
+        loader: 'babel-loader',
+        options: {
+          presets: [
+            [require.resolve('@babel/preset-env'), { modules: 'commonjs' }],
+            require.resolve('@babel/preset-react'),
+          ],
+        },
+      },
+      {
+        test: /\.(md|mdx)$/,
+        exclude: [/node_modules/],
+        loader: '@component-controls/loader/loader',
+        options: {
+          mdx: {
+            transformMDX: true,
           },
-        ],
+        },
       },
       {
         test: /\.(story|stories).(js|jsx|ts|tsx)$/,

diff --git a/core/webpack-configs/src/react-docgen-typescript/index.ts b/core/webpack-configs/src/react-docgen-typescript/index.ts
@@ -3,6 +3,24 @@ import { Configuration } from 'webpack';
 export const reactDocgenTypescript: Configuration = {
   module: {
     rules: [
+      {
+        test: /\.(md|mdx)$/,
+        exclude: [/node_modules/],
+        loader: '@component-controls/loader/loader',
+        options: {
+          propsLoaders: [
+            {
+              name: '@component-controls/react-docgen-info',
+              test: /\.(js|jsx)$/,
+            },
+            {
+              name: '@component-controls/react-docgen-typescript-info',
+              test: /\.(ts|tsx)$/,
+            },
+          ],
+        },
+      },
+
       {
         test: /\.(story|stories).(js|jsx|ts|tsx|mdx)$/,
         loader: '@component-controls/loader/loader',

diff --git a/core/webpack-configs/src/react-docgen/index.ts b/core/webpack-configs/src/react-docgen/index.ts
@@ -4,7 +4,20 @@ export const reactDocgen: Configuration = {
   module: {
     rules: [
       {
-        test: /\.(story|stories).(js|jsx|ts|tsx|mdx)$/,
+        test: /\.(md|mdx)$/,
+        exclude: [/node_modules/],
+        loader: '@component-controls/loader/loader',
+        options: {
+          propsLoaders: [
+            {
+              name: '@component-controls/react-docgen-info',
+              test: /\.(js|jsx|ts|tsx)$/,
+            },
+          ],
+        },
+      },
+      {
+        test: /\.(story|stories).(js|jsx|ts|tsx)$/,
         loader: '@component-controls/loader/loader',
         exclude: [/node_modules/],
         enforce: 'pre',