Fix examples webpack config

EskelCz · Mar 16, 2019 · 5ed463f · 5ed463f
1 parent 60732ed
commit 5ed463f
Show file tree

Hide file tree

Showing 12 changed files with 88 additions and 120 deletions.
diff --git a/addons/a11y/src/components/A11YPanel.tsx b/addons/a11y/src/components/A11YPanel.tsx
@@ -1,5 +1,4 @@
 import React, { Component, Fragment } from 'react';
-import PropTypes from 'prop-types';
 
 import { styled } from '@storybook/theming';
 

diff --git a/examples/angular-cli/.storybook/webpack.config.ts b/examples/angular-cli/.storybook/webpack.config.ts
@@ -1,21 +1,18 @@
 const path = require('path');
 
-module.exports = {
-  module: {
-    rules: [
+module.exports = async ({ config }) => {
+  config.module.rules.push({
+    test: [/\.stories\.tsx?$/, /index\.ts$/],
+    loaders: [
       {
-        test: [/\.stories\.tsx?$/, /index\.ts$/],
-        loaders: [
-          {
-            loader: require.resolve('@storybook/addon-storysource/loader'),
-            options: {
-              parser: 'typescript',
-            },
-          },
-        ],
-        include: [path.resolve(__dirname, '../src')],
-        enforce: 'pre',
+        loader: require.resolve('@storybook/addon-storysource/loader'),
+        options: {
+          parser: 'typescript',
+        },
       },
     ],
-  },
+    include: [path.resolve(__dirname, '../src')],
+    enforce: 'pre',
+  });
+  return config;
 };
diff --git a/examples/cra-ts-kitchen-sink/.storybook/webpack.config.js b/examples/cra-ts-kitchen-sink/.storybook/webpack.config.js
@@ -1,13 +1,10 @@
 const path = require('path');
 
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: /\.tsx?$/,
-        include: path.resolve(__dirname, '../src'),
-        use: [require.resolve('react-docgen-typescript-loader')],
-      },
-    ],
-  },
+module.exports = async ({ config }) => {
+  config.module.rules.push({
+    test: /\.tsx?$/,
+    include: path.resolve(__dirname, '../src'),
+    use: [require.resolve('react-docgen-typescript-loader')],
+  });
+  return config;
 };
diff --git a/examples/ember-cli/.storybook/webpack.config.js b/examples/ember-cli/.storybook/webpack.config.js
@@ -1,14 +1,11 @@
 const path = require('path');
 
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: [/\.stories\.js$/, /index\.js$/],
-        loaders: [require.resolve('@storybook/addon-storysource/loader')],
-        include: [path.resolve(__dirname, '../')],
-        enforce: 'pre',
-      },
-    ],
-  },
+module.exports = async ({ config }) => {
+  config.module.rules.push({
+    test: [/\.stories\.js$/, /index\.js$/],
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    include: [path.resolve(__dirname, '../')],
+    enforce: 'pre',
+  });
+  return config;
 };
diff --git a/examples/html-kitchen-sink/.storybook/webpack.config.js b/examples/html-kitchen-sink/.storybook/webpack.config.js
@@ -1,14 +1,11 @@
 const path = require('path');
 
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: [/\.stories\.js$/, /index\.js$/],
-        loaders: [require.resolve('@storybook/addon-storysource/loader')],
-        include: [path.resolve(__dirname, '../stories')],
-        enforce: 'pre',
-      },
-    ],
-  },
+module.exports = async ({ config }) => {
+  config.module.rules.push({
+    test: [/\.stories\.js$/, /index\.js$/],
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    include: [path.resolve(__dirname, '../stories')],
+    enforce: 'pre',
+  });
+  return config;
 };
diff --git a/examples/marko-cli/.storybook/webpack.config.js b/examples/marko-cli/.storybook/webpack.config.js
@@ -1,14 +1,11 @@
 const path = require('path');
 
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: [/\.stories\.js$/],
-        loaders: [require.resolve('@storybook/addon-storysource/loader')],
-        include: [path.resolve(__dirname, '../src')],
-        enforce: 'pre',
-      },
-    ],
-  },
+module.exports = async ({ config }) => {
+  config.module.rules.push({
+    test: [/\.stories\.js$/],
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    include: [path.resolve(__dirname, '../src')],
+    enforce: 'pre',
+  });
+  return config;
 };
diff --git a/examples/mithril-kitchen-sink/.storybook/webpack.config.js b/examples/mithril-kitchen-sink/.storybook/webpack.config.js
@@ -1,14 +1,11 @@
 const path = require('path');
 
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: [/\.stories\.js$/],
-        loaders: [require.resolve('@storybook/addon-storysource/loader')],
-        include: [path.resolve(__dirname, '../src')],
-        enforce: 'pre',
-      },
-    ],
-  },
+module.exports = async ({ config }) => {
+  config.module.rules.push({
+    test: [/\.stories\.js$/],
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    include: [path.resolve(__dirname, '../src')],
+    enforce: 'pre',
+  });
+  return config;
 };
diff --git a/examples/polymer-cli/.storybook/webpack.config.js b/examples/polymer-cli/.storybook/webpack.config.js
@@ -1,16 +1,13 @@
 const path = require('path');
 const webpack = require('webpack');
 
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: [/\.stories\.js$/, /index\.js$/],
-        loaders: [require.resolve('@storybook/addon-storysource/loader')],
-        include: [path.resolve(__dirname, '../src')],
-        enforce: 'pre',
-      },
-    ],
-  },
-  plugins: [new webpack.IgnorePlugin(/vertx/)],
+module.exports = async ({ config }) => {
+  config.module.rules.push({
+    test: [/\.stories\.js$/, /index\.js$/],
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    include: [path.resolve(__dirname, '../src')],
+    enforce: 'pre',
+  });
+  config.module.plugins.push(new webpack.IgnorePlugin(/vertx/));
+  return config;
 };
diff --git a/examples/preact-kitchen-sink/.storybook/webpack.config.js b/examples/preact-kitchen-sink/.storybook/webpack.config.js
@@ -7,6 +7,5 @@ module.exports = ({ config }) => {
     include: [path.resolve(__dirname, '../src')],
     enforce: 'pre',
   });
-
   return config;
 };
diff --git a/examples/riot-kitchen-sink/.storybook/webpack.config.js b/examples/riot-kitchen-sink/.storybook/webpack.config.js
@@ -1,18 +1,15 @@
 const path = require('path');
 
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: [/\.stories\.js$/, /index\.js$/],
-        loaders: [require.resolve('@storybook/addon-storysource/loader')],
-        include: [path.resolve(__dirname, '../src')],
-        enforce: 'pre',
-      },
-      {
-        test: /\.txt$/,
-        use: 'raw-loader',
-      },
-    ],
-  },
+module.exports = async ({ config }) => {
+  config.module.rules.push({
+    test: [/\.stories\.js$/, /index\.js$/],
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    include: [path.resolve(__dirname, '../src')],
+    enforce: 'pre',
+  });
+  config.module.rules.push({
+    test: /\.txt$/,
+    use: 'raw-loader',
+  });
+  return config;
 };
diff --git a/examples/svelte-kitchen-sink/.storybook/webpack.config.js b/examples/svelte-kitchen-sink/.storybook/webpack.config.js
@@ -1,14 +1,11 @@
 const path = require('path');
 
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: [/\.stories\.js$/, /index\.js$/],
-        loaders: [require.resolve('@storybook/addon-storysource/loader')],
-        include: [path.resolve(__dirname, '../src')],
-        enforce: 'pre',
-      },
-    ],
-  },
+module.exports = async ({ config }) => {
+  config.module.rules.push({
+    test: [/\.stories\.js$/, /index\.js$/],
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    include: [path.resolve(__dirname, '../src')],
+    enforce: 'pre',
+  });
+  return config;
 };
diff --git a/examples/vue-kitchen-sink/.storybook/webpack.config.js b/examples/vue-kitchen-sink/.storybook/webpack.config.js
@@ -1,14 +1,11 @@
 const path = require('path');
 
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: [/\.stories\.js$/, /index\.js$/],
-        loaders: [require.resolve('@storybook/addon-storysource/loader')],
-        include: [path.resolve(__dirname, '../src')],
-        enforce: 'pre',
-      },
-    ],
-  },
+module.exports = async ({ config }) => {
+  config.module.rules.push({
+    test: [/\.stories\.js$/, /index\.js$/],
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    include: [path.resolve(__dirname, '../src')],
+    enforce: 'pre',
+  });
+  return config;
 };