Merge pull request #18979 from storybookjs/shilman/fix-framework-options

Core: Fix frameworkOptions preset
storybookjs · Aug 22, 2022 · 9b71ead · 9b71ead
2 parents aff724a + 91389d5
commit 9b71ead
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/code/lib/builder-webpack5/src/index.ts b/code/lib/builder-webpack5/src/index.ts
@@ -41,7 +41,7 @@ export const getConfig: WebpackBuilder['getConfig'] = async (options) => {
   const { presets } = options;
   const typescriptOptions = await presets.apply('typescript', {}, options);
   const babelOptions = await presets.apply('babel', {}, { ...options, typescriptOptions });
-  const framework = await presets.apply<any>('framework', {}, options);
+  const frameworkOptions = await presets.apply<any>('frameworkOptions');
 
   return presets.apply(
     'webpack',
@@ -50,7 +50,7 @@ export const getConfig: WebpackBuilder['getConfig'] = async (options) => {
       ...options,
       babelOptions,
       typescriptOptions,
-      frameworkOptions: typeof framework === 'string' ? {} : framework?.options,
+      frameworkOptions,
     }
   ) as any;
 };

diff --git a/code/lib/core-server/src/presets/common-preset.ts b/code/lib/core-server/src/presets/common-preset.ts
@@ -125,23 +125,18 @@ export const storyIndexers = async (indexers?: StoryIndexer[]) => {
 export const frameworkOptions = async (
   _: never,
   options: Options
-): Promise<StorybookConfig['framework']> => {
+): Promise<Record<string, any> | null> => {
   const config = await options.presets.apply<StorybookConfig['framework']>('framework');
 
   if (typeof config === 'string') {
-    return {
-      name: config,
-      options: {},
-    };
+    return {};
   }
+
   if (typeof config === 'undefined') {
     return null;
   }
 
-  return {
-    name: config.name,
-    options: config.options,
-  };
+  return config.options;
 };
 
 export const docs = (