diff --git a/apps/api/src/utils.ts b/apps/api/src/utils.ts index 01b83a77..5d776a5c 100644 --- a/apps/api/src/utils.ts +++ b/apps/api/src/utils.ts @@ -9,7 +9,7 @@ import { rebuildRemoteCompose, updateApplicationStatus, updateCompose, -} from "@dokploy/server"; +} from "@dokploy/server/dist"; import type { DeployJob } from "./schema"; import type { LemonSqueezyLicenseResponse } from "./types"; diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 4ebd49bf..9e67968a 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -11,7 +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", - "dev": "tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json ", + "dev": "TURBOPACK=1 tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json ", "studio": "drizzle-kit studio --config ./server/db/drizzle.config.ts", "migration:generate": "drizzle-kit generate --config ./server/db/drizzle.config.ts", "migration:run": "tsx -r dotenv/config migration.ts", @@ -90,7 +90,7 @@ "lucia": "^3.0.1", "lucide-react": "^0.312.0", "nanoid": "3", - "next": "^14.1.3", + "next": "^15.0.1", "next-themes": "^0.2.1", "node-pty": "1.0.0", "node-schedule": "2.1.1", diff --git a/apps/dokploy/server/db/schema/index.ts b/apps/dokploy/server/db/schema/index.ts index c501bf93..5739c7a2 100644 --- a/apps/dokploy/server/db/schema/index.ts +++ b/apps/dokploy/server/db/schema/index.ts @@ -1 +1 @@ -export * from "@dokploy/server/dist/db/schema"; +export * from "@dokploy/server/db/schema"; diff --git a/apps/dokploy/server/server.ts b/apps/dokploy/server/server.ts index a88aba38..b965cd7c 100644 --- a/apps/dokploy/server/server.ts +++ b/apps/dokploy/server/server.ts @@ -27,7 +27,7 @@ import { config({ path: ".env" }); const PORT = Number.parseInt(process.env.PORT || "3000", 10); const dev = process.env.NODE_ENV !== "production"; -const app = next({ dev }); +const app = next({ dev, turbopack: dev }); const handle = app.getRequestHandler(); void app.prepare().then(async () => { try { diff --git a/apps/dokploy/tsconfig.json b/apps/dokploy/tsconfig.json index de7e8a04..e132180e 100644 --- a/apps/dokploy/tsconfig.json +++ b/apps/dokploy/tsconfig.json @@ -26,7 +26,8 @@ /* Path Aliases */ "baseUrl": ".", "paths": { - "@/*": ["./*"] + "@/*": ["./*"], + "@dokploy/server/*": ["../../packages/server/src/*"] } }, diff --git a/apps/dokploy/tsconfig.server.json b/apps/dokploy/tsconfig.server.json index a5cc7a30..6a8f562f 100644 --- a/apps/dokploy/tsconfig.server.json +++ b/apps/dokploy/tsconfig.server.json @@ -9,7 +9,8 @@ "moduleResolution": "Node", "baseUrl": ".", "paths": { - "@/*": ["./*"] + "@/*": ["./*"], + "@dokploy/server/*": ["../../packages/server/src/*"] } }, "include": ["next-env.d.ts", "./server/**/*"] diff --git a/apps/schedules/src/utils.ts b/apps/schedules/src/utils.ts index 65f3cbda..07cefeef 100644 --- a/apps/schedules/src/utils.ts +++ b/apps/schedules/src/utils.ts @@ -8,7 +8,7 @@ import { runMongoBackup, runMySqlBackup, runPostgresBackup, -} from "@dokploy/server"; +} from "@dokploy/server/dist"; import { db } from "@dokploy/server/dist/db"; import { backups, server } from "@dokploy/server/dist/db/schema"; import { eq } from "drizzle-orm"; diff --git a/packages/server/esbuild.config.ts b/packages/server/esbuild.config.ts index 6504492b..03e2cf5d 100644 --- a/packages/server/esbuild.config.ts +++ b/packages/server/esbuild.config.ts @@ -1,28 +1,28 @@ -// import { build } from "esbuild"; -// import alias from "esbuild-plugin-alias"; -// import path from "node:path"; -// import { fileURLToPath } from "node:url"; -// const __filename = fileURLToPath(import.meta.url); // get the resolved path to the file -// const __dirname = path.dirname(__filename); +import path from "node:path"; +import { fileURLToPath } from "node:url"; +import { build } from "esbuild"; +import alias from "esbuild-plugin-alias"; +const __filename = fileURLToPath(import.meta.url); // get the resolved path to the file +const __dirname = path.dirname(__filename); -// build({ -// entryPoints: ["./src/**/*.ts"], -// // outfile: "./dist/index.js", -// outdir: "./dist", -// bundle: true, -// minify: false, -// platform: "node", -// target: "esnext", -// format: "esm", -// plugins: [ -// alias({ -// "@/server": path.resolve(__dirname, "src"), -// }), -// ], -// packages: "external", -// // Opcional: si deseas emitir declaraciones de tipos con esbuild-plugin-dts -// }) -// .then(() => { -// console.log("Build successful"); -// }) -// .catch(() => process.exit(1)); +build({ + entryPoints: ["./src/**/*.ts"], + // outfile: "./dist/index.js", + outdir: "./dist", + bundle: true, + minify: false, + platform: "node", + target: "esnext", + format: "esm", + plugins: [ + alias({ + "@dokploy/server": path.resolve(__dirname, "src"), + }), + ], + packages: "external", + // Opcional: si deseas emitir declaraciones de tipos con esbuild-plugin-dts +}) + .then(() => { + console.log("Build successful"); + }) + .catch(() => process.exit(1)); diff --git a/packages/server/package.json b/packages/server/package.json index 153011b8..61249a56 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,14 +1,35 @@ { "name": "@dokploy/server", "version": "1.0.0", - "main": "dist/index.js", - "types": "dist/index.d.ts", + "main": "./src/index.ts", "type": "module", + "exports": { + ".": "./src/index.ts", + "./db": { + "import": "./src/db/index.ts", + "require": "./dist/db/index.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:types": "tsc --emitDeclarationOnly --experimenta-dts", + "switch:dev": "node scripts/switchToSrc.js", + "switch:prod": "node scripts/switchToDist.js", "dev": "rm -rf ./dist && pnpm esbuild && tsc --emitDeclarationOnly --outDir dist -p tsconfig.server.json", - "esbuild": "tsx ./esbuild.config.ts", + "esbuild": "tsx ./esbuild.config.ts && tsc --project tsconfig.server.json --emitDeclarationOnly ", "typecheck": "tsc --noEmit" }, "dependencies": { @@ -49,6 +70,7 @@ "ssh2": "1.15.0" }, "devDependencies": { + "esbuild-plugin-alias": "0.2.1", "tailwindcss": "^3.4.1", "tsx": "^4.7.1", "tsc-alias": "1.8.10", diff --git a/packages/server/scripts/switchToDist.js b/packages/server/scripts/switchToDist.js new file mode 100644 index 00000000..12f5625a --- /dev/null +++ b/packages/server/scripts/switchToDist.js @@ -0,0 +1,27 @@ +import fs from "node:fs"; +import path from "node:path"; +import { fileURLToPath } from "node:url"; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); + +const packagePath = path.resolve(__dirname, "../package.json"); +const pkg = JSON.parse(fs.readFileSync(packagePath, "utf-8")); + +pkg.exports = { + ".": { + import: "./dist/index.js", + require: "./dist/index.cjs.js", + }, + "./db": { + import: "./dist/db/index.js", + require: "./dist/db/index.cjs.js", + }, + "./*": { + import: "./dist/*", + require: "./dist/*.cjs", + }, +}; + +fs.writeFileSync(packagePath, JSON.stringify(pkg, null, 2)); +console.log("Switched exports to use dist for production"); diff --git a/packages/server/scripts/switchToSrc.js b/packages/server/scripts/switchToSrc.js new file mode 100644 index 00000000..a3e2c3fd --- /dev/null +++ b/packages/server/scripts/switchToSrc.js @@ -0,0 +1,24 @@ +import fs from "node:fs"; +import path from "node:path"; +import { fileURLToPath } from "node:url"; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); + +const packagePath = path.resolve(__dirname, "../package.json"); + +// Leer el archivo package.json +const pkg = JSON.parse(fs.readFileSync(packagePath, "utf-8")); + +// Modificar los exports +pkg.exports = { + ".": "./src/index.ts", + "./db": { + import: "./src/db/index.ts", + require: "./dist/db/index.cjs.js", + }, +}; + +// Guardar los cambios en package.json +fs.writeFileSync(packagePath, JSON.stringify(pkg, null, 2)); +console.log("Switched exports to use src for development"); diff --git a/packages/server/src/auth/auth.ts b/packages/server/src/auth/auth.ts index 7d26a6c3..868afac5 100644 --- a/packages/server/src/auth/auth.ts +++ b/packages/server/src/auth/auth.ts @@ -1,7 +1,7 @@ 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 { findAdminByAuthId } from "@dokploy/server/services/admin"; +import { findUserByAuthId } from "@dokploy/server/services/user"; import { DrizzlePostgreSQLAdapter } from "@lucia-auth/adapter-drizzle"; import { TimeSpan } from "lucia"; import { Lucia } from "lucia/dist/core.js"; diff --git a/packages/server/src/services/admin.ts b/packages/server/src/services/admin.ts index 45088302..94bd92d9 100644 --- a/packages/server/src/services/admin.ts +++ b/packages/server/src/services/admin.ts @@ -1,11 +1,11 @@ import { randomBytes } from "node:crypto"; -import { db } from "@/server/db"; +import { db } from "@dokploy/server/db"; import { admins, type apiCreateUserInvitation, auth, users, -} from "@/server/db/schema"; +} from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import * as bcrypt from "bcrypt"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/services/application.ts b/packages/server/src/services/application.ts index 5f2cb391..ec0c0c2f 100644 --- a/packages/server/src/services/application.ts +++ b/packages/server/src/services/application.ts @@ -1,38 +1,41 @@ -import { docker } from "@/server/constants"; -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 { docker } from "@dokploy/server/constants"; +import { db } from "@dokploy/server/db"; +import { + type apiCreateApplication, + applications, +} from "@dokploy/server/db/schema"; +import { generateAppName } from "@dokploy/server/db/schema"; +import { getAdvancedStats } from "@dokploy/server/monitoring/utilts"; +import { generatePassword } from "@dokploy/server/templates/utils"; import { buildApplication, getBuildCommand, mechanizeDockerContainer, -} from "@/server/utils/builders"; -import { sendBuildErrorNotifications } from "@/server/utils/notifications/build-error"; -import { sendBuildSuccessNotifications } from "@/server/utils/notifications/build-success"; -import { execAsyncRemote } from "@/server/utils/process/execAsync"; +} from "@dokploy/server/utils/builders"; +import { sendBuildErrorNotifications } from "@dokploy/server/utils/notifications/build-error"; +import { sendBuildSuccessNotifications } from "@dokploy/server/utils/notifications/build-success"; +import { execAsyncRemote } from "@dokploy/server/utils/process/execAsync"; import { cloneBitbucketRepository, getBitbucketCloneCommand, -} from "@/server/utils/providers/bitbucket"; +} from "@dokploy/server/utils/providers/bitbucket"; import { buildDocker, buildRemoteDocker, -} from "@/server/utils/providers/docker"; +} from "@dokploy/server/utils/providers/docker"; import { cloneGitRepository, getCustomGitCloneCommand, -} from "@/server/utils/providers/git"; +} from "@dokploy/server/utils/providers/git"; import { cloneGithubRepository, getGithubCloneCommand, -} from "@/server/utils/providers/github"; +} from "@dokploy/server/utils/providers/github"; import { cloneGitlabRepository, getGitlabCloneCommand, -} from "@/server/utils/providers/gitlab"; -import { createTraefikConfig } from "@/server/utils/traefik/application"; +} from "@dokploy/server/utils/providers/gitlab"; +import { createTraefikConfig } from "@dokploy/server/utils/traefik/application"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; import { encodeBase64 } from "../utils/docker/utils"; diff --git a/packages/server/src/services/auth.ts b/packages/server/src/services/auth.ts index a3add4a6..1357f0f5 100644 --- a/packages/server/src/services/auth.ts +++ b/packages/server/src/services/auth.ts @@ -1,13 +1,13 @@ import { randomBytes } from "node:crypto"; -import { db } from "@/server/db"; +import { db } from "@dokploy/server/db"; import { admins, type apiCreateAdmin, type apiCreateUser, auth, users, -} from "@/server/db/schema"; -import { getPublicIpWithFallback } from "@/server/wss/terminal"; +} from "@dokploy/server/db/schema"; +import { getPublicIpWithFallback } from "@dokploy/server/wss/terminal"; import { TRPCError } from "@trpc/server"; import * as bcrypt from "bcrypt"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/services/backup.ts b/packages/server/src/services/backup.ts index 55b38c22..42cc378a 100644 --- a/packages/server/src/services/backup.ts +++ b/packages/server/src/services/backup.ts @@ -1,5 +1,5 @@ -import { db } from "@/server/db"; -import { type apiCreateBackup, backups } from "@/server/db/schema"; +import { db } from "@dokploy/server/db"; +import { type apiCreateBackup, backups } from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/services/bitbucket.ts b/packages/server/src/services/bitbucket.ts index 589837dd..34aa491f 100644 --- a/packages/server/src/services/bitbucket.ts +++ b/packages/server/src/services/bitbucket.ts @@ -1,10 +1,10 @@ -import { db } from "@/server/db"; +import { db } from "@dokploy/server/db"; import { type apiCreateBitbucket, type apiUpdateBitbucket, bitbucket, gitProvider, -} from "@/server/db/schema"; +} from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/services/certificate.ts b/packages/server/src/services/certificate.ts index 1fa48404..23177862 100644 --- a/packages/server/src/services/certificate.ts +++ b/packages/server/src/services/certificate.ts @@ -1,9 +1,12 @@ import fs from "node:fs"; import path from "node:path"; -import { paths } from "@/server/constants"; -import { db } from "@/server/db"; -import { type apiCreateCertificate, certificates } from "@/server/db/schema"; -import { removeDirectoryIfExistsContent } from "@/server/utils/filesystem/directory"; +import { paths } from "@dokploy/server/constants"; +import { db } from "@dokploy/server/db"; +import { + type apiCreateCertificate, + certificates, +} from "@dokploy/server/db/schema"; +import { removeDirectoryIfExistsContent } from "@dokploy/server/utils/filesystem/directory"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; import { dump } from "js-yaml"; diff --git a/packages/server/src/services/compose.ts b/packages/server/src/services/compose.ts index 20e6a1ed..61d7e5fc 100644 --- a/packages/server/src/services/compose.ts +++ b/packages/server/src/services/compose.ts @@ -1,44 +1,47 @@ import { join } from "node:path"; -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 { paths } from "@dokploy/server/constants"; +import { db } from "@dokploy/server/db"; +import { type apiCreateCompose, compose } from "@dokploy/server/db/schema"; +import { generateAppName } from "@dokploy/server/db/schema"; +import { generatePassword } from "@dokploy/server/templates/utils"; import { buildCompose, getBuildComposeCommand, -} from "@/server/utils/builders/compose"; -import { randomizeSpecificationFile } from "@/server/utils/docker/compose"; +} from "@dokploy/server/utils/builders/compose"; +import { randomizeSpecificationFile } from "@dokploy/server/utils/docker/compose"; import { cloneCompose, cloneComposeRemote, loadDockerCompose, loadDockerComposeRemote, -} from "@/server/utils/docker/domain"; -import type { ComposeSpecification } from "@/server/utils/docker/types"; -import { sendBuildErrorNotifications } from "@/server/utils/notifications/build-error"; -import { sendBuildSuccessNotifications } from "@/server/utils/notifications/build-success"; -import { execAsync, execAsyncRemote } from "@/server/utils/process/execAsync"; +} from "@dokploy/server/utils/docker/domain"; +import type { ComposeSpecification } from "@dokploy/server/utils/docker/types"; +import { sendBuildErrorNotifications } from "@dokploy/server/utils/notifications/build-error"; +import { sendBuildSuccessNotifications } from "@dokploy/server/utils/notifications/build-success"; +import { + execAsync, + execAsyncRemote, +} from "@dokploy/server/utils/process/execAsync"; import { cloneBitbucketRepository, getBitbucketCloneCommand, -} from "@/server/utils/providers/bitbucket"; +} from "@dokploy/server/utils/providers/bitbucket"; import { cloneGitRepository, getCustomGitCloneCommand, -} from "@/server/utils/providers/git"; +} from "@dokploy/server/utils/providers/git"; import { cloneGithubRepository, getGithubCloneCommand, -} from "@/server/utils/providers/github"; +} from "@dokploy/server/utils/providers/github"; import { cloneGitlabRepository, getGitlabCloneCommand, -} from "@/server/utils/providers/gitlab"; +} from "@dokploy/server/utils/providers/gitlab"; import { createComposeFile, getCreateComposeFileCommand, -} from "@/server/utils/providers/raw"; +} from "@dokploy/server/utils/providers/raw"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; import { encodeBase64 } from "../utils/docker/utils"; diff --git a/packages/server/src/services/deployment.ts b/packages/server/src/services/deployment.ts index 5ea39c57..5ae6d130 100644 --- a/packages/server/src/services/deployment.ts +++ b/packages/server/src/services/deployment.ts @@ -1,14 +1,14 @@ import { existsSync, promises as fsPromises } from "node:fs"; import path from "node:path"; -import { paths } from "@/server/constants"; -import { db } from "@/server/db"; +import { paths } from "@dokploy/server/constants"; +import { db } from "@dokploy/server/db"; import { type apiCreateDeployment, type apiCreateDeploymentCompose, type apiCreateDeploymentServer, deployments, -} from "@/server/db/schema"; -import { removeDirectoryIfExistsContent } from "@/server/utils/filesystem/directory"; +} from "@dokploy/server/db/schema"; +import { removeDirectoryIfExistsContent } from "@dokploy/server/utils/filesystem/directory"; import { TRPCError } from "@trpc/server"; import { format } from "date-fns"; import { desc, eq } from "drizzle-orm"; @@ -20,7 +20,7 @@ import { import { type Compose, findComposeById, updateCompose } from "./compose"; import { type Server, findServerById } from "./server"; -import { execAsyncRemote } from "@/server/utils/process/execAsync"; +import { execAsyncRemote } from "@dokploy/server/utils/process/execAsync"; export type Deployment = typeof deployments.$inferSelect; diff --git a/packages/server/src/services/destination.ts b/packages/server/src/services/destination.ts index c814d0b5..892c9354 100644 --- a/packages/server/src/services/destination.ts +++ b/packages/server/src/services/destination.ts @@ -1,5 +1,8 @@ -import { db } from "@/server/db"; -import { type apiCreateDestination, destinations } from "@/server/db/schema"; +import { db } from "@dokploy/server/db"; +import { + type apiCreateDestination, + destinations, +} from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { and, eq } from "drizzle-orm"; diff --git a/packages/server/src/services/docker.ts b/packages/server/src/services/docker.ts index d611a11d..d5a40fe0 100644 --- a/packages/server/src/services/docker.ts +++ b/packages/server/src/services/docker.ts @@ -1,4 +1,7 @@ -import { execAsync, execAsyncRemote } from "@/server/utils/process/execAsync"; +import { + execAsync, + execAsyncRemote, +} from "@dokploy/server/utils/process/execAsync"; export const getContainers = async (serverId?: string | null) => { try { diff --git a/packages/server/src/services/domain.ts b/packages/server/src/services/domain.ts index d94cdc08..28dd3ba2 100644 --- a/packages/server/src/services/domain.ts +++ b/packages/server/src/services/domain.ts @@ -1,6 +1,6 @@ -import { db } from "@/server/db"; -import { generateRandomDomain } from "@/server/templates/utils"; -import { manageDomain } from "@/server/utils/traefik/domain"; +import { db } from "@dokploy/server/db"; +import { generateRandomDomain } from "@dokploy/server/templates/utils"; +import { manageDomain } from "@dokploy/server/utils/traefik/domain"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; import { type apiCreateDomain, domains } from "../db/schema"; diff --git a/packages/server/src/services/git-provider.ts b/packages/server/src/services/git-provider.ts index 25b455c4..dfcdaf10 100644 --- a/packages/server/src/services/git-provider.ts +++ b/packages/server/src/services/git-provider.ts @@ -1,5 +1,5 @@ -import { db } from "@/server/db"; -import { gitProvider } from "@/server/db/schema"; +import { db } from "@dokploy/server/db"; +import { gitProvider } from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/services/github.ts b/packages/server/src/services/github.ts index 110dc55e..a7317bc7 100644 --- a/packages/server/src/services/github.ts +++ b/packages/server/src/services/github.ts @@ -1,5 +1,9 @@ -import { db } from "@/server/db"; -import { type apiCreateGithub, gitProvider, github } from "@/server/db/schema"; +import { db } from "@dokploy/server/db"; +import { + type apiCreateGithub, + gitProvider, + github, +} from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/services/gitlab.ts b/packages/server/src/services/gitlab.ts index 53eb1083..673cf1f1 100644 --- a/packages/server/src/services/gitlab.ts +++ b/packages/server/src/services/gitlab.ts @@ -1,11 +1,11 @@ -import { db } from "@/server/db"; +import { db } from "@dokploy/server/db"; import { type apiCreateGitlab, type bitbucket, gitProvider, type github, gitlab, -} from "@/server/db/schema"; +} from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/services/mariadb.ts b/packages/server/src/services/mariadb.ts index 91cc7d73..645b5c65 100644 --- a/packages/server/src/services/mariadb.ts +++ b/packages/server/src/services/mariadb.ts @@ -1,14 +1,18 @@ -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 { db } from "@dokploy/server/db"; +import { + type apiCreateMariaDB, + backups, + mariadb, +} from "@dokploy/server/db/schema"; +import { generateAppName } from "@dokploy/server/db/schema"; +import { generatePassword } from "@dokploy/server/templates/utils"; +import { buildMariadb } from "@dokploy/server/utils/databases/mariadb"; +import { pullImage } from "@dokploy/server/utils/docker/utils"; import { TRPCError } from "@trpc/server"; import { eq, getTableColumns } from "drizzle-orm"; import { validUniqueServerAppName } from "./project"; -import { execAsyncRemote } from "@/server/utils/process/execAsync"; +import { execAsyncRemote } from "@dokploy/server/utils/process/execAsync"; export type Mariadb = typeof mariadb.$inferSelect; diff --git a/packages/server/src/services/mongo.ts b/packages/server/src/services/mongo.ts index 06b1cf58..1360372d 100644 --- a/packages/server/src/services/mongo.ts +++ b/packages/server/src/services/mongo.ts @@ -1,14 +1,14 @@ -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 { db } from "@dokploy/server/db"; +import { type apiCreateMongo, backups, mongo } from "@dokploy/server/db/schema"; +import { generateAppName } from "@dokploy/server/db/schema"; +import { generatePassword } from "@dokploy/server/templates/utils"; +import { buildMongo } from "@dokploy/server/utils/databases/mongo"; +import { pullImage } from "@dokploy/server/utils/docker/utils"; import { TRPCError } from "@trpc/server"; import { eq, getTableColumns } from "drizzle-orm"; import { validUniqueServerAppName } from "./project"; -import { execAsyncRemote } from "@/server/utils/process/execAsync"; +import { execAsyncRemote } from "@dokploy/server/utils/process/execAsync"; export type Mongo = typeof mongo.$inferSelect; diff --git a/packages/server/src/services/mount.ts b/packages/server/src/services/mount.ts index 97528aa5..f5211599 100644 --- a/packages/server/src/services/mount.ts +++ b/packages/server/src/services/mount.ts @@ -1,14 +1,17 @@ import path from "node:path"; -import { paths } from "@/server/constants"; -import { db } from "@/server/db"; +import { paths } from "@dokploy/server/constants"; +import { db } from "@dokploy/server/db"; import { type ServiceType, type apiCreateMount, mounts, -} from "@/server/db/schema"; -import { createFile, getCreateFileCommand } from "@/server/utils/docker/utils"; -import { removeFileOrDirectory } from "@/server/utils/filesystem/directory"; -import { execAsyncRemote } from "@/server/utils/process/execAsync"; +} from "@dokploy/server/db/schema"; +import { + createFile, + getCreateFileCommand, +} from "@dokploy/server/utils/docker/utils"; +import { removeFileOrDirectory } from "@dokploy/server/utils/filesystem/directory"; +import { execAsyncRemote } from "@dokploy/server/utils/process/execAsync"; import { TRPCError } from "@trpc/server"; import { type SQL, eq, sql } from "drizzle-orm"; diff --git a/packages/server/src/services/mysql.ts b/packages/server/src/services/mysql.ts index 7cae5801..ee9df820 100644 --- a/packages/server/src/services/mysql.ts +++ b/packages/server/src/services/mysql.ts @@ -1,14 +1,14 @@ -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 { db } from "@dokploy/server/db"; +import { type apiCreateMySql, backups, mysql } from "@dokploy/server/db/schema"; +import { generateAppName } from "@dokploy/server/db/schema"; +import { generatePassword } from "@dokploy/server/templates/utils"; +import { buildMysql } from "@dokploy/server/utils/databases/mysql"; +import { pullImage } from "@dokploy/server/utils/docker/utils"; import { TRPCError } from "@trpc/server"; import { eq, getTableColumns } from "drizzle-orm"; import { validUniqueServerAppName } from "./project"; -import { execAsyncRemote } from "@/server/utils/process/execAsync"; +import { execAsyncRemote } from "@dokploy/server/utils/process/execAsync"; export type MySql = typeof mysql.$inferSelect; diff --git a/packages/server/src/services/notification.ts b/packages/server/src/services/notification.ts index a7d3a04a..22e1e0b5 100644 --- a/packages/server/src/services/notification.ts +++ b/packages/server/src/services/notification.ts @@ -1,4 +1,4 @@ -import { db } from "@/server/db"; +import { db } from "@dokploy/server/db"; import { type apiCreateDiscord, type apiCreateEmail, @@ -13,7 +13,7 @@ import { notifications, slack, telegram, -} from "@/server/db/schema"; +} from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/services/port.ts b/packages/server/src/services/port.ts index 19229a9c..1f66c014 100644 --- a/packages/server/src/services/port.ts +++ b/packages/server/src/services/port.ts @@ -1,5 +1,5 @@ -import { db } from "@/server/db"; -import { type apiCreatePort, ports } from "@/server/db/schema"; +import { db } from "@dokploy/server/db"; +import { type apiCreatePort, ports } from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/services/postgres.ts b/packages/server/src/services/postgres.ts index 3307141d..c94ddbbe 100644 --- a/packages/server/src/services/postgres.ts +++ b/packages/server/src/services/postgres.ts @@ -1,14 +1,18 @@ -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 { db } from "@dokploy/server/db"; +import { + type apiCreatePostgres, + backups, + postgres, +} from "@dokploy/server/db/schema"; +import { generateAppName } from "@dokploy/server/db/schema"; +import { generatePassword } from "@dokploy/server/templates/utils"; +import { buildPostgres } from "@dokploy/server/utils/databases/postgres"; +import { pullImage } from "@dokploy/server/utils/docker/utils"; import { TRPCError } from "@trpc/server"; import { eq, getTableColumns } from "drizzle-orm"; import { validUniqueServerAppName } from "./project"; -import { execAsyncRemote } from "@/server/utils/process/execAsync"; +import { execAsyncRemote } from "@dokploy/server/utils/process/execAsync"; export type Postgres = typeof postgres.$inferSelect; diff --git a/packages/server/src/services/project.ts b/packages/server/src/services/project.ts index 902dd06b..47e8ac40 100644 --- a/packages/server/src/services/project.ts +++ b/packages/server/src/services/project.ts @@ -1,4 +1,4 @@ -import { db } from "@/server/db"; +import { db } from "@dokploy/server/db"; import { type apiCreateProject, applications, @@ -8,7 +8,7 @@ import { postgres, projects, redis, -} from "@/server/db/schema"; +} from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/services/redirect.ts b/packages/server/src/services/redirect.ts index 972603f2..5a8b1aff 100644 --- a/packages/server/src/services/redirect.ts +++ b/packages/server/src/services/redirect.ts @@ -1,10 +1,10 @@ -import { db } from "@/server/db"; -import { type apiCreateRedirect, redirects } from "@/server/db/schema"; +import { db } from "@dokploy/server/db"; +import { type apiCreateRedirect, redirects } from "@dokploy/server/db/schema"; import { createRedirectMiddleware, removeRedirectMiddleware, updateRedirectMiddleware, -} from "@/server/utils/traefik/redirect"; +} from "@dokploy/server/utils/traefik/redirect"; import { TRPCError } from "@trpc/server"; import { desc, eq } from "drizzle-orm"; import type { z } from "zod"; diff --git a/packages/server/src/services/redis.ts b/packages/server/src/services/redis.ts index 9d3471a7..7809de28 100644 --- a/packages/server/src/services/redis.ts +++ b/packages/server/src/services/redis.ts @@ -1,14 +1,14 @@ -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 { db } from "@dokploy/server/db"; +import { type apiCreateRedis, redis } from "@dokploy/server/db/schema"; +import { generateAppName } from "@dokploy/server/db/schema"; +import { generatePassword } from "@dokploy/server/templates/utils"; +import { buildRedis } from "@dokploy/server/utils/databases/redis"; +import { pullImage } from "@dokploy/server/utils/docker/utils"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; import { validUniqueServerAppName } from "./project"; -import { execAsyncRemote } from "@/server/utils/process/execAsync"; +import { execAsyncRemote } from "@dokploy/server/utils/process/execAsync"; export type Redis = typeof redis.$inferSelect; diff --git a/packages/server/src/services/registry.ts b/packages/server/src/services/registry.ts index f85542b4..b03c11b9 100644 --- a/packages/server/src/services/registry.ts +++ b/packages/server/src/services/registry.ts @@ -1,6 +1,9 @@ -import { db } from "@/server/db"; -import { type apiCreateRegistry, registry } from "@/server/db/schema"; -import { execAsync, execAsyncRemote } from "@/server/utils/process/execAsync"; +import { db } from "@dokploy/server/db"; +import { type apiCreateRegistry, registry } from "@dokploy/server/db/schema"; +import { + execAsync, + execAsyncRemote, +} from "@dokploy/server/utils/process/execAsync"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; import { IS_CLOUD } from "../constants"; diff --git a/packages/server/src/services/security.ts b/packages/server/src/services/security.ts index 2da78e26..40a13bb0 100644 --- a/packages/server/src/services/security.ts +++ b/packages/server/src/services/security.ts @@ -1,9 +1,9 @@ -import { db } from "@/server/db"; -import { type apiCreateSecurity, security } from "@/server/db/schema"; +import { db } from "@dokploy/server/db"; +import { type apiCreateSecurity, security } from "@dokploy/server/db/schema"; import { createSecurityMiddleware, removeSecurityMiddleware, -} from "@/server/utils/traefik/security"; +} from "@dokploy/server/utils/traefik/security"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; import type { z } from "zod"; diff --git a/packages/server/src/services/server.ts b/packages/server/src/services/server.ts index 4cd79cdc..74ba5dd1 100644 --- a/packages/server/src/services/server.ts +++ b/packages/server/src/services/server.ts @@ -1,5 +1,5 @@ -import { db } from "@/server/db"; -import { type apiCreateServer, server } from "@/server/db/schema"; +import { db } from "@dokploy/server/db"; +import { type apiCreateServer, server } from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { desc, eq } from "drizzle-orm"; diff --git a/packages/server/src/services/settings.ts b/packages/server/src/services/settings.ts index eacfd8ca..8261843a 100644 --- a/packages/server/src/services/settings.ts +++ b/packages/server/src/services/settings.ts @@ -1,8 +1,8 @@ import { readdirSync } from "node:fs"; import { join } from "node:path"; -import { docker } from "@/server/constants"; -import { getServiceContainer } from "@/server/utils/docker/utils"; -import { execAsyncRemote } from "@/server/utils/process/execAsync"; +import { docker } from "@dokploy/server/constants"; +import { getServiceContainer } from "@dokploy/server/utils/docker/utils"; +import { execAsyncRemote } from "@dokploy/server/utils/process/execAsync"; // import packageInfo from "../../../package.json"; const updateIsAvailable = async () => { diff --git a/packages/server/src/services/ssh-key.ts b/packages/server/src/services/ssh-key.ts index f44ec22d..2bf292c7 100644 --- a/packages/server/src/services/ssh-key.ts +++ b/packages/server/src/services/ssh-key.ts @@ -1,11 +1,11 @@ -import { db } from "@/server/db"; +import { db } from "@dokploy/server/db"; import { type apiCreateSshKey, type apiFindOneSshKey, type apiRemoveSshKey, type apiUpdateSshKey, sshKeys, -} from "@/server/db/schema"; +} from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/services/user.ts b/packages/server/src/services/user.ts index 87149cd3..1cfe1260 100644 --- a/packages/server/src/services/user.ts +++ b/packages/server/src/services/user.ts @@ -1,5 +1,5 @@ -import { db } from "@/server/db"; -import { users } from "@/server/db/schema"; +import { db } from "@dokploy/server/db"; +import { users } from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; diff --git a/packages/server/src/setup/server-setup.ts b/packages/server/src/setup/server-setup.ts index d3f6a539..efd70a0d 100644 --- a/packages/server/src/setup/server-setup.ts +++ b/packages/server/src/setup/server-setup.ts @@ -1,15 +1,15 @@ import { createWriteStream } from "node:fs"; import path from "node:path"; -import { paths } from "@/server/constants"; +import { paths } from "@dokploy/server/constants"; import { createServerDeployment, updateDeploymentStatus, -} from "@/server/services/deployment"; -import { findServerById } from "@/server/services/server"; +} from "@dokploy/server/services/deployment"; +import { findServerById } from "@dokploy/server/services/server"; import { getDefaultMiddlewares, getDefaultServerTraefikConfig, -} from "@/server/setup/traefik-setup"; +} from "@dokploy/server/setup/traefik-setup"; import { Client } from "ssh2"; import { recreateDirectory } from "../utils/filesystem/directory"; diff --git a/packages/server/src/templates/utils/index.ts b/packages/server/src/templates/utils/index.ts index 4d8df591..c4a199de 100644 --- a/packages/server/src/templates/utils/index.ts +++ b/packages/server/src/templates/utils/index.ts @@ -1,7 +1,7 @@ import { randomBytes } from "node:crypto"; import { readFile } from "node:fs/promises"; import { join } from "node:path"; -import type { Domain } from "@/server/services/domain"; +import type { Domain } from "@dokploy/server/services/domain"; export interface Schema { serverIp: string; diff --git a/packages/server/src/types/with.ts b/packages/server/src/types/with.ts index 2bd864cc..c4826f73 100644 --- a/packages/server/src/types/with.ts +++ b/packages/server/src/types/with.ts @@ -1,4 +1,4 @@ -import type * as schema from "@/server/db/schema"; +import type * as schema from "@dokploy/server/db/schema"; import type { BuildQueryResult, DBQueryConfig, diff --git a/packages/server/src/utils/access-log/handler.ts b/packages/server/src/utils/access-log/handler.ts index db5c7f20..33c10e51 100644 --- a/packages/server/src/utils/access-log/handler.ts +++ b/packages/server/src/utils/access-log/handler.ts @@ -1,5 +1,5 @@ -import { IS_CLOUD, paths } from "@/server/constants"; -import { updateAdmin } from "@/server/services/admin"; +import { IS_CLOUD, paths } from "@dokploy/server/constants"; +import { updateAdmin } from "@dokploy/server/services/admin"; import { type RotatingFileStream, createStream } from "rotating-file-stream"; import { db } from "../../db"; import { execAsync } from "../process/execAsync"; diff --git a/packages/server/src/utils/backups/index.ts b/packages/server/src/utils/backups/index.ts index 8d0c1bf3..b1619253 100644 --- a/packages/server/src/utils/backups/index.ts +++ b/packages/server/src/utils/backups/index.ts @@ -1,5 +1,5 @@ -import { findAdmin } from "@/server/services/admin"; -import { getAllServers } from "@/server/services/server"; +import { findAdmin } from "@dokploy/server/services/admin"; +import { getAllServers } from "@dokploy/server/services/server"; import { scheduleJob } from "node-schedule"; import { db } from "../../db/index"; import { diff --git a/packages/server/src/utils/backups/mariadb.ts b/packages/server/src/utils/backups/mariadb.ts index c4ab1fe3..b8621b28 100644 --- a/packages/server/src/utils/backups/mariadb.ts +++ b/packages/server/src/utils/backups/mariadb.ts @@ -1,7 +1,7 @@ import path from "node:path"; -import type { BackupSchedule } from "@/server/services/backup"; -import type { Mariadb } from "@/server/services/mariadb"; -import { findProjectById } from "@/server/services/project"; +import type { BackupSchedule } from "@dokploy/server/services/backup"; +import type { Mariadb } from "@dokploy/server/services/mariadb"; +import { findProjectById } from "@dokploy/server/services/project"; import { getRemoteServiceContainer, getServiceContainer, diff --git a/packages/server/src/utils/backups/mongo.ts b/packages/server/src/utils/backups/mongo.ts index 6578a84a..3f76224f 100644 --- a/packages/server/src/utils/backups/mongo.ts +++ b/packages/server/src/utils/backups/mongo.ts @@ -1,7 +1,7 @@ import path from "node:path"; -import type { BackupSchedule } from "@/server/services/backup"; -import type { Mongo } from "@/server/services/mongo"; -import { findProjectById } from "@/server/services/project"; +import type { BackupSchedule } from "@dokploy/server/services/backup"; +import type { Mongo } from "@dokploy/server/services/mongo"; +import { findProjectById } from "@dokploy/server/services/project"; import { getRemoteServiceContainer, getServiceContainer, diff --git a/packages/server/src/utils/backups/mysql.ts b/packages/server/src/utils/backups/mysql.ts index 86d503e6..ea92ee84 100644 --- a/packages/server/src/utils/backups/mysql.ts +++ b/packages/server/src/utils/backups/mysql.ts @@ -1,8 +1,8 @@ import { unlink } from "node:fs/promises"; import path from "node:path"; -import type { BackupSchedule } from "@/server/services/backup"; -import type { MySql } from "@/server/services/mysql"; -import { findProjectById } from "@/server/services/project"; +import type { BackupSchedule } from "@dokploy/server/services/backup"; +import type { MySql } from "@dokploy/server/services/mysql"; +import { findProjectById } from "@dokploy/server/services/project"; import { getRemoteServiceContainer, getServiceContainer, diff --git a/packages/server/src/utils/backups/postgres.ts b/packages/server/src/utils/backups/postgres.ts index fd2dbbc8..fe3171d6 100644 --- a/packages/server/src/utils/backups/postgres.ts +++ b/packages/server/src/utils/backups/postgres.ts @@ -1,7 +1,7 @@ import path from "node:path"; -import type { BackupSchedule } from "@/server/services/backup"; -import type { Postgres } from "@/server/services/postgres"; -import { findProjectById } from "@/server/services/project"; +import type { BackupSchedule } from "@dokploy/server/services/backup"; +import type { Postgres } from "@dokploy/server/services/postgres"; +import { findProjectById } from "@dokploy/server/services/project"; import { getRemoteServiceContainer, getServiceContainer, diff --git a/packages/server/src/utils/backups/utils.ts b/packages/server/src/utils/backups/utils.ts index 8ecddd60..b9656ff2 100644 --- a/packages/server/src/utils/backups/utils.ts +++ b/packages/server/src/utils/backups/utils.ts @@ -1,5 +1,5 @@ -import type { BackupSchedule } from "@/server/services/backup"; -import type { Destination } from "@/server/services/destination"; +import type { BackupSchedule } from "@dokploy/server/services/backup"; +import type { Destination } from "@dokploy/server/services/destination"; import { scheduleJob, scheduledJobs } from "node-schedule"; import { runMariadbBackup } from "./mariadb"; import { runMongoBackup } from "./mongo"; diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index 47ec1520..7d3ce0ec 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -5,8 +5,8 @@ import { writeFileSync, } from "node:fs"; import { dirname, join } from "node:path"; -import { paths } from "@/server/constants"; -import type { InferResultType } from "@/server/types/with"; +import { paths } from "@dokploy/server/constants"; +import type { InferResultType } from "@dokploy/server/types/with"; import boxen from "boxen"; import { writeDomainsToCompose, diff --git a/packages/server/src/utils/builders/docker-file.ts b/packages/server/src/utils/builders/docker-file.ts index 0ee2f4b1..f8d4a929 100644 --- a/packages/server/src/utils/builders/docker-file.ts +++ b/packages/server/src/utils/builders/docker-file.ts @@ -1,5 +1,5 @@ import type { WriteStream } from "node:fs"; -import { prepareEnvironmentVariables } from "@/server/utils/docker/utils"; +import { prepareEnvironmentVariables } from "@dokploy/server/utils/docker/utils"; import type { ApplicationNested } from "."; import { getBuildAppDirectory, diff --git a/packages/server/src/utils/builders/drop.ts b/packages/server/src/utils/builders/drop.ts index 14307886..420cd7aa 100644 --- a/packages/server/src/utils/builders/drop.ts +++ b/packages/server/src/utils/builders/drop.ts @@ -1,8 +1,8 @@ import fs from "node:fs/promises"; import path, { join } from "node:path"; -import { paths } from "@/server/constants"; -import type { Application } from "@/server/services/application"; -import { findServerById } from "@/server/services/server"; +import { paths } from "@dokploy/server/constants"; +import type { Application } from "@dokploy/server/services/application"; +import { findServerById } from "@dokploy/server/services/server"; import AdmZip from "adm-zip"; import { Client, type SFTPWrapper } from "ssh2"; import { diff --git a/packages/server/src/utils/builders/index.ts b/packages/server/src/utils/builders/index.ts index 4f7262a8..cf155e45 100644 --- a/packages/server/src/utils/builders/index.ts +++ b/packages/server/src/utils/builders/index.ts @@ -1,5 +1,5 @@ import { createWriteStream } from "node:fs"; -import type { InferResultType } from "@/server/types/with"; +import type { InferResultType } from "@dokploy/server/types/with"; import type { CreateServiceOptions } from "dockerode"; import { uploadImage } from "../cluster/upload"; import { diff --git a/packages/server/src/utils/builders/nixpacks.ts b/packages/server/src/utils/builders/nixpacks.ts index bcc670d0..81e6f061 100644 --- a/packages/server/src/utils/builders/nixpacks.ts +++ b/packages/server/src/utils/builders/nixpacks.ts @@ -1,6 +1,9 @@ import { type WriteStream, existsSync, mkdirSync } from "node:fs"; import path from "node:path"; -import { buildStatic, getStaticCommand } from "@/server/utils/builders/static"; +import { + buildStatic, + getStaticCommand, +} from "@dokploy/server/utils/builders/static"; import { nanoid } from "nanoid"; import type { ApplicationNested } from "."; import { prepareEnvironmentVariables } from "../docker/utils"; diff --git a/packages/server/src/utils/builders/static.ts b/packages/server/src/utils/builders/static.ts index 2f3d4bc2..c46bdf2e 100644 --- a/packages/server/src/utils/builders/static.ts +++ b/packages/server/src/utils/builders/static.ts @@ -2,7 +2,7 @@ import type { WriteStream } from "node:fs"; import { buildCustomDocker, getDockerCommand, -} from "@/server/utils/builders/docker-file"; +} from "@dokploy/server/utils/builders/docker-file"; import type { ApplicationNested } from "."; import { createFile, getCreateFileCommand } from "../docker/utils"; import { getBuildAppDirectory } from "../filesystem/directory"; diff --git a/packages/server/src/utils/databases/mariadb.ts b/packages/server/src/utils/databases/mariadb.ts index 9465d47e..ab9a32a8 100644 --- a/packages/server/src/utils/databases/mariadb.ts +++ b/packages/server/src/utils/databases/mariadb.ts @@ -1,4 +1,4 @@ -import type { InferResultType } from "@/server/types/with"; +import type { InferResultType } from "@dokploy/server/types/with"; import type { CreateServiceOptions } from "dockerode"; import { calculateResources, diff --git a/packages/server/src/utils/databases/mongo.ts b/packages/server/src/utils/databases/mongo.ts index 6b02da86..352f7810 100644 --- a/packages/server/src/utils/databases/mongo.ts +++ b/packages/server/src/utils/databases/mongo.ts @@ -1,4 +1,4 @@ -import type { InferResultType } from "@/server/types/with"; +import type { InferResultType } from "@dokploy/server/types/with"; import type { CreateServiceOptions } from "dockerode"; import { calculateResources, diff --git a/packages/server/src/utils/databases/mysql.ts b/packages/server/src/utils/databases/mysql.ts index 3ad266b7..af625d20 100644 --- a/packages/server/src/utils/databases/mysql.ts +++ b/packages/server/src/utils/databases/mysql.ts @@ -1,4 +1,4 @@ -import type { InferResultType } from "@/server/types/with"; +import type { InferResultType } from "@dokploy/server/types/with"; import type { CreateServiceOptions } from "dockerode"; import { calculateResources, diff --git a/packages/server/src/utils/databases/postgres.ts b/packages/server/src/utils/databases/postgres.ts index f7984fbe..873ad4a5 100644 --- a/packages/server/src/utils/databases/postgres.ts +++ b/packages/server/src/utils/databases/postgres.ts @@ -1,4 +1,4 @@ -import type { InferResultType } from "@/server/types/with"; +import type { InferResultType } from "@dokploy/server/types/with"; import type { CreateServiceOptions } from "dockerode"; import { calculateResources, diff --git a/packages/server/src/utils/databases/redis.ts b/packages/server/src/utils/databases/redis.ts index 62d972a7..fc07bc01 100644 --- a/packages/server/src/utils/databases/redis.ts +++ b/packages/server/src/utils/databases/redis.ts @@ -1,4 +1,4 @@ -import type { InferResultType } from "@/server/types/with"; +import type { InferResultType } from "@dokploy/server/types/with"; import type { CreateServiceOptions } from "dockerode"; import { calculateResources, diff --git a/packages/server/src/utils/docker/compose.ts b/packages/server/src/utils/docker/compose.ts index 0a47c7d2..2cb909ab 100644 --- a/packages/server/src/utils/docker/compose.ts +++ b/packages/server/src/utils/docker/compose.ts @@ -1,5 +1,5 @@ import crypto from "node:crypto"; -import { findComposeById } from "@/server/services/compose"; +import { findComposeById } from "@dokploy/server/services/compose"; import { dump, load } from "js-yaml"; import { addSuffixToAllConfigs } from "./compose/configs"; import { addSuffixToAllNetworks } from "./compose/network"; diff --git a/packages/server/src/utils/docker/domain.ts b/packages/server/src/utils/docker/domain.ts index a2d1e617..28ede308 100644 --- a/packages/server/src/utils/docker/domain.ts +++ b/packages/server/src/utils/docker/domain.ts @@ -1,9 +1,9 @@ import fs, { existsSync, readFileSync } from "node:fs"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; -import { paths } from "@/server/constants"; -import type { Compose } from "@/server/services/compose"; -import type { Domain } from "@/server/services/domain"; +import { paths } from "@dokploy/server/constants"; +import type { Compose } from "@dokploy/server/services/compose"; +import type { Domain } from "@dokploy/server/services/domain"; import { dump, load } from "js-yaml"; import { execAsyncRemote } from "../process/execAsync"; import { diff --git a/packages/server/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts index 3dcc27ac..60793d15 100644 --- a/packages/server/src/utils/docker/utils.ts +++ b/packages/server/src/utils/docker/utils.ts @@ -1,7 +1,7 @@ import fs from "node:fs"; import path from "node:path"; import type { Readable } from "node:stream"; -import { docker, paths } from "@/server/constants"; +import { docker, paths } from "@dokploy/server/constants"; import type { ContainerInfo, ResourceRequirements } from "dockerode"; import { parse } from "dotenv"; import type { ApplicationNested } from "../builders"; diff --git a/packages/server/src/utils/filesystem/directory.ts b/packages/server/src/utils/filesystem/directory.ts index 017c74e0..0a28cbac 100644 --- a/packages/server/src/utils/filesystem/directory.ts +++ b/packages/server/src/utils/filesystem/directory.ts @@ -1,7 +1,7 @@ import fs, { promises as fsPromises } from "node:fs"; import path from "node:path"; -import { paths } from "@/server/constants"; -import type { Application } from "@/server/services/application"; +import { paths } from "@dokploy/server/constants"; +import type { Application } from "@dokploy/server/services/application"; import { execAsync, execAsyncRemote } from "../process/execAsync"; export const recreateDirectory = async (pathFolder: string): Promise => { diff --git a/packages/server/src/utils/notifications/build-error.ts b/packages/server/src/utils/notifications/build-error.ts index f1a7f3fe..703367ec 100644 --- a/packages/server/src/utils/notifications/build-error.ts +++ b/packages/server/src/utils/notifications/build-error.ts @@ -1,6 +1,6 @@ -import { db } from "@/server/db"; -import { notifications } from "@/server/db/schema"; -import BuildFailedEmail from "@/server/emails/emails/build-failed"; +import { db } from "@dokploy/server/db"; +import { notifications } from "@dokploy/server/db/schema"; +import BuildFailedEmail from "@dokploy/server/emails/emails/build-failed"; import { renderAsync } from "@react-email/components"; import { eq } from "drizzle-orm"; import { diff --git a/packages/server/src/utils/notifications/build-success.ts b/packages/server/src/utils/notifications/build-success.ts index 4bc21086..55cbb33d 100644 --- a/packages/server/src/utils/notifications/build-success.ts +++ b/packages/server/src/utils/notifications/build-success.ts @@ -1,6 +1,6 @@ -import { db } from "@/server/db"; -import { notifications } from "@/server/db/schema"; -import BuildSuccessEmail from "@/server/emails/emails/build-success"; +import { db } from "@dokploy/server/db"; +import { notifications } from "@dokploy/server/db/schema"; +import BuildSuccessEmail from "@dokploy/server/emails/emails/build-success"; import { renderAsync } from "@react-email/components"; import { eq } from "drizzle-orm"; import { diff --git a/packages/server/src/utils/notifications/database-backup.ts b/packages/server/src/utils/notifications/database-backup.ts index f631e224..1b2a6909 100644 --- a/packages/server/src/utils/notifications/database-backup.ts +++ b/packages/server/src/utils/notifications/database-backup.ts @@ -1,6 +1,6 @@ -import { db } from "@/server/db"; -import { notifications } from "@/server/db/schema"; -import DatabaseBackupEmail from "@/server/emails/emails/database-backup"; +import { db } from "@dokploy/server/db"; +import { notifications } from "@dokploy/server/db/schema"; +import DatabaseBackupEmail from "@dokploy/server/emails/emails/database-backup"; import { renderAsync } from "@react-email/components"; import { eq } from "drizzle-orm"; import { diff --git a/packages/server/src/utils/notifications/docker-cleanup.ts b/packages/server/src/utils/notifications/docker-cleanup.ts index 6f0f4a6e..a42657bc 100644 --- a/packages/server/src/utils/notifications/docker-cleanup.ts +++ b/packages/server/src/utils/notifications/docker-cleanup.ts @@ -1,6 +1,6 @@ -import { db } from "@/server/db"; -import { notifications } from "@/server/db/schema"; -import DockerCleanupEmail from "@/server/emails/emails/docker-cleanup"; +import { db } from "@dokploy/server/db"; +import { notifications } from "@dokploy/server/db/schema"; +import DockerCleanupEmail from "@dokploy/server/emails/emails/docker-cleanup"; import { renderAsync } from "@react-email/components"; import { eq } from "drizzle-orm"; import { diff --git a/packages/server/src/utils/notifications/dokploy-restart.ts b/packages/server/src/utils/notifications/dokploy-restart.ts index cd986d55..33bc32f0 100644 --- a/packages/server/src/utils/notifications/dokploy-restart.ts +++ b/packages/server/src/utils/notifications/dokploy-restart.ts @@ -1,6 +1,6 @@ -import { db } from "@/server/db"; -import { notifications } from "@/server/db/schema"; -import DokployRestartEmail from "@/server/emails/emails/dokploy-restart"; +import { db } from "@dokploy/server/db"; +import { notifications } from "@dokploy/server/db/schema"; +import DokployRestartEmail from "@dokploy/server/emails/emails/dokploy-restart"; import { renderAsync } from "@react-email/components"; import { eq } from "drizzle-orm"; import { diff --git a/packages/server/src/utils/notifications/utils.ts b/packages/server/src/utils/notifications/utils.ts index 56cb08fd..8327c33d 100644 --- a/packages/server/src/utils/notifications/utils.ts +++ b/packages/server/src/utils/notifications/utils.ts @@ -1,4 +1,9 @@ -import type { discord, email, slack, telegram } from "@/server/db/schema"; +import type { + discord, + email, + slack, + telegram, +} from "@dokploy/server/db/schema"; import nodemailer from "nodemailer"; export const sendEmailNotification = async ( diff --git a/packages/server/src/utils/process/execAsync.ts b/packages/server/src/utils/process/execAsync.ts index 5711bcb2..0bd8f588 100644 --- a/packages/server/src/utils/process/execAsync.ts +++ b/packages/server/src/utils/process/execAsync.ts @@ -1,6 +1,6 @@ import { exec } from "node:child_process"; import util from "node:util"; -import { findServerById } from "@/server/services/server"; +import { findServerById } from "@dokploy/server/services/server"; import { Client } from "ssh2"; export const execAsync = util.promisify(exec); diff --git a/packages/server/src/utils/providers/bitbucket.ts b/packages/server/src/utils/providers/bitbucket.ts index bcf6ca6d..ff5c4b60 100644 --- a/packages/server/src/utils/providers/bitbucket.ts +++ b/packages/server/src/utils/providers/bitbucket.ts @@ -1,13 +1,13 @@ import { createWriteStream } from "node:fs"; import { join } from "node:path"; -import { paths } from "@/server/constants"; +import { paths } from "@dokploy/server/constants"; import type { apiBitbucketTestConnection, apiFindBitbucketBranches, -} from "@/server/db/schema"; -import { findBitbucketById } from "@/server/services/bitbucket"; -import type { Compose } from "@/server/services/compose"; -import type { InferResultType } from "@/server/types/with"; +} from "@dokploy/server/db/schema"; +import { findBitbucketById } from "@dokploy/server/services/bitbucket"; +import type { Compose } from "@dokploy/server/services/compose"; +import type { InferResultType } from "@dokploy/server/types/with"; import { TRPCError } from "@trpc/server"; import { recreateDirectory } from "../filesystem/directory"; import { execAsyncRemote } from "../process/execAsync"; diff --git a/packages/server/src/utils/providers/git.ts b/packages/server/src/utils/providers/git.ts index c504d65a..6d2e34ed 100644 --- a/packages/server/src/utils/providers/git.ts +++ b/packages/server/src/utils/providers/git.ts @@ -1,8 +1,11 @@ import { createWriteStream } from "node:fs"; import path, { join } from "node:path"; -import { paths } from "@/server/constants"; -import type { Compose } from "@/server/services/compose"; -import { findSSHKeyById, updateSSHKeyById } from "@/server/services/ssh-key"; +import { paths } from "@dokploy/server/constants"; +import type { Compose } from "@dokploy/server/services/compose"; +import { + findSSHKeyById, + updateSSHKeyById, +} from "@dokploy/server/services/ssh-key"; import { TRPCError } from "@trpc/server"; import { recreateDirectory } from "../filesystem/directory"; import { execAsync, execAsyncRemote } from "../process/execAsync"; diff --git a/packages/server/src/utils/providers/github.ts b/packages/server/src/utils/providers/github.ts index 9062df85..61d5d30c 100644 --- a/packages/server/src/utils/providers/github.ts +++ b/packages/server/src/utils/providers/github.ts @@ -1,16 +1,16 @@ import { createWriteStream } from "node:fs"; import { join } from "node:path"; -import { paths } from "@/server/constants"; -import type { InferResultType } from "@/server/types/with"; +import { paths } from "@dokploy/server/constants"; +import type { InferResultType } from "@dokploy/server/types/with"; import { createAppAuth } from "@octokit/auth-app"; import { TRPCError } from "@trpc/server"; import { Octokit } from "octokit"; import { recreateDirectory } from "../filesystem/directory"; import { spawnAsync } from "../process/spawnAsync"; -import type { apiFindGithubBranches } from "@/server/db/schema"; -import type { Compose } from "@/server/services/compose"; -import { type Github, findGithubById } from "@/server/services/github"; +import type { apiFindGithubBranches } from "@dokploy/server/db/schema"; +import type { Compose } from "@dokploy/server/services/compose"; +import { type Github, findGithubById } from "@dokploy/server/services/github"; import { execAsyncRemote } from "../process/execAsync"; export const authGithub = (githubProvider: Github): Octokit => { diff --git a/packages/server/src/utils/providers/gitlab.ts b/packages/server/src/utils/providers/gitlab.ts index 34036167..38845af5 100644 --- a/packages/server/src/utils/providers/gitlab.ts +++ b/packages/server/src/utils/providers/gitlab.ts @@ -1,14 +1,14 @@ import { createWriteStream } from "node:fs"; import { join } from "node:path"; -import { paths } from "@/server/constants"; -import type { apiGitlabTestConnection } from "@/server/db/schema"; -import type { Compose } from "@/server/services/compose"; +import { paths } from "@dokploy/server/constants"; +import type { apiGitlabTestConnection } from "@dokploy/server/db/schema"; +import type { Compose } from "@dokploy/server/services/compose"; import { type Gitlab, findGitlabById, updateGitlab, -} from "@/server/services/gitlab"; -import type { InferResultType } from "@/server/types/with"; +} from "@dokploy/server/services/gitlab"; +import type { InferResultType } from "@dokploy/server/types/with"; import { TRPCError } from "@trpc/server"; import { recreateDirectory } from "../filesystem/directory"; import { execAsyncRemote } from "../process/execAsync"; diff --git a/packages/server/src/utils/providers/raw.ts b/packages/server/src/utils/providers/raw.ts index bf7c858b..34ba0012 100644 --- a/packages/server/src/utils/providers/raw.ts +++ b/packages/server/src/utils/providers/raw.ts @@ -1,8 +1,8 @@ import { createWriteStream } from "node:fs"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; -import { paths } from "@/server/constants"; -import type { Compose } from "@/server/services/compose"; +import { paths } from "@dokploy/server/constants"; +import type { Compose } from "@dokploy/server/services/compose"; import { encodeBase64 } from "../docker/utils"; import { recreateDirectory } from "../filesystem/directory"; import { execAsyncRemote } from "../process/execAsync"; diff --git a/packages/server/src/utils/servers/remote-docker.ts b/packages/server/src/utils/servers/remote-docker.ts index c129df83..27bad561 100644 --- a/packages/server/src/utils/servers/remote-docker.ts +++ b/packages/server/src/utils/servers/remote-docker.ts @@ -1,5 +1,5 @@ -import { docker } from "@/server/constants"; -import { findServerById } from "@/server/services/server"; +import { docker } from "@dokploy/server/constants"; +import { findServerById } from "@dokploy/server/services/server"; import Dockerode from "dockerode"; export const getRemoteDocker = async (serverId?: string | null) => { diff --git a/packages/server/src/utils/traefik/application.ts b/packages/server/src/utils/traefik/application.ts index 66c51cbf..4434d858 100644 --- a/packages/server/src/utils/traefik/application.ts +++ b/packages/server/src/utils/traefik/application.ts @@ -1,7 +1,7 @@ import fs, { writeFileSync } from "node:fs"; import path from "node:path"; -import { paths } from "@/server/constants"; -import type { Domain } from "@/server/services/domain"; +import { paths } from "@dokploy/server/constants"; +import type { Domain } from "@dokploy/server/services/domain"; import { dump, load } from "js-yaml"; import { encodeBase64 } from "../docker/utils"; import { execAsyncRemote } from "../process/execAsync"; diff --git a/packages/server/src/utils/traefik/domain.ts b/packages/server/src/utils/traefik/domain.ts index e0a865e7..a6c878e7 100644 --- a/packages/server/src/utils/traefik/domain.ts +++ b/packages/server/src/utils/traefik/domain.ts @@ -1,4 +1,4 @@ -import type { Domain } from "@/server/services/domain"; +import type { Domain } from "@dokploy/server/services/domain"; import type { ApplicationNested } from "../builders"; import { createServiceConfig, diff --git a/packages/server/src/utils/traefik/middleware.ts b/packages/server/src/utils/traefik/middleware.ts index df836051..60345f66 100644 --- a/packages/server/src/utils/traefik/middleware.ts +++ b/packages/server/src/utils/traefik/middleware.ts @@ -1,6 +1,6 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs"; import { join } from "node:path"; -import { paths } from "@/server/constants"; +import { paths } from "@dokploy/server/constants"; import { dump, load } from "js-yaml"; import type { ApplicationNested } from "../builders"; import { execAsyncRemote } from "../process/execAsync"; diff --git a/packages/server/src/utils/traefik/redirect.ts b/packages/server/src/utils/traefik/redirect.ts index 604dadc2..e9b5a94a 100644 --- a/packages/server/src/utils/traefik/redirect.ts +++ b/packages/server/src/utils/traefik/redirect.ts @@ -1,4 +1,4 @@ -import type { Redirect } from "@/server/services/redirect"; +import type { Redirect } from "@dokploy/server/services/redirect"; import type { ApplicationNested } from "../builders"; import { loadOrCreateConfig, diff --git a/packages/server/src/utils/traefik/security.ts b/packages/server/src/utils/traefik/security.ts index ae0ff876..2ded8235 100644 --- a/packages/server/src/utils/traefik/security.ts +++ b/packages/server/src/utils/traefik/security.ts @@ -1,4 +1,4 @@ -import type { Security } from "@/server/services/security"; +import type { Security } from "@dokploy/server/services/security"; import * as bcrypt from "bcrypt"; import type { ApplicationNested } from "../builders"; import { diff --git a/packages/server/src/utils/traefik/web-server.ts b/packages/server/src/utils/traefik/web-server.ts index cd8f8d1a..0aa4d35d 100644 --- a/packages/server/src/utils/traefik/web-server.ts +++ b/packages/server/src/utils/traefik/web-server.ts @@ -1,7 +1,7 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs"; import { join } from "node:path"; -import { paths } from "@/server/constants"; -import type { Admin } from "@/server/services/admin"; +import { paths } from "@dokploy/server/constants"; +import type { Admin } from "@dokploy/server/services/admin"; import { dump, load } from "js-yaml"; import { loadOrCreateConfig, writeTraefikConfig } from "./application"; import type { FileConfig } from "./file-types"; diff --git a/packages/server/src/wss/docker-container-logs.ts b/packages/server/src/wss/docker-container-logs.ts index e01e82a7..e800fee9 100644 --- a/packages/server/src/wss/docker-container-logs.ts +++ b/packages/server/src/wss/docker-container-logs.ts @@ -1,5 +1,5 @@ import type http from "node:http"; -import { findServerById } from "@/server/services/server"; +import { findServerById } from "@dokploy/server/services/server"; import { spawn } from "node-pty"; import { Client } from "ssh2"; import { WebSocketServer } from "ws"; diff --git a/packages/server/src/wss/docker-container-terminal.ts b/packages/server/src/wss/docker-container-terminal.ts index 0a944df5..8b5b034e 100644 --- a/packages/server/src/wss/docker-container-terminal.ts +++ b/packages/server/src/wss/docker-container-terminal.ts @@ -1,5 +1,5 @@ import type http from "node:http"; -import { findServerById } from "@/server/services/server"; +import { findServerById } from "@dokploy/server/services/server"; import { spawn } from "node-pty"; import { Client } from "ssh2"; import { WebSocketServer } from "ws"; diff --git a/packages/server/src/wss/listen-deployment.ts b/packages/server/src/wss/listen-deployment.ts index 0ff633b5..d72c528b 100644 --- a/packages/server/src/wss/listen-deployment.ts +++ b/packages/server/src/wss/listen-deployment.ts @@ -1,6 +1,6 @@ import { spawn } from "node:child_process"; import type http from "node:http"; -import { findServerById } from "@/server/services/server"; +import { findServerById } from "@dokploy/server/services/server"; import { Client } from "ssh2"; import { WebSocketServer } from "ws"; import { validateWebSocketRequest } from "../auth/auth"; diff --git a/packages/server/src/wss/terminal.ts b/packages/server/src/wss/terminal.ts index 019efd43..562040d7 100644 --- a/packages/server/src/wss/terminal.ts +++ b/packages/server/src/wss/terminal.ts @@ -1,6 +1,6 @@ import type http from "node:http"; import path from "node:path"; -import { findServerById } from "@/server/services/server"; +import { findServerById } from "@dokploy/server/services/server"; import { spawn } from "node-pty"; import { publicIpv4, publicIpv6 } from "public-ip"; import { WebSocketServer } from "ws"; diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index 1f75de81..0eb9923a 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -12,7 +12,6 @@ "strict": true, "noUncheckedIndexedAccess": true, "checkJs": true, - /* Bundled projects */ "lib": ["dom", "dom.iterable", "ES2022"], "noEmit": true, @@ -20,16 +19,15 @@ "moduleResolution": "Bundler", "jsx": "preserve", "plugins": [{ "name": "next" }], - "incremental": true, "outDir": "./dist", /* Path Aliases */ "baseUrl": ".", "paths": { - "@/server/*": ["./src/*"] + "@dokploy/server/*": ["./src/*"] } }, - "include": ["next-env.d.ts", "./src/**/*.ts"], + "exclude": [ "tsup.ts", "node_modules", diff --git a/packages/server/tsconfig.server.json b/packages/server/tsconfig.server.json index 0de10162..7f349eb8 100644 --- a/packages/server/tsconfig.server.json +++ b/packages/server/tsconfig.server.json @@ -10,10 +10,9 @@ "moduleResolution": "Node", "rootDir": "./src", "baseUrl": ".", - "incremental": false, "jsx": "react-jsx", "paths": { - "@/server/*": ["src/*"] + "@dokploy/server/*": ["./src/*"] } }, "include": ["next-env.d.ts", "./src/**/*"], diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 01ed3fac..d78af3e0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -241,7 +241,7 @@ importers: version: 10.45.2(@trpc/server@10.45.2) '@trpc/next': specifier: ^10.43.6 - version: 10.45.2(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/client@10.45.2(@trpc/server@10.45.2))(@trpc/react-query@10.45.2(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/client@10.45.2(@trpc/server@10.45.2))(@trpc/server@10.45.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/server@10.45.2)(next@14.2.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 10.45.2(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/client@10.45.2(@trpc/server@10.45.2))(@trpc/react-query@10.45.2(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/client@10.45.2(@trpc/server@10.45.2))(@trpc/server@10.45.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/server@10.45.2)(next@15.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@trpc/react-query': specifier: ^10.43.6 version: 10.45.2(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/client@10.45.2(@trpc/server@10.45.2))(@trpc/server@10.45.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) @@ -315,11 +315,11 @@ importers: specifier: '3' version: 3.3.7 next: - specifier: ^14.1.3 - version: 14.2.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + specifier: ^15.0.1 + version: 15.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0) next-themes: specifier: ^0.2.1 - version: 0.2.1(next@14.2.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 0.2.1(next@15.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0) node-pty: specifier: 1.0.0 version: 1.0.0 @@ -756,6 +756,9 @@ importers: esbuild: specifier: 0.20.2 version: 0.20.2 + esbuild-plugin-alias: + specifier: 0.2.1 + version: 0.2.1 postcss: specifier: ^8.4.31 version: 8.4.40 @@ -1033,6 +1036,9 @@ packages: '@emnapi/runtime@0.45.0': resolution: {integrity: sha512-Txumi3td7J4A/xTTwlssKieHKTGl3j4A1tglBx72auZ49YK7ePY6XZricgIg9mnZT4xPfA+UPCUdnhRuEFDL+w==} + '@emnapi/runtime@1.3.1': + resolution: {integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==} + '@esbuild-kit/core-utils@3.3.2': resolution: {integrity: sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==} @@ -1681,6 +1687,111 @@ packages: resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} deprecated: Use @eslint/object-schema instead + '@img/sharp-darwin-arm64@0.33.5': + resolution: {integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] + os: [darwin] + + '@img/sharp-darwin-x64@0.33.5': + resolution: {integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [darwin] + + '@img/sharp-libvips-darwin-arm64@1.0.4': + resolution: {integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==} + cpu: [arm64] + os: [darwin] + + '@img/sharp-libvips-darwin-x64@1.0.4': + resolution: {integrity: sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==} + cpu: [x64] + os: [darwin] + + '@img/sharp-libvips-linux-arm64@1.0.4': + resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==} + cpu: [arm64] + os: [linux] + + '@img/sharp-libvips-linux-arm@1.0.5': + resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==} + cpu: [arm] + os: [linux] + + '@img/sharp-libvips-linux-s390x@1.0.4': + resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==} + cpu: [s390x] + os: [linux] + + '@img/sharp-libvips-linux-x64@1.0.4': + resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==} + cpu: [x64] + os: [linux] + + '@img/sharp-libvips-linuxmusl-arm64@1.0.4': + resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==} + cpu: [arm64] + os: [linux] + + '@img/sharp-libvips-linuxmusl-x64@1.0.4': + resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==} + cpu: [x64] + os: [linux] + + '@img/sharp-linux-arm64@0.33.5': + resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] + os: [linux] + + '@img/sharp-linux-arm@0.33.5': + resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm] + os: [linux] + + '@img/sharp-linux-s390x@0.33.5': + resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [s390x] + os: [linux] + + '@img/sharp-linux-x64@0.33.5': + resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [linux] + + '@img/sharp-linuxmusl-arm64@0.33.5': + resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] + os: [linux] + + '@img/sharp-linuxmusl-x64@0.33.5': + resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [linux] + + '@img/sharp-wasm32@0.33.5': + resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [wasm32] + + '@img/sharp-win32-ia32@0.33.5': + resolution: {integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [ia32] + os: [win32] + + '@img/sharp-win32-x64@0.33.5': + resolution: {integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [win32] + '@ioredis/commands@1.2.0': resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==} @@ -1808,6 +1919,9 @@ packages: '@next/env@14.2.5': resolution: {integrity: sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA==} + '@next/env@15.0.1': + resolution: {integrity: sha512-lc4HeDUKO9gxxlM5G2knTRifqhsY6yYpwuHspBZdboZe0Gp+rZHBNNSIjmQKDJIdRXiXGyVnSD6gafrbQPvILQ==} + '@next/eslint-plugin-next@13.4.16': resolution: {integrity: sha512-QuFtQl+oSEEQb0HMYBdvBoUaTiMxbY3go/MFkF3zOnfY0t84+IbAX78cw8ZCfr6cA6UcTq3nMIlCrHwDC/moxg==} @@ -1823,6 +1937,12 @@ packages: cpu: [arm64] os: [darwin] + '@next/swc-darwin-arm64@15.0.1': + resolution: {integrity: sha512-C9k/Xv4sxkQRTA37Z6MzNq3Yb1BJMmSqjmwowoWEpbXTkAdfOwnoKOpAb71ItSzoA26yUTIo6ZhN8rKGu4ExQw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + '@next/swc-darwin-x64@14.2.2': resolution: {integrity: sha512-x7Afi/jt0ZBRUZHTi49yyej4o8znfIMHO4RvThuoc0P+uli8Jd99y5GKjxoYunPKsXL09xBXEM1+OQy2xEL0Ag==} engines: {node: '>= 10'} @@ -1835,6 +1955,12 @@ packages: cpu: [x64] os: [darwin] + '@next/swc-darwin-x64@15.0.1': + resolution: {integrity: sha512-uHl13HXOuq1G7ovWFxCACDJHTSDVbn/sbLv8V1p+7KIvTrYQ5HNoSmKBdYeEKRRCbEmd+OohOgg9YOp8Ux3MBg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + '@next/swc-linux-arm64-gnu@14.2.2': resolution: {integrity: sha512-zbfPtkk7L41ODMJwSp5VbmPozPmMMQrzAc0HAUomVeVIIwlDGs/UCqLJvLNDt4jpWgc21SjjyIn762lNGrMaUA==} engines: {node: '>= 10'} @@ -1847,6 +1973,12 @@ packages: cpu: [arm64] os: [linux] + '@next/swc-linux-arm64-gnu@15.0.1': + resolution: {integrity: sha512-LvyhvxHOihFTEIbb35KxOc3q8w8G4xAAAH/AQnsYDEnOvwawjL2eawsB59AX02ki6LJdgDaHoTEnC54Gw+82xw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + '@next/swc-linux-arm64-musl@14.2.2': resolution: {integrity: sha512-wPbS3pI/JU16rm3XdLvvTmlsmm1nd+sBa2ohXgBZcShX4TgOjD4R+RqHKlI1cjo/jDZKXt6OxmcU0Iys0OC/yg==} engines: {node: '>= 10'} @@ -1859,6 +1991,12 @@ packages: cpu: [arm64] os: [linux] + '@next/swc-linux-arm64-musl@15.0.1': + resolution: {integrity: sha512-vFmCGUFNyk/A5/BYcQNhAQqPIw01RJaK6dRO+ZEhz0DncoW+hJW1kZ8aH2UvTX27zPq3m85zN5waMSbZEmANcQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + '@next/swc-linux-x64-gnu@14.2.2': resolution: {integrity: sha512-NqWOHqqq8iC9tuHvZxjQ2tX+jWy2X9y8NX2mcB4sj2bIccuCxbIZrU/ThFPZZPauygajZuVQ6zediejQHwZHwQ==} engines: {node: '>= 10'} @@ -1871,6 +2009,12 @@ packages: cpu: [x64] os: [linux] + '@next/swc-linux-x64-gnu@15.0.1': + resolution: {integrity: sha512-5by7IYq0NCF8rouz6Qg9T97jYU68kaClHPfGpQG2lCZpSYHtSPQF1kjnqBTd34RIqPKMbCa4DqCufirgr8HM5w==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + '@next/swc-linux-x64-musl@14.2.2': resolution: {integrity: sha512-lGepHhwb9sGhCcU7999+iK1ZZT+6rrIoVg40MP7DZski9GIZP80wORSbt5kJzh9v2x2ev2lxC6VgwMQT0PcgTA==} engines: {node: '>= 10'} @@ -1883,6 +2027,12 @@ packages: cpu: [x64] os: [linux] + '@next/swc-linux-x64-musl@15.0.1': + resolution: {integrity: sha512-lmYr6H3JyDNBJLzklGXLfbehU3ay78a+b6UmBGlHls4xhDXBNZfgb0aI67sflrX+cGBnv1LgmWzFlYrAYxS1Qw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + '@next/swc-win32-arm64-msvc@14.2.2': resolution: {integrity: sha512-TZSh/48SfcLEQ4rD25VVn2kdIgUWmMflRX3OiyPwGNXn3NiyPqhqei/BaqCYXViIQ+6QsG9R0C8LftMqy8JPMA==} engines: {node: '>= 10'} @@ -1895,6 +2045,12 @@ packages: cpu: [arm64] os: [win32] + '@next/swc-win32-arm64-msvc@15.0.1': + resolution: {integrity: sha512-DS8wQtl6diAj0eZTdH0sefykm4iXMbHT4MOvLwqZiIkeezKpkgPFcEdFlz3vKvXa2R/2UEgMh48z1nEpNhjeOQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + '@next/swc-win32-ia32-msvc@14.2.2': resolution: {integrity: sha512-M0tBVNMEBJN2ZNQWlcekMn6pvLria7Sa2Fai5znm7CCJz4pP3lrvlSxhKdkCerk0D9E0bqx5yAo3o2Q7RrD4gA==} engines: {node: '>= 10'} @@ -1919,6 +2075,12 @@ packages: cpu: [x64] os: [win32] + '@next/swc-win32-x64-msvc@15.0.1': + resolution: {integrity: sha512-4Ho2ggvDdMKlZ/0e9HNdZ9ngeaBwtc+2VS5oCeqrbXqOgutX6I4U2X/42VBw0o+M5evn4/7v3zKgGHo+9v/VjA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + '@noble/hashes@1.5.0': resolution: {integrity: sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==} engines: {node: ^14.21.3 || >=16} @@ -3427,6 +3589,9 @@ packages: '@swc/counter@0.1.3': resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} + '@swc/helpers@0.5.13': + resolution: {integrity: sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==} + '@swc/helpers@0.5.5': resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==} @@ -4325,10 +4490,17 @@ packages: color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + color-string@1.9.1: + resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==} + color-support@1.1.3: resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} hasBin: true + color@4.2.3: + resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==} + engines: {node: '>=12.5.0'} + colorette@2.0.20: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} @@ -4933,6 +5105,9 @@ packages: es6-weak-map@2.0.3: resolution: {integrity: sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==} + esbuild-plugin-alias@0.2.1: + resolution: {integrity: sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==} + esbuild-register@3.6.0: resolution: {integrity: sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==} peerDependencies: @@ -5673,6 +5848,9 @@ packages: is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} + is-arrayish@0.3.2: + resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==} + is-async-function@2.0.0: resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==} engines: {node: '>= 0.4'} @@ -6532,6 +6710,27 @@ packages: sass: optional: true + next@15.0.1: + resolution: {integrity: sha512-PSkFkr/w7UnFWm+EP8y/QpHrJXMqpZzAXpergB/EqLPOh4SGPJXv1wj4mslr2hUZBAS9pX7/9YLIdxTv6fwytw==} + engines: {node: '>=18.18.0'} + hasBin: true + peerDependencies: + '@opentelemetry/api': ^1.1.0 + '@playwright/test': ^1.41.2 + babel-plugin-react-compiler: '*' + react: ^18.2.0 || 19.0.0-rc-69d4b800-20241021 + react-dom: ^18.2.0 || 19.0.0-rc-69d4b800-20241021 + sass: ^1.3.0 + peerDependenciesMeta: + '@opentelemetry/api': + optional: true + '@playwright/test': + optional: true + babel-plugin-react-compiler: + optional: true + sass: + optional: true + node-abi@3.68.0: resolution: {integrity: sha512-7vbj10trelExNjFSBm5kTvZXXa7pZyKWx9RCKIyqe6I9Ev3IzGpQoqBP3a+cOdxY+pWj6VkP28n/2wWysBHD/A==} engines: {node: '>=10'} @@ -7464,6 +7663,11 @@ packages: engines: {node: '>=10'} hasBin: true + semver@7.6.3: + resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==} + engines: {node: '>=10'} + hasBin: true + serialize-error@8.1.0: resolution: {integrity: sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==} engines: {node: '>=10'} @@ -7489,6 +7693,10 @@ packages: resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==} hasBin: true + sharp@0.33.5: + resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} @@ -7524,6 +7732,9 @@ packages: simple-get@4.0.1: resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==} + simple-swizzle@0.2.2: + resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} + sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} @@ -7715,6 +7926,19 @@ packages: babel-plugin-macros: optional: true + styled-jsx@5.1.6: + resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==} + engines: {node: '>= 12.0.0'} + peerDependencies: + '@babel/core': '*' + babel-plugin-macros: '*' + react: '>= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0' + peerDependenciesMeta: + '@babel/core': + optional: true + babel-plugin-macros: + optional: true + sucrase@3.35.0: resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} engines: {node: '>=16 || 14 >=14.17'} @@ -8666,6 +8890,11 @@ snapshots: tslib: 2.6.3 optional: true + '@emnapi/runtime@1.3.1': + dependencies: + tslib: 2.6.3 + optional: true + '@esbuild-kit/core-utils@3.3.2': dependencies: esbuild: 0.18.20 @@ -9057,6 +9286,81 @@ snapshots: '@humanwhocodes/object-schema@2.0.3': {} + '@img/sharp-darwin-arm64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-darwin-arm64': 1.0.4 + optional: true + + '@img/sharp-darwin-x64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-darwin-x64': 1.0.4 + optional: true + + '@img/sharp-libvips-darwin-arm64@1.0.4': + optional: true + + '@img/sharp-libvips-darwin-x64@1.0.4': + optional: true + + '@img/sharp-libvips-linux-arm64@1.0.4': + optional: true + + '@img/sharp-libvips-linux-arm@1.0.5': + optional: true + + '@img/sharp-libvips-linux-s390x@1.0.4': + optional: true + + '@img/sharp-libvips-linux-x64@1.0.4': + optional: true + + '@img/sharp-libvips-linuxmusl-arm64@1.0.4': + optional: true + + '@img/sharp-libvips-linuxmusl-x64@1.0.4': + optional: true + + '@img/sharp-linux-arm64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linux-arm64': 1.0.4 + optional: true + + '@img/sharp-linux-arm@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linux-arm': 1.0.5 + optional: true + + '@img/sharp-linux-s390x@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linux-s390x': 1.0.4 + optional: true + + '@img/sharp-linux-x64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linux-x64': 1.0.4 + optional: true + + '@img/sharp-linuxmusl-arm64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linuxmusl-arm64': 1.0.4 + optional: true + + '@img/sharp-linuxmusl-x64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linuxmusl-x64': 1.0.4 + optional: true + + '@img/sharp-wasm32@0.33.5': + dependencies: + '@emnapi/runtime': 1.3.1 + optional: true + + '@img/sharp-win32-ia32@0.33.5': + optional: true + + '@img/sharp-win32-x64@0.33.5': + optional: true + '@ioredis/commands@1.2.0': {} '@isaacs/cliui@8.0.2': @@ -9212,6 +9516,8 @@ snapshots: '@next/env@14.2.5': {} + '@next/env@15.0.1': {} + '@next/eslint-plugin-next@13.4.16': dependencies: glob: 7.1.7 @@ -9222,42 +9528,63 @@ snapshots: '@next/swc-darwin-arm64@14.2.5': optional: true + '@next/swc-darwin-arm64@15.0.1': + optional: true + '@next/swc-darwin-x64@14.2.2': optional: true '@next/swc-darwin-x64@14.2.5': optional: true + '@next/swc-darwin-x64@15.0.1': + optional: true + '@next/swc-linux-arm64-gnu@14.2.2': optional: true '@next/swc-linux-arm64-gnu@14.2.5': optional: true + '@next/swc-linux-arm64-gnu@15.0.1': + optional: true + '@next/swc-linux-arm64-musl@14.2.2': optional: true '@next/swc-linux-arm64-musl@14.2.5': optional: true + '@next/swc-linux-arm64-musl@15.0.1': + optional: true + '@next/swc-linux-x64-gnu@14.2.2': optional: true '@next/swc-linux-x64-gnu@14.2.5': optional: true + '@next/swc-linux-x64-gnu@15.0.1': + optional: true + '@next/swc-linux-x64-musl@14.2.2': optional: true '@next/swc-linux-x64-musl@14.2.5': optional: true + '@next/swc-linux-x64-musl@15.0.1': + optional: true + '@next/swc-win32-arm64-msvc@14.2.2': optional: true '@next/swc-win32-arm64-msvc@14.2.5': optional: true + '@next/swc-win32-arm64-msvc@15.0.1': + optional: true + '@next/swc-win32-ia32-msvc@14.2.2': optional: true @@ -9270,6 +9597,9 @@ snapshots: '@next/swc-win32-x64-msvc@14.2.5': optional: true + '@next/swc-win32-x64-msvc@15.0.1': + optional: true + '@noble/hashes@1.5.0': {} '@node-rs/argon2-android-arm-eabi@1.7.0': @@ -11363,6 +11693,10 @@ snapshots: '@swc/counter@0.1.3': {} + '@swc/helpers@0.5.13': + dependencies: + tslib: 2.6.3 + '@swc/helpers@0.5.5': dependencies: '@swc/counter': 0.1.3 @@ -11410,13 +11744,13 @@ snapshots: dependencies: '@trpc/server': 10.45.2 - '@trpc/next@10.45.2(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/client@10.45.2(@trpc/server@10.45.2))(@trpc/react-query@10.45.2(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/client@10.45.2(@trpc/server@10.45.2))(@trpc/server@10.45.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/server@10.45.2)(next@14.2.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + '@trpc/next@10.45.2(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/client@10.45.2(@trpc/server@10.45.2))(@trpc/react-query@10.45.2(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/client@10.45.2(@trpc/server@10.45.2))(@trpc/server@10.45.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/server@10.45.2)(next@15.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: '@tanstack/react-query': 4.36.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@trpc/client': 10.45.2(@trpc/server@10.45.2) '@trpc/react-query': 10.45.2(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@trpc/client@10.45.2(@trpc/server@10.45.2))(@trpc/server@10.45.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@trpc/server': 10.45.2 - next: 14.2.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + next: 15.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -12403,8 +12737,20 @@ snapshots: color-name@1.1.4: {} + color-string@1.9.1: + dependencies: + color-name: 1.1.4 + simple-swizzle: 0.2.2 + optional: true + color-support@1.1.3: {} + color@4.2.3: + dependencies: + color-convert: 2.0.1 + color-string: 1.9.1 + optional: true + colorette@2.0.20: {} combined-stream@1.0.8: @@ -12980,6 +13326,8 @@ snapshots: es6-iterator: 2.0.3 es6-symbol: 3.1.4 + esbuild-plugin-alias@0.2.1: {} + esbuild-register@3.6.0(esbuild@0.19.12): dependencies: debug: 4.3.7 @@ -14014,6 +14362,9 @@ snapshots: is-arrayish@0.2.1: {} + is-arrayish@0.3.2: + optional: true + is-async-function@2.0.0: dependencies: has-tostringtag: 1.0.2 @@ -15053,9 +15404,9 @@ snapshots: react: 18.2.0 use-intl: 3.19.0(react@18.2.0) - next-themes@0.2.1(next@14.2.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0): + next-themes@0.2.1(next@15.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0): dependencies: - next: 14.2.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + next: 15.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -15091,31 +15442,6 @@ snapshots: - '@babel/core' - babel-plugin-macros - next@14.2.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0): - dependencies: - '@next/env': 14.2.5 - '@swc/helpers': 0.5.5 - busboy: 1.6.0 - caniuse-lite: 1.0.30001643 - graceful-fs: 4.2.11 - postcss: 8.4.31 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - styled-jsx: 5.1.1(react@18.2.0) - optionalDependencies: - '@next/swc-darwin-arm64': 14.2.5 - '@next/swc-darwin-x64': 14.2.5 - '@next/swc-linux-arm64-gnu': 14.2.5 - '@next/swc-linux-arm64-musl': 14.2.5 - '@next/swc-linux-x64-gnu': 14.2.5 - '@next/swc-linux-x64-musl': 14.2.5 - '@next/swc-win32-arm64-msvc': 14.2.5 - '@next/swc-win32-ia32-msvc': 14.2.5 - '@next/swc-win32-x64-msvc': 14.2.5 - transitivePeerDependencies: - - '@babel/core' - - babel-plugin-macros - next@14.2.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@next/env': 14.2.5 @@ -15141,6 +15467,31 @@ snapshots: - '@babel/core' - babel-plugin-macros + next@15.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0): + dependencies: + '@next/env': 15.0.1 + '@swc/counter': 0.1.3 + '@swc/helpers': 0.5.13 + busboy: 1.6.0 + caniuse-lite: 1.0.30001643 + postcss: 8.4.31 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + styled-jsx: 5.1.6(react@18.2.0) + optionalDependencies: + '@next/swc-darwin-arm64': 15.0.1 + '@next/swc-darwin-x64': 15.0.1 + '@next/swc-linux-arm64-gnu': 15.0.1 + '@next/swc-linux-arm64-musl': 15.0.1 + '@next/swc-linux-x64-gnu': 15.0.1 + '@next/swc-linux-x64-musl': 15.0.1 + '@next/swc-win32-arm64-msvc': 15.0.1 + '@next/swc-win32-x64-msvc': 15.0.1 + sharp: 0.33.5 + transitivePeerDependencies: + - '@babel/core' + - babel-plugin-macros + node-abi@3.68.0: dependencies: semver: 7.6.2 @@ -16146,6 +16497,9 @@ snapshots: semver@7.6.2: {} + semver@7.6.3: + optional: true + serialize-error@8.1.0: dependencies: type-fest: 0.20.2 @@ -16179,6 +16533,33 @@ snapshots: inherits: 2.0.4 safe-buffer: 5.2.1 + sharp@0.33.5: + dependencies: + color: 4.2.3 + detect-libc: 2.0.3 + semver: 7.6.3 + optionalDependencies: + '@img/sharp-darwin-arm64': 0.33.5 + '@img/sharp-darwin-x64': 0.33.5 + '@img/sharp-libvips-darwin-arm64': 1.0.4 + '@img/sharp-libvips-darwin-x64': 1.0.4 + '@img/sharp-libvips-linux-arm': 1.0.5 + '@img/sharp-libvips-linux-arm64': 1.0.4 + '@img/sharp-libvips-linux-s390x': 1.0.4 + '@img/sharp-libvips-linux-x64': 1.0.4 + '@img/sharp-libvips-linuxmusl-arm64': 1.0.4 + '@img/sharp-libvips-linuxmusl-x64': 1.0.4 + '@img/sharp-linux-arm': 0.33.5 + '@img/sharp-linux-arm64': 0.33.5 + '@img/sharp-linux-s390x': 0.33.5 + '@img/sharp-linux-x64': 0.33.5 + '@img/sharp-linuxmusl-arm64': 0.33.5 + '@img/sharp-linuxmusl-x64': 0.33.5 + '@img/sharp-wasm32': 0.33.5 + '@img/sharp-win32-ia32': 0.33.5 + '@img/sharp-win32-x64': 0.33.5 + optional: true + shebang-command@2.0.0: dependencies: shebang-regex: 3.0.0 @@ -16215,6 +16596,11 @@ snapshots: simple-concat: 1.0.1 optional: true + simple-swizzle@0.2.2: + dependencies: + is-arrayish: 0.3.2 + optional: true + sisteransi@1.0.5: {} slash@3.0.0: {} @@ -16408,6 +16794,11 @@ snapshots: client-only: 0.0.1 react: 18.3.1 + styled-jsx@5.1.6(react@18.2.0): + dependencies: + client-only: 0.0.1 + react: 18.2.0 + sucrase@3.35.0: dependencies: '@jridgewell/gen-mapping': 0.3.5