Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/trigger-api-tasks-deploy-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@ jobs:
- name: Build DB package
working-directory: ./packages/db
run: bun run build
- name: Copy model files to api schema dir and generate client
- name: Copy model files to api schema dir
working-directory: ./apps/api
run: |
find ../../packages/db/prisma/schema -name '*.prisma' ! -name 'schema.prisma' -exec cp {} prisma/schema/ \;
bunx prisma generate --schema=prisma/schema
- name: 🚀 Deploy Trigger.dev
working-directory: ./apps/api
timeout-minutes: 20
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/trigger-api-tasks-deploy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,10 @@ jobs:
working-directory: ./packages/db
run: bun run build

- name: Copy model files to api schema dir and generate client
- name: Copy model files to api schema dir
working-directory: ./apps/api
run: |
find ../../packages/db/prisma/schema -name '*.prisma' ! -name 'schema.prisma' -exec cp {} prisma/schema/ \;
bunx prisma generate --schema=prisma/schema

- name: 🚀 Deploy Trigger.dev
working-directory: ./apps/api
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/trigger-tasks-deploy-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ jobs:
- name: Build Integration Platform package
working-directory: ./packages/integration-platform
run: bun run build
- name: Copy schema to app and generate client
working-directory: ./apps/app
- name: Generate Prisma clients
run: |
mkdir -p prisma/schema
cd packages/db && node scripts/generate-prisma-client-js.js
cd ../..
cd apps/app && mkdir -p prisma/schema
find ../../packages/db/prisma/schema -name '*.prisma' ! -name 'schema.prisma' -exec cp {} prisma/schema/ \;
bunx prisma generate --schema=prisma/schema
- name: 🚀 Deploy Trigger.dev
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/trigger-tasks-deploy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ jobs:
working-directory: ./packages/integration-platform
run: bun run build

- name: Copy schema to app and generate client
working-directory: ./apps/app
- name: Generate Prisma clients
run: |
mkdir -p prisma/schema
cd packages/db && node scripts/generate-prisma-client-js.js
cd ../..
cd apps/app && mkdir -p prisma/schema
find ../../packages/db/prisma/schema -name '*.prisma' ! -name 'schema.prisma' -exec cp {} prisma/schema/ \;
bunx prisma generate --schema=prisma/schema

Expand Down
47 changes: 34 additions & 13 deletions apps/api/customPrismaExtension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -283,31 +283,52 @@ export class PrismaExtension implements BuildExtension {
}

private buildSchemaCandidates(context: ExtendedBuildContext): string[] {
const candidates = new Set<string>();

const addNodeModuleCandidates = (start: string | undefined) => {
if (!start) {
return;
const candidates: string[] = [];
const seen = new Set<string>();
const add = (p: string) => {
const resolved = resolve(p);
if (!seen.has(resolved)) {
seen.add(resolved);
candidates.push(resolved);
}
};

// Strategy 1: Resolve @trycompai/db via Node module resolution (follows workspace symlinks)
try {
const dbPkgJson = require.resolve('@trycompai/db/package.json', {
paths: [context.workingDir],
});
const dbRoot = dirname(dbPkgJson);
add(join(dbRoot, 'dist', 'schema.prisma'));
add(join(dbRoot, 'prisma', 'schema', 'schema.prisma'));
} catch {
// Package not resolvable yet (pre-install), fall through to other strategies
}

// Strategy 2: Walk up node_modules hierarchy from workingDir and workspaceDir
const addNodeModuleCandidates = (start: string | undefined) => {
if (!start) return;
let current = start;
while (true) {
candidates.add(resolve(current, 'node_modules/@trycompai/db/dist/schema.prisma'));
const dbDir = resolve(current, 'node_modules', '@trycompai', 'db');
add(join(dbDir, 'dist', 'schema.prisma'));
add(join(dbDir, 'prisma', 'schema', 'schema.prisma'));
const parent = dirname(current);
if (parent === current) {
break;
}
if (parent === current) break;
current = parent;
}
};

addNodeModuleCandidates(context.workingDir);
addNodeModuleCandidates(context.workspaceDir);

candidates.add(resolve(context.workingDir, '../../packages/db/dist/schema.prisma'));
candidates.add(resolve(context.workingDir, '../packages/db/dist/schema.prisma'));
// Strategy 3: Relative monorepo paths (apps/api → packages/db, apps/app → packages/db)
for (const rel of ['../../packages/db', '../packages/db']) {
const dbDir = resolve(context.workingDir, rel);
add(join(dbDir, 'dist', 'schema.prisma'));
add(join(dbDir, 'prisma', 'schema', 'schema.prisma'));
}

return Array.from(candidates);
return candidates;
}
}

Expand Down
47 changes: 34 additions & 13 deletions apps/app/customPrismaExtension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -283,30 +283,51 @@ export class PrismaExtension implements BuildExtension {
}

private buildSchemaCandidates(context: ExtendedBuildContext): string[] {
const candidates = new Set<string>();

const addNodeModuleCandidates = (start: string | undefined) => {
if (!start) {
return;
const candidates: string[] = [];
const seen = new Set<string>();
const add = (p: string) => {
const resolved = resolve(p);
if (!seen.has(resolved)) {
seen.add(resolved);
candidates.push(resolved);
}
};

// Strategy 1: Resolve @trycompai/db via Node module resolution (follows workspace symlinks)
try {
const dbPkgJson = require.resolve('@trycompai/db/package.json', {
paths: [context.workingDir],
});
const dbRoot = dirname(dbPkgJson);
add(join(dbRoot, 'dist', 'schema.prisma'));
add(join(dbRoot, 'prisma', 'schema', 'schema.prisma'));
} catch {
// Package not resolvable yet (pre-install), fall through to other strategies
}

// Strategy 2: Walk up node_modules hierarchy from workingDir and workspaceDir
const addNodeModuleCandidates = (start: string | undefined) => {
if (!start) return;
let current = start;
while (true) {
candidates.add(resolve(current, 'node_modules/@trycompai/db/dist/schema.prisma'));
const dbDir = resolve(current, 'node_modules', '@trycompai', 'db');
add(join(dbDir, 'dist', 'schema.prisma'));
add(join(dbDir, 'prisma', 'schema', 'schema.prisma'));
const parent = dirname(current);
if (parent === current) {
break;
}
if (parent === current) break;
current = parent;
}
};

addNodeModuleCandidates(context.workingDir);
addNodeModuleCandidates(context.workspaceDir);

candidates.add(resolve(context.workingDir, '../../packages/db/dist/schema.prisma'));
candidates.add(resolve(context.workingDir, '../packages/db/dist/schema.prisma'));
// Strategy 3: Relative monorepo paths (apps/api → packages/db, apps/app → packages/db)
for (const rel of ['../../packages/db', '../packages/db']) {
const dbDir = resolve(context.workingDir, rel);
add(join(dbDir, 'dist', 'schema.prisma'));
add(join(dbDir, 'prisma', 'schema', 'schema.prisma'));
}

return Array.from(candidates);
return candidates;
}
}
Loading