fontend코드를 배포 브랜치에 병합하기 위한 충돌 해결

.github/workflows/cd-frontend.yml

@@ -12,6 +12,4 @@ jobs:
     steps:
       - name: deploy
         run: |
-          cd ~/deploy && ./deploy-fe.sh
-
-
+          cd ~/deploy && ./deploy-fe-dev.sh

.github/workflows/ci-frontend.yml

@@ -27,14 +27,15 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '20.15.0'
+          node-version: "20.15.0"
 
       - name: Install Dependencies
         run: npm install --frozen-lockfile
 
       - name: Create .env file
         run: |
           echo "BASE_URL=${{ secrets.BASE_URL }}" > .env
+          echo "API_BASE_URL=${{ secrets.API_BASE_URL }}" >> .env
           echo "REACT_APP_GOOGLE_ANALYTICS=${{ secrets.REACT_APP_GOOGLE_ANALYTICS }}" >> .env
           echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> .env
           echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env

.gitignore

@@ -3,5 +3,7 @@
 /backend/out
 /frontend/.idea
 /backend/htmlReport
+.DS_Store
 *.pem
 backend/src/main/resources/auth/AuthKey.p8
+

frontend/.storybook/preview.tsx

@@ -1,11 +1,12 @@
+import { Global, ThemeProvider } from '@emotion/react';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { initialize, mswDecorator } from 'msw-storybook-addon';
+
+import { BrowserRouter } from 'react-router-dom';
 import type { Preview } from '@storybook/react';
 import React from 'react';
 import reset from '../src/common/reset.style';
-import { Global, ThemeProvider } from '@emotion/react';
 import { theme } from '../src/common/theme/theme.style';
-import { initialize, mswDecorator } from 'msw-storybook-addon';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { BrowserRouter } from 'react-router-dom';
 
 initialize();
 
@@ -15,7 +16,6 @@ const preview: Preview = {
     controls: {
       matchers: {
         color: /(background|color)$/i,
-        date: /Date$/i,
       },
     },
   },

frontend/jest.config.json

@@ -2,8 +2,15 @@
   "preset": "ts-jest",
   "testEnvironment": "jest-environment-jsdom",
 
+  "transform": {
+    "^.+\\.(ts|tsx)$": [
+      "ts-jest",
+      {
+        "tsconfig": "tsconfig.jest.json"
+      }
+    ]
+  },
 
-
   "moduleNameMapper": {
     "^@_apis/(.*)$": "<rootDir>/src/apis/$1",
     "^@_constants/(.*)$": "<rootDir>/src/constants/$1",
@@ -17,9 +24,12 @@
     "^@_routes/(.*)$": "<rootDir>/src/routes/$1",
     "^@_mocks/(.*)$": "<rootDir>/src/mocks/$1"
   },
+
   "testEnvironmentOptions": {
     "customExportConditions": [""]
   },
+
   "setupFiles": ["dotenv/config", "./jest.polyfills.js"],
+
   "setupFilesAfterEnv": ["<rootDir>/jest.setup.ts"]
-}
+}

frontend/package.json

@@ -83,6 +83,7 @@
     "typescript": "^5.5.3",
     "undici": "^6.19.5",
     "webpack": "^5.92.1",
+    "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.4"
   },
@@ -93,6 +94,7 @@
     "@sentry/react": "^8.24.0",
     "@sentry/webpack-plugin": "^2.22.0",
     "firebase": "^10.12.5",
+    "heic2any": "^0.0.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-ga4": "^2.1.0",