fix: 충돌 수정

TEAM-BEAT · Jul 10, 2024 · bfcb5ae · bfcb5ae
2 parents d42ba0b + 0fb7f04
commit bfcb5ae
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 170 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -33,7 +33,7 @@ const jsConfig = {
     curly: "error",
     quotes: ["error", "double"],
     "comma-style": ["error", "last"],
-    "no-unused-vars": ["off", { varsIgnorePattern: "^React$" }],
+    "no-unused-vars": ["warn", { varsIgnorePattern: "^React$" }],
     "no-console": "warn",
     "no-extra-semi": "error",
     "no-unused-expressions": "error",
@@ -64,8 +64,8 @@ const jsConfig = {
     "no-new-wrappers": "error",
     "no-restricted-globals": "error",
     "no-return-assign": "warn",
-    "@typescript-eslint/no-explicit-any": "off", // any 허용
-    "@typescript-eslint/no-unused-vars": ["off", { varsIgnorePattern: "^React$" }], // 'React' 사용 안해도 경고하지 않도록 설정
+    "@typescript-eslint/no-explicit-any": "warn", // any 허용
+    "@typescript-eslint/no-unused-vars": ["warn", { varsIgnorePattern: "^React$" }], // 'React' 사용 안해도 경고하지 않도록 설정
   },
   settings: {
     react: {

diff --git a/package.json b/package.json
@@ -65,21 +65,21 @@
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@types/shelljs": "^0",
-    "@typescript-eslint/eslint-plugin": "^7.13.1",
-    "@typescript-eslint/parser": "^7.13.1",
+    "@typescript-eslint/eslint-plugin": "^7.16.0",
+    "@typescript-eslint/parser": "^7.16.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "@yarnpkg/pnpify": "^4.1.0",
     "@yarnpkg/sdks": "^3.1.3",
     "chromatic": "^11.5.4",
-    "eslint": "8.56.0",
+    "eslint": "^9.6.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.9.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.34.3",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.7",
+    "eslint-plugin-react-refresh": "^0.4.8",
     "eslint-plugin-storybook": "^0.8.0",
     "globals": "^15.6.0",
     "husky": "^8.0.0",

diff --git a/src/pages/nonMbLookup/NonMbLookup.tsx b/src/pages/nonMbLookup/NonMbLookup.tsx
@@ -1,10 +1,10 @@
-import { useState, useEffect } from "react";
+import { useEffect, useState } from "react";
 import * as S from "./NonMbLookup.styled";
 
 import useModal from "@hooks/useModal";
 
-import InputWrapper from "./components/InputWrapper";
 import Button from "@components/commons/button/Button";
+import InputWrapper from "./components/InputWrapper";
 
 const NonMbLookup = () => {
   const { openAlert } = useModal();

diff --git a/src/pages/nonMbLookup/components/InputWrapper.tsx b/src/pages/nonMbLookup/components/InputWrapper.tsx
@@ -114,7 +114,7 @@ const InputWrapper = ({ btnOn, btnOff, isReadyRequest, dataStatus }: InputProps)
         filter={numericFilter}
         maxLength={4}
       />
-      <S.EyeTest onClick={handlePwd}>버튼 임시 위치!!!!!!!</S.EyeTest>
+      {/* <S.EyeTest onClick={handlePwd}>버튼 임시 위치!!!!!!!</S.EyeTest> */}
     </S.InputWrapperLayout>
   );
 };

diff --git a/src/routes/Router.tsx b/src/routes/Router.tsx
@@ -7,10 +7,10 @@ import Lookup from "@pages/lookup/Lookup";
 import Manage from "@pages/manage/Manage";
 import ModalTest from "@pages/ModalTest";
 import MyRegisterdShow from "@pages/MyRegisterdShow/MyRegisterdShow";
+import NonMbLookup from "@pages/nonMbLookup/NonMbLookup";
 import Register from "@pages/register/Register";
 import TestPage from "@pages/test/TestPage";
 import ViewBottomSheetTest from "@pages/ViewBottomSheetTest";
-import NonMbLookup from "@pages/nonMbLookup/NonMbLookup";
 import { createBrowserRouter } from "react-router-dom";
 import RegisterComplete from "@pages/register/RegisterComplete";
 

diff --git a/tsconfig.app.json b/tsconfig.app.json
@@ -18,10 +18,10 @@
     "jsx": "react-jsx",
 
     /* Linting */
-    "strict": false,
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "noFallthroughCasesInSwitch": false,
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
 
     "baseUrl": "./",
     "paths": {