Merge branch 'main' into siddharth/query-v5

blitz-js · Dec 23, 2024 · 817ba6e · 817ba6e
2 parents efaa1df + 38d320f
commit 817ba6e
Show file tree

Hide file tree

Showing 15 changed files with 533 additions and 88 deletions.
diff --git a/.changeset/twelve-wolves-fix.md b/.changeset/twelve-wolves-fix.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+chore: Upgrade to prisma v6. Read more about migration in https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6
diff --git a/apps/toolkit-app-passportjs/package.json b/apps/toolkit-app-passportjs/package.json
@@ -29,11 +29,11 @@
     "@blitzjs/rpc": "2.1.3",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "blitz": "2.1.3",
     "next": "14.2.15",
     "openid-client": "5.2.1",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "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
@@ -30,11 +30,11 @@
     "@blitzjs/rpc": "2.1.3",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "blitz": "2.1.3",
     "next": "14.2.15",
     "next-auth": "4.24.7",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "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
@@ -20,7 +20,7 @@
     "@blitzjs/config": "2.1.3",
     "@blitzjs/next": "2.1.3",
     "@blitzjs/rpc": "2.1.3",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "@types/jest": "29.2.2",
     "@types/passport-twitter": "1.0.37",
     "blitz": "2.1.3",
@@ -29,7 +29,7 @@
     "next": "14.2.15",
     "passport-mock-strategy": "2.0.0",
     "passport-twitter": "1.0.4",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "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
@@ -23,11 +23,11 @@
     "@blitzjs/rpc": "2.1.3",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "blitz": "2.1.3",
     "delay": "5.0.0",
     "next": "14.2.15",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "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
@@ -20,11 +20,11 @@
     "@blitzjs/auth": "2.1.3",
     "@blitzjs/config": "2.1.3",
     "@blitzjs/next": "2.1.3",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "blitz": "2.1.3",
     "lowdb": "3.0.0",
     "next": "14.2.15",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "secure-password": "4.0.0",

diff --git a/integration-tests/get-initial-props/package.json b/integration-tests/get-initial-props/package.json
@@ -19,11 +19,11 @@
     "@blitzjs/auth": "2.1.3",
     "@blitzjs/next": "2.1.3",
     "@blitzjs/rpc": "2.1.3",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "blitz": "2.1.3",
     "lowdb": "2.1.0",
     "next": "14.2.15",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

diff --git a/integration-tests/next-13-app-dir/package.json b/integration-tests/next-13-app-dir/package.json
@@ -21,11 +21,11 @@
     "@blitzjs/config": "2.1.3",
     "@blitzjs/next": "2.1.3",
     "@blitzjs/rpc": "2.1.3",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "blitz": "2.1.3",
     "lowdb": "2.1.0",
     "next": "14.2.15",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "secure-password": "4.0.0",

diff --git a/integration-tests/no-suspense/package.json b/integration-tests/no-suspense/package.json
@@ -19,11 +19,11 @@
     "@blitzjs/auth": "2.1.3",
     "@blitzjs/next": "2.1.3",
     "@blitzjs/rpc": "2.1.3",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "blitz": "2.1.3",
     "lowdb": "3.0.0",
     "next": "14.2.15",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

diff --git a/integration-tests/qm/package.json b/integration-tests/qm/package.json
@@ -12,11 +12,11 @@
     "@blitzjs/config": "2.1.3",
     "@blitzjs/next": "2.1.3",
     "@blitzjs/rpc": "2.1.3",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "@tanstack/react-query": "5.51.1",
     "blitz": "2.1.3",
     "next": "14.2.15",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "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
@@ -18,11 +18,11 @@
   "dependencies": {
     "@blitzjs/next": "2.1.3",
     "@blitzjs/rpc": "2.1.3",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "blitz": "2.1.3",
     "lowdb": "3.0.0",
     "next": "14.2.15",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "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
@@ -19,11 +19,11 @@
     "@blitzjs/auth": "2.1.3",
     "@blitzjs/next": "2.1.3",
     "@blitzjs/rpc": "2.1.3",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "blitz": "2.1.3",
     "lowdb": "3.0.0",
     "next": "14.2.15",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

diff --git a/packages/generator/templates/pages/package.js.json b/packages/generator/templates/pages/package.js.json
@@ -25,10 +25,10 @@
     "@blitzjs/auth": "latest",
     "@blitzjs/next": "latest",
     "@blitzjs/rpc": "latest",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "blitz": "latest",
     "next": "14.2.15",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "secure-password": "4.0.0",

diff --git a/packages/generator/templates/pages/package.ts.json b/packages/generator/templates/pages/package.ts.json
@@ -25,10 +25,10 @@
     "@blitzjs/auth": "latest",
     "@blitzjs/next": "latest",
     "@blitzjs/rpc": "latest",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "6.1.0",
     "blitz": "latest",
     "next": "14.2.15",
-    "prisma": "4.6.1",
+    "prisma": "6.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "secure-password": "4.0.0",