diff --git a/.vscode/settings.json b/.vscode/settings.json index 44a73ec..a8aaff5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,10 @@ { "mode": "auto" } - ] + ], + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll.eslint": "explicit", + "source.organizeImports": "explicit" + } } diff --git a/apps/storybook/.storybook/main.ts b/apps/storybook/.storybook/main.ts index ad09282..38dac33 100644 --- a/apps/storybook/.storybook/main.ts +++ b/apps/storybook/.storybook/main.ts @@ -2,11 +2,16 @@ import type { StorybookConfig } from "@storybook/react-vite"; import { vanillaExtractPlugin } from "@vanilla-extract/vite-plugin"; const config: StorybookConfig = { - stories: ["../../../packages/ui/src/**/*.stories.@(js|jsx|ts|tsx)"], + stories: [ + "../../../packages/ui/src/**/*.stories.@(js|jsx|ts|tsx)", + "../../../packages/ui/src/**/*.mdx", // 문서화용 MDX 파일 추가 + ], addons: [ "@storybook/addon-links", "@storybook/addon-essentials", "@storybook/addon-interactions", + "@storybook/addon-docs", // 문서화 애드온 + "@storybook/blocks", ], framework: { name: "@storybook/react-vite", diff --git a/apps/storybook/.storybook/preview.ts b/apps/storybook/.storybook/preview.ts index 1df66c3..b44d9c1 100644 --- a/apps/storybook/.storybook/preview.ts +++ b/apps/storybook/.storybook/preview.ts @@ -1,5 +1,5 @@ +import "@repo/ui/src/globalStyle/global.css"; import type { Preview } from "@storybook/react"; -import "../../../packages/ui/src/globalStyle/global.css"; // alias 설정해도 안됨 const preview: Preview = { parameters: { diff --git a/apps/storybook/package.json b/apps/storybook/package.json index a5fd0ac..b48d6d5 100644 --- a/apps/storybook/package.json +++ b/apps/storybook/package.json @@ -12,7 +12,10 @@ }, "devDependencies": { "@chromatic-com/storybook": "3.2.5", + "@mdx-js/react": "^3.1.0", + "@mdx-js/rollup": "^3.1.0", "@storybook/addon-actions": "^8.6.4", + "@storybook/addon-docs": "^8.6.4", "@storybook/addon-essentials": "8.6.4", "@storybook/addon-interactions": "8.6.4", "@storybook/addon-links": "^8.6.4", diff --git a/apps/storybook/tsconfig.json b/apps/storybook/tsconfig.json index 0cc156d..2e3bba4 100644 --- a/apps/storybook/tsconfig.json +++ b/apps/storybook/tsconfig.json @@ -14,8 +14,7 @@ "incremental": true, "baseUrl": ".", // alias 기준 설정 "paths": { - "@/*": ["./src/*"], - "@repo/ui/*": ["../../../packages/ui/*"] // alias 설정 + "@/*": ["./src/*"] } }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], diff --git a/apps/user/src/app/layout.tsx b/apps/user/src/app/layout.tsx index 7ba0989..220b2d0 100644 --- a/apps/user/src/app/layout.tsx +++ b/apps/user/src/app/layout.tsx @@ -1,3 +1,4 @@ +// import "@repo/ui/globalStyle"; import type { Metadata } from "next"; import { Geist, Geist_Mono } from "next/font/google"; import "./globals.css"; diff --git a/apps/user/src/app/page.tsx b/apps/user/src/app/page.tsx index 84af2cb..c70b6f1 100644 --- a/apps/user/src/app/page.tsx +++ b/apps/user/src/app/page.tsx @@ -1,12 +1,10 @@ import Image from "next/image"; -import styles from "./page.module.css"; export default function Home() { return ( -