Merge branch 'main' into 14-feat/TextField-컴포넌트-제작

KyeongJooni · web-flow · commit 4b088d4dfd86 · 2026-01-16T09:45:41.000+09:00
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -0,0 +1,33 @@
+name: CodeQL
+
+on:
+  pull_request:
+    branches:
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  security-events: write
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: javascript-typescript
+          trap-caching: false
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/pr-automation.yml b/.github/workflows/pr-automation.yml
@@ -35,7 +35,7 @@ jobs:
 
             // Reviewer 추가
             if (currentReviewers.length === 0) {
-              const reviewers = ['YeBeenChoi', 'jwj0620gcu'].filter(r => r !== prAuthor);
+              const reviewers = ['YeBeenChoi', 'jwj0620gcu', 'KyeongJooni'].filter(r => r !== prAuthor);
               if (reviewers.length > 0) {
                 try {
                   await github.rest.pulls.requestReviewers({
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -1,10 +1,14 @@
-name: Build Test
+name: PR Build Test
 
 on:
   pull_request:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
   pull-requests: write
@@ -54,14 +58,12 @@ jobs:
         run: |
           yarn lint --max-warnings 0 --format json > lint-results.json || {
             echo "LINT_FAILED=true" >> $GITHUB_OUTPUT
-            echo "Lint issues found, but continuing build..."
+            exit 1
           }
-        continue-on-error: true
 
       - name: Format check
         id: format
         run: yarn format:check
-        continue-on-error: true
 
       - name: Run tests
         id: test
diff --git a/.github/workflows/pr-description-check.yml b/.github/workflows/pr-description-check.yml
@@ -0,0 +1,60 @@
+name: PR Description Check
+
+on:
+  pull_request:
+    types: [opened, ready_for_review]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  pull-requests: write
+
+jobs:
+  check-description:
+    name: Check PR description
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
+
+    steps:
+      - name: Check if PR has description
+        id: check
+        run: |
+          # 템플릿 텍스트 제거:
+          # - 제목 (## 로 시작)
+          # - HTML 주석 (<!-- -->)
+          # - 체크리스트 (- [ ])
+          # - 구분선 (---)
+          # - 빈 줄
+          # - "- Close #" 만 있는 줄
+          FILTERED=$(echo "$RAW_BODY" | sed -r \
+            -e '/^##/d' \
+            -e '/<!--.*-->/d' \
+            -e '/^<!--/d' \
+            -e '/^-->/d' \
+            -e '/^---$/d' \
+            -e '/^- \[/d' \
+            -e '/^- Close #$/d' \
+            -e '/^$/d')
+
+          if [[ -z "${FILTERED//[[:space:]]/}" ]]; then
+            echo "empty=true" >> $GITHUB_OUTPUT
+          else
+            echo "empty=false" >> $GITHUB_OUTPUT
+          fi
+        env:
+          RAW_BODY: ${{ github.event.pull_request.body }}
+
+      - uses: actions/checkout@v4
+        if: steps.check.outputs.empty == 'true'
+        with:
+          sparse-checkout: 'README.md'
+
+      - name: Comment on PR
+        if: steps.check.outputs.empty == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr comment ${{ github.event.pull_request.number }} --body \
+          "👋 @${{ github.actor }} PR 설명이 비어있습니다. 변경 사항에 대한 설명을 추가해주세요."
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,7 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
-dist
+build
 dist-ssr
 *.local
 .react-router
@@ -38,3 +38,7 @@ storybook-static
 # Yarn
 .yarn/cache
 .yarn/install-state.gz
+!.yarn/releases
+
+# Vercel
+.vercel
diff --git a/.prettierignore b/.prettierignore
@@ -6,3 +6,4 @@ node_modules
 pnpm-lock.yaml
 yarn.lock
 package-lock.json
+lint-results.json
diff --git a/.yarn/releases/yarn-4.10.3.cjs b/.yarn/releases/yarn-4.10.3.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1 +1,3 @@
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.10.3.cjs
diff --git a/package.json b/package.json
@@ -5,11 +5,11 @@
   "type": "module",
   "packageManager": "yarn@4.10.3",
   "scripts": {
-    "dev": "vite",
-    "build": "tsc -b && vite build",
+    "dev": "react-router dev",
+    "build": "react-router build",
     "lint": "eslint .",
-    "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,md}\"",
-    "format:check": "prettier --check \"src/**/*.{js,jsx,ts,tsx,json,css,md}\"",
+    "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,css,md}\"",
+    "format:check": "prettier --check \"**/*.{js,jsx,ts,tsx,json,css,md}\"",
     "preview": "vite preview",
     "test": "vitest",
     "test:ui": "vitest --ui",
@@ -23,10 +23,12 @@
     "@hookform/resolvers": "^5.2.2",
     "@tanstack/react-query": "^5.90.12",
     "@tanstack/react-query-devtools": "^5.91.1",
+    "@vercel/react-router": "^1.2.4",
     "axios": "^1.13.2",
     "clsx": "^2.1.1",
     "dayjs": "^1.11.19",
     "es-toolkit": "^1.43.0",
+    "isbot": "^5.1.32",
     "pretendard": "^1.3.9",
     "react": "^19.2.3",
     "react-dom": "^19.2.3",
diff --git a/react-router.config.ts b/react-router.config.ts
@@ -1,7 +1,8 @@
+import { vercelPreset } from '@vercel/react-router/vite';
 import type { Config } from '@react-router/dev/config';
 
 export default {
   appDirectory: 'src/app',
-  buildDirectory: 'dist',
   ssr: false,
+  presets: [vercelPreset()],
 } satisfies Config;
diff --git a/src/app/entry.server.tsx b/src/app/entry.server.tsx
@@ -1,37 +1,12 @@
-import { PassThrough } from 'node:stream';
-import { createReadableStreamFromReadable } from '@react-router/node';
-import { renderToPipeableStream } from 'react-dom/server';
-import { ServerRouter, type EntryContext } from 'react-router';
+import { handleRequest } from '@vercel/react-router/entry.server';
+import type { AppLoadContext, EntryContext } from 'react-router';
 
-export default function handleRequest(
+export default async function handleServerRequest(
   request: Request,
   responseStatusCode: number,
   responseHeaders: Headers,
-  routerContext: EntryContext
-) {
-  return new Promise((resolve, reject) => {
-    const { pipe } = renderToPipeableStream(
-      <ServerRouter context={routerContext} url={request.url} />,
-      {
-        onShellReady() {
-          responseHeaders.set('Content-Type', 'text/html');
-
-          const body = new PassThrough();
-          const stream = createReadableStreamFromReadable(body);
-
-          resolve(
-            new Response(stream, {
-              headers: responseHeaders,
-              status: responseStatusCode,
-            })
-          );
-
-          pipe(body);
-        },
-        onShellError(error: unknown) {
-          reject(error);
-        },
-      }
-    );
-  });
+  routerContext: EntryContext,
+  loadContext?: AppLoadContext
+): Promise<Response> {
+  return handleRequest(request, responseStatusCode, responseHeaders, routerContext, loadContext);
 }
diff --git a/src/app/root.tsx b/src/app/root.tsx
@@ -21,7 +21,7 @@ export default function Root() {
         <Meta />
         <Links />
       </head>
-      <body>
+      <body className="w-full overflow-x-hidden">
         <AppProviders>
           <Outlet />
         </AppProviders>
diff --git a/src/pages/playground.tsx b/src/pages/playground.tsx
@@ -1,6 +1,7 @@
 import { Button } from '@shared/ui/Button/Button';
 import { Card } from '@shared/ui/Card/Card';
 import { Checkbox } from '@shared/ui/Checkbox/Checkbox';
+import { Header } from '@shared/ui/Header/Header';
 import { Profile } from '@shared/ui/Profile/Profile';
 import { RadioButton } from '@shared/ui/RadioButton/RadioButton';
 import { TextField } from '@shared/ui/TextField/TextField';
@@ -11,6 +12,11 @@ export default function Playground() {
       <h1 className="typo-title-2">UI Playground</h1>
 
       {/* Button */}
+      <section className="flex flex-col gap-4">
+        <h2 className="typo-body-1">Header</h2>
+        <Header />
+      </section>
+
       <section className="flex flex-col gap-4">
         <h2 className="typo-body-1">Button</h2>
         <p className="typo-caption-2 text-gray-600">
diff --git a/src/shared/assets/logo/index.ts b/src/shared/assets/logo/index.ts
@@ -0,0 +1,5 @@
+import Logo from './logo.svg?react';
+import Logo2 from './logo2.svg?react';
+import Logo3 from './logo3.svg?react';
+
+export { Logo, Logo2, Logo3 };
diff --git a/src/shared/ui/Button/Button.tsx b/src/shared/ui/Button/Button.tsx
@@ -5,7 +5,14 @@ import type { VariantProps } from 'tailwind-variants';
 export type ButtonProps = Omit<ComponentPropsWithoutRef<'button'>, 'type'> &
   VariantProps<typeof buttonVariants>;
 
-export const Button = ({ children, variant, className, onMouseUp, ...props }: ButtonProps) => {
+export const Button = ({
+  children,
+  variant,
+  size,
+  className,
+  onMouseUp,
+  ...props
+}: ButtonProps) => {
   const handleMouseUp = (e: React.MouseEvent<HTMLButtonElement>) => {
     onMouseUp?.(e);
     e.currentTarget.blur();
@@ -14,7 +21,7 @@ export const Button = ({ children, variant, className, onMouseUp, ...props }: Bu
   return (
     <button
       type="button"
-      className={buttonVariants({ variant, className })}
+      className={buttonVariants({ variant, size, className })}
       onMouseUp={handleMouseUp}
       {...props}
     >
diff --git a/src/shared/ui/Button/Button.variants.ts b/src/shared/ui/Button/Button.variants.ts
@@ -4,7 +4,7 @@ export const buttonVariants = tv({
   base: [
     /* layout */
     'flex items-center justify-center',
-    'w-[163px] h-[44px]',
+    'h-[44px]',
     'px-[var(--padding-xl)] py-[var(--padding-m)]',
     'gap-[var(--spacing-xxs)]',
 
@@ -55,9 +55,15 @@ export const buttonVariants = tv({
         'disabled:cursor-not-allowed',
       ],
     },
+
+    size: {
+      default: ['w-[163px]'],
+      auto: ['w-auto'],
+    },
   },
 
   defaultVariants: {
     variant: 'fill',
+    size: 'default',
   },
 });
diff --git a/src/shared/ui/Header/Header.stories.tsx b/src/shared/ui/Header/Header.stories.tsx
diff --git a/src/shared/ui/Header/Header.tsx b/src/shared/ui/Header/Header.tsx
diff --git a/src/shared/ui/Header/Header.variants.ts b/src/shared/ui/Header/Header.variants.ts
diff --git a/src/shared/ui/Header/index.ts b/src/shared/ui/Header/index.ts
diff --git a/tests/unit/shared/ui/Header/Header.test.tsx b/tests/unit/shared/ui/Header/Header.test.tsx
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`nodeLinker: node-modules`
	`2`	`+`
	`3`	`+yarnPath: .yarn/releases/yarn-4.10.3.cjs`