Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
67f3607
chore: update package versions and configurations across multiple pac…
Marfuen Jul 28, 2025
f33bb34
fix: add missing newlines in package.json and index.ts files for cons…
Marfuen Jul 28, 2025
e2e5e65
chore: reorganize package.json files across multiple packages
Marfuen Jul 28, 2025
2cdc51b
refactor: update import statements to use types from @comp/db/types
Marfuen Jul 28, 2025
fd3a8c0
Merge branch 'main' of https://github.com/trycompai/comp into claudio…
Marfuen Jul 28, 2025
3328506
Merge pull request #1141 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
639ac5e
fix: update BINARY_TARGET for Prisma extension
Marfuen Jul 28, 2025
9365db1
Merge pull request #1143 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
a9210a8
feat: enhance Prisma client generation process with detailed logging
Marfuen Jul 28, 2025
45b46e1
Merge pull request #1144 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
3fea35a
chore: update Prisma dependencies and configuration
Marfuen Jul 28, 2025
9484255
chore: update package.json to remove duplicate Prisma entry
Marfuen Jul 28, 2025
3ec3495
Merge pull request #1145 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
a55ded7
chore: remove 'bun' runtime configuration from trigger.config.ts
Marfuen Jul 28, 2025
bd411a6
Merge pull request #1146 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
cbc1d36
feat: add shouldGenerateTypes option to PrismaExtensionOptions
Marfuen Jul 28, 2025
f984d3a
Merge pull request #1147 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
fda190d
chore: remove binaryTargets from Prisma schema configuration
Marfuen Jul 28, 2025
88fa4b0
Merge pull request #1148 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
0c5afa7
chore: update Prisma configuration and dependencies in bun.lock and t…
Marfuen Jul 28, 2025
3a04df0
Merge pull request #1149 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
6915e8d
chore: update Prisma schema configuration to refine preview features …
Marfuen Jul 28, 2025
27e6a95
Merge pull request #1150 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
d214286
chore: update trigger.config.ts to use custom PrismaExtension and ref…
Marfuen Jul 28, 2025
c709427
chore: enhance deployment logging and update Prisma environment confi…
Marfuen Jul 28, 2025
dc6d45d
Merge pull request #1151 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
09bf5fc
chore: update Prisma CLI binary targets for compatibility
Marfuen Jul 28, 2025
63d4a86
Merge pull request #1152 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
996e09a
chore: add commands to copy generated Prisma client to expected location
Marfuen Jul 28, 2025
765701f
Merge pull request #1153 from trycompai/claudio/infra-code
Marfuen Jul 28, 2025
a53cb42
fix: update Prisma extension to properly handle generated client loca…
Marfuen Jul 28, 2025
9182fd2
style: fix prettier formatting in customPrismaExtension.ts
Marfuen Jul 28, 2025
556bd17
fix: simplify Prisma extension to copy generated client to correct lo…
Marfuen Jul 28, 2025
28abf7e
Merge pull request #1154 from trycompai/claudio/infra-code
Marfuen Jul 29, 2025
8d2fe33
fix: ensure Prisma query engine binary is properly copied in Trigger.…
Marfuen Jul 29, 2025
7159deb
Merge pull request #1155 from trycompai/claudio/infra-code
Marfuen Jul 29, 2025
7c3af89
fix: copy Prisma binary to locations where runtime is searching
Marfuen Jul 29, 2025
d0165f4
Merge pull request #1156 from trycompai/claudio/infra-code
Marfuen Jul 29, 2025
880e2dc
chore: remove "type" field from package.json for consistency
Marfuen Jul 29, 2025
ad5cb79
Merge pull request #1157 from trycompai/claudio/infra-code
Marfuen Jul 29, 2025
d777006
chore: add RHEL binary target for Prisma client compatibility
Marfuen Jul 29, 2025
4470a4a
Merge pull request #1158 from trycompai/claudio/infra-code
Marfuen Jul 29, 2025
a9ee09a
fix: ensure Prisma client is generated during Next.js build for deplo…
Marfuen Jul 29, 2025
b16e34d
Merge pull request #1159 from trycompai/claudio/infra-code
Marfuen Jul 29, 2025
fa43f5e
fix: ensure Prisma binaries are included in Vercel deployment
Marfuen Jul 29, 2025
6ef5033
fix: comprehensive Prisma deployment fix for Vercel monorepo
Marfuen Jul 29, 2025
1e01ae4
fix: restore import of environment variables in Next.js config
Marfuen Jul 29, 2025
e877714
fix: ensure Prisma binaries are included in Vercel deployment with cu…
Marfuen Jul 29, 2025
ab60dc8
refactor: simplify Next.js configuration and build script for Prisma …
Marfuen Jul 29, 2025
7388d43
Merge pull request #1160 from trycompai/claudio/infra-code
Marfuen Jul 29, 2025
3fccc8f
chore: add buildspec for database migrations
claudfuen Jul 29, 2025
55b5718
Merge pull request #1161 from trycompai/claudio/fix-height-issue
claudfuen Jul 29, 2025
c633df3
chore: update Prisma dependencies to version 6.13.0 across the project
Marfuen Jul 29, 2025
f65cc8b
chore: update project dependencies and configuration for improved com…
Marfuen Jul 29, 2025
7e7bbd7
chore: update react and related dependencies across multiple package.…
Marfuen Jul 29, 2025
a0157bb
chore: update build and lint scripts in package.json files
Marfuen Jul 29, 2025
1fb3ab2
refactor: reorganize imports for better clarity and consistency
Marfuen Jul 29, 2025
5d1848d
chore: update dependencies and configuration for improved functionality
Marfuen Jul 29, 2025
1c70985
refactor: update FrameworkSelection component for improved framework …
Marfuen Jul 29, 2025
60187c8
Merge branch 'main' into claudio/infra-code
Marfuen Jul 29, 2025
ab98009
refactor: migrate database imports to @trycompai/db
Marfuen Jul 29, 2025
ed22bdb
refactor: simplify PrismaExtension for @trycompai/db integration
Marfuen Jul 29, 2025
5e5e7b7
chore: upgrade @trycompai/db to version 1.2.6 across all relevant pac…
Marfuen Jul 29, 2025
fb91918
fix: add newline at end of package.json for proper formatting
Marfuen Jul 29, 2025
25da56c
chore: bump @trycompai/db version to 1.2.7 and update binaryTargets i…
Marfuen Jul 29, 2025
dffba58
chore: add glob and buffer-from dependencies, update Next.js config f…
Marfuen Jul 29, 2025
9f3b042
chore: remove unnecessary newline in package.json for cleaner formatting
Marfuen Jul 29, 2025
43a003c
chore: update Next.js config for Prisma integration
Marfuen Jul 29, 2025
1fbd67b
chore: enhance Next.js config for Vercel deployment with @trycompai/db
Marfuen Jul 29, 2025
1ccaae1
fix: correct environment variable assignment for Prisma query engine …
Marfuen Jul 29, 2025
e7cbc8f
feat: integrate Prisma client generation and update imports for local…
Marfuen Jul 29, 2025
f3ed25a
fix: correct indentation in package.json scripts section
Marfuen Jul 29, 2025
e0061c0
feat: add Prisma client generation task and update build dependencies
Marfuen Jul 29, 2025
4850e68
fix: restore prebuild script in package.json for Prisma client genera…
Marfuen Jul 29, 2025
716da1a
chore: update Prisma schema and client generation script to include b…
Marfuen Jul 29, 2025
4bc6cb4
chore: add Prisma Next.js monorepo workaround plugin and enhance Next…
Marfuen Jul 29, 2025
f3314e9
Merge pull request #1162 from trycompai/claudio/infra-code
Marfuen Jul 29, 2025
186e56b
refactor: clean up fallback Prisma schema in client generation script
Marfuen Jul 29, 2025
cd1f645
chore: update @trycompai/db package version to 1.2.8 and adjust relat…
Marfuen Jul 29, 2025
4a3ff89
Merge pull request #1163 from trycompai/claudio/infra-code
Marfuen Jul 29, 2025
a98f139
refactor: streamline Prisma client management and update configuration
Marfuen Jul 29, 2025
c3872ae
chore: reorder db scripts in package.json for clarity
Marfuen Jul 29, 2025
9782bd3
chore: update .gitignore and remove old Prisma schema file
Marfuen Jul 29, 2025
681c1f7
chore: update various components and actions for improved functionali…
Marfuen Jul 30, 2025
5743c50
chore: update db:getschema script location in package.json
Marfuen Jul 30, 2025
b5ce5f1
fix: ensure consistent newline handling in Prisma client and exports
Marfuen Jul 30, 2025
78b1e87
chore: reorganize imports across multiple components and actions for …
Marfuen Jul 30, 2025
947dfbc
Merge pull request #1164 from trycompai/claudio/infra-code
Marfuen Jul 30, 2025
ff36b14
chore: update TypeScript configuration and add dotenv dependency
Marfuen Jul 30, 2025
51f1533
Merge pull request #1165 from trycompai/claudio/infra-code
Marfuen Jul 30, 2025
738508a
chore: update @trycompai/db package version to 1.2.9 and adjust imports
Marfuen Jul 30, 2025
52c33c4
Merge pull request #1166 from trycompai/claudio/infra-code
Marfuen Jul 30, 2025
b260fc9
refactor: update Prisma client imports and configuration
claudfuen Jul 30, 2025
98efb51
feat: add Dockerfiles for app and portal services
claudfuen Jul 30, 2025
6a296c8
Merge pull request #1167 from trycompai/claudio/fix-height-issue
claudfuen Jul 30, 2025
8bd0263
feat: enhance PrismaExtension to resolve and copy schema from @trycom…
Marfuen Jul 30, 2025
52df46e
Merge pull request #1169 from trycompai/mariano/finalize-aws
Marfuen Jul 30, 2025
df09d0c
chore: update @trycompai/db package version to 1.3.0 and add dotenv d…
Marfuen Jul 30, 2025
681055e
Merge pull request #1170 from trycompai/mariano/finalize-aws
Marfuen Jul 30, 2025
266090d
chore: rename workflows and update migration commands to use Bun
Marfuen Jul 30, 2025
f6974ee
Merge pull request #1171 from trycompai/mariano/finalize-aws
Marfuen Jul 30, 2025
c5ff854
chore: update @trycompai/db package version to 1.3.0 in trigger.confi…
Marfuen Jul 30, 2025
a85e0ca
Merge pull request #1172 from trycompai/mariano/finalize-aws
Marfuen Jul 30, 2025
c413f6f
feat: enhance schema resolution in PrismaExtension for monorepo support
Marfuen Jul 30, 2025
14e4ceb
Merge pull request #1173 from trycompai/mariano/finalize-aws
Marfuen Jul 30, 2025
856f869
feat: introduce custom PrismaExtension for enhanced schema handling
Marfuen Jul 30, 2025
680e141
Merge pull request #1174 from trycompai/mariano/finalize-aws
Marfuen Jul 30, 2025
40d020b
chore: format
Marfuen Jul 30, 2025
3081bb8
Merge branch 'main' of https://github.com/trycompai/comp into mariano…
Marfuen Jul 30, 2025
ee59f0f
chore: update deployment workflow and remove obsolete Prisma extension
Marfuen Jul 30, 2025
7ecc94b
Merge pull request #1175 from trycompai/mariano/finalize-aws
Marfuen Jul 30, 2025
d85f5e8
Merge branch 'release' into main
Marfuen Jul 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 11 additions & 2 deletions .github/workflows/database-migrations-main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Database Migrations Dev
name: Database Migrations Main
on:
push: # Runs AFTER merge to main (never during PR review!)
branches:
Expand All @@ -11,9 +11,18 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup Bun
uses: oven-sh/setup-bun@v1
with:
bun-version: latest

- name: Install dependencies
run: bun install

- name: Apply database migrations
env:
DATABASE_URL: ${{ secrets.DATABASE_URL_DEV }}
run: |
cd packages/db
npx prisma migrate deploy
bunx prisma migrate deploy
13 changes: 11 additions & 2 deletions .github/workflows/database-migrations-release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Database Migrations Prod
name: Database Migrations Release
on:
push: # Runs AFTER merge to release (never during PR review!)
branches:
Expand All @@ -11,9 +11,18 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup Bun
uses: oven-sh/setup-bun@v1
with:
bun-version: latest

- name: Install dependencies
run: bun install

- name: Apply database migrations
env:
DATABASE_URL: ${{ secrets.DATABASE_URL_PROD }}
run: |
cd packages/db
npx prisma migrate deploy
bunx prisma migrate deploy
3 changes: 2 additions & 1 deletion .github/workflows/trigger-tasks-deploy-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ jobs:
run: bunx prisma generate
- name: 🚀 Deploy Trigger.dev
working-directory: ./apps/app
timeout-minutes: 20
env:
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
SECRET_KEY: ${{ secrets.SECRET_KEY }}
VERCEL_ACCESS_TOKEN: ${{ secrets.VERCEL_ACCESS_TOKEN }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
VERCEL_TEAM_ID: ${{ secrets.VERCEL_TEAM_ID }}
run: bunx trigger.dev@latest deploy --env staging
run: bunx trigger.dev@latest deploy --env staging --log-level debug
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,7 @@ debug-setup-page.png

.playground/

packages/*/dist
packages/*/dist

# Generated Prisma Client
**/src/db/generated/
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ WORKDIR /app
COPY packages/db/prisma ./packages/db/prisma

# Create minimal package.json for Prisma
RUN echo '{"name":"migrator","type":"module","dependencies":{"prisma":"^6.9.0","@prisma/client":"^6.9.0"}}' > package.json
RUN echo '{"name":"migrator","type":"module","dependencies":{"prisma":"^6.13.0","@prisma/client":"^6.13.0"}}' > package.json

# Install ONLY Prisma dependencies
RUN bun install
Expand Down
7 changes: 4 additions & 3 deletions apps/app/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"extends": "next/core-web-vitals",
"extends": ["next/core-web-vitals"],
"ignorePatterns": ["src/db/generated/**"],
"rules": {
"react/no-unescaped-entities": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
"react-hooks/rules-of-hooks": "warn",
"react/no-unescaped-entities": "off",
"react/display-name": "off"
}
}
5 changes: 5 additions & 0 deletions apps/app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,8 @@ next-env.d.ts

# Sentry Config File
.env.sentry-build-plugin

# Generated Prisma Client
prisma/generated
# Copied schema from @trycompai/db package - always generate fresh
prisma/schema.prisma
5 changes: 4 additions & 1 deletion apps/app/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Playwright test artifacts
playwright-report/
test-results/
.playwright/
.playwright/

# Generated Prisma Client
src/db/generated/
File renamed without changes.
Loading
Loading