Skip to content

Commit 5345d94

Browse files
Revert "fix(deps): update prisma monorepo to v7 (major) (#385)"
This reverts commit 55fec44. # Conflicts: # package-lock.json
1 parent b8d0f0e commit 5345d94

File tree

8 files changed

+87
-742
lines changed

8 files changed

+87
-742
lines changed

apps/frontend/next.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const withNextIntl = createNextIntlPlugin();
1414
const nextConfig: NextConfig = {
1515
output: 'standalone',
1616
outputFileTracingRoot: path.join(__dirname, '../../'),
17-
serverExternalPackages: ['better-sqlite3'],
1817
images: {
1918
// deviceSizes: [430, 828, 1200, 2048, 3840],
2019
qualities: [75, 90],

package-lock.json

Lines changed: 73 additions & 699 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,5 @@
8383
"commander": "^14.0.2",
8484
"prompts": "^2.4.2",
8585
"unzipper": "^0.12.3"
86-
},
87-
"overrides": {
88-
"better-sqlite3": "^12.5.0"
8986
}
9087
}
-48 KB
Binary file not shown.

packages/integrations/mocked/package.json

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
".env.local"
1717
],
1818
"scripts": {
19-
"prepare": "dotenv -e .env.local -- npx prisma generate && dotenv -e .env.local -- prisma migrate deploy && dotenv -e .env.local -- prisma db seed",
20-
"postinstall": "dotenv -e .env.local -- npx prisma generate",
19+
"prepare": "npx prisma generate && dotenv -e .env.local -- prisma migrate deploy && dotenv -e .env.local -- prisma db seed",
20+
"postinstall": "npx prisma generate",
2121
"build": "dotenv -e .env.local -- prisma migrate deploy && tsc --preserveWatchOutput && tsc-alias",
2222
"postbuild": "shx cp -r src/modules/invoices/resources dist/modules/invoices/",
2323
"lint": "tsc --noEmit && eslint . --max-warnings=0",
@@ -30,23 +30,21 @@
3030
},
3131
"dependencies": {
3232
"@auth/prisma-adapter": "^2.11.1",
33-
"@prisma/adapter-better-sqlite3": "^7.2.0",
34-
"@prisma/client": "^7.2.0",
35-
"better-sqlite3": "^12.5.0",
33+
"@o2s/framework": "*",
34+
"@o2s/utils.logger": "*",
35+
"@prisma/client": "^6.19.0",
3636
"bcryptjs": "^3.0.3",
3737
"dotenv-cli": "^11.0.0",
3838
"jsonwebtoken": "^9.0.3",
39-
"prisma": "^7.2.0",
40-
"@o2s/framework": "*",
41-
"@o2s/utils.logger": "*"
39+
"prisma": "^6.19.0"
4240
},
4341
"devDependencies": {
44-
"@types/jsonwebtoken": "^9.0.10",
4542
"@o2s/eslint-config": "*",
4643
"@o2s/lint-staged-config": "*",
4744
"@o2s/prettier-config": "*",
48-
"@o2s/typescript-config": "*",
4945
"@o2s/telemetry": "*",
46+
"@o2s/typescript-config": "*",
47+
"@types/jsonwebtoken": "^9.0.10",
5048
"concurrently": "^9.2.1",
5149
"eslint": "^9.39.1",
5250
"prettier": "^3.7.4",
@@ -59,8 +57,8 @@
5957
"@nestjs/common": "^11.0.16",
6058
"@nestjs/config": "^4.0.2",
6159
"@nestjs/core": "^11",
62-
"rxjs": "^7",
6360
"next-auth": "^5.0.0-beta.30",
61+
"rxjs": "^7",
6462
"zod": "^3.25.4 || ^4.0.0"
6563
}
66-
}
64+
}

packages/integrations/mocked/prisma.config.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

packages/integrations/mocked/prisma/schema.prisma

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
datasource db {
2-
provider = "sqlite"
2+
provider = "sqlite"
3+
url = env("AUTH_DATABASE_URL")
4+
directUrl = env("AUTH_DATABASE_URL")
35
}
46

57
generator client {
Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
1-
import { PrismaBetterSqlite3 } from '@prisma/adapter-better-sqlite3';
21
import { PrismaClient } from '@prisma/client';
32

43
const globalForPrisma = globalThis as unknown as {
54
prisma: PrismaClient;
65
};
76

8-
const getDatabaseUrl = () => {
9-
return process.env.AUTH_DATABASE_URL || 'file:./dev.db';
10-
};
11-
12-
const createAdapter = () => {
13-
const url = getDatabaseUrl();
14-
return new PrismaBetterSqlite3({ url });
15-
};
16-
177
export const prisma =
188
globalForPrisma.prisma ??
19-
new PrismaClient({
20-
adapter: createAdapter(),
21-
log: process.env.NODE_ENV === 'development' ? ['query', 'info', 'warn', 'error'] : ['error'],
22-
});
9+
new PrismaClient({ log: process.env.NODE_ENV === 'development' ? ['query', 'info', 'warn', 'error'] : ['error'] });
2310

2411
if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma;

0 commit comments

Comments
 (0)