Skip to content

Commit c69caca

Browse files
claudfuenclaudfuen
authored
Merge pull request #804 from trycompai/codex/remove-biome-from-codebase
Remove Biome configs and switch to Prettier
2 parents 1cf3850 + 05c5e19 commit c69caca

15 files changed

Lines changed: 1974 additions & 741 deletions

File tree

‎.husky/pre-push‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
branch_name=$(git symbolic-ref --short HEAD)
2-
pattern="^[a-zA-Z]+/comp-.*$"
2+
pattern="^[a-zA-Z-]+/.+$"
33

44
if [[ ! $branch_name =~ $pattern ]]; then
55
echo "Branch name '$branch_name' does not follow the naming convention."
6-
echo "Branch names should follow the pattern: firstname/comp-*"
6+
echo "Branch names should follow the pattern: category/branch-name (e.g. feature/add-button)"
77
exit 1
88
fi

‎.vscode/settings.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"prisma.fileWatcher": true,
3-
"[prisma]": {
4-
"editor.defaultFormatter": "Prisma.prisma"
5-
},
6-
"[javascript]": {
7-
"editor.defaultFormatter": "biomejs.biome"
8-
},
9-
"[typescript]": {
10-
"editor.defaultFormatter": "biomejs.biome"
11-
},
12-
"editor.defaultFormatter": "biomejs.biome",
13-
"editor.tabSize": 4,
14-
"editor.detectIndentation": true,
15-
"[yaml]": {
16-
"editor.tabSize": 4
17-
},
18-
"[dockercompose]": {
19-
"editor.tabSize": 4
20-
},
21-
"editor.codeActionsOnSave": {
22-
"source.fixAll.biome": "explicit"
23-
}
2+
"prisma.fileWatcher": true,
3+
"[prisma]": {
4+
"editor.defaultFormatter": "Prisma.prisma"
5+
},
6+
"[javascript]": {
7+
"editor.defaultFormatter": "esbenp.prettier-vscode"
8+
},
9+
"[typescript]": {
10+
"editor.defaultFormatter": "esbenp.prettier-vscode"
11+
},
12+
"editor.defaultFormatter": "esbenp.prettier-vscode",
13+
"editor.tabSize": 4,
14+
"editor.detectIndentation": true,
15+
"[yaml]": {
16+
"editor.tabSize": 4
17+
},
18+
"[dockercompose]": {
19+
"editor.tabSize": 4
20+
},
21+
"editor.codeActionsOnSave": {
22+
"source.fixAll": "explicit"
23+
}
2424
}

‎apps/app/package.json‎

Lines changed: 133 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,135 @@
11
{
2-
"name": "@comp/app",
3-
"version": "0.1.0",
4-
"private": true,
5-
"scripts": {
6-
"dev": "bun i && bun run apply-migrations && bunx concurrently --kill-others --names \"next,trigger\" --prefix-colors \"yellow,blue\" \"next dev --turbo -p 3000\" \"bun run trigger:dev\"",
7-
"trigger:dev": "npx trigger.dev@latest dev",
8-
"build": "next build --turbopack",
9-
"start": "next start",
10-
"lint": "biome lint ./src",
11-
"apply-migrations": "cd ../../packages/db && bunx prisma migrate dev && cd ../../apps/app",
12-
"clean-react": "rm -rf node_modules/react; rm -rf node_modules/react-dom",
13-
"deploy:trigger-prod": "npx trigger.dev@latest deploy",
14-
"typecheck": "tsc --noEmit"
15-
},
16-
"dependencies": {
17-
"@ai-sdk/groq": "^1.2.8",
18-
"@ai-sdk/openai": "^1.3.19",
19-
"@ai-sdk/provider": "^1.1.3",
20-
"@ai-sdk/react": "^1.2.9",
21-
"@aws-sdk/client-s3": "^3.806.0",
22-
"@aws-sdk/client-sts": "^3.808.0",
23-
"@aws-sdk/s3-request-presigner": "^3.806.0",
24-
"@browserbasehq/sdk": "^2.5.0",
25-
"@calcom/atoms": "^1.0.102-framer",
26-
"@calcom/embed-react": "^1.5.3",
27-
"@comp/db": "workspace:*",
28-
"@comp/notifications": "workspace:*",
29-
"@date-fns/tz": "^1.2.0",
30-
"@dnd-kit/core": "^6.3.1",
31-
"@dnd-kit/modifiers": "^9.0.0",
32-
"@dnd-kit/sortable": "^10.0.0",
33-
"@dnd-kit/utilities": "^3.2.2",
34-
"@hookform/resolvers": "^3.10.0",
35-
"@mendable/firecrawl-js": "^1.24.0",
36-
"@nangohq/frontend": "^0.53.2",
37-
"@next/third-parties": "^15.3.1",
38-
"@novu/headless": "^2.6.6",
39-
"@novu/react": "^2.6.6",
40-
"@number-flow/react": "^0.5.9",
41-
"@prisma/instrumentation": "6.6.0",
42-
"@react-email/components": "^0.0.41",
43-
"@react-email/render": "^1.1.2",
44-
"@tanstack/react-query": "^5.74.4",
45-
"@tanstack/react-table": "^8.21.3",
46-
"@tiptap/extension-table": "^2.11.7",
47-
"@tiptap/extension-table-cell": "^2.11.7",
48-
"@tiptap/extension-table-header": "^2.11.7",
49-
"@tiptap/extension-table-row": "^2.11.7",
50-
"@tiptap/pm": "^2.11.7",
51-
"@tiptap/react": "^2.11.7",
52-
"@tiptap/starter-kit": "^2.11.7",
53-
"@trigger.dev/react-hooks": "3.3.17",
54-
"@trigger.dev/sdk": "3.3.17",
55-
"@types/d3": "^7.4.3",
56-
"@uploadthing/react": "^7.3.0",
57-
"@upstash/ratelimit": "^2.0.5",
58-
"@vercel/sdk": "^1.7.1",
59-
"ai": "^4.3.10",
60-
"argon2": "^0.43.0",
61-
"axios": "^1.9.0",
62-
"better-auth": "^1.2.7",
63-
"bun": "^1.2.10",
64-
"crypto": "^1.0.1",
65-
"d3": "^7.9.0",
66-
"dub": "^0.46.29",
67-
"framer-motion": "^12.9.2",
68-
"geist": "^1.3.1",
69-
"highlight.js": "^11.11.1",
70-
"immer": "^10.1.1",
71-
"marked": "^15.0.11",
72-
"motion": "^12.9.2",
73-
"next": "^15.4.0-canary.62",
74-
"next-safe-action": "^7.10.6",
75-
"next-themes": "^0.4.6",
76-
"novel": "^1.0.2",
77-
"novu": "^2.6.6",
78-
"nuqs": "^2.4.3",
79-
"playwright-core": "^1.52.0",
80-
"posthog-js": "^1.236.6",
81-
"posthog-node": "^4.14.0",
82-
"puppeteer-core": "^24.7.2",
83-
"react-dom": "^19.1.0",
84-
"react-email": "^4.0.15",
85-
"react-hotkeys-hook": "^4.6.2",
86-
"react-intersection-observer": "^9.16.0",
87-
"react-markdown": "^9.1.0",
88-
"react-textarea-autosize": "^8.5.9",
89-
"react-use-draggable-scroll": "^0.4.7",
90-
"react-wrap-balancer": "^1.1.1",
91-
"remark-gfm": "^4.0.1",
92-
"remark-parse": "^11.0.0",
93-
"resend": "^4.4.1",
94-
"sonner": "^1.7.4",
95-
"stripe": "^18.1.0",
96-
"tiptap-markdown": "^0.8.10",
97-
"ts-pattern": "^5.7.0",
98-
"use-debounce": "^10.0.4",
99-
"use-long-press": "^3.3.0",
100-
"xml2js": "^0.6.2",
101-
"zustand": "^5.0.3"
102-
},
103-
"devDependencies": {
104-
"next": "15.4.0-canary.62",
105-
"@comp/db": "workspace:*",
106-
"@trigger.dev/build": "3.3.17",
107-
"@types/node": "^22.15.2",
108-
"@types/react": "19.1.2",
109-
"@types/react-dom": "19.1.1",
110-
"postcss": "^8.5.3",
111-
"tailwindcss": "^3.4.17",
112-
"typescript": "^5.8.3"
113-
},
114-
"resolutions": {
115-
"@types/react": "19.1.2",
116-
"@types/react-dom": "19.1.1"
117-
},
118-
"pnpm": {
119-
"overrides": {
120-
"tiptap-extension-global-drag-handle": "^0.1.18"
121-
}
122-
},
123-
"exports": {
124-
"./src/lib/encryption": "./src/lib/encryption.ts"
125-
},
126-
"peerDependencies": {
127-
"react": "^19",
128-
"react-dom": "^19",
129-
"react-hook-form": "^7.56.3"
130-
}
2+
"name": "@comp/app",
3+
"version": "0.1.0",
4+
"private": true,
5+
"scripts": {
6+
"dev": "bun i && bun run apply-migrations && bunx concurrently --kill-others --names \"next,trigger\" --prefix-colors \"yellow,blue\" \"next dev --turbo -p 3000\" \"bun run trigger:dev\"",
7+
"trigger:dev": "npx trigger.dev@latest dev",
8+
"build": "next build --turbopack",
9+
"start": "next start",
10+
"lint": "prettier --check .",
11+
"apply-migrations": "cd ../../packages/db && bunx prisma migrate dev && cd ../../apps/app",
12+
"clean-react": "rm -rf node_modules/react; rm -rf node_modules/react-dom",
13+
"deploy:trigger-prod": "npx trigger.dev@latest deploy",
14+
"analyze-locale-usage": "bunx tsx src/locales/analyze-locale-usage.ts",
15+
"typecheck": "tsc --noEmit"
16+
},
17+
"dependencies": {
18+
"@ai-sdk/groq": "^1.2.8",
19+
"@ai-sdk/openai": "^1.3.19",
20+
"@ai-sdk/provider": "^1.1.3",
21+
"@ai-sdk/react": "^1.2.9",
22+
"@aws-sdk/client-s3": "^3.806.0",
23+
"@aws-sdk/client-sts": "^3.808.0",
24+
"@aws-sdk/s3-request-presigner": "^3.806.0",
25+
"@browserbasehq/sdk": "^2.5.0",
26+
"@calcom/atoms": "^1.0.102-framer",
27+
"@calcom/embed-react": "^1.5.3",
28+
"@comp/db": "workspace:*",
29+
"@comp/notifications": "workspace:*",
30+
"@date-fns/tz": "^1.2.0",
31+
"@dnd-kit/core": "^6.3.1",
32+
"@dnd-kit/modifiers": "^9.0.0",
33+
"@dnd-kit/sortable": "^10.0.0",
34+
"@dnd-kit/utilities": "^3.2.2",
35+
"@hookform/resolvers": "^3.10.0",
36+
"@mendable/firecrawl-js": "^1.24.0",
37+
"@nangohq/frontend": "^0.53.2",
38+
"@next/third-parties": "^15.3.1",
39+
"@novu/headless": "^2.6.6",
40+
"@novu/react": "^2.6.6",
41+
"@number-flow/react": "^0.5.9",
42+
"@prisma/instrumentation": "6.6.0",
43+
"@react-email/components": "^0.0.41",
44+
"@react-email/render": "^1.1.2",
45+
"@tanstack/react-query": "^5.74.4",
46+
"@tanstack/react-table": "^8.21.3",
47+
"@tiptap/extension-table": "^2.11.7",
48+
"@tiptap/extension-table-cell": "^2.11.7",
49+
"@tiptap/extension-table-header": "^2.11.7",
50+
"@tiptap/extension-table-row": "^2.11.7",
51+
"@tiptap/pm": "^2.11.7",
52+
"@tiptap/react": "^2.11.7",
53+
"@tiptap/starter-kit": "^2.11.7",
54+
"@trigger.dev/react-hooks": "3.3.17",
55+
"@trigger.dev/sdk": "3.3.17",
56+
"@types/d3": "^7.4.3",
57+
"@uploadthing/react": "^7.3.0",
58+
"@upstash/ratelimit": "^2.0.5",
59+
"@vercel/sdk": "^1.7.1",
60+
"ai": "^4.3.10",
61+
"argon2": "^0.43.0",
62+
"axios": "^1.9.0",
63+
"better-auth": "^1.2.7",
64+
"bun": "^1.2.10",
65+
"crypto": "^1.0.1",
66+
"d3": "^7.9.0",
67+
"dub": "^0.46.29",
68+
"framer-motion": "^12.9.2",
69+
"geist": "^1.3.1",
70+
"highlight.js": "^11.11.1",
71+
"immer": "^10.1.1",
72+
"languine": "^3.1.4",
73+
"marked": "^15.0.11",
74+
"motion": "^12.9.2",
75+
"next": "^15.4.0-canary.62",
76+
"next-international": "^1.3.1",
77+
"next-intl": "^3.26.5",
78+
"next-safe-action": "^7.10.6",
79+
"next-themes": "^0.4.6",
80+
"novel": "^1.0.2",
81+
"novu": "^2.6.6",
82+
"nuqs": "^2.4.3",
83+
"playwright-core": "^1.52.0",
84+
"posthog-js": "^1.236.6",
85+
"posthog-node": "^4.14.0",
86+
"puppeteer-core": "^24.7.2",
87+
"react-dom": "^19.1.0",
88+
"react-email": "^4.0.15",
89+
"react-hotkeys-hook": "^4.6.2",
90+
"react-intersection-observer": "^9.16.0",
91+
"react-markdown": "^9.1.0",
92+
"react-textarea-autosize": "^8.5.9",
93+
"react-use-draggable-scroll": "^0.4.7",
94+
"react-wrap-balancer": "^1.1.1",
95+
"remark-gfm": "^4.0.1",
96+
"remark-parse": "^11.0.0",
97+
"resend": "^4.4.1",
98+
"sonner": "^1.7.4",
99+
"stripe": "^18.1.0",
100+
"tiptap-markdown": "^0.8.10",
101+
"ts-pattern": "^5.7.0",
102+
"use-debounce": "^10.0.4",
103+
"use-long-press": "^3.3.0",
104+
"xml2js": "^0.6.2",
105+
"zustand": "^5.0.3"
106+
},
107+
"devDependencies": {
108+
"next": "15.4.0-canary.62",
109+
"@comp/db": "workspace:*",
110+
"@trigger.dev/build": "3.3.17",
111+
"@types/node": "^22.15.2",
112+
"@types/react": "19.1.2",
113+
"@types/react-dom": "19.1.1",
114+
"postcss": "^8.5.3",
115+
"tailwindcss": "^3.4.17",
116+
"typescript": "^5.8.3"
117+
},
118+
"resolutions": {
119+
"@types/react": "19.1.2",
120+
"@types/react-dom": "19.1.1"
121+
},
122+
"pnpm": {
123+
"overrides": {
124+
"tiptap-extension-global-drag-handle": "^0.1.18"
125+
}
126+
},
127+
"exports": {
128+
"./src/lib/encryption": "./src/lib/encryption.ts"
129+
},
130+
"peerDependencies": {
131+
"react": "^19",
132+
"react-dom": "^19",
133+
"react-hook-form": "^7.56.3"
134+
}
131135
}

‎biome.json‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)