Merge branch 'main' into dev/be

woowacourse-teams · Aug 23, 2024 · 153a976 · 153a976
2 parents 5b00085 + 94b3e42
commit 153a976
Show file tree

Hide file tree

Showing 166 changed files with 5,695 additions and 2,646 deletions.
diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml
@@ -26,14 +26,13 @@ jobs:
       - name: DB 설정 파일 가져오기
         working-directory: ./backend/src/main/resources
         run: echo "${{ secrets.APPLICATION_DB_YAML }}" > application-db.yml
-    
+
       - name: JDK 17 설정
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
-          
+
       - name: 테스트 코드 실행
         run: ./gradlew test
         working-directory: ./backend
-
diff --git a/.github/workflows/frontend_cd.yml b/.github/workflows/frontend_cd.yml
@@ -54,14 +54,13 @@ jobs:
         run: |
           rm -rf ${{ secrets.FRONT_DIRECTORY }}
           mkdir ${{ secrets.FRONT_DIRECTORY }}
-          
+
       - name: Artifact 다운로드
         uses: actions/download-artifact@v4
         with:
           name: code-zap-front
           path: ${{ secrets.FRONT_DIRECTORY }}
-          
+
       - name: 파일 S3로 이동
         run: |
           aws s3 cp --recursive ${{ secrets.FRONT_DIRECTORY }} s3://techcourse-project-2024/code-zap
-        
diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
@@ -2,7 +2,8 @@
   "root": true,
   "env": {
     "browser": true,
-    "es2020": true
+    "es2020": true,
+    "node": true
   },
   "extends": [
     "eslint:recommended",

diff --git a/frontend/.storybook/main.ts b/frontend/.storybook/main.ts
@@ -1,6 +1,7 @@
 import type { StorybookConfig } from '@storybook/react-webpack5';
 import { Configuration } from 'webpack';
 import path from 'path';
+
 const config: StorybookConfig = {
   stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
   addons: [
@@ -12,30 +13,48 @@ const config: StorybookConfig = {
     '@storybook/addon-interactions',
   ],
   webpackFinal: async (config: Configuration) => {
-    config.module?.rules?.push({
-      test: /\.(ts|tsx)$/,
-      use: [
-        {
-          loader: require.resolve('ts-loader'),
-          options: {
-            transpileOnly: true,
-            compilerOptions: {
-              jsx: 'react-jsx',
-              jsxImportSource: '@emotion/react',
+    config.module = config.module || {};
+    config.module.rules = config.module.rules || [];
+
+    const imageRule = config.module.rules.find((rule) => rule?.['test']?.test('.svg'));
+
+    if (imageRule) {
+      imageRule['exclude'] = /\.svg$/;
+    }
+
+    config.module?.rules?.push(
+      {
+        test: /\.(ts|tsx)$/,
+        use: [
+          {
+            loader: require.resolve('ts-loader'),
+            options: {
+              transpileOnly: true,
+              compilerOptions: {
+                jsx: 'react-jsx',
+                jsxImportSource: '@emotion/react',
+              },
             },
           },
-        },
-      ],
-    });
+        ],
+      },
+      {
+        test: /\.svg$/,
+        use: ['@svgr/webpack'],
+      },
+    );
+
     config.resolve = {
       ...config.resolve,
       alias: {
         ...config.resolve?.alias,
         '@': path.resolve(__dirname, '../src'),
       },
     };
+
     return config;
   },
+
   framework: {
     name: '@storybook/react-webpack5',
     options: {},

diff --git a/frontend/jest.config.ts b/frontend/jest.config.ts
@@ -15,7 +15,11 @@ const config: Config = {
   clearMocks: true,
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/src/$1',
+    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
+    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)$': '<rootDir>/src/mocks/fileMock.js',
+    'react-syntax-highlighter/dist/esm': 'react-syntax-highlighter/dist/cjs',
   },
+  transformIgnorePatterns: ['/node_modules/(?!react-syntax-highlighter)'],
 };
 
 export default config;