From 319ca6944d283503cf9c7e505bdee7541bbbe5d6 Mon Sep 17 00:00:00 2001 From: Marukome0743 Date: Mon, 16 Jun 2025 13:06:44 +0900 Subject: [PATCH 1/9] chore: sort the package.json dependencies --- apps/api/package.json | 22 +++++++++++----------- apps/dokploy/package.json | 8 ++++---- apps/schedules/package.json | 24 ++++++++++++------------ package.json | 12 ++++++------ packages/server/package.json | 24 ++++++++++++------------ 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/apps/api/package.json b/apps/api/package.json index 56ea5695..65f9d4ad 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -9,25 +9,25 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "pino": "9.4.0", - "pino-pretty": "11.2.2", - "@hono/zod-validator": "0.3.0", - "zod": "^3.23.4", - "react": "18.2.0", - "react-dom": "18.2.0", "@dokploy/server": "workspace:*", "@hono/node-server": "^1.12.1", - "hono": "^4.5.8", + "@hono/zod-validator": "0.3.0", + "@nerimity/mimiqueue": "1.2.3", "dotenv": "^16.3.1", + "hono": "^4.5.8", + "pino": "9.4.0", + "pino-pretty": "11.2.2", + "react": "18.2.0", + "react-dom": "18.2.0", "redis": "4.7.0", - "@nerimity/mimiqueue": "1.2.3" + "zod": "^3.23.4" }, "devDependencies": { - "typescript": "^5.4.2", + "@types/node": "^20.11.17", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.15", - "@types/node": "^20.11.17", - "tsx": "^4.7.1" + "tsx": "^4.7.1", + "typescript": "^5.4.2" }, "packageManager": "pnpm@9.5.0" } diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index e62b1c9f..0b87dde3 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -36,8 +36,6 @@ "test": "vitest --config __test__/vitest.config.ts" }, "dependencies": { - "pino": "9.4.0", - "pino-pretty": "11.2.2", "@ai-sdk/anthropic": "^1.0.6", "@ai-sdk/azure": "^1.0.15", "@ai-sdk/cohere": "^1.0.6", @@ -127,6 +125,8 @@ "octokit": "3.1.2", "ollama-ai-provider": "^1.1.0", "otpauth": "^9.2.3", + "pino": "9.4.0", + "pino-pretty": "11.2.2", "postgres": "3.4.4", "public-ip": "6.0.2", "qrcode": "^1.5.3", @@ -147,13 +147,13 @@ "swagger-ui-react": "^5.17.14", "tailwind-merge": "^2.2.0", "tailwindcss-animate": "^1.0.7", + "toml": "3.0.0", "undici": "^6.19.2", "use-resize-observer": "9.1.0", "ws": "8.16.0", "xterm-addon-fit": "^0.8.0", "zod": "^3.23.4", - "zod-form-data": "^2.0.2", - "toml": "3.0.0" + "zod-form-data": "^2.0.2" }, "devDependencies": { "@types/adm-zip": "^0.5.5", diff --git a/apps/schedules/package.json b/apps/schedules/package.json index 0a869fb0..c7f458d2 100644 --- a/apps/schedules/package.json +++ b/apps/schedules/package.json @@ -8,26 +8,26 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "drizzle-orm": "^0.39.1", - "ioredis": "5.4.1", - "bullmq": "5.4.2", - "@hono/zod-validator": "0.3.0", - "zod": "^3.23.4", - "react": "18.2.0", - "react-dom": "18.2.0", "@dokploy/server": "workspace:*", "@hono/node-server": "^1.12.1", - "hono": "^4.5.8", + "@hono/zod-validator": "0.3.0", + "bullmq": "5.4.2", "dotenv": "^16.3.1", + "drizzle-orm": "^0.39.1", + "hono": "^4.5.8", + "ioredis": "5.4.1", "pino": "9.4.0", - "pino-pretty": "11.2.2" + "pino-pretty": "11.2.2", + "react": "18.2.0", + "react-dom": "18.2.0", + "zod": "^3.23.4" }, "devDependencies": { - "typescript": "^5.4.2", + "@types/node": "^20.11.17", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.15", - "@types/node": "^20.11.17", - "tsx": "^4.7.1" + "tsx": "^4.7.1", + "typescript": "^5.4.2" }, "packageManager": "pnpm@9.5.0" } diff --git a/package.json b/package.json index 317a7e98..53ff0064 100644 --- a/package.json +++ b/package.json @@ -20,15 +20,15 @@ "format-and-lint:fix": "biome check . --write" }, "devDependencies": { - "dotenv": "16.4.5", - "esbuild": "0.20.2", - "tsx": "4.16.2", - "lint-staged": "^15.2.7", "@biomejs/biome": "1.9.4", - "lefthook": "1.8.4", "@commitlint/cli": "^19.3.0", "@commitlint/config-conventional": "^19.2.2", - "@types/node": "^18.17.0" + "@types/node": "^18.17.0", + "dotenv": "16.4.5", + "esbuild": "0.20.2", + "lefthook": "1.8.4", + "lint-staged": "^15.2.7", + "tsx": "4.16.2" }, "packageManager": "pnpm@9.5.0", "engines": { diff --git a/packages/server/package.json b/packages/server/package.json index a124518a..782d67a0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -28,9 +28,6 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "pino": "9.4.0", - "pino-pretty": "11.2.2", - "micromatch": "4.0.8", "@ai-sdk/anthropic": "^1.0.6", "@ai-sdk/azure": "^1.0.15", "@ai-sdk/cohere": "^1.0.6", @@ -39,27 +36,29 @@ "@ai-sdk/openai": "^1.0.12", "@ai-sdk/openai-compatible": "^0.0.13", "@better-auth/utils": "0.2.4", - "@oslojs/encoding": "1.1.0", - "@oslojs/crypto": "1.0.1", - "drizzle-dbml-generator": "0.10.0", - "better-auth": "v1.2.8-beta.7", "@faker-js/faker": "^8.4.1", "@octokit/auth-app": "^6.0.4", + "@octokit/rest": "^20.0.2", + "@oslojs/crypto": "1.0.1", + "@oslojs/encoding": "1.1.0", "@react-email/components": "^0.0.21", "@trpc/server": "^10.43.6", "adm-zip": "^0.5.14", "ai": "^4.0.23", "bcrypt": "5.1.1", + "better-auth": "v1.2.8-beta.7", "bl": "6.0.11", "boxen": "^7.1.1", "date-fns": "3.6.0", "dockerode": "4.0.2", "dotenv": "16.4.5", + "drizzle-dbml-generator": "0.10.0", "drizzle-orm": "^0.39.1", "drizzle-zod": "0.5.1", "hi-base32": "^0.5.1", "js-yaml": "4.1.0", "lodash": "4.17.21", + "micromatch": "4.0.8", "nanoid": "3", "node-os-utils": "1.3.7", "node-pty": "1.0.0", @@ -68,6 +67,8 @@ "octokit": "3.1.2", "ollama-ai-provider": "^1.1.0", "otpauth": "^9.2.3", + "pino": "9.4.0", + "pino-pretty": "11.2.2", "postgres": "3.4.4", "public-ip": "6.0.2", "qrcode": "^1.5.3", @@ -75,19 +76,18 @@ "react-dom": "18.2.0", "rotating-file-stream": "3.2.3", "slugify": "^1.6.6", - "ws": "8.16.0", - "zod": "^3.23.4", "ssh2": "1.15.0", - "@octokit/rest": "^20.0.2", - "toml": "3.0.0" + "toml": "3.0.0", + "ws": "8.16.0", + "zod": "^3.23.4" }, "devDependencies": { - "@types/micromatch": "4.0.9", "@types/adm-zip": "^0.5.5", "@types/bcrypt": "5.0.2", "@types/dockerode": "3.3.23", "@types/js-yaml": "4.0.9", "@types/lodash": "4.17.4", + "@types/micromatch": "4.0.9", "@types/node": "^18.17.0", "@types/node-os-utils": "1.3.4", "@types/node-schedule": "2.1.6", From 45a178e7055c996a369fa82ba3ae29b3fbeda2d3 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sat, 21 Jun 2025 23:58:27 -0600 Subject: [PATCH 2/9] chore: update version in package.json to v0.23.0 --- apps/dokploy/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 0b87dde3..dd35e837 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.22.7", + "version": "v0.23.0", "private": true, "license": "Apache-2.0", "type": "module", From da52d767eb33d9bd5fa7f93db93e9bf60447ca69 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 22 Jun 2025 00:52:45 -0600 Subject: [PATCH 3/9] refactor(git_provider): update userId assignment to use owner_id from organization table - Changed the SQL update statement to directly select the owner_id from the organization table instead of joining with the account table, simplifying the query. --- apps/dokploy/drizzle/0094_numerous_carmella_unuscione.sql | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/dokploy/drizzle/0094_numerous_carmella_unuscione.sql b/apps/dokploy/drizzle/0094_numerous_carmella_unuscione.sql index 5f259a44..216c4318 100644 --- a/apps/dokploy/drizzle/0094_numerous_carmella_unuscione.sql +++ b/apps/dokploy/drizzle/0094_numerous_carmella_unuscione.sql @@ -1,12 +1,11 @@ ALTER TABLE "git_provider" ADD COLUMN "userId" text;--> statement-breakpoint -- Update existing git providers to be owned by the organization owner --- We need to get the account.user_id for the organization owner +-- We can get the owner_id directly from the organization table UPDATE "git_provider" SET "userId" = ( - SELECT a.user_id + SELECT o."owner_id" FROM "organization" o - JOIN "account" a ON o."owner_id" = a.user_id WHERE o.id = "git_provider"."organizationId" );--> statement-breakpoint From f35d084dd4e1eefa3b7bc3cad68517c725d45605 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 22 Jun 2025 00:58:00 -0600 Subject: [PATCH 4/9] chore: update version in package.json to v0.23.1 --- apps/dokploy/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index dd35e837..fbb833fc 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.23.0", + "version": "v0.23.1", "private": true, "license": "Apache-2.0", "type": "module", From fa16cfec2afce4ac3d77ddcf23fb693f8a5dd42b Mon Sep 17 00:00:00 2001 From: nikolajjsj <10490273+nikolajjsj@users.noreply.github.com> Date: Sun, 22 Jun 2025 15:10:57 +0200 Subject: [PATCH 5/9] feat(scripts): add script to reset 2fa for admin Similar style to existing reset-password script --- apps/dokploy/reset-2fa.ts | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 apps/dokploy/reset-2fa.ts diff --git a/apps/dokploy/reset-2fa.ts b/apps/dokploy/reset-2fa.ts new file mode 100644 index 00000000..573f31d7 --- /dev/null +++ b/apps/dokploy/reset-2fa.ts @@ -0,0 +1,27 @@ +import { findAdmin } from "@dokploy/server"; +import { db } from "@dokploy/server/db"; +import { users_temp } from "@dokploy/server/db/schema"; +import { eq } from "drizzle-orm"; + +(async () => { + try { + const result = await findAdmin(); + + const update = await db + .update(users_temp) + .set({ + twoFactorEnabled: false, + }) + .where(eq(users_temp.id, result.userId)); + + if (update) { + console.log("2FA reset successful"); + } else { + console.log("Password reset failed"); + } + + process.exit(0); + } catch (error) { + console.log("Error resetting 2FA", error); + } +})(); From db8a4e6edf94186fda1df70675945b03caab5e16 Mon Sep 17 00:00:00 2001 From: nikolajjsj <10490273+nikolajjsj@users.noreply.github.com> Date: Sun, 22 Jun 2025 15:11:12 +0200 Subject: [PATCH 6/9] feat(scripts): add command to run reset-2fa script --- apps/dokploy/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index fbb833fc..84180c8c 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -11,6 +11,7 @@ "build-next": "next build", "setup": "tsx -r dotenv/config setup.ts && sleep 5 && pnpm run migration:run", "reset-password": "node -r dotenv/config dist/reset-password.mjs", + "reset-2fa": "node -r dotenv/config dist/reset-2fa.mjs", "dev": "tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json ", "dev-turbopack": "TURBOPACK=1 tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json", "studio": "drizzle-kit studio --config ./server/db/drizzle.config.ts", From f7fd77f7e9fd06a8d2d7ac6984d92253ef369107 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 22 Jun 2025 08:31:46 -0600 Subject: [PATCH 7/9] fix: simplify useEffect condition in ShowEnvironment component --- .../components/dashboard/application/environment/show.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/components/dashboard/application/environment/show.tsx b/apps/dokploy/components/dashboard/application/environment/show.tsx index 35ddc51b..6f504959 100644 --- a/apps/dokploy/components/dashboard/application/environment/show.tsx +++ b/apps/dokploy/components/dashboard/application/environment/show.tsx @@ -49,7 +49,7 @@ export const ShowEnvironment = ({ applicationId }: Props) => { currentBuildArgs !== (data?.buildArgs || ""); useEffect(() => { - if (data && !hasChanges) { + if (data) { form.reset({ env: data.env || "", buildArgs: data.buildArgs || "", From b74d3995ee2f662c6d3c27a134e4c6b283514d63 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 22 Jun 2025 08:32:20 -0600 Subject: [PATCH 8/9] chore: update version in package.json to v0.23.2 --- apps/dokploy/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index fbb833fc..03ecb572 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.23.1", + "version": "v0.23.2", "private": true, "license": "Apache-2.0", "type": "module", From fca537ee400e9939e4383866dcf68da66d485e0f Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 22 Jun 2025 08:40:13 -0600 Subject: [PATCH 9/9] feat(esbuild): add entry point for reset-2fa script --- apps/dokploy/esbuild.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/dokploy/esbuild.config.ts b/apps/dokploy/esbuild.config.ts index 9e6469ca..91854d94 100644 --- a/apps/dokploy/esbuild.config.ts +++ b/apps/dokploy/esbuild.config.ts @@ -21,6 +21,7 @@ try { entryPoints: { server: "server/server.ts", "reset-password": "reset-password.ts", + "reset-2fa": "reset-2fa.ts", }, bundle: true, platform: "node",