diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 170d02e2..0995ebb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,6 +54,10 @@ jobs: - name: Setup uses: ./tooling/github/setup + - name: Copy env + shell: bash + run: cp .env.example .env + - name: Typecheck run: pnpm typecheck # TODO: Add test CI diff --git a/packages/db/package.json b/packages/db/package.json index a0860449..29baca98 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -41,6 +41,7 @@ "dependencies": { "@prisma/adapter-pg": "catalog:prisma", "@prisma/client": "catalog:prisma", + "@prisma/client-runtime-utils": "catalog:prisma", "@t3-oss/env-core": "catalog:t3-env", "kysely": "^0.28.8", "pg": "^8.16.3", diff --git a/patches/@prisma__client.patch b/patches/@prisma__client.patch new file mode 100644 index 00000000..ebe1e149 --- /dev/null +++ b/patches/@prisma__client.patch @@ -0,0 +1,27 @@ +diff --git a/runtime/client.d.ts b/runtime/client.d.ts +index 8cfc8fbb4221ba0c5d9508cac2b428ef50230d32..5f764a3ebe7765aa5a2803080da12e3d1fd83562 100644 +--- a/runtime/client.d.ts ++++ b/runtime/client.d.ts +@@ -3178,3 +3178,8 @@ export { Value } + export declare const warnOnce: (key: string, message: string, ...args: unknown[]) => void; + + export { } ++ ++export { AnyNullClass } from '@prisma/client-runtime-utils'; ++export { DbNullClass } from '@prisma/client-runtime-utils'; ++export { JsonNullClass } from '@prisma/client-runtime-utils'; ++ +diff --git a/runtime/index-browser.d.ts b/runtime/index-browser.d.ts +index ca12789acff83849a2e2d96331ca68dfcd306469..8212c484f8ad10af6fd4cf901b8a1ce9d64280c5 100644 +--- a/runtime/index-browser.d.ts ++++ b/runtime/index-browser.d.ts +@@ -85,3 +85,9 @@ declare function validator, O extend + declare function validator, O extends keyof C[M] & Operation, P extends keyof Args>(client: C, model: M, operation: O, prop: P): (select: Exact[P]>) => S; + + export { } ++ ++ ++export { AnyNullClass } from '@prisma/client-runtime-utils'; ++export { DbNullClass } from '@prisma/client-runtime-utils'; ++export { JsonNullClass } from '@prisma/client-runtime-utils'; ++ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 80f50c75..58ac3a10 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,6 +53,9 @@ catalogs: '@prisma/client': specifier: ^7.0.0 version: 7.0.0 + '@prisma/client-runtime-utils': + specifier: 7.0.1 + version: 7.0.1 prisma: specifier: ^7.0.0 version: 7.0.0 @@ -131,6 +134,9 @@ overrides: '@types/minimatch': 5.1.2 patchedDependencies: + '@prisma/client': + hash: 58018448eed4770d123ddd6ed87507d3fba789174f28276a2678e83ebc1bdd2f + path: patches/@prisma__client.patch prisma-extension-kysely@3.0.0: hash: 9c42e9101198e2a811c3bbc340d104ac02bfe42534e64ef50bacd3872ef91827 path: patches/prisma-extension-kysely@3.0.0.patch @@ -367,10 +373,13 @@ importers: version: 7.0.0 '@prisma/client': specifier: catalog:prisma - version: 7.0.0(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3) + version: 7.0.0(patch_hash=58018448eed4770d123ddd6ed87507d3fba789174f28276a2678e83ebc1bdd2f)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3) + '@prisma/client-runtime-utils': + specifier: catalog:prisma + version: 7.0.1 '@t3-oss/env-core': specifier: catalog:t3-env - version: 0.13.8(typescript@5.9.3)(valibot@1.1.0(typescript@5.9.3))(zod@4.1.13) + version: 0.13.8(typescript@5.9.3)(valibot@1.1.0(typescript@5.9.3))(zod@4.1.12) kysely: specifier: ^0.28.8 version: 0.28.8 @@ -379,10 +388,10 @@ importers: version: 8.16.3 prisma-extension-kysely: specifier: 'catalog:' - version: 3.0.0(patch_hash=9c42e9101198e2a811c3bbc340d104ac02bfe42534e64ef50bacd3872ef91827)(@prisma/client@7.0.0(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3)) + version: 3.0.0(patch_hash=9c42e9101198e2a811c3bbc340d104ac02bfe42534e64ef50bacd3872ef91827)(@prisma/client@7.0.0(patch_hash=58018448eed4770d123ddd6ed87507d3fba789174f28276a2678e83ebc1bdd2f)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3)) zod: specifier: 'catalog:' - version: 4.1.13 + version: 4.1.12 devDependencies: '@acme/eslint-config': specifier: workspace:* @@ -413,7 +422,7 @@ importers: version: 2.2.1(magicast@0.3.5)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3)) prisma-zod-generator: specifier: ^2.1.2 - version: 2.1.2(magicast@0.3.5)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3)(zod@4.1.13) + version: 2.1.2(magicast@0.3.5)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3)(zod@4.1.12) typescript: specifier: 'catalog:' version: 5.9.3 @@ -1398,6 +1407,9 @@ packages: '@prisma/client-runtime-utils@7.0.0': resolution: {integrity: sha512-PAiFgMBPrLSaakBwUpML5NevipuKSL3rtNr8pZ8CZ3OBXo0BFcdeGcBIKw/CxJP6H4GNa4+l5bzJPrk8Iq6tDw==} + '@prisma/client-runtime-utils@7.0.1': + resolution: {integrity: sha512-R26BVX9D/iw4toUmZKZf3jniM/9pMGHHdZN5LVP2L7HNiCQKNQQx/9LuMtjepbgRqSqQO3oHN0yzojHLnKTGEw==} + '@prisma/client@7.0.0': resolution: {integrity: sha512-FM1NtJezl0zH3CybLxcbJwShJt7xFGSRg+1tGhy3sCB8goUDnxnBR+RC/P35EAW8gjkzx7kgz7bvb0MerY2VSw==} engines: {node: ^20.19 || ^22.12 || ^24.0} @@ -7216,7 +7228,9 @@ snapshots: '@prisma/client-runtime-utils@7.0.0': {} - '@prisma/client@7.0.0(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3)': + '@prisma/client-runtime-utils@7.0.1': {} + + '@prisma/client@7.0.0(patch_hash=58018448eed4770d123ddd6ed87507d3fba789174f28276a2678e83ebc1bdd2f)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3)': dependencies: '@prisma/client-runtime-utils': 7.0.0 optionalDependencies: @@ -8691,12 +8705,6 @@ snapshots: valibot: 1.1.0(typescript@5.9.3) zod: 4.1.12 - '@t3-oss/env-core@0.13.8(typescript@5.9.3)(valibot@1.1.0(typescript@5.9.3))(zod@4.1.13)': - optionalDependencies: - typescript: 5.9.3 - valibot: 1.1.0(typescript@5.9.3) - zod: 4.1.13 - '@t3-oss/env-nextjs@0.13.8(typescript@5.9.3)(valibot@1.1.0(typescript@5.9.3))(zod@4.1.12)': dependencies: '@t3-oss/env-core': 0.13.8(typescript@5.9.3)(valibot@1.1.0(typescript@5.9.3))(zod@4.1.12) @@ -11884,9 +11892,9 @@ snapshots: ansi-styles: 5.2.0 react-is: 17.0.2 - prisma-extension-kysely@3.0.0(patch_hash=9c42e9101198e2a811c3bbc340d104ac02bfe42534e64ef50bacd3872ef91827)(@prisma/client@7.0.0(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3)): + prisma-extension-kysely@3.0.0(patch_hash=9c42e9101198e2a811c3bbc340d104ac02bfe42534e64ef50bacd3872ef91827)(@prisma/client@7.0.0(patch_hash=58018448eed4770d123ddd6ed87507d3fba789174f28276a2678e83ebc1bdd2f)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3)): dependencies: - '@prisma/client': 7.0.0(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3) + '@prisma/client': 7.0.0(patch_hash=58018448eed4770d123ddd6ed87507d3fba789174f28276a2678e83ebc1bdd2f)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3) prisma-kysely@2.2.1(magicast@0.3.5)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3)): dependencies: @@ -11899,9 +11907,9 @@ snapshots: transitivePeerDependencies: - magicast - prisma-zod-generator@2.1.2(magicast@0.3.5)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3)(zod@4.1.13): + prisma-zod-generator@2.1.2(magicast@0.3.5)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3)(zod@4.1.12): dependencies: - '@prisma/client': 7.0.0(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3) + '@prisma/client': 7.0.0(patch_hash=58018448eed4770d123ddd6ed87507d3fba789174f28276a2678e83ebc1bdd2f)(prisma@7.0.0(@types/react@19.2.4)(magicast@0.3.5)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3))(typescript@5.9.3) '@prisma/generator-helper': 7.0.0 '@prisma/internals': 7.0.0(magicast@0.3.5)(typescript@5.9.3) '@types/cors': 2.8.19 @@ -11915,7 +11923,7 @@ snapshots: node-fetch: 3.3.2 prettier: 3.6.2 tslib: 2.8.1 - zod: 4.1.13 + zod: 4.1.12 transitivePeerDependencies: - magicast - prisma diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 42904f90..e0d8d21c 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -23,6 +23,7 @@ catalogs: prisma: '@prisma/adapter-pg': ^7.0.0 '@prisma/client': ^7.0.0 + '@prisma/client-runtime-utils': 7.0.1 prisma: ^7.0.0 react-query5: '@tanstack/react-query': ^5.90.8 @@ -68,6 +69,7 @@ overrides: '@types/minimatch': 5.1.2 patchedDependencies: + '@prisma/client': patches/@prisma__client.patch prisma-extension-kysely@3.0.0: patches/prisma-extension-kysely@3.0.0.patch publicHoistPattern: