fixes

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',
   });
 };

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<StorybookConfig> & Record<string, unknown>;
+  main: Partial<StorybookConfigRaw> & Record<string, unknown>;
 }) => {
   return autodocsTrue.check({
     packageManager: makePackageManager(packageJson),
-    mainConfig: mainConfig as StorybookConfig,
+    mainConfig: mainConfig as StorybookConfigRaw,
     storybookVersion: '7.0.0',
   });
 };

code/lib/cli/src/automigrate/fixes/bare-mdx-stories-glob.test.ts

@@ -1,6 +1,6 @@
 /// <reference types="@types/jest" />;
 
-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<StorybookConfig> & Record<string, unknown>;
+  main?: Partial<StorybookConfigRaw> & Record<string, unknown>;
   storybookVersion?: string;
 }) => {
   return bareMdxStoriesGlob.check({
-    mainConfig: mainConfig as StorybookConfig,
+    mainConfig: mainConfig as StorybookConfigRaw,
     packageManager: makePackageManager(packageJson),
     storybookVersion,
   });

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<StorybookConfig> & Record<string, unknown>;
+  main: Partial<StorybookConfigRaw> & Record<string, unknown>;
 }) => {
   return builderVite.check({
-    mainConfig: mainConfig as StorybookConfig,
+    mainConfig: mainConfig as StorybookConfigRaw,
     packageManager: makePackageManager(packageJson),
     storybookVersion: '7.0.0',
   });

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<StorybookConfig> & Record<string, unknown>;
+  main?: Partial<StorybookConfigRaw> & Record<string, unknown>;
   storybookVersion?: string;
 }) => {
   return cra5.check({
     packageManager,
-    mainConfig: mainConfig as StorybookConfig,
+    mainConfig: mainConfig as StorybookConfigRaw,
     storybookVersion,
   });
 };

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: [],

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')) {

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}`

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 }> => {

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;

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 = <I extends string>(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,