Skip to content

Commit d471dc0

Browse files
authored
Merge pull request #18 from boostcampwm-2022/chore/#17-K
Chore/#17-K: husky hook ์ถ”๊ฐ€
2 parents a913893 + 120585c commit d471dc0

30 files changed

+381
-174
lines changed

โ€Ž.husky/pre-commitโ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
npm run lint-staged

โ€Ž.prettierrcโ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"semi": true,
3+
"trailingComma": "all",
4+
"useTabs": false,
5+
"tabWidth": 2,
6+
"bracketSpacing": true,
7+
"singleQuote": true,
8+
"endOfLine": "lf"
9+
}

โ€Žclient/.eslintrcโ€Ž

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
"sourceType": "module"
2020
},
2121
"plugins": ["react", "@typescript-eslint", "import"],
22+
"settings": {
23+
"react": {
24+
"version": "detect"
25+
}
26+
},
2227
"rules": {
2328
"react/react-in-jsx-scope": "off",
2429
"react/jsx-filename-extension": [1, { "extensions": [".ts", ".tsx"] }],
@@ -28,6 +33,7 @@
2833
"no-nested-ternary": "error",
2934
"eqeqeq": "error",
3035
"no-console": "warn",
36+
"import/no-unresolved": "off",
3137
"import/order": [
3238
"error",
3339
{

โ€Žclient/package.jsonโ€Ž

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,12 @@
1717
},
1818
"devDependencies": {
1919
"@testing-library/jest-dom": "^5.16.5",
20-
"@types/eslint": "^8",
2120
"@types/react": "^18.0.24",
2221
"@types/react-dom": "^18.0.8",
2322
"@types/testing-library__jest-dom": "^5",
24-
"@typescript-eslint/eslint-plugin": "latest",
25-
"@typescript-eslint/parser": "^5.42.1",
2623
"@vitejs/plugin-react": "^2.2.0",
27-
"eslint": "latest",
28-
"eslint-import-resolver-typescript": "^3.5.2",
29-
"eslint-plugin-import": "^2.26.0",
3024
"eslint-plugin-react": "latest",
3125
"sass": "^1.56.1",
32-
"typescript": "^4.6.4",
3326
"vite": "^3.2.3",
3427
"vite-tsconfig-paths": "^3.5.2"
3528
}

โ€Žclient/src/components/common/Button/index.tsxโ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import style from "./style.module.scss";
21
import cx from "classnames";
32

3+
import style from "./style.module.scss";
4+
45
interface ButtonProps {
56
text: string;
67
icon?: JSX.Element;

โ€Žclient/src/pages/Login/index.tsxโ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
import BubblesIcon from "src/components/common/Icon/Bubbles";
2+
import LogoIcon from "src/components/common/Icon/Logo";
3+
14
import Button from "../../components/common/Button";
25
import GithubIcon from "../../components/common/Icon/Github";
36
import style from "./style.module.scss";
4-
import BubblesIcon from "src/components/common/Icon/Bubbles";
5-
import LogoIcon from "src/components/common/Icon/Logo";
67

78
function LoginPage() {
89
return (

โ€Žclient/vite.config.tsโ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { defineConfig } from "vite";
2-
import react from "@vitejs/plugin-react";
31
import { resolve } from "path";
42

3+
import react from "@vitejs/plugin-react";
4+
import { defineConfig } from "vite";
5+
56
// https://vitejs.dev/config/
67
export default defineConfig({
78
plugins: [react()],

0 commit comments

Comments
ย (0)