Merge pull request #603 from Dokploy/fix/start-schedules-and-server

fix(server): update build paths

Dockerfile

@@ -15,7 +15,6 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 # Deploy only the dokploy app
 
 ENV NODE_ENV=production
-RUN pnpm --filter=@dokploy/server switch:prod
 RUN pnpm --filter=@dokploy/server build
 RUN pnpm --filter=./apps/dokploy run build
 

Dockerfile.cloud

@@ -17,7 +17,6 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server
 ARG NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
 ENV NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=$NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
 ENV NODE_ENV=production
-RUN pnpm --filter=@dokploy/server switch:prod
 RUN pnpm --filter=@dokploy/server build
 RUN pnpm --filter=./apps/dokploy run build
 

Dockerfile.schedule

@@ -15,7 +15,6 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server
 # Deploy only the dokploy app
 
 ENV NODE_ENV=production
-RUN pnpm --filter=@dokploy/server switch:prod
 RUN pnpm --filter=@dokploy/server build
 RUN pnpm --filter=./apps/schedules run build
 

Dockerfile.server

@@ -15,7 +15,6 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server
 # Deploy only the dokploy app
 
 ENV NODE_ENV=production
-RUN pnpm --filter=@dokploy/server switch:prod
 RUN pnpm --filter=@dokploy/server build
 RUN pnpm --filter=./apps/api run build
 

apps/api/src/types.ts

@@ -1,16 +0,0 @@
-export interface LemonSqueezyLicenseResponse {
-	valid: boolean;
-	error?: string;
-	meta?: {
-		store_id: string;
-		order_id: number;
-		order_item_id: number;
-		product_id: number;
-		product_name: string;
-		variant_id: number;
-		variant_name: string;
-		customer_id: number;
-		customer_name: string;
-		customer_email: string;
-	};
-}

apps/api/src/utils.ts

@@ -1,45 +1,12 @@
 import {
-	deployApplication,
-	deployCompose,
 	deployRemoteApplication,
 	deployRemoteCompose,
-	rebuildApplication,
-	rebuildCompose,
 	rebuildRemoteApplication,
 	rebuildRemoteCompose,
 	updateApplicationStatus,
 	updateCompose,
-} from "@dokploy/server/dist";
+} from "@dokploy/server";
 import type { DeployJob } from "./schema";
-import type { LemonSqueezyLicenseResponse } from "./types";
-
-// const LEMON_SQUEEZY_API_KEY = process.env.LEMON_SQUEEZY_API_KEY;
-// const LEMON_SQUEEZY_STORE_ID = process.env.LEMON_SQUEEZY_STORE_ID;
-// export const validateLemonSqueezyLicense = async (
-// 	licenseKey: string,
-// ): Promise<LemonSqueezyLicenseResponse> => {
-// 	try {
-// 		const response = await fetch(
-// 			"https://api.lemonsqueezy.com/v1/licenses/validate",
-// 			{
-// 				method: "POST",
-// 				headers: {
-// 					"Content-Type": "application/json",
-// 					"x-api-key": LEMON_SQUEEZY_API_KEY as string,
-// 				},
-// 				body: JSON.stringify({
-// 					license_key: licenseKey,
-// 					store_id: LEMON_SQUEEZY_STORE_ID as string,
-// 				}),
-// 			},
-// 		);
-
-// 		return response.json();
-// 	} catch (error) {
-// 		console.error("Error validating license:", error);
-// 		return { valid: false, error: "Error validating license" };
-// 	}
-// };
 
 export const deploy = async (job: DeployJob) => {
 	try {

apps/schedules/src/utils.ts

@@ -8,7 +8,7 @@ import {
 	runMongoBackup,
 	runMySqlBackup,
 	runPostgresBackup,
-} from "@dokploy/server/dist";
+} from "@dokploy/server";
 import { db } from "@dokploy/server/dist/db";
 import { backups, server } from "@dokploy/server/dist/db/schema";
 import { eq } from "drizzle-orm";

biome.json

@@ -1,7 +1,14 @@
 {
 	"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
 	"files": {
-		"ignore": ["node_modules/**", ".next/**", "drizzle/**", ".docker", "dist"]
+		"ignore": [
+			"node_modules/**",
+			".next/**",
+			"drizzle/**",
+			".docker",
+			"dist",
+			"packages/server/package.json"
+		]
 	},
 	"organizeImports": {
 		"enabled": true

packages/server/package.json

@@ -16,22 +16,10 @@
     "./constants": {
       "import": "./src/constants/index.ts",
       "require": "./dist/constants.cjs.js"
-		},
-		"./dist": {
-			"import": "./dist/index.js",
-			"require": "./dist/index.cjs.js"
-		},
-		"./dist/db": {
-			"import": "./dist/db/index.js",
-			"require": "./dist/db/*.cjs"
-		},
-		"./dist/db/schema": {
-			"import": "./dist/db/schema/index.js",
-			"require": "./dist/db/schema/*.cjs"
     }
   },
   "scripts": {
-		"build": "rm -rf ./dist && tsc --project tsconfig.server.json && tsc-alias -p tsconfig.server.json",
+    "build": "npm run switch:prod && rm -rf ./dist && tsc --project tsconfig.server.json && tsc-alias -p tsconfig.server.json",
     "build:types": "tsc --emitDeclarationOnly --experimenta-dts",
     "switch:dev": "node scripts/switchToSrc.js",
     "switch:prod": "node scripts/switchToDist.js",

packages/server/scripts/switchToDist.js

@@ -8,6 +8,8 @@ const __dirname = path.dirname(__filename);
 const packagePath = path.resolve(__dirname, "../package.json");
 const pkg = JSON.parse(fs.readFileSync(packagePath, "utf-8"));
 
+pkg.main = "./dist/index.js";
+
 pkg.exports = {
 	".": {
 		import: "./dist/index.js",
@@ -21,6 +23,18 @@ pkg.exports = {
 		import: "./dist/*",
 		require: "./dist/*.cjs",
 	},
+	"./dist": {
+		import: "./dist/index.js",
+		require: "./dist/index.cjs.js",
+	},
+	"./dist/db": {
+		import: "./dist/db/index.js",
+		require: "./dist/db/index.cjs.js",
+	},
+	"./dist/db/schema": {
+		import: "./dist/db/schema/index.js",
+		require: "./dist/db/schema/index.cjs.js",
+	},
 };
 
 fs.writeFileSync(packagePath, JSON.stringify(pkg, null, 2));

packages/server/scripts/switchToSrc.js

@@ -10,6 +10,8 @@ const packagePath = path.resolve(__dirname, "../package.json");
 // Leer el archivo package.json
 const pkg = JSON.parse(fs.readFileSync(packagePath, "utf-8"));
 
+pkg.main = "./src/index.ts";
+
 // Modificar los exports
 pkg.exports = {
 	".": "./src/index.ts",
@@ -25,19 +27,6 @@ pkg.exports = {
 		import: "./src/constants/index.ts",
 		require: "./dist/constants.cjs.js",
 	},
-	"./dist": {
-		import: "./dist/index.js",
-		require: "./dist/index.cjs.js",
-	},
-
-	"./dist/db": {
-		import: "./dist/db/index.js",
-		require: "./dist/db/*.cjs",
-	},
-	"./dist/db/schema": {
-		import: "./dist/db/schema/index.js",
-		require: "./dist/db/schema/*.cjs",
-	},
 };
 
 // Guardar los cambios en package.json