feat: loader plugin load in preset

ccontrols · Apr 16, 2020 · 08f59a0 · 08f59a0
1 parent d37520e
commit 08f59a0
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 13 deletions.
diff --git a/examples/storybook-6-no-docs/.storybook/main.js b/examples/storybook-6-no-docs/.storybook/main.js
@@ -1,5 +1,4 @@
 const path = require('path');
-const storyStorePlugin = require('@component-controls/loader/plugin');
 
 module.exports = {
   presets:[
@@ -109,10 +108,6 @@ module.exports = {
     resolve: {
       ...config.resolve,
       extensions: [...(config.resolve.extensions || []), '.ts', '.tsx'],
-    },
-    plugins: [
-      new storyStorePlugin(),
-      ...config.plugins,
-    ]
+    },    
   }},
 };
diff --git a/examples/storybook-6-no-docs/package.json b/examples/storybook-6-no-docs/package.json
@@ -9,7 +9,6 @@
     "build-storybook": "build-storybook -c .storybook -o ./docs"
   },
   "dependencies": {
-    "@component-controls/loader": "^0.6.0",
     "@component-controls/react-docgen-info": "^0.6.0",
     "@component-controls/react-docgen-typescript-info": "^0.6.0",
     "@component-controls/storybook": "^0.6.0",

diff --git a/examples/storybook-6/.storybook/main.js b/examples/storybook-6/.storybook/main.js
@@ -1,5 +1,4 @@
 const path = require('path');
-const storyStorePlugin = require('@component-controls/loader/plugin');
 
 module.exports = {
   presets:[
@@ -72,9 +71,5 @@ module.exports = {
       ...config.resolve,
       extensions: [...(config.resolve.extensions || []), '.ts', '.tsx'],
     },
-    plugins: [
-      new storyStorePlugin(),
-      ...config.plugins,
-    ]
   }},
 };
diff --git a/examples/storybook-6/package.json b/examples/storybook-6/package.json
@@ -9,7 +9,6 @@
     "build-storybook": "build-storybook -c .storybook -o ../../docs"
   },
   "dependencies": {
-    "@component-controls/loader": "^0.6.0",
     "@component-controls/react-docgen-info": "^0.6.0",
     "@component-controls/react-docgen-typescript-info": "^0.6.0",
     "@component-controls/storybook": "^0.6.0",

diff --git a/integrations/storybook/src/preset.ts b/integrations/storybook/src/preset.ts
@@ -1,4 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
+const storyStorePlugin = require('@component-controls/loader/plugin');
+
 module.exports = {
   config: (entry: any[] = [], options: any = {}) => {
     const result = [...entry];
@@ -13,6 +15,7 @@ module.exports = {
   webpack: (webpackConfig: any = {}, options: any = {}) => {
     const result = {
       ...webpackConfig,
+      plugins: [new storyStorePlugin(), ...webpackConfig.plugins],
     };
     return result;
   },