From 935369f987ba4c679040ddcde72539f91a03c7c3 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 27 Nov 2023 17:05:46 +0100 Subject: [PATCH] fixes --- code/lib/cli/src/automigrate/fixes/add-react.test.ts | 4 ++-- .../cli/src/automigrate/fixes/autodocs-true.test.ts | 6 +++--- .../automigrate/fixes/bare-mdx-stories-glob.test.ts | 6 +++--- .../lib/cli/src/automigrate/fixes/builder-vite.test.ts | 6 +++--- code/lib/cli/src/automigrate/fixes/cra5.test.ts | 6 +++--- .../automigrate/helpers/checkWebpack5Builder.test.ts | 4 ++-- .../src/automigrate/helpers/checkWebpack5Builder.ts | 4 ++-- code/lib/cli/src/automigrate/helpers/mainConfigFile.ts | 10 +++++----- .../src/automigrate/helpers/new-frameworks-utils.ts | 4 ++-- code/lib/cli/src/automigrate/types.ts | 4 ++-- .../react-webpack/src/framework-preset-react.ts | 6 +++--- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/code/lib/cli/src/automigrate/fixes/add-react.test.ts b/code/lib/cli/src/automigrate/fixes/add-react.test.ts index 4602a30d3ecd..9b7103625de7 100644 --- a/code/lib/cli/src/automigrate/fixes/add-react.test.ts +++ b/code/lib/cli/src/automigrate/fixes/add-react.test.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/types'; +import type { StorybookConfigRaw } from '@storybook/types'; import type { JsPackageManager, PackageJson } from '../../js-package-manager'; import { addReact } from './add-react'; @@ -9,7 +9,7 @@ const checkAddReact = async (packageJson: PackageJson) => { return addReact.check({ packageManager, - mainConfig: {} as StorybookConfig, + mainConfig: {} as StorybookConfigRaw, storybookVersion: '7.0.0', }); }; diff --git a/code/lib/cli/src/automigrate/fixes/autodocs-true.test.ts b/code/lib/cli/src/automigrate/fixes/autodocs-true.test.ts index c21de1bd9727..af244a8ad073 100644 --- a/code/lib/cli/src/automigrate/fixes/autodocs-true.test.ts +++ b/code/lib/cli/src/automigrate/fixes/autodocs-true.test.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/types'; +import type { StorybookConfigRaw } from '@storybook/types'; import type { PackageJson } from '../../js-package-manager'; import { makePackageManager } from '../helpers/testing-helpers'; import { autodocsTrue } from './autodocs-true'; @@ -8,11 +8,11 @@ const checkAutodocs = async ({ main: mainConfig, }: { packageJson?: PackageJson; - main: Partial & Record; + main: Partial & Record; }) => { return autodocsTrue.check({ packageManager: makePackageManager(packageJson), - mainConfig: mainConfig as StorybookConfig, + mainConfig: mainConfig as StorybookConfigRaw, storybookVersion: '7.0.0', }); }; diff --git a/code/lib/cli/src/automigrate/fixes/bare-mdx-stories-glob.test.ts b/code/lib/cli/src/automigrate/fixes/bare-mdx-stories-glob.test.ts index 7354fca3c4a9..46ea29710724 100644 --- a/code/lib/cli/src/automigrate/fixes/bare-mdx-stories-glob.test.ts +++ b/code/lib/cli/src/automigrate/fixes/bare-mdx-stories-glob.test.ts @@ -1,6 +1,6 @@ /// ; -import type { StorybookConfig } from '@storybook/types'; +import type { StorybookConfigRaw } from '@storybook/types'; import type { PackageJson } from '../../js-package-manager'; import { ansiRegex } from '../helpers/cleanLog'; import { makePackageManager } from '../helpers/testing-helpers'; @@ -13,11 +13,11 @@ const checkBareMdxStoriesGlob = async ({ storybookVersion = '7.0.0', }: { packageJson: PackageJson; - main?: Partial & Record; + main?: Partial & Record; storybookVersion?: string; }) => { return bareMdxStoriesGlob.check({ - mainConfig: mainConfig as StorybookConfig, + mainConfig: mainConfig as StorybookConfigRaw, packageManager: makePackageManager(packageJson), storybookVersion, }); diff --git a/code/lib/cli/src/automigrate/fixes/builder-vite.test.ts b/code/lib/cli/src/automigrate/fixes/builder-vite.test.ts index 20b8f935c0e7..4905a22c2d9b 100644 --- a/code/lib/cli/src/automigrate/fixes/builder-vite.test.ts +++ b/code/lib/cli/src/automigrate/fixes/builder-vite.test.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/types'; +import type { StorybookConfigRaw } from '@storybook/types'; import { makePackageManager } from '../helpers/testing-helpers'; import type { PackageJson } from '../../js-package-manager'; import { builderVite } from './builder-vite'; @@ -8,10 +8,10 @@ const checkBuilderVite = async ({ main: mainConfig, }: { packageJson?: PackageJson; - main: Partial & Record; + main: Partial & Record; }) => { return builderVite.check({ - mainConfig: mainConfig as StorybookConfig, + mainConfig: mainConfig as StorybookConfigRaw, packageManager: makePackageManager(packageJson), storybookVersion: '7.0.0', }); diff --git a/code/lib/cli/src/automigrate/fixes/cra5.test.ts b/code/lib/cli/src/automigrate/fixes/cra5.test.ts index 15ef6485851d..1eedffc0a12f 100644 --- a/code/lib/cli/src/automigrate/fixes/cra5.test.ts +++ b/code/lib/cli/src/automigrate/fixes/cra5.test.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/types'; +import type { StorybookConfigRaw } from '@storybook/types'; import type { JsPackageManager } from '../../js-package-manager'; import { cra5 } from './cra5'; @@ -8,12 +8,12 @@ const checkCra5 = async ({ storybookVersion = '7.0.0', }: { packageManager: any; - main?: Partial & Record; + main?: Partial & Record; storybookVersion?: string; }) => { return cra5.check({ packageManager, - mainConfig: mainConfig as StorybookConfig, + mainConfig: mainConfig as StorybookConfigRaw, storybookVersion, }); }; diff --git a/code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.test.ts b/code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.test.ts index 51cb622baf42..89428a48fb2d 100644 --- a/code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.test.ts +++ b/code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.test.ts @@ -1,8 +1,8 @@ -import type { StorybookConfig } from '@storybook/types'; +import type { StorybookConfigRaw } from '@storybook/types'; import { checkWebpack5Builder } from './checkWebpack5Builder'; import { getBuilderPackageName } from './mainConfigFile'; -const mockMainConfig: StorybookConfig = { +const mockMainConfig: StorybookConfigRaw = { framework: 'react', addons: [], stories: [], diff --git a/code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.ts b/code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.ts index 8d59d62d0bcc..860b68fb0718 100644 --- a/code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.ts +++ b/code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.ts @@ -1,7 +1,7 @@ import chalk from 'chalk'; import semver from 'semver'; import dedent from 'ts-dedent'; -import type { StorybookConfig } from '@storybook/types'; +import type { StorybookConfigRaw } from '@storybook/types'; import { getBuilderPackageName } from './mainConfigFile'; const logger = console; @@ -10,7 +10,7 @@ export const checkWebpack5Builder = async ({ mainConfig, storybookVersion, }: { - mainConfig: StorybookConfig; + mainConfig: StorybookConfigRaw; storybookVersion: string; }) => { if (semver.lt(storybookVersion, '6.3.0')) { diff --git a/code/lib/cli/src/automigrate/helpers/mainConfigFile.ts b/code/lib/cli/src/automigrate/helpers/mainConfigFile.ts index b5325df31ac2..188e9bd9d99b 100644 --- a/code/lib/cli/src/automigrate/helpers/mainConfigFile.ts +++ b/code/lib/cli/src/automigrate/helpers/mainConfigFile.ts @@ -5,7 +5,7 @@ import { frameworkPackages, builderPackages, } from '@storybook/core-common'; -import type { StorybookConfig } from '@storybook/types'; +import type { StorybookConfigRaw, StorybookConfig } from '@storybook/types'; import type { ConfigFile } from '@storybook/csf-tools'; import { readConfig, writeConfig as writeConfigFile } from '@storybook/csf-tools'; import chalk from 'chalk'; @@ -21,7 +21,7 @@ const logger = console; * @param mainConfig - The main Storybook configuration object to lookup. * @returns - The package name of the framework. If not found, returns null. */ -export const getFrameworkPackageName = (mainConfig?: StorybookConfig) => { +export const getFrameworkPackageName = (mainConfig?: StorybookConfigRaw) => { const packageNameOrPath = typeof mainConfig?.framework === 'string' ? mainConfig.framework : mainConfig?.framework?.name; @@ -41,7 +41,7 @@ export const getFrameworkPackageName = (mainConfig?: StorybookConfig) => { * @param mainConfig - The main Storybook configuration object to lookup. * @returns - The package name of the builder. If not found, returns null. */ -export const getBuilderPackageName = (mainConfig?: StorybookConfig) => { +export const getBuilderPackageName = (mainConfig?: StorybookConfigRaw) => { const packageNameOrPath = typeof mainConfig?.core?.builder === 'string' ? mainConfig.core.builder @@ -97,9 +97,9 @@ export const getStorybookData = async ({ const configDir = userDefinedConfigDir || configDirFromScript || '.storybook'; - let mainConfig: StorybookConfig; + let mainConfig: StorybookConfigRaw; try { - mainConfig = await loadMainConfig({ configDir, noCache: true }); + mainConfig = (await loadMainConfig({ configDir, noCache: true })) as StorybookConfigRaw; } catch (err) { throw new Error( dedent`Unable to find or evaluate ${chalk.blue(mainConfigPath)}: ${err.message}` diff --git a/code/lib/cli/src/automigrate/helpers/new-frameworks-utils.ts b/code/lib/cli/src/automigrate/helpers/new-frameworks-utils.ts index db84aaa3b245..3f7348e0c7a5 100644 --- a/code/lib/cli/src/automigrate/helpers/new-frameworks-utils.ts +++ b/code/lib/cli/src/automigrate/helpers/new-frameworks-utils.ts @@ -1,5 +1,5 @@ import { frameworkPackages } from '@storybook/core-common'; -import type { Preset, StorybookConfig } from '@storybook/types'; +import type { Preset, StorybookConfigRaw } from '@storybook/types'; import findUp from 'find-up'; import type { JsPackageManager } from '../../js-package-manager'; import { getBuilderPackageName, getFrameworkPackageName } from './mainConfigFile'; @@ -66,7 +66,7 @@ export const detectBuilderInfo = async ({ configDir, packageManager, }: { - mainConfig: StorybookConfig & { builder?: string | Preset }; + mainConfig: StorybookConfigRaw & { builder?: string | Preset }; configDir: string; packageManager: JsPackageManager; }): Promise<{ name: BuilderType; options: any }> => { diff --git a/code/lib/cli/src/automigrate/types.ts b/code/lib/cli/src/automigrate/types.ts index 740dfa3a0451..a2c124c09629 100644 --- a/code/lib/cli/src/automigrate/types.ts +++ b/code/lib/cli/src/automigrate/types.ts @@ -1,11 +1,11 @@ -import type { StorybookConfig } from '@storybook/types'; +import type { StorybookConfigRaw } from '@storybook/types'; import type { JsPackageManager, PackageManagerName } from '../js-package-manager'; export interface CheckOptions { packageManager: JsPackageManager; rendererPackage?: string; configDir?: string; - mainConfig: StorybookConfig; + mainConfig: StorybookConfigRaw; storybookVersion: string; previewConfigPath?: string; mainConfigPath?: string; diff --git a/code/presets/react-webpack/src/framework-preset-react.ts b/code/presets/react-webpack/src/framework-preset-react.ts index c01e0550974f..a3a1d273189c 100644 --- a/code/presets/react-webpack/src/framework-preset-react.ts +++ b/code/presets/react-webpack/src/framework-preset-react.ts @@ -4,7 +4,7 @@ import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin'; import { logger } from '@storybook/node-logger'; import type { Options, Preset } from '@storybook/core-webpack'; -import type { PresetProperty } from 'lib/types/dist'; +import type { PresetProperty, PresetPropertyFn } from 'lib/types/dist'; import type { StorybookConfig, ReactOptions } from './types'; const getAbsolutePath = (input: I): I => @@ -17,7 +17,7 @@ const applyFastRefresh = async (options: Options) => { return isDevelopment && (reactOptions.fastRefresh || process.env.FAST_REFRESH === 'true'); }; -export const babel: PresetProperty<'babel'> = async (config, options) => { +export const babel: PresetPropertyFn<'babel'> = async (config, options) => { if (!(await applyFastRefresh(options))) return config; return { @@ -43,7 +43,7 @@ const hasJsxRuntime = () => { } }; -export const babelDefault: PresetProperty<'babelDefault'> = async (config) => { +export const babelDefault: PresetPropertyFn<'babelDefault'> = async (config) => { const presetReactOptions = hasJsxRuntime() ? { runtime: 'automatic' } : {}; return { ...config,