From a965c0e924b2b3e5f268e2359c5c75446b10c9ec Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 12 Jan 2025 15:10:25 -0600 Subject: [PATCH] fix: add prefix and remove resolution esm flag (#1095) * fix: add prefix and remove resolution esm flag * refactor: revert --- apps/api/package.json | 2 +- apps/api/src/index.ts | 6 +++--- apps/schedules/package.json | 2 +- apps/schedules/src/index.ts | 15 ++++++++++----- apps/schedules/src/queue.ts | 4 ++-- apps/schedules/src/utils.ts | 6 +++--- apps/schedules/src/workers.ts | 8 ++++---- 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/apps/api/package.json b/apps/api/package.json index 0da226af..56ea5695 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "PORT=4000 tsx watch src/index.ts", "build": "tsc --project tsconfig.json", - "start": "node --experimental-specifier-resolution=node dist/index.js", + "start": "node dist/index.js", "typecheck": "tsc --noEmit" }, "dependencies": { diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts index bf91b040..4b405e9c 100644 --- a/apps/api/src/index.ts +++ b/apps/api/src/index.ts @@ -4,9 +4,9 @@ import "dotenv/config"; import { zValidator } from "@hono/zod-validator"; import { Queue } from "@nerimity/mimiqueue"; import { createClient } from "redis"; -import { logger } from "./logger"; -import { type DeployJob, deployJobSchema } from "./schema"; -import { deploy } from "./utils"; +import { logger } from "./logger.js"; +import { type DeployJob, deployJobSchema } from "./schema.js"; +import { deploy } from "./utils.js"; const app = new Hono(); const redisClient = createClient({ diff --git a/apps/schedules/package.json b/apps/schedules/package.json index 88ca3dfb..dd6818d1 100644 --- a/apps/schedules/package.json +++ b/apps/schedules/package.json @@ -4,7 +4,7 @@ "scripts": { "dev": "PORT=4001 tsx watch src/index.ts", "build": "tsc --project tsconfig.json", - "start": "node --experimental-specifier-resolution=node dist/index.js", + "start": "node dist/index.js", "typecheck": "tsc --noEmit" }, "dependencies": { diff --git a/apps/schedules/src/index.ts b/apps/schedules/src/index.ts index e440358d..0ef8e930 100644 --- a/apps/schedules/src/index.ts +++ b/apps/schedules/src/index.ts @@ -2,11 +2,16 @@ import { serve } from "@hono/node-server"; import { Hono } from "hono"; import "dotenv/config"; import { zValidator } from "@hono/zod-validator"; -import { logger } from "./logger"; -import { cleanQueue, getJobRepeatable, removeJob, scheduleJob } from "./queue"; -import { jobQueueSchema } from "./schema"; -import { initializeJobs } from "./utils"; -import { firstWorker, secondWorker } from "./workers"; +import { logger } from "./logger.js"; +import { + cleanQueue, + getJobRepeatable, + removeJob, + scheduleJob, +} from "./queue.js"; +import { jobQueueSchema } from "./schema.js"; +import { initializeJobs } from "./utils.js"; +import { firstWorker, secondWorker } from "./workers.js"; const app = new Hono(); diff --git a/apps/schedules/src/queue.ts b/apps/schedules/src/queue.ts index 471b9a4a..e751fa6d 100644 --- a/apps/schedules/src/queue.ts +++ b/apps/schedules/src/queue.ts @@ -1,7 +1,7 @@ import { Queue, type RepeatableJob } from "bullmq"; import IORedis from "ioredis"; -import { logger } from "./logger"; -import type { QueueJob } from "./schema"; +import { logger } from "./logger.js"; +import type { QueueJob } from "./schema.js"; export const connection = new IORedis(process.env.REDIS_URL!, { maxRetriesPerRequest: null, diff --git a/apps/schedules/src/utils.ts b/apps/schedules/src/utils.ts index 65f3cbda..6b94dd14 100644 --- a/apps/schedules/src/utils.ts +++ b/apps/schedules/src/utils.ts @@ -12,9 +12,9 @@ import { import { db } from "@dokploy/server/dist/db"; import { backups, server } from "@dokploy/server/dist/db/schema"; import { eq } from "drizzle-orm"; -import { logger } from "./logger"; -import { scheduleJob } from "./queue"; -import type { QueueJob } from "./schema"; +import { logger } from "./logger.js"; +import { scheduleJob } from "./queue.js"; +import type { QueueJob } from "./schema.js"; export const runJobs = async (job: QueueJob) => { try { diff --git a/apps/schedules/src/workers.ts b/apps/schedules/src/workers.ts index d8adc53e..b63f995a 100644 --- a/apps/schedules/src/workers.ts +++ b/apps/schedules/src/workers.ts @@ -1,8 +1,8 @@ import { type Job, Worker } from "bullmq"; -import { logger } from "./logger"; -import { connection } from "./queue"; -import type { QueueJob } from "./schema"; -import { runJobs } from "./utils"; +import { logger } from "./logger.js"; +import { connection } from "./queue.js"; +import type { QueueJob } from "./schema.js"; +import { runJobs } from "./utils.js"; export const firstWorker = new Worker( "backupQueue",