Merge branch 'main' into prisma-prepare-array

.all-contributorsrc

@@ -3805,16 +3805,6 @@
         "doc",
         "code"
       ]
-    },
-    {
-      "login": "Trancever",
-      "name": "Dawid Urbaniak",
-      "avatar_url": "https://avatars.githubusercontent.com/u/18584155?v=4",
-      "profile": "https://twitter.com/trensik",
-      "contributions": [
-        "doc",
-        "code"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/dull-rings-arrive.md

@@ -1,5 +0,0 @@
----
-"@blitzjs/auth": patch
----
-
-Fixes adding authError query param in Passport adapter.

.changeset/fluffy-coats-flow.md

@@ -1,6 +0,0 @@
----
-"@blitzjs/rpc": patch
-"blitz": patch
----
-
-Fix suspense error codegen patch for nextjs versions 13-13.0.6

.changeset/giant-clocks-mate.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+A prisma helper function that converts nested array fields to the prisma api format and use the correct CRUD method based on initial form data.

.changeset/pre.json

@@ -67,7 +67,6 @@
     "calm-papayas-protect",
     "calm-tomatoes-drive",
     "chilled-carrots-own",
-    "chilly-candles-care",
     "chilly-nails-nail",
     "clean-hats-pump",
     "clean-walls-wink",
@@ -82,7 +81,6 @@
     "cyan-cars-greet",
     "dirty-monkeys-greet",
     "dirty-planets-chew",
-    "dull-rings-arrive",
     "early-lamps-itch",
     "eighty-apes-sleep",
     "eleven-humans-sort",
@@ -101,7 +99,6 @@
     "few-hounds-worry",
     "few-shrimps-leave",
     "flat-bees-approve",
-    "fluffy-coats-flow",
     "fluffy-mangos-begin",
     "fluffy-mice-wash",
     "forty-timers-rhyme",
@@ -251,7 +248,6 @@
     "stale-parents-yawn",
     "strong-apes-reply",
     "strong-keys-lie",
-    "stupid-rabbits-jump",
     "stupid-walls-sell",
     "sweet-kiwis-cross",
     "swift-drinks-dress",
@@ -264,12 +260,10 @@
     "ten-rivers-burn",
     "tender-cooks-tie",
     "tender-pianos-check",
-    "thick-moons-fry",
     "thick-parrots-float",
     "thirty-countries-build",
     "thirty-spies-applaud",
     "three-lies-pull",
-    "three-toes-sell",
     "tidy-clouds-smoke",
     "tidy-llamas-compare",
     "tough-toes-pull",

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
-* @flybayer
+* @dillonraphael
 
-# packages/generator/templates**/* @flybayer
+packages/generator/templates**/* @flybayer

README.md

@@ -6,7 +6,7 @@
     <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
   </a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-403-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
+<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-402-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
   <a aria-label="License" href="https://github.com/blitz-js/blitz/blob/main/LICENSE">
     <img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -738,7 +738,6 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <td align="center"><a href="a11rew.dev"><img src="https://avatars.githubusercontent.com/u/87580113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrew Glago</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=a11rew" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=a11rew" title="Code">💻</a></td>
     <td align="center"><a href="http://tobiasjordans.de"><img src="https://avatars.githubusercontent.com/u/111561?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tordans" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=tordans" title="Documentation">📖</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/iagor-moraes/"><img src="https://avatars.githubusercontent.com/u/13892132?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Iagor Moraes</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=iagormoraes" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=iagormoraes" title="Code">💻</a></td>
-    <td align="center"><a href="https://twitter.com/trensik"><img src="https://avatars.githubusercontent.com/u/18584155?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dawid Urbaniak</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Trancever" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=Trancever" title="Code">💻</a></td>
   </tr>
 </table>
 

apps/toolkit-app-passportjs/package.json

@@ -30,7 +30,7 @@
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.20",
     "next": "12.2.5",
     "openid-client": "5.2.1",
     "prisma": "4.6.0",

apps/toolkit-app/package.json

@@ -31,7 +31,7 @@
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.20",
     "next": "12.2.5",
     "prisma": "4.6.0",
     "react": "18.2.0",

integration-tests/auth-with-rpc/package.json

@@ -17,14 +17,14 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.21",
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
-    "@blitzjs/next": "workspace:2.0.0-beta.21",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
+    "@blitzjs/auth": "workspace:2.0.0-beta.20",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
+    "@blitzjs/next": "workspace:2.0.0-beta.20",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.20",
     "delay": "5.0.0",
     "next": "12.2.5",
     "prisma": "4.6.0",

integration-tests/auth/package.json

@@ -17,11 +17,11 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.21",
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
-    "@blitzjs/next": "workspace:2.0.0-beta.21",
+    "@blitzjs/auth": "workspace:2.0.0-beta.20",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
+    "@blitzjs/next": "workspace:2.0.0-beta.20",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.20",
     "lowdb": "3.0.0",
     "next": "12.2.5",
     "prisma": "4.6.0",

integration-tests/get-initial-props/package.json

@@ -16,11 +16,11 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.21",
-    "@blitzjs/next": "workspace:2.0.0-beta.21",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
+    "@blitzjs/auth": "workspace:2.0.0-beta.20",
+    "@blitzjs/next": "workspace:2.0.0-beta.20",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.20",
     "lowdb": "3.0.0",
     "next": "12.2.5",
     "prisma": "4.6.0",
@@ -28,7 +28,7 @@
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

integration-tests/middleware/package.json

@@ -11,10 +11,10 @@
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
   },
   "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
-    "@blitzjs/next": "workspace:2.0.0-beta.21",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
-    "blitz": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
+    "@blitzjs/next": "workspace:2.0.0-beta.20",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
+    "blitz": "workspace:2.0.0-beta.20",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0"

integration-tests/no-suspense/package.json

@@ -16,11 +16,11 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.21",
-    "@blitzjs/next": "workspace:2.0.0-beta.21",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
+    "@blitzjs/auth": "workspace:2.0.0-beta.20",
+    "@blitzjs/next": "workspace:2.0.0-beta.20",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.20",
     "lowdb": "3.0.0",
     "next": "12.2.5",
     "prisma": "4.6.0",
@@ -28,7 +28,7 @@
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

integration-tests/qm/package.json

@@ -8,13 +8,13 @@
     "clean": "rm -rf .turbo && rm -rf node_modules"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.21",
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
-    "@blitzjs/next": "workspace:2.0.0-beta.21",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
+    "@blitzjs/auth": "workspace:2.0.0-beta.20",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
+    "@blitzjs/next": "workspace:2.0.0-beta.20",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
     "@prisma/client": "4.6.0",
     "@tanstack/react-query": "4.0.10",
-    "blitz": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.20",
     "next": "12.2.5",
     "prisma": "4.6.0",
     "react": "18.2.0",

integration-tests/react-query-utils/package.json

@@ -16,10 +16,10 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/next": "workspace:2.0.0-beta.21",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
+    "@blitzjs/next": "workspace:2.0.0-beta.20",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.20",
     "lowdb": "3.0.0",
     "next": "12.2.5",
     "prisma": "4.6.0",
@@ -27,7 +27,7 @@
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

integration-tests/rpc-path-root/package.json

@@ -7,10 +7,10 @@
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
   },
   "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
-    "@blitzjs/next": "workspace:2.0.0-beta.21",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
-    "blitz": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
+    "@blitzjs/next": "workspace:2.0.0-beta.20",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
+    "blitz": "workspace:2.0.0-beta.20",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0"

integration-tests/rpc/package.json

@@ -7,10 +7,10 @@
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
   },
   "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
-    "@blitzjs/next": "workspace:2.0.0-beta.21",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
-    "blitz": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
+    "@blitzjs/next": "workspace:2.0.0-beta.20",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
+    "blitz": "workspace:2.0.0-beta.20",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0"

integration-tests/trailing-slash/package.json

@@ -16,11 +16,11 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.21",
-    "@blitzjs/next": "workspace:2.0.0-beta.21",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
+    "@blitzjs/auth": "workspace:2.0.0-beta.20",
+    "@blitzjs/next": "workspace:2.0.0-beta.20",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.20",
     "lowdb": "3.0.0",
     "next": "12.2.5",
     "prisma": "4.6.0",
@@ -28,7 +28,7 @@
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

packages/blitz-auth/CHANGELOG.md

@@ -1,15 +1,5 @@
 # @blitzjs/auth
 
-## 2.0.0-beta.21
-
-### Patch Changes
-
-- 82e8b64f5: Fixes adding authError query param in Passport adapter.
-- Updated dependencies [d692b4c1d]
-- Updated dependencies [10f98c681]
-- Updated dependencies [d5b8faa86]
-  - blitz@2.0.0-beta.21
-
 ## 2.0.0-beta.20
 
 ### Minor Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.20",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -39,10 +39,10 @@
     "url": "0.11.0"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-beta.21"
+    "blitz": "2.0.0-beta.20"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
     "@testing-library/react": "13.4.0",
     "@testing-library/react-hooks": "8.0.1",
     "@types/cookie": "0.4.1",
@@ -50,7 +50,7 @@
     "@types/jsonwebtoken": "8.5.8",
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "^4.8.4",

packages/blitz-auth/src/server/passport-adapter.ts

@@ -172,13 +172,8 @@ export function passportAuth(config: BlitzPassportConfig): ApiHandler {
               if (error) {
                 console.error(`Login via ${strategyName} was unsuccessful.`)
                 console.error(error)
-
-                const authErrorQueryStringKey = redirectUrl.includes("?")
-                  ? "&authError="
-                  : "?authError="
                 redirectUrl +=
-                  authErrorQueryStringKey +
-                  encodeURIComponent(truncateString(error.toString(), 100))
+                  "?authError=" + encodeURIComponent(truncateString(error.toString(), 100))
                 res.setHeader("Location", redirectUrl)
                 res.statusCode = 302
                 res.end()

packages/blitz-next/CHANGELOG.md

@@ -1,17 +1,5 @@
 # @blitzjs/next
 
-## 2.0.0-beta.21
-
-### Patch Changes
-
-- 10f98c681: Add an href property to the generated route manifest that will return a string of the pathname and included query params.
-- Updated dependencies [d692b4c1d]
-- Updated dependencies [0025856b9]
-- Updated dependencies [10f98c681]
-- Updated dependencies [d5b8faa86]
-  - @blitzjs/rpc@2.0.0-beta.21
-  - blitz@2.0.0-beta.21
-
 ## 2.0.0-beta.20
 
 ### Minor Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.20",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,7 +24,7 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-beta.21",
+    "@blitzjs/rpc": "2.0.0-beta.20",
     "@tanstack/react-query": "4.0.10",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
@@ -34,12 +34,12 @@
     "supports-color": "8.1.1"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "next": "*",
     "react": "*"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.4.0",
@@ -49,7 +49,7 @@
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "next": "12.2.5",

packages/blitz-rpc/CHANGELOG.md

@@ -1,16 +1,5 @@
 # @blitzjs/rpc
 
-## 2.0.0-beta.21
-
-### Patch Changes
-
-- d692b4c1d: Fix suspense error codegen patch for nextjs versions 13-13.0.6
-- 0025856b9: Support full api of tanstack invalidateQueries
-- Updated dependencies [d692b4c1d]
-- Updated dependencies [10f98c681]
-- Updated dependencies [d5b8faa86]
-  - blitz@2.0.0-beta.21
-
 ## 2.0.0-beta.20
 
 ### Minor Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.20",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 400 ../blitz/dist/index-server.d.ts && wait-on -d 400 ../blitz-auth/dist/index-browser.d.ts",
@@ -30,17 +30,17 @@
     "supports-color": "8.1.1"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "next": "*",
     "react": "*"
   },
   "devDependencies": {
-    "@blitzjs/auth": "2.0.0-beta.21",
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/auth": "2.0.0-beta.20",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0",

packages/blitz-rpc/src/data-client/react-query.tsx

@@ -29,10 +29,6 @@ type QueryNonLazyOptions =
   | {suspense: true; enabled: true}
   | {suspense?: never; enabled?: never}
 
-class NextError extends Error {
-  digest?: string
-}
-
 // -------------------------
 // useQuery
 // -------------------------
@@ -97,11 +93,8 @@ export function useQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    const e = new NextError()
+    const e = new Error()
     e.name = "Rendering Suspense fallback..."
-    e.digest = "DYNAMIC_SERVER_USAGE"
-    // Backwards compatibility for nextjs 13.0.7
-    e.message = "DYNAMIC_SERVER_USAGE"
     delete e.stack
     throw e
   }
@@ -180,11 +173,8 @@ export function usePaginatedQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    const e = new NextError()
+    const e = new Error()
     e.name = "Rendering Suspense fallback..."
-    e.digest = "DYNAMIC_SERVER_USAGE"
-    // Backwards compatibility for nextjs 13.0.7
-    e.message = "DYNAMIC_SERVER_USAGE"
     delete e.stack
     throw e
   }
@@ -275,11 +265,8 @@ export function useInfiniteQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    const e = new NextError()
+    const e = new Error()
     e.name = "Rendering Suspense fallback..."
-    e.digest = "DYNAMIC_SERVER_USAGE"
-    // Backwards compatibility for nextjs 13.0.7
-    e.message = "DYNAMIC_SERVER_USAGE"
     delete e.stack
     throw e
   }

packages/blitz/CHANGELOG.md

@@ -1,15 +1,5 @@
 # blitz
 
-## 2.0.0-beta.21
-
-### Patch Changes
-
-- d692b4c1d: Fix suspense error codegen patch for nextjs versions 13-13.0.6
-- 10f98c681: Add an href property to the generated route manifest that will return a string of the pathname and included query params.
-- d5b8faa86: add regex to support inline and non-inline codebase and proper next.js package version check
-- Updated dependencies [77b7da0f3]
-  - @blitzjs/generator@2.0.0-beta.21
-
 ## 2.0.0-beta.20
 
 ### Minor Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.20",
   "scripts": {
     "build": "unbuild",
     "dev": "rm -rf dist && pnpm run predev && watch unbuild src --wait=0.2",
@@ -25,7 +25,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-beta.21",
+    "@blitzjs/generator": "2.0.0-beta.20",
     "@mrleebo/prisma-ast": "0.2.6",
     "@types/global-agent": "2.1.1",
     "arg": "5.0.1",
@@ -64,7 +64,6 @@
     "resolve-cwd": "3.0.0",
     "resolve-from": "5.0.0",
     "rimraf": "3.0.2",
-    "semver": "7.3.8",
     "superjson": "1.11.0",
     "supports-color": "8.1.1",
     "tar": "6.1.11",
@@ -74,7 +73,7 @@
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.20",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

packages/blitz/src/cli/utils/codegen-tasks.ts

@@ -5,7 +5,6 @@ import {join} from "path"
 import fs from "fs-extra"
 import {getPackageJson} from "./get-package-json"
 import {runPrisma} from "../../utils/run-prisma"
-import semver from "semver"
 
 import resolveFrom from "resolve-from"
 export const codegenTasks = async () => {
@@ -19,22 +18,21 @@ export const codegenTasks = async () => {
     const readFile = await fs.readFile(nextClientIndex)
     const packageJson = await getPackageJson()
     const nextVersion = packageJson.dependencies.next
-
     if (nextVersion && /^([~^])?12/.test(nextVersion)) {
       const updatedFile = readFile
         .toString()
         .replace(
           /ReactDOM\.hydrateRoot\(.*?\);/,
-          `ReactDOM.hydrateRoot(domEl, reactEl, {onRecoverableError: (err) => (err.toString().includes("DYNAMIC_SERVER_USAGE") || err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : console.error(err)});`,
+          `ReactDOM.hydrateRoot(domEl, reactEl, {onRecoverableError: (err) => (err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : console.error(err)});`,
         )
       await fs.writeFile(nextClientIndex, updatedFile)
       log.success("Next.js was successfully patched with a React Suspense fix")
-    } else if (nextVersion && semver.satisfies(nextVersion, "13 - 13.0.6")) {
+    } else if (nextVersion && /^([~^])?13/.test(nextVersion)) {
       const updatedFile = readFile
         .toString()
         .replace(
-          /_client.default\.hydrateRoot\(.*?\);/,
-          `_client.default.hydrateRoot(domEl, reactEl, {onRecoverableError: (err) => (err.toString().includes("DYNAMIC_SERVER_USAGE") || err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : console.error(err)});`,
+          /_client\.default\.hydrateRoot\(.*?\{?[\s\S]*?}?\);/,
+          `_client.default.hydrateRoot(domEl, reactEl, {onRecoverableError: (err) => (err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : console.error(err)});`,
         )
       await fs.writeFile(nextClientIndex, updatedFile)
       log.success("Next.js was successfully patched with a React Suspense fix")

packages/blitz/src/index-server.ts

@@ -6,6 +6,7 @@ export * from "./index-browser"
 export * from "./types"
 export * from "./utils/run-prisma"
 export * from "./utils/enhance-prisma"
+export {prepareArrayField} from "./utils/prisma-prepare-array"
 export * from "./middleware"
 export * from "./paginate"
 export * from "./logging"

packages/blitz/src/utils/prisma-prepare-array.ts

@@ -0,0 +1,125 @@
+type Options = {
+  removedItemsMethod?: "delete" | "disconnect"
+}
+
+function isDeepEqual(val1: any, val2: any): boolean {
+  if (val1 === val2) {
+    return true
+  } else if (typeof val1 === "object" && typeof val2 === "object") {
+    if (val1 === null || val2 === null) {
+      return val1 === val2
+    } else if (Array.isArray(val1) && Array.isArray(val2)) {
+      if (val1.length !== val2.length) {
+        return false
+      }
+      for (let i = 0; i < val1.length; i++) {
+        if (!isDeepEqual(val1[i], val2[i])) {
+          return false
+        }
+      }
+      return true
+    } else {
+      const keys1 = Object.keys(val1)
+      const keys2 = Object.keys(val2)
+      if (keys1.length !== keys2.length) {
+        return false
+      }
+      for (const key of keys1) {
+        if (!isDeepEqual(val1[key], val2[key])) {
+          return false
+        }
+      }
+      return true
+    }
+  } else {
+    return false
+  }
+}
+
+/**
+ * helper to convert array-like fields into Prisma Api format
+ * it converts arrays like [ 1,2,3 ] to something like { create: [1,2,3] }
+ * @example
+ * value = [ {name: 1}, {id: 2, name: 3} ]
+ * initial = [ {id: 2, name: 2}, {id: 3} ]
+ * prepareArrayField(value, initial)
+ * // returns
+ * {
+ *    create: [ {name: 1} ],
+ *    update: [ { data: {name: 3}, where: {id: 2} } ],
+ *    remove: [ {id: 3} ]
+ * }
+ */
+export function prepareArrayField(
+  value: any[],
+  initial?: any[],
+  mapper?: null | ((item: any, initial?: any) => any),
+  {removedItemsMethod = "delete"}: Options = {},
+) {
+  value = value.filter(Boolean)
+
+  const valueById = value.reduce((res, item) => {
+    item.id && (res[item.id] = item)
+    return res
+  }, {})
+
+  const initialById =
+    initial?.reduce((res, item) => {
+      item.id && (res[item.id] = item)
+      return res
+    }, {}) || {}
+
+  const create: any[] = []
+  const connect: any[] = []
+  const update: any[] = []
+  const remove = initial?.filter(({id}) => !valueById[id])
+
+  for (const item of value) {
+    const {id} = item
+
+    if (id) {
+      if (initialById[id]) {
+        if (!isDeepEqual(item, initialById[id])) {
+          update.push(item)
+        }
+      } else {
+        connect.push(item)
+      }
+    } else {
+      create.push(item)
+    }
+  }
+
+  const connectItems = connect.map(({id}) => ({id}))
+
+  const removeItems = remove?.map(({id}) => ({id}))
+
+  const createItems = mapper ? create.map((item) => mapper(item)) : create
+
+  const updateItems = update.map((item) => {
+    const initialItemValue = initialById[item.id]
+
+    const changed = Object.keys(item).reduce((acc: {[key: string]: unknown}, key) => {
+      const value = item[key]
+      if (!isDeepEqual(value, initialItemValue && initialItemValue[key])) {
+        acc[key] = value
+      }
+      return acc
+    }, {})
+
+    return {
+      data: mapper ? mapper(changed, initialItemValue) : changed,
+      where: {id: item.id},
+    }
+  })
+
+  return {
+    connect: connectItems.length ? connectItems : undefined,
+
+    create: createItems.length ? createItems : undefined,
+
+    update: updateItems?.length ? updateItems : undefined,
+
+    [removedItemsMethod]: removeItems?.length ? removeItems : undefined,
+  }
+}

packages/codemod/CHANGELOG.md

@@ -1,16 +1,5 @@
 # @blitzjs/codemod
 
-## 2.0.0-beta.21
-
-### Patch Changes
-
-- Updated dependencies [77b7da0f3]
-- Updated dependencies [d692b4c1d]
-- Updated dependencies [10f98c681]
-- Updated dependencies [d5b8faa86]
-  - @blitzjs/generator@2.0.0-beta.21
-  - blitz@2.0.0-beta.21
-
 ## 2.0.0-beta.20
 
 ### Patch Changes

packages/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/codemod",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.20",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -25,9 +25,9 @@
     "@babel/plugin-proposal-class-properties": "7.17.12",
     "@babel/plugin-syntax-jsx": "7.17.12",
     "@babel/plugin-syntax-typescript": "7.17.12",
-    "@blitzjs/generator": "2.0.0-beta.21",
+    "@blitzjs/generator": "2.0.0-beta.20",
     "arg": "5.0.1",
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "chalk": "^4.1.0",
     "cross-spawn": "7.0.3",
     "debug": "4.3.3",

packages/config/CHANGELOG.md

@@ -1,7 +1,5 @@
 # @blitzjs/config
 
-## 2.0.0-beta.21
-
 ## 2.0.0-beta.20
 
 ## 2.0.0-beta.19

packages/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blitzjs/config",
   "private": true,
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.20",
   "license": "MIT",
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "5.42.1",

packages/generator/CHANGELOG.md

@@ -1,11 +1,5 @@
 # @blitzjs/generator
 
-## 2.0.0-beta.21
-
-### Patch Changes
-
-- 77b7da0f3: Remove husky prepush hook & update precommit hook to only run prettier
-
 ## 2.0.0-beta.20
 
 ### Patch Changes

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.20",
   "scripts": {
     "dev": "watch unbuild src --wait=0.2",
     "build": "unbuild && pnpm build:templates",
@@ -47,7 +47,7 @@
     "vinyl": "2.2.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.21",
+    "@blitzjs/config": "2.0.0-beta.20",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",

packages/pkg-template/package.json

@@ -25,7 +25,7 @@
     "@typescript-eslint/parser": "5.9.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.21",
+    "@blitzjs/config": "2.0.0-beta.20",
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
     "react": "18.2.0",

recipes/base-web/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/bulma/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/bumbag-ui/package.json

@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/chakra-ui/package.json

@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/emotion/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/gh-action-yarn-mariadb/package.json

@@ -24,6 +24,6 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21"
+    "blitz": "2.0.0-beta.20"
   }
 }

recipes/gh-action-yarn-postgres/package.json

@@ -24,6 +24,6 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21"
+    "blitz": "2.0.0-beta.20"
   }
 }

recipes/ghost/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/graphql-apollo-server/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0",
     "uuid": "^8.3.1"
   },

recipes/logrocket/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/material-ui/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/next-ui/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/passenger/package.json

@@ -23,6 +23,6 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21"
+    "blitz": "2.0.0-beta.20"
   }
 }

recipes/quirrel/package.json

@@ -22,6 +22,6 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21"
+    "blitz": "2.0.0-beta.20"
   }
 }

recipes/reflexjs/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/render/package.json

@@ -22,6 +22,6 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21"
+    "blitz": "2.0.0-beta.20"
   }
 }

recipes/secureheaders/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0",
     "uuid": "^8.3.1"
   },

recipes/stitches/package.json

@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/styled-components/package.json

@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/tailwind/package.json

@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/theme-ui/package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {

recipes/vanilla-extract/package.json

@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "dependencies": {
-    "blitz": "2.0.0-beta.21",
+    "blitz": "2.0.0-beta.20",
     "jscodeshift": "0.13.0"
   },
   "devDependencies": {