Fix vite framework preset types

code/frameworks/html-vite/src/preset.ts

@@ -1,6 +1,7 @@
-import type { StorybookConfig } from '@storybook/builder-vite';
+import type { PresetProperty } from '@storybook/types';
+import type { StorybookConfig } from './types';
 
-export const core: StorybookConfig['core'] = {
+export const core: PresetProperty<'core', StorybookConfig> = {
   builder: '@storybook/builder-vite',
   renderer: '@storybook/html',
 };

code/frameworks/html-vite/src/types.ts

@@ -15,7 +15,7 @@ type StorybookConfigFramework = {
         name: FrameworkName;
         options: FrameworkOptions;
       };
-  core?: {
+  core?: StorybookConfigBase['core'] & {
     builder?:
       | BuilderName
       | {

code/frameworks/preact-vite/src/preset.ts

@@ -1,8 +1,9 @@
-import type { StorybookConfig } from '@storybook/builder-vite';
 import { hasVitePlugins } from '@storybook/builder-vite';
+import type { PresetProperty } from '@storybook/types';
 import preact from '@preact/preset-vite';
+import type { StorybookConfig } from './types';
 
-export const core: StorybookConfig['core'] = {
+export const core: PresetProperty<'core', StorybookConfig> = {
   builder: '@storybook/builder-vite',
   renderer: '@storybook/preact',
 };

code/frameworks/preact-vite/src/types.ts

@@ -15,7 +15,7 @@ type StorybookConfigFramework = {
         name: FrameworkName;
         options: FrameworkOptions;
       };
-  core?: {
+  core?: StorybookConfigBase['core'] & {
     builder?:
       | BuilderName
       | {

code/frameworks/react-vite/src/preset.ts

@@ -1,8 +1,9 @@
 /* eslint-disable global-require */
-import type { StorybookConfig } from '@storybook/builder-vite';
+import type { PresetProperty } from '@storybook/types';
 import { hasVitePlugins } from '@storybook/builder-vite';
+import type { StorybookConfig } from './types';
 
-export const core: StorybookConfig['core'] = {
+export const core: PresetProperty<'core', StorybookConfig> = {
   builder: '@storybook/builder-vite',
   renderer: '@storybook/react',
 };

code/frameworks/react-vite/src/types.ts

@@ -15,7 +15,7 @@ type StorybookConfigFramework = {
         name: FrameworkName;
         options: FrameworkOptions;
       };
-  core?: {
+  core?: StorybookConfigBase['core'] & {
     builder?:
       | BuilderName
       | {

code/frameworks/svelte-vite/src/preset.ts

@@ -1,8 +1,10 @@
-import { type StorybookConfig, hasVitePlugins } from '@storybook/builder-vite';
+import { hasVitePlugins } from '@storybook/builder-vite';
+import type { PresetProperty } from '@storybook/types';
+import type { StorybookConfig } from './types';
 import { handleSvelteKit } from './utils';
 import { svelteDocgen } from './plugins/svelte-docgen';
 
-export const core: StorybookConfig['core'] = {
+export const core: PresetProperty<'core', StorybookConfig> = {
   builder: '@storybook/builder-vite',
   renderer: '@storybook/svelte',
 };

code/frameworks/svelte-vite/src/types.ts

@@ -15,7 +15,7 @@ type StorybookConfigFramework = {
         name: FrameworkName;
         options: FrameworkOptions;
       };
-  core?: {
+  core?: StorybookConfigBase['core'] & {
     builder?:
       | BuilderName
       | {

code/frameworks/sveltekit/src/preset.ts

@@ -1,9 +1,10 @@
-import { type StorybookConfig } from '@storybook/svelte-vite';
 // @ts-expect-error -- TS picks up the type from preset.js instead of dist/preset.d.ts
 import { viteFinal as svelteViteFinal } from '@storybook/svelte-vite/preset';
+import type { PresetProperty } from '@storybook/types';
 import { withoutVitePlugins } from '@storybook/builder-vite';
+import { type StorybookConfig } from './types';
 
-export const core: StorybookConfig['core'] = {
+export const core: PresetProperty<'core', StorybookConfig> = {
   builder: '@storybook/builder-vite',
   renderer: '@storybook/svelte',
 };

code/frameworks/sveltekit/src/types.ts

@@ -15,7 +15,7 @@ type StorybookConfigFramework = {
         name: FrameworkName;
         options: FrameworkOptions;
       };
-  core?: {
+  core?: StorybookConfigBase['core'] & {
     builder?:
       | BuilderName
       | {

code/frameworks/vue-vite/src/preset.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 import type { PresetProperty } from '@storybook/types';
-import type { StorybookConfig } from '@storybook/builder-vite';
+import type { StorybookConfig } from './types';
 import { vueDocgen } from './plugins/vue-docgen';
 
 export const core: PresetProperty<'core', StorybookConfig> = async (config, options) => {
@@ -11,7 +11,7 @@ export const core: PresetProperty<'core', StorybookConfig> = async (config, opti
     builder: {
       name: path.dirname(
         require.resolve(path.join('@storybook/builder-vite', 'package.json'))
-      ) as '@storybook/builder-webpack5',
+      ) as '@storybook/builder-vite',
       options: typeof framework === 'string' ? {} : framework?.options.builder || {},
     },
     renderer: '@storybook/vue',

code/frameworks/vue-vite/src/types.ts

@@ -15,7 +15,7 @@ type StorybookConfigFramework = {
         name: FrameworkName;
         options: FrameworkOptions;
       };
-  core?: {
+  core?: StorybookConfigBase['core'] & {
     builder?:
       | BuilderName
       | {

code/frameworks/vue3-vite/src/preset.ts

@@ -1,8 +1,9 @@
-import type { StorybookConfig } from '@storybook/builder-vite';
 import { hasVitePlugins } from '@storybook/builder-vite';
+import type { PresetProperty } from '@storybook/types';
+import type { StorybookConfig } from './types';
 import { vueDocgen } from './plugins/vue-docgen';
 
-export const core: StorybookConfig['core'] = {
+export const core: PresetProperty<'core', StorybookConfig> = {
   builder: '@storybook/builder-vite',
   renderer: '@storybook/vue3',
 };

code/frameworks/vue3-vite/src/types.ts

@@ -15,7 +15,7 @@ type StorybookConfigFramework = {
         name: FrameworkName;
         options: FrameworkOptions;
       };
-  core?: {
+  core?: StorybookConfigBase['core'] & {
     builder?:
       | BuilderName
       | {

code/frameworks/web-components-vite/src/preset.ts

@@ -1,6 +1,7 @@
-import type { StorybookConfig } from '@storybook/builder-vite';
+import type { PresetProperty } from '@storybook/types';
+import type { StorybookConfig } from './types';
 
-export const core: StorybookConfig['core'] = {
+export const core: PresetProperty<'core', StorybookConfig> = {
   builder: '@storybook/builder-vite',
   renderer: '@storybook/web-components',
 };

code/frameworks/web-components-vite/src/types.ts

@@ -15,7 +15,7 @@ type StorybookConfigFramework = {
         name: FrameworkName;
         options: FrameworkOptions;
       };
-  core?: {
+  core?: StorybookConfigBase['core'] & {
     builder?:
       | BuilderName
       | {