diff --git a/.github/workflows/changeset-check.yml b/.github/workflows/changeset-check.yml index 39439b4..a831c5f 100644 --- a/.github/workflows/changeset-check.yml +++ b/.github/workflows/changeset-check.yml @@ -3,7 +3,6 @@ name: Changeset Check on: pull_request: branches: - - dev - main jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 773cb90..00e2230 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,6 +36,9 @@ jobs: - name: Install Dependencies run: pnpm install --frozen-lockfile + - name: Generate Prisma Client + run: pnpm --filter=api db:generate + - name: Build Packages run: pnpm build diff --git a/.github/workflows/version-pr.yml b/.github/workflows/version-pr.yml index be24a56..abb35d7 100644 --- a/.github/workflows/version-pr.yml +++ b/.github/workflows/version-pr.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - dev + - main paths: - '.changeset/**' diff --git a/apps/api/.gitignore b/apps/api/.gitignore index 9f62ec0..11ddd8d 100644 --- a/apps/api/.gitignore +++ b/apps/api/.gitignore @@ -1,5 +1,3 @@ node_modules # Keep environment variables out of version control .env - -/generated/prisma diff --git a/apps/api/package.json b/apps/api/package.json index 190b7cf..79b9ad4 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -26,6 +26,7 @@ "author": "", "license": "ISC", "dependencies": { + "@prisma/client": "^6.17.1", "@types/pg": "^8.15.5", "axios": "^1.12.2", "compression": "^1.7.4", @@ -43,7 +44,6 @@ "zod": "^4.1.12" }, "devDependencies": { - "@prisma/client": "^6.17.1", "@types/compression": "^1.7.5", "@types/cors": "^2.8.17", "@types/express": "^4.17.21", diff --git a/apps/api/prisma/schema.prisma b/apps/api/prisma/schema.prisma index 4b5f6c1..22631ca 100644 --- a/apps/api/prisma/schema.prisma +++ b/apps/api/prisma/schema.prisma @@ -1,6 +1,5 @@ generator client { provider = "prisma-client-js" - output = "../generated/prisma" } datasource db { diff --git a/apps/api/src/domains/library/library.services.ts b/apps/api/src/domains/library/library.services.ts index e862ed3..9c0a5e6 100644 --- a/apps/api/src/domains/library/library.services.ts +++ b/apps/api/src/domains/library/library.services.ts @@ -5,7 +5,7 @@ import { LibraryUpdateResult, LibraryWithMetadata, } from "./library.types"; -import { Prisma, MediaType } from "../../../generated/prisma"; +import { Prisma, MediaType } from "@prisma/client"; export const libraryServices = { delete: async (libraryId: string): Promise => { diff --git a/apps/api/src/domains/library/library.types.ts b/apps/api/src/domains/library/library.types.ts index a6f5c09..b2f3151 100644 --- a/apps/api/src/domains/library/library.types.ts +++ b/apps/api/src/domains/library/library.types.ts @@ -1,4 +1,4 @@ -import { Library } from "../../../generated/prisma"; +import { Library } from "@prisma/client"; /** * Library types and interfaces diff --git a/apps/api/src/domains/movies/movies.types.ts b/apps/api/src/domains/movies/movies.types.ts index cc59673..b5c838a 100644 --- a/apps/api/src/domains/movies/movies.types.ts +++ b/apps/api/src/domains/movies/movies.types.ts @@ -2,7 +2,7 @@ * Movie types and interfaces */ -import { Movie, Media } from "../../../generated/prisma"; +import { Movie, Media } from "@prisma/client"; /** * Movie with its associated media information diff --git a/apps/api/src/domains/tvshows/tvshows.types.ts b/apps/api/src/domains/tvshows/tvshows.types.ts index 00061dd..674cbae 100644 --- a/apps/api/src/domains/tvshows/tvshows.types.ts +++ b/apps/api/src/domains/tvshows/tvshows.types.ts @@ -2,7 +2,7 @@ * TV Show types and interfaces */ -import { TVShow, Media, Season, Episode } from "../../../generated/prisma"; +import { TVShow, Media, Season, Episode } from "@prisma/client"; /** * TV Show with its associated media information diff --git a/apps/api/src/lib/database/index.ts b/apps/api/src/lib/database/index.ts index 7b79497..3a765e9 100644 --- a/apps/api/src/lib/database/index.ts +++ b/apps/api/src/lib/database/index.ts @@ -1,2 +1,2 @@ export { default as prisma } from "./prisma"; -export { MediaType } from "../../../generated/prisma"; +export { MediaType } from "@prisma/client"; diff --git a/apps/api/src/lib/database/prisma.ts b/apps/api/src/lib/database/prisma.ts index dad885b..bba9975 100644 --- a/apps/api/src/lib/database/prisma.ts +++ b/apps/api/src/lib/database/prisma.ts @@ -1,4 +1,4 @@ -import { PrismaClient } from "../../../generated/prisma"; +import { PrismaClient } from "@prisma/client"; declare global { var __prisma: PrismaClient | undefined;