Version Packages (alpha) (#3717 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Print model added or updated in schema.prisma after running model generator (#3718 )
2026-02-04 03:01:17 -05:00 · 2022-08-12 20:05:18 +02:00 · 2022-08-12 20:01:15 +02:00 · 2022-08-12 19:43:40 +02:00 · 2022-08-12 13:21:25 -04:00 · 2022-08-12 13:37:07 +02:00
181 changed files with 4357 additions and 1314 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -970,7 +970,9 @@
      "avatar_url": "https://avatars0.githubusercontent.com/u/3496193?v=4",
      "profile": "https://twitter.com/dillonraphael",
      "contributions": [
-        "code"
+        "code",
+        "doc",
+        "test"
      ]
    },
    {
@@ -3611,6 +3613,96 @@
        "tool",
        "code"
      ]
+    },
+    {
+      "login": "ryanwashburne",
+      "name": "Ryan Washburne",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12566087?v=4",
+      "profile": "https://linkedin.com/in/ryanwashburne",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "sherryxiao1988",
+      "name": "Shundan Xiao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1202426?v=4",
+      "profile": "https://github.com/sherryxiao1988",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "tommywong-dev",
+      "name": "tommywong-dev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/79971095?v=4",
+      "profile": "https://github.com/tommywong-dev",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "datner",
+      "name": "Datner",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22598347?v=4",
+      "profile": "https://github.com/datner",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "chaiwattsw",
+      "name": "Chaiwat Trisuwan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30198386?v=4",
+      "profile": "https://chaiwattsw.com/",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "oltdaniel",
+      "name": "Daniel Oltmanns",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53529846?v=4",
+      "profile": "oltdaniel.eu",
+      "contributions": [
+        "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"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.changeset/blue-pigs-tan.md
+++ b/.changeset/blue-pigs-tan.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Throw error if cookiePrefix is undefined when running codemod
--- 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-carpets-deny.md
+++ b/.changeset/calm-carpets-deny.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fixes the db seed command so that the database can disconnect after running the seed file.
--- 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/calm-tomatoes-drive.md
+++ b/.changeset/calm-tomatoes-drive.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Include `.env.test` file to the generator templates
--- 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/clever-radios-lie.md
+++ b/.changeset/clever-radios-lie.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+Add DocumentProps & DocumentContext to the codemod import map
+
--- 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/curly-rules-speak.md
+++ b/.changeset/curly-rules-speak.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Comment out generate command import until we add the full support back
--- a/.changeset/fair-carrots-guess.md
+++ b/.changeset/fair-carrots-guess.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fixes loading production env variables by default for blitz build command
--- a/.changeset/four-sheep-judge.md
+++ b/.changeset/four-sheep-judge.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Export router-context from browser entrypoint
--- a/.changeset/fuzzy-bees-warn.md
+++ b/.changeset/fuzzy-bees-warn.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix APP_ENV not being set before loading env config
--- a/.changeset/gorgeous-games-obey.md
+++ b/.changeset/gorgeous-games-obey.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Avoid `invalid config detected` warnings by deleting `"blitz"` key from next config object
--- a/.changeset/great-candles-stare.md
+++ b/.changeset/great-candles-stare.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+
+Use internal branded blitz logger for @blitzjs/rpc
--- a/.changeset/great-terms-rescue.md
+++ b/.changeset/great-terms-rescue.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Add BlitzServerMiddleware utility function to wrap middleware in blitz server file
--- a/.changeset/green-pillows-hammer.md
+++ b/.changeset/green-pillows-hammer.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Runs the codegen on the blitz build command
--- a/.changeset/happy-hotels-visit.md
+++ b/.changeset/happy-hotels-visit.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Add missing value to "skip" option when choosing a package manager during new app scaffolding
--- a/.changeset/hot-cups-rhyme.md
+++ b/.changeset/hot-cups-rhyme.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix blitz codegen to work with monorepos
--- a/.changeset/kind-walls-suffer.md
+++ b/.changeset/kind-walls-suffer.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Run codegen tasks on blitz dev command
--- a/.changeset/light-donkeys-double.md
+++ b/.changeset/light-donkeys-double.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Run `prisma generate` as a `blitz codegen` step if "prisma" is found in project's dependencies
--- 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/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/ninety-rice-tickle.md
+++ b/.changeset/ninety-rice-tickle.md
@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Improve `blitz new` messaging and fix minor issues
--- 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/polite-lizards-love.md
+++ b/.changeset/polite-lizards-love.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Passes the correct arguments (without flags) to any bin command ran with the blitz cli
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -18,43 +18,67 @@
    "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": [
    "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",
    "dirty-planets-chew",
    "eleven-humans-sort",
    "empty-berries-rule",
    "empty-turkeys-wave",
+    "fair-carrots-guess",
    "fair-wombats-sneeze",
    "famous-kings-explain",
    "fast-trainers-kneel",
    "flat-bees-approve",
    "four-brooms-juggle",
    "four-meals-fry",
+    "four-sheep-judge",
+    "fuzzy-bees-warn",
    "fuzzy-jars-admire",
    "gentle-dogs-reply",
    "good-apes-drum",
    "good-insects-wink",
    "gorgeous-buses-scream",
+    "gorgeous-games-obey",
+    "great-candles-stare",
    "great-months-train",
+    "great-terms-rescue",
    "green-papayas-do",
+    "green-pillows-hammer",
+    "happy-hotels-visit",
    "healthy-rice-shout",
    "heavy-apes-judge",
+    "hot-cups-rhyme",
    "hot-drinks-approve",
    "hungry-baboons-swim",
+    "kind-walls-suffer",
    "late-steaks-give",
    "lemon-games-press",
    "lemon-seas-push",
+    "light-donkeys-double",
+    "long-bees-hope",
+    "lovely-berries-sell",
    "lovely-colts-share",
    "lucky-cows-try",
    "mean-gorillas-reply",
@@ -71,11 +95,14 @@
    "nine-onions-admire",
    "ninety-lies-press",
    "ninety-pets-heal",
+    "ninety-rice-tickle",
    "olive-bees-buy",
    "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",
@@ -86,43 +113,62 @@
    "quiet-feet-travel",
    "quiet-pans-hunt",
    "quiet-sloths-rule",
+    "red-badgers-retire",
    "rich-chairs-invent",
    "rich-queens-travel",
+    "rotten-rocks-remember",
+    "shaggy-carpets-brake",
    "sharp-falcons-begin",
    "shy-olives-hang",
+    "shy-pumpkins-try",
    "silent-colts-reply",
    "silly-apricots-share",
    "six-apricots-kick",
+    "slimy-humans-impress",
    "slimy-needles-taste",
    "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",
    "sweet-kiwis-cross",
    "swift-drinks-dress",
    "tall-meals-learn",
    "tame-keys-reply",
+    "tasty-maps-fetch",
    "tasty-news-collect",
    "ten-hairs-listen",
    "ten-rivers-burn",
    "tender-pianos-check",
    "thick-parrots-float",
    "thirty-countries-build",
+    "three-lies-pull",
    "tidy-clouds-smoke",
+    "tough-toes-pull",
+    "twelve-hornets-sip",
    "twelve-lemons-smile",
    "twenty-beans-pump",
    "two-carpets-rhyme",
+    "two-eyes-knock",
    "two-kiwis-help",
    "two-tigers-type",
+    "unlucky-avocados-fix",
    "unlucky-papayas-sleep",
    "violet-bags-leave",
    "violet-lions-help",
    "weak-suns-shave",
    "wicked-ghosts-cough",
-    "wise-frogs-give"
+    "wicked-rings-walk",
+    "wise-frogs-give",
+    "wise-rabbits-complain"
  ]
 }
--- a/.changeset/red-badgers-retire.md
+++ b/.changeset/red-badgers-retire.md
@@ -0,0 +1,8 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+Fixes peer dependency warnings
--- a/.changeset/rotten-rocks-remember.md
+++ b/.changeset/rotten-rocks-remember.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Run codegen tasks after creating a new app if user chose yarn as a package manager
--- a/.changeset/shaggy-carpets-brake.md
+++ b/.changeset/shaggy-carpets-brake.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Fix template path for the generator
--- a/.changeset/shy-pumpkins-try.md
+++ b/.changeset/shy-pumpkins-try.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+Upgrade react-query to v4
--- a/.changeset/slimy-humans-impress.md
+++ b/.changeset/slimy-humans-impress.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Remove trailing comma from tsconfig.json file in the new app template"
--- 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/smooth-tools-train.md
+++ b/.changeset/smooth-tools-train.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add ts-jest to dependencies in new app templates
--- 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/spicy-beds-float.md
+++ b/.changeset/spicy-beds-float.md
@@ -0,0 +1,8 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"blitz": patch
+"@blitzjs/generator": patch
+---
+Fixes the supports-color warning for pnpm
--- 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/stale-jobs-drum.md
+++ b/.changeset/stale-jobs-drum.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Set correct packages versions in package.json with upgrade-legacy codemod
--- a/.changeset/tasty-maps-fetch.md
+++ b/.changeset/tasty-maps-fetch.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix `enhancePrisma is undefined` errors by moving the utility function to a browser entrypoint
--- a/.changeset/three-lies-pull.md
+++ b/.changeset/three-lies-pull.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+moves zod to devDependencies
--- a/.changeset/tough-toes-pull.md
+++ b/.changeset/tough-toes-pull.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Remove debug console.log
--- a/.changeset/twelve-hornets-sip.md
+++ b/.changeset/twelve-hornets-sip.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Fix codemod to accept a self closing `DocumentHead` in the `_document` page
--- a/.changeset/two-eyes-knock.md
+++ b/.changeset/two-eyes-knock.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Update new app templates to use blitz-rpc's resolver function
--- a/.changeset/unlucky-avocados-fix.md
+++ b/.changeset/unlucky-avocados-fix.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add `@testing-library/jest-dom` to new app dependecies
--- a/.changeset/wicked-rings-walk.md
+++ b/.changeset/wicked-rings-walk.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Set prefix in moduleNameWrapper's options in Blitz's jest configuration
--- a/.changeset/wise-rabbits-complain.md
+++ b/.changeset/wise-rabbits-complain.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Mocks @blitzjs/auth instead of blitz inside the forgotPassword mutation test & hardcodes blitz package version types instead of just using the alpha tag.
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
    <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
  </a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-383-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-391-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">
    <img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -151,6 +151,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>
@@ -337,7 +338,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
  </tr>
  <tr>
    <td align="center"><a href="https://github.com/jschepmans"><img src="https://avatars2.githubusercontent.com/u/5782977?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Johan Schepmans</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jschepmans" title="Code">💻</a></td>
-    <td align="center"><a href="https://twitter.com/dillonraphael"><img src="https://avatars0.githubusercontent.com/u/3496193?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Code">💻</a></td>
+    <td align="center"><a href="https://twitter.com/dillonraphael"><img src="https://avatars0.githubusercontent.com/u/3496193?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://github.com/clgeoio"><img src="https://avatars2.githubusercontent.com/u/37571416?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cody G</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=clgeoio" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=clgeoio" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://github.com/madflow"><img src="https://avatars0.githubusercontent.com/u/183248?v=4?s=100" width="100px;" alt=""/><br /><sub><b>madflow</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=madflow" title="Documentation">📖</a></td>
    <td align="center"><a href="https://twitter.com/nitaking_"><img src="https://avatars2.githubusercontent.com/u/10850034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Satoshi Nitawaki</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nitaking" title="Code">💻</a> <a href="#maintenance-nitaking" title="Maintenance">🚧</a> <a href="#question-nitaking" title="Answering Questions">💬</a> <a href="https://github.com/blitz-js/blitz/commits?author=nitaking" title="Documentation">📖</a></td>
@@ -701,6 +702,17 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
    <td align="center"><a href="https://github.com/robertrisch"><img src="https://avatars.githubusercontent.com/u/73828816?v=4?s=100" width="100px;" alt=""/><br /><sub><b>robertrisch</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=robertrisch" title="Documentation">📖</a></td>
    <td align="center"><a href="https://github.com/saadaltabari"><img src="https://avatars.githubusercontent.com/u/29986512?v=4?s=100" width="100px;" alt=""/><br /><sub><b>saadaltabari</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=saadaltabari" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=saadaltabari" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/iojcde"><img src="https://avatars.githubusercontent.com/u/31413538?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeeho Ahn</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=iojcde" title="Documentation">📖</a> <a href="#tool-iojcde" title="Tools">🔧</a> <a href="https://github.com/blitz-js/blitz/commits?author=iojcde" title="Code">💻</a></td>
+    <td align="center"><a href="https://linkedin.com/in/ryanwashburne"><img src="https://avatars.githubusercontent.com/u/12566087?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ryan Washburne</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ryanwashburne" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/sherryxiao1988"><img src="https://avatars.githubusercontent.com/u/1202426?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shundan Xiao</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sherryxiao1988" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/tommywong-dev"><img src="https://avatars.githubusercontent.com/u/79971095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tommywong-dev</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tommywong-dev" title="Documentation">📖</a></td>
+    <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" 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>
 </table>

--- a/apps/toolkit-app/.npmrc
+++ b/apps/toolkit-app/.npmrc
@@ -1,7 +1,7 @@
 save-exact=true
 legacy-peer-deps=true

-public-hoist-pattern[]=react-query
+public-hoist-pattern[]=@tanstack/react-query
 public-hoist-pattern[]=next
 public-hoist-pattern[]=secure-password
 public-hoist-pattern[]=*jest*
--- 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,7 +29,7 @@
    "@blitzjs/rpc": "workspace:*",
    "@hookform/resolvers": "2.8.8",
    "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-alpha.58",
+    "blitz": "workspace:2.0.0-alpha.70",
    "next": "12.2.0",
    "prisma": "4.0.0",
    "react": "18.0.0",
--- 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/.npmrc
+++ b/apps/web/.npmrc
@@ -1,7 +1,7 @@
 save-exact=true
 legacy-peer-deps=true

-public-hoist-pattern[]=react-query
+public-hoist-pattern[]=@tanstack/react-query
 public-hoist-pattern[]=next
 public-hoist-pattern[]=secure-password
 public-hoist-pattern[]=*jest*
--- 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",
--- 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/integration-tests/qm/package.json
+++ b/integration-tests/qm/package.json
@@ -13,12 +13,12 @@
    "@blitzjs/next": "workspace:*",
    "@blitzjs/rpc": "workspace:*",
    "@prisma/client": "4.0.0",
+    "@tanstack/react-query": "4.0.10",
    "blitz": "workspace:*",
    "next": "12.2.0",
    "prisma": "4.0.0",
    "react": "18.0.0",
-    "react-dom": "18.0.0",
-    "react-query": "3.39.0"
+    "react-dom": "18.0.0"
  },
  "devDependencies": {
    "@testing-library/react": "13.0.0",
--- a/integration-tests/qm/test/snapshots/use-mutation.test.tsx.snap
+++ b/integration-tests/qm/test/snapshots/use-mutation.test.tsx.snap
@@ -2,4 +2,4 @@

 exports[`useMutation > useMutation calls the resolver with the argument > shouldn't work with query function 1`] = `"\\"useMutation\\" was expected to be called with a mutation but was called with a \\"query\\""`;

-exports[`useMutation > useMutation calls the resolver with the argument > shouldn't work with regular functions 1`] = `"Either the file path to your resolver is incorrect (must be in a \\"queries\\" or \\"mutations\\" folder that isn't nested inside \\"pages\\" or \\"api\\") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from \\"react-query\\")"`;
+exports[`useMutation > useMutation calls the resolver with the argument > shouldn't work with regular functions 1`] = `"Either the file path to your resolver is incorrect (must be in a \\"queries\\" or \\"mutations\\" folder that isn't nested inside \\"pages\\" or \\"api\\") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from \\"@tanstack/react-query\\")."`;
--- a/integration-tests/qm/test/snapshots/use-query.test.tsx.snap
+++ b/integration-tests/qm/test/snapshots/use-query.test.tsx.snap
@@ -1,5 +1,5 @@
 // Vitest Snapshot v1

-exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with mutation function 1`] = `"Cannot read properties of null (reading 'isReady')"`;
+exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with mutation function 1`] = `"\\"useQuery\\" was expected to be called with a query but was called with a \\"mutation\\""`;

-exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with regular functions 1`] = `"Cannot read properties of null (reading 'isReady')"`;
+exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with regular functions 1`] = `"Either the file path to your resolver is incorrect (must be in a \\"queries\\" or \\"mutations\\" folder that isn't nested inside \\"pages\\" or \\"api\\") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from \\"@tanstack/react-query\\")."`;
--- a/integration-tests/qm/test/use-query.test.tsx
+++ b/integration-tests/qm/test/use-query.test.tsx
@@ -1,166 +1,190 @@
 import {describe, it, expect, beforeAll, vi} from "vitest"
 import {act, screen, waitForElementToBeRemoved, waitFor} from "@testing-library/react"
-import {useQuery, useInfiniteQuery} from "@blitzjs/rpc"
+import {useQuery, useInfiniteQuery, BlitzRpcPlugin, QueryClientProvider} from "@blitzjs/rpc"
 import React from "react"
 import delay from "delay"
-import {buildMutationRpc, buildQueryRpc, render} from "../../utils/blitz-test-utils"
+import {buildMutationRpc, buildQueryRpc, mockRouter, render} from "../../utils/blitz-test-utils"
+import {RouterContext} from "next/dist/shared/lib/router-context"
+
+beforeAll(() => {
+  globalThis.__BLITZ_SESSION_COOKIE_PREFIX = "qm-test-cookie-prefix"
+  globalThis.IS_REACT_ACT_ENVIRONMENT = true
+})

 describe("useQuery", () => {
-  it("Placeholder", async () => {
-    console.log("placeholder")
+  const setupHook = (
+    ID: string,
+    params: any,
+    queryFn: (...args: any) => any,
+    options: Parameters<typeof useQuery>[2] = {} as any,
+  ): [{data?: any; setQueryData?: any}, Function] => {
+    let res = {}
+    const qc = BlitzRpcPlugin({})
+
+    function TestHarness() {
+      const [data, {setQueryData}] = useQuery(queryFn, params, {
+        suspense: true,
+        ...options,
+      } as any)
+
+      Object.assign(res, {data, setQueryData})
+      return (
+        <div id={`harness-${ID}`}>
+          <span>{data ? `Ready${ID}` : "No data"}</span>
+          <span>{data}</span>
+        </div>
+      )
+    }
+
+    const ui = () => (
+      <React.Suspense fallback="Loading...">
+        <TestHarness />
+      </React.Suspense>
+    )
+
+    const {rerender} = render(ui(), {
+      wrapper: ({children}) => (
+        <QueryClientProvider client={globalThis.queryClient}>
+          <RouterContext.Provider value={mockRouter}>{children}</RouterContext.Provider>
+        </QueryClientProvider>
+      ),
+    })
+    return [res, () => rerender(ui())]
+  }
+
+  describe('a "query" that converts the string parameter to uppercase', () => {
+    const upcase = async (args: string) => {
+      await delay(500)
+      return args.toUpperCase()
+    }
+
+    it("should work with Blitz queries", async () => {
+      const [res] = setupHook("2", "test", buildQueryRpc(upcase))
+      await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
+      await act(async () => {
+        await screen.findByText("Ready2")
+        expect(res.data).toBe("TEST")
+      })
+    })
+
+    it("should be able to change the data with setQueryData", async () => {
+      const [res] = setupHook("3", "fooBar", buildQueryRpc(upcase))
+      await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
+      await act(async () => {
+        await screen.findByText("Ready3")
+        expect(res.data).toBe("FOOBAR")
+        res.setQueryData((p: string) => p.substr(3, 3), {refetch: false})
+        await delay(100)
+      })
+
+      expect(res.data).toBe("BAR")
+    })
+
+    it("shouldn't work with regular functions", () => {
+      console.error = vi.fn()
+      expect(() => setupHook("4", "test", upcase)).toThrowErrorMatchingSnapshot()
+    })
+
+    it("shouldn't work with mutation function", () => {
+      console.error = vi.fn()
+      expect(() => setupHook("5", "test", buildMutationRpc(upcase))).toThrowErrorMatchingSnapshot()
+    })
+
+    it("suspense disabled if enabled is false", async () => {
+      setupHook("6", "test", buildQueryRpc(upcase), {enabled: false})
+      await screen.findByText("No data")
+    })
+
+    it("suspense disabled if enabled is undefined", async () => {
+      setupHook("7", "test", buildQueryRpc(upcase), {enabled: undefined})
+      await screen.findByText("No data")
+    })
+
+    // it("suspense disabled if enabled is false and suspense set", async () => {
+    //   setupHook("8", "test", buildQueryRpc(upcase), {
+    //     enabled: false,
+    //     suspense: true,
+    //   })
+    //   await screen.findByText("No data")
+    // })
+
+    it("works with options other than enabled & suspense without type error", () => {
+      const Demo = () => {
+        useQuery(buildQueryRpc(upcase), undefined, {refetchInterval: 10000})
+        return <div></div>
+      }
+      const ui = () => <Demo />
+
+      const {rerender} = render(ui(), {
+        wrapper: ({children}) => (
+          <QueryClientProvider client={globalThis.queryClient}>
+            <RouterContext.Provider value={mockRouter}>{children}</RouterContext.Provider>
+          </QueryClientProvider>
+        ),
+      })
+    })
  })
 })
-// beforeAll(() => {
-//   globalThis.__BLITZ_SESSION_COOKIE_PREFIX = "qm-test-cookie-prefix"
-//   globalThis.IS_REACT_ACT_ENVIRONMENT = true
-// })

-// describe("useQuery", () => {
-//   const setupHook = (
-//     params: any,
-//     queryFn: (...args: any) => any,
-//     options: Parameters<typeof useQuery>[2] = {} as any,
-//   ): [{data?: any; setQueryData?: any}, Function] => {
-//     let res = {}
-//     function TestHarness() {
-//       const [data, {setQueryData}] = useQuery(queryFn, params, {
-//         suspense: true,
-//         ...options,
-//       } as any)
-//       Object.assign(res, {data, setQueryData})
-//       return (
-//         <div id="harness">
-//           <span>{data ? "Ready" : "No data"}</span>
-//           <span>{data}</span>
-//         </div>
-//       )
-//     }
+describe("useInfiniteQuery", () => {
+  const setupHook = (
+    ID: string,
+    params: (arg?: any) => any,
+    queryFn: (...args: any) => any,
+  ): [{data?: any; setQueryData?: any}, Function] => {
+    let res = {}
+    const qc = BlitzRpcPlugin({})

-//     const ui = () => (
-//       <React.Suspense fallback="Loading...">
-//         <TestHarness />
-//       </React.Suspense>
-//     )
+    function TestHarness() {
+      // TODO - fix typing
+      //@ts-ignore
+      const [groupedData] = useInfiniteQuery(queryFn, params, {
+        suspense: true,
+        getNextPageParam: () => {},
+      })
+      Object.assign(res, {groupedData})
+      return (
+        <div id="harness">
+          <span>{groupedData ? `Ready${ID}` : "No data"}</span>
+          <div>
+            {groupedData.map((data: any, i) => (
+              <div key={i}>{data}</div>
+            ))}
+          </div>
+        </div>
+      )
+    }

-//     const {rerender} = render(ui())
-//     return [res, () => rerender(ui())]
-//   }
+    const ui = () => (
+      <React.Suspense fallback={`Loading${ID}...`}>
+        <TestHarness />
+      </React.Suspense>
+    )

-//   describe('a "query" that converts the string parameter to uppercase', () => {
-//     const upcase = async (args: string) => {
-//       await delay(1000)
-//       return args.toUpperCase()
-//     }
-//     it("should work with Blitz queries", async () => {
-//       const [res] = setupHook("test", buildQueryRpc(upcase))
-//       await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
-//       await act(async () => {
-//         await screen.findByText("Ready")
-//         expect(res.data).toBe("TEST")
-//       })
-//     })
+    const {rerender} = render(ui(), {
+      wrapper: ({children}) => (
+        <QueryClientProvider client={globalThis.queryClient}>
+          <RouterContext.Provider value={mockRouter}>{children}</RouterContext.Provider>
+        </QueryClientProvider>
+      ),
+    })
+    return [res, () => rerender(ui())]
+  }

-//     it("should be able to change the data with setQueryData", async () => {
-//       const [res] = setupHook("test", buildQueryRpc(upcase))
-//       await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
-//       await act(async () => {
-//         await screen.findByText("Ready")
-//         expect(res.data).toBe("TEST")
-//         res.setQueryData((p: string) => p.substr(1, 2), {refetch: false})
-//         await waitFor(() => screen.getByText("ES"))
-//       })
-//     })
-
-//     it("shouldn't work with regular functions", () => {
-//       console.error = vi.fn()
-//       expect(() => setupHook("test", upcase)).toThrowErrorMatchingSnapshot()
-//     })
-
-//     it("shouldn't work with mutation function", () => {
-//       console.error = vi.fn()
-//       expect(() => setupHook("test", buildMutationRpc(upcase))).toThrowErrorMatchingSnapshot()
-//     })
-
-//     it("suspense disabled if enabled is false", async () => {
-//       setupHook("test", buildQueryRpc(upcase), {enabled: false})
-//       await screen.findByText("No data")
-//     })
-
-//     it("suspense disabled if enabled is undefined", async () => {
-//       setupHook("test", buildQueryRpc(upcase), {enabled: undefined})
-//       await screen.findByText("No data")
-//     })
-
-//     it("suspense disabled if enabled is false and suspense set", async () => {
-//       setupHook("test", buildQueryRpc(upcase), {
-//         enabled: false,
-//         suspense: true,
-//       })
-//       await screen.findByText("No data")
-//     })
-//   })
-
-//   // it("works with options other than enabled & suspense without type error", () => {
-//   //   const queryFn = ((() => true) as unknown) as () => Promise<boolean>
-//   //   useQuery(queryFn, undefined, {refetchInterval: 10000})
-//   // })
-// })
-
-// describe("useInfiniteQuery", () => {
-//   const setupHook = (
-//     params: (arg?: any) => any,
-//     queryFn: (...args: any) => any,
-//   ): [{data?: any; setQueryData?: any}, Function] => {
-//     let res = {}
-//     function TestHarness() {
-//       // TODO - fix typing
-//       //@ts-ignore
-//       const [groupedData] = useInfiniteQuery(queryFn, params, {
-//         suspense: true,
-//         getNextPageParam: () => {},
-//       })
-//       Object.assign(res, {groupedData})
-//       return (
-//         <div id="harness">
-//           <span>{groupedData ? "Ready" : "No data"}</span>
-//           <div>
-//             {groupedData.map((data: any, i) => (
-//               <div key={i}>{data}</div>
-//             ))}
-//           </div>
-//         </div>
-//       )
-//     }
-
-//     const ui = () => (
-//       <React.Suspense fallback="Loading...">
-//         <TestHarness />
-//       </React.Suspense>
-//     )
-
-//     const {rerender} = render(ui())
-//     return [res, () => rerender(ui())]
-//   }
-
-//   const getItems = ({id}: {id: number}) => {
-//     if (id === 1) {
-//       return "item1"
-//     } else if (id === 2) {
-//       return "item2"
-//     } else {
-//       throw new Error("No item for this id")
-//     }
-//   }
-//   it("should work", async () => {
-//     setupHook(() => ({id: 1}), buildQueryRpc(getItems))
-//     await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
-//     await act(async () => {
-//       await screen.findByText("item1")
-//     })
-
-//     setupHook(() => ({id: 2}), buildQueryRpc(getItems))
-//     await act(async () => {
-//       await screen.findByText("item2")
-//     })
-//   })
-// })
+  const getItems = ({id}: {id: number}) => {
+    if (id === 1) {
+      return "item1"
+    } else if (id === 2) {
+      return "item2"
+    } else {
+      throw new Error("No item for this id")
+    }
+  }
+  it("should show loading", async () => {
+    setupHook("1", () => ({id: 1}), buildQueryRpc(getItems))
+    await waitForElementToBeRemoved(() => screen.getByText("Loading1..."))
+    await act(async () => {
+      await screen.findByText("item1")
+    })
+  })
+})
--- 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.0",
+    "prisma": "4.0.0",
+    "react": "18.0.0",
+    "react-dom": "18.0.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.1",
+    "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/utils/blitz-test-utils.tsx
+++ b/integration-tests/utils/blitz-test-utils.tsx
@@ -1,11 +1,12 @@
-import {render as defaultRender} from "@testing-library/react"
-import {NextRouter} from "next/router"
-import {vi} from "vitest"
-import {QueryClient, QueryClientProvider} from "react-query"
 import React from "react"
-import {BlitzRpcPlugin} from "@blitzjs/rpc"
+import {vi} from "vitest"
+import {QueryClient} from "@tanstack/react-query"
+import {BlitzRpcPlugin, QueryClientProvider} from "@blitzjs/rpc"
+import {NextRouter} from "next/router"
+import {RouterContext} from "next/dist/shared/lib/router-context"
+import {render as defaultRender} from "@testing-library/react"

-const mockRouter: NextRouter = {
+export const mockRouter: NextRouter = {
  basePath: "",
  pathname: "/",
  route: "/",
@@ -56,8 +57,6 @@ const BlitzProvider = ({

  return children
 }
-export const RouterContext = React.createContext(null as any)
-RouterContext.displayName = "RouterContext"
 const compose =
  (...rest) =>
  (x: React.ComponentType<any>) =>
--- a/integration-tests/utils/next-webdriver.d.ts
+++ b/integration-tests/utils/next-webdriver.d.ts
@@ -1,34 +1,24 @@
-interface ChainMethods {
-  elementByCss: (selector: string) => Chain<Element>
-  elementById: () => Chain<Element>
-  getValue: () => Chain<any>
-  text: () => Chain<string>
-  type: () => Chain<any>
-  moveTo: () => Chain<any>
-  getComputedCss: () => Chain<any>
-  getAttribute: () => Chain<any>
-  hasElementByCssSelector: () => Chain<any>
-  click: () => Chain<any>
-  elementsByCss: () => Chain<Element[]>
-  waitForElementByCss: (arg: string) => Chain<any>
-  eval: (evalStr: string) => Chain<any>
-  log: () => Chain<any>
-  url: () => Chain<any>
-  back: () => Chain<any>
-  forward: () => Chain<any>
-  refresh: () => Chain<any>
-  setDimensions: (opts: {height: number; width: number}) => Chain<any>
-  close: () => Chain<any>
-  quit: () => Chain<any>
-}
-
-interface Chain<T> extends Promise<T & ChainMethods>, ChainMethods {}
-
-type Browser = {__brand: "Browser"}
-
-export default function (
-  appPort: number,
-  path: string,
-  waitHydration?: boolean,
-  allowHydrationRetry?: boolean,
-): Promise<Chain<Browser>>
+import {BrowserInterface} from "./browsers/base"
+export declare const USE_SELENIUM: boolean
+/**
+ *
+ * @param appPortOrUrl can either be the port or the full URL
+ * @param url the path/query to append when using appPort
+ * @param options.waitHydration whether to wait for react hydration to finish
+ * @param options.retryWaitHydration allow retrying hydration wait if reload occurs
+ * @param options.disableCache disable cache for page load
+ * @param options.beforePageLoad the callback receiving page instance before loading page
+ * @returns thenable browser instance
+ */
+export default function webdriver(
+  appPortOrUrl: string | number,
+  url: string,
+  options?: {
+    waitHydration?: boolean
+    retryWaitHydration?: boolean
+    disableCache?: boolean
+    beforePageLoad?: (page: any) => void
+    locale?: string
+  },
+): Promise<BrowserInterface>
+//# sourceMappingURL=next-webdriver.d.ts.map
--- a/integration-tests/utils/package.json
+++ b/integration-tests/utils/package.json
@@ -5,6 +5,7 @@
  "devDependencies": {
    "@blitzjs/config": "workspace: *",
    "@blitzjs/rpc": "workspace: *",
+    "@tanstack/react-query": "4.0.10",
    "@testing-library/react": "13.0.0",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
@@ -23,7 +24,6 @@
    "playwright-chromium": "1.14.1",
    "react": "18.0.0",
    "react-dom": "18.0.0",
-    "react-query": "3.39.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",
@@ -33,10 +33,15 @@
    "prettier": "^2.5.1",
    "prettier-plugin-prisma": "3.8.0",
    "pretty-quick": "3.1.3",
-    "turbo": "1.1.5",
+    "turbo": "1.4.2",
    "vitest": "0.8.2",
    "wait-on": "6.0.1"
  },
  "npmClient": "pnpm",
-  "packageManager": "pnpm@7.4.0-1"
+  "packageManager": "pnpm@7.4.0-1",
+  "manypkg": {
+    "ignoredRules": [
+      "EXTERNAL_MISMATCH"
+    ]
+  }
 }
--- a/packages/blitz-auth/CHANGELOG.md
+++ b/packages/blitz-auth/CHANGELOG.md
@@ -1,5 +1,96 @@
 # @blitzjs/auth

+## 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
+
+- Updated dependencies [271c58ac]
+- Updated dependencies [630c7181]
+- Updated dependencies [f0ca738d]
+- Updated dependencies [41608c4c]
+  - blitz@2.0.0-alpha.68
+
+## 2.0.0-alpha.67
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.67
+
+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- a3e6c49c: Fixes the supports-color warning for pnpm
+- Updated dependencies [928e840b]
+- Updated dependencies [240f3f34]
+- Updated dependencies [55b1cb20]
+- Updated dependencies [4d7d126d]
+- Updated dependencies [890b0c0c]
+- Updated dependencies [807a2b56]
+- Updated dependencies [a3e6c49c]
+  - blitz@2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+### Patch Changes
+
+- Updated dependencies [dd5f5174]
+  - blitz@2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+### Patch Changes
+
+- Updated dependencies [54db8a46]
+- Updated dependencies [62bf12b5]
+  - blitz@2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+### Patch Changes
+
+- Updated dependencies [365e6709]
+  - blitz@2.0.0-alpha.62
+
+## 2.0.0-alpha.61
+
+### Patch Changes
+
+- Updated dependencies [240f378b]
+  - blitz@2.0.0-alpha.61
+
+## 2.0.0-alpha.60
+
+### Patch Changes
+
+- Updated dependencies [1d863f35]
+  - blitz@2.0.0-alpha.60
+
+## 2.0.0-alpha.59
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.59
+
 ## 2.0.0-alpha.58

 ### 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.58",
+  "version": "2.0.0-alpha.70",
  "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.58",
+    "blitz": "2.0.0-alpha.70",
    "cookie": "0.4.1",
    "cookie-session": "2.0.0",
    "debug": "4.3.3",
@@ -36,10 +36,11 @@
    "passport": "0.5.2",
    "path": "0.12.7",
    "secure-password": "4.0.0",
+    "supports-color": "8.1.1",
    "url": "0.11.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.58",
+    "@blitzjs/config": "workspace:2.0.0-alpha.70",
    "@testing-library/react": "13.0.0",
    "@testing-library/react-hooks": "7.0.2",
    "@types/cookie": "0.4.1",
@@ -50,7 +51,7 @@
    "react": "18.0.0",
    "react-dom": "18.0.0",
    "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
+    "unbuild": "0.7.6",
    "watch": "1.0.2"
  },
  "publishConfig": {
--- a/packages/blitz-auth/src/server/auth-plugin.ts
+++ b/packages/blitz-auth/src/server/auth-plugin.ts
@@ -105,7 +105,6 @@ export function AuthServerPlugin(options: AuthPluginOptions): BlitzServerPlugin<
      IncomingMessage,
      ServerResponse & {blitzCtx: Ctx}
    > = async (req, res, next) => {
-      console.log("Starting sessionMiddleware...")
      if (!res.blitzCtx?.session) {
        await getSession(req, res)
      }
--- a/packages/blitz-next/CHANGELOG.md
+++ b/packages/blitz-next/CHANGELOG.md
@@ -1,5 +1,91 @@
 # @blitzjs/next

+## 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
+
+- Updated dependencies [630c7181]
+  - @blitzjs/rpc@2.0.0-alpha.68
+
+## 2.0.0-alpha.67
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.67
+
+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- ccb1af8d: Avoid `invalid config detected` warnings by deleting `"blitz"` key from next config object
+- 807a2b56: Fixes peer dependency warnings
+- a3e6c49c: Fixes the supports-color warning for pnpm
+- Updated dependencies [807a2b56]
+- Updated dependencies [a3e6c49c]
+- Updated dependencies [9620ef6b]
+  - @blitzjs/rpc@2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+### Patch Changes
+
+- f52ca398: Upgrade react-query to v4
+- Updated dependencies [f52ca398]
+  - @blitzjs/rpc@2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+### Patch Changes
+
+- 31d7a6f4: Set prefix in moduleNameWrapper's options in Blitz's jest configuration
+  - @blitzjs/rpc@2.0.0-alpha.62
+
+## 2.0.0-alpha.61
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.61
+
+## 2.0.0-alpha.60
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.60
+
+## 2.0.0-alpha.59
+
+### Patch Changes
+
+- 3b213a35: Export router-context from browser entrypoint
+- Updated dependencies [3b213a35]
+  - @blitzjs/rpc@2.0.0-alpha.59
+
 ## 2.0.0-alpha.58

 ### Patch Changes
--- a/packages/blitz-next/build.config.ts
+++ b/packages/blitz-next/build.config.ts
@@ -2,7 +2,7 @@ import {BuildConfig} from "unbuild"

 const config: BuildConfig = {
  entries: ["./src/index-browser", "./src/index-server"],
-  externals: ["index-browser.cjs", "index-browser.mjs", "blitz", ".blitz"],
+  externals: ["index-browser.cjs", "index-browser.mjs", "blitz", ".blitz", "next", "react"],
  declaration: true,
  rollup: {
    emitCJS: true,
--- a/packages/blitz-next/jest/index.js
+++ b/packages/blitz-next/jest/index.js
@@ -21,6 +21,7 @@ function createJestConfigForNext(options) {
        // This ensures any path aliases in tsconfig also work in jest
        ...pathsToModuleNameMapper(
          (tsConfig && tsConfig.compilerOptions && tsConfig.compilerOptions.paths) || {},
+          {prefix: "<rootDir>/"},
        ),
        "\\.(jpg|jpeg|png|gif|webp|ico)$": path.resolve(__dirname, "./jest-preset/image-mock.js"),
      },
--- a/packages/blitz-next/package.json
+++ b/packages/blitz-next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.58",
+  "version": "2.0.0-alpha.70",
  "scripts": {
    "build": "unbuild",
    "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,16 +24,17 @@
    "eslint.js"
  ],
  "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.58",
+    "@blitzjs/rpc": "2.0.0-alpha.70",
+    "@tanstack/react-query": "4.0.10",
    "@types/hoist-non-react-statics": "3.3.1",
    "debug": "4.3.3",
    "fs-extra": "10.0.1",
    "hoist-non-react-statics": "3.3.2",
-    "react-query": "3.39.0",
-    "superjson": "1.8.0"
+    "superjson": "1.8.0",
+    "supports-color": "8.1.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.58",
+    "@blitzjs/config": "workspace:2.0.0-alpha.70",
    "@testing-library/dom": "8.13.0",
    "@testing-library/jest-dom": "5.16.3",
    "@testing-library/react": "13.0.0",
@@ -43,7 +44,7 @@
    "@types/react": "18.0.1",
    "@types/react-dom": "17.0.14",
    "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.58",
+    "blitz": "2.0.0-alpha.70",
    "cross-spawn": "7.0.3",
    "find-up": "4.1.0",
    "next": "12.2.0",
@@ -52,14 +53,10 @@
    "resolve-from": "5.0.0",
    "ts-jest": "27.1.4",
    "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
+    "unbuild": "0.7.6",
    "watch": "1.0.2"
  },
  "publishConfig": {
    "access": "public"
-  },
-  "peerDependencies": {
-    "next": ">=12.2.0",
-    "react": "*"
  }
 }
--- a/packages/blitz-next/src/global.ts
+++ b/packages/blitz-next/src/global.ts
@@ -1,4 +1,4 @@
-import {QueryClient} from "react-query"
+import {QueryClient} from "@tanstack/react-query"

 declare global {
  var queryClient: QueryClient
--- a/packages/blitz-next/src/index-browser.tsx
+++ b/packages/blitz-next/src/index-browser.tsx
@@ -7,8 +7,7 @@ import type {
 } from "blitz"
 import Head from "next/head"
 import React, {ReactNode} from "react"
-import {QueryClient, QueryClientProvider} from "react-query"
-import {Hydrate, HydrateOptions} from "react-query/hydration"
+import {QueryClient, QueryClientProvider, Hydrate, HydrateOptions} from "@tanstack/react-query"
 import {withSuperJSONPage} from "./superjson"
 import {Ctx} from "blitz"
 import {UrlObject} from "url"
@@ -19,6 +18,7 @@ import {RouterContext} from "./router-context"
 export * from "./error-boundary"
 export * from "./error-component"
 export * from "./use-params"
+export * from "./router-context"
 export {Routes} from ".blitz"

 const compose =
--- 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,
@@ -25,11 +25,13 @@ import {
  InstallWebpackConfigOptions,
  ResolverPathOptions,
 } from "@blitzjs/rpc"
-import {DefaultOptions, QueryClient} from "react-query"
+import {DefaultOptions, QueryClient} from "@tanstack/react-query"
 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
@@ -209,7 +240,8 @@ export function withBlitz(nextConfig: BlitzConfig = {}) {
    },
  })

-  return config
+  const {blitz, ...rest} = config
+  return rest
 }

 export type PrefetchQueryFn = <T extends AsyncFunc, TInput = FirstParam<T>>(
@@ -218,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) {
@@ -228,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,98 @@
 # @blitzjs/rpc

+## 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
+
+- 630c7181: Use internal branded blitz logger for @blitzjs/rpc
+  - @blitzjs/auth@2.0.0-alpha.68
+
+## 2.0.0-alpha.67
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.67
+
+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- 807a2b56: Fixes peer dependency warnings
+- a3e6c49c: Fixes the supports-color warning for pnpm
+- 9620ef6b: moves zod to devDependencies
+- Updated dependencies [a3e6c49c]
+  - @blitzjs/auth@2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+### Patch Changes
+
+- Updated dependencies [dd5f5174]
+  - blitz@2.0.0-alpha.65
+  - @blitzjs/auth@2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+### Patch Changes
+
+- Updated dependencies [54db8a46]
+- Updated dependencies [62bf12b5]
+  - blitz@2.0.0-alpha.64
+  - @blitzjs/auth@2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+### Patch Changes
+
+- f52ca398: Upgrade react-query to v4
+  - @blitzjs/auth@2.0.0-alpha.63
+  - blitz@2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+### Patch Changes
+
+- Updated dependencies [365e6709]
+  - blitz@2.0.0-alpha.62
+  - @blitzjs/auth@2.0.0-alpha.62
+
+## 2.0.0-alpha.61
+
+### Patch Changes
+
+- Updated dependencies [240f378b]
+  - blitz@2.0.0-alpha.61
+  - @blitzjs/auth@2.0.0-alpha.61
+
+## 2.0.0-alpha.60
+
+### Patch Changes
+
+- Updated dependencies [1d863f35]
+  - blitz@2.0.0-alpha.60
+  - @blitzjs/auth@2.0.0-alpha.60
+
+## 2.0.0-alpha.59
+
+### Patch Changes
+
+- 3b213a35: Remove debug console.log
+  - @blitzjs/auth@2.0.0-alpha.59
+  - blitz@2.0.0-alpha.59
+
 ## 2.0.0-alpha.58

 ### Patch Changes
--- a/packages/blitz-rpc/build.config.ts
+++ b/packages/blitz-rpc/build.config.ts
@@ -14,6 +14,9 @@ const config: BuildConfig = {
    "index-server.cjs",
    "index-server.mjs",
    "react",
+    "blitz",
+    "next",
+    "zod",
  ],
  declaration: true,
  rollup: {
--- a/packages/blitz-rpc/package.json
+++ b/packages/blitz-rpc/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.58",
+  "version": "2.0.0-alpha.70",
  "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,31 +20,28 @@
    "dist/**"
  ],
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-alpha.58",
+    "@blitzjs/auth": "2.0.0-alpha.70",
+    "@tanstack/react-query": "4.0.10",
    "b64-lite": "1.4.0",
    "bad-behavior": "1.0.1",
    "chalk": "^4.1.0",
    "debug": "4.3.3",
-    "react-query": "3.39.0",
    "superjson": "1.8.0",
-    "zod": "3.17.3"
+    "supports-color": "8.1.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.58",
+    "@blitzjs/config": "workspace:2.0.0-alpha.70",
    "@types/debug": "4.1.7",
    "@types/react": "18.0.1",
    "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.58",
+    "blitz": "2.0.0-alpha.70",
    "next": "12.2.0",
    "react": "18.0.0",
    "react-dom": "18.0.0",
    "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
-    "watch": "1.0.2"
-  },
-  "peerDependencies": {
-    "blitz": "2.0.0-alpha.58",
-    "next": ">=12.2.0"
+    "unbuild": "0.7.6",
+    "watch": "1.0.2",
+    "zod": "3.17.3"
  },
  "publishConfig": {
    "access": "public"
--- a/packages/blitz-rpc/src/data-client/index.ts
+++ b/packages/blitz-rpc/src/data-client/index.ts
@@ -7,8 +7,13 @@ export {
  invalidateQuery,
  setQueryData,
  getQueryClient,
+  getQueryData,
 } from "./react-query-utils"
-export {useQueryErrorResetBoundary, QueryClient} from "react-query"
-export {dehydrate} from "react-query/hydration"
+export {
+  useQueryErrorResetBoundary,
+  QueryClientProvider,
+  QueryClient,
+  dehydrate,
+} from "@tanstack/react-query"
 export {invoke} from "./invoke"
 export {invokeWithCtx} from "./invokeWithCtx"
--- 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, QueryKey} from "react-query"
+import {QueryClient, QueryFilters} from "@tanstack/react-query"
 import {serialize} from "superjson"
 import {isClient, isServer, AsyncFunc} from "blitz"
 import {ResolverType, RpcClient} from "./rpc"
@@ -94,7 +94,7 @@ export const validateQueryFn = <TInput, TResult>(
 ) => {
  if (isClient && !isRpcClient(queryFn) && isNotInUserTestEnvironment()) {
    throw new Error(
-      `Either the file path to your resolver is incorrect (must be in a "queries" or "mutations" folder that isn't nested inside "pages" or "api") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from "react-query")`,
+      `Either the file path to your resolver is incorrect (must be in a "queries" or "mutations" folder that isn't nested inside "pages" or "api") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from "@tanstack/react-query").`,
    )
  }
 }
@@ -169,14 +169,7 @@ export function invalidateQuery<TInput, TResult, T extends AsyncFunc>(
  }

  const fullQueryKey = getQueryKey(resolver, params)
-  let queryKey: QueryKey
-  if (params) {
-    queryKey = fullQueryKey
-  } else {
-    // Params not provided, only use first query key item (url)
-    queryKey = fullQueryKey[0]
-  }
-  return getQueryClient().invalidateQueries(queryKey)
+  return getQueryClient().invalidateQueries(fullQueryKey)
 }

 export function setQueryData<TInput, TResult, T extends AsyncFunc>(
@@ -206,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/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
github-actions[bot]	0bc107fd7f	Version Packages (alpha) (#3684 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-08-10 10:36:04 +02:00
Dillon Raphael	cb55ed266d	check if DocumentHead is self closing in the codemod step (#3702 )	2022-08-09 13:21:26 -04:00
Aleksandra	271c58ac62	Fix `Cannot find module 'generate'` error (#3700 )	2022-08-09 14:32:22 +02:00
Dillon Raphael	06427f67f2	Throw error if `cookiePrefix` is undefined during codemod (#3696 ) * throws error if cookiePrefix is undefined * create ExpectedError class	2022-08-08 16:35:17 -04:00
Dillon Raphael	f120f6723a	Add `DocumentProps` to codemod import map (#3695 ) * add DocumentProps & DocumentContext to import map & clean up post structuring of _document imports from next/document	2022-08-08 16:10:33 -04:00
Blitz.js Bot	bac5e740ba	(meta) added @oltdaniel as contributor	2022-08-08 15:35:24 -04:00
Daniel Oltmanns	630c718129	Fixes #3614 - changed console logs to standard logger (#3693 ) * Fixes #3614 - changed console logs to standard logger I tried to keep the logging format close to what has been present before, by also including the chalk package for coloring. * Create great-candles-stare.md Co-authored-by: Dillon Raphael <dillon@creatorsneverdie.com>	2022-08-08 15:35:20 -04:00
Aleksandra	078fe47419	Add '@testing-library/jest-dom' to new app dependecies (#3694 )	2022-08-08 19:23:33 +02:00
Aleksandra	8dfaad088d	Set correct packages versions in package.json with upgrade-legacy codemod (#3678 )	2022-08-08 18:54:21 +02:00
Aleksandra	dd299ae89f	Add ts-jest dependency to the new app templates (#3688 )	2022-08-08 18:10:22 +02:00
Aleksandra	41608c4c34	Run codegen tasks after installing dependecies in the new command (#3692 )	2022-08-08 17:57:39 +02:00
Aleksandra	70b334a2f7	Remove trailing comma from tsconfig.json in new app template (#3687 )	2022-08-08 12:12:18 +02:00
Dillon Raphael	f0ca738d56	Run the codegen tasks on blitz dev (#3683 )	2022-08-05 19:13:45 +02:00
github-actions[bot]	1010858446	Version Packages (alpha) (#3680 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-08-05 15:44:22 +02:00
Dillon Raphael	ebd74b4e97	Fix template path for the generator (#3679 )	2022-08-05 15:35:31 +02:00
Aleksandra	8870580710	Utilities cleanup (#3677 )	2022-08-05 14:42:25 +02:00
github-actions[bot]	414d758fe8	Version Packages (alpha) (#3653 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-08-05 00:04:16 +02:00
Blitz.js Bot	fce0f3135a	(meta) added @chaiwattsw as contributor	2022-08-04 17:57:34 -04:00
Chaiwat Trisuwan	9620ef6b1e	chore: move zod to devDependencies (#3674 )	2022-08-04 23:57:29 +02:00
Dillon Raphael	240f3f3471	exports BlitzServerMiddleware util function (#3671 )	2022-08-04 18:54:40 +02:00
Dillon Raphael	91aa535632	Include `.env.test` to generator templates (#3672 ) * adds env test file to generator templates	2022-08-04 18:43:13 +02:00
Aleksandra	ccb1af8d08	Avoid Next's `invalid config detected` warnings by deleting `"blitz"` key from the config object (#3670 )	2022-08-04 13:21:50 +02:00
Dillon Raphael	807a2b5645	removes peer dependencies and adds to build externals (#3667 )	2022-08-04 01:51:13 +02:00
Dillon Raphael	a3e6c49c4d	Fixes the supports-color warning for pnpm (#3666 ) * add supports-color to package.json	2022-08-04 01:13:33 +02:00
Aleksandra	4d7d126d9c	Run `prisma generate` as a `blitz codegen` step (#3662 )	2022-08-03 18:02:03 +02:00
Aleksandra	890b0c0c9d	various `blitz new` fixes and improvements (#3661 )	2022-08-03 12:46:00 +02:00
Dillon Raphael	928e840b59	Fixes loading production env variables by default for blitz build command (#3659 )	2022-08-03 01:21:58 +02:00
Dillon Raphael	55b1cb2044	runs codegen on build & remove stopWatcher console log (#3658 )	2022-08-03 01:07:44 +02:00
Blitz.js Bot	3a6677b307	(meta) updated @dillonraphael contributions	2022-08-02 16:19:49 -04:00
Dillon Raphael	f202aac183	fixes mock in forgotPassword mutation test & uses hardcoded blitz package versions instead of the alpha tag (#3655 )	2022-08-02 22:19:43 +02:00
Aleksandra	065db256d7	Update generator templates to use resolver function (#3652 )	2022-08-02 14:49:31 +02:00
github-actions[bot]	ada5cac7e3	Version Packages (alpha) (#3650 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>	2022-08-02 11:02:12 +02:00
Blitz.js Bot	e286bcb3ff	(meta) added @datner as contributor	2022-08-02 04:57:42 -04:00
Datner	dd5f51744f	Move enchancePrisma to a browser entrypoint (#3609 ) Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>	2022-08-02 10:57:37 +02:00
github-actions[bot]	99b054a44a	Version Packages (alpha) (#3645 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-08-01 13:11:24 +02:00
Aleksandra	54db8a46dd	Comment out version check until it's fixed & fix missing value in pkg manager options (#3647 )	2022-08-01 13:01:56 +02:00
Blitz.js Bot	6125eb7837	(meta) added @tommywong-dev as contributor	2022-08-01 05:08:00 -04:00
Dillon Raphael	62bf12b5c6	Update how cli checks if isInternalBlitzMonorepoDevelopment for codegen (#3644 ) Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>	2022-08-01 11:03:19 +02:00
github-actions[bot]	8e4580a446	Version Packages (alpha) (#3642 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-07-30 21:03:36 +02:00
Fran Zekan	f52ca398ee	Upgrade React-Query to V4 (#3557 )	2022-07-30 20:59:38 +02:00
github-actions[bot]	922bc276d9	Version Packages (alpha) (#3638 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-07-29 19:58:38 +02:00
Dillon Raphael	365e67094c	Fixes db seed command (#3639 ) * require db.default in db runSeed cli command	2022-07-29 19:51:23 +02:00
Dillon Raphael	31d7a6f413	Adds rootDir prefix to tsconfig alias module name mapper (#3634 ) Co-authored-by: beerose <alexsandra.sikora@gmail.com>	2022-07-29 11:36:43 +02:00
github-actions[bot]	8726b16bb9	Version Packages (alpha) (#3632 )	2022-07-28 20:06:17 +02:00
Dillon Raphael	240f378b54	passes the correct arguments to runCommandFromBin in blitz cli index (#3631 )	2022-07-28 19:57:08 +02:00
github-actions[bot]	d6655f0178	Version Packages (alpha) (#3630 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Dillon Raphael <dillon@creatorsneverdie.com>	2022-07-28 16:23:15 +02:00
Blitz.js Bot	001c174cbf	(meta) updated @dillonraphael contributions	2022-07-28 10:18:55 -04:00
Dillon Raphael	1d863f352a	Fix APP_ENV not being set before running loadEnvConfig (#3629 ) * rearanges the order of setting --env before loading envConfig	2022-07-28 16:16:19 +02:00
Blitz.js Bot	a36110171a	(meta) added @sherryxiao1988 as contributor	2022-07-27 13:29:50 -04:00
github-actions[bot]	37b5e35e22	Version Packages (alpha) (#3622 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2022-07-27 18:51:31 +02:00
beerose	3b213a35b0	Add missing changesets	2022-07-27 18:46:06 +02:00
Marcus Reinhardt	809f6019be	Remove debug print (#3616 ) Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>	2022-07-27 18:44:51 +02:00
Aleksandra	a51b1e85e1	Export router-context from blitz-next (#3621 )	2022-07-27 18:23:28 +02:00
Blitz.js Bot	a948dbb7b8	(meta) added @ryanwashburne as contributor	2022-07-27 11:08:20 -04:00
				`@@ -0,0 +1 @@`
				`module.exports = require("@blitzjs/config/eslint")`