From 1c3bcb86ebe289fa3403cffd6b038fbc338b1685 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Tue, 26 Aug 2025 11:40:30 +0100 Subject: [PATCH 1/9] Initial work on upgrading to 6.14.0 Set the output to node_modules still to make it easier --- .cursor/rules/webapp.mdc | 9 +- docker/Dockerfile | 2 +- internal-packages/database/package.json | 4 +- .../database/prisma/schema.prisma | 3 +- pnpm-lock.yaml | 882 +++++++++++++++++- references/v3-catalog/package.json | 96 ++ 6 files changed, 967 insertions(+), 29 deletions(-) create mode 100644 references/v3-catalog/package.json diff --git a/.cursor/rules/webapp.mdc b/.cursor/rules/webapp.mdc index 6cda973951..a362f14fe1 100644 --- a/.cursor/rules/webapp.mdc +++ b/.cursor/rules/webapp.mdc @@ -6,7 +6,7 @@ alwaysApply: false The main trigger.dev webapp, which powers it's API and dashboard and makes up the docker image that is produced as an OSS image, is a Remix 2.1.0 app that uses an express server, written in TypeScript. The following subsystems are either included in the webapp or are used by the webapp in another part of the monorepo: -- `@trigger.dev/database` exports a Prisma 5.4.1 client that is used extensively in the webapp to access a PostgreSQL instance. The schema file is [schema.prisma](mdc:internal-packages/database/prisma/schema.prisma) +- `@trigger.dev/database` exports a Prisma 6.14.0 client that is used extensively in the webapp to access a PostgreSQL instance. The schema file is [schema.prisma](mdc:internal-packages/database/prisma/schema.prisma) - `@trigger.dev/core` is a published package and is used to share code between the `@trigger.dev/sdk` and the webapp. It includes functionality but also a load of Zod schemas for data validation. When importing from `@trigger.dev/core` in the webapp, we never import the root `@trigger.dev/core` path, instead we favor one of the subpath exports that you can find in [package.json](mdc:packages/core/package.json) - `@internal/run-engine` has all the code needed to trigger a run and take it through it's lifecycle to completion. - `@trigger.dev/redis-worker` is a custom redis based background job/worker system that's used in the webapp and also used inside the run engine. @@ -31,7 +31,10 @@ We originally the Trigger.dev "Run Engine" not as a single system, but just spre - The batch trigger API endpoint is [api.v1.tasks.batch.ts](mdc:apps/webapp/app/routes/api.v1.tasks.batch.ts) - Setup code for the prisma client is in [db.server.ts](mdc:apps/webapp/app/db.server.ts) - The run engine is configured in [runEngine.server.ts](mdc:apps/webapp/app/v3/runEngine.server.ts) -- All the "services" that are found in app/v3/services/**/*.server.ts +- All the "services" that are found in app/v3/services/\*_/_.server.ts - The code for the TaskEvent data, which is the otel data sent from tasks to our servers, is in both the [eventRepository.server.ts](mdc:apps/webapp/app/v3/eventRepository.server.ts) and also the [otlpExporter.server.ts](mdc:apps/webapp/app/v3/otlpExporter.server.ts). The otel endpoints which are hit from production and development otel exporters is [otel.v1.logs.ts](mdc:apps/webapp/app/routes/otel.v1.logs.ts) and [otel.v1.traces.ts](mdc:apps/webapp/app/routes/otel.v1.traces.ts) -- We use "presenters" to move more complex loader code into a class, and you can find those are app/v3/presenters/**/*.server.ts +- We use "presenters" to move more complex loader code into a class, and you can find those are app/v3/presenters/\*_/_.server.ts +- All the "services" that are found in app/v3/services/\*_/_.server.ts +- The code for the TaskEvent data, which is the otel data sent from tasks to our servers, is in both the [eventRepository.server.ts](mdc:apps/webapp/app/v3/eventRepository.server.ts) and also the [otlpExporter.server.ts](mdc:apps/webapp/app/v3/otlpExporter.server.ts). The otel endpoints which are hit from production and development otel exporters is [otel.v1.logs.ts](mdc:apps/webapp/app/routes/otel.v1.logs.ts) and [otel.v1.traces.ts](mdc:apps/webapp/app/routes/otel.v1.traces.ts) +- We use "presenters" to move more complex loader code into a class, and you can find those are app/v3/presenters/\*_/_.server.ts diff --git a/docker/Dockerfile b/docker/Dockerfile index 8757fe2aa5..14ecf6138e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -38,7 +38,7 @@ RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install COPY --from=pruner --chown=node:node /triggerdotdev/internal-packages/database/prisma/schema.prisma /triggerdotdev/internal-packages/database/prisma/schema.prisma # RUN pnpm add @prisma/client@5.1.1 -w ENV NPM_CONFIG_IGNORE_WORKSPACE_ROOT_CHECK true -RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpx prisma@5.4.1 generate --schema /triggerdotdev/internal-packages/database/prisma/schema.prisma +RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpx prisma@6.14.0 generate --schema /triggerdotdev/internal-packages/database/prisma/schema.prisma ## Builder (builds the webapp) FROM base AS builder diff --git a/internal-packages/database/package.json b/internal-packages/database/package.json index be3a505fdb..875a11d383 100644 --- a/internal-packages/database/package.json +++ b/internal-packages/database/package.json @@ -5,10 +5,10 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@prisma/client": "5.4.1" + "@prisma/client": "6.14.0" }, "devDependencies": { - "prisma": "5.4.1", + "prisma": "6.14.0", "rimraf": "6.0.1" }, "scripts": { diff --git a/internal-packages/database/prisma/schema.prisma b/internal-packages/database/prisma/schema.prisma index 10df7a0398..01eaa73820 100644 --- a/internal-packages/database/prisma/schema.prisma +++ b/internal-packages/database/prisma/schema.prisma @@ -6,8 +6,9 @@ datasource db { generator client { provider = "prisma-client-js" + output = "../node_modules/.prisma/client" binaryTargets = ["native", "debian-openssl-1.1.x"] - previewFeatures = ["tracing", "metrics"] + previewFeatures = ["metrics"] } model User { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 907ab245c5..c04d87336d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -973,12 +973,12 @@ importers: internal-packages/database: dependencies: '@prisma/client': - specifier: 5.4.1 - version: 5.4.1(prisma@5.4.1) + specifier: 6.14.0 + version: 6.14.0(prisma@6.14.0)(typescript@5.5.4) devDependencies: prisma: - specifier: 5.4.1 - version: 5.4.1 + specifier: 6.14.0 + version: 6.14.0(typescript@5.5.4) rimraf: specifier: 6.0.1 version: 6.0.1 @@ -2366,6 +2366,456 @@ importers: specifier: ^5.5.4 version: 5.5.4 +<<<<<<< ours +||||||| ancestor + references/v3-catalog: + dependencies: + '@1password/sdk': + specifier: ^0.3.0 + version: 0.3.0 + '@effect/schema': + specifier: ^0.75.5 + version: 0.75.5(effect@3.17.1) + '@infisical/sdk': + specifier: ^2.3.5 + version: 2.3.5 + '@opentelemetry/api': + specifier: 1.4.1 + version: 1.4.1 + '@prisma/client': + specifier: 5.19.0 + version: 5.19.0(prisma@5.19.0) + '@react-email/components': + specifier: 0.0.24 + version: 0.0.24(react-dom@18.3.1)(react@19.0.0-rc.0) + '@react-email/render': + specifier: 1.0.1 + version: 1.0.1(react-dom@18.3.1)(react@19.0.0-rc.0) + '@sentry/esbuild-plugin': + specifier: ^2.22.2 + version: 2.22.2 + '@sinclair/typebox': + specifier: ^0.33.17 + version: 0.33.17 + '@sindresorhus/slugify': + specifier: ^2.2.1 + version: 2.2.1 + '@t3-oss/env-core': + specifier: ^0.11.0 + version: 0.11.0(typescript@5.5.4)(zod@3.25.76) + '@t3-oss/env-nextjs': + specifier: ^0.10.1 + version: 0.10.1(typescript@5.5.4)(zod@3.25.76) + '@traceloop/instrumentation-openai': + specifier: ^0.10.0 + version: 0.10.0(@opentelemetry/api@1.4.1) + '@trigger.dev/sdk': + specifier: workspace:* + version: link:../../packages/trigger-sdk + '@typeschema/typebox': + specifier: ^0.14.0 + version: 0.14.0(@sinclair/typebox@0.33.17) + ai: + specifier: ^3.3.24 + version: 3.3.24(openai@4.56.0)(react@19.0.0-rc.0)(svelte@5.33.14)(vue@3.5.16)(zod@3.25.76) + arktype: + specifier: 2.0.0-rc.17 + version: 2.0.0-rc.17 + bcrypt: + specifier: ^6.0.0 + version: 6.0.0 + canvas: + specifier: ^3.1.0 + version: 3.1.0 + dotenv: + specifier: ^16.4.5 + version: 16.4.5 + email-reply-parser: + specifier: ^1.8.0 + version: 1.8.0 + execa: + specifier: ^8.0.1 + version: 8.0.1 + fluent-ffmpeg: + specifier: ^2.1.3 + version: 2.1.3 + header-generator: + specifier: ^2.1.55 + version: 2.1.55 + kysely: + specifier: ^0.27.4 + version: 0.27.4 + msw: + specifier: ^2.2.1 + version: 2.3.5(typescript@5.5.4) + mupdf: + specifier: ^1.3.6 + version: 1.3.6 + openai: + specifier: ^4.47.0 + version: 4.56.0(zod@3.25.76) + pg: + specifier: ^8.11.5 + version: 8.11.5 + playwright: + specifier: ^1.50.1 + version: 1.50.1 + puppeteer: + specifier: ^23.4.0 + version: 23.4.0(typescript@5.5.4) + react: + specifier: 19.0.0-rc.0 + version: 19.0.0-rc.0 + react-email: + specifier: ^3.0.1 + version: 3.0.1(@opentelemetry/api@1.4.1)(@playwright/test@1.37.0)(react-dom@18.3.1)(react@19.0.0-rc.0) + reflect-metadata: + specifier: ^0.1.13 + version: 0.1.14 + runtypes: + specifier: ^6.7.0 + version: 6.7.0 + server-only: + specifier: ^0.0.1 + version: 0.0.1 + sharp: + specifier: ^0.34.2 + version: 0.34.2 + sqlite3: + specifier: ^5.1.7 + version: 5.1.7 + stripe: + specifier: ^12.14.0 + version: 12.18.0 + superstruct: + specifier: ^2.0.2 + version: 2.0.2 + typeorm: + specifier: ^0.3.20 + version: 0.3.20(pg@8.11.5)(sqlite3@5.1.7)(ts-node@10.9.2) + valibot: + specifier: ^0.42.1 + version: 0.42.1(typescript@5.5.4) + wrangler: + specifier: 3.70.0 + version: 3.70.0 + yt-dlp-wrap: + specifier: ^2.3.12 + version: 2.3.12 + yup: + specifier: ^1.4.0 + version: 1.4.0 + zip-node-addon: + specifier: ^0.0.11 + version: 0.0.11 + zod: + specifier: 3.25.76 + version: 3.25.76 + devDependencies: + '@opentelemetry/core': + specifier: ^1.22.0 + version: 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/exporter-logs-otlp-http': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/exporter-trace-otlp-http': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/instrumentation': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/instrumentation-express': + specifier: ^0.36.1 + version: 0.36.1(@opentelemetry/api@1.4.1) + '@opentelemetry/instrumentation-fetch': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/instrumentation-http': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/instrumentation-undici': + specifier: 0.2.0 + version: 0.2.0(@opentelemetry/api@1.4.1) + '@opentelemetry/resources': + specifier: ^1.22.0 + version: 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-logs': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api-logs@0.203.0)(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-node': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-base': + specifier: ^1.22.0 + version: 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-node': + specifier: ^1.22.0 + version: 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': + specifier: ^1.22.0 + version: 1.25.1 + '@trigger.dev/build': + specifier: workspace:* + version: link:../../packages/build + '@trigger.dev/python': + specifier: workspace:* + version: link:../../packages/python + '@types/bcrypt': + specifier: ^5.0.2 + version: 5.0.2 + '@types/email-reply-parser': + specifier: ^1.4.2 + version: 1.4.2 + '@types/fluent-ffmpeg': + specifier: ^2.1.26 + version: 2.1.26 + '@types/react': + specifier: ^18.3.1 + version: 18.3.1 + esbuild: + specifier: ^0.19.11 + version: 0.19.11 + prisma: + specifier: 5.19.0 + version: 5.19.0 + prisma-kysely: + specifier: ^1.8.0 + version: 1.8.0 + trigger.dev: + specifier: workspace:* + version: link:../../packages/cli-v3 + ts-node: + specifier: ^10.9.2 + version: 10.9.2(@types/node@20.14.14)(typescript@5.5.4) + tsconfig-paths: + specifier: ^4.2.0 + version: 4.2.0 + +======= + references/v3-catalog: + dependencies: + '@1password/sdk': + specifier: ^0.3.0 + version: 0.3.0 + '@effect/schema': + specifier: ^0.75.5 + version: 0.75.5(effect@3.17.1) + '@infisical/sdk': + specifier: ^2.3.5 + version: 2.3.5 + '@opentelemetry/api': + specifier: 1.4.1 + version: 1.4.1 + '@prisma/client': + specifier: 6.14.0 + version: 6.14.0(prisma@6.14.0)(typescript@5.5.4) + '@react-email/components': + specifier: 0.0.24 + version: 0.0.24(react-dom@18.3.1)(react@19.0.0-rc.0) + '@react-email/render': + specifier: 1.0.1 + version: 1.0.1(react-dom@18.3.1)(react@19.0.0-rc.0) + '@sentry/esbuild-plugin': + specifier: ^2.22.2 + version: 2.22.2 + '@sinclair/typebox': + specifier: ^0.33.17 + version: 0.33.17 + '@sindresorhus/slugify': + specifier: ^2.2.1 + version: 2.2.1 + '@t3-oss/env-core': + specifier: ^0.11.0 + version: 0.11.0(typescript@5.5.4)(zod@3.25.76) + '@t3-oss/env-nextjs': + specifier: ^0.10.1 + version: 0.10.1(typescript@5.5.4)(zod@3.25.76) + '@traceloop/instrumentation-openai': + specifier: ^0.10.0 + version: 0.10.0(@opentelemetry/api@1.4.1) + '@trigger.dev/sdk': + specifier: workspace:* + version: link:../../packages/trigger-sdk + '@typeschema/typebox': + specifier: ^0.14.0 + version: 0.14.0(@sinclair/typebox@0.33.17) + ai: + specifier: ^3.3.24 + version: 3.3.24(openai@4.56.0)(react@19.0.0-rc.0)(svelte@5.33.14)(vue@3.5.16)(zod@3.25.76) + arktype: + specifier: 2.0.0-rc.17 + version: 2.0.0-rc.17 + bcrypt: + specifier: ^6.0.0 + version: 6.0.0 + canvas: + specifier: ^3.1.0 + version: 3.1.0 + dotenv: + specifier: ^16.4.5 + version: 16.4.5 + email-reply-parser: + specifier: ^1.8.0 + version: 1.8.0 + execa: + specifier: ^8.0.1 + version: 8.0.1 + fluent-ffmpeg: + specifier: ^2.1.3 + version: 2.1.3 + header-generator: + specifier: ^2.1.55 + version: 2.1.55 + kysely: + specifier: ^0.27.4 + version: 0.27.4 + msw: + specifier: ^2.2.1 + version: 2.3.5(typescript@5.5.4) + mupdf: + specifier: ^1.3.6 + version: 1.3.6 + openai: + specifier: ^4.47.0 + version: 4.56.0(zod@3.25.76) + pg: + specifier: ^8.11.5 + version: 8.11.5 + playwright: + specifier: ^1.50.1 + version: 1.50.1 + puppeteer: + specifier: ^23.4.0 + version: 23.4.0(typescript@5.5.4) + react: + specifier: 19.0.0-rc.0 + version: 19.0.0-rc.0 + react-email: + specifier: ^3.0.1 + version: 3.0.1(@opentelemetry/api@1.4.1)(@playwright/test@1.37.0)(react-dom@18.3.1)(react@19.0.0-rc.0) + reflect-metadata: + specifier: ^0.1.13 + version: 0.1.14 + runtypes: + specifier: ^6.7.0 + version: 6.7.0 + server-only: + specifier: ^0.0.1 + version: 0.0.1 + sharp: + specifier: ^0.34.2 + version: 0.34.2 + sqlite3: + specifier: ^5.1.7 + version: 5.1.7 + stripe: + specifier: ^12.14.0 + version: 12.18.0 + superstruct: + specifier: ^2.0.2 + version: 2.0.2 + typeorm: + specifier: ^0.3.20 + version: 0.3.20(pg@8.11.5)(sqlite3@5.1.7)(ts-node@10.9.2) + valibot: + specifier: ^0.42.1 + version: 0.42.1(typescript@5.5.4) + wrangler: + specifier: 3.70.0 + version: 3.70.0 + yt-dlp-wrap: + specifier: ^2.3.12 + version: 2.3.12 + yup: + specifier: ^1.4.0 + version: 1.4.0 + zip-node-addon: + specifier: ^0.0.11 + version: 0.0.11 + zod: + specifier: 3.25.76 + version: 3.25.76 + devDependencies: + '@opentelemetry/core': + specifier: ^1.22.0 + version: 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/exporter-logs-otlp-http': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/exporter-trace-otlp-http': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/instrumentation': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/instrumentation-express': + specifier: ^0.36.1 + version: 0.36.1(@opentelemetry/api@1.4.1) + '@opentelemetry/instrumentation-fetch': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/instrumentation-http': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/instrumentation-undici': + specifier: 0.2.0 + version: 0.2.0(@opentelemetry/api@1.4.1) + '@opentelemetry/resources': + specifier: ^1.22.0 + version: 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-logs': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api-logs@0.203.0)(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-node': + specifier: ^0.49.1 + version: 0.49.1(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-base': + specifier: ^1.22.0 + version: 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-node': + specifier: ^1.22.0 + version: 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': + specifier: ^1.22.0 + version: 1.25.1 + '@trigger.dev/build': + specifier: workspace:* + version: link:../../packages/build + '@trigger.dev/python': + specifier: workspace:* + version: link:../../packages/python + '@types/bcrypt': + specifier: ^5.0.2 + version: 5.0.2 + '@types/email-reply-parser': + specifier: ^1.4.2 + version: 1.4.2 + '@types/fluent-ffmpeg': + specifier: ^2.1.26 + version: 2.1.26 + '@types/react': + specifier: ^18.3.1 + version: 18.3.1 + esbuild: + specifier: ^0.19.11 + version: 0.19.11 + prisma: + specifier: 6.14.0 + version: 6.14.0(typescript@5.5.4) + prisma-kysely: + specifier: ^1.8.0 + version: 1.8.0 + trigger.dev: + specifier: workspace:* + version: link:../../packages/cli-v3 + ts-node: + specifier: ^10.9.2 + version: 10.9.2(@types/node@20.14.14)(typescript@5.5.4) + tsconfig-paths: + specifier: ^4.2.0 + version: 4.2.0 + +>>>>>>> theirs packages: /@adobe/css-tools@4.4.0: @@ -9686,6 +10136,7 @@ packages: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: false +<<<<<<< ours /@prisma/client@5.4.1(prisma@5.4.1): resolution: {integrity: sha512-xyD0DJ3gRNfLbPsC+YfMBBuLJtZKQfy1OD2qU/PZg+HKrr7SO+09174LMeTlWP0YF2wca9LxtVd4HnAiB5ketQ==} engines: {node: '>=16.13'} @@ -9694,20 +10145,271 @@ packages: prisma: '*' peerDependenciesMeta: prisma: +||||||| ancestor + /@prisma/client@5.19.0(prisma@5.19.0): + resolution: {integrity: sha512-CzOpau+q1kEWQyoQMvlnXIHqPvwmWbh48xZ4n8KWbAql0p8PC0BIgSTYW5ncxXa4JSEff0tcoxSZB874wDstdg==} + engines: {node: '>=16.13'} + requiresBuild: true + peerDependencies: + prisma: '*' + peerDependenciesMeta: + prisma: + optional: true + dependencies: + prisma: 5.19.0 + dev: false + + /@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: '*' + peerDependenciesMeta: + prisma: +======= + /@prisma/client@6.14.0(prisma@6.14.0)(typescript@5.5.4): + resolution: {integrity: sha512-8E/Nk3eL5g7RQIg/LUj1ICyDmhD053STjxrPxUtCRybs2s/2sOEcx9NpITuAOPn07HEpWBfhAVe1T/HYWXUPOw==} + engines: {node: '>=18.18'} + requiresBuild: true + peerDependencies: + prisma: '*' + typescript: '>=5.1.0' + peerDependenciesMeta: + prisma: + optional: true + typescript: +>>>>>>> theirs optional: true dependencies: - '@prisma/engines-version': 5.4.1-1.2f302df92bd8945e20ad4595a73def5b96afa54f - prisma: 5.4.1 + prisma: 6.14.0(typescript@5.5.4) + typescript: 5.5.4 dev: false +<<<<<<< ours + /@prisma/engines-version@5.4.1-1.2f302df92bd8945e20ad4595a73def5b96afa54f: + resolution: {integrity: sha512-+nUQM/y8C+1GG5Ioeqcu6itFslCfxvQSAUVSMC9XM2G2Fcq0F4Afnp6m0pXF6X6iUBWen7jZBPmM9Qlq4Nr3/A==} + dev: false +||||||| ancestor + /@prisma/debug@5.19.0: + resolution: {integrity: sha512-+b/G0ubAZlrS+JSiDhXnYV5DF/aTJ3pinktkiV/L4TtLRLZO6SVGyFELgxBsicCTWJ2ZMu5vEV/jTtYCdjFTRA==} + + /@prisma/debug@5.3.1: + resolution: {integrity: sha512-eYrxqslEKf+wpMFIIHgbcNYuZBXUdiJLA85Or3TwOhgPIN1ZoXT9CwJph3ynW8H1Xg0LkdYLwVmuULCwiMoU5A==} + dependencies: + '@types/debug': 4.1.8 + debug: 4.3.4 + strip-ansi: 6.0.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@prisma/engines-version@5.19.0-31.5fe21811a6ba0b952a3bc71400666511fe3b902f: + resolution: {integrity: sha512-GimI9aZIFy/yvvR11KfXRn3pliFn1QAkdebVlsXlnoh5uk0YhLblVmeYiHfsu+wDA7BeKqYT4sFfzg8mutzuWw==} + /@prisma/engines-version@5.4.1-1.2f302df92bd8945e20ad4595a73def5b96afa54f: resolution: {integrity: sha512-+nUQM/y8C+1GG5Ioeqcu6itFslCfxvQSAUVSMC9XM2G2Fcq0F4Afnp6m0pXF6X6iUBWen7jZBPmM9Qlq4Nr3/A==} dev: false +======= + /@prisma/config@6.14.0: + resolution: {integrity: sha512-IwC7o5KNNGhmblLs23swnfBjADkacBb7wvyDXUWLwuvUQciKJZqyecU0jw0d7JRkswrj+XTL8fdr0y2/VerKQQ==} + dependencies: + c12: 3.1.0 + deepmerge-ts: 7.1.5 + effect: 3.16.12 + empathic: 2.0.0 + transitivePeerDependencies: + - magicast + + /@prisma/debug@5.3.1: + resolution: {integrity: sha512-eYrxqslEKf+wpMFIIHgbcNYuZBXUdiJLA85Or3TwOhgPIN1ZoXT9CwJph3ynW8H1Xg0LkdYLwVmuULCwiMoU5A==} + dependencies: + '@types/debug': 4.1.8 + debug: 4.3.4 + strip-ansi: 6.0.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@prisma/debug@6.14.0: + resolution: {integrity: sha512-j4Lf+y+5QIJgQD4sJWSbkOD7geKx9CakaLp/TyTy/UDu9Wo0awvWCBH/BAxTHUaCpIl9USA5VS/KJhDqKJSwug==} +>>>>>>> theirs + +<<<<<<< ours + /@prisma/engines@5.4.1: + resolution: {integrity: sha512-vJTdY4la/5V3N7SFvWRmSMUh4mIQnyb/MNoDjzVbh9iLmEC+uEykj/1GPviVsorvfz7DbYSQC4RiwmlEpTEvGA==} +||||||| ancestor + /@prisma/engines@5.19.0: + resolution: {integrity: sha512-UtW+0m4HYoRSSR3LoDGKF3Ud4BSMWYlLEt4slTnuP1mI+vrV3zaDoiAPmejdAT76vCN5UqnWURbkXxf66nSylQ==} + requiresBuild: true + dependencies: + '@prisma/debug': 5.19.0 + '@prisma/engines-version': 5.19.0-31.5fe21811a6ba0b952a3bc71400666511fe3b902f + '@prisma/fetch-engine': 5.19.0 + '@prisma/get-platform': 5.19.0 + + /@prisma/engines@5.3.1: + resolution: {integrity: sha512-6QkILNyfeeN67BNEPEtkgh3Xo2tm6D7V+UhrkBbRHqKw9CTaz/vvTP/ROwYSP/3JT2MtIutZm/EnhxUiuOPVDA==} + requiresBuild: true + dev: true /@prisma/engines@5.4.1: resolution: {integrity: sha512-vJTdY4la/5V3N7SFvWRmSMUh4mIQnyb/MNoDjzVbh9iLmEC+uEykj/1GPviVsorvfz7DbYSQC4RiwmlEpTEvGA==} +======= + /@prisma/engines-version@6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49: + resolution: {integrity: sha512-EgN9ODJpiX45yvwcngoStp3uQPJ3l+AEVoQ6dMMO2QvmwIlnxfApzKmJQExzdo7/hqQANrz5txHJdGYHzOnGHA==} + + /@prisma/engines@5.3.1: + resolution: {integrity: sha512-6QkILNyfeeN67BNEPEtkgh3Xo2tm6D7V+UhrkBbRHqKw9CTaz/vvTP/ROwYSP/3JT2MtIutZm/EnhxUiuOPVDA==} requiresBuild: true + dev: true + + /@prisma/engines@6.14.0: + resolution: {integrity: sha512-LhJjqsALFEcoAtF07nSaOkVguaxw/ZsgfROIYZ8bAZDobe7y8Wy+PkYQaPOK1iLSsFgV2MhCO/eNrI1gdSOj6w==} +>>>>>>> theirs + requiresBuild: true +<<<<<<< ours + +||||||| ancestor + + /@prisma/fetch-engine@5.19.0: + resolution: {integrity: sha512-oOiPNtmJX0cP/ebu7BBEouJvCw8T84/MFD/Hf2zlqjxkK4ojl38bB9i9J5LAxotL6WlYVThKdxc7HqoWnPOhqQ==} + dependencies: + '@prisma/debug': 5.19.0 + '@prisma/engines-version': 5.19.0-31.5fe21811a6ba0b952a3bc71400666511fe3b902f + '@prisma/get-platform': 5.19.0 + /@prisma/fetch-engine@5.3.1: + resolution: {integrity: sha512-w1yk1YiK8N82Pobdq58b85l6e8akyrkxuzwV9DoiUTRf3gpsuhJJesHc4Yi0WzUC9/3znizl1UfCsI6dhkj3Vw==} + dependencies: + '@prisma/debug': 5.3.1 + '@prisma/get-platform': 5.3.1 + execa: 5.1.1 + find-cache-dir: 3.3.2 + fs-extra: 11.1.1 + hasha: 5.2.2 + http-proxy-agent: 7.0.0 + https-proxy-agent: 7.0.2 + kleur: 4.1.5 + node-fetch: 2.7.0 + p-filter: 2.1.0 + p-map: 4.0.0 + p-retry: 4.6.2 + progress: 2.0.3 + rimraf: 3.0.2 + temp-dir: 2.0.0 + tempy: 1.0.1 + transitivePeerDependencies: + - encoding + - supports-color + dev: true + + /@prisma/generator-helper@5.3.1: + resolution: {integrity: sha512-zrYS0iHLgPlOJjYnd5KvVMMvSS+ktOL39EwooS5EnyvfzwfzxlKCeOUgxTfiKYs0WUWqzEvyNAYtramYgSknsQ==} + dependencies: + '@prisma/debug': 5.3.1 + '@types/cross-spawn': 6.0.2 + cross-spawn: 7.0.3 + kleur: 4.1.5 + transitivePeerDependencies: + - supports-color + dev: true + + /@prisma/get-platform@5.19.0: + resolution: {integrity: sha512-s9DWkZKnuP4Y8uy6yZfvqQ/9X3/+2KYf3IZUVZz5OstJdGBJrBlbmIuMl81917wp5TuK/1k2TpHNCEdpYLPKmg==} + dependencies: + '@prisma/debug': 5.19.0 + + /@prisma/get-platform@5.3.1: + resolution: {integrity: sha512-3IiZY2BUjKnAuZ0569zppZE6/rZbVAM09//c2nvPbbkGG9MqrirA8fbhhF7tfVmhyVfdmVCHnf/ujWPHJ8B46Q==} + dependencies: + '@prisma/debug': 5.3.1 + escape-string-regexp: 4.0.0 + execa: 5.1.1 + fs-jetpack: 5.1.0 + kleur: 4.1.5 + replace-string: 3.1.0 + strip-ansi: 6.0.1 + tempy: 1.0.1 + terminal-link: 2.1.1 + ts-pattern: 4.3.0 + transitivePeerDependencies: + - supports-color + dev: true + +======= + dependencies: + '@prisma/debug': 6.14.0 + '@prisma/engines-version': 6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49 + '@prisma/fetch-engine': 6.14.0 + '@prisma/get-platform': 6.14.0 + + /@prisma/fetch-engine@5.3.1: + resolution: {integrity: sha512-w1yk1YiK8N82Pobdq58b85l6e8akyrkxuzwV9DoiUTRf3gpsuhJJesHc4Yi0WzUC9/3znizl1UfCsI6dhkj3Vw==} + dependencies: + '@prisma/debug': 5.3.1 + '@prisma/get-platform': 5.3.1 + execa: 5.1.1 + find-cache-dir: 3.3.2 + fs-extra: 11.1.1 + hasha: 5.2.2 + http-proxy-agent: 7.0.0 + https-proxy-agent: 7.0.2 + kleur: 4.1.5 + node-fetch: 2.7.0 + p-filter: 2.1.0 + p-map: 4.0.0 + p-retry: 4.6.2 + progress: 2.0.3 + rimraf: 3.0.2 + temp-dir: 2.0.0 + tempy: 1.0.1 + transitivePeerDependencies: + - encoding + - supports-color + dev: true + + /@prisma/fetch-engine@6.14.0: + resolution: {integrity: sha512-MPzYPOKMENYOaY3AcAbaKrfvXVlvTc6iHmTXsp9RiwCX+bPyfDMqMFVUSVXPYrXnrvEzhGHfyiFy0PRLHPysNg==} + dependencies: + '@prisma/debug': 6.14.0 + '@prisma/engines-version': 6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49 + '@prisma/get-platform': 6.14.0 + + /@prisma/generator-helper@5.3.1: + resolution: {integrity: sha512-zrYS0iHLgPlOJjYnd5KvVMMvSS+ktOL39EwooS5EnyvfzwfzxlKCeOUgxTfiKYs0WUWqzEvyNAYtramYgSknsQ==} + dependencies: + '@prisma/debug': 5.3.1 + '@types/cross-spawn': 6.0.2 + cross-spawn: 7.0.3 + kleur: 4.1.5 + transitivePeerDependencies: + - supports-color + dev: true + + /@prisma/get-platform@5.3.1: + resolution: {integrity: sha512-3IiZY2BUjKnAuZ0569zppZE6/rZbVAM09//c2nvPbbkGG9MqrirA8fbhhF7tfVmhyVfdmVCHnf/ujWPHJ8B46Q==} + dependencies: + '@prisma/debug': 5.3.1 + escape-string-regexp: 4.0.0 + execa: 5.1.1 + fs-jetpack: 5.1.0 + kleur: 4.1.5 + replace-string: 3.1.0 + strip-ansi: 6.0.1 + tempy: 1.0.1 + terminal-link: 2.1.1 + ts-pattern: 4.3.0 + transitivePeerDependencies: + - supports-color + dev: true + + /@prisma/get-platform@6.14.0: + resolution: {integrity: sha512-7VjuxKNwjnBhKfqPpMeWiHEa2sVjYzmHdl1slW6STuUCe9QnOY0OY1ljGSvz6wpG4U8DfbDqkG1yofd/1GINww==} + dependencies: + '@prisma/debug': 6.14.0 + +>>>>>>> theirs /@prisma/instrumentation@5.11.0: resolution: {integrity: sha512-ou4nvDpNEY6+t3Dn9juOTz6tK33D0Y4XXkEZ2uPd8KH6Mqmc+4LYOOm470DP7noj7dyJjuGiM+wpPk//HKrcDg==} dependencies: @@ -20183,6 +20885,27 @@ packages: rc9: 2.1.2 dev: false + /c12@3.1.0: + resolution: {integrity: sha512-uWoS8OU1MEIsOv8p/5a82c3H31LsWVR5qiyXVfBNOzfffjUWtPnhAb4BYI2uG2HfGmZmFjCtui5XNWaps+iFuw==} + peerDependencies: + magicast: ^0.3.5 + peerDependenciesMeta: + magicast: + optional: true + dependencies: + chokidar: 4.0.3 + confbox: 0.2.2 + defu: 6.1.4 + dotenv: 16.6.1 + exsolve: 1.0.7 + giget: 2.0.0 + jiti: 2.4.2 + ohash: 2.0.11 + pathe: 2.0.3 + perfect-debounce: 1.0.0 + pkg-types: 2.3.0 + rc9: 2.1.2 + /cac@6.7.14: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} engines: {node: '>=8'} @@ -20406,7 +21129,6 @@ packages: engines: {node: '>= 14.16.0'} dependencies: readdirp: 4.1.2 - dev: true /chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} @@ -20449,7 +21171,6 @@ packages: resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==} dependencies: consola: 3.4.2 - dev: false /cjs-module-lexer@1.2.3: resolution: {integrity: sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==} @@ -20756,7 +21477,6 @@ packages: /confbox@0.2.2: resolution: {integrity: sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==} - dev: false /config-chain@1.1.13: resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} @@ -20765,11 +21485,6 @@ packages: proto-list: 1.2.4 dev: false - /consola@3.2.3: - resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} - engines: {node: ^14.18.0 || >=16.10.0} - dev: false - /consola@3.4.2: resolution: {integrity: sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==} engines: {node: ^14.18.0 || >=16.10.0} @@ -21378,6 +22093,10 @@ packages: resolution: {integrity: sha512-Rn+RuwkmkDwCi2/oXOFS9Gsr5lJZu/yTGpK7wAaAIE75CC+LCGEZHpY6VQJa/RoJcrmaA/docWJZvYohlNkWPA==} dev: true + /deepmerge-ts@7.1.5: + resolution: {integrity: sha512-HOJkrhaYsweh+W+e74Yn7YStZOilkoPb6fycpwNLKzSPtruFs48nYis0zy5yJz1+ktUhHxoRDJ27RQAWLIJVJw==} + engines: {node: '>=16.0.0'} + /deepmerge@4.3.1: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} @@ -21473,7 +22192,6 @@ packages: /destr@2.0.3: resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==} - dev: false /destroy@1.2.0: resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} @@ -21659,6 +22377,10 @@ packages: engines: {node: '>=12'} dev: true + /dotenv@16.6.1: + resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==} + engines: {node: '>=12'} + /dotenv@8.6.0: resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==} engines: {node: '>=10'} @@ -21746,6 +22468,12 @@ packages: fast-check: 3.22.0 dev: false + /effect@3.16.12: + resolution: {integrity: sha512-N39iBk0K71F9nb442TLbTkjl24FLUzuvx2i1I2RsEAQsdAdUTuUoW0vlfUXgkMTUOnYqKnWcFfqw4hK4Pw27hg==} + dependencies: + '@standard-schema/spec': 1.0.0 + fast-check: 3.23.2 + /effect@3.17.1: resolution: {integrity: sha512-t917ks10FGNf7MpwOxHUg6vo42p0XsdMHuBMVpy4NttPu5gIv8/ah5MgbHLVQJ2kmDvZfQUT1/xyCa1IR09u2Q==} dependencies: @@ -21777,6 +22505,10 @@ packages: resolution: {integrity: sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==} dev: true + /empathic@2.0.0: + resolution: {integrity: sha512-i6UzDscO/XfAcNYD75CfICkmfLedpyPDdozrLMmQc5ORaQcdMoc21OnlEylMIqI7U8eniKrPMxxtj8k0vhmJhA==} + engines: {node: '>=14'} + /encodeurl@1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} engines: {node: '>= 0.8'} @@ -23244,6 +23976,9 @@ packages: - supports-color dev: false + /exsolve@1.0.7: + resolution: {integrity: sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==} + /extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} @@ -23958,15 +24693,26 @@ packages: hasBin: true dependencies: citty: 0.1.6 - consola: 3.2.3 + consola: 3.4.2 defu: 6.1.4 - node-fetch-native: 1.6.4 + node-fetch-native: 1.6.6 nypm: 0.3.9 ohash: 1.1.3 pathe: 1.1.2 tar: 6.2.1 dev: false + /giget@2.0.0: + resolution: {integrity: sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==} + hasBin: true + dependencies: + citty: 0.1.6 + consola: 3.4.2 + defu: 6.1.4 + node-fetch-native: 1.6.6 + nypm: 0.6.1 + pathe: 2.0.3 + /git-last-commit@1.0.1: resolution: {integrity: sha512-FDSgeMqa7GnJDxt/q0AbrxbfeTyxp4ImxEw1e4nw6NUHA5FMhFUq33dTXI4Xdgcj1VQ1q5QLWF6WxFrJ8KCBOg==} dev: false @@ -25142,7 +25888,6 @@ packages: /jiti@2.4.2: resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==} hasBin: true - dev: true /joi@17.7.0: resolution: {integrity: sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==} @@ -27326,10 +28071,25 @@ packages: skin-tone: 2.0.0 dev: true +<<<<<<< ours + /node-fetch-native@1.6.4: + resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==} + dev: false + +||||||| ancestor /node-fetch-native@1.6.4: resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==} dev: false + /node-fetch-native@1.6.6: + resolution: {integrity: sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==} + dev: false + +======= + /node-fetch-native@1.6.6: + resolution: {integrity: sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==} + +>>>>>>> theirs /node-fetch@2.6.12: resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==} engines: {node: 4.x || >=6.0.0} @@ -27511,6 +28271,17 @@ packages: ufo: 1.5.4 dev: false + /nypm@0.6.1: + resolution: {integrity: sha512-hlacBiRiv1k9hZFiphPUkfSQ/ZfQzZDzC+8z0wL3lvDAOUu/2NnChkKuMoMjNur/9OpKuz2QsIeiPVN0xM5Q0w==} + engines: {node: ^14.16.0 || >=16.10.0} + hasBin: true + dependencies: + citty: 0.1.6 + consola: 3.4.2 + pathe: 2.0.3 + pkg-types: 2.3.0 + tinyexec: 1.0.1 + /oauth-sign@0.9.0: resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==} dev: false @@ -27628,6 +28399,9 @@ packages: resolution: {integrity: sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==} dev: false + /ohash@2.0.11: + resolution: {integrity: sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==} + /oidc-token-hash@5.0.3: resolution: {integrity: sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==} engines: {node: ^10.13.0 || >=12.0.0} @@ -28208,7 +28982,6 @@ packages: /perfect-debounce@1.0.0: resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==} - dev: false /performance-now@2.1.0: resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} @@ -28436,6 +29209,13 @@ packages: pathe: 2.0.3 dev: false + /pkg-types@2.3.0: + resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==} + dependencies: + confbox: 0.2.2 + exsolve: 1.0.7 + pathe: 2.0.3 + /platform@1.3.6: resolution: {integrity: sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==} dev: false @@ -29012,13 +29792,70 @@ packages: react: 18.2.0 dev: false +<<<<<<< ours /prisma@5.4.1: resolution: {integrity: sha512-op9PmU8Bcw5dNAas82wBYTG0yHnpq9/O3bhxbDBrNzwZTwBqsVCxxYRLf6wHNh9HVaDGhgjjHlu1+BcW8qdnBg==} engines: {node: '>=16.13'} +||||||| ancestor + /prisma-kysely@1.8.0: + resolution: {integrity: sha512-VpNpolZ8RXRgfU+j4R+fPZmX8EE95w3vJ2tt7+FwuiQc0leNTfLK5QLf3KbbPDes2rfjh3g20AjDxefQIo5GIA==} + hasBin: true + dependencies: + '@mrleebo/prisma-ast': 0.7.0 + '@prisma/generator-helper': 5.3.1 + '@prisma/internals': 5.3.1 + typescript: 5.8.3 + zod: 3.25.76 + transitivePeerDependencies: + - encoding + - supports-color + dev: true + + /prisma@5.19.0: + resolution: {integrity: sha512-Pu7lUKpVyTx8cVwM26dYh8NdvMOkMnJXzE8L6cikFuR4JwyMU5NKofQkWyxJKlTT4fNjmcnibTvklV8oVMrn+g==} + engines: {node: '>=16.13'} hasBin: true requiresBuild: true dependencies: - '@prisma/engines': 5.4.1 + '@prisma/engines': 5.19.0 + optionalDependencies: + fsevents: 2.3.3 + + /prisma@5.4.1: + resolution: {integrity: sha512-op9PmU8Bcw5dNAas82wBYTG0yHnpq9/O3bhxbDBrNzwZTwBqsVCxxYRLf6wHNh9HVaDGhgjjHlu1+BcW8qdnBg==} + engines: {node: '>=16.13'} +======= + /prisma-kysely@1.8.0: + resolution: {integrity: sha512-VpNpolZ8RXRgfU+j4R+fPZmX8EE95w3vJ2tt7+FwuiQc0leNTfLK5QLf3KbbPDes2rfjh3g20AjDxefQIo5GIA==} + hasBin: true + dependencies: + '@mrleebo/prisma-ast': 0.7.0 + '@prisma/generator-helper': 5.3.1 + '@prisma/internals': 5.3.1 + typescript: 5.8.3 + zod: 3.25.76 + transitivePeerDependencies: + - encoding + - supports-color + dev: true + + /prisma@6.14.0(typescript@5.5.4): + resolution: {integrity: sha512-QEuCwxu+Uq9BffFw7in8In+WfbSUN0ewnaSUKloLkbJd42w6EyFckux4M0f7VwwHlM3A8ssaz4OyniCXlsn0WA==} + engines: {node: '>=18.18'} +>>>>>>> theirs + hasBin: true + requiresBuild: true + peerDependencies: + typescript: '>=5.1.0' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@prisma/config': 6.14.0 + '@prisma/engines': 6.14.0 + typescript: 5.5.4 + transitivePeerDependencies: + - magicast /prismjs@1.29.0: resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==} @@ -29318,7 +30155,6 @@ packages: dependencies: defu: 6.1.4 destr: 2.0.3 - dev: false /rc@1.2.8: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} @@ -29977,7 +30813,6 @@ packages: /readdirp@4.1.2: resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} engines: {node: '>= 14.18.0'} - dev: true /real-require@0.2.0: resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==} @@ -32260,6 +33095,9 @@ packages: /tinyexec@0.3.2: resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} + /tinyexec@1.0.1: + resolution: {integrity: sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==} + /tinyglobby@0.2.10: resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==} engines: {node: '>=12.0.0'} diff --git a/references/v3-catalog/package.json b/references/v3-catalog/package.json new file mode 100644 index 0000000000..6367c7ad20 --- /dev/null +++ b/references/v3-catalog/package.json @@ -0,0 +1,96 @@ +{ + "name": "references-v3-catalog", + "private": true, + "type": "module", + "zenstack": { + "schema": "./prisma/schema.zmodel" + }, + "scripts": { + "dev": "trigger dev", + "deploy": "trigger deploy --self-hosted --load-image", + "management": "tsx -r dotenv/config ./src/management.ts", + "queues": "ts-node -r dotenv/config -r tsconfig-paths/register ./src/queues.ts", + "build:client": "tsup-node ./src/clientUsage.ts --format esm,cjs", + "client": "tsx -r dotenv/config ./src/clientUsage.ts", + "triggerWithLargePayload": "tsx -r dotenv/config ./src/triggerWithLargePayload.ts", + "generate:prisma": "prisma generate --sql" + }, + "dependencies": { + "@1password/sdk": "^0.3.0", + "@effect/schema": "^0.75.5", + "@infisical/sdk": "^2.3.5", + "@opentelemetry/api": "1.4.1", + "@prisma/client": "6.14.0", + "@react-email/components": "0.0.24", + "@react-email/render": "1.0.1", + "@sentry/esbuild-plugin": "^2.22.2", + "@sinclair/typebox": "^0.33.17", + "@sindresorhus/slugify": "^2.2.1", + "@t3-oss/env-core": "^0.11.0", + "@t3-oss/env-nextjs": "^0.10.1", + "@traceloop/instrumentation-openai": "^0.10.0", + "@trigger.dev/sdk": "workspace:*", + "@typeschema/typebox": "^0.14.0", + "ai": "^3.3.24", + "arktype": "2.0.0-rc.17", + "bcrypt": "^6.0.0", + "canvas": "^3.1.0", + "dotenv": "^16.4.5", + "email-reply-parser": "^1.8.0", + "execa": "^8.0.1", + "fluent-ffmpeg": "^2.1.3", + "header-generator": "^2.1.55", + "kysely": "^0.27.4", + "msw": "^2.2.1", + "mupdf": "^1.3.6", + "openai": "^4.47.0", + "pg": "^8.11.5", + "playwright": "^1.50.1", + "puppeteer": "^23.4.0", + "react": "19.0.0-rc.0", + "react-email": "^3.0.1", + "reflect-metadata": "^0.1.13", + "runtypes": "^6.7.0", + "server-only": "^0.0.1", + "sharp": "^0.34.2", + "sqlite3": "^5.1.7", + "stripe": "^12.14.0", + "superstruct": "^2.0.2", + "typeorm": "^0.3.20", + "valibot": "^0.42.1", + "wrangler": "3.70.0", + "yt-dlp-wrap": "^2.3.12", + "yup": "^1.4.0", + "zip-node-addon": "^0.0.11", + "zod": "3.25.76" + }, + "devDependencies": { + "@opentelemetry/api": "^1.8.0", + "@opentelemetry/core": "^1.22.0", + "@opentelemetry/exporter-logs-otlp-http": "^0.49.1", + "@opentelemetry/exporter-trace-otlp-http": "^0.49.1", + "@opentelemetry/instrumentation": "^0.49.1", + "@opentelemetry/instrumentation-express": "^0.36.1", + "@opentelemetry/instrumentation-fetch": "^0.49.1", + "@opentelemetry/instrumentation-http": "^0.49.1", + "@opentelemetry/instrumentation-undici": "0.2.0", + "@opentelemetry/resources": "^1.22.0", + "@opentelemetry/sdk-logs": "^0.49.1", + "@opentelemetry/sdk-node": "^0.49.1", + "@opentelemetry/sdk-trace-base": "^1.22.0", + "@opentelemetry/sdk-trace-node": "^1.22.0", + "@opentelemetry/semantic-conventions": "^1.22.0", + "@trigger.dev/build": "workspace:*", + "@trigger.dev/python": "workspace:*", + "@types/bcrypt": "^5.0.2", + "@types/email-reply-parser": "^1.4.2", + "@types/fluent-ffmpeg": "^2.1.26", + "@types/react": "^18.3.1", + "esbuild": "^0.19.11", + "prisma": "6.14.0", + "prisma-kysely": "^1.8.0", + "trigger.dev": "workspace:*", + "ts-node": "^10.9.2", + "tsconfig-paths": "^4.2.0" + } +} \ No newline at end of file From c9f7bf33d45eb261e36ba9480839653be5f310e6 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Tue, 26 Aug 2025 14:10:01 +0100 Subject: [PATCH 2/9] Use ./generated Prisma folder, update types to fix issues --- apps/webapp/app/db.server.ts | 10 +++++----- ...ef.background-workers.$envSlug.$version.ts | 6 +++--- internal-packages/database/.gitignore | 2 ++ internal-packages/database/package.json | 4 +++- .../database/prisma/schema.prisma | 2 +- internal-packages/database/src/index.ts | 2 +- internal-packages/database/src/transaction.ts | 19 ++++++++++++++----- pnpm-lock.yaml | 16 ++++++++++++++++ 8 files changed, 45 insertions(+), 16 deletions(-) diff --git a/apps/webapp/app/db.server.ts b/apps/webapp/app/db.server.ts index 8435182e63..aa12a67911 100644 --- a/apps/webapp/app/db.server.ts +++ b/apps/webapp/app/db.server.ts @@ -1,10 +1,11 @@ import { Prisma, PrismaClient, - PrismaClientOrTransaction, - PrismaReplicaClient, - PrismaTransactionClient, - PrismaTransactionOptions, + $transaction as transac, + type PrismaClientOrTransaction, + type PrismaReplicaClient, + type PrismaTransactionClient, + type PrismaTransactionOptions, } from "@trigger.dev/database"; import invariant from "tiny-invariant"; import { z } from "zod"; @@ -12,7 +13,6 @@ import { env } from "./env.server"; import { logger } from "./services/logger.server"; import { isValidDatabaseUrl } from "./utils/db"; import { singleton } from "./utils/singleton"; -import { $transaction as transac } from "@trigger.dev/database"; import { startActiveSpan } from "./v3/tracer.server"; import { Span } from "@opentelemetry/api"; diff --git a/apps/webapp/app/routes/api.v1.projects.$projectRef.background-workers.$envSlug.$version.ts b/apps/webapp/app/routes/api.v1.projects.$projectRef.background-workers.$envSlug.$version.ts index f9411c2d15..90dc7a3661 100644 --- a/apps/webapp/app/routes/api.v1.projects.$projectRef.background-workers.$envSlug.$version.ts +++ b/apps/webapp/app/routes/api.v1.projects.$projectRef.background-workers.$envSlug.$version.ts @@ -82,9 +82,9 @@ export async function loader({ params, request }: LoaderFunctionArgs) { }); } -function decompressContent(compressedBuffer: Buffer): string { - // First, we need to decode the base64 Buffer to get the actual compressed data - const decodedBuffer = Buffer.from(compressedBuffer.toString("utf-8"), "base64"); +function decompressContent(compressedBuffer: Uint8Array): string { + // Convert Uint8Array to Buffer and decode base64 in one step + const decodedBuffer = Buffer.from(Buffer.from(compressedBuffer).toString("utf-8"), "base64"); // Decompress the data const decompressedData = zlib.inflateSync(decodedBuffer); diff --git a/internal-packages/database/.gitignore b/internal-packages/database/.gitignore index 586a9f721b..74ffb04b14 100644 --- a/internal-packages/database/.gitignore +++ b/internal-packages/database/.gitignore @@ -1,3 +1,5 @@ node_modules # Ensure the .env symlink is not removed by accident !.env + +generated/prisma \ No newline at end of file diff --git a/internal-packages/database/package.json b/internal-packages/database/package.json index 875a11d383..cd9b40db95 100644 --- a/internal-packages/database/package.json +++ b/internal-packages/database/package.json @@ -5,9 +5,11 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@prisma/client": "6.14.0" + "@prisma/client": "6.14.0", + "decimal.js": "^10.6.0" }, "devDependencies": { + "@types/decimal.js": "^7.4.3", "prisma": "6.14.0", "rimraf": "6.0.1" }, diff --git a/internal-packages/database/prisma/schema.prisma b/internal-packages/database/prisma/schema.prisma index 01eaa73820..ba5a8de266 100644 --- a/internal-packages/database/prisma/schema.prisma +++ b/internal-packages/database/prisma/schema.prisma @@ -6,7 +6,7 @@ datasource db { generator client { provider = "prisma-client-js" - output = "../node_modules/.prisma/client" + output = "../generated/prisma" binaryTargets = ["native", "debian-openssl-1.1.x"] previewFeatures = ["metrics"] } diff --git a/internal-packages/database/src/index.ts b/internal-packages/database/src/index.ts index cb0f9d4eb9..94e211e91a 100644 --- a/internal-packages/database/src/index.ts +++ b/internal-packages/database/src/index.ts @@ -1,2 +1,2 @@ -export * from "@prisma/client"; +export * from "../generated/prisma"; export * from "./transaction"; diff --git a/internal-packages/database/src/transaction.ts b/internal-packages/database/src/transaction.ts index ac671a6f8e..5d0cdb85f0 100644 --- a/internal-packages/database/src/transaction.ts +++ b/internal-packages/database/src/transaction.ts @@ -1,4 +1,13 @@ -import { Prisma, PrismaClient } from "@prisma/client"; +import { PrismaClient } from "../generated/prisma"; +import { Decimal } from "decimal.js"; +import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library"; + +// Define the isolation levels manually +type TransactionIsolationLevel = + | "ReadUncommitted" + | "ReadCommitted" + | "RepeatableRead" + | "Serializable"; export type PrismaTransactionClient = Omit< PrismaClient, @@ -9,13 +18,13 @@ export type PrismaClientOrTransaction = PrismaClient | PrismaTransactionClient; export type PrismaReplicaClient = Omit; -export const Decimal = Prisma.Decimal; +export { Decimal }; function isTransactionClient(prisma: PrismaClientOrTransaction): prisma is PrismaTransactionClient { return !("$transaction" in prisma); } -export function isPrismaKnownError(error: unknown): error is Prisma.PrismaClientKnownRequestError { +export function isPrismaKnownError(error: unknown): error is PrismaClientKnownRequestError { return ( typeof error === "object" && error !== null && "code" in error && typeof error.code === "string" ); @@ -55,7 +64,7 @@ export type PrismaTransactionOptions = { timeout?: number; /** Sets the transaction isolation level. By default this is set to the value currently configured in your database. */ - isolationLevel?: Prisma.TransactionIsolationLevel; + isolationLevel?: TransactionIsolationLevel; swallowPrismaErrors?: boolean; @@ -70,7 +79,7 @@ export type PrismaTransactionOptions = { export async function $transaction( prisma: PrismaClientOrTransaction, fn: (prisma: PrismaTransactionClient) => Promise, - prismaError: (error: Prisma.PrismaClientKnownRequestError) => void, + prismaError: (error: PrismaClientKnownRequestError) => void, options?: PrismaTransactionOptions, attempt = 0 ): Promise { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c04d87336d..cc964af05f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -975,7 +975,13 @@ importers: '@prisma/client': specifier: 6.14.0 version: 6.14.0(prisma@6.14.0)(typescript@5.5.4) + decimal.js: + specifier: ^10.6.0 + version: 10.6.0 devDependencies: + '@types/decimal.js': + specifier: ^7.4.3 + version: 7.4.3 prisma: specifier: 6.14.0 version: 6.14.0(typescript@5.5.4) @@ -18397,6 +18403,13 @@ packages: '@types/ms': 0.7.31 dev: true + /@types/decimal.js@7.4.3: + resolution: {integrity: sha512-7MpxcJPHqQ637FCZwJLtJMaDZkcD/iyUxj0m8A+m06slFeqRiK9QtgEyuocWNRbEtCrOZOEbZPTSSR88hMZVsg==} + deprecated: This is a stub types definition. decimal.js provides its own type definitions, so you do not need this installed. + dependencies: + decimal.js: 10.6.0 + dev: true + /@types/diff-match-patch@1.0.36: resolution: {integrity: sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg==} @@ -22057,6 +22070,9 @@ packages: resolution: {integrity: sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==} dev: false + /decimal.js@10.6.0: + resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==} + /decode-named-character-reference@1.0.2: resolution: {integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==} dependencies: From 779f8d02ecf40b5008bc0687d67db6da04532a4b Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Tue, 26 Aug 2025 22:19:35 +0100 Subject: [PATCH 3/9] Docker compose restart Clickhouse --- docker/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 26fbf25230..9a0b97569c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -77,6 +77,7 @@ services: clickhouse: image: bitnami/clickhouse:latest + restart: always container_name: clickhouse environment: CLICKHOUSE_ADMIN_USER: default From b9f3f3abd8fd267cb2f34d636108fe812def2e44 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Tue, 26 Aug 2025 22:20:10 +0100 Subject: [PATCH 4/9] Prisma instrumentation update --- apps/webapp/package.json | 5 +- pnpm-lock.yaml | 270 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 265 insertions(+), 10 deletions(-) diff --git a/apps/webapp/package.json b/apps/webapp/package.json index b6341aca5f..dfc07768e3 100644 --- a/apps/webapp/package.json +++ b/apps/webapp/package.json @@ -78,7 +78,7 @@ "@opentelemetry/sdk-trace-node": "1.25.1", "@opentelemetry/semantic-conventions": "1.25.1", "@popperjs/core": "^2.11.8", - "@prisma/instrumentation": "^5.11.0", + "@prisma/instrumentation": "^6.14.0", "@radix-ui/react-accordion": "^1.2.11", "@radix-ui/react-alert-dialog": "^1.0.4", "@radix-ui/react-dialog": "^1.0.3", @@ -137,6 +137,7 @@ "dotenv": "^16.4.5", "effect": "^3.11.7", "emails": "workspace:*", + "eventsource": "^4.0.0", "evt": "^2.4.13", "express": "4.20.0", "framer-motion": "^10.12.11", @@ -214,9 +215,9 @@ "@remix-run/dev": "2.1.0", "@remix-run/eslint-config": "2.1.0", "@remix-run/testing": "^2.1.0", + "@sentry/cli": "2.50.2", "@swc/core": "^1.3.4", "@swc/helpers": "^0.4.11", - "@sentry/cli": "2.50.2", "@tailwindcss/forms": "^0.5.3", "@tailwindcss/typography": "^0.5.9", "@total-typescript/ts-reset": "^0.4.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cc964af05f..0756c43848 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -342,8 +342,8 @@ importers: specifier: ^2.11.8 version: 2.11.8 '@prisma/instrumentation': - specifier: ^5.11.0 - version: 5.11.0 + specifier: ^6.14.0 + version: 6.14.0(@opentelemetry/api@1.9.0) '@radix-ui/react-accordion': specifier: ^1.2.11 version: 1.2.11(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0) @@ -518,6 +518,9 @@ importers: emails: specifier: workspace:* version: link:../../internal-packages/emails + eventsource: + specifier: ^4.0.0 + version: 4.0.0 evt: specifier: ^2.4.13 version: 2.4.13 @@ -2919,7 +2922,7 @@ packages: optional: true dependencies: '@ai-sdk/provider': 1.0.0 - eventsource-parser: 3.0.0 + eventsource-parser: 3.0.3 nanoid: 5.1.5 secure-json-parse: 2.7.0 zod: 3.25.76 @@ -9060,6 +9063,28 @@ packages: '@opentelemetry/api': 1.9.0 dev: false +<<<<<<< ours + /@opentelemetry/core@1.22.0(@opentelemetry/api@1.8.0): + resolution: {integrity: sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.9.0' + dependencies: + '@opentelemetry/api': 1.8.0 + '@opentelemetry/semantic-conventions': 1.22.0 + dev: false + +||||||| ancestor + /@opentelemetry/core@1.22.0(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.9.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/semantic-conventions': 1.22.0 + dev: true + /@opentelemetry/core@1.22.0(@opentelemetry/api@1.8.0): resolution: {integrity: sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA==} engines: {node: '>=14'} @@ -9070,6 +9095,36 @@ packages: '@opentelemetry/semantic-conventions': 1.22.0 dev: false + /@opentelemetry/core@1.25.1(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/semantic-conventions': 1.25.1 + +======= + /@opentelemetry/core@1.22.0(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.9.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/semantic-conventions': 1.22.0 + dev: true + + /@opentelemetry/core@1.25.1(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/semantic-conventions': 1.25.1 + +>>>>>>> theirs /@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0): resolution: {integrity: sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==} engines: {node: '>=14'} @@ -9638,6 +9693,42 @@ packages: - supports-color dev: false +<<<<<<< ours + /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.8.0): + resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + dependencies: + '@opentelemetry/api': 1.8.0 + '@opentelemetry/api-logs': 0.49.1 + '@types/shimmer': 1.0.2 + import-in-the-middle: 1.7.1 + require-in-the-middle: 7.1.1(supports-color@10.0.0) + semver: 7.6.3 + shimmer: 1.2.1 + transitivePeerDependencies: + - supports-color + dev: false + +||||||| ancestor + /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/api-logs': 0.49.1 + '@types/shimmer': 1.0.2 + import-in-the-middle: 1.7.1 + require-in-the-middle: 7.1.1(supports-color@10.0.0) + semver: 7.6.3 + shimmer: 1.2.1 + transitivePeerDependencies: + - supports-color + dev: true + /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.8.0): resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==} engines: {node: '>=14'} @@ -9655,6 +9746,25 @@ packages: - supports-color dev: false +======= + /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/api-logs': 0.49.1 + '@types/shimmer': 1.0.2 + import-in-the-middle: 1.7.1 + require-in-the-middle: 7.1.1(supports-color@10.0.0) + semver: 7.6.3 + shimmer: 1.2.1 + transitivePeerDependencies: + - supports-color + dev: true + +>>>>>>> theirs /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.9.0): resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==} engines: {node: '>=14'} @@ -9825,6 +9935,30 @@ packages: engines: {node: '>=14'} dev: false +<<<<<<< ours + /@opentelemetry/resources@1.22.0(@opentelemetry/api@1.8.0): + resolution: {integrity: sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.9.0' + dependencies: + '@opentelemetry/api': 1.8.0 + '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.8.0) + '@opentelemetry/semantic-conventions': 1.22.0 + dev: false + +||||||| ancestor + /@opentelemetry/resources@1.22.0(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.9.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': 1.22.0 + dev: true + /@opentelemetry/resources@1.22.0(@opentelemetry/api@1.8.0): resolution: {integrity: sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==} engines: {node: '>=14'} @@ -9836,6 +9970,41 @@ packages: '@opentelemetry/semantic-conventions': 1.22.0 dev: false + /@opentelemetry/resources@1.25.1(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': 1.25.1 + dev: true + +======= + /@opentelemetry/resources@1.22.0(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.9.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': 1.22.0 + dev: true + + /@opentelemetry/resources@1.25.1(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': 1.25.1 + dev: true + +>>>>>>> theirs /@opentelemetry/resources@1.25.1(@opentelemetry/api@1.9.0): resolution: {integrity: sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==} engines: {node: '>=14'} @@ -9974,6 +10143,32 @@ packages: - supports-color dev: false +<<<<<<< ours + /@opentelemetry/sdk-trace-base@1.22.0(@opentelemetry/api@1.8.0): + resolution: {integrity: sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.9.0' + dependencies: + '@opentelemetry/api': 1.8.0 + '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.8.0) + '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.8.0) + '@opentelemetry/semantic-conventions': 1.22.0 + dev: false + +||||||| ancestor + /@opentelemetry/sdk-trace-base@1.22.0(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.9.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1) + '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': 1.22.0 + dev: true + /@opentelemetry/sdk-trace-base@1.22.0(@opentelemetry/api@1.8.0): resolution: {integrity: sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==} engines: {node: '>=14'} @@ -9986,6 +10181,44 @@ packages: '@opentelemetry/semantic-conventions': 1.22.0 dev: false + /@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': 1.25.1 + dev: true + +======= + /@opentelemetry/sdk-trace-base@1.22.0(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.9.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1) + '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': 1.22.0 + dev: true + + /@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==} + engines: {node: '>=14'} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + dependencies: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': 1.25.1 + dev: true + +>>>>>>> theirs /@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0): resolution: {integrity: sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==} engines: {node: '>=14'} @@ -10075,7 +10308,12 @@ packages: /@opentelemetry/semantic-conventions@1.22.0: resolution: {integrity: sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==} engines: {node: '>=14'} +<<<<<<< ours dev: false +||||||| ancestor +======= + dev: true +>>>>>>> theirs /@opentelemetry/semantic-conventions@1.25.1: resolution: {integrity: sha512-ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==} @@ -10415,19 +10653,28 @@ packages: dependencies: '@prisma/debug': 6.14.0 +<<<<<<< ours >>>>>>> theirs /@prisma/instrumentation@5.11.0: resolution: {integrity: sha512-ou4nvDpNEY6+t3Dn9juOTz6tK33D0Y4XXkEZ2uPd8KH6Mqmc+4LYOOm470DP7noj7dyJjuGiM+wpPk//HKrcDg==} +||||||| ancestor + /@prisma/instrumentation@5.11.0: + resolution: {integrity: sha512-ou4nvDpNEY6+t3Dn9juOTz6tK33D0Y4XXkEZ2uPd8KH6Mqmc+4LYOOm470DP7noj7dyJjuGiM+wpPk//HKrcDg==} +======= + /@prisma/instrumentation@6.11.1(@opentelemetry/api@1.9.0): + resolution: {integrity: sha512-mrZOev24EDhnefmnZX7WVVT7v+r9LttPRqf54ONvj6re4XMF7wFTpK2tLJi4XHB7fFp/6xhYbgRel8YV7gQiyA==} + peerDependencies: + '@opentelemetry/api': ^1.8 +>>>>>>> theirs dependencies: - '@opentelemetry/api': 1.8.0 - '@opentelemetry/instrumentation': 0.49.1(@opentelemetry/api@1.8.0) - '@opentelemetry/sdk-trace-base': 1.22.0(@opentelemetry/api@1.8.0) + '@opentelemetry/api': 1.9.0 + '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0) transitivePeerDependencies: - supports-color dev: false - /@prisma/instrumentation@6.11.1(@opentelemetry/api@1.9.0): - resolution: {integrity: sha512-mrZOev24EDhnefmnZX7WVVT7v+r9LttPRqf54ONvj6re4XMF7wFTpK2tLJi4XHB7fFp/6xhYbgRel8YV7gQiyA==} + /@prisma/instrumentation@6.14.0(@opentelemetry/api@1.9.0): + resolution: {integrity: sha512-Po/Hry5bAeunRDq0yAQueKookW3glpP+qjjvvyOfm6dI2KG5/Y6Bgg3ahyWd7B0u2E+Wf9xRk2rtdda7ySgK1A==} peerDependencies: '@opentelemetry/api': ^1.8 dependencies: @@ -23853,6 +24100,13 @@ packages: eventsource-parser: 3.0.0 dev: false + /eventsource@4.0.0: + resolution: {integrity: sha512-fvIkb9qZzdMxgZrEQDyll+9oJsyaVvY92I2Re+qK0qEJ+w5s0X3dtz+M0VAPOjP1gtU3iqWyjQ0G3nvd5CLZ2g==} + engines: {node: '>=20.0.0'} + dependencies: + eventsource-parser: 3.0.3 + dev: false + /evt@2.4.13: resolution: {integrity: sha512-haTVOsmjzk+28zpzvVwan9Zw2rLQF2izgi7BKjAPRzZAfcv+8scL0TpM8MzvGNKFYHiy+Bq3r6FYIIUPl9kt3A==} dependencies: From 59e8db340fef1ddaed101fae0b8cdb71c8e7c2d9 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Tue, 26 Aug 2025 22:20:20 +0100 Subject: [PATCH 5/9] Docker --- docker/Dockerfile | 2 +- internal-packages/database/.dockerignore | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 internal-packages/database/.dockerignore diff --git a/docker/Dockerfile b/docker/Dockerfile index 14ecf6138e..01323432ec 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -36,7 +36,7 @@ RUN corepack enable ENV NODE_ENV production RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --prod --no-frozen-lockfile COPY --from=pruner --chown=node:node /triggerdotdev/internal-packages/database/prisma/schema.prisma /triggerdotdev/internal-packages/database/prisma/schema.prisma -# RUN pnpm add @prisma/client@5.1.1 -w +# RUN pnpm add @prisma/client@6.14.0 -w ENV NPM_CONFIG_IGNORE_WORKSPACE_ROOT_CHECK true RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpx prisma@6.14.0 generate --schema /triggerdotdev/internal-packages/database/prisma/schema.prisma diff --git a/internal-packages/database/.dockerignore b/internal-packages/database/.dockerignore new file mode 100644 index 0000000000..74ffb04b14 --- /dev/null +++ b/internal-packages/database/.dockerignore @@ -0,0 +1,5 @@ +node_modules +# Ensure the .env symlink is not removed by accident +!.env + +generated/prisma \ No newline at end of file From a31f561711e0b5a634328468077567f58fdad30a Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Wed, 27 Aug 2025 15:32:16 +0100 Subject: [PATCH 6/9] Removed database dockerignore file, add generated prisma client to the top-level one --- .dockerignore | 2 ++ internal-packages/database/.dockerignore | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 internal-packages/database/.dockerignore diff --git a/.dockerignore b/.dockerignore index d3f8720a9e..a3ea4db8ee 100644 --- a/.dockerignore +++ b/.dockerignore @@ -16,6 +16,8 @@ **/dist **/node_modules +**/generated/prisma + apps/webapp/build apps/webapp/public/build diff --git a/internal-packages/database/.dockerignore b/internal-packages/database/.dockerignore deleted file mode 100644 index 74ffb04b14..0000000000 --- a/internal-packages/database/.dockerignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules -# Ensure the .env symlink is not removed by accident -!.env - -generated/prisma \ No newline at end of file From 8b31009fdeeb187de8f97ba1aff0e6a59c448979 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Wed, 27 Aug 2025 15:34:10 +0100 Subject: [PATCH 7/9] Delete v3-catalog package.json --- references/v3-catalog/package.json | 96 ------------------------------ 1 file changed, 96 deletions(-) delete mode 100644 references/v3-catalog/package.json diff --git a/references/v3-catalog/package.json b/references/v3-catalog/package.json deleted file mode 100644 index 6367c7ad20..0000000000 --- a/references/v3-catalog/package.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "name": "references-v3-catalog", - "private": true, - "type": "module", - "zenstack": { - "schema": "./prisma/schema.zmodel" - }, - "scripts": { - "dev": "trigger dev", - "deploy": "trigger deploy --self-hosted --load-image", - "management": "tsx -r dotenv/config ./src/management.ts", - "queues": "ts-node -r dotenv/config -r tsconfig-paths/register ./src/queues.ts", - "build:client": "tsup-node ./src/clientUsage.ts --format esm,cjs", - "client": "tsx -r dotenv/config ./src/clientUsage.ts", - "triggerWithLargePayload": "tsx -r dotenv/config ./src/triggerWithLargePayload.ts", - "generate:prisma": "prisma generate --sql" - }, - "dependencies": { - "@1password/sdk": "^0.3.0", - "@effect/schema": "^0.75.5", - "@infisical/sdk": "^2.3.5", - "@opentelemetry/api": "1.4.1", - "@prisma/client": "6.14.0", - "@react-email/components": "0.0.24", - "@react-email/render": "1.0.1", - "@sentry/esbuild-plugin": "^2.22.2", - "@sinclair/typebox": "^0.33.17", - "@sindresorhus/slugify": "^2.2.1", - "@t3-oss/env-core": "^0.11.0", - "@t3-oss/env-nextjs": "^0.10.1", - "@traceloop/instrumentation-openai": "^0.10.0", - "@trigger.dev/sdk": "workspace:*", - "@typeschema/typebox": "^0.14.0", - "ai": "^3.3.24", - "arktype": "2.0.0-rc.17", - "bcrypt": "^6.0.0", - "canvas": "^3.1.0", - "dotenv": "^16.4.5", - "email-reply-parser": "^1.8.0", - "execa": "^8.0.1", - "fluent-ffmpeg": "^2.1.3", - "header-generator": "^2.1.55", - "kysely": "^0.27.4", - "msw": "^2.2.1", - "mupdf": "^1.3.6", - "openai": "^4.47.0", - "pg": "^8.11.5", - "playwright": "^1.50.1", - "puppeteer": "^23.4.0", - "react": "19.0.0-rc.0", - "react-email": "^3.0.1", - "reflect-metadata": "^0.1.13", - "runtypes": "^6.7.0", - "server-only": "^0.0.1", - "sharp": "^0.34.2", - "sqlite3": "^5.1.7", - "stripe": "^12.14.0", - "superstruct": "^2.0.2", - "typeorm": "^0.3.20", - "valibot": "^0.42.1", - "wrangler": "3.70.0", - "yt-dlp-wrap": "^2.3.12", - "yup": "^1.4.0", - "zip-node-addon": "^0.0.11", - "zod": "3.25.76" - }, - "devDependencies": { - "@opentelemetry/api": "^1.8.0", - "@opentelemetry/core": "^1.22.0", - "@opentelemetry/exporter-logs-otlp-http": "^0.49.1", - "@opentelemetry/exporter-trace-otlp-http": "^0.49.1", - "@opentelemetry/instrumentation": "^0.49.1", - "@opentelemetry/instrumentation-express": "^0.36.1", - "@opentelemetry/instrumentation-fetch": "^0.49.1", - "@opentelemetry/instrumentation-http": "^0.49.1", - "@opentelemetry/instrumentation-undici": "0.2.0", - "@opentelemetry/resources": "^1.22.0", - "@opentelemetry/sdk-logs": "^0.49.1", - "@opentelemetry/sdk-node": "^0.49.1", - "@opentelemetry/sdk-trace-base": "^1.22.0", - "@opentelemetry/sdk-trace-node": "^1.22.0", - "@opentelemetry/semantic-conventions": "^1.22.0", - "@trigger.dev/build": "workspace:*", - "@trigger.dev/python": "workspace:*", - "@types/bcrypt": "^5.0.2", - "@types/email-reply-parser": "^1.4.2", - "@types/fluent-ffmpeg": "^2.1.26", - "@types/react": "^18.3.1", - "esbuild": "^0.19.11", - "prisma": "6.14.0", - "prisma-kysely": "^1.8.0", - "trigger.dev": "workspace:*", - "ts-node": "^10.9.2", - "tsconfig-paths": "^4.2.0" - } -} \ No newline at end of file From ffb144d1a28a75cb373d77b481cddef90761c9ba Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Wed, 27 Aug 2025 15:36:43 +0100 Subject: [PATCH 8/9] Resolved pnpm lock file --- pnpm-lock.yaml | 1032 ------------------------------------------------ 1 file changed, 1032 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0756c43848..ea79ed7518 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2375,456 +2375,6 @@ importers: specifier: ^5.5.4 version: 5.5.4 -<<<<<<< ours -||||||| ancestor - references/v3-catalog: - dependencies: - '@1password/sdk': - specifier: ^0.3.0 - version: 0.3.0 - '@effect/schema': - specifier: ^0.75.5 - version: 0.75.5(effect@3.17.1) - '@infisical/sdk': - specifier: ^2.3.5 - version: 2.3.5 - '@opentelemetry/api': - specifier: 1.4.1 - version: 1.4.1 - '@prisma/client': - specifier: 5.19.0 - version: 5.19.0(prisma@5.19.0) - '@react-email/components': - specifier: 0.0.24 - version: 0.0.24(react-dom@18.3.1)(react@19.0.0-rc.0) - '@react-email/render': - specifier: 1.0.1 - version: 1.0.1(react-dom@18.3.1)(react@19.0.0-rc.0) - '@sentry/esbuild-plugin': - specifier: ^2.22.2 - version: 2.22.2 - '@sinclair/typebox': - specifier: ^0.33.17 - version: 0.33.17 - '@sindresorhus/slugify': - specifier: ^2.2.1 - version: 2.2.1 - '@t3-oss/env-core': - specifier: ^0.11.0 - version: 0.11.0(typescript@5.5.4)(zod@3.25.76) - '@t3-oss/env-nextjs': - specifier: ^0.10.1 - version: 0.10.1(typescript@5.5.4)(zod@3.25.76) - '@traceloop/instrumentation-openai': - specifier: ^0.10.0 - version: 0.10.0(@opentelemetry/api@1.4.1) - '@trigger.dev/sdk': - specifier: workspace:* - version: link:../../packages/trigger-sdk - '@typeschema/typebox': - specifier: ^0.14.0 - version: 0.14.0(@sinclair/typebox@0.33.17) - ai: - specifier: ^3.3.24 - version: 3.3.24(openai@4.56.0)(react@19.0.0-rc.0)(svelte@5.33.14)(vue@3.5.16)(zod@3.25.76) - arktype: - specifier: 2.0.0-rc.17 - version: 2.0.0-rc.17 - bcrypt: - specifier: ^6.0.0 - version: 6.0.0 - canvas: - specifier: ^3.1.0 - version: 3.1.0 - dotenv: - specifier: ^16.4.5 - version: 16.4.5 - email-reply-parser: - specifier: ^1.8.0 - version: 1.8.0 - execa: - specifier: ^8.0.1 - version: 8.0.1 - fluent-ffmpeg: - specifier: ^2.1.3 - version: 2.1.3 - header-generator: - specifier: ^2.1.55 - version: 2.1.55 - kysely: - specifier: ^0.27.4 - version: 0.27.4 - msw: - specifier: ^2.2.1 - version: 2.3.5(typescript@5.5.4) - mupdf: - specifier: ^1.3.6 - version: 1.3.6 - openai: - specifier: ^4.47.0 - version: 4.56.0(zod@3.25.76) - pg: - specifier: ^8.11.5 - version: 8.11.5 - playwright: - specifier: ^1.50.1 - version: 1.50.1 - puppeteer: - specifier: ^23.4.0 - version: 23.4.0(typescript@5.5.4) - react: - specifier: 19.0.0-rc.0 - version: 19.0.0-rc.0 - react-email: - specifier: ^3.0.1 - version: 3.0.1(@opentelemetry/api@1.4.1)(@playwright/test@1.37.0)(react-dom@18.3.1)(react@19.0.0-rc.0) - reflect-metadata: - specifier: ^0.1.13 - version: 0.1.14 - runtypes: - specifier: ^6.7.0 - version: 6.7.0 - server-only: - specifier: ^0.0.1 - version: 0.0.1 - sharp: - specifier: ^0.34.2 - version: 0.34.2 - sqlite3: - specifier: ^5.1.7 - version: 5.1.7 - stripe: - specifier: ^12.14.0 - version: 12.18.0 - superstruct: - specifier: ^2.0.2 - version: 2.0.2 - typeorm: - specifier: ^0.3.20 - version: 0.3.20(pg@8.11.5)(sqlite3@5.1.7)(ts-node@10.9.2) - valibot: - specifier: ^0.42.1 - version: 0.42.1(typescript@5.5.4) - wrangler: - specifier: 3.70.0 - version: 3.70.0 - yt-dlp-wrap: - specifier: ^2.3.12 - version: 2.3.12 - yup: - specifier: ^1.4.0 - version: 1.4.0 - zip-node-addon: - specifier: ^0.0.11 - version: 0.0.11 - zod: - specifier: 3.25.76 - version: 3.25.76 - devDependencies: - '@opentelemetry/core': - specifier: ^1.22.0 - version: 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/exporter-logs-otlp-http': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/exporter-trace-otlp-http': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/instrumentation': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/instrumentation-express': - specifier: ^0.36.1 - version: 0.36.1(@opentelemetry/api@1.4.1) - '@opentelemetry/instrumentation-fetch': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/instrumentation-http': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/instrumentation-undici': - specifier: 0.2.0 - version: 0.2.0(@opentelemetry/api@1.4.1) - '@opentelemetry/resources': - specifier: ^1.22.0 - version: 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-logs': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api-logs@0.203.0)(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-node': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-base': - specifier: ^1.22.0 - version: 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-node': - specifier: ^1.22.0 - version: 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': - specifier: ^1.22.0 - version: 1.25.1 - '@trigger.dev/build': - specifier: workspace:* - version: link:../../packages/build - '@trigger.dev/python': - specifier: workspace:* - version: link:../../packages/python - '@types/bcrypt': - specifier: ^5.0.2 - version: 5.0.2 - '@types/email-reply-parser': - specifier: ^1.4.2 - version: 1.4.2 - '@types/fluent-ffmpeg': - specifier: ^2.1.26 - version: 2.1.26 - '@types/react': - specifier: ^18.3.1 - version: 18.3.1 - esbuild: - specifier: ^0.19.11 - version: 0.19.11 - prisma: - specifier: 5.19.0 - version: 5.19.0 - prisma-kysely: - specifier: ^1.8.0 - version: 1.8.0 - trigger.dev: - specifier: workspace:* - version: link:../../packages/cli-v3 - ts-node: - specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.14)(typescript@5.5.4) - tsconfig-paths: - specifier: ^4.2.0 - version: 4.2.0 - -======= - references/v3-catalog: - dependencies: - '@1password/sdk': - specifier: ^0.3.0 - version: 0.3.0 - '@effect/schema': - specifier: ^0.75.5 - version: 0.75.5(effect@3.17.1) - '@infisical/sdk': - specifier: ^2.3.5 - version: 2.3.5 - '@opentelemetry/api': - specifier: 1.4.1 - version: 1.4.1 - '@prisma/client': - specifier: 6.14.0 - version: 6.14.0(prisma@6.14.0)(typescript@5.5.4) - '@react-email/components': - specifier: 0.0.24 - version: 0.0.24(react-dom@18.3.1)(react@19.0.0-rc.0) - '@react-email/render': - specifier: 1.0.1 - version: 1.0.1(react-dom@18.3.1)(react@19.0.0-rc.0) - '@sentry/esbuild-plugin': - specifier: ^2.22.2 - version: 2.22.2 - '@sinclair/typebox': - specifier: ^0.33.17 - version: 0.33.17 - '@sindresorhus/slugify': - specifier: ^2.2.1 - version: 2.2.1 - '@t3-oss/env-core': - specifier: ^0.11.0 - version: 0.11.0(typescript@5.5.4)(zod@3.25.76) - '@t3-oss/env-nextjs': - specifier: ^0.10.1 - version: 0.10.1(typescript@5.5.4)(zod@3.25.76) - '@traceloop/instrumentation-openai': - specifier: ^0.10.0 - version: 0.10.0(@opentelemetry/api@1.4.1) - '@trigger.dev/sdk': - specifier: workspace:* - version: link:../../packages/trigger-sdk - '@typeschema/typebox': - specifier: ^0.14.0 - version: 0.14.0(@sinclair/typebox@0.33.17) - ai: - specifier: ^3.3.24 - version: 3.3.24(openai@4.56.0)(react@19.0.0-rc.0)(svelte@5.33.14)(vue@3.5.16)(zod@3.25.76) - arktype: - specifier: 2.0.0-rc.17 - version: 2.0.0-rc.17 - bcrypt: - specifier: ^6.0.0 - version: 6.0.0 - canvas: - specifier: ^3.1.0 - version: 3.1.0 - dotenv: - specifier: ^16.4.5 - version: 16.4.5 - email-reply-parser: - specifier: ^1.8.0 - version: 1.8.0 - execa: - specifier: ^8.0.1 - version: 8.0.1 - fluent-ffmpeg: - specifier: ^2.1.3 - version: 2.1.3 - header-generator: - specifier: ^2.1.55 - version: 2.1.55 - kysely: - specifier: ^0.27.4 - version: 0.27.4 - msw: - specifier: ^2.2.1 - version: 2.3.5(typescript@5.5.4) - mupdf: - specifier: ^1.3.6 - version: 1.3.6 - openai: - specifier: ^4.47.0 - version: 4.56.0(zod@3.25.76) - pg: - specifier: ^8.11.5 - version: 8.11.5 - playwright: - specifier: ^1.50.1 - version: 1.50.1 - puppeteer: - specifier: ^23.4.0 - version: 23.4.0(typescript@5.5.4) - react: - specifier: 19.0.0-rc.0 - version: 19.0.0-rc.0 - react-email: - specifier: ^3.0.1 - version: 3.0.1(@opentelemetry/api@1.4.1)(@playwright/test@1.37.0)(react-dom@18.3.1)(react@19.0.0-rc.0) - reflect-metadata: - specifier: ^0.1.13 - version: 0.1.14 - runtypes: - specifier: ^6.7.0 - version: 6.7.0 - server-only: - specifier: ^0.0.1 - version: 0.0.1 - sharp: - specifier: ^0.34.2 - version: 0.34.2 - sqlite3: - specifier: ^5.1.7 - version: 5.1.7 - stripe: - specifier: ^12.14.0 - version: 12.18.0 - superstruct: - specifier: ^2.0.2 - version: 2.0.2 - typeorm: - specifier: ^0.3.20 - version: 0.3.20(pg@8.11.5)(sqlite3@5.1.7)(ts-node@10.9.2) - valibot: - specifier: ^0.42.1 - version: 0.42.1(typescript@5.5.4) - wrangler: - specifier: 3.70.0 - version: 3.70.0 - yt-dlp-wrap: - specifier: ^2.3.12 - version: 2.3.12 - yup: - specifier: ^1.4.0 - version: 1.4.0 - zip-node-addon: - specifier: ^0.0.11 - version: 0.0.11 - zod: - specifier: 3.25.76 - version: 3.25.76 - devDependencies: - '@opentelemetry/core': - specifier: ^1.22.0 - version: 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/exporter-logs-otlp-http': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/exporter-trace-otlp-http': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/instrumentation': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/instrumentation-express': - specifier: ^0.36.1 - version: 0.36.1(@opentelemetry/api@1.4.1) - '@opentelemetry/instrumentation-fetch': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/instrumentation-http': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/instrumentation-undici': - specifier: 0.2.0 - version: 0.2.0(@opentelemetry/api@1.4.1) - '@opentelemetry/resources': - specifier: ^1.22.0 - version: 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-logs': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api-logs@0.203.0)(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-node': - specifier: ^0.49.1 - version: 0.49.1(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-base': - specifier: ^1.22.0 - version: 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-node': - specifier: ^1.22.0 - version: 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': - specifier: ^1.22.0 - version: 1.25.1 - '@trigger.dev/build': - specifier: workspace:* - version: link:../../packages/build - '@trigger.dev/python': - specifier: workspace:* - version: link:../../packages/python - '@types/bcrypt': - specifier: ^5.0.2 - version: 5.0.2 - '@types/email-reply-parser': - specifier: ^1.4.2 - version: 1.4.2 - '@types/fluent-ffmpeg': - specifier: ^2.1.26 - version: 2.1.26 - '@types/react': - specifier: ^18.3.1 - version: 18.3.1 - esbuild: - specifier: ^0.19.11 - version: 0.19.11 - prisma: - specifier: 6.14.0 - version: 6.14.0(typescript@5.5.4) - prisma-kysely: - specifier: ^1.8.0 - version: 1.8.0 - trigger.dev: - specifier: workspace:* - version: link:../../packages/cli-v3 - ts-node: - specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.14)(typescript@5.5.4) - tsconfig-paths: - specifier: ^4.2.0 - version: 4.2.0 - ->>>>>>> theirs packages: /@adobe/css-tools@4.4.0: @@ -9063,68 +8613,6 @@ packages: '@opentelemetry/api': 1.9.0 dev: false -<<<<<<< ours - /@opentelemetry/core@1.22.0(@opentelemetry/api@1.8.0): - resolution: {integrity: sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.8.0 - '@opentelemetry/semantic-conventions': 1.22.0 - dev: false - -||||||| ancestor - /@opentelemetry/core@1.22.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/semantic-conventions': 1.22.0 - dev: true - - /@opentelemetry/core@1.22.0(@opentelemetry/api@1.8.0): - resolution: {integrity: sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.8.0 - '@opentelemetry/semantic-conventions': 1.22.0 - dev: false - - /@opentelemetry/core@1.25.1(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.10.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/semantic-conventions': 1.25.1 - -======= - /@opentelemetry/core@1.22.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/semantic-conventions': 1.22.0 - dev: true - - /@opentelemetry/core@1.25.1(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.10.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/semantic-conventions': 1.25.1 - ->>>>>>> theirs /@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0): resolution: {integrity: sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==} engines: {node: '>=14'} @@ -9693,78 +9181,6 @@ packages: - supports-color dev: false -<<<<<<< ours - /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.8.0): - resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': ^1.3.0 - dependencies: - '@opentelemetry/api': 1.8.0 - '@opentelemetry/api-logs': 0.49.1 - '@types/shimmer': 1.0.2 - import-in-the-middle: 1.7.1 - require-in-the-middle: 7.1.1(supports-color@10.0.0) - semver: 7.6.3 - shimmer: 1.2.1 - transitivePeerDependencies: - - supports-color - dev: false - -||||||| ancestor - /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': ^1.3.0 - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/api-logs': 0.49.1 - '@types/shimmer': 1.0.2 - import-in-the-middle: 1.7.1 - require-in-the-middle: 7.1.1(supports-color@10.0.0) - semver: 7.6.3 - shimmer: 1.2.1 - transitivePeerDependencies: - - supports-color - dev: true - - /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.8.0): - resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': ^1.3.0 - dependencies: - '@opentelemetry/api': 1.8.0 - '@opentelemetry/api-logs': 0.49.1 - '@types/shimmer': 1.0.2 - import-in-the-middle: 1.7.1 - require-in-the-middle: 7.1.1(supports-color@10.0.0) - semver: 7.6.3 - shimmer: 1.2.1 - transitivePeerDependencies: - - supports-color - dev: false - -======= - /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': ^1.3.0 - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/api-logs': 0.49.1 - '@types/shimmer': 1.0.2 - import-in-the-middle: 1.7.1 - require-in-the-middle: 7.1.1(supports-color@10.0.0) - semver: 7.6.3 - shimmer: 1.2.1 - transitivePeerDependencies: - - supports-color - dev: true - ->>>>>>> theirs /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.9.0): resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==} engines: {node: '>=14'} @@ -9935,76 +9351,6 @@ packages: engines: {node: '>=14'} dev: false -<<<<<<< ours - /@opentelemetry/resources@1.22.0(@opentelemetry/api@1.8.0): - resolution: {integrity: sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.8.0 - '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.8.0) - '@opentelemetry/semantic-conventions': 1.22.0 - dev: false - -||||||| ancestor - /@opentelemetry/resources@1.22.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.22.0 - dev: true - - /@opentelemetry/resources@1.22.0(@opentelemetry/api@1.8.0): - resolution: {integrity: sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.8.0 - '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.8.0) - '@opentelemetry/semantic-conventions': 1.22.0 - dev: false - - /@opentelemetry/resources@1.25.1(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.10.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.25.1 - dev: true - -======= - /@opentelemetry/resources@1.22.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.22.0 - dev: true - - /@opentelemetry/resources@1.25.1(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.10.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.25.1 - dev: true - ->>>>>>> theirs /@opentelemetry/resources@1.25.1(@opentelemetry/api@1.9.0): resolution: {integrity: sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==} engines: {node: '>=14'} @@ -10143,82 +9489,6 @@ packages: - supports-color dev: false -<<<<<<< ours - /@opentelemetry/sdk-trace-base@1.22.0(@opentelemetry/api@1.8.0): - resolution: {integrity: sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.8.0 - '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.8.0) - '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.8.0) - '@opentelemetry/semantic-conventions': 1.22.0 - dev: false - -||||||| ancestor - /@opentelemetry/sdk-trace-base@1.22.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1) - '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.22.0 - dev: true - - /@opentelemetry/sdk-trace-base@1.22.0(@opentelemetry/api@1.8.0): - resolution: {integrity: sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.8.0 - '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.8.0) - '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.8.0) - '@opentelemetry/semantic-conventions': 1.22.0 - dev: false - - /@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.10.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.25.1 - dev: true - -======= - /@opentelemetry/sdk-trace-base@1.22.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.9.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1) - '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.22.0 - dev: true - - /@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.10.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.25.1 - dev: true - ->>>>>>> theirs /@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0): resolution: {integrity: sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==} engines: {node: '>=14'} @@ -10305,16 +9575,6 @@ packages: '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0) dev: false - /@opentelemetry/semantic-conventions@1.22.0: - resolution: {integrity: sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==} - engines: {node: '>=14'} -<<<<<<< ours - dev: false -||||||| ancestor -======= - dev: true ->>>>>>> theirs - /@opentelemetry/semantic-conventions@1.25.1: resolution: {integrity: sha512-ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==} engines: {node: '>=14'} @@ -10380,38 +9640,6 @@ packages: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: false -<<<<<<< ours - /@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: '*' - peerDependenciesMeta: - prisma: -||||||| ancestor - /@prisma/client@5.19.0(prisma@5.19.0): - resolution: {integrity: sha512-CzOpau+q1kEWQyoQMvlnXIHqPvwmWbh48xZ4n8KWbAql0p8PC0BIgSTYW5ncxXa4JSEff0tcoxSZB874wDstdg==} - engines: {node: '>=16.13'} - requiresBuild: true - peerDependencies: - prisma: '*' - peerDependenciesMeta: - prisma: - optional: true - dependencies: - prisma: 5.19.0 - dev: false - - /@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: '*' - peerDependenciesMeta: - prisma: -======= /@prisma/client@6.14.0(prisma@6.14.0)(typescript@5.5.4): resolution: {integrity: sha512-8E/Nk3eL5g7RQIg/LUj1ICyDmhD053STjxrPxUtCRybs2s/2sOEcx9NpITuAOPn07HEpWBfhAVe1T/HYWXUPOw==} engines: {node: '>=18.18'} @@ -10423,38 +9651,12 @@ packages: prisma: optional: true typescript: ->>>>>>> theirs optional: true dependencies: prisma: 6.14.0(typescript@5.5.4) typescript: 5.5.4 dev: false -<<<<<<< ours - /@prisma/engines-version@5.4.1-1.2f302df92bd8945e20ad4595a73def5b96afa54f: - resolution: {integrity: sha512-+nUQM/y8C+1GG5Ioeqcu6itFslCfxvQSAUVSMC9XM2G2Fcq0F4Afnp6m0pXF6X6iUBWen7jZBPmM9Qlq4Nr3/A==} - dev: false -||||||| ancestor - /@prisma/debug@5.19.0: - resolution: {integrity: sha512-+b/G0ubAZlrS+JSiDhXnYV5DF/aTJ3pinktkiV/L4TtLRLZO6SVGyFELgxBsicCTWJ2ZMu5vEV/jTtYCdjFTRA==} - - /@prisma/debug@5.3.1: - resolution: {integrity: sha512-eYrxqslEKf+wpMFIIHgbcNYuZBXUdiJLA85Or3TwOhgPIN1ZoXT9CwJph3ynW8H1Xg0LkdYLwVmuULCwiMoU5A==} - dependencies: - '@types/debug': 4.1.8 - debug: 4.3.4 - strip-ansi: 6.0.1 - transitivePeerDependencies: - - supports-color - dev: true - - /@prisma/engines-version@5.19.0-31.5fe21811a6ba0b952a3bc71400666511fe3b902f: - resolution: {integrity: sha512-GimI9aZIFy/yvvR11KfXRn3pliFn1QAkdebVlsXlnoh5uk0YhLblVmeYiHfsu+wDA7BeKqYT4sFfzg8mutzuWw==} - - /@prisma/engines-version@5.4.1-1.2f302df92bd8945e20ad4595a73def5b96afa54f: - resolution: {integrity: sha512-+nUQM/y8C+1GG5Ioeqcu6itFslCfxvQSAUVSMC9XM2G2Fcq0F4Afnp6m0pXF6X6iUBWen7jZBPmM9Qlq4Nr3/A==} - dev: false -======= /@prisma/config@6.14.0: resolution: {integrity: sha512-IwC7o5KNNGhmblLs23swnfBjADkacBb7wvyDXUWLwuvUQciKJZqyecU0jw0d7JRkswrj+XTL8fdr0y2/VerKQQ==} dependencies: @@ -10465,154 +9667,21 @@ packages: transitivePeerDependencies: - magicast - /@prisma/debug@5.3.1: - resolution: {integrity: sha512-eYrxqslEKf+wpMFIIHgbcNYuZBXUdiJLA85Or3TwOhgPIN1ZoXT9CwJph3ynW8H1Xg0LkdYLwVmuULCwiMoU5A==} - dependencies: - '@types/debug': 4.1.8 - debug: 4.3.4 - strip-ansi: 6.0.1 - transitivePeerDependencies: - - supports-color - dev: true - /@prisma/debug@6.14.0: resolution: {integrity: sha512-j4Lf+y+5QIJgQD4sJWSbkOD7geKx9CakaLp/TyTy/UDu9Wo0awvWCBH/BAxTHUaCpIl9USA5VS/KJhDqKJSwug==} ->>>>>>> theirs -<<<<<<< ours - /@prisma/engines@5.4.1: - resolution: {integrity: sha512-vJTdY4la/5V3N7SFvWRmSMUh4mIQnyb/MNoDjzVbh9iLmEC+uEykj/1GPviVsorvfz7DbYSQC4RiwmlEpTEvGA==} -||||||| ancestor - /@prisma/engines@5.19.0: - resolution: {integrity: sha512-UtW+0m4HYoRSSR3LoDGKF3Ud4BSMWYlLEt4slTnuP1mI+vrV3zaDoiAPmejdAT76vCN5UqnWURbkXxf66nSylQ==} - requiresBuild: true - dependencies: - '@prisma/debug': 5.19.0 - '@prisma/engines-version': 5.19.0-31.5fe21811a6ba0b952a3bc71400666511fe3b902f - '@prisma/fetch-engine': 5.19.0 - '@prisma/get-platform': 5.19.0 - - /@prisma/engines@5.3.1: - resolution: {integrity: sha512-6QkILNyfeeN67BNEPEtkgh3Xo2tm6D7V+UhrkBbRHqKw9CTaz/vvTP/ROwYSP/3JT2MtIutZm/EnhxUiuOPVDA==} - requiresBuild: true - dev: true - - /@prisma/engines@5.4.1: - resolution: {integrity: sha512-vJTdY4la/5V3N7SFvWRmSMUh4mIQnyb/MNoDjzVbh9iLmEC+uEykj/1GPviVsorvfz7DbYSQC4RiwmlEpTEvGA==} -======= /@prisma/engines-version@6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49: resolution: {integrity: sha512-EgN9ODJpiX45yvwcngoStp3uQPJ3l+AEVoQ6dMMO2QvmwIlnxfApzKmJQExzdo7/hqQANrz5txHJdGYHzOnGHA==} - /@prisma/engines@5.3.1: - resolution: {integrity: sha512-6QkILNyfeeN67BNEPEtkgh3Xo2tm6D7V+UhrkBbRHqKw9CTaz/vvTP/ROwYSP/3JT2MtIutZm/EnhxUiuOPVDA==} - requiresBuild: true - dev: true - /@prisma/engines@6.14.0: resolution: {integrity: sha512-LhJjqsALFEcoAtF07nSaOkVguaxw/ZsgfROIYZ8bAZDobe7y8Wy+PkYQaPOK1iLSsFgV2MhCO/eNrI1gdSOj6w==} ->>>>>>> theirs requiresBuild: true -<<<<<<< ours - -||||||| ancestor - - /@prisma/fetch-engine@5.19.0: - resolution: {integrity: sha512-oOiPNtmJX0cP/ebu7BBEouJvCw8T84/MFD/Hf2zlqjxkK4ojl38bB9i9J5LAxotL6WlYVThKdxc7HqoWnPOhqQ==} - dependencies: - '@prisma/debug': 5.19.0 - '@prisma/engines-version': 5.19.0-31.5fe21811a6ba0b952a3bc71400666511fe3b902f - '@prisma/get-platform': 5.19.0 - - /@prisma/fetch-engine@5.3.1: - resolution: {integrity: sha512-w1yk1YiK8N82Pobdq58b85l6e8akyrkxuzwV9DoiUTRf3gpsuhJJesHc4Yi0WzUC9/3znizl1UfCsI6dhkj3Vw==} - dependencies: - '@prisma/debug': 5.3.1 - '@prisma/get-platform': 5.3.1 - execa: 5.1.1 - find-cache-dir: 3.3.2 - fs-extra: 11.1.1 - hasha: 5.2.2 - http-proxy-agent: 7.0.0 - https-proxy-agent: 7.0.2 - kleur: 4.1.5 - node-fetch: 2.7.0 - p-filter: 2.1.0 - p-map: 4.0.0 - p-retry: 4.6.2 - progress: 2.0.3 - rimraf: 3.0.2 - temp-dir: 2.0.0 - tempy: 1.0.1 - transitivePeerDependencies: - - encoding - - supports-color - dev: true - - /@prisma/generator-helper@5.3.1: - resolution: {integrity: sha512-zrYS0iHLgPlOJjYnd5KvVMMvSS+ktOL39EwooS5EnyvfzwfzxlKCeOUgxTfiKYs0WUWqzEvyNAYtramYgSknsQ==} - dependencies: - '@prisma/debug': 5.3.1 - '@types/cross-spawn': 6.0.2 - cross-spawn: 7.0.3 - kleur: 4.1.5 - transitivePeerDependencies: - - supports-color - dev: true - - /@prisma/get-platform@5.19.0: - resolution: {integrity: sha512-s9DWkZKnuP4Y8uy6yZfvqQ/9X3/+2KYf3IZUVZz5OstJdGBJrBlbmIuMl81917wp5TuK/1k2TpHNCEdpYLPKmg==} - dependencies: - '@prisma/debug': 5.19.0 - - /@prisma/get-platform@5.3.1: - resolution: {integrity: sha512-3IiZY2BUjKnAuZ0569zppZE6/rZbVAM09//c2nvPbbkGG9MqrirA8fbhhF7tfVmhyVfdmVCHnf/ujWPHJ8B46Q==} - dependencies: - '@prisma/debug': 5.3.1 - escape-string-regexp: 4.0.0 - execa: 5.1.1 - fs-jetpack: 5.1.0 - kleur: 4.1.5 - replace-string: 3.1.0 - strip-ansi: 6.0.1 - tempy: 1.0.1 - terminal-link: 2.1.1 - ts-pattern: 4.3.0 - transitivePeerDependencies: - - supports-color - dev: true - -======= dependencies: '@prisma/debug': 6.14.0 '@prisma/engines-version': 6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49 '@prisma/fetch-engine': 6.14.0 '@prisma/get-platform': 6.14.0 - /@prisma/fetch-engine@5.3.1: - resolution: {integrity: sha512-w1yk1YiK8N82Pobdq58b85l6e8akyrkxuzwV9DoiUTRf3gpsuhJJesHc4Yi0WzUC9/3znizl1UfCsI6dhkj3Vw==} - dependencies: - '@prisma/debug': 5.3.1 - '@prisma/get-platform': 5.3.1 - execa: 5.1.1 - find-cache-dir: 3.3.2 - fs-extra: 11.1.1 - hasha: 5.2.2 - http-proxy-agent: 7.0.0 - https-proxy-agent: 7.0.2 - kleur: 4.1.5 - node-fetch: 2.7.0 - p-filter: 2.1.0 - p-map: 4.0.0 - p-retry: 4.6.2 - progress: 2.0.3 - rimraf: 3.0.2 - temp-dir: 2.0.0 - tempy: 1.0.1 - transitivePeerDependencies: - - encoding - - supports-color - dev: true - /@prisma/fetch-engine@6.14.0: resolution: {integrity: sha512-MPzYPOKMENYOaY3AcAbaKrfvXVlvTc6iHmTXsp9RiwCX+bPyfDMqMFVUSVXPYrXnrvEzhGHfyiFy0PRLHPysNg==} dependencies: @@ -10620,52 +9689,15 @@ packages: '@prisma/engines-version': 6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49 '@prisma/get-platform': 6.14.0 - /@prisma/generator-helper@5.3.1: - resolution: {integrity: sha512-zrYS0iHLgPlOJjYnd5KvVMMvSS+ktOL39EwooS5EnyvfzwfzxlKCeOUgxTfiKYs0WUWqzEvyNAYtramYgSknsQ==} - dependencies: - '@prisma/debug': 5.3.1 - '@types/cross-spawn': 6.0.2 - cross-spawn: 7.0.3 - kleur: 4.1.5 - transitivePeerDependencies: - - supports-color - dev: true - - /@prisma/get-platform@5.3.1: - resolution: {integrity: sha512-3IiZY2BUjKnAuZ0569zppZE6/rZbVAM09//c2nvPbbkGG9MqrirA8fbhhF7tfVmhyVfdmVCHnf/ujWPHJ8B46Q==} - dependencies: - '@prisma/debug': 5.3.1 - escape-string-regexp: 4.0.0 - execa: 5.1.1 - fs-jetpack: 5.1.0 - kleur: 4.1.5 - replace-string: 3.1.0 - strip-ansi: 6.0.1 - tempy: 1.0.1 - terminal-link: 2.1.1 - ts-pattern: 4.3.0 - transitivePeerDependencies: - - supports-color - dev: true - /@prisma/get-platform@6.14.0: resolution: {integrity: sha512-7VjuxKNwjnBhKfqPpMeWiHEa2sVjYzmHdl1slW6STuUCe9QnOY0OY1ljGSvz6wpG4U8DfbDqkG1yofd/1GINww==} dependencies: '@prisma/debug': 6.14.0 -<<<<<<< ours ->>>>>>> theirs - /@prisma/instrumentation@5.11.0: - resolution: {integrity: sha512-ou4nvDpNEY6+t3Dn9juOTz6tK33D0Y4XXkEZ2uPd8KH6Mqmc+4LYOOm470DP7noj7dyJjuGiM+wpPk//HKrcDg==} -||||||| ancestor - /@prisma/instrumentation@5.11.0: - resolution: {integrity: sha512-ou4nvDpNEY6+t3Dn9juOTz6tK33D0Y4XXkEZ2uPd8KH6Mqmc+4LYOOm470DP7noj7dyJjuGiM+wpPk//HKrcDg==} -======= /@prisma/instrumentation@6.11.1(@opentelemetry/api@1.9.0): resolution: {integrity: sha512-mrZOev24EDhnefmnZX7WVVT7v+r9LttPRqf54ONvj6re4XMF7wFTpK2tLJi4XHB7fFp/6xhYbgRel8YV7gQiyA==} peerDependencies: '@opentelemetry/api': ^1.8 ->>>>>>> theirs dependencies: '@opentelemetry/api': 1.9.0 '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0) @@ -28341,25 +27373,9 @@ packages: skin-tone: 2.0.0 dev: true -<<<<<<< ours - /node-fetch-native@1.6.4: - resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==} - dev: false - -||||||| ancestor - /node-fetch-native@1.6.4: - resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==} - dev: false - - /node-fetch-native@1.6.6: - resolution: {integrity: sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==} - dev: false - -======= /node-fetch-native@1.6.6: resolution: {integrity: sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==} ->>>>>>> theirs /node-fetch@2.6.12: resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==} engines: {node: 4.x || >=6.0.0} @@ -30062,57 +29078,9 @@ packages: react: 18.2.0 dev: false -<<<<<<< ours - /prisma@5.4.1: - resolution: {integrity: sha512-op9PmU8Bcw5dNAas82wBYTG0yHnpq9/O3bhxbDBrNzwZTwBqsVCxxYRLf6wHNh9HVaDGhgjjHlu1+BcW8qdnBg==} - engines: {node: '>=16.13'} -||||||| ancestor - /prisma-kysely@1.8.0: - resolution: {integrity: sha512-VpNpolZ8RXRgfU+j4R+fPZmX8EE95w3vJ2tt7+FwuiQc0leNTfLK5QLf3KbbPDes2rfjh3g20AjDxefQIo5GIA==} - hasBin: true - dependencies: - '@mrleebo/prisma-ast': 0.7.0 - '@prisma/generator-helper': 5.3.1 - '@prisma/internals': 5.3.1 - typescript: 5.8.3 - zod: 3.25.76 - transitivePeerDependencies: - - encoding - - supports-color - dev: true - - /prisma@5.19.0: - resolution: {integrity: sha512-Pu7lUKpVyTx8cVwM26dYh8NdvMOkMnJXzE8L6cikFuR4JwyMU5NKofQkWyxJKlTT4fNjmcnibTvklV8oVMrn+g==} - engines: {node: '>=16.13'} - hasBin: true - requiresBuild: true - dependencies: - '@prisma/engines': 5.19.0 - optionalDependencies: - fsevents: 2.3.3 - - /prisma@5.4.1: - resolution: {integrity: sha512-op9PmU8Bcw5dNAas82wBYTG0yHnpq9/O3bhxbDBrNzwZTwBqsVCxxYRLf6wHNh9HVaDGhgjjHlu1+BcW8qdnBg==} - engines: {node: '>=16.13'} -======= - /prisma-kysely@1.8.0: - resolution: {integrity: sha512-VpNpolZ8RXRgfU+j4R+fPZmX8EE95w3vJ2tt7+FwuiQc0leNTfLK5QLf3KbbPDes2rfjh3g20AjDxefQIo5GIA==} - hasBin: true - dependencies: - '@mrleebo/prisma-ast': 0.7.0 - '@prisma/generator-helper': 5.3.1 - '@prisma/internals': 5.3.1 - typescript: 5.8.3 - zod: 3.25.76 - transitivePeerDependencies: - - encoding - - supports-color - dev: true - /prisma@6.14.0(typescript@5.5.4): resolution: {integrity: sha512-QEuCwxu+Uq9BffFw7in8In+WfbSUN0ewnaSUKloLkbJd42w6EyFckux4M0f7VwwHlM3A8ssaz4OyniCXlsn0WA==} engines: {node: '>=18.18'} ->>>>>>> theirs hasBin: true requiresBuild: true peerDependencies: From 75aa9d8a5e4a9cd812ce61307ffb18d61fb9cd50 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Wed, 27 Aug 2025 16:35:50 +0100 Subject: [PATCH 9/9] Log errors for very slow queries --- apps/webapp/app/db.server.ts | 31 +++++++-- apps/webapp/app/env.server.ts | 2 + .../utils/queryPerformanceMonitor.server.ts | 64 +++++++++++++++++++ 3 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 apps/webapp/app/utils/queryPerformanceMonitor.server.ts diff --git a/apps/webapp/app/db.server.ts b/apps/webapp/app/db.server.ts index aa12a67911..47b67a1a40 100644 --- a/apps/webapp/app/db.server.ts +++ b/apps/webapp/app/db.server.ts @@ -15,6 +15,7 @@ import { isValidDatabaseUrl } from "./utils/db"; import { singleton } from "./utils/singleton"; import { startActiveSpan } from "./v3/tracer.server"; import { Span } from "@opentelemetry/api"; +import { queryPerformanceMonitor } from "./utils/queryPerformanceMonitor.server"; export type { PrismaTransactionClient, @@ -153,13 +154,19 @@ function getClient() { }, ] : []) satisfies Prisma.LogDefinition[]), - // verbose - ...((process.env.VERBOSE_PRISMA_LOGS === "1" + // Query performance monitoring + ...((process.env.VERBOSE_PRISMA_LOGS === "1" || + process.env.VERY_SLOW_QUERY_THRESHOLD_MS !== undefined ? [ { emit: "event", level: "query", }, + ] + : []) satisfies Prisma.LogDefinition[]), + // verbose + ...((process.env.VERBOSE_PRISMA_LOGS === "1" + ? [ { emit: "stdout", level: "query", @@ -206,6 +213,11 @@ function getClient() { }); } + // Add query performance monitoring + client.$on("query", (log) => { + queryPerformanceMonitor.onQuery("writer", log); + }); + // connect eagerly client.$connect(); @@ -265,13 +277,19 @@ function getReplicaClient() { }, ] : []) satisfies Prisma.LogDefinition[]), - // verbose - ...((process.env.VERBOSE_PRISMA_LOGS === "1" + // Query performance monitoring + ...((process.env.VERBOSE_PRISMA_LOGS === "1" || + process.env.VERY_SLOW_QUERY_THRESHOLD_MS !== undefined ? [ { emit: "event", level: "query", }, + ] + : []) satisfies Prisma.LogDefinition[]), + // verbose + ...((process.env.VERBOSE_PRISMA_LOGS === "1" + ? [ { emit: "stdout", level: "query", @@ -317,6 +335,11 @@ function getReplicaClient() { }); } + // Add query performance monitoring for replica client + replicaClient.$on("query", (log) => { + queryPerformanceMonitor.onQuery("replica", log); + }); + // connect eagerly replicaClient.$connect(); diff --git a/apps/webapp/app/env.server.ts b/apps/webapp/app/env.server.ts index cf53fb4176..0b488b82eb 100644 --- a/apps/webapp/app/env.server.ts +++ b/apps/webapp/app/env.server.ts @@ -1080,6 +1080,8 @@ const EnvironmentSchema = z.object({ AI_RUN_FILTER_MODEL: z.string().optional(), EVENT_LOOP_MONITOR_THRESHOLD_MS: z.coerce.number().int().default(100), + + VERY_SLOW_QUERY_THRESHOLD_MS: z.coerce.number().int().optional(), }); export type Environment = z.infer; diff --git a/apps/webapp/app/utils/queryPerformanceMonitor.server.ts b/apps/webapp/app/utils/queryPerformanceMonitor.server.ts new file mode 100644 index 0000000000..69a11f22b3 --- /dev/null +++ b/apps/webapp/app/utils/queryPerformanceMonitor.server.ts @@ -0,0 +1,64 @@ +import { env } from "~/env.server"; +import { logger } from "~/services/logger.server"; + +export interface QueryPerformanceConfig { + verySlowQueryThreshold?: number; // ms + maxQueryLogLength: number; +} + +export class QueryPerformanceMonitor { + private config: QueryPerformanceConfig; + + constructor(config: Partial = {}) { + this.config = { + maxQueryLogLength: 1000, + ...config, + }; + } + + onQuery( + clientType: "writer" | "replica", + log: { + duration: number; + query: string; + params: string; + target: string; + timestamp: Date; + } + ) { + if (this.config.verySlowQueryThreshold === undefined) { + return; + } + + const { duration, query, params, target, timestamp } = log; + + // Only log very slow queries as errors + if (duration > this.config.verySlowQueryThreshold) { + // Truncate long queries for readability + const truncatedQuery = + query.length > this.config.maxQueryLogLength + ? query.substring(0, this.config.maxQueryLogLength) + "..." + : query; + + logger.error("Prisma: very slow database query", { + clientType, + durationMs: duration, + query: truncatedQuery, + target, + timestamp, + paramCount: this.countParams(query), + hasParams: params !== "[]" && params !== "", + }); + } + } + + private countParams(query: string): number { + // Count the number of $1, $2, etc. parameters in the query + const paramMatches = query.match(/\$\d+/g); + return paramMatches ? paramMatches.length : 0; + } +} + +export const queryPerformanceMonitor = new QueryPerformanceMonitor({ + verySlowQueryThreshold: env.VERY_SLOW_QUERY_THRESHOLD_MS, +});