diff --git a/app.ts b/app.ts index 53edc52f..705562cf 100644 --- a/app.ts +++ b/app.ts @@ -2,7 +2,7 @@ import { errorResponse, jsonResponse, response } from "@/response"; import { sentry } from "@/sentry"; import { Hono } from "@hono/hono"; import { getLogger } from "@logtape/logtape"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { agentBans } from "./middlewares/agent-bans"; import { bait } from "./middlewares/bait"; import { boundaryCheck } from "./middlewares/boundary-check"; diff --git a/bun.lockb b/bun.lockb index dfe02a3b..d117f10b 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/classes/functions/federation.ts b/classes/functions/federation.ts index 81b7ba16..a733b2a0 100644 --- a/classes/functions/federation.ts +++ b/classes/functions/federation.ts @@ -1,5 +1,5 @@ import type { Undo } from "@lysand-org/federation/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import type { User } from "~/packages/database-interface/user"; export const undoFederationRequest = (undoer: User, uri: string): Undo => { diff --git a/classes/functions/like.ts b/classes/functions/like.ts index d7de9f4d..37e9f86e 100644 --- a/classes/functions/like.ts +++ b/classes/functions/like.ts @@ -1,8 +1,8 @@ import type { Like } from "@lysand-org/federation/types"; -import { config } from "config-manager"; import { type InferSelectModel, and, eq } from "drizzle-orm"; import { db } from "~/drizzle/db"; import { Likes, Notifications } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import type { Note } from "~/packages/database-interface/note"; import type { User } from "~/packages/database-interface/user"; diff --git a/classes/functions/status.ts b/classes/functions/status.ts index 242218cb..d48f6990 100644 --- a/classes/functions/status.ts +++ b/classes/functions/status.ts @@ -2,7 +2,6 @@ import { mentionValidator } from "@/api"; import { sanitizeHtml, sanitizeHtmlInline } from "@/sanitization"; import markdownItTaskLists from "@hackmd/markdown-it-task-lists"; import type { ContentFormat } from "@lysand-org/federation/types"; -import { config } from "config-manager"; import { type InferSelectModel, and, @@ -32,6 +31,7 @@ import { type Notes, Users, } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import type { EmojiWithInstance } from "~/packages/database-interface/emoji"; import { User } from "~/packages/database-interface/user"; import type { Application } from "./application"; diff --git a/classes/functions/user.ts b/classes/functions/user.ts index 7f5753d3..c22429b4 100644 --- a/classes/functions/user.ts +++ b/classes/functions/user.ts @@ -3,7 +3,6 @@ import type { FollowAccept, FollowReject, } from "@lysand-org/federation/types"; -import { config } from "config-manager"; import { type InferSelectModel, eq, sql } from "drizzle-orm"; import { db } from "~/drizzle/db"; import { @@ -13,6 +12,7 @@ import { Tokens, type Users, } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import type { EmojiWithInstance } from "~/packages/database-interface/emoji"; import { User } from "~/packages/database-interface/user"; import type { Application } from "./application"; diff --git a/classes/media/drivers/disk.test.ts b/classes/media/drivers/disk.test.ts index 7c2b9496..dc637f7c 100644 --- a/classes/media/drivers/disk.test.ts +++ b/classes/media/drivers/disk.test.ts @@ -14,7 +14,7 @@ import { } from "bun:test"; import * as fs from "node:fs/promises"; import * as path from "node:path"; -import type { Config } from "config-manager"; +import type { Config } from "~/packages/config-manager/config.type"; import type { MediaHasher } from "../media-hasher"; import { DiskMediaDriver } from "./disk"; diff --git a/classes/media/drivers/disk.ts b/classes/media/drivers/disk.ts index 7df0501c..d915d184 100644 --- a/classes/media/drivers/disk.ts +++ b/classes/media/drivers/disk.ts @@ -5,7 +5,7 @@ import { rm } from "node:fs/promises"; import { join } from "node:path"; -import type { Config } from "config-manager"; +import type { Config } from "~/packages/config-manager/config.type"; import { MediaHasher } from "../media-hasher"; import type { UploadedFileMetadata } from "../media-manager"; import type { MediaDriver } from "./media-driver"; diff --git a/classes/media/drivers/s3.test.ts b/classes/media/drivers/s3.test.ts index b5492661..8704e048 100644 --- a/classes/media/drivers/s3.test.ts +++ b/classes/media/drivers/s3.test.ts @@ -5,7 +5,7 @@ import { beforeEach, describe, expect, it, mock } from "bun:test"; import type { S3Client } from "@bradenmacdonald/s3-lite-client"; -import type { Config } from "config-manager"; +import type { Config } from "~/packages/config-manager/config.type"; import type { MediaHasher } from "../media-hasher"; import { S3MediaDriver } from "./s3"; diff --git a/classes/media/drivers/s3.ts b/classes/media/drivers/s3.ts index 81c1175e..396e0222 100644 --- a/classes/media/drivers/s3.ts +++ b/classes/media/drivers/s3.ts @@ -4,7 +4,7 @@ */ import { S3Client } from "@bradenmacdonald/s3-lite-client"; -import type { Config } from "config-manager"; +import type { Config } from "~/packages/config-manager/config.type"; import { MediaHasher } from "../media-hasher"; import type { UploadedFileMetadata } from "../media-manager"; import type { MediaDriver } from "./media-driver"; diff --git a/classes/media/media-manager.test.ts b/classes/media/media-manager.test.ts index d8e762c7..5b714140 100644 --- a/classes/media/media-manager.test.ts +++ b/classes/media/media-manager.test.ts @@ -4,7 +4,7 @@ */ import { beforeEach, describe, expect, it, mock } from "bun:test"; -import type { Config } from "config-manager"; +import type { Config } from "~/packages/config-manager/config.type"; import { MediaBackendType } from "~/packages/config-manager/config.type"; import { DiskMediaDriver } from "./drivers/disk"; import { S3MediaDriver } from "./drivers/s3"; diff --git a/classes/media/media-manager.ts b/classes/media/media-manager.ts index c2eaf370..7d9ee860 100644 --- a/classes/media/media-manager.ts +++ b/classes/media/media-manager.ts @@ -3,7 +3,7 @@ * @module MediaManager */ -import type { Config } from "config-manager"; +import type { Config } from "~/packages/config-manager/config.type"; import { DiskMediaDriver } from "./drivers/disk"; import type { MediaDriver } from "./drivers/media-driver"; import { S3MediaDriver } from "./drivers/s3"; diff --git a/classes/media/preprocessors/image-conversion.test.ts b/classes/media/preprocessors/image-conversion.test.ts index 51b3cfc8..97f354c1 100644 --- a/classes/media/preprocessors/image-conversion.test.ts +++ b/classes/media/preprocessors/image-conversion.test.ts @@ -1,6 +1,6 @@ import { beforeEach, describe, expect, it } from "bun:test"; -import type { Config } from "config-manager"; import sharp from "sharp"; +import type { Config } from "~/packages/config-manager/config.type"; import { ImageConversionPreprocessor } from "./image-conversion"; describe("ImageConversionPreprocessor", () => { diff --git a/classes/media/preprocessors/image-conversion.ts b/classes/media/preprocessors/image-conversion.ts index 768bfec3..cfb1bceb 100644 --- a/classes/media/preprocessors/image-conversion.ts +++ b/classes/media/preprocessors/image-conversion.ts @@ -3,8 +3,8 @@ * @module MediaManager/Preprocessors */ -import type { Config } from "config-manager"; import sharp from "sharp"; +import type { Config } from "~/packages/config-manager/config.type"; import type { MediaPreprocessor } from "./media-preprocessor"; /** diff --git a/drizzle.config.ts b/drizzle.config.ts index 3f90c425..664f067c 100644 --- a/drizzle.config.ts +++ b/drizzle.config.ts @@ -1,5 +1,5 @@ -import { config } from "config-manager"; import type { Config } from "drizzle-kit"; +import { config } from "~/packages/config-manager/index"; export default { dialect: "postgresql", diff --git a/index.ts b/index.ts index 4dfc5d90..8f66fa52 100644 --- a/index.ts +++ b/index.ts @@ -1,8 +1,8 @@ import { configureLoggers } from "@/loggers"; import { sentry } from "@/sentry"; import { createServer } from "@/server"; -import { config } from "config-manager"; import { appFactory } from "~/app"; +import { config } from "~/packages/config-manager/index"; import { setupDatabase } from "./drizzle/db"; if (import.meta.main) { diff --git a/package.json b/package.json index 42e1eeb0..74345c31 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,6 @@ "chalk": "^5.3.0", "cli-progress": "^3.12.0", "cli-table": "^0.3.11", - "config-manager": "workspace:*", "drizzle-orm": "^0.33.0", "extract-zip": "^2.0.1", "hono": "npm:@jsr/hono__hono@4.5.4", diff --git a/packages/config-manager/package.json b/packages/config-manager/package.json deleted file mode 100644 index 35d9f9d9..00000000 --- a/packages/config-manager/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "config-manager", - "version": "0.0.0", - "main": "index.ts", - "type": "module", - "dependencies": { - "c12": "^1.11.1", - "zod": "^3.23.8", - "zod-validation-error": "^3.3.0" - } -} diff --git a/packages/database-interface/attachment.ts b/packages/database-interface/attachment.ts index 8ce327f2..1fb16c02 100644 --- a/packages/database-interface/attachment.ts +++ b/packages/database-interface/attachment.ts @@ -4,7 +4,6 @@ import type { Attachment as ApiAttachment, } from "@lysand-org/client/types"; import type { ContentFormat } from "@lysand-org/federation/types"; -import { config } from "config-manager"; import { MediaBackendType } from "config-manager/config.type"; import { type InferInsertModel, @@ -16,6 +15,7 @@ import { } from "drizzle-orm"; import { db } from "~/drizzle/db"; import { Attachments } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { BaseInterface } from "./base"; export type AttachmentType = InferSelectModel; diff --git a/packages/database-interface/instance.ts b/packages/database-interface/instance.ts index c55d0eb5..14a6f44c 100644 --- a/packages/database-interface/instance.ts +++ b/packages/database-interface/instance.ts @@ -6,7 +6,6 @@ import { } from "@lysand-org/federation"; import type { ServerMetadata } from "@lysand-org/federation/types"; import chalk from "chalk"; -import { config } from "config-manager"; import { type InferInsertModel, type InferSelectModel, @@ -18,6 +17,7 @@ import { } from "drizzle-orm"; import { db } from "~/drizzle/db"; import { Instances } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { BaseInterface } from "./base"; import { User } from "./user"; diff --git a/packages/database-interface/role.ts b/packages/database-interface/role.ts index 675ad9b4..c2ae2fbc 100644 --- a/packages/database-interface/role.ts +++ b/packages/database-interface/role.ts @@ -1,6 +1,5 @@ import { proxyUrl } from "@/response"; import type { RolePermission } from "@lysand-org/client/types"; -import { config } from "config-manager"; import { type InferInsertModel, type InferSelectModel, @@ -12,6 +11,7 @@ import { } from "drizzle-orm"; import { db } from "~/drizzle/db"; import { RoleToUsers, Roles } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { BaseInterface } from "./base"; export type RoleType = InferSelectModel; diff --git a/packages/glitch-server/main.ts b/packages/glitch-server/main.ts index 315a12a7..76620cbe 100644 --- a/packages/glitch-server/main.ts +++ b/packages/glitch-server/main.ts @@ -1,8 +1,8 @@ import { join } from "node:path"; import { redirect } from "@/response"; import type { BunFile } from "bun"; -import { config } from "config-manager"; import { retrieveUserFromToken } from "~/classes/functions/user"; +import { config } from "~/packages/config-manager/index"; import type { User } from "~/packages/database-interface/user"; import { languages } from "./glitch-languages"; diff --git a/server/api/api/v1/accounts/:id/block.test.ts b/server/api/api/v1/accounts/:id/block.test.ts index 7b1d6a38..c1aa83ad 100644 --- a/server/api/api/v1/accounts/:id/block.test.ts +++ b/server/api/api/v1/accounts/:id/block.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import type { Relationship as ApiRelationship } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./block"; diff --git a/server/api/api/v1/accounts/:id/follow.test.ts b/server/api/api/v1/accounts/:id/follow.test.ts index a7b3599f..5a82373c 100644 --- a/server/api/api/v1/accounts/:id/follow.test.ts +++ b/server/api/api/v1/accounts/:id/follow.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import type { Relationship as ApiRelationship } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./follow"; diff --git a/server/api/api/v1/accounts/:id/followers.test.ts b/server/api/api/v1/accounts/:id/followers.test.ts index cdcce2b1..513a8ea6 100644 --- a/server/api/api/v1/accounts/:id/followers.test.ts +++ b/server/api/api/v1/accounts/:id/followers.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Account as ApiAccount } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./followers"; diff --git a/server/api/api/v1/accounts/:id/following.test.ts b/server/api/api/v1/accounts/:id/following.test.ts index eb3dfcb9..58f13b32 100644 --- a/server/api/api/v1/accounts/:id/following.test.ts +++ b/server/api/api/v1/accounts/:id/following.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Account as ApiAccount } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./following"; diff --git a/server/api/api/v1/accounts/:id/index.test.ts b/server/api/api/v1/accounts/:id/index.test.ts index e43a578e..8da0c320 100644 --- a/server/api/api/v1/accounts/:id/index.test.ts +++ b/server/api/api/v1/accounts/:id/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Account as ApiAccount } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/accounts/:id/mute.test.ts b/server/api/api/v1/accounts/:id/mute.test.ts index 60dd4c4c..a75da007 100644 --- a/server/api/api/v1/accounts/:id/mute.test.ts +++ b/server/api/api/v1/accounts/:id/mute.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import type { Relationship as ApiRelationship } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./mute"; diff --git a/server/api/api/v1/accounts/:id/statuses.test.ts b/server/api/api/v1/accounts/:id/statuses.test.ts index 9ef31fe8..7e9a7d8d 100644 --- a/server/api/api/v1/accounts/:id/statuses.test.ts +++ b/server/api/api/v1/accounts/:id/statuses.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Status as ApiStatus } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./statuses"; diff --git a/server/api/api/v1/accounts/:id/unmute.test.ts b/server/api/api/v1/accounts/:id/unmute.test.ts index 2a0e67af..c80d9e99 100644 --- a/server/api/api/v1/accounts/:id/unmute.test.ts +++ b/server/api/api/v1/accounts/:id/unmute.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Relationship as ApiRelationship } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./unmute"; diff --git a/server/api/api/v1/accounts/id/index.test.ts b/server/api/api/v1/accounts/id/index.test.ts index 4ce0dcd5..cdeffac8 100644 --- a/server/api/api/v1/accounts/id/index.test.ts +++ b/server/api/api/v1/accounts/id/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import type { Account as ApiAccount } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/accounts/index.test.ts b/server/api/api/v1/accounts/index.test.ts index a6969c57..896899c2 100644 --- a/server/api/api/v1/accounts/index.test.ts +++ b/server/api/api/v1/accounts/index.test.ts @@ -1,9 +1,9 @@ import { afterEach, describe, expect, test } from "bun:test"; import { randomString } from "@/math"; -import { config } from "config-manager"; import { eq } from "drizzle-orm"; import { db } from "~/drizzle/db"; import { Users } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { getSolvedChallenge, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/accounts/lookup/index.test.ts b/server/api/api/v1/accounts/lookup/index.test.ts index ab9421b4..103d73fc 100644 --- a/server/api/api/v1/accounts/lookup/index.test.ts +++ b/server/api/api/v1/accounts/lookup/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import type { Account as ApiAccount } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/accounts/relationships/index.test.ts b/server/api/api/v1/accounts/relationships/index.test.ts index b12825b4..080e5d6d 100644 --- a/server/api/api/v1/accounts/relationships/index.test.ts +++ b/server/api/api/v1/accounts/relationships/index.test.ts @@ -1,8 +1,8 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { config } from "config-manager"; import { eq } from "drizzle-orm"; import { db } from "~/drizzle/db"; import { Users } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/accounts/search/index.test.ts b/server/api/api/v1/accounts/search/index.test.ts index 89e69c27..ef667012 100644 --- a/server/api/api/v1/accounts/search/index.test.ts +++ b/server/api/api/v1/accounts/search/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import type { Account as ApiAccount } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/accounts/update_credentials/index.ts b/server/api/api/v1/accounts/update_credentials/index.ts index c83f2d7e..808d16a2 100644 --- a/server/api/api/v1/accounts/update_credentials/index.ts +++ b/server/api/api/v1/accounts/update_credentials/index.ts @@ -3,7 +3,6 @@ import { errorResponse, jsonResponse } from "@/response"; import { sanitizedHtmlStrip } from "@/sanitization"; import type { Hono } from "@hono/hono"; import { zValidator } from "@hono/zod-validator"; -import { config } from "config-manager"; import { and, eq, isNull } from "drizzle-orm"; import ISO6391 from "iso-639-1"; import { z } from "zod"; @@ -11,6 +10,7 @@ import { contentToHtml } from "~/classes/functions/status"; import { MediaManager } from "~/classes/media/media-manager"; import { db } from "~/drizzle/db"; import { EmojiToUser, RolePermissions, Users } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { Attachment } from "~/packages/database-interface/attachment"; import { Emoji } from "~/packages/database-interface/emoji"; import { User } from "~/packages/database-interface/user"; diff --git a/server/api/api/v1/challenges/index.test.ts b/server/api/api/v1/challenges/index.test.ts index 2df94862..812efe61 100644 --- a/server/api/api/v1/challenges/index.test.ts +++ b/server/api/api/v1/challenges/index.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from "bun:test"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/custom_emojis/index.test.ts b/server/api/api/v1/custom_emojis/index.test.ts index db8471c4..2e6c0454 100644 --- a/server/api/api/v1/custom_emojis/index.test.ts +++ b/server/api/api/v1/custom_emojis/index.test.ts @@ -1,8 +1,8 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { config } from "config-manager"; import { inArray } from "drizzle-orm"; import { db } from "~/drizzle/db"; import { Emojis } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/emojis/:id/index.test.ts b/server/api/api/v1/emojis/:id/index.test.ts index 33f3958a..e8af582e 100644 --- a/server/api/api/v1/emojis/:id/index.test.ts +++ b/server/api/api/v1/emojis/:id/index.test.ts @@ -1,8 +1,8 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { config } from "config-manager"; import { inArray } from "drizzle-orm"; import { db } from "~/drizzle/db"; import { Emojis } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/emojis/index.test.ts b/server/api/api/v1/emojis/index.test.ts index 27c569a5..0f245ca0 100644 --- a/server/api/api/v1/emojis/index.test.ts +++ b/server/api/api/v1/emojis/index.test.ts @@ -1,9 +1,9 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { config } from "config-manager"; import { inArray } from "drizzle-orm"; import sharp from "sharp"; import { db } from "~/drizzle/db"; import { Emojis } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/instance/extended_description.test.ts b/server/api/api/v1/instance/extended_description.test.ts index 5156c97d..8a230f13 100644 --- a/server/api/api/v1/instance/extended_description.test.ts +++ b/server/api/api/v1/instance/extended_description.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from "bun:test"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { sendTestRequest } from "~/tests/utils"; import { meta } from "./extended_description"; diff --git a/server/api/api/v1/instance/privacy_policy.test.ts b/server/api/api/v1/instance/privacy_policy.test.ts index ed4360c3..710e3ee8 100644 --- a/server/api/api/v1/instance/privacy_policy.test.ts +++ b/server/api/api/v1/instance/privacy_policy.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from "bun:test"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { sendTestRequest } from "~/tests/utils"; import { meta } from "./privacy_policy"; diff --git a/server/api/api/v1/instance/rules.test.ts b/server/api/api/v1/instance/rules.test.ts index 5f2c7c78..6ed8b7a5 100644 --- a/server/api/api/v1/instance/rules.test.ts +++ b/server/api/api/v1/instance/rules.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from "bun:test"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { sendTestRequest } from "~/tests/utils"; import { meta } from "./rules"; diff --git a/server/api/api/v1/instance/tos.test.ts b/server/api/api/v1/instance/tos.test.ts index 91d60c5c..715a6a52 100644 --- a/server/api/api/v1/instance/tos.test.ts +++ b/server/api/api/v1/instance/tos.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from "bun:test"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { sendTestRequest } from "~/tests/utils"; import { meta } from "./tos"; diff --git a/server/api/api/v1/markers/index.test.ts b/server/api/api/v1/markers/index.test.ts index cc2d37b5..9b418cad 100644 --- a/server/api/api/v1/markers/index.test.ts +++ b/server/api/api/v1/markers/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/media/:id/index.ts b/server/api/api/v1/media/:id/index.ts index c39f5c1c..37496794 100644 --- a/server/api/api/v1/media/:id/index.ts +++ b/server/api/api/v1/media/:id/index.ts @@ -2,10 +2,10 @@ import { applyConfig, auth, handleZodError, idValidator } from "@/api"; import { errorResponse, jsonResponse, response } from "@/response"; import type { Hono } from "@hono/hono"; import { zValidator } from "@hono/zod-validator"; -import { config } from "config-manager"; import { z } from "zod"; import { MediaManager } from "~/classes/media/media-manager"; import { RolePermissions } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { Attachment } from "~/packages/database-interface/attachment"; export const meta = applyConfig({ diff --git a/server/api/api/v1/media/index.ts b/server/api/api/v1/media/index.ts index 3b762d99..341d73cb 100644 --- a/server/api/api/v1/media/index.ts +++ b/server/api/api/v1/media/index.ts @@ -2,11 +2,11 @@ import { applyConfig, auth, handleZodError } from "@/api"; import { errorResponse, jsonResponse } from "@/response"; import type { Hono } from "@hono/hono"; import { zValidator } from "@hono/zod-validator"; -import { config } from "config-manager"; import sharp from "sharp"; import { z } from "zod"; import { MediaManager } from "~/classes/media/media-manager"; import { RolePermissions } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { Attachment } from "~/packages/database-interface/attachment"; export const meta = applyConfig({ diff --git a/server/api/api/v1/mutes/index.test.ts b/server/api/api/v1/mutes/index.test.ts index 7ffde214..a9733617 100644 --- a/server/api/api/v1/mutes/index.test.ts +++ b/server/api/api/v1/mutes/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/notifications/:id/dismiss.test.ts b/server/api/api/v1/notifications/:id/dismiss.test.ts index 53ea6de5..f53b9a0a 100644 --- a/server/api/api/v1/notifications/:id/dismiss.test.ts +++ b/server/api/api/v1/notifications/:id/dismiss.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Notification as ApiNotification } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./dismiss"; diff --git a/server/api/api/v1/notifications/:id/index.test.ts b/server/api/api/v1/notifications/:id/index.test.ts index 36846dda..a687eb26 100644 --- a/server/api/api/v1/notifications/:id/index.test.ts +++ b/server/api/api/v1/notifications/:id/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Notification as ApiNotification } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/notifications/clear/index.test.ts b/server/api/api/v1/notifications/clear/index.test.ts index 7a62da95..672dd33d 100644 --- a/server/api/api/v1/notifications/clear/index.test.ts +++ b/server/api/api/v1/notifications/clear/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Notification as ApiNotification } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/notifications/destroy_multiple/index.test.ts b/server/api/api/v1/notifications/destroy_multiple/index.test.ts index 75e3b4cc..dbd012ed 100644 --- a/server/api/api/v1/notifications/destroy_multiple/index.test.ts +++ b/server/api/api/v1/notifications/destroy_multiple/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Notification as ApiNotification } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/notifications/index.test.ts b/server/api/api/v1/notifications/index.test.ts index 5db11cc9..864a7a35 100644 --- a/server/api/api/v1/notifications/index.test.ts +++ b/server/api/api/v1/notifications/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Notification as ApiNotification } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/roles/:id/index.test.ts b/server/api/api/v1/roles/:id/index.test.ts index e5361046..4abc2858 100644 --- a/server/api/api/v1/roles/:id/index.test.ts +++ b/server/api/api/v1/roles/:id/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { config } from "config-manager"; import { ADMIN_ROLES, DEFAULT_ROLES, RolePermissions } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { Role } from "~/packages/database-interface/role"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/roles/index.test.ts b/server/api/api/v1/roles/index.test.ts index 1323f3e6..48b63d3f 100644 --- a/server/api/api/v1/roles/index.test.ts +++ b/server/api/api/v1/roles/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { config } from "config-manager"; import { ADMIN_ROLES } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { Role } from "~/packages/database-interface/role"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/statuses/:id/favourite.test.ts b/server/api/api/v1/statuses/:id/favourite.test.ts index 2e2a9fe2..8d127e33 100644 --- a/server/api/api/v1/statuses/:id/favourite.test.ts +++ b/server/api/api/v1/statuses/:id/favourite.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import type { Status as ApiStatus } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./favourite"; diff --git a/server/api/api/v1/statuses/:id/favourited_by.test.ts b/server/api/api/v1/statuses/:id/favourited_by.test.ts index b668fe70..acf28144 100644 --- a/server/api/api/v1/statuses/:id/favourited_by.test.ts +++ b/server/api/api/v1/statuses/:id/favourited_by.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Account as ApiAccount } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./favourited_by"; diff --git a/server/api/api/v1/statuses/:id/index.ts b/server/api/api/v1/statuses/:id/index.ts index 1be75fe2..e07b65f0 100644 --- a/server/api/api/v1/statuses/:id/index.ts +++ b/server/api/api/v1/statuses/:id/index.ts @@ -8,11 +8,11 @@ import { import { errorResponse, jsonResponse } from "@/response"; import type { Hono } from "@hono/hono"; import { zValidator } from "@hono/zod-validator"; -import { config } from "config-manager"; import ISO6391 from "iso-639-1"; import { z } from "zod"; import { undoFederationRequest } from "~/classes/functions/federation"; import { RolePermissions } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { Attachment } from "~/packages/database-interface/attachment"; import { Note } from "~/packages/database-interface/note"; diff --git a/server/api/api/v1/statuses/:id/reblogged_by.test.ts b/server/api/api/v1/statuses/:id/reblogged_by.test.ts index 5d3be646..2a9be319 100644 --- a/server/api/api/v1/statuses/:id/reblogged_by.test.ts +++ b/server/api/api/v1/statuses/:id/reblogged_by.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Account as ApiAccount } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./reblogged_by"; diff --git a/server/api/api/v1/statuses/:id/unfavourite.test.ts b/server/api/api/v1/statuses/:id/unfavourite.test.ts index 59161af7..dac216e8 100644 --- a/server/api/api/v1/statuses/:id/unfavourite.test.ts +++ b/server/api/api/v1/statuses/:id/unfavourite.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Status as ApiStatus } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./unfavourite"; diff --git a/server/api/api/v1/statuses/index.test.ts b/server/api/api/v1/statuses/index.test.ts index 2fed2793..48cef09b 100644 --- a/server/api/api/v1/statuses/index.test.ts +++ b/server/api/api/v1/statuses/index.test.ts @@ -1,9 +1,9 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Status as ApiStatus } from "@lysand-org/client/types"; -import { config } from "config-manager"; import { eq } from "drizzle-orm"; import { db } from "~/drizzle/db"; import { Emojis } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v1/statuses/index.ts b/server/api/api/v1/statuses/index.ts index c0c2b3ac..fffef36d 100644 --- a/server/api/api/v1/statuses/index.ts +++ b/server/api/api/v1/statuses/index.ts @@ -2,10 +2,10 @@ import { applyConfig, auth, handleZodError, jsonOrForm } from "@/api"; import { errorResponse, jsonResponse } from "@/response"; import type { Hono } from "@hono/hono"; import { zValidator } from "@hono/zod-validator"; -import { config } from "config-manager"; import ISO6391 from "iso-639-1"; import { z } from "zod"; import { RolePermissions } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { Attachment } from "~/packages/database-interface/attachment"; import { Note } from "~/packages/database-interface/note"; diff --git a/server/api/api/v1/timelines/home.test.ts b/server/api/api/v1/timelines/home.test.ts index 30e9432d..12685a0b 100644 --- a/server/api/api/v1/timelines/home.test.ts +++ b/server/api/api/v1/timelines/home.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import type { Status as ApiStatus } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./home"; diff --git a/server/api/api/v1/timelines/public.test.ts b/server/api/api/v1/timelines/public.test.ts index e543556b..b5533aad 100644 --- a/server/api/api/v1/timelines/public.test.ts +++ b/server/api/api/v1/timelines/public.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import type { Status as ApiStatus } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./public"; diff --git a/server/api/api/v2/filters/:id/index.test.ts b/server/api/api/v2/filters/:id/index.test.ts index 52220947..dcd87410 100644 --- a/server/api/api/v2/filters/:id/index.test.ts +++ b/server/api/api/v2/filters/:id/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v2/filters/index.test.ts b/server/api/api/v2/filters/index.test.ts index 946eed5b..f09527d2 100644 --- a/server/api/api/v2/filters/index.test.ts +++ b/server/api/api/v2/filters/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v2/instance/index.test.ts b/server/api/api/v2/instance/index.test.ts index 002e6e51..98b5fd70 100644 --- a/server/api/api/v2/instance/index.test.ts +++ b/server/api/api/v2/instance/index.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from "bun:test"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; diff --git a/server/api/api/v2/media/index.ts b/server/api/api/v2/media/index.ts index f8390218..c52fb1bb 100644 --- a/server/api/api/v2/media/index.ts +++ b/server/api/api/v2/media/index.ts @@ -2,11 +2,11 @@ import { applyConfig, auth, handleZodError } from "@/api"; import { errorResponse, jsonResponse } from "@/response"; import type { Hono } from "@hono/hono"; import { zValidator } from "@hono/zod-validator"; -import { config } from "config-manager"; import sharp from "sharp"; import { z } from "zod"; import { MediaManager } from "~/classes/media/media-manager"; import { RolePermissions } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import { Attachment } from "~/packages/database-interface/attachment"; export const meta = applyConfig({ diff --git a/setup.ts b/setup.ts index 4f7bf6a1..bdb43243 100644 --- a/setup.ts +++ b/setup.ts @@ -1,8 +1,8 @@ import { checkConfig } from "@/init"; import { configureLoggers } from "@/loggers"; import { getLogger } from "@logtape/logtape"; -import { config } from "config-manager"; import { setupDatabase } from "~/drizzle/db"; +import { config } from "~/packages/config-manager/index"; import { Note } from "~/packages/database-interface/note"; import { searchManager } from "./classes/search/search-manager"; diff --git a/tests/api.test.ts b/tests/api.test.ts index 7e47416d..ba3c21f3 100644 --- a/tests/api.test.ts +++ b/tests/api.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "./utils"; const baseUrl = config.http.base_url; diff --git a/tests/api/accounts.test.ts b/tests/api/accounts.test.ts index e148fff6..82cd8f6a 100644 --- a/tests/api/accounts.test.ts +++ b/tests/api/accounts.test.ts @@ -6,7 +6,7 @@ import type { Account as ApiAccount, Relationship as ApiRelationship, } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~/tests/utils"; const baseUrl = config.http.base_url; diff --git a/tests/api/statuses.test.ts b/tests/api/statuses.test.ts index 0864b24e..694a4599 100644 --- a/tests/api/statuses.test.ts +++ b/tests/api/statuses.test.ts @@ -7,7 +7,7 @@ import type { Context as ApiContext, Status as ApiStatus, } from "@lysand-org/client/types"; -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~/tests/utils"; const baseUrl = config.http.base_url; diff --git a/utils/api.ts b/utils/api.ts index cd1160f7..f47e7f8a 100644 --- a/utils/api.ts +++ b/utils/api.ts @@ -6,7 +6,6 @@ import { validator } from "@hono/hono/validator"; import { getLogger } from "@logtape/logtape"; import { extractParams, verifySolution } from "altcha-lib"; import chalk from "chalk"; -import { config } from "config-manager"; import { eq } from "drizzle-orm"; import { anyOf, @@ -27,6 +26,7 @@ import type { Application } from "~/classes/functions/application"; import { type AuthData, getFromHeader } from "~/classes/functions/user"; import { db } from "~/drizzle/db"; import { Challenges } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager/index"; import type { User } from "~/packages/database-interface/user"; import type { ApiRouteMetadata, HttpVerb } from "~/types/api"; diff --git a/utils/constants.ts b/utils/constants.ts index 6fafefc1..3f16c764 100644 --- a/utils/constants.ts +++ b/utils/constants.ts @@ -1,4 +1,4 @@ -import { config } from "config-manager"; +import { config } from "~/packages/config-manager/index"; export const oauthRedirectUri = (issuer: string) => new URL(`/oauth/sso/${issuer}/callback`, config.http.base_url).toString(); diff --git a/utils/sentry.ts b/utils/sentry.ts index 2d9b9f67..4d2e1d0d 100644 --- a/utils/sentry.ts +++ b/utils/sentry.ts @@ -1,6 +1,6 @@ import * as Sentry from "@sentry/bun"; -import { config } from "config-manager"; import pkg from "~/package.json"; +import { config } from "~/packages/config-manager/index"; const sentryInstance = config.logging.sentry.enabled && diff --git a/utils/server.ts b/utils/server.ts index 902f05e0..963391f0 100644 --- a/utils/server.ts +++ b/utils/server.ts @@ -1,5 +1,5 @@ import type { Hono } from "@hono/hono"; -import type { Config } from "config-manager"; +import type { Config } from "~/packages/config-manager/config.type"; export const createServer = (config: Config, app: Hono) => Bun.serve({ diff --git a/utils/timelines.ts b/utils/timelines.ts index 0d68e331..da3db574 100644 --- a/utils/timelines.ts +++ b/utils/timelines.ts @@ -1,4 +1,3 @@ -import { config } from "config-manager"; import type { Notification, findManyNotifications, @@ -6,6 +5,7 @@ import type { import type { Status, findManyNotes } from "~/classes/functions/status"; import type { UserType, findManyUsers } from "~/classes/functions/user"; import type { db } from "~/drizzle/db"; +import { config } from "~/packages/config-manager/index"; export async function fetchTimeline( model: