Version Packages (beta) (#3751 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Remove the NODE_ENV development check when patching nextjs (#3742 )
2026-02-04 12:08:33 -05:00 · 2022-08-18 14:22:30 +02:00 · 2022-08-17 17:51:31 +02:00 · 2022-08-17 17:25:57 +02:00 · 2022-08-17 17:17:12 +02:00 · 2022-08-17 11:03:28 -04:00
120 changed files with 1925 additions and 697 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -3670,6 +3670,48 @@
        "doc",
        "code"
      ]
+    },
+    {
+      "login": "edrickleong",
+      "name": "Edrick Leong",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10529706?v=4",
+      "profile": "https://github.com/edrickleong",
+      "contributions": [
+        "doc",
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "siddhsuresh",
+      "name": "Siddharth Suresh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/83594610?v=4",
+      "profile": "https://github.com/siddhsuresh",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "orionmiz",
+      "name": "JH.Lee",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39466936?v=4",
+      "profile": "http://jins.dev",
+      "contributions": [
+        "code",
+        "test",
+        "maintenance",
+        "doc"
+      ]
+    },
+    {
+      "login": "corydeppen",
+      "name": "Cory Deppen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/313264?v=4",
+      "profile": "https://github.com/corydeppen",
+      "contributions": [
+        "doc"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.changeset/afraid-dancers-juggle.md
+++ b/.changeset/afraid-dancers-juggle.md
@@ -0,0 +1,13 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"@blitzjs/codemod": patch
+"@blitzjs/config": patch
+"@blitzjs/generator": patch
+---
+
+Bump react, react-dom, @types/react and next versions
+
+This fixes a console warning: `Warning: Received `true` for a non-boolean attribute `global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
--- a/.changeset/brown-avocados-wink.md
+++ b/.changeset/brown-avocados-wink.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Print model added or updated in schema.prisma after running model generator
--- a/.changeset/calm-horses-tie.md
+++ b/.changeset/calm-horses-tie.md
@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Add back blitz generate command
--- a/.changeset/chilled-carrots-own.md
+++ b/.changeset/chilled-carrots-own.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add `BlitzPage` type to Home pages in app templates
--- a/.changeset/clean-hats-pump.md
+++ b/.changeset/clean-hats-pump.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Allow using `RouteUrlObject` as `redirect.destination` in `getStaticProps` and `getServerSideProps`
--- a/.changeset/cuddly-pugs-crash.md
+++ b/.changeset/cuddly-pugs-crash.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Wrap middlewares with BlitzServerMiddleware function with codemod
--- a/.changeset/few-dogs-fetch.md
+++ b/.changeset/few-dogs-fetch.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Use correct path for log utilities import
--- a/.changeset/forty-timers-rhyme.md
+++ b/.changeset/forty-timers-rhyme.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Change ES6 import for `withBlitz` during the codemod to the require syntax.
--- a/.changeset/gorgeous-birds-warn.md
+++ b/.changeset/gorgeous-birds-warn.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add `BlitzPage` types to auth pages in new app template
--- a/.changeset/lazy-maps-sort.md
+++ b/.changeset/lazy-maps-sort.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Patch Next.js Suspense issue in all node environments. Previously we only patched it in the `development` environment, but now we make sure it gets patched in the `production` env (with the `blitz build` command) as well.
--- a/.changeset/long-bees-hope.md
+++ b/.changeset/long-bees-hope.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add type checking to next.config.js files in new app templates
--- a/.changeset/long-lobsters-drop.md
+++ b/.changeset/long-lobsters-drop.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Include ResetPasswordPage in new app template
--- a/.changeset/lovely-berries-sell.md
+++ b/.changeset/lovely-berries-sell.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Remove trailing comma when removing BlitzConfig from next.config.js & Fix codemod so if route (eg. `app/auth/pages`) convert to (eg. `pages/`) instead of (eg. `pages/auth`)
--- a/.changeset/perfect-trains-double.md
+++ b/.changeset/perfect-trains-double.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Wrap `blitz.config.ts` with the `withBlitz` function during the codemod step instead of creating a blank `next.config.js` file.
--- a/.changeset/poor-walls-relax.md
+++ b/.changeset/poor-walls-relax.md
@@ -0,0 +1,10 @@
+---
+"@blitzjs/codemod": patch
+"@blitzjs/generator": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"@blitzjs/config": patch
+---
+
+Set current Blitz tag to latest
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -1,38 +1,45 @@
 {
  "mode": "pre",
-  "tag": "alpha",
+  "tag": "beta",
  "initialVersions": {
    "web": "0.0.0",
    "test-auth": "0.0.0",
    "test-rpc": "0.0.0",
    "test-utils": "0.0.0",
-    "blitz": "2.0.0-alpha.0",
-    "@blitzjs/auth": "2.0.0-alpha.0",
-    "@blitzjs/next": "2.0.0-alpha.0",
-    "@blitzjs/rpc": "2.0.0-alpha.0",
+    "blitz": "2.0.0-beta.0",
+    "@blitzjs/auth": "2.0.0-beta.0",
+    "@blitzjs/next": "2.0.0-beta.0",
+    "@blitzjs/rpc": "2.0.0-beta.0",
    "@blitzjs/config": "0.0.0",
-    "@blitzjs/generator": "2.0.0-alpha.0",
-    "@blitzjs/codemod": "2.0.0-alpha.0",
+    "@blitzjs/generator": "2.0.0-beta.0",
+    "@blitzjs/codemod": "2.0.0-beta.0",
    "template": "0.0.0",
    "toolkit-app": "1.0.0",
    "test-qm": "0.0.0",
    "test-no-suspense": "0.0.0",
    "test-trailing-slash": "0.0.0",
-    "test-middleware": "0.0.0"
+    "test-middleware": "0.0.0",
+    "test-react-query-utils": "0.0.0"
  },
  "changesets": [
+    "afraid-dancers-juggle",
    "big-phones-bow",
    "blue-pigs-tan",
    "breezy-cameras-double",
    "breezy-moose-behave",
    "bright-mangos-run",
+    "brown-avocados-wink",
    "calm-carpets-deny",
+    "calm-horses-tie",
    "calm-nails-wait",
    "calm-tomatoes-drive",
+    "chilled-carrots-own",
+    "clean-hats-pump",
    "clean-walls-wink",
    "clever-radios-lie",
    "cool-doors-invent",
    "cool-horses-check",
+    "cuddly-pugs-crash",
    "curly-rules-speak",
    "curly-seas-serve",
    "dirty-monkeys-greet",
@@ -44,7 +51,9 @@
    "fair-wombats-sneeze",
    "famous-kings-explain",
    "fast-trainers-kneel",
+    "few-dogs-fetch",
    "flat-bees-approve",
+    "forty-timers-rhyme",
    "four-brooms-juggle",
    "four-meals-fry",
    "four-sheep-judge",
@@ -53,6 +62,7 @@
    "gentle-dogs-reply",
    "good-apes-drum",
    "good-insects-wink",
+    "gorgeous-birds-warn",
    "gorgeous-buses-scream",
    "gorgeous-games-obey",
    "great-candles-stare",
@@ -68,9 +78,13 @@
    "hungry-baboons-swim",
    "kind-walls-suffer",
    "late-steaks-give",
+    "lazy-maps-sort",
    "lemon-games-press",
    "lemon-seas-push",
    "light-donkeys-double",
+    "long-bees-hope",
+    "long-lobsters-drop",
+    "lovely-berries-sell",
    "lovely-colts-share",
    "lucky-cows-try",
    "mean-gorillas-reply",
@@ -92,13 +106,16 @@
    "olive-feet-rhyme",
    "olive-sheep-rhyme",
    "perfect-eyes-repeat",
+    "perfect-trains-double",
    "plenty-bottles-swim",
    "polite-lizards-love",
    "poor-peas-lick",
    "poor-penguins-look",
    "poor-shrimps-think",
+    "poor-walls-relax",
    "popular-teachers-pay",
    "pretty-games-march",
+    "purple-donkeys-smash",
    "purple-singers-greet",
    "quick-cycles-confess",
    "quiet-feet-travel",
@@ -120,11 +137,14 @@
    "slow-walls-poke",
    "small-socks-confess",
    "smooth-planets-admire",
+    "smooth-rice-clap",
    "smooth-stingrays-drum",
    "smooth-tools-train",
    "soft-adults-smell",
    "sour-lemons-hunt",
+    "sour-mails-lick",
    "spicy-beds-float",
+    "spotty-dingos-stare",
    "stale-jobs-drum",
    "strong-apes-reply",
    "stupid-walls-sell",
@@ -149,6 +169,7 @@
    "two-eyes-knock",
    "two-kiwis-help",
    "two-tigers-type",
+    "two-turtles-poke",
    "unlucky-avocados-fix",
    "unlucky-papayas-sleep",
    "violet-bags-leave",
@@ -156,6 +177,7 @@
    "weak-suns-shave",
    "wicked-ghosts-cough",
    "wicked-rings-walk",
+    "wise-eels-visit",
    "wise-frogs-give",
    "wise-rabbits-complain"
  ]
--- a/.changeset/purple-donkeys-smash.md
+++ b/.changeset/purple-donkeys-smash.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Exit CLI process after `blitz new` command is finished
--- a/.changeset/smooth-rice-clap.md
+++ b/.changeset/smooth-rice-clap.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Fix typo in a next.config.js file name
--- a/.changeset/sour-mails-lick.md
+++ b/.changeset/sour-mails-lick.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Allow codemod to finish if `cookiePrefix` is undefined. Then show error at the end of running the codemod.
--- a/.changeset/spotty-dingos-stare.md
+++ b/.changeset/spotty-dingos-stare.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Add `getQueryData` utility to get an existing query's cached data
--- a/.changeset/two-turtles-poke.md
+++ b/.changeset/two-turtles-poke.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Add `Script` as a default import from next.js during the codemod.
--- a/.changeset/wise-eels-visit.md
+++ b/.changeset/wise-eels-visit.md
@@ -0,0 +1,11 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"@blitzjs/codemod": patch
+"@blitzjs/config": patch
+"@blitzjs/generator": patch
+---
+
+Beta release
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing

-[Read the Contributing Guide at Blitzjs.com](https://alpha.blitzjs.com/docs/contributing)
+[Read the Contributing Guide at Blitzjs.com](https://blitzjs.com/docs/contributing)

 ## To run tests

--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@
    <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-389-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-393-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/canary/LICENSE">
+  <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">
  </a>
  <a aria-label="NPM version" href="https://www.npmjs.com/package/blitz">
@@ -66,16 +66,16 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 <table>
  <tr>
 <td><a aria-label="Andreas Asprou" href="https://andreas.fyi">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/andreas.jpg" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/andreas.jpg" width="40px"/>
 </a></td>
 <td><a aria-label="Digas" href="https://digsas.com">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/digsas.svg" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/digsas.svg" width="40px"/>
 </a></td>
 <td><a aria-label="userTrack" href="https://www.usertrack.net/?ref=blitzjs">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/usertrack.png" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/usertrack.png" width="40px"/>
 </a></td>
 <td><a aria-label="MeetKai" href="https://meetkai.com/?ref=blitzjs">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/meetkai.png" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/meetkai.png" width="40px"/>
 </a></td>
  </tr>
 </table>
@@ -85,14 +85,11 @@ Your financial contributions help ensure Blitz continues to be developed and mai

 <table>
  <tr>
-<td><a aria-label="Render.com" href="https://render.com?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/render-logo-color2.png" width="200px">
-</a></td>
 <td><a aria-label="RIT" href="https://rit-inc.co.jp/?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2021">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/rit_logo.png" width="200px">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/rit_logo.png" width="200px">
 </a></td>
 <td><a aria-label="Boostry" href="https://boostry.co.jp/?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2021">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/boostry.svg" width="200px">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/boostry.svg" width="200px">
 </a></td>
  </tr>
 </table>
@@ -105,7 +102,7 @@ Your financial contributions help ensure Blitz continues to be developed and mai
  <tr>
  <td>
 <a aria-label="Fauna" href="https://dashboard.fauna.com/accounts/register?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/Fauna_Logo_Blue.png" width="300px">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/Fauna_Logo_Blue.png" width="300px">
 </a>
 </td>
  </tr>
@@ -119,9 +116,13 @@ Your financial contributions help ensure Blitz continues to be developed and mai

 ### 💎 Diamond Sponsors

-<a aria-label="Your Company" href="#">
-<img alt="" src="https://dummyimage.com/1000x330/efe8ff/000000.png&text=Your+Logo+Here" width="500px">
-</a>
+<table>
+  <tr>
+    <a aria-label="Flightcontrol" href="https://www.flightcontrol.dev?ref=blitzjs">
+    <img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/flightcontrol.png" width="400px">
+    </a>
+  </tr>
+</table>

 <br>

@@ -151,6 +152,7 @@ _Code ownership, pull request approvals and merging, etc_ (see [Maintainers L2](
 <table>
  <tr>
    <td align="center"><a href="http://simonknott.de"><img src="https://avatars1.githubusercontent.com/u/14912729?v=4" width="100px;" alt=""/><br /><sub><b>Simon Knott</b></sub></a><br />SuperJSON</td>
+    <td align="center"><a href="http://jins.dev"><img src="https://avatars.githubusercontent.com/u/39466936?v=4" width="100px;" alt=""/><br /><sub><b>JH.Lee</b></sub></a><br />SuperJSON</td>
    <td align="center"><a href="https://juanm04.com"><img src="https://avatars0.githubusercontent.com/u/16712703?v=4" width="100px;" alt=""/><br /><sub><b>Juan Martín Seery</b></sub></a><br />Website/Docs</td>
  </tr>
 </table>
@@ -709,6 +711,12 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
    <td align="center"><a href="https://github.com/datner"><img src="https://avatars.githubusercontent.com/u/22598347?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Datner</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Code">💻</a></td>
    <td align="center"><a href="https://chaiwattsw.com/"><img src="https://avatars.githubusercontent.com/u/30198386?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chaiwat Trisuwan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Code">💻</a></td>
    <td align="center"><a href="oltdaniel.eu"><img src="https://avatars.githubusercontent.com/u/53529846?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Oltmanns</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=oltdaniel" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=oltdaniel" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/edrickleong"><img src="https://avatars.githubusercontent.com/u/10529706?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Edrick Leong</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=edrickleong" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=edrickleong" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=edrickleong" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/siddhsuresh"><img src="https://avatars.githubusercontent.com/u/83594610?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Siddharth Suresh</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=siddhsuresh" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=siddhsuresh" title="Code">💻</a></td>
+    <td align="center"><a href="http://jins.dev"><img src="https://avatars.githubusercontent.com/u/39466936?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JH.Lee</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=orionmiz" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=orionmiz" title="Tests">⚠️</a> <a href="#maintenance-orionmiz" title="Maintenance">🚧</a> <a href="https://github.com/blitz-js/blitz/commits?author=orionmiz" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/corydeppen"><img src="https://avatars.githubusercontent.com/u/313264?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cory Deppen</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=corydeppen" title="Documentation">📖</a></td>
  </tr>
 </table>

--- a/apps/toolkit-app/mailers/forgotPasswordMailer.ts
+++ b/apps/toolkit-app/mailers/forgotPasswordMailer.ts
@@ -13,7 +13,7 @@ type ResetPasswordMailer = {
 export function forgotPasswordMailer({ to, token }: ResetPasswordMailer) {
  // In production, set APP_ORIGIN to your production server origin
  const origin = process.env.APP_ORIGIN || process.env.BLITZ_DEV_SERVER_ORIGIN
-  const resetUrl = `${origin}/reset-password?token=${token}`
+  const resetUrl = `${origin}/auth/reset-password?token=${token}`

  const msg = {
    from: "TODO@example.com",
--- a/apps/toolkit-app/next.config.js
+++ b/apps/toolkit-app/next.config.js
@@ -1,10 +1,15 @@
+// @ts-check
+
 const withBundleAnalyzer = require("@next/bundle-analyzer")({
  enabled: process.env.ANALYZE === "true",
 })
 const { withBlitz } = require("@blitzjs/next")

-module.exports = withBlitz(
-  withBundleAnalyzer({
-    reactStrictMode: true,
-  })
-)
+/**
+ * @type {import('@blitzjs/next').BlitzConfig}
+ **/
+const config = {
+  reactStrictMode: true,
+}
+
+module.exports = withBlitz(withBundleAnalyzer(config))
--- a/apps/toolkit-app/package.json
+++ b/apps/toolkit-app/package.json
@@ -29,11 +29,11 @@
    "@blitzjs/rpc": "workspace:*",
    "@hookform/resolvers": "2.8.8",
    "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-alpha.68",
-    "next": "12.2.0",
+    "blitz": "workspace:2.0.0-beta.2",
+    "next": "12.2.5",
    "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
    "react-hook-form": "7.29.0",
    "ts-node": "10.7.0",
    "zod": "3.17.3"
@@ -45,7 +45,7 @@
    "@types/jest": "27.4.1",
    "@types/node": "17.0.16",
    "@types/preview-email": "2.0.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "@typescript-eslint/eslint-plugin": "5.9.1",
    "eslint": "7.32.0",
    "eslint-config-next": "12.2.0",
--- a/apps/toolkit-app/pages/auth/forgot-password.tsx
+++ b/apps/toolkit-app/pages/auth/forgot-password.tsx
@@ -4,8 +4,9 @@ import { Form, FORM_ERROR } from "app/core/components/Form"
 import { ForgotPassword } from "app/auth/validations"
 import forgotPassword from "app/auth/mutations/forgotPassword"
 import { useMutation } from "@blitzjs/rpc"
+import { BlitzPage } from "@blitzjs/next"

-const ForgotPasswordPage = () => {
+const ForgotPasswordPage: BlitzPage = () => {
  const [forgotPasswordMutation, { isSuccess }] = useMutation(forgotPassword)

  return (
--- a/apps/toolkit-app/pages/auth/login.tsx
+++ b/apps/toolkit-app/pages/auth/login.tsx
@@ -1,8 +1,9 @@
 import Layout from "app/core/layouts/Layout"
 import { LoginForm } from "app/auth/components/LoginForm"
 import { useRouter } from "next/router"
+import { BlitzPage } from "@blitzjs/next"

-const LoginPage = () => {
+const LoginPage: BlitzPage = () => {
  const router = useRouter()

  return (
--- a/apps/toolkit-app/pages/auth/reset-password.tsx
+++ b/apps/toolkit-app/pages/auth/reset-password.tsx
@@ -0,0 +1,66 @@
+import Layout from "app/core/layouts/Layout"
+import { LabeledTextField } from "app/core/components/LabeledTextField"
+import { Form, FORM_ERROR } from "app/core/components/Form"
+import { ResetPassword } from "app/auth/validations"
+import resetPassword from "app/auth/mutations/resetPassword"
+import { BlitzPage, Routes } from "@blitzjs/next"
+import { useRouter } from "next/router"
+import { useMutation } from "@blitzjs/rpc"
+import Link from "next/link"
+
+const ResetPasswordPage: BlitzPage = () => {
+  const router = useRouter()
+  const [resetPasswordMutation, { isSuccess }] = useMutation(resetPassword)
+
+  return (
+    <div>
+      <h1>Set a New Password</h1>
+
+      {isSuccess ? (
+        <div>
+          <h2>Password Reset Successfully</h2>
+          <p>
+            Go to the <Link href={Routes.Home()}>homepage</Link>
+          </p>
+        </div>
+      ) : (
+        <Form
+          submitText="Reset Password"
+          schema={ResetPassword}
+          initialValues={{
+            password: "",
+            passwordConfirmation: "",
+            token: router.query.token as string,
+          }}
+          onSubmit={async (values) => {
+            try {
+              await resetPasswordMutation(values)
+            } catch (error: any) {
+              if (error.name === "ResetPasswordError") {
+                return {
+                  [FORM_ERROR]: error.message,
+                }
+              } else {
+                return {
+                  [FORM_ERROR]: "Sorry, we had an unexpected error. Please try again.",
+                }
+              }
+            }
+          }}
+        >
+          <LabeledTextField name="password" label="New Password" type="password" />
+          <LabeledTextField
+            name="passwordConfirmation"
+            label="Confirm New Password"
+            type="password"
+          />
+        </Form>
+      )}
+    </div>
+  )
+}
+
+ResetPasswordPage.redirectAuthenticatedTo = "/"
+ResetPasswordPage.getLayout = (page) => <Layout title="Reset Your Password">{page}</Layout>
+
+export default ResetPasswordPage
--- a/apps/toolkit-app/pages/auth/signup.tsx
+++ b/apps/toolkit-app/pages/auth/signup.tsx
@@ -1,9 +1,9 @@
 import { useRouter } from "next/router"
 import Layout from "app/core/layouts/Layout"
 import { SignupForm } from "app/auth/components/SignupForm"
-import { Routes } from "@blitzjs/next"
+import { BlitzPage, Routes } from "@blitzjs/next"

-const SignupPage = () => {
+const SignupPage: BlitzPage = () => {
  const router = useRouter()

  return (
--- a/apps/toolkit-app/pages/index.tsx
+++ b/apps/toolkit-app/pages/index.tsx
@@ -6,7 +6,7 @@ import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 import logout from "app/auth/mutations/logout"
 import logo from "public/logo.png"
 import { useMutation } from "@blitzjs/rpc"
-import { Routes } from "@blitzjs/next"
+import { Routes, BlitzPage } from "@blitzjs/next"

 /*
 * This file is just for a pleasant getting started page for your new app.
@@ -53,7 +53,7 @@ const UserInfo = () => {
  }
 }

-const Home = () => {
+const Home: BlitzPage = () => {
  return (
    <Layout title="Home">
      <div className="container">
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -4,7 +4,7 @@
  "private": true,
  "scripts": {
    "start:dev": "pnpm run prisma:start && next dev",
-    "buildapp": "prisma generate && next build",
+    "buildapp": "NODE_ENV=production pnpm blitz codegen && pnpm prisma generate && next build",
    "start": "next start",
    "lint": "next lint",
    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
@@ -25,17 +25,17 @@
    "@types/passport-twitter": "1.0.37",
    "blitz": "workspace:*",
    "jest": "27.5.1",
-    "next": "12.2.0",
+    "next": "12.2.5",
    "passport-mock-strategy": "2.0.0",
    "passport-twitter": "1.0.4",
    "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
    "ts-node": "10.7.0"
  },
  "devDependencies": {
    "@next/bundle-analyzer": "12.0.8",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "eslint": "7.32.0",
    "typescript": "^4.5.3"
  }
--- a/apps/web/pages/[postId]/index.tsx
+++ b/apps/web/pages/[postId]/index.tsx
@@ -0,0 +1,7 @@
+export default function Post() {
+  return (
+    <div>
+      <h1>Post</h1>
+    </div>
+  )
+}
--- a/apps/web/pages/page-with-get-query-data.tsx
+++ b/apps/web/pages/page-with-get-query-data.tsx
@@ -0,0 +1,24 @@
+import {getQueryData, useQuery} from "@blitzjs/rpc"
+import getBasic from "../app/queries/getBasic"
+import {useState} from "react"
+
+function PageWithGetQueryData() {
+  const [data] = useQuery(getBasic, {})
+  const [newData, setNewData] = useState<string>()
+  return (
+    <div>
+      <div>{data}</div>
+      {newData && <div id="new-data">{newData}</div>}
+      <button
+        onClick={async () => {
+          const newData = getQueryData(getBasic, {})
+          setNewData(newData)
+        }}
+      >
+        Call getQueryData
+      </button>
+    </div>
+  )
+}
+
+export default PageWithGetQueryData
--- a/apps/web/pages/page-with-gssp-redirect.tsx
+++ b/apps/web/pages/page-with-gssp-redirect.tsx
@@ -0,0 +1,27 @@
+import {SessionContext} from "@blitzjs/auth"
+import {Routes} from "@blitzjs/next"
+import {gSSP} from "app/blitz-server"
+
+type Props = {
+  userId: unknown
+  publicData: SessionContext["$publicData"]
+}
+
+export const getServerSideProps = gSSP<Props>(async ({ctx}) => {
+  const {session} = ctx
+
+  return {
+    redirect: {destination: Routes.Post({postId: "1"})},
+    props: {
+      userId: session.userId,
+      publicData: session.$publicData,
+      publishedAt: new Date(0),
+    },
+  }
+})
+
+function PageWithGsspRedirect(props: Props) {
+  return <div>{JSON.stringify(props, null, 2)}</div>
+}
+
+export default PageWithGsspRedirect
--- a/assets/flightcontrol.png
+++ b/assets/flightcontrol.png
--- a/integration-tests/auth/package.json
+++ b/integration-tests/auth/package.json
@@ -19,17 +19,17 @@
    "@prisma/client": "4.0.0",
    "blitz": "workspace:*",
    "lowdb": "3.0.0",
-    "next": "12.2.0",
+    "next": "12.2.5",
    "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
  },
  "devDependencies": {
    "@next/bundle-analyzer": "12.0.8",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
    "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "b64-lite": "1.4.0",
    "eslint": "7.32.0",
    "fs-extra": "10.0.1",
--- a/integration-tests/middleware/package.json
+++ b/integration-tests/middleware/package.json
@@ -15,16 +15,16 @@
    "@blitzjs/next": "workspace:*",
    "@blitzjs/rpc": "workspace:*",
    "blitz": "workspace:*",
-    "next": "12.2.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "next": "12.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
  },
  "devDependencies": {
    "@next/bundle-analyzer": "12.0.8",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
    "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "eslint": "7.32.0",
    "fs-extra": "10.0.1",
    "get-port": "6.1.2",
--- a/integration-tests/no-suspense/package.json
+++ b/integration-tests/no-suspense/package.json
@@ -19,10 +19,10 @@
    "@prisma/client": "4.0.0",
    "blitz": "workspace:*",
    "lowdb": "3.0.0",
-    "next": "12.2.0",
+    "next": "12.2.5",
    "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
  },
  "devDependencies": {
    "@blitzjs/config": "workspace:*",
@@ -30,7 +30,7 @@
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
    "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "b64-lite": "1.4.0",
    "eslint": "7.32.0",
    "fs-extra": "10.0.1",
--- a/integration-tests/qm/package.json
+++ b/integration-tests/qm/package.json
@@ -15,14 +15,14 @@
    "@prisma/client": "4.0.0",
    "@tanstack/react-query": "4.0.10",
    "blitz": "workspace:*",
-    "next": "12.2.0",
+    "next": "12.2.5",
    "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
  },
  "devDependencies": {
    "@testing-library/react": "13.0.0",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "@vitejs/plugin-react": "1.3.0",
    "delay": "5.0.0",
    "eslint": "7.32.0",
--- a/integration-tests/react-query-utils/.env
+++ b/integration-tests/react-query-utils/.env
@@ -0,0 +1,2 @@
+SESSION_SECRET_KEY=hsdenhJfpLHrGjgdgg3jdF8g2bYD2PaQ
+HEADLESS=true
--- a/integration-tests/react-query-utils/.eslintrc.js
+++ b/integration-tests/react-query-utils/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require("@blitzjs/config/eslint")
--- a/integration-tests/react-query-utils/.gitignore
+++ b/integration-tests/react-query-utils/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+# Keep environment variables out of version control
+*.sqlite
--- a/integration-tests/react-query-utils/app/blitz-client.ts
+++ b/integration-tests/react-query-utils/app/blitz-client.ts
@@ -0,0 +1,14 @@
+import {BlitzRpcPlugin} from "@blitzjs/rpc"
+import {setupBlitzClient} from "@blitzjs/next"
+import {AuthClientPlugin} from "@blitzjs/auth"
+
+const {withBlitz} = setupBlitzClient({
+  plugins: [
+    AuthClientPlugin({
+      cookiePrefix: "react-query-utils-tests-cookie-prefix",
+    }),
+    BlitzRpcPlugin({}),
+  ],
+})
+
+export {withBlitz}
--- a/integration-tests/react-query-utils/app/blitz-server.ts
+++ b/integration-tests/react-query-utils/app/blitz-server.ts
@@ -0,0 +1,16 @@
+import {setupBlitzServer} from "@blitzjs/next"
+import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
+import {simpleRolesIsAuthorized} from "@blitzjs/auth"
+import db from "../db"
+
+const {gSSP, gSP, api} = setupBlitzServer({
+  plugins: [
+    AuthServerPlugin({
+      cookiePrefix: "react-query-utils-tests-cookie-prefix",
+      storage: PrismaStorage(db),
+      isAuthorized: simpleRolesIsAuthorized,
+    }),
+  ],
+})
+
+export {gSSP, gSP, api}
--- a/integration-tests/react-query-utils/app/queries/getBasic.ts
+++ b/integration-tests/react-query-utils/app/queries/getBasic.ts
@@ -0,0 +1,3 @@
+export default async function getBasic() {
+  return "basic-result"
+}
--- a/integration-tests/react-query-utils/db/index.ts
+++ b/integration-tests/react-query-utils/db/index.ts
@@ -0,0 +1,8 @@
+import {enhancePrisma} from "blitz"
+import {PrismaClient} from "@prisma/client"
+
+const EnhancedPrisma = enhancePrisma(PrismaClient)
+
+export * from "@prisma/client"
+const prisma = new EnhancedPrisma()
+export default prisma
--- a/integration-tests/react-query-utils/db/migrations/20220330155417_init/migration.sql
+++ b/integration-tests/react-query-utils/db/migrations/20220330155417_init/migration.sql
@@ -0,0 +1,47 @@
+-- CreateTable
+CREATE TABLE "User" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "name" TEXT,
+    "email" TEXT NOT NULL,
+    "hashedPassword" TEXT,
+    "role" TEXT NOT NULL DEFAULT 'user'
+);
+
+-- CreateTable
+CREATE TABLE "Session" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "expiresAt" DATETIME,
+    "handle" TEXT NOT NULL,
+    "userId" INTEGER,
+    "hashedSessionToken" TEXT,
+    "antiCSRFToken" TEXT,
+    "publicData" TEXT,
+    "privateData" TEXT,
+    CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "Token" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "hashedToken" TEXT NOT NULL,
+    "type" TEXT NOT NULL,
+    "expiresAt" DATETIME NOT NULL,
+    "sentTo" TEXT NOT NULL,
+    "userId" INTEGER NOT NULL,
+    CONSTRAINT "Token_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Session_handle_key" ON "Session"("handle");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Token_hashedToken_type_key" ON "Token"("hashedToken", "type");
--- a/integration-tests/react-query-utils/db/migrations/migration_lock.toml
+++ b/integration-tests/react-query-utils/db/migrations/migration_lock.toml
@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
+provider = "sqlite"
--- a/integration-tests/react-query-utils/db/schema.prisma
+++ b/integration-tests/react-query-utils/db/schema.prisma
@@ -0,0 +1,50 @@
+datasource sqlite {
+  provider = "sqlite"
+  url      = "file:./db.sqlite"
+}
+
+generator client {
+  provider = "prisma-client-js"
+}
+
+model User {
+  id             Int      @id @default(autoincrement())
+  createdAt      DateTime @default(now())
+  updatedAt      DateTime @updatedAt
+  name           String?
+  email          String   @unique
+  hashedPassword String?
+  role           String   @default("user")
+
+  sessions Session[]
+  tokens   Token[]
+}
+
+model Session {
+  id                 Int       @id @default(autoincrement())
+  createdAt          DateTime  @default(now())
+  updatedAt          DateTime  @updatedAt
+  expiresAt          DateTime?
+  handle             String    @unique
+  user               User?     @relation(fields: [userId], references: [id])
+  userId             Int?
+  hashedSessionToken String?
+  antiCSRFToken      String?
+  publicData         String?
+  privateData        String?
+}
+
+model Token {
+  id          Int      @id @default(autoincrement())
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+  hashedToken String
+  type        String
+  expiresAt   DateTime
+  sentTo      String
+
+  user   User @relation(fields: [userId], references: [id])
+  userId Int
+
+  @@unique([hashedToken, type])
+}
--- a/integration-tests/react-query-utils/db/seed.ts
+++ b/integration-tests/react-query-utils/db/seed.ts
@@ -0,0 +1,7 @@
+import prisma from "./index"
+
+const seed = async () => {
+  await prisma.$reset()
+}
+
+export default seed
--- a/integration-tests/react-query-utils/next-env.d.ts
+++ b/integration-tests/react-query-utils/next-env.d.ts
@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.
--- a/integration-tests/react-query-utils/next.config.js
+++ b/integration-tests/react-query-utils/next.config.js
@@ -0,0 +1,2 @@
+const {withBlitz} = require("@blitzjs/next")
+module.exports = withBlitz({})
--- a/integration-tests/react-query-utils/package.json
+++ b/integration-tests/react-query-utils/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "test-react-query-utils",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "start:dev": "pnpm run prisma:start && next dev",
+    "test": "pnpm run prisma:start && vitest run",
+    "test-watch": "vitest",
+    "start": "next start",
+    "lint": "next lint",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
+    "prisma:start": "prisma generate && prisma migrate deploy",
+    "prisma:studio": "prisma studio"
+  },
+  "prisma": {
+    "schema": "db/schema.prisma"
+  },
+  "dependencies": {
+    "@blitzjs/auth": "workspace:*",
+    "@blitzjs/next": "workspace:*",
+    "@blitzjs/rpc": "workspace:*",
+    "@prisma/client": "4.0.0",
+    "blitz": "workspace:*",
+    "lowdb": "3.0.0",
+    "next": "12.2.5",
+    "prisma": "4.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
+  },
+  "devDependencies": {
+    "@blitzjs/config": "workspace:*",
+    "@next/bundle-analyzer": "12.0.8",
+    "@types/express": "4.17.13",
+    "@types/fs-extra": "9.0.13",
+    "@types/node-fetch": "2.6.1",
+    "@types/react": "18.0.17",
+    "b64-lite": "1.4.0",
+    "eslint": "7.32.0",
+    "fs-extra": "10.0.1",
+    "get-port": "6.1.2",
+    "node-fetch": "3.2.3",
+    "typescript": "^4.5.3"
+  }
+}
--- a/integration-tests/react-query-utils/pages/_app.tsx
+++ b/integration-tests/react-query-utils/pages/_app.tsx
@@ -0,0 +1,36 @@
+import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
+import {AuthenticationError, AuthorizationError} from "blitz"
+import React, {Suspense} from "react"
+import {withBlitz} from "../app/blitz-client"
+
+function RootErrorFallback({error}: ErrorFallbackProps) {
+  if (error instanceof AuthenticationError) {
+    return <div>Error: You are not authenticated</div>
+  } else if (error instanceof AuthorizationError) {
+    return (
+      <ErrorComponent
+        statusCode={error.statusCode}
+        title="Sorry, you are not authorized to access this"
+      />
+    )
+  } else {
+    return (
+      <ErrorComponent
+        statusCode={(error as any)?.statusCode || 400}
+        title={error.message || error.name}
+      />
+    )
+  }
+}
+
+function MyApp({Component, pageProps}: AppProps) {
+  return (
+    <Suspense fallback="Loading...">
+      <ErrorBoundary FallbackComponent={RootErrorFallback}>
+        <Component {...pageProps} />
+      </ErrorBoundary>
+    </Suspense>
+  )
+}
+
+export default withBlitz(MyApp)
--- a/integration-tests/react-query-utils/pages/api/rpc/[[...blitz]].ts
+++ b/integration-tests/react-query-utils/pages/api/rpc/[[...blitz]].ts
@@ -0,0 +1,4 @@
+import {rpcHandler} from "@blitzjs/rpc"
+import {api} from "../../../app/blitz-server"
+
+export default api(rpcHandler({onError: console.log}))
--- a/integration-tests/react-query-utils/pages/page-with-get-query-data.tsx
+++ b/integration-tests/react-query-utils/pages/page-with-get-query-data.tsx
@@ -0,0 +1,35 @@
+import {getQueryData, useQuery} from "@blitzjs/rpc"
+import {Suspense, useState} from "react"
+import getBasic from "../app/queries/getBasic"
+
+function Content() {
+  const [data] = useQuery(getBasic, undefined)
+  const [newData, setNewData] = useState<string>()
+  return (
+    <div>
+      <div>{data}</div>
+      {newData && <div id="new-data">{newData}</div>}
+      <button
+        id="button"
+        onClick={async () => {
+          const newData = getQueryData(getBasic, undefined)
+          setNewData(newData)
+        }}
+      >
+        Call getQueryData
+      </button>
+    </div>
+  )
+}
+
+function PageWithGetQueryData() {
+  return (
+    <div id="page">
+      <Suspense fallback={"Loading..."}>
+        <Content />
+      </Suspense>
+    </div>
+  )
+}
+
+export default PageWithGetQueryData
--- a/integration-tests/react-query-utils/test/index.test.ts
+++ b/integration-tests/react-query-utils/test/index.test.ts
@@ -0,0 +1,59 @@
+import {describe, it, expect, beforeAll, afterAll} from "vitest"
+import {killApp, findPort, launchApp, nextBuild, nextStart} from "../../utils/next-test-utils"
+import webdriver from "../../utils/next-webdriver"
+
+import {join} from "path"
+
+let app: any
+let appPort: number
+const appDir = join(__dirname, "../")
+
+const runTests = (mode?: string) => {
+  describe("get query data", () => {
+    it(
+      "should work",
+      async () => {
+        const browser = await webdriver(appPort, "/page-with-get-query-data")
+
+        browser.waitForElementByCss("#button", 0)
+        await browser.elementByCss("#button").click()
+
+        browser.waitForElementByCss("#new-data", 0)
+        const newText = await browser.elementByCss("#new-data").text()
+        expect(newText).toMatch(/basic-result/)
+
+        if (browser) await browser.close()
+      },
+      5000 * 60 * 2,
+    )
+  })
+}
+describe("React Query Utils Tests", () => {
+  describe("dev mode", () => {
+    beforeAll(async () => {
+      try {
+        appPort = await findPort()
+        app = await launchApp(appDir, appPort, {cwd: process.cwd()})
+      } catch (error) {
+        console.log(error)
+      }
+    }, 5000 * 60 * 2)
+    afterAll(async () => await killApp(app))
+    runTests()
+  })
+
+  describe("server mode", () => {
+    beforeAll(async () => {
+      try {
+        await nextBuild(appDir)
+        appPort = await findPort()
+        app = await nextStart(appDir, appPort, {cwd: process.cwd()})
+      } catch (err) {
+        console.log(err)
+      }
+    }, 5000 * 60 * 2)
+    afterAll(async () => await killApp(app))
+
+    runTests()
+  })
+})
--- a/integration-tests/react-query-utils/tsconfig.json
+++ b/integration-tests/react-query-utils/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "@blitzjs/config/tsconfig.nextjs.json",
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
+  "compilerOptions": {
+    "paths": {
+      "react": ["./node_modules/@types/react"]
+    }
+  },
+  "exclude": ["node_modules"],
+  "baseUrl": "."
+}
--- a/integration-tests/react-query-utils/types.ts
+++ b/integration-tests/react-query-utils/types.ts
@@ -0,0 +1,15 @@
+import {SimpleRolesIsAuthorized} from "@blitzjs/auth"
+import {User} from "./db"
+
+export type Role = "ADMIN" | "USER"
+
+declare module "@blitzjs/auth" {
+  export interface Session {
+    isAuthorized: SimpleRolesIsAuthorized<Role>
+    PublicData: {
+      userId: User["id"]
+      role: Role
+      views?: number
+    }
+  }
+}
--- a/integration-tests/rpc/package.json
+++ b/integration-tests/rpc/package.json
@@ -12,15 +12,15 @@
    "@blitzjs/next": "workspace:*",
    "@blitzjs/rpc": "workspace:*",
    "blitz": "workspace:*",
-    "next": "12.2.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "next": "12.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
  },
  "devDependencies": {
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
    "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "b64-lite": "1.4.0",
    "eslint": "7.32.0",
    "fs-extra": "10.0.1",
--- a/integration-tests/trailing-slash/package.json
+++ b/integration-tests/trailing-slash/package.json
@@ -22,10 +22,10 @@
    "@prisma/client": "4.0.0",
    "blitz": "workspace:*",
    "lowdb": "3.0.0",
-    "next": "12.2.0",
+    "next": "12.2.5",
    "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
  },
  "devDependencies": {
    "@blitzjs/config": "workspace:*",
@@ -33,7 +33,7 @@
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
    "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "b64-lite": "1.4.0",
    "eslint": "7.32.0",
    "fs-extra": "10.0.1",
--- a/integration-tests/utils/package.json
+++ b/integration-tests/utils/package.json
@@ -10,7 +10,7 @@
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
    "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "@types/rimraf": "3.0.2",
    "@types/selenium-webdriver": "4.0.18",
    "chromedriver": "100.0.0",
@@ -22,8 +22,8 @@
    "node-fetch": "3.2.3",
    "pkg-dir": "5.0.0",
    "playwright-chromium": "1.14.1",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
    "resolve-cwd": "3.0.0",
    "resolve-from": "5.0.0",
    "rimraf": "3.0.2",
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
    "preinstall": "npx only-allow pnpm",
    "prepare": "husky install",
    "build": "turbo run build",
-    "build:apps": "turbo run buildapp",
+    "build:apps": "turbo run buildapp --concurrency=1",
    "dev": "turbo run dev --no-cache --parallel",
    "lint": "turbo run lint",
    "test": "turbo run test",
@@ -28,7 +28,7 @@
    "husky": "7.0.4",
    "jsdom": "^19.0.0",
    "lint-staged": "12.1.7",
-    "next": "12.2.0",
+    "next": "12.2.5",
    "only-allow": "1.1.0",
    "prettier": "^2.5.1",
    "prettier-plugin-prisma": "3.8.0",
--- a/packages/blitz-auth/CHANGELOG.md
+++ b/packages/blitz-auth/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @blitzjs/auth

+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- Updated dependencies [db7233db]
+- Updated dependencies [0936cb38]
+- Updated dependencies [3f9fe8f0]
+  - blitz@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+  - blitz@2.0.0-beta.1
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+- Updated dependencies [2cc888ef]
+  - blitz@2.0.0-beta.72
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- Updated dependencies [fd31e56b]
+  - blitz@2.0.0-alpha.69
+
 ## 2.0.0-alpha.68

 ### Patch Changes
--- a/packages/blitz-auth/package.json
+++ b/packages/blitz-auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.68",
+  "version": "2.0.0-beta.2",
  "scripts": {
    "build": "unbuild",
    "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -26,7 +26,7 @@
    "@types/secure-password": "3.1.1",
    "b64-lite": "1.4.0",
    "bad-behavior": "1.0.1",
-    "blitz": "2.0.0-alpha.68",
+    "blitz": "2.0.0-beta.2",
    "cookie": "0.4.1",
    "cookie-session": "2.0.0",
    "debug": "4.3.3",
@@ -40,16 +40,16 @@
    "url": "0.11.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.68",
+    "@blitzjs/config": "workspace:2.0.0-beta.2",
    "@testing-library/react": "13.0.0",
    "@testing-library/react-hooks": "7.0.2",
    "@types/cookie": "0.4.1",
    "@types/debug": "4.1.7",
    "@types/jsonwebtoken": "8.5.8",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "@types/react-dom": "17.0.14",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
    "typescript": "^4.5.3",
    "unbuild": "0.7.6",
    "watch": "1.0.2"
--- a/packages/blitz-next/CHANGELOG.md
+++ b/packages/blitz-next/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @blitzjs/next

+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- Updated dependencies [db7233db]
+  - @blitzjs/rpc@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+- Updated dependencies [0f4926fd]
+  - @blitzjs/rpc@2.0.0-beta.1
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+- Updated dependencies [2cc888ef]
+  - @blitzjs/rpc@2.0.0-beta.72
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- a3c92cb8: Allow using `RouteUrlObject` as `redirect.destination` in `getStaticProps` and `getServerSideProps`
+- Updated dependencies [49028024]
+  - @blitzjs/rpc@2.0.0-alpha.69
+
 ## 2.0.0-alpha.68

 ### Patch Changes
--- a/packages/blitz-next/package.json
+++ b/packages/blitz-next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.68",
+  "version": "2.0.0-beta.2",
  "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-alpha.68",
+    "@blitzjs/rpc": "2.0.0-beta.2",
    "@tanstack/react-query": "4.0.10",
    "@types/hoist-non-react-statics": "3.3.1",
    "debug": "4.3.3",
@@ -34,22 +34,22 @@
    "supports-color": "8.1.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.68",
+    "@blitzjs/config": "workspace:2.0.0-beta.2",
    "@testing-library/dom": "8.13.0",
    "@testing-library/jest-dom": "5.16.3",
    "@testing-library/react": "13.0.0",
    "@testing-library/react-hooks": "7.0.2",
    "@testing-library/user-event": "13.5.0",
    "@types/node": "17.0.16",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "@types/react-dom": "17.0.14",
    "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.68",
+    "blitz": "2.0.0-beta.2",
    "cross-spawn": "7.0.3",
    "find-up": "4.1.0",
-    "next": "12.2.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "next": "12.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
    "resolve-from": "5.0.0",
    "ts-jest": "27.1.4",
    "typescript": "^4.5.3",
--- a/packages/blitz-next/src/index-server.ts
+++ b/packages/blitz-next/src/index-server.ts
@@ -1,5 +1,5 @@
-import type {NextConfig} from "next"
-import {
+import type {
+  NextConfig,
  GetServerSideProps,
  GetServerSidePropsResult,
  GetStaticProps,
@@ -30,6 +30,8 @@ import {IncomingMessage, ServerResponse} from "http"
 import {withSuperJsonProps} from "./superjson"
 import {ParsedUrlQuery} from "querystring"
 import {PreviewData} from "next/types"
+import {resolveHref} from "next/dist/shared/lib/router/router"
+import {RouteUrlObject, isRouteUrlObject} from "blitz"

 export * from "./index-browser"

@@ -50,6 +52,25 @@ type SetupBlitzOptions = {
  onError?: (err: Error) => void
 }

+export type Redirect =
+  | {
+      statusCode: 301 | 302 | 303 | 307 | 308
+      destination: string | RouteUrlObject
+      basePath?: false
+    }
+  | {
+      permanent: boolean
+      destination: string | RouteUrlObject
+      basePath?: false
+    }
+
+export type BlitzGSSPResult<P> = {props: P | Promise<P>} | {redirect: Redirect} | {notFound: true}
+
+export type BlitzGSPResult<P> =
+  | {props: P; revalidate?: number | boolean}
+  | {redirect: Redirect; revalidate?: number | boolean}
+  | {notFound: true; revalidate?: number | boolean}
+
 export type BlitzGSSPHandler<
  TProps,
  Query extends ParsedUrlQuery = ParsedUrlQuery,
@@ -59,8 +80,8 @@ export type BlitzGSSPHandler<
  req,
  res,
  ...args
-}: Parameters<GetServerSideProps<TProps, Query, PD>>[0] & {ctx: Ctx}) => ReturnType<
-  GetServerSideProps<TProps, Query, PD>
+}: Parameters<GetServerSideProps<TProps, Query, PD>>[0] & {ctx: Ctx}) => Promise<
+  BlitzGSSPResult<TProps>
 >

 export type BlitzGSPHandler<
@@ -70,9 +91,9 @@ export type BlitzGSPHandler<
 > = ({
  ctx,
  ...args
-}: Parameters<GetStaticProps<TProps, Query, PD>>[0] & {ctx: Ctx}) => ReturnType<
-  GetStaticProps<TProps, Query, PD>
->
+}: Parameters<GetStaticProps<TProps, Query, PD>>[0] & {ctx: Ctx}) =>
+  | Promise<BlitzGSPResult<TProps>>
+  | BlitzGSPResult<TProps>

 export type BlitzAPIHandler<TResult> = (
  req: NextApiRequest,
@@ -123,7 +144,12 @@ export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {

      try {
        const result = await handler({req, res, ctx, ...rest})
-        return withSuperJsonProps(withDehydratedState(result, getClient()))
+        return withSuperJsonProps(
+          withDehydratedState(
+            normalizeRedirectValues<GetServerSidePropsResult<TProps>>(result),
+            getClient(),
+          ),
+        )
      } catch (err: any) {
        onError?.(err)
        throw err
@@ -143,7 +169,12 @@ export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {

      try {
        const result = await handler({...context, ctx: ctx})
-        return withSuperJsonProps(withDehydratedState(result, getClient()))
+        return withSuperJsonProps(
+          withDehydratedState(
+            normalizeRedirectValues<GetStaticPropsResult<TProps>>(result),
+            getClient(),
+          ),
+        )
      } catch (err: any) {
        onError?.(err)
        throw err
@@ -219,6 +250,7 @@ export type PrefetchQueryFn = <T extends AsyncFunc, TInput = FirstParam<T>>(
  options?: DefaultOptions,
 ) => Promise<void>

+type BlitzResult = Partial<BlitzGSPResult<any> & BlitzGSSPResult<any>>
 type Result = Partial<GetServerSidePropsResult<any> & GetStaticPropsResult<any>>

 function withDehydratedState<T extends Result>(result: T, queryClient: QueryClient | null) {
@@ -229,6 +261,27 @@ function withDehydratedState<T extends Result>(result: T, queryClient: QueryClie
  return {...result, props: {...("props" in result ? result.props : undefined), dehydratedState}}
 }

+// Converts Blitz's GetServerSidePropsResult and GetStaticPropsResult to a NextJS compatible format
+// Blitz accepts string | RouteUrlObject as redirect.destination — this function converts it to a string
+const normalizeRedirectValues = <NormalizedResult extends Result>(
+  result: BlitzResult,
+): NormalizedResult => {
+  if ("redirect" in result) {
+    const dest = result.redirect?.destination
+    if (dest && isRouteUrlObject(dest)) {
+      // Todo: find a better way to resolve href without `as any` assertion.
+      const resolvedDest = resolveHref({asPath: "/", pathname: "/"} as any, dest, true)
+
+      return {
+        ...result,
+        redirect: {...result.redirect, destination: resolvedDest[1] || resolvedDest[0]},
+      } as NormalizedResult
+    }
+  }
+
+  return result as NormalizedResult
+}
+
 declare module "blitz" {
  export interface Ctx {
    prefetchQuery: PrefetchQueryFn
--- a/packages/blitz-rpc/CHANGELOG.md
+++ b/packages/blitz-rpc/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @blitzjs/rpc

+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- Updated dependencies [db7233db]
+  - @blitzjs/auth@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+- Updated dependencies [0f4926fd]
+  - @blitzjs/auth@2.0.0-beta.1
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+- Updated dependencies [2cc888ef]
+  - @blitzjs/auth@2.0.0-beta.72
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- 49028024: Add `getQueryData` utility to get an existing query's cached data
+  - @blitzjs/auth@2.0.0-alpha.69
+
 ## 2.0.0-alpha.68

 ### Patch Changes
--- a/packages/blitz-rpc/package.json
+++ b/packages/blitz-rpc/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.68",
+  "version": "2.0.0-beta.2",
  "scripts": {
    "build": "unbuild",
    "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts && wait-on -d 250 ../blitz-auth/dist/index-browser.d.ts",
@@ -20,7 +20,7 @@
    "dist/**"
  ],
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-alpha.68",
+    "@blitzjs/auth": "2.0.0-beta.2",
    "@tanstack/react-query": "4.0.10",
    "b64-lite": "1.4.0",
    "bad-behavior": "1.0.1",
@@ -30,14 +30,14 @@
    "supports-color": "8.1.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.68",
+    "@blitzjs/config": "workspace:2.0.0-beta.2",
    "@types/debug": "4.1.7",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.68",
-    "next": "12.2.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "blitz": "2.0.0-beta.2",
+    "next": "12.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
    "typescript": "^4.5.3",
    "unbuild": "0.7.6",
    "watch": "1.0.2",
--- a/packages/blitz-rpc/src/data-client/index.ts
+++ b/packages/blitz-rpc/src/data-client/index.ts
@@ -7,6 +7,7 @@ export {
  invalidateQuery,
  setQueryData,
  getQueryClient,
+  getQueryData,
 } from "./react-query-utils"
 export {
  useQueryErrorResetBoundary,
--- a/packages/blitz-rpc/src/data-client/react-query-utils.ts
+++ b/packages/blitz-rpc/src/data-client/react-query-utils.ts
@@ -1,4 +1,4 @@
-import {QueryClient} from "@tanstack/react-query"
+import {QueryClient, QueryFilters} from "@tanstack/react-query"
 import {serialize} from "superjson"
 import {isClient, isServer, AsyncFunc} from "blitz"
 import {ResolverType, RpcClient} from "./rpc"
@@ -199,3 +199,15 @@ export function setQueryData<TInput, TResult, T extends AsyncFunc>(
    }
  })
 }
+
+export function getQueryData<TInput, TResult, T extends AsyncFunc>(
+  resolver: T | Resolver<TInput, TResult> | RpcClient<TInput, TResult>,
+  params: TInput,
+): TResult | undefined {
+  if (typeof resolver === "undefined") {
+    throw new Error("getQueryData is missing the first argument - it must be a resolver function")
+  }
+  const queryKey = getQueryKey(resolver, params)
+
+  return getQueryClient().getQueryData(queryKey)
+}
--- a/packages/blitz/CHANGELOG.md
+++ b/packages/blitz/CHANGELOG.md
@@ -1,5 +1,60 @@
 # blitz

+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- 0936cb38: Patch Next.js Suspense issue in all node environments. Previously we only patched it in the `development` environment, but now we make sure it gets patched in the `production` env (with the `blitz build` command) as well.
+- 3f9fe8f0: Exit CLI process after `blitz new` command is finished
+- Updated dependencies [db7233db]
+- Updated dependencies [eb971568]
+- Updated dependencies [8ada2c26]
+  - @blitzjs/generator@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- Updated dependencies [0f4926fd]
+  - @blitzjs/generator@2.0.0-beta.1
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+- Updated dependencies [2cc888ef]
+  - @blitzjs/generator@2.0.0-beta.72
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- Updated dependencies [176c7b8b]
+  - @blitzjs/generator@2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- Updated dependencies [4656e6ec]
+- Updated dependencies [1e0ec7a9]
+  - @blitzjs/generator@2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- fd31e56b: Add back blitz generate command
+- Updated dependencies [fd31e56b]
+- Updated dependencies [6baab190]
+- Updated dependencies [37623a4f]
+  - @blitzjs/generator@2.0.0-alpha.69
+
 ## 2.0.0-alpha.68

 ### Patch Changes
--- a/packages/blitz/package.json
+++ b/packages/blitz/package.json
@@ -1,6 +1,6 @@
 {
  "name": "blitz",
-  "version": "2.0.0-alpha.68",
+  "version": "2.0.0-beta.2",
  "scripts": {
    "build": "unbuild",
    "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
    "blitz": "bin/blitz"
  },
  "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.68",
+    "@blitzjs/generator": "2.0.0-beta.2",
    "arg": "5.0.1",
    "boxen": "7.0.0",
    "chalk": "^4.1.0",
@@ -55,7 +55,7 @@
    "watchpack": "2.1.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.68",
+    "@blitzjs/config": "workspace:2.0.0-beta.2",
    "@types/cookie": "0.4.1",
    "@types/cross-spawn": "6.0.2",
    "@types/debug": "4.1.7",
@@ -67,12 +67,12 @@
    "@types/node-fetch": "2.6.1",
    "@types/npm-which": "3.0.1",
    "@types/prompts": "2.0.14",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "@types/react-dom": "17.0.14",
    "@types/test-listen": "1.1.0",
    "@types/watchpack": "1.1.1",
    "express": "4.17.3",
-    "react": "18.0.0",
+    "react": "18.2.0",
    "test-listen": "1.1.0",
    "typescript": "^4.5.3",
    "unbuild": "0.7.6",
--- a/packages/blitz/src/cli/commands/generate.ts
+++ b/packages/blitz/src/cli/commands/generate.ts
@@ -8,6 +8,13 @@ import {
  singleCamel,
  singlePascal,
  uncapitalize,
+  PageGenerator,
+  FormGenerator,
+  QueriesGenerator,
+  MutationGenerator,
+  MutationsGenerator,
+  ModelGenerator,
+  QueryGenerator,
 } from "@blitzjs/generator"

 const getIsTypeScript = async () =>
@@ -39,21 +46,21 @@ function ModelNames(input: string = "") {
 }

 const generatorMap = {
-  // [ResourceType.All]: [
-  //   PageGenerator,
-  //   FormGenerator,
-  //   QueriesGenerator,
-  //   MutationsGenerator,
-  //   ModelGenerator,
-  // ],
-  // [ResourceType.Crud]: [MutationsGenerator, QueriesGenerator],
-  // [ResourceType.Model]: [ModelGenerator],
-  // [ResourceType.Pages]: [PageGenerator, FormGenerator],
-  // [ResourceType.Queries]: [QueriesGenerator],
-  // [ResourceType.Query]: [QueryGenerator],
-  // [ResourceType.Mutations]: [MutationsGenerator],
-  // [ResourceType.Mutation]: [MutationGenerator],
-  // [ResourceType.Resource]: [QueriesGenerator, MutationsGenerator, ModelGenerator],
+  [ResourceType.All]: [
+    PageGenerator,
+    FormGenerator,
+    QueriesGenerator,
+    MutationsGenerator,
+    ModelGenerator,
+  ],
+  [ResourceType.Crud]: [MutationsGenerator, QueriesGenerator],
+  [ResourceType.Model]: [ModelGenerator],
+  [ResourceType.Pages]: [PageGenerator, FormGenerator],
+  [ResourceType.Queries]: [QueriesGenerator],
+  [ResourceType.Query]: [QueryGenerator],
+  [ResourceType.Mutations]: [MutationsGenerator],
+  [ResourceType.Mutation]: [MutationGenerator],
+  [ResourceType.Resource]: [QueriesGenerator, MutationsGenerator, ModelGenerator],
 }

 const args = arg(
@@ -61,7 +68,6 @@ const args = arg(
    // Types
    "--help": Boolean,
    "--type": String,
-    "--name": String,
    "--context": String,
    "--parent": String,
    "--dry-run": Boolean,
@@ -69,10 +75,10 @@ const args = arg(

    // Aliases
    "-e": "--env",
-    "-n": "--name",
    "-t": "--type",
    "-c": "--context",
-    "-p": "--dry-run",
+    "-p": "--parent",
+    "-d": "--dry-run",
  },
  {
    permissive: true,
@@ -164,23 +170,8 @@ const determineName = async () => {
 }

 const determineContext = async () => {
-  if (args["--context"] && !selectedModelName) {
-    if (args["--name"] && args["--name"].includes("/")) {
-      throw new Error("Your model should not contain a context when supplying a context explicitly")
-    }
-
-    const res = await prompts({
-      type: "text",
-      name: "model",
-      message: `The name of your model, like "user". Can be singular or plural - same result`,
-    })
-
-    if (res.model.includes("/")) {
-      throw new Error("Your model should not contain a context when supplying a context explicitly")
-    }
-    const {model, context} = getModelNameAndContext(res.model, args["--context"])
-    selectedModelName = model
-    selectedContext = context
+  if (args["--context"] && selectedModelName && !selectedContext) {
+    selectedContext = args["--context"]
  }
 }

@@ -189,32 +180,32 @@ const getHelp = async () => {
    console.log(`
      # The 'crud' type will generate all queries & mutations for a model

-        > blitz generate --type crud --name productVariant
+        > blitz generate crud productVariant

      # The 'all' generator will scaffold out everything possible for a model

-        > blitz generate --type all --name products
+        > blitz generate all products

-      # The '--context' flag will allow you to generate files in a nested folder
+      # The '--context' flag will allow you to generate files such as components, queries & mutations in a nested folder

-        > blitz generate --type pages --name projects --context admin
+        > blitz generate pages projects --context=admin

      # Context can also be supplied in the model name directly

-        > blitz generate --type pages --name admin/projects
+        > blitz generate pages admin/projects

      # To generate nested routes for dependent models (e.g. Projects that contain Tasks), specify a parent model.
-      For example, this command generates pages under app/tasks/pages/projects/[projectId]/tasks/
+      For example, this command generates pages under pages/projects/[projectId]/tasks/

-        > blitz generate --type all --name tasks --parent=projects
+        > blitz generate all tasks --parent=projects

      # Database models can also be generated directly from the CLI.
        Model fields can be specified with any generator that generates a database model ("all", "model", "resource").
        Both of the commands below will generate the proper database model for a Task.

-        > blitz generate --type model --name task name:string completed:boolean:default=false belongsTo:project?
+        > blitz generate model task name:string completed:boolean:default=false belongsTo:project?

-        > blitz generate --type all --name tasks name:string completed:boolean:default=false belongsTo:project?
+        > blitz generate all tasks name:string completed:boolean:default=false belongsTo:project?

    `)

@@ -222,26 +213,23 @@ const getHelp = async () => {
  }
 }

-const generate: CliCommand = async (argv) => {
+const generate: CliCommand = async () => {
  await getHelp()
  await determineType()
-  await determineContext()
  if (!selectedModelName) {
    await determineName()
  }
+  await determineContext()

  try {
    const singularRootContext = modelName(selectedModelName)
    validateModelName(singularRootContext)

-    // const {loadConfigProduction} = await import("next/dist/server/config-shared")
-    // const blitzConfig = loadConfigProduction(process.cwd())
    const generators = generatorMap[selectedType as keyof typeof generatorMap]

    for (const GeneratorClass of generators) {
      const generator = new GeneratorClass({
        destinationRoot: require("path").resolve(),
-        // templateDir: blitzConfig.codegen?.templateDir,
        extraArgs: args["_"].slice(3) as string[],
        modelName: singularRootContext,
        modelNames: modelNames(singularRootContext),
--- a/packages/blitz/src/cli/commands/new.ts
+++ b/packages/blitz/src/cli/commands/new.ts
@@ -300,8 +300,10 @@ const newApp: CliCommand = async (argv) => {
      console.log(chalk.yellow(`   ${index + 1}. ${step}`))
    })
    console.log("") // new line
+    process.exit(0)
  } catch (error) {
    console.error(error)
+    process.exit(1)
  }
 }

--- a/packages/blitz/src/cli/index.ts
+++ b/packages/blitz/src/cli/index.ts
@@ -31,7 +31,7 @@ const commands = {
  build: () => import("./commands/next/build").then((i) => i.build),
  start: () => import("./commands/next/start").then((i) => i.start),
  new: () => import("./commands/new").then((i) => i.newApp),
-  // generate: () => import("./commands/generate").then((i) => i.generate),
+  generate: () => import("./commands/generate").then((i) => i.generate),
  codegen: () => import("./commands/codegen").then((i) => i.codegen),
  db: () => import("./commands/db").then((i) => i.db),
 }
--- a/packages/blitz/src/cli/utils/codegen-tasks.ts
+++ b/packages/blitz/src/cli/utils/codegen-tasks.ts
@@ -19,7 +19,7 @@ export const codegenTasks = async () => {
      .toString()
      .replace(
        /ReactDOM\.hydrateRoot\(.*?\);/,
-        `ReactDOM.hydrateRoot(domEl, reactEl, process.env.NODE_ENV === 'development' ? {onRecoverableError: (err) => err.toString().includes("could not finish this Suspense boundary") ? null : console.error(err)} : undefined);`,
+        `ReactDOM.hydrateRoot(domEl, reactEl, {onRecoverableError: (err) => err.toString().includes("could not finish this Suspense boundary") ? null : console.error(err)});`,
      )
    await fs.writeFile(nextClientIndex, updatedFile)
    log.success("Next.js was successfully patched with a React Suspense fix")
--- a/packages/blitz/src/types.ts
+++ b/packages/blitz/src/types.ts
@@ -6,6 +6,10 @@ export interface RouteUrlObject extends Pick<UrlObject, "pathname" | "query"> {
  pathname: string
 }

+export const isRouteUrlObject = (x: any): x is RouteUrlObject => {
+  return typeof x === "object" && "pathname" in x && typeof x.pathname === "string"
+}
+
 export type AsyncFunc = (...args: any) => Promise<any>

 /**
--- a/packages/blitz/src/utils/index.ts
+++ b/packages/blitz/src/utils/index.ts
@@ -104,7 +104,6 @@ export function compose(middleware: RequestMiddleware<any, any>[]) {
      }

      try {
-        console.log(`[${handler.name}] Starting handler...`)
        return Promise.resolve(handler(req, res, dispatch.bind(null, i + 1)))
      } catch (err) {
        return Promise.reject(err)
--- a/packages/codemod/CHANGELOG.md
+++ b/packages/codemod/CHANGELOG.md
@@ -1,5 +1,72 @@
 # @blitzjs/codemod

+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- a3b5fdd0: Change ES6 import for `withBlitz` during the codemod to the require syntax.
+- ebfb562b: Add `Script` as a default import from next.js during the codemod.
+- Updated dependencies [db7233db]
+- Updated dependencies [eb971568]
+- Updated dependencies [0936cb38]
+- Updated dependencies [8ada2c26]
+- Updated dependencies [3f9fe8f0]
+  - blitz@2.0.0-beta.2
+  - @blitzjs/generator@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+- Updated dependencies [0f4926fd]
+  - @blitzjs/generator@2.0.0-beta.1
+  - blitz@2.0.0-beta.1
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+- Updated dependencies [2cc888ef]
+  - blitz@2.0.0-beta.72
+  - @blitzjs/generator@2.0.0-beta.72
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- Updated dependencies [176c7b8b]
+  - @blitzjs/generator@2.0.0-alpha.71
+  - blitz@2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- f88702c1: Remove trailing comma when removing BlitzConfig from next.config.js & Fix codemod so if route (eg. `app/auth/pages`) convert to (eg. `pages/`) instead of (eg. `pages/auth`)
+- Updated dependencies [4656e6ec]
+- Updated dependencies [1e0ec7a9]
+  - @blitzjs/generator@2.0.0-alpha.70
+  - blitz@2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- 86af6dec: Wrap middlewares with BlitzServerMiddleware function with codemod
+- 72a332e0: Wrap `blitz.config.ts` with the `withBlitz` function during the codemod step instead of creating a blank `next.config.js` file.
+- 2d1482fc: Allow codemod to finish if `cookiePrefix` is undefined. Then show error at the end of running the codemod.
+- Updated dependencies [fd31e56b]
+- Updated dependencies [6baab190]
+- Updated dependencies [37623a4f]
+  - blitz@2.0.0-alpha.69
+  - @blitzjs/generator@2.0.0-alpha.69
+
 ## 2.0.0-alpha.68

 ### Patch Changes
--- a/packages/codemod/package.json
+++ b/packages/codemod/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/codemod",
-  "version": "2.0.0-alpha.68",
+  "version": "2.0.0-beta.2",
  "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-alpha.68",
+    "@blitzjs/generator": "2.0.0-beta.2",
    "arg": "5.0.1",
-    "blitz": "2.0.0-alpha.68",
+    "blitz": "2.0.0-beta.2",
    "chalk": "^4.1.0",
    "cross-spawn": "7.0.3",
    "debug": "4.3.3",
--- a/packages/codemod/src/upgrade-legacy.ts
+++ b/packages/codemod/src/upgrade-legacy.ts
@@ -1,4 +1,9 @@
-import j, {ImportDeclaration, ImportDefaultSpecifier, ImportSpecifier} from "jscodeshift"
+import j, {
+  Expression,
+  ImportDeclaration,
+  ImportDefaultSpecifier,
+  ImportSpecifier,
+} from "jscodeshift"
 import * as fs from "fs-extra"
 import path from "path"
 import {
@@ -18,7 +23,7 @@ import {
 } from "./utils"
 import {log} from "blitz"

-const CURRENT_BLITZ_TAG = "alpha"
+const CURRENT_BLITZ_TAG = "latest"

 class ExpectedError extends Error {
  constructor(message: string) {
@@ -30,7 +35,7 @@ class ExpectedError extends Error {
 const isInternalBlitzMonorepoDevelopment = fs.existsSync(
  path.join(__dirname, "../../../blitz-next"),
 )
-
+type Step = {name: string; action: (stepIndex: number) => Promise<void>}
 const upgradeLegacy = async () => {
  let isTypescript = fs.existsSync(path.resolve("tsconfig.json"))
  let blitzConfigFile = `blitz.config.${isTypescript ? "ts" : "js"}`
@@ -38,11 +43,8 @@ const upgradeLegacy = async () => {
  const appDir = path.resolve("app")
  let failedAt =
    fs.existsSync(path.resolve(".migration.json")) && fs.readJSONSync("./.migration.json").failedAt
-
-  let steps: {
-    name: string
-    action: () => Promise<void>
-  }[] = []
+  let collectedErrors: {message: string; step: number}[] = []
+  let steps: Step[] = []

  // Add steps in order

@@ -52,36 +54,60 @@ const upgradeLegacy = async () => {
      const program = getCollectionFromSource(blitzConfigFile)
      const parsedProgram = program.get()

-      // Clear file
-      parsedProgram.value.program.body = []
+      // Remove BlitzConfig type annotation
+      let findBlitzConfigType = program.find(j.Identifier, (node) => node.name === "BlitzConfig")
+      if (findBlitzConfigType) {
+        findBlitzConfigType.forEach((c) => {
+          if (c.name === "typeName") {
+            j(c.parentPath.parentPath).remove()
+          }
+
+          if (c.name === "imported") {
+            j(c.parentPath).remove()
+          }
+        })
+      }
+
+      // Remove all typescript stuff
+      let findTypes = program.find(j.TSType, (node) => node)
+      if (findTypes) {
+        findTypes.forEach((t) => j(t.parentPath).remove())
+      }

-      // We create an object property eg. {withBlitz: withBlitz}
      let withBlitz = j.objectProperty(j.identifier("withBlitz"), j.identifier("withBlitz"))
-      // Then set the shorthand to true so we get {withBlitz}
      withBlitz.shorthand = true
+      let config = program.find(j.AssignmentExpression, {
+        left: {
+          type: "MemberExpression",
+          object: {
+            type: "Identifier",
+            name: "module",
+          },
+          property: {
+            type: "Identifier",
+            name: "exports",
+          },
+        },
+      })
+      let createdConfig = config.get().value.right
+      let importWithBlitz = j.expressionStatement(
+        j.assignmentExpression(
+          "=",
+          j.identifier("const { withBlitz }"),
+          j.callExpression(j.identifier("require"), [j.identifier(`"@blitzjs/next"`)]),
+        )
+      )
+      parsedProgram.value.program.body.unshift(importWithBlitz)
+      config.remove()

-      /* Declare the variable using the object above that equals to a require expression, eg.
-        const {withBlitz} = require("@blitzjs/next")
-      */
-      let blitzDeclare = j.variableDeclaration("const", [
-        j.variableDeclarator(
-          j.objectPattern([withBlitz]),
-          j.callExpression(j.identifier("require"), [j.stringLiteral("@blitzjs/next")]),
-        ),
-      ])
-      parsedProgram.value.program.body.push(blitzDeclare)
-
-      // Create the module.exports with the withBlitz callExpression and empty arguments. Giving us module.exports = withBlitz()
-      let moduleExportExpression = j.expressionStatement(
+      let moduleExportStatement = j.expressionStatement(
        j.assignmentExpression(
          "=",
          j.memberExpression(j.identifier("module"), j.identifier("exports")),
-          j.callExpression(j.identifier("withBlitz"), [
-            j.objectExpression([j.objectProperty(j.identifier("blitz"), j.objectExpression([]))]),
-          ]),
+          j.callExpression(j.identifier("withBlitz"), [createdConfig]),
        ),
      )
-      parsedProgram.value.program.body.push(moduleExportExpression)
+      parsedProgram.value.program.body.push(moduleExportStatement)

      fs.writeFileSync(path.resolve("next.config.js"), program.toSource())
    },
@@ -237,6 +263,7 @@ const upgradeLegacy = async () => {
        const nextLink = findImport(program, "next/link")
        const nextHead = findImport(program, "next/head")
        const dynamic = findImport(program, "next/dynamic")
+        const nextScript = findImport(program, "next/script")

        if (nextImage?.length) {
          nextImage.remove()
@@ -249,6 +276,18 @@ const upgradeLegacy = async () => {
              ),
            )
        }
+        
+        if (nextScript?.length) {
+          nextScript.remove()
+          program
+            .get()
+            .value.program.body.unshift(
+              j.importDeclaration(
+                [j.importDefaultSpecifier(j.identifier("Script"))],
+                j.stringLiteral("next/script"), 
+              ),
+            )
+        }

        if (nextLink?.length) {
          nextLink.remove()
@@ -411,7 +450,7 @@ const upgradeLegacy = async () => {

  steps.push({
    name: "Add cookiePrefix to blitz server",
-    action: async () => {
+    action: async (stepIndex) => {
      const blitzConfigProgram = getCollectionFromSource(blitzConfigFile)
      const cookieIdentifier = blitzConfigProgram.find(
        j.Identifier,
@@ -434,9 +473,12 @@ const upgradeLegacy = async () => {
            blitzClientProgram.toSource(),
          )
        } else {
-          throw new ExpectedError(
-            "Cookie Prefix is undefined & not a string. Please set your cookie prefix manually in app/blitz-client",
-          )
+          // Show error at end of codemod
+          collectedErrors.push({
+            message:
+              "Detected cookiePrefix is undefined. Please set your cookie prefix manually in app/blitz-client",
+            step: stepIndex,
+          })
        }
      } else {
        log.error("Cookie Prefix not found in blitz config file")
@@ -465,7 +507,7 @@ const upgradeLegacy = async () => {

        pluginArray.get().parentPath.value.value.elements = [
          ...pluginArray.get().parentPath.value.value.elements,
-          ...middlewares,
+          ...middlewares.map((m: Node) => j.template.expression`BlitzServerMiddleware(${m})`),
        ]

        let importStatements = []
@@ -492,11 +534,21 @@ const upgradeLegacy = async () => {
        }

        importStatements.forEach((s) => blitzServerProgram.get().value.program.body.unshift(s))
+        addNamedImport(blitzServerProgram, "BlitzServerMiddleware", "blitz")

        fs.writeFileSync(
          `${appDir}/blitz-server.${isTypescript ? "ts" : "js"}`,
          blitzServerProgram.toSource(),
        )
+
+        // Remove middleware array from next.config.js
+        const nextConfigProgram = getCollectionFromSource(path.resolve("next.config.js"))
+        const nextConfigMiddlewareArray = nextConfigProgram.find(
+          j.Identifier,
+          (node) => node.name === "middleware",
+        )
+        j(nextConfigMiddlewareArray.get().parentPath).remove()
+        fs.writeFileSync(`next.config.js`, nextConfigProgram.toSource())
      } else {
        log.error("Middleware array not found in blit config file")
      }
@@ -592,7 +644,7 @@ const upgradeLegacy = async () => {
                    }
                  } else {
                    arr.push({
-                      model: file,
+                      model: "",
                      path: dirPath + "/" + file + "/pages",
                    })
                    break
@@ -626,6 +678,7 @@ const upgradeLegacy = async () => {
          // If the directory exists without a sub model (sub page directory), loop through the directory manually move each file/directory
          if (fs.existsSync(path.join(path.resolve("pages"), pages.model))) {
            let subs = fs.readdirSync(pages.path)
+
            subs.forEach((sub) => {
              fs.moveSync(
                path.join(pages.path, sub),
@@ -1110,7 +1163,7 @@ const upgradeLegacy = async () => {

  steps.push({
    name: "check for usages of invokeWithMiddleware",
-    action: async () => {
+    action: async (stepIndex) => {
      let errors = 0

      getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
@@ -1132,58 +1185,21 @@ const upgradeLegacy = async () => {
      })

      if (errors > 0) {
-        throw new ExpectedError(
-          "\n invokeWithMiddleware is not supported. \n Use invokeWithCtx instead: https://canary.blitzjs.com/docs/resolver-server-utilities#invoke-with-ctx \n Fix the files above, then run the codemod again.",
-        )
+        collectedErrors.push({
+          message:
+            "\n invokeWithMiddleware is not supported. \n Use invokeWithCtx instead: https://canary.blitzjs.com/docs/resolver-server-utilities#invoke-with-ctx \n Fix the files above, then run the codemod again.",
+          step: stepIndex,
+        })
+
+        // Write to the migration file so the user can run the migration again from this point
+        failedAt = stepIndex + 1
+        fs.writeJsonSync(".migration.json", {
+          failedAt,
+        })
      }
    },
  })

-  // steps.push({
-  //   name: "Update invokeMiddleware to invoke",
-  //   action: async () => {
-  //     getAllFiles(appDir, [], [], [".css"]).forEach((file) => {
-  //       const program = getCollectionFromSource(file)
-  //       const importSpecifier = findImportSpecifier(program, "invokeWithMiddleware")
-  //       importSpecifier?.paths().forEach((path) => {
-  //         path.get().value.imported.name = "invoke"
-  //       })
-
-  //       const invokeWithMiddlewarePath = findCallExpression(program, "invokeWithMiddleware")
-  //       if (invokeWithMiddlewarePath?.length) {
-  //         invokeWithMiddlewarePath?.paths().forEach((path) => {
-  //           path.get().value.callee.name = "invoke"
-  //           if (path.get().value.arguments.length === 3) {
-  //             delete path.get().value.arguments[2]
-  //           }
-  //         })
-  //       }
-
-  //       fs.writeFileSync(path.resolve(file), program.toSource())
-  //     })
-
-  //     getAllFiles(path.resolve("pages"), [], [], [".css"]).forEach((file) => {
-  //       const program = getCollectionFromSource(file)
-  //       const importSpecifier = findImportSpecifier(program, "invokeWithMiddleware")
-  //       importSpecifier?.paths().forEach((path) => {
-  //         path.get().value.imported.name = "invoke"
-  //       })
-
-  //       const invokeWithMiddlewarePath = findCallExpression(program, "invokeWithMiddleware")
-  //       if (invokeWithMiddlewarePath?.length) {
-  //         invokeWithMiddlewarePath?.paths().forEach((path) => {
-  //           path.get().value.callee.name = "invoke"
-  //           if (path.get().value.arguments.length === 3) {
-  //             delete path.get().value.arguments[2]
-  //           }
-  //         })
-  //       }
-
-  //       fs.writeFileSync(path.resolve(file), program.toSource())
-  //     })
-  //   },
-  // })
-
  // Loop through steps and run the action
  if ((failedAt && failedAt < steps.length) || failedAt !== "SUCCESS" || isLegacyBlitz) {
    for (let [index, step] of steps.entries()) {
@@ -1193,8 +1209,15 @@ const upgradeLegacy = async () => {
      }
      const spinner = log.spinner(log.withBrand(`Running ${step.name}...`)).start()
      try {
-        await step.action()
+        await step.action(index)
+        if (collectedErrors.filter((e) => e.step === index).length) {
+          // Soft stored error
+          spinner.fail(`${step.name}`)
+        } else {
+          spinner.succeed(`Successfully ran ${step.name}`)
+        }
      } catch (err) {
+        // Hard exit error
        const error = err as {code: string} | string
        spinner.fail(`${step.name}`)
        log.error(error as string)
@@ -1218,10 +1241,12 @@ const upgradeLegacy = async () => {
        })
        process.exit(1)
      }
-
-      spinner.succeed(`Successfully ran ${step.name}`)
    }
-
+    if (collectedErrors.length) {
+      for (const error of collectedErrors) {
+        log.error(`⚠️  ${error.message}`)
+      }
+    }
    fs.writeJsonSync(".migration.json", {
      failedAt: "SUCCESS",
    })
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @blitzjs/config

+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+
+## 2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
 ## 2.0.0-alpha.68

 ## 2.0.0-alpha.67
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@blitzjs/config",
  "private": true,
-  "version": "2.0.0-alpha.68",
+  "version": "2.0.0-beta.2",
  "license": "MIT",
  "dependencies": {
    "@typescript-eslint/eslint-plugin": "5.9.1",
--- a/packages/generator/CHANGELOG.md
+++ b/packages/generator/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @blitzjs/generator

+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- eb971568: Add `BlitzPage` types to auth pages in new app template
+- 8ada2c26: Include ResetPasswordPage in new app template
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+
+## 2.0.0-beta.72
+
+### Patch Changes
+
+- 2cc888ef: Beta release
+
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- 176c7b8b: Use correct path for log utilities import
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- 4656e6ec: Print model added or updated in schema.prisma after running model generator
+- 1e0ec7a9: Add `BlitzPage` type to Home pages in app templates
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- fd31e56b: Add back blitz generate command
+- 6baab190: Add type checking to next.config.js files in new app templates
+- 37623a4f: Fix typo in a next.config.js file name
+
 ## 2.0.0-alpha.68

 ### Patch Changes
--- a/packages/generator/package.json
+++ b/packages/generator/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.68",
+  "version": "2.0.0-beta.2",
  "scripts": {
    "dev": "watch unbuild src --wait=0.2",
    "build": "unbuild && pnpm build:templates",
@@ -46,7 +46,7 @@
    "vinyl": "2.2.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.68",
+    "@blitzjs/config": "2.0.0-beta.2",
    "@juanm04/cpx": "2.0.1",
    "@types/babel__core": "7.1.19",
    "@types/diff": "5.0.2",
@@ -56,7 +56,7 @@
    "@types/mem-fs-editor": "7.0.1",
    "@types/pluralize": "0.0.29",
    "@types/prettier": "2.4.4",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
    "@types/react-dom": "17.0.14",
    "@types/vinyl": "2.0.6",
    "@typescript-eslint/eslint-plugin": "5.9.1",
@@ -64,7 +64,7 @@
    "babylon": "6.18.0",
    "debug": "4.3.3",
    "eslint": "7.32.0",
-    "react": "18.0.0",
+    "react": "18.2.0",
    "typescript": "^4.5.3",
    "unbuild": "0.6.9",
    "watch": "1.0.2"
--- a/packages/generator/src/generators/model-generator.ts
+++ b/packages/generator/src/generators/model-generator.ts
@@ -2,6 +2,7 @@ import * as ast from "@mrleebo/prisma-ast"
 import {spawn} from "cross-spawn"
 import which from "npm-which"
 import path from "path"
+import {log} from "../utils/log"
 import {Generator, GeneratorOptions, SourceRootType} from "../generator"
 import {Field} from "../prisma/field"
 import {Model} from "../prisma/model"
@@ -88,8 +89,10 @@ export class ModelGenerator extends Generator<ModelGeneratorOptions> {
          dryRun ? "" : ` ${updatedOrCreated} in schema.prisma`
        }:\n`,
      )
-      ast.printSchema({type: "schema", list: [model]}).split("\n")
-      // .map(log.progress) // todo
+      ast
+        .printSchema({type: "schema", list: [model]})
+        .split("\n")
+        .map(log.progress)
      console.log("\n")
    }
  }
--- a/packages/generator/src/generators/page-generator.ts
+++ b/packages/generator/src/generators/page-generator.ts
@@ -1,6 +1,8 @@
 import {Generator, GeneratorOptions, SourceRootType} from "../generator"
 import {getTemplateRoot} from "../utils/get-template-root"
 import {camelCaseToKebabCase} from "../utils/inflector"
+import {spawn} from "cross-spawn"
+import which from "npm-which"

 export interface PageGeneratorOptions extends GeneratorOptions {
  ModelName: string
@@ -67,9 +69,10 @@ export class PageGenerator extends Generator<PageGeneratorOptions> {
  }

  async postWrite() {
-    // const {loadConfigProduction} = await import("next/dist/server/config-shared")
-    // const {saveRouteManifest} = await import("next/dist/build/routes")
-    // const config = loadConfigProduction(process.cwd())
-    // await saveRouteManifest(process.cwd(), config)
+    await new Promise<void>((res, rej) => {
+      const blitzBin = which(process.cwd()).sync("blitz")
+      const child = spawn(blitzBin, ["codegen"], {stdio: "inherit"})
+      child.on("exit", (code) => (code === 0 ? res() : rej()))
+    })
  }
 }
--- a/packages/generator/src/utils/get-blitz-dependency-version.ts
+++ b/packages/generator/src/utils/get-blitz-dependency-version.ts
@@ -1,14 +1,14 @@
 import {logFailedVersionFetch} from "./get-latest-version"
 import {fetchDistTags} from "./npm-fetch"

-const CURRENT_BLITZ_TAG = "alpha"
+const CURRENT_BLITZ_TAG = "latest"

 export const getBlitzDependencyVersion = async () => {
  try {
    const result = await fetchDistTags("blitz")

    if (CURRENT_BLITZ_TAG in result) {
-      return {value: result}
+      return {value: result[CURRENT_BLITZ_TAG]}
    }

    logFailedVersionFetch("blitz")
--- a/packages/generator/src/utils/log.ts
+++ b/packages/generator/src/utils/log.ts
@@ -67,7 +67,7 @@ export function assignDefaultsBase(userConfig: {[key: string]: any}) {
 export function loadConfigProduction(pagesDir: string) {
  let userConfigModule
  try {
-    const path = join(pagesDir, "next.confi.js")
+    const path = join(pagesDir, "next.config.js")
    debug("Loading config from ", path)
    // eslint-disable-next-line no-eval -- block webpack from following this module path
    userConfigModule = eval("require")(path)
--- a/packages/generator/templates/app/mailers/forgotPasswordMailer.ts
+++ b/packages/generator/templates/app/mailers/forgotPasswordMailer.ts
@@ -13,7 +13,7 @@ type ResetPasswordMailer = {
 export function forgotPasswordMailer({ to, token }: ResetPasswordMailer) {
  // In production, set APP_ORIGIN to your production server origin
  const origin = process.env.APP_ORIGIN || process.env.BLITZ_DEV_SERVER_ORIGIN
-  const resetUrl = `${origin}/reset-password?token=${token}`
+  const resetUrl = `${origin}/auth/reset-password?token=${token}`

  const msg = {
    from: "TODO@example.com",
--- a/packages/generator/templates/app/next.config.js
+++ b/packages/generator/templates/app/next.config.js
@@ -1,3 +1,9 @@
+// @ts-check
 const {withBlitz} = require("@blitzjs/next")

-module.exports = withBlitz()
+/**
+ * @type {import('@blitzjs/next').BlitzConfig}
+ **/
+const config = {}
+
+module.exports = withBlitz(config)
--- a/packages/generator/templates/app/package.js.json
+++ b/packages/generator/templates/app/package.js.json
@@ -22,15 +22,15 @@
    "*.{js}": ["eslint --fix"]
  },
  "dependencies": {
-    "@blitzjs/auth": "alpha",
-    "@blitzjs/next": "alpha",
-    "@blitzjs/rpc": "alpha",
+    "@blitzjs/auth": "latest",
+    "@blitzjs/next": "latest",
+    "@blitzjs/rpc": "latest",
    "@prisma/client": "4.0.0",
-    "blitz": "alpha",
-    "next": "12.2.0",
+    "blitz": "latest",
+    "next": "12.2.5",
    "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
    "zod": "3.17.3"
  },
  "devDependencies": {
@@ -39,7 +39,7 @@
    "@types/jest": "27.4.1",
    "@types/node": "17.0.16",
    "@types/preview-email": "2.0.1",
-    "@types/react": "18.0.1",
+     "@types/react": "18.0.17",
    "eslint": "7.32.0",
    "eslint-config-next": "12.2.0",
    "eslint-config-prettier": "8.5.0",
--- a/packages/generator/templates/app/package.ts.json
+++ b/packages/generator/templates/app/package.ts.json
@@ -22,15 +22,15 @@
    "*.{js,ts,tsx}": ["eslint --fix"]
  },
  "dependencies": {
-    "@blitzjs/auth": "alpha",
-    "@blitzjs/next": "alpha",
-    "@blitzjs/rpc": "alpha",
+    "@blitzjs/auth": "latest",
+    "@blitzjs/next": "latest",
+    "@blitzjs/rpc": "latest",
    "@prisma/client": "4.0.0",
-    "blitz": "alpha",
-    "next": "12.2.0",
+    "blitz": "latest",
+    "next": "12.2.5",
    "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
    "zod": "3.17.3"
  },
  "devDependencies": {
@@ -39,7 +39,7 @@
    "@types/jest": "27.4.1",
    "@types/node": "17.0.16",
    "@types/preview-email": "2.0.1",
-    "@types/react": "18.0.1",
+     "@types/react": "18.0.17",
    "@typescript-eslint/eslint-plugin": "5.30.5",
    "eslint": "7.32.0",
    "eslint-config-next": "12.2.0",
--- a/packages/generator/templates/app/pages/auth/forgot-password.tsx
+++ b/packages/generator/templates/app/pages/auth/forgot-password.tsx
@@ -4,8 +4,9 @@ import { Form, FORM_ERROR } from "app/core/components/Form"
 import { ForgotPassword } from "app/auth/validations"
 import forgotPassword from "app/auth/mutations/forgotPassword"
 import { useMutation } from "@blitzjs/rpc"
+import { BlitzPage } from "@blitzjs/next"

-const ForgotPasswordPage = () => {
+const ForgotPasswordPage: BlitzPage = () => {
  const [forgotPasswordMutation, { isSuccess }] = useMutation(forgotPassword)

  return (
--- a/packages/generator/templates/app/pages/auth/login.tsx
+++ b/packages/generator/templates/app/pages/auth/login.tsx
@@ -1,8 +1,9 @@
+import { BlitzPage } from "@blitzjs/next"
 import Layout from "app/core/layouts/Layout"
 import { LoginForm } from "app/auth/components/LoginForm"
 import { useRouter } from "next/router"

-const LoginPage = () => {
+const LoginPage: BlitzPage = () => {
  const router = useRouter()

  return (
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
github-actions[bot]	000bc2334c	Version Packages (beta) (#3751 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-08-18 14:22:30 +02:00
Dillon Raphael	0936cb38a6	Remove the NODE_ENV development check when patching nextjs (#3742 )	2022-08-17 17:51:31 +02:00
Aleksandra	8ada2c26f7	Include ResetPasswordPage in new app template (#3743 )	2022-08-17 17:25:57 +02:00
Aleksandra	eb9715688c	Add BlitzPage type to auth pages in new app template (#3750 )	2022-08-17 17:17:12 +02:00
Siddharth Suresh	ebfb562bfa	Fix #3735 Add Script as a Default Import of Next.js (#3736 ) * Fix #3735 Add Script as a Default Import of Next,js	2022-08-17 11:03:28 -04:00
Siddharth Suresh	a3b5fdd03e	Fix #3745 Change ES6 import to require syntax (#3746 ) * Fix #3745 Change ES6 import to require syntax * fix error in syntax of callExpression	2022-08-17 10:44:52 -04:00
Aleksandra	3f9fe8f043	Exit process after finishing blitz new command (#3749 )	2022-08-17 16:19:13 +02:00
Guillermo Antony Cava Nuñez	db7233db6a	version bump to fix hydration mismatch react error (#3739 ) Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>	2022-08-17 15:34:40 +02:00
Blitz.js Bot	1a6e953976	(meta) added @corydeppen as contributor	2022-08-16 04:27:27 -04:00
Dillon Raphael	58ae66fdb5	Remove console log from blitz util file (#3738 ) * remove console log from blitz util file	2022-08-15 15:06:14 -04:00
github-actions[bot]	6eb5bc8987	Version Packages (beta) (#3732 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-08-15 11:38:08 +02:00
Aleksandra	0f4926fd1f	Set latest tag in package json files (#3731 )	2022-08-15 11:29:21 +02:00
github-actions[bot]	dff9fd042a	Version Packages (beta) (#3730 ) * Version Packages (beta) * Update version number Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: beerose <alexsandra.sikora@gmail.com>	2022-08-15 10:38:03 +02:00
Aleksandra	2cc888eff8	Update changeset config (#3729 )	2022-08-15 10:13:57 +02:00
github-actions[bot]	8a0a97bebb	Version Packages (alpha) (#3724 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-08-14 15:57:22 +02:00
Aleksandra	176c7b8b57	Use correct path for log utilities import (#3721 )	2022-08-14 15:49:43 +02:00
Aleksandra	b307931f2e	Point to main branch instead of canary in README.md	2022-08-13 11:33:47 +02:00
Aleksandra	14375e25c4	Update sponsors list (#3720 )	2022-08-13 11:30:30 +02:00
github-actions[bot]	8b755574b5	Version Packages (alpha) (#3717 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-08-12 20:05:18 +02:00
Aleksandra	4656e6ecd6	Print model added or updated in schema.prisma after running model generator (#3718 )	2022-08-12 20:01:15 +02:00
Aleksandra	1e0ec7a972	Add missing BlitzPage type to Home page (#3716 )	2022-08-12 19:43:40 +02:00
Dillon Raphael	f88702c1c1	Minimal codemod fixes (#3715 ) * fix removing trailing comma when removing BlitzConfig from next.config.js during codemod * fix codemod for consolidating pages	2022-08-12 13:21:25 -04:00
github-actions[bot]	8b9ad3f40c	Version Packages (alpha) (#3705 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-08-12 13:37:07 +02:00
Daniel Bannert	37623a4f4c	add missing `g` in next.config.js file name (#3713 ) * feat: added missing g in confi.js * Add Changeset Co-authored-by: beerose <alexsandra.sikora@gmail.com>	2022-08-12 13:28:47 +02:00
Aleksandra	6baab1907e	Add type checking to next.config.js files in templates (#3710 )	2022-08-12 11:37:06 +02:00
JH.Lee	b5de25c3d8	(meta) add @orionmiz as contributor (#3712 )	2022-08-12 11:24:26 +02:00
Dillon Raphael	86af6dec5f	Wrap middlewares with BlitzServerMiddleware function with codemod (#3711 ) * wrap middlewares with BlitzServerMiddleware function & fix generating next config file	2022-08-11 14:39:59 -04:00
Blitz.js Bot	52a6338772	(meta) added @siddhsuresh as contributor	2022-08-11 11:11:28 -04:00
Siddharth Suresh	72a332e013	#3602 Fix the way next.config.js file is created by the codemod (#3709 ) * #3602 fix the way next.config.js file is created by the codemod * Update upgrade-legacy.ts * remove middleware block	2022-08-11 11:11:23 -04:00
Dillon Raphael	fd31e56bc5	blitz generate changeset	2022-08-11 10:47:03 -04:00
Dillon Raphael	e2fac297fd	Add back generate command (#3707 ) * add back generate command * use Routes object in generator templates * update query & mutation templates to use resolver	2022-08-11 10:34:57 -04:00
Aleksandra	a3c92cb863	Allow using RouteUrlObject as redirect.destination in getStaticProps and getServerSideProps (#3699 )	2022-08-11 13:20:57 +02:00
Dillon Raphael	2d1482fc8b	Store error for cookiePrefix if undefined & show error at the end of codemod (#3704 ) * store error for cookiePrefix if undefined & show error at the end * rename to collectedErrors * fix type & update error message	2022-08-10 15:40:17 -04:00
Blitz.js Bot	85b15a9cfb	(meta) added @edrickleong as contributor	2022-08-10 05:17:42 -04:00
Edrick Leong	4902802402	Add `getQueryData` utility to get an existing query's cached data (#3648 ) * feat: add getQueryData * test: add integration test for getQueryData * Add changeset Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>	2022-08-10 11:17:37 +02:00
				`@@ -0,0 +1 @@`
				`module.exports = require("@blitzjs/config/eslint")`