Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ yarn-error.log*

# turbo
.turbo
packages/db/prisma/generated
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's quite many files, but should usually be checked in to git. How about it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

checked in hmmm no I wouldn't, same for the https://www.npmjs.com/package/prisma-client-types-generator we've made, I do not check generated types in

30 changes: 15 additions & 15 deletions apps/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,29 @@
"kill": "kill -9 $(lsof -t -i:3020)"
},
"dependencies": {
"@babel/core": "7.26.10",
"@mui/icons-material": "^5.15.14",
"@mui/material": "^5.15.14",
"@mui/styles": "^5.15.14",
"@babel/core": "7.28.5",
"@mui/icons-material": "^7.3.5",
"@mui/material": "^7.3.5",
"@mui/styles": "^6.4.8",
"@prisma/extension-read-replicas": "^0.4.1",
"axios": "^1.13.2",
"db": "workspace:*",
"lodash": "^4.17.21",
"next": "15.3.0",
"next-auth": "^4.24.11",
"next": "16.0.3",
"next-auth": "^4.24.13",
"next-auth-prisma-adapter": "workspace:*",
"ra-data-simple-prisma": "workspace:*",
"react": "18.3.1",
"react-admin": "^5.7.2",
"react-dom": "18.3.1",
"react-json-view-lite": "^2.4.1"
"react": "19.2.0",
"react-admin": "^5.13.2",
"react-dom": "19.2.0",
"react-json-view-lite": "^2.5.0"
},
"devDependencies": {
"@types/lodash": "^4.17.16",
"@types/node": "22.14.1",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@types/lodash": "^4.17.20",
"@types/node": "24.10.1",
"@types/react": "19.2.6",
"@types/react-dom": "19.2.3",
"eslint-config-custom": "workspace:*",
"typescript": "5.8.3"
"typescript": "5.9.3"
}
}
5 changes: 3 additions & 2 deletions apps/admin/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
"jsx": "react-jsx",
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this happened automatically, is it correct?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no idea

"incremental": true,
"plugins": [
{
Expand All @@ -28,7 +28,8 @@
"next-env.d.ts",
"**/*.ts",
"**/*.tsx",
".next/types/**/*.ts"
".next/types/**/*.ts",
".next/dev/types/**/*.ts"
],
"exclude": [
"node_modules"
Expand Down
2 changes: 1 addition & 1 deletion apps/website/next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
26 changes: 13 additions & 13 deletions apps/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@
"kill": "kill -9 $(lsof -t -i:3021)"
},
"dependencies": {
"@babel/core": "7.26.10",
"@mui/icons-material": "^5.15.14",
"@mui/material": "^5.15.14",
"@mui/styles": "^5.15.14",
"@babel/core": "7.28.5",
"@mui/icons-material": "^7.3.5",
"@mui/material": "^7.3.5",
"@mui/styles": "^6.4.8",
"config": "workspace:*",
"db": "workspace:*",
"next": "15.3.0",
"next-auth": "^4.24.11",
"react": "19.1.0",
"react-dom": "19.1.0"
"next": "16.0.3",
"next-auth": "^4.24.13",
"react": "19.2.0",
"react-dom": "19.2.0"
},
"devDependencies": {
"@types/node": "22.14.1",
"@types/react": "19.1.1",
"@types/react-dom": "19.1.2",
"@types/node": "24.10.1",
"@types/react": "19.2.6",
"@types/react-dom": "19.2.3",
"babel-plugin-superjson-next": "^0.4.5",
"eslint-config-custom": "workspace:*",
"superjson": "^1.9.0",
"typescript": "5.8.3"
"superjson": "^2.2.5",
"typescript": "5.9.3"
}
}
18 changes: 14 additions & 4 deletions apps/website/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"compilerOptions": {
"target": "es5",
"lib": ["dom", "dom.iterable", "esnext"],
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"strict": true,
Expand All @@ -12,9 +16,15 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
"jsx": "react-jsx",
"incremental": true
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
"exclude": ["node_modules"]
"include": [
"next-env.d.ts",
"**/*.ts",
"**/*.tsx"
],
"exclude": [
"node_modules"
]
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"kill": "pnpm run kill --filter apps/*"
},
"devDependencies": {
"turbo": "^2.5.6"
"turbo": "^2.6.1"
},
"packageManager": "pnpm@10.8.0"
}
14 changes: 7 additions & 7 deletions packages/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"jest-server.js"
],
"dependencies": {
"eslint": "9.24.0",
"eslint-config-next": "^15.3.0",
"eslint-config-prettier": "^10.1.2",
"next": "15.3.0",
"react": "19.1.0",
"react-dom": "19.1.0",
"typescript": "^5.8.3"
"eslint": "9.39.1",
"eslint-config-next": "^16.0.3",
"eslint-config-prettier": "^10.1.8",
"next": "16.0.3",
"react": "19.2.0",
"react-dom": "19.2.0",
"typescript": "^5.9.3"
}
}
12 changes: 7 additions & 5 deletions packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,17 @@
"postinstall": "prisma generate"
},
"dependencies": {
"@prisma/client": "^6.8.2"
"@prisma/adapter-pg": "^7.0.0",
"@prisma/client": "^7.0.0"
},
"prisma": {
"seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
},
"devDependencies": {
"jest": "^29.7.0",
"prisma": "^6.8.2",
"tsup": "^8.4.0",
"typescript": "^5.8.3"
"dotenv": "^17.2.3",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is prisma not coming with it anymore?

"jest": "^30.2.0",
"prisma": "^7.0.0",
"tsup": "^8.5.1",
"typescript": "^5.9.3"
}
}
12 changes: 12 additions & 0 deletions packages/db/prisma.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import "dotenv/config";
import { defineConfig, env } from "prisma/config";

export default defineConfig({
schema: "prisma/schema.prisma",
migrations: {
seed: "tsx prisma/seed.ts",
},
datasource: {
url: env("DATABASE_URL"),
},
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome

10 changes: 7 additions & 3 deletions packages/db/prisma/prismaClient.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
import { PrismaClient } from "@prisma/client";
import { PrismaClient } from "./generated/client";
import { PrismaPg } from "@prisma/adapter-pg";
import { readReplicas } from "@prisma/extension-read-replicas";

const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL });
Copy link
Contributor

@ogroppo ogroppo Nov 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interesting, PrismaPg does indeed have slightly more flexibility, what was your reason for?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or is the adapter required now?


declare global {
var prismaClient: PrismaClient;
}

export const prismaClient: PrismaClient =
export const prismaClient =
global.prismaClient ||
new PrismaClient({
adapter,
errorFormat: "pretty",
});

if (process.env.NODE_ENV !== "production") global.prismaClient = prismaClient;

export const prismaReadClient = prismaClient
export const prismaReadClient = new PrismaClient({ adapter })
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mmmh, I think it should extend the primary client, unless things have changed?

.$extends(
readReplicas({
url: process.env.DATABASE_URL,
Expand Down
4 changes: 2 additions & 2 deletions packages/db/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// learn more about it in the docs: https://pris.ly/d/prisma-schema
datasource db {
provider = "postgresql"
url = env("DATABASE_URL")
}

generator client {
provider = "prisma-client-js"
provider = "prisma-client"
output = "generated"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any better idea for an output path?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fine

previewFeatures = ["fullTextSearchPostgres"]
}

Expand Down
8 changes: 4 additions & 4 deletions packages/eslint-config-custom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"eslint": "^9.24.0",
"eslint-config-next": "^15.3.0",
"eslint-config-prettier": "^10.1.2",
"eslint-config-turbo": "^2.5.0",
"eslint": "^9.39.1",
"eslint-config-next": "^16.0.3",
"eslint-config-prettier": "^10.1.8",
"eslint-config-turbo": "^2.6.1",
"eslint-plugin-react": "^7.37.5"
}
}
8 changes: 4 additions & 4 deletions packages/next-auth-prisma-adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
},
"devDependencies": {
"eslint-config-custom": "workspace:*",
"jest": "^29.7.0",
"next-auth": "^4.24.11",
"tsup": "^8.4.0",
"typescript": "^5.8.3"
"jest": "^30.2.0",
"next-auth": "^4.24.13",
"tsup": "^8.5.1",
"typescript": "^5.9.3"
}
}
18 changes: 9 additions & 9 deletions packages/ra-data-simple-prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,20 @@
},
"dependencies": {
"axios": "^1.13.2",
"deverything": "^4.2.1"
"deverything": "^4.5.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

},
"devDependencies": {
"@babel/core": "7.28.3",
"@babel/preset-env": "^7.28.3",
"@babel/preset-typescript": "^7.27.1",
"@babel/core": "7.28.5",
"@babel/preset-env": "^7.28.5",
"@babel/preset-typescript": "^7.28.5",
"@changesets/cli": "^2.29.7",
"@types/jest": "^30.0.0",
"@types/node": "^24.3.0",
"@types/node": "^24.10.1",
"eslint-config-custom": "workspace:*",
"jest": "^30.0.5",
"react-admin": "^5.10.1",
"jest": "^30.2.0",
"react-admin": "^5.13.2",
"ts-node": "^10.9.2",
"tsup": "^8.5.0",
"typescript": "^5.9.2"
"tsup": "^8.5.1",
"typescript": "^5.9.3"
}
}
Loading