Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Revert Prisma build.
Mike Caobf6c9395c6d4
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prismaindex be78f4d05..3f5008b75 100644--- a/db/postgresql/schema.prisma+++ b/db/postgresql/schema.prisma@@ -1,7 +1,6 @@generator client {- provider = "prisma-client"+ provider = "prisma-client-js"previewFeatures = ["driverAdapters"]- output = "../src/generated/prisma"}datasource db {diff --git a/package.json b/package.jsonindex 878176db9..ce8475b0f 100644--- a/package.json+++ b/package.json@@ -26,7 +26,7 @@"build-components": "rollup -c rollup.components.config.js","build-tracker": "rollup -c rollup.tracker.config.js","build-prisma-client": "node scripts/build-prisma-client.js",- "build-db": "npm-run-all copy-db-files build-db-client build-prisma-client",+ "build-db": "npm-run-all copy-db-files build-db-client","build-lang": "npm-run-all format-lang compile-lang download-country-names download-language-names clean-lang","build-geo": "node scripts/build-geo.js","build-db-schema": "prisma db pull",diff --git a/scripts/check-db.js b/scripts/check-db.jsindex 839c55717..f93135abe 100644--- a/scripts/check-db.js+++ b/scripts/check-db.js@@ -4,7 +4,7 @@ import 'dotenv/config';import { execSync } from 'node:child_process';import chalk from 'chalk';import semver from 'semver';-import { PrismaClient } from '../dist/generated/prisma/client.js';+import { PrismaClient } from '@prisma/client';import { PrismaPg } from '@prisma/adapter-pg';if (process.env.SKIP_DB_CHECK) {diff --git a/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsxindex 16aa55fb8..e5cba326f 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx@@ -2,7 +2,7 @@import { createContext, ReactNode } from 'react';import { useWebsiteQuery } from '@/components/hooks';import { Loading } from '@umami/react-zen';-import { Website } from '@/generated/prisma/client';+import { Website } from '@prisma/client';export const WebsiteContext = createContext<Website>(null);diff --git a/src/lib/auth.ts b/src/lib/auth.tsindex 7811efd0f..b30c254e5 100644--- a/src/lib/auth.ts+++ b/src/lib/auth.ts@@ -1,5 +1,5 @@import bcrypt from 'bcryptjs';-import { Report } from '@/generated/prisma/client';+import { Report } from '@prisma/client';import redis from '@/lib/redis';import debug from 'debug';import { PERMISSIONS, ROLE_PERMISSIONS, ROLES, SHARE_TOKEN_HEADER } from '@/lib/constants';diff --git a/src/lib/load.ts b/src/lib/load.tsindex badda3a6b..d9aa23c28 100644--- a/src/lib/load.ts+++ b/src/lib/load.ts@@ -1,4 +1,4 @@-import { Website, Session } from '@/generated/prisma/client';+import { Website, Session } from '@prisma/client';import redis from '@/lib/redis';import { getWebsiteSession, getWebsite } from '@/queries';diff --git a/src/lib/prisma.ts b/src/lib/prisma.tsindex cc184b6a5..813c844b4 100644--- a/src/lib/prisma.ts+++ b/src/lib/prisma.ts@@ -1,5 +1,5 @@import debug from 'debug';-import { PrismaClient } from '@/generated/prisma/client';+import { PrismaClient } from '@prisma/client';import { PrismaPg } from '@prisma/adapter-pg';import { readReplicas } from '@prisma/extension-read-replicas';import { MYSQL, POSTGRESQL, getDatabaseType } from '@/lib/db';diff --git a/src/queries/prisma/report.ts b/src/queries/prisma/report.tsindex 322193d26..f89a9da0b 100644--- a/src/queries/prisma/report.ts+++ b/src/queries/prisma/report.ts@@ -1,4 +1,4 @@-import { Prisma, Report } from '@/generated/prisma/client';+import { Prisma, Report } from '@prisma/client';import prisma from '@/lib/prisma';import { PageResult, QueryFilters } from '@/lib/types';import ReportFindManyArgs = Prisma.ReportFindManyArgs;diff --git a/src/queries/prisma/team.ts b/src/queries/prisma/team.tsindex 076ff0123..edc082bae 100644--- a/src/queries/prisma/team.ts+++ b/src/queries/prisma/team.ts@@ -1,4 +1,4 @@-import { Prisma, Team } from '@/generated/prisma/client';+import { Prisma, Team } from '@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.tsindex 45024b415..1b88243cc 100644--- a/src/queries/prisma/teamUser.ts+++ b/src/queries/prisma/teamUser.ts@@ -1,4 +1,4 @@-import { Prisma, TeamUser } from '@/generated/prisma/client';+import { Prisma, TeamUser } from '@prisma/client';import { uuid } from '@/lib/crypto';import prisma from '@/lib/prisma';import { PageResult, QueryFilters } from '@/lib/types';diff --git a/src/queries/prisma/user.ts b/src/queries/prisma/user.tsindex 48640ec7c..24753d83d 100644--- a/src/queries/prisma/user.ts+++ b/src/queries/prisma/user.ts@@ -1,4 +1,4 @@-import { Prisma, User } from '@/generated/prisma/client';+import { Prisma, User } from '@prisma/client';import { ROLES } from '@/lib/constants';import prisma from '@/lib/prisma';import { PageResult, Role, QueryFilters } from '@/lib/types';diff --git a/src/queries/prisma/website.ts b/src/queries/prisma/website.tsindex a959769b6..0a7492ad8 100644--- a/src/queries/prisma/website.ts+++ b/src/queries/prisma/website.ts@@ -1,4 +1,4 @@-import { Prisma, Website } from '@/generated/prisma/client';+import { Prisma, Website } from '@prisma/client';import redis from '@/lib/redis';import prisma from '@/lib/prisma';import { PageResult, QueryFilters } from '@/lib/types';diff --git a/src/queries/sql/events/getEventData.ts b/src/queries/sql/events/getEventData.tsindex 1167f0140..4b2b197d6 100644--- a/src/queries/sql/events/getEventData.ts+++ b/src/queries/sql/events/getEventData.ts@@ -1,4 +1,4 @@-import { EventData } from '@/generated/prisma/client';+import { EventData } from '@prisma/client';import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';diff --git a/src/queries/sql/sessions/createSession.ts b/src/queries/sql/sessions/createSession.tsindex 395f9f4c8..d2794c8f5 100644--- a/src/queries/sql/sessions/createSession.ts+++ b/src/queries/sql/sessions/createSession.ts@@ -1,4 +1,4 @@-import { Prisma } from '@/generated/prisma/client';+import { Prisma } from '@prisma/client';import prisma from '@/lib/prisma';export async function createSession(