Skip to content

Commit b1f7090

Browse files
authored
Merge pull request #743 from trycompai/main
[comp] Production Deploy
2 parents 4e37daf + aaabf54 commit b1f7090

File tree

219 files changed

+10143
-42290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+10143
-42290
lines changed

.cursor/rules/server-actions.mdc

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
---
2-
description:
2+
description:
33
globs: *.ts
44
alwaysApply: false
55
---
6-
- Never use safe server actions, always use regular simple server actions.
6+
- Always use safe-actions [safe-action.ts](mdc:apps/app/src/actions/safe-action.ts), here's an example:
7+
[delete-integration-connection.ts](mdc:apps/app/src/actions/integrations/delete-integration-connection.ts)
8+
9+
- Always revalidate the path based on the header x-path-name:
10+
11+
const headersList = await headers();
12+
let path =
13+
headersList.get("x-pathname") || headersList.get("referer") || "";
14+
path = path.replace(/\/[a-z]{2}\//, "/");
15+
16+
revalidatePath(path);

.cursor/rules/translation-rules.mdc

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

.github/workflows/database-migrations-main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- main
66
workflow_dispatch: # Allows manual triggering
77
env:
8-
BUN_VERSION: "1.0.26"
8+
BUN_VERSION: "1.2.15"
99
jobs:
1010
migrate:
1111
name: Run Database Migrations
@@ -17,8 +17,6 @@ jobs:
1717
uses: oven-sh/setup-bun@v1
1818
with:
1919
bun-version: ${{ env.BUN_VERSION }}
20-
- name: Install dependencies
21-
run: bun install
2220
- name: Apply database migrations
2321
env:
2422
DATABASE_URL: ${{ secrets.DATABASE_URL_DEV }}

.github/workflows/database-migrations-release.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- release
66
workflow_dispatch: # Allows manual triggering
77
env:
8-
BUN_VERSION: "1.0.26"
8+
BUN_VERSION: "1.2.15"
99
jobs:
1010
migrate:
1111
name: Run Database Migrations
@@ -17,8 +17,6 @@ jobs:
1717
uses: oven-sh/setup-bun@v1
1818
with:
1919
bun-version: ${{ env.BUN_VERSION }}
20-
- name: Install dependencies
21-
run: bun install
2220
- name: Apply database migrations
2321
env:
2422
DATABASE_URL: ${{ secrets.DATABASE_URL_PROD }}

.github/workflows/trigger-tasks-deploy-main.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ jobs:
1111
- name: Use Node.js 20.x
1212
uses: actions/setup-node@v4
1313
with:
14-
node-version: "20.x"
14+
node-version: "22.x" # Updated to match Node.js w/ Vercel
1515
- name: Setup Bun
1616
uses: oven-sh/setup-bun@v1
17+
- name: Clear cache
18+
run: rm -rf node_modules .bun
1719
- name: Install dependencies
18-
run: bun install
20+
run: |
21+
bun install --no-cache --force
1922
- name: Generate Prisma client
2023
working-directory: ./packages/db
2124
run: bunx prisma generate

apps/app/next.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const config: NextConfig = {
2727
serverActions: {
2828
bodySizeLimit: "15mb",
2929
},
30+
nodeMiddleware: true,
3031
authInterrupts: true,
3132
},
3233
async rewrites() {

apps/app/package.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.0",
44
"private": true,
55
"scripts": {
6-
"dev": "bun install && bun run apply-migrations && bunx concurrently --kill-others --names \"next,trigger\" --prefix-colors \"yellow,blue\" \"next dev --turbo -p 3000\" \"bun run trigger:dev\"",
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\"",
77
"trigger:dev": "npx trigger.dev@latest dev",
88
"build": "next build --turbopack",
99
"start": "next start",
@@ -40,6 +40,8 @@
4040
"@novu/react": "^2.6.6",
4141
"@number-flow/react": "^0.5.9",
4242
"@prisma/instrumentation": "6.6.0",
43+
"@react-email/components": "^0.0.41",
44+
"@react-email/render": "^1.1.2",
4345
"@tanstack/react-query": "^5.74.4",
4446
"@tanstack/react-table": "^8.21.3",
4547
"@tiptap/extension-table": "^2.11.7",
@@ -70,8 +72,7 @@
7072
"languine": "^3.1.4",
7173
"marked": "^15.0.11",
7274
"motion": "^12.9.2",
73-
"next": "^15.3.1",
74-
"next-auth": "^5.0.0-beta.27",
75+
"next": "^15.4.0-canary.62",
7576
"next-international": "^1.3.1",
7677
"next-intl": "^3.26.5",
7778
"next-safe-action": "^7.10.6",
@@ -83,8 +84,8 @@
8384
"posthog-js": "^1.236.6",
8485
"posthog-node": "^4.14.0",
8586
"puppeteer-core": "^24.7.2",
86-
"react": "^19.1.0",
8787
"react-dom": "^19.1.0",
88+
"react-email": "^4.0.15",
8889
"react-hotkeys-hook": "^4.6.2",
8990
"react-intersection-observer": "^9.16.0",
9091
"react-markdown": "^9.1.0",
@@ -104,6 +105,7 @@
104105
"zustand": "^5.0.3"
105106
},
106107
"devDependencies": {
108+
"next": "15.4.0-canary.62",
107109
"@comp/db": "workspace:*",
108110
"@trigger.dev/build": "3.3.17",
109111
"@types/node": "^22.15.2",
@@ -126,8 +128,8 @@
126128
"./src/lib/encryption": "./src/lib/encryption.ts"
127129
},
128130
"peerDependencies": {
129-
"react": "^19.1.0",
130-
"react-dom": "^19.1.0",
131+
"react": "^19",
132+
"react-dom": "^19",
131133
"react-hook-form": "^7.56.3"
132134
}
133135
}

apps/app/src/actions/add-comment.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ export const addCommentAction = authActionClient
6666
"";
6767
path = path.replace(/\/[a-z]{2}\//, "/");
6868

69-
if (path) {
70-
revalidatePath(path);
71-
}
69+
revalidatePath(path);
7270

7371
return { success: true, data: comment };
7472
} catch (error) {

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/actions/createComment.ts renamed to apps/app/src/actions/comments/createComment.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,12 @@ export const createComment = async (
112112
return comment;
113113
});
114114

115-
if (pathToRevalidate) {
116-
revalidatePath(pathToRevalidate);
117-
}
115+
const headersList = await headers();
116+
let path =
117+
headersList.get("x-pathname") || headersList.get("referer") || "";
118+
path = path.replace(/\/[a-z]{2}\//, "/");
119+
120+
revalidatePath(path);
118121

119122
return {
120123
success: true,

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/actions/deleteComment.ts renamed to apps/app/src/actions/comments/deleteComment.ts

File renamed without changes.

0 commit comments

Comments
 (0)