diff --git a/apps/webapp/app/services/jobs/registerJob.server.ts b/apps/webapp/app/services/jobs/registerJob.server.ts index 401c69c8aac..3898083595f 100644 --- a/apps/webapp/app/services/jobs/registerJob.server.ts +++ b/apps/webapp/app/services/jobs/registerJob.server.ts @@ -4,14 +4,7 @@ import { SCHEDULED_EVENT, TriggerMetadata, } from "@trigger.dev/core"; -import type { - Endpoint, - Integration, - Job, - JobIntegration, - JobIntegrationPayload, - JobVersion, -} from "@trigger.dev/database"; +import type { Endpoint, Integration, Job, JobIntegration, JobVersion } from "@trigger.dev/database"; import { DEFAULT_MAX_CONCURRENT_RUNS } from "~/consts"; import type { PrismaClient } from "~/db.server"; import { prisma } from "~/db.server"; diff --git a/docker/Dockerfile b/docker/Dockerfile index 2c7d3fc3023..cf12ecd6a8c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -32,7 +32,8 @@ ENV NODE_ENV production RUN pnpm install --prod --no-frozen-lockfile COPY --from=pruner --chown=node:node /triggerdotdev/packages/database/prisma/schema.prisma /triggerdotdev/packages/database/prisma/schema.prisma # RUN pnpm add @prisma/client@5.1.1 -w -RUN pnpx prisma@4.16.0 generate --schema /triggerdotdev/packages/database/prisma/schema.prisma +ENV NPM_CONFIG_IGNORE_WORKSPACE_ROOT_CHECK true +RUN pnpx prisma@5.4.1 generate --schema /triggerdotdev/packages/database/prisma/schema.prisma ## Builder (builds the webapp) FROM base AS builder diff --git a/docker/dev-compose.yml b/docker/dev-compose.yml index b5db14f4bd5..3f0003a5759 100644 --- a/docker/dev-compose.yml +++ b/docker/dev-compose.yml @@ -35,6 +35,7 @@ services: DIRECT_URL: postgres://postgres:postgres@db:5432/postgres?schema=public SESSION_SECRET: secret123 MAGIC_LINK_SECRET: secret123 + ENCRYPTION_KEY: secret123 REMIX_APP_PORT: 3030 PORT: 3030 networks: diff --git a/packages/database/package.json b/packages/database/package.json index dda8fdef487..3fcb975173d 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -5,11 +5,11 @@ "main": "./src/index.ts", "types": "./src/index.ts", "dependencies": { - "@prisma/client": "4.16.0", + "@prisma/client": "5.4.1", "typescript": "^4.8.4" }, "devDependencies": { - "prisma": "4.16.0" + "prisma": "5.4.1" }, "scripts": { "generate": "prisma generate", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index af3b34683ce..8f347a8714c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -763,14 +763,14 @@ importers: packages/database: specifiers: - '@prisma/client': 4.16.0 - prisma: 4.16.0 + '@prisma/client': 5.4.1 + prisma: 5.4.1 typescript: ^4.8.4 dependencies: - '@prisma/client': 4.16.0_prisma@4.16.0 + '@prisma/client': 5.4.1_prisma@5.4.1 typescript: 4.9.5 devDependencies: - prisma: 4.16.0 + prisma: 5.4.1 packages/emails: specifiers: @@ -9494,9 +9494,9 @@ packages: config-chain: 1.1.13 dev: false - /@prisma/client/4.16.0_prisma@4.16.0: - resolution: {integrity: sha512-CBD+5IdZPiavhLkQokvsz1uz4r9ppixaqY/ajybWs4WXNnsDVMBKEqN3BiPzpSo79jiy22VKj/67pqt4VwIg9w==} - engines: {node: '>=14.17'} + /@prisma/client/5.4.1_prisma@5.4.1: + resolution: {integrity: sha512-xyD0DJ3gRNfLbPsC+YfMBBuLJtZKQfy1OD2qU/PZg+HKrr7SO+09174LMeTlWP0YF2wca9LxtVd4HnAiB5ketQ==} + engines: {node: '>=16.13'} requiresBuild: true peerDependencies: prisma: '*' @@ -9504,16 +9504,16 @@ packages: prisma: optional: true dependencies: - '@prisma/engines-version': 4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c - prisma: 4.16.0 + '@prisma/engines-version': 5.4.1-1.2f302df92bd8945e20ad4595a73def5b96afa54f + prisma: 5.4.1 dev: false - /@prisma/engines-version/4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c: - resolution: {integrity: sha512-tMWAF/qF00fbUH1HB4Yjmz6bjh7fzkb7Y3NRoUfMlHu6V+O45MGvqwYxqwBjn1BIUXkl3r04W351D4qdJjrgvA==} + /@prisma/engines-version/5.4.1-1.2f302df92bd8945e20ad4595a73def5b96afa54f: + resolution: {integrity: sha512-+nUQM/y8C+1GG5Ioeqcu6itFslCfxvQSAUVSMC9XM2G2Fcq0F4Afnp6m0pXF6X6iUBWen7jZBPmM9Qlq4Nr3/A==} dev: false - /@prisma/engines/4.16.0: - resolution: {integrity: sha512-M6XoMRXnqL0rqZGQS8ZpNiHYG4G1fKBdoqW/oBtHnr1in5UYgerZqal3CXchmd6OBD/770PE9dtjQuqcilZJUA==} + /@prisma/engines/5.4.1: + resolution: {integrity: sha512-vJTdY4la/5V3N7SFvWRmSMUh4mIQnyb/MNoDjzVbh9iLmEC+uEykj/1GPviVsorvfz7DbYSQC4RiwmlEpTEvGA==} requiresBuild: true /@protobufjs/aspromise/1.1.2: @@ -26455,13 +26455,13 @@ packages: react: 18.2.0 dev: false - /prisma/4.16.0: - resolution: {integrity: sha512-kSCwbTm3LCephyGfZMJYqBXpPJXdJStg5xwfzeFmR5C05zfkOURK9pQpJF6uUQvFWm3lI9ZMSNkObmFkAPnB+g==} - engines: {node: '>=14.17'} + /prisma/5.4.1: + resolution: {integrity: sha512-op9PmU8Bcw5dNAas82wBYTG0yHnpq9/O3bhxbDBrNzwZTwBqsVCxxYRLf6wHNh9HVaDGhgjjHlu1+BcW8qdnBg==} + engines: {node: '>=16.13'} hasBin: true requiresBuild: true dependencies: - '@prisma/engines': 4.16.0 + '@prisma/engines': 5.4.1 /prismjs/1.29.0: resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}