Skip to content

Commit b8eada0

Browse files
authored
Merge pull request #259 from CSE-Shaco/develop
Chore: Update frontend linting, formatting, and build configurations
2 parents 136e216 + 401bb70 commit b8eada0

8 files changed

Lines changed: 2290 additions & 2586 deletions

File tree

.eslintrc.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"extends": "next/core-web-vitals"
2+
"extends": [
3+
"next/core-web-vitals",
4+
"prettier"
5+
]
36
}

.prettierignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
node_modules
2+
.next
3+
out
4+
build
5+
coverage
6+
dist

.prettierrc.json

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

package-lock.json

Lines changed: 950 additions & 1430 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,54 @@
66
"dev": "next dev",
77
"build": "next build",
88
"start": "next start",
9-
"lint": "next lint"
9+
"lint": "next lint",
10+
"format": "prettier --write .",
11+
"format:check": "prettier --check ."
1012
},
1113
"dependencies": {
1214
"@heroicons/react": "^2.2.0",
13-
"@heroui/scroll-shadow": "^2.3.6",
14-
"@heroui/system": "^2.4.7",
15-
"@heroui/theme": "^2.4.6",
15+
"@heroui/scroll-shadow": "^2.3.19",
16+
"@heroui/system": "^2.4.25",
17+
"@heroui/theme": "^2.4.25",
1618
"@nextui-org/react": "^2.6.11",
17-
"@react-google-maps/api": "^2.20.7",
19+
"@react-google-maps/api": "^2.20.8",
1820
"@splidejs/react-splide": "^0.7.12",
1921
"@splidejs/splide": "^4.1.4",
2022
"@splidejs/splide-extension-auto-scroll": "^0.5.3",
2123
"@studio-freight/lenis": "^1.0.42",
22-
"axios": "^1.7.9",
23-
"framer-motion": "^11.16.1",
24-
"gsap": "^3.12.7",
24+
"axios": "1.13.2",
25+
"framer-motion": "^12.24.7",
26+
"gsap": "^3.14.2",
2527
"hangul-js": "^0.2.6",
26-
"lucide-react": "^0.507.0",
27-
"next": ">=15.2.3",
28-
"react": "^18.2.0",
29-
"react-dom": "^18.2.0",
30-
"react-error-boundary": "^6.0.0",
28+
"lucide-react": "^0.562.0",
29+
"next": "15.5.9",
30+
"react": "18.3.1",
31+
"react-dom": "18.3.1",
32+
"react-error-boundary": "^6.0.2",
3133
"react-icons": "^5.4.0",
3234
"react-markdown": "^10.1.0",
33-
"recharts": "^3.1.2",
35+
"recharts": "^3.6.0",
3436
"remark-breaks": "^4.0.0",
3537
"remark-gfm": "^4.0.1",
3638
"type-hangul": "^0.2.4"
3739
},
3840
"devDependencies": {
41+
"@tailwindcss/postcss": "^4.1.18",
3942
"@types/node": "22.15.21",
40-
"@types/react": "19.1.5",
43+
"@types/react": "^18.2.0",
4144
"eslint": "^8",
42-
"eslint-config-next": "15.0.2",
45+
"eslint-config-prettier": "^9.1.0",
46+
"eslint-config-next": "15.5.9",
47+
"eslint-plugin-react": "^7.37.5",
4348
"postcss": "^8",
44-
"tailwindcss": "^3.4.1",
45-
"typescript": "^5.8.3"
49+
"prettier": "^3.5.1",
50+
"tailwindcss": "^4.1.18",
51+
"typescript": "^5.9.3"
52+
},
53+
"overrides": {
54+
"brace-expansion": "^2.0.2",
55+
"form-data": "^4.0.4",
56+
"glob": "^10.5.0",
57+
"mdast-util-to-hast": "^13.2.1"
4658
}
4759
}

postcss.config.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
/** @type {import('postcss-load-config').Config} */
22
const config = {
33
plugins: {
4-
tailwindcss: {},
4+
'@tailwindcss/postcss': {},
55
},
66
};
77

88
export default config;
9+
10+

src/styles/globals.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import "tailwindcss";
42

53
:root {
64
background-color: black;

0 commit comments

Comments
 (0)