diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 798a871a3..926d2ead7 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -110,7 +110,7 @@ "date-fns": "3.6.0", "dockerode": "4.0.2", "dotenv": "16.4.5", - "drizzle-orm": "0.41.0", + "drizzle-orm": "catalog:", "drizzle-zod": "0.8.3", "fancy-ansi": "^0.1.3", "input-otp": "^1.4.2", diff --git a/apps/schedules/package.json b/apps/schedules/package.json index 51f27773c..6fc4b09ff 100644 --- a/apps/schedules/package.json +++ b/apps/schedules/package.json @@ -1,37 +1,37 @@ { - "name": "@dokploy/schedules", - "type": "module", - "scripts": { - "dev": "PORT=4001 tsx watch src/index.ts", - "build": "tsc --project tsconfig.json", - "start": "node dist/index.js", - "typecheck": "tsc --noEmit" - }, - "dependencies": { - "@dokploy/server": "workspace:*", - "@hono/node-server": "^1.14.3", - "@hono/zod-validator": "0.3.0", - "bullmq": "5.67.3", - "dotenv": "^16.4.5", - "drizzle-orm": "0.41.0", - "hono": "^4.11.7", - "ioredis": "5.4.1", - "pino": "9.4.0", - "pino-pretty": "11.2.2", - "react": "18.2.0", - "react-dom": "18.2.0", - "zod": "^4.3.6" - }, - "devDependencies": { - "@types/node": "^24.4.0", - "@types/react": "^18.3.5", - "@types/react-dom": "^18.3.0", - "tsx": "^4.16.2", - "typescript": "^5.8.3" - }, - "packageManager": "pnpm@10.22.0", - "engines": { - "node": "^24.4.0", - "pnpm": ">=10.22.0" - } -} + "name": "@dokploy/schedules", + "type": "module", + "scripts": { + "dev": "PORT=4001 tsx watch src/index.ts", + "build": "tsc --project tsconfig.json", + "start": "node dist/index.js", + "typecheck": "tsc --noEmit" + }, + "dependencies": { + "@dokploy/server": "workspace:*", + "@hono/node-server": "^1.14.3", + "@hono/zod-validator": "0.3.0", + "bullmq": "5.67.3", + "dotenv": "^16.4.5", + "drizzle-orm": "catalog:", + "hono": "^4.11.7", + "ioredis": "5.4.1", + "pino": "9.4.0", + "pino-pretty": "11.2.2", + "react": "18.2.0", + "react-dom": "18.2.0", + "zod": "^4.3.6" + }, + "devDependencies": { + "@types/node": "^24.4.0", + "@types/react": "^18.3.5", + "@types/react-dom": "^18.3.0", + "tsx": "^4.16.2", + "typescript": "^5.8.3" + }, + "packageManager": "pnpm@10.22.0", + "engines": { + "node": "^24.4.0", + "pnpm": ">=10.22.0" + } +} \ No newline at end of file diff --git a/apps/schedules/src/utils.ts b/apps/schedules/src/utils.ts index 855cfdeab..b9132280e 100644 --- a/apps/schedules/src/utils.ts +++ b/apps/schedules/src/utils.ts @@ -15,13 +15,14 @@ import { runVolumeBackup, } from "@dokploy/server"; import { + and, backups, db, + eq, schedules, server, volumeBackups, } from "@dokploy/server/db"; -import { and, eq } from "drizzle-orm"; import { logger } from "./logger.js"; import { scheduleJob } from "./queue.js"; import type { QueueJob } from "./schema.js"; diff --git a/packages/server/package.json b/packages/server/package.json index 334ddc147..bdb6b640b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -57,7 +57,7 @@ "dockerode": "4.0.2", "dotenv": "16.4.5", "drizzle-dbml-generator": "0.10.0", - "drizzle-orm": "0.41.0", + "drizzle-orm": "catalog:", "drizzle-zod": "0.5.1", "yaml": "2.8.1", "lodash": "4.17.21", diff --git a/packages/server/src/db/index.ts b/packages/server/src/db/index.ts index 14db4f066..7a5d19267 100644 --- a/packages/server/src/db/index.ts +++ b/packages/server/src/db/index.ts @@ -1,8 +1,10 @@ +import { and, eq } from "drizzle-orm"; import { drizzle, type PostgresJsDatabase } from "drizzle-orm/postgres-js"; import postgres from "postgres"; import { dbUrl } from "./constants"; import * as schema from "./schema"; +export { and, eq }; export * from "./schema"; declare global { diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 4b3c22cb5..bae3b9b68 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -3,3 +3,7 @@ packages: - "apps/dokploy" - "apps/schedules" - "packages/server" + +# Single source of truth for shared dependency versions (use in package.json: "drizzle-orm": "catalog:") +catalog: + drizzle-orm: "0.41.0"