Fix TS errors

storybookjs · Feb 6, 2024 · fdd7a22 · fdd7a22
1 parent 1801d3d
commit fdd7a22
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/code/frameworks/ember/src/preset.ts b/code/frameworks/ember/src/preset.ts
@@ -1,4 +1,6 @@
 import { dirname, join } from 'path';
+import { getVirtualModules } from '@storybook/builder-webpack5';
+import { getProjectRoot, resolvePathInStorybookCache } from '@storybook/core-common';
 import type { PresetProperty } from '@storybook/types';
 import type { StorybookConfig } from './types';
 

diff --git a/code/frameworks/nextjs/src/preset.ts b/code/frameworks/nextjs/src/preset.ts
@@ -1,6 +1,6 @@
 // https://storybook.js.org/docs/react/addons/writing-presets
 import { dirname, join } from 'path';
-import type { Options, PresetProperty } from '@storybook/types';
+import type { PresetProperty } from '@storybook/types';
 import type { ConfigItem, PluginItem, TransformOptions } from '@babel/core';
 import { loadPartialConfig } from '@babel/core';
 import { getProjectRoot } from '@storybook/core-common';
@@ -104,7 +104,10 @@ export const babel = async (baseConfig: TransformOptions): Promise<TransformOpti
 };
 
 export const webpackFinal: StorybookConfig['webpackFinal'] = async (baseConfig, options) => {
-  const { nextConfigPath } = await options.presets.apply<FrameworkOptions>('frameworkOptions');
+  const { builder, nextConfigPath } = await options.presets.apply<FrameworkOptions>(
+    'frameworkOptions'
+  );
+
   const nextConfig = await configureConfig({
     baseConfig,
     nextConfigPath,

diff --git a/code/frameworks/vue3-webpack5/src/preset.ts b/code/frameworks/vue3-webpack5/src/preset.ts
@@ -6,8 +6,8 @@ const getAbsolutePath = <I extends string>(input: I): I =>
 
 export const addons: PresetProperty<'addons'> = [getAbsolutePath('@storybook/preset-vue3-webpack')];
 
-export const core: PresetProperty<'core', StorybookConfig> = async (config, options) => {
-  const framework = await options.presets.apply<StorybookConfig['framework']>('framework');
+export const core: PresetProperty<'core'> = async (config, options) => {
+  const framework = await options.presets.apply('framework');
 
   return {
     ...config,
@@ -19,7 +19,7 @@ export const core: PresetProperty<'core', StorybookConfig> = async (config, opti
   };
 };
 
-export const typescript: PresetProperty<'typescript', StorybookConfig> = async (config) => ({
+export const typescript: PresetProperty<'typescript'> = async (config) => ({
   ...config,
   skipBabel: true,
   skipCompiler: true,

diff --git a/code/lib/types/src/modules/core-common.ts b/code/lib/types/src/modules/core-common.ts
@@ -67,9 +67,9 @@ interface DirectoryMapping {
 export interface Presets {
   apply(
     extension: 'typescript',
-    config: TypescriptOptions,
+    config: Partial<TypescriptOptions>,
     args?: Options
-  ): Promise<TypescriptOptions>;
+  ): Promise<Partial<TypescriptOptions>>;
   apply(extension: 'framework', config?: {}, args?: any): Promise<Preset>;
   apply(extension: 'babel', config?: {}, args?: any): Promise<BabelOptions>;
   apply(extension: 'swc', config?: {}, args?: any): Promise<SWCOptions>;