From 9f737fc0610329133d94914a55dee2d2585229da Mon Sep 17 00:00:00 2001 From: Luke Vella Date: Fri, 14 Jul 2023 12:46:04 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=20Upgrade=20to=20prisma=205=20(#74?= =?UTF-8?q?8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/trpc/routers/polls.ts | 2 -- packages/database/package.json | 4 +-- scripts/vercel.sh | 1 + yarn.lock | 36 +++++++++++++------------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/packages/backend/trpc/routers/polls.ts b/packages/backend/trpc/routers/polls.ts index 2538c4a7a..3cbd59afe 100644 --- a/packages/backend/trpc/routers/polls.ts +++ b/packages/backend/trpc/routers/polls.ts @@ -347,7 +347,6 @@ export const polls = router({ where: { adminUrlId: input.urlId, }, - rejectOnNotFound: false, }); if (!res) { @@ -404,7 +403,6 @@ export const polls = router({ where: { id: input.urlId, }, - rejectOnNotFound: false, }); if (!res) { diff --git a/packages/database/package.json b/packages/database/package.json index 44e824ebc..b4603f0ea 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -12,13 +12,13 @@ "main": "./index.ts", "types": "./index.ts", "dependencies": { - "@prisma/client": "^4.12.0" + "@prisma/client": "^5.0.0" }, "devDependencies": { "@faker-js/faker": "^7.6.0", "@rallly/tsconfig": "*", "@types/node": "^18.15.10", - "prisma": "^4.12.0", + "prisma": "^5.0.0", "ts-node": "^10.9.1", "typescript": "^5.0.2" } diff --git a/scripts/vercel.sh b/scripts/vercel.sh index 7e922793a..610d8fd5f 100755 --- a/scripts/vercel.sh +++ b/scripts/vercel.sh @@ -2,6 +2,7 @@ set -e export NEXT_PUBLIC_APP_VERSION=v$(node -p "require('./package.json').version") echo "Set NEXT_PUBLIC_APP_VERSION=$NEXT_PUBLIC_APP_VERSION" +yarn prisma generate yarn build # Deploy migration using direct database connection (no connection pool) DATABASE_URL=$DIRECT_DATABASE_URL yarn db:deploy diff --git a/yarn.lock b/yarn.lock index 80d5b6502..b34fb6c63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2361,22 +2361,22 @@ resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz" integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== -"@prisma/client@^4.12.0": - version "4.12.0" - resolved "https://registry.npmjs.org/@prisma/client/-/client-4.12.0.tgz" - integrity sha512-j9/ighfWwux97J2dS15nqhl60tYoH8V0IuSsgZDb6bCFcQD3fXbXmxjYC8GHhIgOk3lB7Pq+8CwElz2MiDpsSg== +"@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.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7" + "@prisma/engines-version" "4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584" -"@prisma/engines-version@4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7": - version "4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7" - resolved "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7.tgz" - integrity sha512-JIHNj5jlXb9mcaJwakM0vpgRYJIAurxTUqM0iX0tfEQA5XLZ9ONkIckkhuAKdAzocZ+80GYg7QSsfpjg7OxbOA== +"@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.12.0": - version "4.12.0" - resolved "https://registry.npmjs.org/@prisma/engines/-/engines-4.12.0.tgz" - integrity sha512-0alKtnxhNB5hYU+ymESBlGI4b9XrGGSdv7Ud+8TE/fBNOEhIud0XQsAR+TrvUZgS4na5czubiMsODw0TUrgkIA== +"@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== "@radix-ui/number@1.0.0": version "1.0.0" @@ -8261,12 +8261,12 @@ pretty@2.0.0: extend-shallow "^2.0.1" js-beautify "^1.6.12" -prisma@^4.12.0: - version "4.12.0" - resolved "https://registry.npmjs.org/prisma/-/prisma-4.12.0.tgz" - integrity sha512-xqVper4mbwl32BWzLpdznHAYvYDWQQWK2tBfXjdUD397XaveRyAP7SkBZ6kFlIg8kKayF4hvuaVtYwXd9BodAg== +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.12.0" + "@prisma/engines" "5.0.0" process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: version "2.0.1"