diff --git a/client/.storybook/main.tsx b/client/.storybook/main.tsx index 5844b215..cffdf0a3 100644 --- a/client/.storybook/main.tsx +++ b/client/.storybook/main.tsx @@ -1,35 +1,13 @@ -import path, { dirname } from "path"; -import { fileURLToPath } from "url"; - -// Setup filenames and directory paths -const __filename = fileURLToPath(import.meta.url); -const __dirname = dirname(__filename); - -/** @type { import('@storybook/react-webpack5').StorybookConfig } */ +/** @type { import('@storybook/react-vite').StorybookConfig } */ const config = { stories: ["../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"], addons: [ - "@storybook/addon-webpack5-compiler-swc", + "@storybook/builder-vite", "@storybook/addon-a11y", "@storybook/addon-docs", "@storybook/addon-onboarding", "storybook-addon-apollo-client", ], - framework: "@storybook/react-webpack5", - webpackFinal: async (config) => { - // Match path aliases from webpack.common.js - config.resolve.alias = { - ...config.resolve.alias, - "@components": path.resolve(__dirname, "../src/components/"), - "@database": path.resolve(__dirname, "../src/database/"), - "@hooks": path.resolve(__dirname, "../src/hooks/"), - "@lib": path.resolve(__dirname, "../src/lib/"), - "@pages": path.resolve(__dirname, "../src/pages/"), - "@types": path.resolve(__dirname, "../../types"), - "@variables": path.resolve(__dirname, "../src/variables"), - }; - - return config; - }, + framework: "@storybook/react-vite", }; export default config; diff --git a/client/.storybook/preview.tsx b/client/.storybook/preview.tsx index 9ffe600a..7691b693 100644 --- a/client/.storybook/preview.tsx +++ b/client/.storybook/preview.tsx @@ -1,3 +1,6 @@ +// React imports +import React from "react"; + // Storybook imports import type { Preview } from "@storybook/react"; diff --git a/client/babel.config.json b/client/babel.config.json deleted file mode 100644 index f406f678..00000000 --- a/client/babel.config.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript"] -} diff --git a/website/src/index.html b/client/index.html similarity index 66% rename from website/src/index.html rename to client/index.html index 422a649c..1cc36a0f 100644 --- a/website/src/index.html +++ b/client/index.html @@ -4,9 +4,10 @@