Merges 573 with fix for Dockerfile (triggerdotdev#578)

ericallam · karti16 · web-flow · commit 24d892e322dd · 2023-10-06T15:10:43.000+01:00
* update prisma to 5.4.1 (triggerdotdev#573) * Get prisma 5.4.1 to work in the Dockerfile --------- Co-authored-by: Karthik <kartim316@gmail.com>
diff --git 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
@@ -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
@@ -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
@@ -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
