fix: loader options update for instrument

ccontrols · Mar 6, 2020 · 89645a8 · 89645a8
1 parent 93bc1f4
commit 89645a8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/core/loader/src/loader.ts b/core/loader/src/loader.ts
@@ -9,16 +9,16 @@ import { addStoriesKind } from './store';
 
 module.exports.default = async function(source: string) {
   const options: LoaderOptions = getOptions(this) || {};
-  const { type = 'csf', prettier } = options;
+  const { type = 'csf', ...instrumentOptions } = options;
   const context = this as loader.LoaderContext;
   const filePath = context.resourcePath;
   let store: StoriesStore;
   switch (type) {
     case 'csf':
-      store = await parseCSF(source, filePath, prettier);
+      store = await parseCSF(source, filePath, instrumentOptions);
       break;
     case 'mdx':
-      store = await parseMDX(source, filePath, prettier);
+      store = await parseMDX(source, filePath, instrumentOptions);
       break;
   }
   if (store) {

diff --git a/core/loader/src/types.ts b/core/loader/src/types.ts
@@ -1,6 +1,5 @@
-import { PrettierOptions } from '@component-controls/instrument';
+import { InstrumentOptions } from '@component-controls/instrument';
 
-export interface LoaderOptions {
+export type LoaderOptions = {
   type?: 'csf' | 'mdx';
-  prettier?: PrettierOptions;
-}
+} & InstrumentOptions;
diff --git a/examples/storybook-5/.storybook/main.js b/examples/storybook-5/.storybook/main.js
@@ -44,7 +44,7 @@ module.exports = {
           options: {
             type: 'csf',
             prettier: {
-              tabWidth: 2,
+              tabWidth: 4,
             }
           },
         },