diff --git a/package.json b/package.json index c3e45703..9aebc417 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@fastify/cors": "^8.2.0", "@fastify/formbody": "^7.3.0", "@fastify/swagger": "^8.1.0", - "@prisma/client": "4", + "@prisma/client": "^5.0.0", "@sentry/node": "^7.9.0", "@sentry/tracing": "^7.9.0", "@simplewebauthn/server": "^5.4.0", @@ -54,7 +54,7 @@ "husky": "^4.3.0", "lint-staged": "^10.5.1", "prettier": "^2.1.2", - "prisma": "4", + "prisma": "^5.0.0", "ts-node": "^9.0.0" }, "scripts": { diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 83087a49..0eaa768f 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -8,7 +8,6 @@ datasource db { generator client { provider = "prisma-client-js" - previewFeatures = ["filterJson"] } model User { diff --git a/src/common/meiling/identity/user.ts b/src/common/meiling/identity/user.ts index 32f382a4..e7314e3f 100644 --- a/src/common/meiling/identity/user.ts +++ b/src/common/meiling/identity/user.ts @@ -1,4 +1,4 @@ -import { Email, Group, OAuthTokenType, Phone, prisma, User as UserModel, OAuthClient } from '@prisma/client'; +import { Email, Group, OAuthTokenType, Phone, User as UserModel, OAuthClient } from '@prisma/client'; import { VerifiedAuthenticationResponse, VerifiedRegistrationResponse } from '@simplewebauthn/server/./dist'; import { AttestationFormat } from '@simplewebauthn/server/dist/helpers/decodeAttestationObject'; import { CredentialDeviceType } from '@simplewebauthn/typescript-types'; diff --git a/yarn.lock b/yarn.lock index c4f76b4e..25dae603 100644 --- a/yarn.lock +++ b/yarn.lock @@ -160,22 +160,22 @@ pvtsutils "^1.3.2" tslib "^2.4.0" -"@prisma/client@4": - version "4.6.1" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.6.1.tgz#e8e1d347ecbff44158d21b6591bb99650c8503a8" - integrity sha512-M1+NNrMzqaOIxT7PBGcTs3IZo7d1EW/+gVQd4C4gUgWBDGgD9AcIeZnUSidgWClmpMSgVUdnVORjsWWGUameYA== +"@prisma/client@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.0.0.tgz#9f0cd4164f4ffddb28bb1811c27eb7fa1e01a087" + integrity sha512-XlO5ELNAQ7rV4cXIDJUNBEgdLwX3pjtt9Q/RHqDpGf43szpNJx2hJnggfFs7TKNx0cOFsl6KJCSfqr5duEU/bQ== dependencies: - "@prisma/engines-version" "4.6.1-3.694eea289a8462c80264df36757e4fdc129b1b32" + "@prisma/engines-version" "4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584" -"@prisma/engines-version@4.6.1-3.694eea289a8462c80264df36757e4fdc129b1b32": - version "4.6.1-3.694eea289a8462c80264df36757e4fdc129b1b32" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.6.1-3.694eea289a8462c80264df36757e4fdc129b1b32.tgz#90a71bbdfd5172fc674009346a6ad6b84410cc0a" - integrity sha512-HUCmkXAU2jqp2O1RvNtbE+seLGLyJGEABZS/R38rZjSAafAy0WzBuHq+tbZMnD+b5OSCsTVtIPVcuvx1ySxcWQ== +"@prisma/engines-version@4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584": + version "4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584.tgz#b36eda5620872d3fac810c302a7e46cf41daa033" + integrity sha512-HHiUF6NixsldsP3JROq07TYBLEjXFKr6PdH8H4gK/XAoTmIplOJBCgrIUMrsRAnEuGyRoRLXKXWUb943+PFoKQ== -"@prisma/engines@4.6.1": - version "4.6.1" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.6.1.tgz#ae31309cc0f600f2da22708697b3be4eb1e46f9e" - integrity sha512-3u2/XxvxB+Q7cMXHnKU0CpBiUK1QWqpgiBv28YDo1zOIJE3FCF8DI2vrp6vuwjGt5h0JGXDSvmSf4D4maVjJdw== +"@prisma/engines@5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.0.0.tgz#5249650eabe77c458c90f2be97d8210353c2e22e" + integrity sha512-kyT/8fd0OpWmhAU5YnY7eP31brW1q1YrTGoblWrhQJDiN/1K+Z8S1kylcmtjqx5wsUGcP1HBWutayA/jtyt+sg== "@sentry/core@7.20.1": version "7.20.1" @@ -2449,12 +2449,12 @@ prettier@^2.1.2: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== -prisma@4: - version "4.6.1" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.6.1.tgz#6c85fb667abed006a6b849c9c1ddd81d3f071b87" - integrity sha512-BR4itMCuzrDV4tn3e2TF+nh1zIX/RVU0isKtKoN28ADeoJ9nYaMhiuRRkFd2TZN8+l/XfYzoRKyHzUFXLQhmBQ== +prisma@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.0.0.tgz#f6571c46dc2478172cb7bc1bb62d74026a2c2630" + integrity sha512-KYWk83Fhi1FH59jSpavAYTt2eoMVW9YKgu8ci0kuUnt6Dup5Qy47pcB4/TLmiPAbhGrxxSz7gsSnJcCmkyPANA== dependencies: - "@prisma/engines" "4.6.1" + "@prisma/engines" "5.0.0" process-warning@^1.0.0: version "1.0.0"