From 5f0da62d058331007c3134209359b51e29af0edf Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Sun, 5 Feb 2023 14:21:15 -0800 Subject: [PATCH 1/4] fix: remove unnecessary stuff from Svelte plugin --- code/frameworks/svelte-vite/src/preset.ts | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/code/frameworks/svelte-vite/src/preset.ts b/code/frameworks/svelte-vite/src/preset.ts index 870755ac6094..1b91a4310804 100644 --- a/code/frameworks/svelte-vite/src/preset.ts +++ b/code/frameworks/svelte-vite/src/preset.ts @@ -13,18 +13,8 @@ export const viteFinal: NonNullable = async (confi const { plugins = [] } = config; // TODO: set up eslint import to use typescript resolver // eslint-disable-next-line import/no-unresolved - const { svelte, loadSvelteConfig } = await import('@sveltejs/vite-plugin-svelte'); - const svelteOptions: Record = await options.presets.apply( - 'svelteOptions', - {}, - options - ); - const svelteConfig = { ...(await loadSvelteConfig()), ...svelteOptions }; - - // Add svelte plugin if not present - if (!(await hasVitePlugins(plugins, ['vite-plugin-svelte']))) { - plugins.push(svelte()); - } + const { loadSvelteConfig } = await import('@sveltejs/vite-plugin-svelte'); + const svelteConfig = await loadSvelteConfig(); // Add docgen plugin plugins.push(svelteDocgen(svelteConfig)); From 2a2cc2b26b943a4a94088b102fc4459239bf2913 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Sun, 5 Feb 2023 14:30:29 -0800 Subject: [PATCH 2/4] fix: remove unused import --- code/frameworks/svelte-vite/src/preset.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/code/frameworks/svelte-vite/src/preset.ts b/code/frameworks/svelte-vite/src/preset.ts index 1b91a4310804..0db8c360e08b 100644 --- a/code/frameworks/svelte-vite/src/preset.ts +++ b/code/frameworks/svelte-vite/src/preset.ts @@ -1,4 +1,3 @@ -import { hasVitePlugins } from '@storybook/builder-vite'; import type { PresetProperty } from '@storybook/types'; import type { StorybookConfig } from './types'; import { handleSvelteKit } from './utils'; From 167056a3add98f4cd5267bd54bdae13fdebd1b73 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Mon, 6 Feb 2023 09:06:23 -0800 Subject: [PATCH 3/4] use vite-plugin-svelte by default again --- code/frameworks/svelte-vite/src/preset.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/frameworks/svelte-vite/src/preset.ts b/code/frameworks/svelte-vite/src/preset.ts index 0db8c360e08b..6471dcefd67f 100644 --- a/code/frameworks/svelte-vite/src/preset.ts +++ b/code/frameworks/svelte-vite/src/preset.ts @@ -1,3 +1,4 @@ +import { hasVitePlugins } from '@storybook/builder-vite'; import type { PresetProperty } from '@storybook/types'; import type { StorybookConfig } from './types'; import { handleSvelteKit } from './utils'; @@ -15,6 +16,11 @@ export const viteFinal: NonNullable = async (confi const { loadSvelteConfig } = await import('@sveltejs/vite-plugin-svelte'); const svelteConfig = await loadSvelteConfig(); + // Add svelte plugin if the user does not have a Vite config of their own + if (!(await hasVitePlugins(plugins, ['vite-plugin-svelte']))) { + plugins.push(svelte()); + } + // Add docgen plugin plugins.push(svelteDocgen(svelteConfig)); From edad6bcd610de6a374f6fe660832557c4e2277c1 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Mon, 6 Feb 2023 09:31:48 -0800 Subject: [PATCH 4/4] Update preset.ts --- code/frameworks/svelte-vite/src/preset.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/frameworks/svelte-vite/src/preset.ts b/code/frameworks/svelte-vite/src/preset.ts index 6471dcefd67f..bf7a7f742511 100644 --- a/code/frameworks/svelte-vite/src/preset.ts +++ b/code/frameworks/svelte-vite/src/preset.ts @@ -13,7 +13,7 @@ export const viteFinal: NonNullable = async (confi const { plugins = [] } = config; // TODO: set up eslint import to use typescript resolver // eslint-disable-next-line import/no-unresolved - const { loadSvelteConfig } = await import('@sveltejs/vite-plugin-svelte'); + const { svelte, loadSvelteConfig } = await import('@sveltejs/vite-plugin-svelte'); const svelteConfig = await loadSvelteConfig(); // Add svelte plugin if the user does not have a Vite config of their own