Merge remote-tracking branch 'origin/develop' into feat/258

Author: holim0

.eslintrc.js

@@ -18,8 +18,6 @@ module.exports = {
   ],
   plugins: ['react', '@typescript-eslint', 'react-hooks', 'jsx-a11y'],
   rules: {
-    'react-hooks/rules-of-hooks': 'error',
-    'react-hooks/exhaustive-deps': 'warn',
     'react/react-in-jsx-scope': 'off',
     'comma-dangle': 'off',
     'react/display-name': 'off',

.github/workflows/deploy-app.yml

@@ -1,6 +1,7 @@
 name: Build & Deploy Ahhachul App
 
 on:
+  pull_request:
   push:
     branches:
       - main
@@ -54,4 +55,4 @@ jobs:
           aws s3 cp services/ahhachul.com/build s3://${S3_BUCKET_NAME} --recursive
 
       - name: Invalidate CloudFront
-        run: aws cloudfront create-invalidation --distribution-id ${{ env.AWS_CLOUDFRONT_DISTRIBUTION_ID_USER }} --paths "/*"
+        run: aws cloudfront create-invalidation --distribution-id ${{ env.AWS_CLOUDFRONT_DISTRIBUTION_ID_USER }} --paths "/*"

.husky/pre-commit

@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint-staged
+# lint-staged 실행
+yarn lint-staged || exit 1

.husky/prepare-commit-msg

@@ -0,0 +1,29 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+# 현재 브랜치 이름 가져오기
+branch_name=$(git rev-parse --abbrev-ref HEAD)
+
+# 브랜치 이름에서 숫자 또는 텍스트 식별자 추출
+issue_identifier=$(echo "$branch_name" | grep -oE '[^/]+$')
+
+# 식별자가 없으면 스크립트 종료
+if [ -z "$issue_identifier" ]; then
+  echo "No issue identifier found." >> /tmp/husky-debug.log
+  exit 0
+fi
+
+# 커밋 메시지 파일 경로
+commit_msg_file="$1"
+
+# 커밋 메시지 경로 디버깅
+if [ ! -f "$commit_msg_file" ]; then
+  echo "COMMIT_EDITMSG file not found: $commit_msg_file" >> /tmp/husky-debug.log
+  exit 1
+fi
+
+# 커밋 메시지 끝에 식별자 추가 (줄바꿈 없이)
+if ! grep -q "(#$issue_identifier)" "$commit_msg_file"; then
+  sed -i '' -e "\$s/\$/ \\(#$issue_identifier\\)/" "$commit_msg_file"
+  echo "Issue identifier added: (#$issue_identifier)" >> /tmp/husky-debug.log
+fi

.yarnrc.yml

@@ -20,3 +20,6 @@ packageExtensions:
     dependencies:
       '@lexical/clipboard': '^0.14.2'
       '@lexical/selection': '^0.14.2'
+  'eslint-config-next@*':
+    dependencies:
+      'next': '*'

package.json

@@ -10,10 +10,12 @@
     "prepare": "husky",
     "graph": "nx run-many --target=build --graph",
     "storybook": "nx storybook @ahhachul/storybook",
+    "dev:app": "yarn workspace ahhachul.com start",
     "dev:one-app": "yarn workspace @ahhachul/one-app dev",
     "test:one-app": "yarn workspace @ahhachul/one-app test",
     "dev:mocking": "yarn workspace @ahhachul/one-app dev:mocking",
     "server:mocking": "yarn workspace @ahhachul/one-app server:mocking",
+    "build:app": "nx build ahhachul.com",
     "build:one-app": "nx build @ahhachul/one-app",
     "build:all": "nx run-many --target=build --all",
     "start:one-app": "yarn workspace @ahhachul/one-app start"

packages/react/components/accordion/src/Accordion.tsx

@@ -1,23 +1,22 @@
-import { useState } from "react";
-import AccordionContext from "./AccordionContext";
-import { AccordionProps } from "./types";
-import { clsx } from "clsx";
-import * as React from "react";
-import { accordionStyle } from "./style.css";
+import { useState } from 'react';
+import AccordionContext from './AccordionContext';
+import { AccordionProps } from './types';
+import { clsx } from 'clsx';
+import * as React from 'react';
+import { accordionStyle } from './style.css';
 
 const Accordion = (props: AccordionProps, ref: React.Ref<HTMLDivElement>) => {
   const { defaultActiveItems = [], children, className, ...rest } = props;
 
-  const [activeItems, setActiveItems] =
-    useState<string[]>(defaultActiveItems);
+  const [activeItems, setActiveItems] = useState<string[]>(defaultActiveItems);
 
   const handleSetActiveItem = (item: string) => {
     if (activeItems.includes(item)) {
       setActiveItems(activeItems.filter((activeItem) => activeItem !== item));
     } else {
       setActiveItems([...activeItems, item]);
     }
-  };  
+  };
 
   return (
     <AccordionContext.Provider

packages/react/components/accordion/src/AccordionButton.tsx

@@ -1,16 +1,16 @@
-import * as React from "react";
-import { AccordionButtonProps } from "./types";
-import { clsx } from "clsx";
-import { accordionButtonStyle } from "./style.css";
-import { useButton } from "@ahhachul/react-hooks-button";
-import { useAccordionContext } from "./AccordionContext";
-import { useCallback } from "react";
+import * as React from 'react';
+import { AccordionButtonProps } from './types';
+import { clsx } from 'clsx';
+import { accordionButtonStyle } from './style.css';
+import { useButton } from '@ahhachul/react-hooks-button';
+import { useAccordionContext } from './AccordionContext';
+import { useCallback } from 'react';
 
 const AccordionButton = (
   props: AccordionButtonProps,
   ref: React.Ref<HTMLButtonElement>,
 ) => {
-  const { className, itemName = "", onClick, children, ...rest } = props;
+  const { className, itemName = '', onClick, children, ...rest } = props;
 
   const { setActiveItem } = useAccordionContext();
 
@@ -25,7 +25,7 @@ const AccordionButton = (
   const { buttonProps } = useButton({
     ...rest,
     onClick: handleClick,
-    elementType: "button",
+    elementType: 'button',
   });
 
   return (

packages/react/components/accordion/src/AccordionItem.tsx

@@ -1,17 +1,20 @@
-import * as React from "react";
-import { clsx } from "clsx";
-import { accordionItemStyle } from "./style.css";
-import { AccordionItemProps } from "./types";
-import { Children, cloneElement, isValidElement } from "react";
+import * as React from 'react';
+import { clsx } from 'clsx';
+import { accordionItemStyle } from './style.css';
+import { AccordionItemProps } from './types';
+import { Children, cloneElement, isValidElement } from 'react';
 
-const AccordionItem = (props: AccordionItemProps, ref: React.Ref<HTMLDivElement>) => {
+const AccordionItem = (
+  props: AccordionItemProps,
+  ref: React.Ref<HTMLDivElement>,
+) => {
   const { itemName, children, className, ...rest } = props;
 
   const childrenWithProps = Children.toArray(children);
 
   const accordionItemChildren = childrenWithProps.map((child) => {
     if (isValidElement(child)) {
-      return cloneElement(child, { ...child.props, itemName })
+      return cloneElement(child, { ...child.props, itemName });
     }
 
     return null;

packages/react/components/accordion/src/AccordionPanel.tsx

@@ -1,13 +1,16 @@
-import * as React from "react";
-import { AccordionPanelProps } from "./types";
-import { clsx } from "clsx";
-import { accordionPanelStyle, panelHeight } from "./style.css";
-import { useAccordionContext } from "./AccordionContext";
-import { useEffect, useRef, useState } from "react";
-import { assignInlineVars } from "@vanilla-extract/dynamic";
+import * as React from 'react';
+import { AccordionPanelProps } from './types';
+import { clsx } from 'clsx';
+import { accordionPanelStyle, panelHeight } from './style.css';
+import { useAccordionContext } from './AccordionContext';
+import { useEffect, useRef, useState } from 'react';
+import { assignInlineVars } from '@vanilla-extract/dynamic';
 
-const AccordionPanel = (props: AccordionPanelProps, ref: React.Ref<HTMLDivElement>) => {
-  const { itemName = "", children, className, style, ...rest } = props;
+const AccordionPanel = (
+  props: AccordionPanelProps,
+  ref: React.Ref<HTMLDivElement>,
+) => {
+  const { itemName = '', children, className, style, ...rest } = props;
   const innerRef = useRef<HTMLDivElement>(null);
 
   const { activeItems } = useAccordionContext();
@@ -18,7 +21,7 @@ const AccordionPanel = (props: AccordionPanelProps, ref: React.Ref<HTMLDivElemen
     if (!innerRef.current) return;
 
     setCurrentPanelHeight(
-      isActive ? `${innerRef.current.clientHeight}px` : "0",
+      isActive ? `${innerRef.current.clientHeight}px` : '0',
     );
   }, [isActive, activeItems]);
 
@@ -30,7 +33,8 @@ const AccordionPanel = (props: AccordionPanelProps, ref: React.Ref<HTMLDivElemen
       data-action-item={isActive}
       style={{
         ...assignInlineVars({
-          [panelHeight]: currentPanelHeight ?? `$innerRef.current.clientHeight}px`,
+          [panelHeight]:
+            currentPanelHeight ?? `$innerRef.current.clientHeight}px`,
         }),
         ...style,
       }}
@@ -40,7 +44,7 @@ const AccordionPanel = (props: AccordionPanelProps, ref: React.Ref<HTMLDivElemen
       </div>
     </div>
   );
-}
+};
 
 const _AccordionPanel = React.forwardRef(AccordionPanel);
 export { _AccordionPanel as AccordionPanel };