diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 835407b4..0d437127 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,8 +20,6 @@ jobs: include: - node-version: 18.18 db-type: postgresql - - node-version: 18.18 - db-type: mysql steps: - uses: actions/checkout@v4 @@ -29,10 +27,13 @@ jobs: uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - cache: 'yarn' + cache: 'pnpm' env: DATABASE_TYPE: ${{ matrix.db-type }} - - run: npm install --global yarn - - run: yarn install - - run: yarn test - - run: yarn build + - name: Install pnpm + uses: pnpm/action-setup@v2 + with: + version: 10 + - run: pnpm install + - run: pnpm test + - run: pnpm build diff --git a/src/lib/load.ts b/src/lib/load.ts index 631ba775..badda3a6 100644 --- a/src/lib/load.ts +++ b/src/lib/load.ts @@ -1,4 +1,4 @@ -import { Website, Session } from '@/generated/prisma'; +import { Website, Session } from '@/generated/prisma/client'; import redis from '@/lib/redis'; import { getWebsiteSession, getWebsite } from '@/queries'; diff --git a/src/queries/prisma/team.ts b/src/queries/prisma/team.ts index e69f91db..9bf514c1 100644 --- a/src/queries/prisma/team.ts +++ b/src/queries/prisma/team.ts @@ -1,4 +1,4 @@ -import { Prisma, Team } from '@/generated/prisma'; +import { Prisma, Team } from '@/generated/prisma/client'; import { ROLES } from '@/lib/constants'; import { uuid } from '@/lib/crypto'; import prisma from '@/lib/prisma'; diff --git a/src/queries/prisma/teamUser.ts b/src/queries/prisma/teamUser.ts index 6fdba0f3..0485dd8b 100644 --- a/src/queries/prisma/teamUser.ts +++ b/src/queries/prisma/teamUser.ts @@ -1,4 +1,4 @@ -import { Prisma, TeamUser } from '@/generated/prisma'; +import { Prisma, TeamUser } from '@/generated/prisma/client'; import { uuid } from '@/lib/crypto'; import prisma from '@/lib/prisma'; import { PageResult, PageParams } from '@/lib/types'; diff --git a/src/queries/prisma/user.ts b/src/queries/prisma/user.ts index 9dffd84d..8adae5b8 100644 --- a/src/queries/prisma/user.ts +++ b/src/queries/prisma/user.ts @@ -1,4 +1,4 @@ -import { Prisma } from '@/generated/prisma'; +import { Prisma } from '@/generated/prisma/client'; import { ROLES } from '@/lib/constants'; import prisma from '@/lib/prisma'; import { PageResult, Role, User, PageParams } from '@/lib/types'; diff --git a/src/queries/prisma/website.ts b/src/queries/prisma/website.ts index 5d248a40..753fb0ae 100644 --- a/src/queries/prisma/website.ts +++ b/src/queries/prisma/website.ts @@ -1,4 +1,4 @@ -import { Prisma, Website } from '@/generated/prisma'; +import { Prisma, Website } from '@/generated/prisma/client'; import redis from '@/lib/redis'; import prisma from '@/lib/prisma'; import { PageResult, PageParams } from '@/lib/types'; diff --git a/src/queries/sql/events/getEventData.ts b/src/queries/sql/events/getEventData.ts index e7f27ea9..1167f014 100644 --- a/src/queries/sql/events/getEventData.ts +++ b/src/queries/sql/events/getEventData.ts @@ -1,4 +1,4 @@ -import { EventData } from '@/generated/prisma'; +import { EventData } from '@/generated/prisma/client'; import prisma from '@/lib/prisma'; import clickhouse from '@/lib/clickhouse'; import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';