From 3f9f6e3f9306367d60baaeb738822c568343aa0a Mon Sep 17 00:00:00 2001 From: Ilia Mashkov Date: Sat, 7 Mar 2026 11:16:21 +0300 Subject: [PATCH] refactor(config): move storybook and vitest configs to config/, import app.css in storybook preview --- {.storybook => config/storybook}/main.ts | 0 {.storybook => config/storybook}/preview.ts | 1 + {.storybook => config/storybook}/vitest.setup.ts | 0 {src/shared/config/tests => config/vitest}/setup.ts | 0 package.json | 4 ++-- vitest.config.ts | 6 +++--- vitest.unit.config.ts | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) rename {.storybook => config/storybook}/main.ts (100%) rename {.storybook => config/storybook}/preview.ts (91%) rename {.storybook => config/storybook}/vitest.setup.ts (100%) rename {src/shared/config/tests => config/vitest}/setup.ts (100%) diff --git a/.storybook/main.ts b/config/storybook/main.ts similarity index 100% rename from .storybook/main.ts rename to config/storybook/main.ts diff --git a/.storybook/preview.ts b/config/storybook/preview.ts similarity index 91% rename from .storybook/preview.ts rename to config/storybook/preview.ts index 8678238..9cbac5a 100644 --- a/.storybook/preview.ts +++ b/config/storybook/preview.ts @@ -1,3 +1,4 @@ +import '../../src/app/styles/app.css'; import type { Preview } from '@storybook/sveltekit' const preview: Preview = { diff --git a/.storybook/vitest.setup.ts b/config/storybook/vitest.setup.ts similarity index 100% rename from .storybook/vitest.setup.ts rename to config/storybook/vitest.setup.ts diff --git a/src/shared/config/tests/setup.ts b/config/vitest/setup.ts similarity index 100% rename from src/shared/config/tests/setup.ts rename to config/vitest/setup.ts diff --git a/package.json b/package.json index ae0e489..a0afa1c 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "test:e2e": "playwright test", "test:all": "bun run test && bun run test:e2e", "test:coverage": "vitest --coverage", - "storybook": "storybook dev -p 6006", - "build-storybook": "storybook build" + "storybook": "storybook dev -p 6006 --config-dir config/storybook", + "build-storybook": "storybook build --config-dir config/storybook" }, "devDependencies": { "@biomejs/biome": "^2.4.5", diff --git a/vitest.config.ts b/vitest.config.ts index 74ef881..5739f9f 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -20,7 +20,7 @@ export default defineConfig({ test: { globals: true, environment: "jsdom", - setupFiles: ["./src/shared/config/tests/setup.ts"], + setupFiles: ["./config/vitest/setup.ts"], include: ["src/**/*.test.{js,ts}"], exclude: ["src/**/*.e2e.{js,ts}"], projects: [ @@ -30,7 +30,7 @@ export default defineConfig({ // The plugin will run tests for the stories defined in your Storybook config // See options at: https://storybook.js.org/docs/next/writing-tests/integrations/vitest-addon#storybooktest storybookTest({ - configDir: path.join(dirname, ".storybook"), + configDir: path.join(dirname, "config/storybook"), }), ], test: { @@ -45,7 +45,7 @@ export default defineConfig({ }, ], }, - setupFiles: [".storybook/vitest.setup.ts"], + setupFiles: ["./config/storybook/vitest.setup.ts"], }, }, ], diff --git a/vitest.unit.config.ts b/vitest.unit.config.ts index eab706f..b8c3dfa 100644 --- a/vitest.unit.config.ts +++ b/vitest.unit.config.ts @@ -17,7 +17,7 @@ export default defineConfig({ test: { globals: true, environment: "jsdom", - setupFiles: ["./src/shared/config/tests/setup.ts"], + setupFiles: ["./config/vitest/setup.ts"], include: ["src/**/*.test.{js,ts}"], exclude: ["src/**/*.e2e.{js,ts}"], },