Merge pull request #12 from CHZZK-Study/dev

Chore: 모든 브랜치 병합
JECT-Study · Jul 23, 2024 · d3f1eee · d3f1eee
2 parents 601d8a5 + fd19642
commit d3f1eee
Show file tree

Hide file tree

Showing 35 changed files with 1,937 additions and 26 deletions.
diff --git a/.env b/.env
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -12,19 +12,53 @@ module.exports = {
     'plugin:vitest/recommended',
     'plugin:jest-dom/recommended',
   ],
-  ignorePatterns: ['dist', '.eslintrc.cjs'],
+  ignorePatterns: ['dist', '.eslintrc.cjs', 'tailwind.config.js'],
   parser: '@typescript-eslint/parser',
   plugins: ['react-refresh'],
+  settings: {
+    'import/resolver': {
+      typescript: {
+        alwaysTryTypes: true, // This is important to resolve types
+        project: ['./tsconfig.json', './tsconfig.app.json', './tsconfig.node.json', './tsconfig.base.json'],
+      },
+      node: {
+        extensions: ['.js', '.jsx', '.ts', '.tsx'],
+      },
+    },
+  },
   rules: {
-    'import/no-extraneous-dependencies': "off",
+    'import/no-extraneous-dependencies': 'off',
+    'import/prefer-default-export': 'off',
     'react-refresh/only-export-components': [
       'warn',
       { allowConstantExport: true },
     ],
-    "react/react-in-jsx-scope": "off"
+    'react/react-in-jsx-scope': 'off',
+    // 함수형 컴포넌트 정의 규칙 수정
+    'react/function-component-definition': [
+      'error',
+      {
+        namedComponents: 'arrow-function',
+        unnamedComponents: 'arrow-function',
+      },
+    ],
+    // Button 간의 Type구분 꺼두기
+    'react/button-has-type': 'off',
+    // import/extensions 규칙 수정
+    'import/extensions': [
+      'error',
+      'ignorePackages',
+      {
+        js: 'never',
+        jsx: 'never',
+        ts: 'never',
+        tsx: 'never',
+        json: 'never',
+      },
+    ],
   },
   parserOptions: {
     tsconfigRootDir: './',
-    project: ['./tsconfig.json', './tsconfig.app.json', './tsconfig.node.json']
+    project: ['./tsconfig.json', './tsconfig.app.json', './tsconfig.node.json', './tsconfig.base.json'],
   },
-};
+};