refactor: rename builders to server

packages/builders/tsconfig.json

@@ -1,43 +0,0 @@
-{
-  "compilerOptions": {
-    /* Base Options: */
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "target": "es2022",
-    "allowJs": true,
-    "resolveJsonModule": true,
-    "moduleDetection": "force",
-    "isolatedModules": true,
-    /* Strictness */
-    "strict": true,
-    "noUncheckedIndexedAccess": true,
-    "checkJs": true,
-
-    /* Bundled projects */
-    "lib": ["dom", "dom.iterable", "ES2022"],
-    "noEmit": true,
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
-    "jsx": "preserve",
-    "plugins": [{ "name": "next" }],
-    "incremental": true,
-    "outDir": "./dist",
-    /* Path Aliases */
-    "baseUrl": ".",
-    "paths": {
-      "@/server/*": ["./src/*"]
-    }
-  },
-
-  "include": ["next-env.d.ts", "./src/**/*.ts"],
-  "exclude": [
-    "tsup.ts",
-    "node_modules",
-    "dokploy",
-    "config",
-    "dist",
-    "webpack.config.server.js",
-    "migration.ts",
-    "setup.ts"
-  ]
-}

packages/builders/tsconfig.server.json

@@ -1,25 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "ESNext",
-    "outDir": "dist/",
-    "target": "ESNext",
-    "isolatedModules": false,
-    "noEmit": false,
-    "declaration": true,
-    "moduleResolution": "Node",
-    "rootDir": "./src",
-    "baseUrl": ".",
-    "incremental": false,
-    "jsx": "react-jsx",
-    "paths": {
-      "@/server/*": ["src/*"]
-    }
-  },
-  "include": ["next-env.d.ts", "./src/**/*"],
-  "exclude": ["**/dist", "tsup.ts"],
-  "tsc-alias": {
-    "resolveFullPaths": true,
-    "verbose": false
-  }
-}

packages/server/package.json

@@ -1,5 +1,5 @@
 {
-	"name": "@dokploy/builders",
+	"name": "@dokploy/server",
 	"version": "1.0.0",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

packages/server/src/auth/auth.ts

@@ -1,11 +1,11 @@
 import { webcrypto } from "node:crypto";
 import type { IncomingMessage, ServerResponse } from "node:http";
+import { findAdminByAuthId } from "@/server/services/admin";
+import { findUserByAuthId } from "@/server/services/user";
 import { DrizzlePostgreSQLAdapter } from "@lucia-auth/adapter-drizzle";
 import { TimeSpan } from "lucia";
 import { Lucia } from "lucia/dist/core.js";
 import type { Session, User } from "lucia/dist/core.js";
-import { findAdminByAuthId } from "@/server/services/admin";
-import { findUserByAuthId } from "@/server/services/user";
 import { db } from "../db";
 import { type DatabaseUser, auth, sessionTable } from "../db/schema";
 

packages/server/src/auth/token.ts

@@ -1,9 +1,9 @@
 import type { IncomingMessage } from "node:http";
 import { TimeSpan } from "lucia";
 import { Lucia } from "lucia/dist/core.js";
-import { type ReturnValidateToken, adapter } from "./auth";
 import { findAdminByAuthId } from "../services/admin";
 import { findUserByAuthId } from "../services/user";
+import { type ReturnValidateToken, adapter } from "./auth";
 
 export const luciaToken = new Lucia(adapter, {
 	sessionCookie: {

packages/server/src/db/schema/admin.ts

@@ -6,8 +6,8 @@ import { z } from "zod";
 import { auth } from "./auth";
 import { registry } from "./registry";
 import { certificateType } from "./shared";
-import { users } from "./user";
 import { sshKeys } from "./ssh-key";
+import { users } from "./user";
 
 export const admins = pgTable("admin", {
 	adminId: text("adminId")

packages/server/src/db/schema/application.ts

@@ -10,21 +10,21 @@ import {
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
+import { bitbucket } from "./bitbucket";
 import { deployments } from "./deployment";
 import { domains } from "./domain";
+import { github } from "./github";
+import { gitlab } from "./gitlab";
 import { mounts } from "./mount";
 import { ports } from "./port";
 import { projects } from "./project";
 import { redirects } from "./redirects";
 import { registry } from "./registry";
 import { security } from "./security";
+import { server } from "./server";
 import { applicationStatus } from "./shared";
 import { sshKeys } from "./ssh-key";
 import { generateAppName } from "./utils";
-import { github } from "./github";
-import { gitlab } from "./gitlab";
-import { bitbucket } from "./bitbucket";
-import { server } from "./server";
 
 export const sourceType = pgEnum("sourceType", [
 	"docker",

packages/server/src/db/schema/compose.ts

@@ -1,19 +1,19 @@
-import { sshKeys } from "./ssh-key";
 import { relations } from "drizzle-orm";
 import { boolean, integer, pgEnum, pgTable, text } from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
+import { bitbucket } from "./bitbucket";
 import { deployments } from "./deployment";
 import { domains } from "./domain";
-import { mounts } from "./mount";
-import { projects } from "./project";
-import { applicationStatus } from "./shared";
-import { generateAppName } from "./utils";
 import { github } from "./github";
 import { gitlab } from "./gitlab";
-import { bitbucket } from "./bitbucket";
+import { mounts } from "./mount";
+import { projects } from "./project";
 import { server } from "./server";
+import { applicationStatus } from "./shared";
+import { sshKeys } from "./ssh-key";
+import { generateAppName } from "./utils";
 
 export const sourceTypeCompose = pgEnum("sourceTypeCompose", [
 	"git",

packages/server/src/db/schema/domain.ts

@@ -1,4 +1,3 @@
-import { domain } from "../validations/domain";
 import { relations } from "drizzle-orm";
 import {
 	boolean,
@@ -11,6 +10,7 @@ import {
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
+import { domain } from "../validations/domain";
 import { applications } from "./application";
 import { compose } from "./compose";
 import { certificateType } from "./shared";

packages/server/src/db/schema/git-provider.ts

@@ -3,10 +3,10 @@ import { pgEnum, pgTable, text } from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
+import { admins } from "./admin";
 import { bitbucket } from "./bitbucket";
 import { github } from "./github";
 import { gitlab } from "./gitlab";
-import { admins } from "./admin";
 
 export const gitProviderType = pgEnum("gitProviderType", [
 	"github",

packages/server/src/db/schema/server.ts

@@ -5,16 +5,16 @@ import { nanoid } from "nanoid";
 import { z } from "zod";
 
 import { admins } from "./admin";
-import { deployments } from "./deployment";
-import { sshKeys } from "./ssh-key";
-import { generateAppName } from "./utils";
 import { applications } from "./application";
 import { compose } from "./compose";
+import { deployments } from "./deployment";
 import { mariadb } from "./mariadb";
 import { mongo } from "./mongo";
 import { mysql } from "./mysql";
 import { postgres } from "./postgres";
 import { redis } from "./redis";
+import { sshKeys } from "./ssh-key";
+import { generateAppName } from "./utils";
 
 export const server = pgTable("server", {
 	serverId: text("serverId")

packages/server/src/db/schema/ssh-key.ts

@@ -1,12 +1,12 @@
-import { applications } from "./application";
-import { compose } from "./compose";
-import { sshKeyCreate, sshKeyType } from "../validations";
 import { relations } from "drizzle-orm";
 import { pgTable, text } from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
-import { server } from "./server";
+import { sshKeyCreate, sshKeyType } from "../validations";
 import { admins } from "./admin";
+import { applications } from "./application";
+import { compose } from "./compose";
+import { server } from "./server";
 
 export const sshKeys = pgTable("ssh-key", {
 	sshKeyId: text("sshKeyId")

packages/server/src/services/application.ts

@@ -3,6 +3,7 @@ import { db } from "@/server/db";
 import { type apiCreateApplication, applications } from "@/server/db/schema";
 import { generateAppName } from "@/server/db/schema";
 import { getAdvancedStats } from "@/server/monitoring/utilts";
+import { generatePassword } from "@/server/templates/utils";
 import {
 	buildApplication,
 	getBuildCommand,
@@ -32,7 +33,6 @@ import {
 	getGitlabCloneCommand,
 } from "@/server/utils/providers/gitlab";
 import { createTraefikConfig } from "@/server/utils/traefik/application";
-import { generatePassword } from "@/server/templates/utils";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
 import { getDokployUrl } from "./admin";

packages/server/src/services/compose.ts

@@ -3,6 +3,7 @@ import { paths } from "@/server/constants";
 import { db } from "@/server/db";
 import { type apiCreateCompose, compose } from "@/server/db/schema";
 import { generateAppName } from "@/server/db/schema";
+import { generatePassword } from "@/server/templates/utils";
 import {
 	buildCompose,
 	getBuildComposeCommand,
@@ -38,7 +39,6 @@ import {
 	createComposeFile,
 	getCreateComposeFileCommand,
 } from "@/server/utils/providers/raw";
-import { generatePassword } from "@/server/templates/utils";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
 import { getDokployUrl } from "./admin";

packages/server/src/services/domain.ts

@@ -1,9 +1,9 @@
 import { db } from "@/server/db";
-import { type apiCreateDomain, domains } from "../db/schema";
-import { manageDomain } from "@/server/utils/traefik/domain";
 import { generateRandomDomain } from "@/server/templates/utils";
+import { manageDomain } from "@/server/utils/traefik/domain";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
+import { type apiCreateDomain, domains } from "../db/schema";
 import { findAdmin, findAdminById } from "./admin";
 import { findApplicationById } from "./application";
 import { findServerById } from "./server";

packages/server/src/services/mariadb.ts

@@ -1,9 +1,9 @@
 import { db } from "@/server/db";
 import { type apiCreateMariaDB, backups, mariadb } from "@/server/db/schema";
 import { generateAppName } from "@/server/db/schema";
+import { generatePassword } from "@/server/templates/utils";
 import { buildMariadb } from "@/server/utils/databases/mariadb";
 import { pullImage } from "@/server/utils/docker/utils";
-import { generatePassword } from "@/server/templates/utils";
 import { TRPCError } from "@trpc/server";
 import { eq, getTableColumns } from "drizzle-orm";
 import { validUniqueServerAppName } from "./project";

packages/server/src/services/mongo.ts

@@ -1,9 +1,9 @@
 import { db } from "@/server/db";
 import { type apiCreateMongo, backups, mongo } from "@/server/db/schema";
 import { generateAppName } from "@/server/db/schema";
+import { generatePassword } from "@/server/templates/utils";
 import { buildMongo } from "@/server/utils/databases/mongo";
 import { pullImage } from "@/server/utils/docker/utils";
-import { generatePassword } from "@/server/templates/utils";
 import { TRPCError } from "@trpc/server";
 import { eq, getTableColumns } from "drizzle-orm";
 import { validUniqueServerAppName } from "./project";

packages/server/src/services/mysql.ts

@@ -1,9 +1,9 @@
 import { db } from "@/server/db";
 import { type apiCreateMySql, backups, mysql } from "@/server/db/schema";
 import { generateAppName } from "@/server/db/schema";
+import { generatePassword } from "@/server/templates/utils";
 import { buildMysql } from "@/server/utils/databases/mysql";
 import { pullImage } from "@/server/utils/docker/utils";
-import { generatePassword } from "@/server/templates/utils";
 import { TRPCError } from "@trpc/server";
 import { eq, getTableColumns } from "drizzle-orm";
 import { validUniqueServerAppName } from "./project";

packages/server/src/services/postgres.ts

@@ -1,9 +1,9 @@
 import { db } from "@/server/db";
 import { type apiCreatePostgres, backups, postgres } from "@/server/db/schema";
 import { generateAppName } from "@/server/db/schema";
+import { generatePassword } from "@/server/templates/utils";
 import { buildPostgres } from "@/server/utils/databases/postgres";
 import { pullImage } from "@/server/utils/docker/utils";
-import { generatePassword } from "@/server/templates/utils";
 import { TRPCError } from "@trpc/server";
 import { eq, getTableColumns } from "drizzle-orm";
 import { validUniqueServerAppName } from "./project";

packages/server/src/services/redis.ts

@@ -1,9 +1,9 @@
 import { db } from "@/server/db";
 import { type apiCreateRedis, redis } from "@/server/db/schema";
 import { generateAppName } from "@/server/db/schema";
+import { generatePassword } from "@/server/templates/utils";
 import { buildRedis } from "@/server/utils/databases/redis";
 import { pullImage } from "@/server/utils/docker/utils";
-import { generatePassword } from "@/server/templates/utils";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
 import { validUniqueServerAppName } from "./project";