From e49611ac90b7364d80db856665a295d0d70b24c8 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 18 Jan 2023 16:39:37 +0100 Subject: [PATCH] Update to `"prisma": "4.6.1"` Update Prisma from `4.6.0` to `4.6.1` to solve enum issue with PostgreSQL https://github.com/prisma/prisma/issues/16180 --- .changeset/mean-ears-speak.md | 15 ++++ apps/toolkit-app-passportjs/package.json | 2 +- apps/toolkit-app/package.json | 2 +- apps/web/package.json | 2 +- integration-tests/auth-with-rpc/package.json | 2 +- integration-tests/auth/package.json | 2 +- .../get-initial-props/package.json | 2 +- integration-tests/no-suspense/package.json | 2 +- integration-tests/qm/package.json | 2 +- .../react-query-utils/package.json | 2 +- integration-tests/trailing-slash/package.json | 2 +- .../generator/templates/app/package.js.json | 2 +- .../generator/templates/app/package.ts.json | 2 +- pnpm-lock.yaml | 90 +++++++++---------- 14 files changed, 72 insertions(+), 57 deletions(-) create mode 100644 .changeset/mean-ears-speak.md diff --git a/.changeset/mean-ears-speak.md b/.changeset/mean-ears-speak.md new file mode 100644 index 0000000000..7a1e8e40cd --- /dev/null +++ b/.changeset/mean-ears-speak.md @@ -0,0 +1,15 @@ +--- +"toolkit-app": patch +"toolkit-app-passport": patch +"web": patch +"test-auth": patch +"test-full-auth-with-rpc": patch +"test-get-initial-props": patch +"test-no-suspense": patch +"test-qm": patch +"test-react-query-utils": patch +"test-trailing-slash": patch +"@blitzjs/generator": patch +--- + +Update Prisma from `4.6.0` to `4.6.1` to solve enum issue with postgresql https://github.com/prisma/prisma/issues/16180 diff --git a/apps/toolkit-app-passportjs/package.json b/apps/toolkit-app-passportjs/package.json index 5c237045f1..636134a09c 100644 --- a/apps/toolkit-app-passportjs/package.json +++ b/apps/toolkit-app-passportjs/package.json @@ -33,7 +33,7 @@ "blitz": "workspace:2.0.0-beta.22", "next": "12.2.5", "openid-client": "5.2.1", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0", "react-hook-form": "7.39.1", diff --git a/apps/toolkit-app/package.json b/apps/toolkit-app/package.json index 5dfd561b9c..e4bb03e813 100644 --- a/apps/toolkit-app/package.json +++ b/apps/toolkit-app/package.json @@ -33,7 +33,7 @@ "@prisma/client": "4.6.0", "blitz": "workspace:2.0.0-beta.22", "next": "12.2.5", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0", "react-hook-form": "7.39.1", diff --git a/apps/web/package.json b/apps/web/package.json index c1c89b3bed..dcad14a2b6 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -29,7 +29,7 @@ "next": "12.2.5", "passport-mock-strategy": "2.0.0", "passport-twitter": "1.0.4", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0", "ts-node": "10.9.1" diff --git a/integration-tests/auth-with-rpc/package.json b/integration-tests/auth-with-rpc/package.json index 1cb3178d27..db4929f74c 100644 --- a/integration-tests/auth-with-rpc/package.json +++ b/integration-tests/auth-with-rpc/package.json @@ -27,7 +27,7 @@ "blitz": "workspace:2.0.0-beta.22", "delay": "5.0.0", "next": "12.2.5", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0", "react-hook-form": "7.39.1", diff --git a/integration-tests/auth/package.json b/integration-tests/auth/package.json index 3fc9ecfe15..44c39fd662 100644 --- a/integration-tests/auth/package.json +++ b/integration-tests/auth/package.json @@ -24,7 +24,7 @@ "blitz": "workspace:2.0.0-beta.22", "lowdb": "3.0.0", "next": "12.2.5", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/integration-tests/get-initial-props/package.json b/integration-tests/get-initial-props/package.json index 03eb06a0cf..d06aa3c9dc 100644 --- a/integration-tests/get-initial-props/package.json +++ b/integration-tests/get-initial-props/package.json @@ -23,7 +23,7 @@ "blitz": "workspace:2.0.0-beta.22", "lowdb": "3.0.0", "next": "12.2.5", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/integration-tests/no-suspense/package.json b/integration-tests/no-suspense/package.json index dcff762045..db111e3d71 100644 --- a/integration-tests/no-suspense/package.json +++ b/integration-tests/no-suspense/package.json @@ -23,7 +23,7 @@ "blitz": "workspace:2.0.0-beta.22", "lowdb": "3.0.0", "next": "12.2.5", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/integration-tests/qm/package.json b/integration-tests/qm/package.json index 0c5996b40f..2e19111e4e 100644 --- a/integration-tests/qm/package.json +++ b/integration-tests/qm/package.json @@ -16,7 +16,7 @@ "@tanstack/react-query": "4.0.10", "blitz": "workspace:2.0.0-beta.22", "next": "12.2.5", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/integration-tests/react-query-utils/package.json b/integration-tests/react-query-utils/package.json index e6341f6df1..826f089c78 100644 --- a/integration-tests/react-query-utils/package.json +++ b/integration-tests/react-query-utils/package.json @@ -22,7 +22,7 @@ "blitz": "workspace:2.0.0-beta.22", "lowdb": "3.0.0", "next": "12.2.5", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/integration-tests/trailing-slash/package.json b/integration-tests/trailing-slash/package.json index 7efb44e6cc..5132d53430 100644 --- a/integration-tests/trailing-slash/package.json +++ b/integration-tests/trailing-slash/package.json @@ -23,7 +23,7 @@ "blitz": "workspace:2.0.0-beta.22", "lowdb": "3.0.0", "next": "12.2.5", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/packages/generator/templates/app/package.js.json b/packages/generator/templates/app/package.js.json index c2b7d13ad9..5661c0a1a2 100644 --- a/packages/generator/templates/app/package.js.json +++ b/packages/generator/templates/app/package.js.json @@ -28,7 +28,7 @@ "@prisma/client": "4.6.0", "blitz": "latest", "next": "13.1", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0", "zod": "3.19.1" diff --git a/packages/generator/templates/app/package.ts.json b/packages/generator/templates/app/package.ts.json index 67e8733ec9..285b1f1868 100644 --- a/packages/generator/templates/app/package.ts.json +++ b/packages/generator/templates/app/package.ts.json @@ -28,7 +28,7 @@ "@prisma/client": "4.6.0", "blitz": "latest", "next": "13.1", - "prisma": "4.6.0", + "prisma": "4.6.1", "react": "18.2.0", "react-dom": "18.2.0", "zod": "3.20.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 482eda1385..e7e82ac629 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,7 +63,7 @@ importers: prettier-plugin-prisma: 4.4.0 pretty-quick: 3.1.3 preview-email: 3.0.7 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0 react-hook-form: 7.39.1 @@ -79,10 +79,10 @@ importers: "@blitzjs/rpc": link:../../packages/blitz-rpc "@hookform/error-message": 2.0.0_uitc6c22ofsl6jhrdjqyu3was4 "@hookform/resolvers": 2.9.10_react-hook-form@7.39.1 - "@prisma/client": 4.6.0_prisma@4.6.0 + "@prisma/client": 4.6.0_prisma@4.6.1 blitz: link:../../packages/blitz next: 12.2.5_biqbaboplfbrettd7655fr4n2y - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 react-hook-form: 7.39.1_react@18.2.0 @@ -143,7 +143,7 @@ importers: prettier-plugin-prisma: 4.4.0 pretty-quick: 3.1.3 preview-email: 3.0.7 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0 react-hook-form: 7.39.1 @@ -157,11 +157,11 @@ importers: "@blitzjs/rpc": link:../../packages/blitz-rpc "@hookform/error-message": 2.0.0_uitc6c22ofsl6jhrdjqyu3was4 "@hookform/resolvers": 2.9.10_react-hook-form@7.39.1 - "@prisma/client": 4.6.0_prisma@4.6.0 + "@prisma/client": 4.6.0_prisma@4.6.1 blitz: link:../../packages/blitz next: 12.2.5_biqbaboplfbrettd7655fr4n2y openid-client: 5.2.1 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 react-hook-form: 7.39.1_react@18.2.0 @@ -207,7 +207,7 @@ importers: next: 12.2.5 passport-mock-strategy: 2.0.0 passport-twitter: 1.0.4 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0 ts-node: 10.9.1 @@ -217,7 +217,7 @@ importers: "@blitzjs/config": link:../../packages/config "@blitzjs/next": link:../../packages/blitz-next "@blitzjs/rpc": link:../../packages/blitz-rpc - "@prisma/client": 4.6.0_prisma@4.6.0 + "@prisma/client": 4.6.0_prisma@4.6.1 "@types/jest": 29.2.2 "@types/passport-twitter": 1.0.37 blitz: link:../../packages/blitz @@ -226,7 +226,7 @@ importers: next: 12.2.5_biqbaboplfbrettd7655fr4n2y passport-mock-strategy: 2.0.0 passport-twitter: 1.0.4 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 ts-node: 10.9.1_typescript@4.8.4 @@ -256,7 +256,7 @@ importers: lowdb: 3.0.0 next: 12.2.5 node-fetch: 3.2.3 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0 ts-node: 10.9.1 @@ -265,11 +265,11 @@ importers: "@blitzjs/auth": link:../../packages/blitz-auth "@blitzjs/config": link:../../packages/config "@blitzjs/next": link:../../packages/blitz-next - "@prisma/client": 4.6.0_prisma@4.6.0 + "@prisma/client": 4.6.0_prisma@4.6.1 blitz: link:../../packages/blitz lowdb: 3.0.0 next: 12.2.5_biqbaboplfbrettd7655fr4n2y - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 devDependencies: @@ -319,7 +319,7 @@ importers: prettier-plugin-prisma: 4.4.0 pretty-quick: 3.1.3 preview-email: 3.0.7 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0 react-hook-form: 7.39.1 @@ -335,11 +335,11 @@ importers: "@blitzjs/rpc": link:../../packages/blitz-rpc "@hookform/error-message": 2.0.0_uitc6c22ofsl6jhrdjqyu3was4 "@hookform/resolvers": 2.9.10_react-hook-form@7.39.1 - "@prisma/client": 4.6.0_prisma@4.6.0 + "@prisma/client": 4.6.0_prisma@4.6.1 blitz: link:../../packages/blitz delay: 5.0.0 next: 12.2.5_biqbaboplfbrettd7655fr4n2y - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 react-hook-form: 7.39.1_react@18.2.0 @@ -390,7 +390,7 @@ importers: lowdb: 3.0.0 next: 12.2.5 node-fetch: 3.2.3 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0 typescript: ^4.8.4 @@ -398,11 +398,11 @@ importers: "@blitzjs/auth": link:../../packages/blitz-auth "@blitzjs/next": link:../../packages/blitz-next "@blitzjs/rpc": link:../../packages/blitz-rpc - "@prisma/client": 4.6.0_prisma@4.6.0 + "@prisma/client": 4.6.0_prisma@4.6.1 blitz: link:../../packages/blitz lowdb: 3.0.0 next: 12.2.5_biqbaboplfbrettd7655fr4n2y - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 devDependencies: @@ -478,7 +478,7 @@ importers: lowdb: 3.0.0 next: 12.2.5 node-fetch: 3.2.3 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0 typescript: ^4.8.4 @@ -486,11 +486,11 @@ importers: "@blitzjs/auth": link:../../packages/blitz-auth "@blitzjs/next": link:../../packages/blitz-next "@blitzjs/rpc": link:../../packages/blitz-rpc - "@prisma/client": 4.6.0_prisma@4.6.0 + "@prisma/client": 4.6.0_prisma@4.6.1 blitz: link:../../packages/blitz lowdb: 3.0.0 next: 12.2.5_biqbaboplfbrettd7655fr4n2y - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 devDependencies: @@ -525,7 +525,7 @@ importers: eslint-plugin-testing-library: 5.0.1 jsdom: ^19.0.0 next: 12.2.5 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0 typescript: ^4.8.4 @@ -534,11 +534,11 @@ importers: "@blitzjs/config": link:../../packages/config "@blitzjs/next": link:../../packages/blitz-next "@blitzjs/rpc": link:../../packages/blitz-rpc - "@prisma/client": 4.6.0_prisma@4.6.0 + "@prisma/client": 4.6.0_prisma@4.6.1 "@tanstack/react-query": 4.0.10_biqbaboplfbrettd7655fr4n2y blitz: link:../../packages/blitz next: 12.2.5_biqbaboplfbrettd7655fr4n2y - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 devDependencies: @@ -547,7 +547,7 @@ importers: "@vitejs/plugin-react": 1.3.0 delay: 5.0.0 eslint: 8.27.0 - eslint-config-next: 13.1.1_rmayb2veg2btbq6mbmnyivgasy + eslint-config-next: 13.1.2_rmayb2veg2btbq6mbmnyivgasy eslint-plugin-testing-library: 5.0.1_rmayb2veg2btbq6mbmnyivgasy jsdom: 19.0.0 typescript: 4.8.4 @@ -571,18 +571,18 @@ importers: lowdb: 3.0.0 next: 12.2.5 node-fetch: 3.2.3 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0 typescript: ^4.8.4 dependencies: "@blitzjs/next": link:../../packages/blitz-next "@blitzjs/rpc": link:../../packages/blitz-rpc - "@prisma/client": 4.6.0_prisma@4.6.0 + "@prisma/client": 4.6.0_prisma@4.6.1 blitz: link:../../packages/blitz lowdb: 3.0.0 next: 12.2.5_biqbaboplfbrettd7655fr4n2y - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 devDependencies: @@ -689,7 +689,7 @@ importers: lowdb: 3.0.0 next: 12.2.5 node-fetch: 3.2.3 - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0 typescript: ^4.8.4 @@ -697,11 +697,11 @@ importers: "@blitzjs/auth": link:../../packages/blitz-auth "@blitzjs/next": link:../../packages/blitz-next "@blitzjs/rpc": link:../../packages/blitz-rpc - "@prisma/client": 4.6.0_prisma@4.6.0 + "@prisma/client": 4.6.0_prisma@4.6.1 blitz: link:../../packages/blitz lowdb: 3.0.0 next: 12.2.5_biqbaboplfbrettd7655fr4n2y - prisma: 4.6.0 + prisma: 4.6.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 devDependencies: @@ -5091,10 +5091,10 @@ packages: dependencies: glob: 7.1.7 - /@next/eslint-plugin-next/13.1.1: + /@next/eslint-plugin-next/13.1.2: resolution: { - integrity: sha512-SBrOFS8PC3nQ5aeZmawJkjKkWjwK9RoxvBSv/86nZp0ubdoVQoko8r8htALd9ufp16NhacCdqhu9bzZLDWtALQ==, + integrity: sha512-WGaNVvIYphdriesP6r7jq/8l7u38tzotnVQuxc1RYKLqYYApSsrebti3OCPoT3Gx0pw2smPIFHH98RzcsgW5GQ==, } dependencies: glob: 7.1.7 @@ -5300,7 +5300,7 @@ packages: } dev: true - /@prisma/client/4.6.0_prisma@4.6.0: + /@prisma/client/4.6.0_prisma@4.6.1: resolution: { integrity: sha512-D9LaQinDxOHinRpcJTw2tjMtjhc9HTP+aF1IRd2oLldp/8TiwIfxK8x17OhBBiX4y1PzbJXXET7kS+5wB3es/w==, @@ -5314,7 +5314,7 @@ packages: optional: true dependencies: "@prisma/engines-version": 4.6.0-53.2e719efb80b56a3f32d18a62489de95bb9c130e3 - prisma: 4.6.0 + prisma: 4.6.1 dev: false /@prisma/engines-version/4.6.0-53.2e719efb80b56a3f32d18a62489de95bb9c130e3: @@ -5324,10 +5324,10 @@ packages: } dev: false - /@prisma/engines/4.6.0: + /@prisma/engines/4.6.1: resolution: { - integrity: sha512-S+72PAl0zTCbIGou1uXD/McvzdtP+bjOs0LRmGZfcOQcVqR9x/0f6Z+dqpUU0zIcqHEl+0DOB8UXaTwRvssFsQ==, + integrity: sha512-3u2/XxvxB+Q7cMXHnKU0CpBiUK1QWqpgiBv28YDo1zOIJE3FCF8DI2vrp6vuwjGt5h0JGXDSvmSf4D4maVjJdw==, } requiresBuild: true dev: false @@ -10952,10 +10952,10 @@ packages: - supports-color dev: false - /eslint-config-next/13.1.1_rmayb2veg2btbq6mbmnyivgasy: + /eslint-config-next/13.1.2_rmayb2veg2btbq6mbmnyivgasy: resolution: { - integrity: sha512-/5S2XGWlGaiqrRhzpn51ux5JUSLwx8PVK2keLi5xk7QmhfYB8PqE6R6SlVw6hgnf/VexvUXSrlNJ/su00NhtHQ==, + integrity: sha512-zdRAQOr8v69ZwJRtBrGqAqm160ONqKxU/pV1FB1KlgfyqveGsLZmlQ7l31otwtw763901J7xdiTVkj2y3YxXZA==, } peerDependencies: eslint: ^7.23.0 || ^8.0.0 @@ -10964,7 +10964,7 @@ packages: typescript: optional: true dependencies: - "@next/eslint-plugin-next": 13.1.1 + "@next/eslint-plugin-next": 13.1.2 "@rushstack/eslint-patch": 1.1.3 "@typescript-eslint/parser": 5.43.0_rmayb2veg2btbq6mbmnyivgasy eslint: 8.27.0 @@ -13976,7 +13976,7 @@ packages: pretty-format: 29.2.1 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.1_cbe7ovvae6zqfnmtgctpgpys54 + ts-node: 10.9.1_typescript@4.8.4 transitivePeerDependencies: - supports-color @@ -17344,16 +17344,16 @@ packages: uuid: 8.3.2 dev: true - /prisma/4.6.0: + /prisma/4.6.1: resolution: { - integrity: sha512-TAnObUMGCM9NLt9nsRs1WWYQGPKsJOK8bN/7gSAnBcYIxMCFFDe+XtFYJbyTzsJZ/i+0rH4zg8au3m7HX354LA==, + integrity: sha512-BR4itMCuzrDV4tn3e2TF+nh1zIX/RVU0isKtKoN28ADeoJ9nYaMhiuRRkFd2TZN8+l/XfYzoRKyHzUFXLQhmBQ==, } engines: {node: ">=14.17"} hasBin: true requiresBuild: true dependencies: - "@prisma/engines": 4.6.0 + "@prisma/engines": 4.6.1 dev: false /process-nextick-args/2.0.1: @@ -19754,6 +19754,7 @@ packages: typescript: 4.8.4 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + dev: false /ts-node/10.9.1_ieummqxttktzud32hpyrer46t4: resolution: @@ -19820,7 +19821,6 @@ packages: typescript: 4.8.4 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 - dev: false /tsconfig-paths/3.14.1: resolution: