Version Packages (alpha) (#3645)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.all-contributorsrc

@@ -970,7 +970,8 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/3496193?v=4",
       "profile": "https://twitter.com/dillonraphael",
       "contributions": [
-        "code"
+        "code",
+        "doc"
       ]
     },
     {
@@ -3590,6 +3591,54 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "saadaltabari",
+      "name": "saadaltabari",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29986512?v=4",
+      "profile": "https://github.com/saadaltabari",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "iojcde",
+      "name": "Jeeho Ahn",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31413538?v=4",
+      "profile": "https://github.com/iojcde",
+      "contributions": [
+        "doc",
+        "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"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/breezy-moose-behave.md

@@ -0,0 +1,6 @@
+---
+"blitz": minor
+"@blitzjs/auth": patch
+---
+
+Truncate errors from `api/auth/<strategy>/callback` request to 100 characters before passing them to the `?authError=` query parameter

.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.

.changeset/calm-nails-wait.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+These are various changes to will make the codemod more dynamic and work with a larger variety of codebases. These fixes are implemented to make the codemod work with flightdeck.

.changeset/clean-walls-wink.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Pass `signal` from useQuery to Blitz internal rpc client to be able to cancel queries on unmount

.changeset/cool-horses-check.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fixes issue when generating a new blitz app with the form flag that ends up installing the wrong form library

.changeset/curly-seas-serve.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Check for new versions when running CLI

.changeset/dirty-planets-chew.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": patch
+---
+
+Update `deleteSession` return type — allow undefined values

.changeset/four-sheep-judge.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Export router-context from browser entrypoint

.changeset/fuzzy-bees-warn.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix APP_ENV not being set before loading env config

.changeset/good-apes-drum.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fixes wrong import of the db module in `blitz db seed` command function

.changeset/gorgeous-buses-scream.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Allow prefetching multiple queries in gSSP and gSP

.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

.changeset/heavy-apes-judge.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Show all blitz packages when running `blitz version` command

.changeset/hot-cups-rhyme.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix blitz codegen to work with monorepos

.changeset/hungry-baboons-swim.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Improve codemod utilities

.changeset/lemon-games-press.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+Update Next.js version and addBasePath location

.changeset/lemon-seas-push.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Don't try to copy RPC API endpoint in templates that don't have it

.changeset/mean-gorillas-reply.md

@@ -0,0 +1,10 @@
+---
+"@blitzjs/auth": patch
+"blitz": patch
+---
+
+Fix a long-standing issue with occasional blitz auth flakiness
+
+This bug would sometimes cause users to be logged out or to experience an CSRFTokenMismatchError. This bug, when encountered, usually by lots of setPublicData or session.create calls, would not set the cookie headers correctly resulting in cookies being set to a previous state or in a possibly undefined state.
+
+There are no security concerns as far as I can tell.

.changeset/modern-ligers-behave.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add hoist pattern entry for react-query in new app templates

.changeset/moody-bags-walk.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"blitz": patch
+---
+
+Fix redirectAuthenticatedTo errors

.changeset/new-coats-turn.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/codemod": patch
+---
+
+Handle duplicate imports with Blitz upgrade-legacy codemod

.changeset/nice-deers-dream.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Export BlitzProvider from @blitzjs/next

.changeset/nine-birds-confess.md

@@ -0,0 +1,7 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+
+Fix SSP / SP not prefetching queries correctly

.changeset/ninety-lies-press.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Temporarily skip version check

.changeset/olive-sheep-rhyme.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add missing lint deps to the new app templates

.changeset/perfect-eyes-repeat.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Fix pipe resolver return type

.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

.changeset/popular-teachers-pay.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Handle next/dynamic default import in codemod

.changeset/pre.json

@@ -23,9 +23,16 @@
   "changesets": [
     "big-phones-bow",
     "breezy-cameras-double",
+    "breezy-moose-behave",
     "bright-mangos-run",
+    "calm-carpets-deny",
+    "calm-nails-wait",
+    "clean-walls-wink",
     "cool-doors-invent",
+    "cool-horses-check",
+    "curly-seas-serve",
     "dirty-monkeys-greet",
+    "dirty-planets-chew",
     "eleven-humans-sort",
     "empty-berries-rule",
     "empty-turkeys-wave",
@@ -35,42 +42,76 @@
     "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",
     "great-months-train",
     "green-papayas-do",
+    "happy-hotels-visit",
     "healthy-rice-shout",
+    "heavy-apes-judge",
+    "hot-cups-rhyme",
     "hot-drinks-approve",
+    "hungry-baboons-swim",
     "late-steaks-give",
+    "lemon-games-press",
+    "lemon-seas-push",
     "lovely-colts-share",
     "lucky-cows-try",
+    "mean-gorillas-reply",
     "modern-cameras-pull",
+    "modern-ligers-behave",
+    "moody-bags-walk",
     "moody-squids-cheer",
     "nervous-beds-travel",
     "nervous-dolls-rule",
+    "new-coats-turn",
+    "nice-deers-dream",
     "nice-starfishes-live",
+    "nine-birds-confess",
     "nine-onions-admire",
+    "ninety-lies-press",
     "ninety-pets-heal",
     "olive-bees-buy",
     "olive-feet-rhyme",
+    "olive-sheep-rhyme",
+    "perfect-eyes-repeat",
     "plenty-bottles-swim",
+    "polite-lizards-love",
     "poor-peas-lick",
     "poor-penguins-look",
     "poor-shrimps-think",
+    "popular-teachers-pay",
+    "pretty-games-march",
     "purple-singers-greet",
+    "quick-cycles-confess",
     "quiet-feet-travel",
     "quiet-pans-hunt",
+    "quiet-sloths-rule",
     "rich-chairs-invent",
     "rich-queens-travel",
     "sharp-falcons-begin",
     "shy-olives-hang",
+    "shy-pumpkins-try",
     "silent-colts-reply",
+    "silly-apricots-share",
+    "six-apricots-kick",
+    "slimy-needles-taste",
+    "slow-walls-poke",
     "small-socks-confess",
     "smooth-planets-admire",
+    "smooth-stingrays-drum",
+    "soft-adults-smell",
+    "sour-lemons-hunt",
     "strong-apes-reply",
     "stupid-walls-sell",
+    "sweet-kiwis-cross",
     "swift-drinks-dress",
+    "tall-meals-learn",
     "tame-keys-reply",
     "tasty-news-collect",
     "ten-hairs-listen",
@@ -78,7 +119,11 @@
     "tender-pianos-check",
     "thick-parrots-float",
     "thirty-countries-build",
+    "tidy-clouds-smoke",
+    "tough-toes-pull",
+    "twelve-lemons-smile",
     "twenty-beans-pump",
+    "two-carpets-rhyme",
     "two-kiwis-help",
     "two-tigers-type",
     "unlucky-papayas-sleep",
@@ -86,6 +131,7 @@
     "violet-lions-help",
     "weak-suns-shave",
     "wicked-ghosts-cough",
+    "wicked-rings-walk",
     "wise-frogs-give"
   ]
 }

.changeset/pretty-games-march.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Import ErrorComponent as DefaultErrorComponent

.changeset/quick-cycles-confess.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+fixes blitz not loading custom server

.changeset/quiet-sloths-rule.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Removes the check for when withBlitz is mounted before rendering the users app. We had this previously to avoid the react 18 suspense error being showin in development with nextjs.

.changeset/shy-pumpkins-try.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+Upgrade react-query to v4

.changeset/silly-apricots-share.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Avoid reassigning queryClient in prefetch methods

.changeset/six-apricots-kick.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Infer result type in the `api` handler and allow customizing it

.changeset/slimy-needles-taste.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+Add jest.config.js to newly generated typescript apps

.changeset/slow-walls-poke.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+Allow resolverPath to be a function which is ran for every file path that is converted to RPC Route

.changeset/smooth-stingrays-drum.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Updates the error messages based on if it's a babel parse error or an unexpected error

.changeset/soft-adults-smell.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": patch
+---
+
+Fix `Page.authenticate` not working for layout components

.changeset/sour-lemons-hunt.md

@@ -0,0 +1,9 @@
+---
+"@blitzjs/auth": patch
+"blitz": patch
+---
+
+Fix auth issue where session token and publicData cookie were updated unnecessarily, leading to potential user logout
+
+- Previously, we were updating the session token each time public data changed. This is not needed, and it would cause race condition bugs where a user could be unexpectedly logged out because a request already in flight would not match the new session token.
+- Previously, we were updating the publicData cookie even when it hadn't changed. This may reduce unnecessary re-renders on the client.

.changeset/sweet-kiwis-cross.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Fix queries/mutations lookup on Windows

.changeset/tall-meals-learn.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Upgrade Prisma to v4.0.0

.changeset/tidy-clouds-smoke.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix routes manifest showing duplicates for non queries|resolvers reso…

.changeset/tough-toes-pull.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Remove debug console.log

.changeset/twelve-lemons-smile.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Fix prefetching multiple queries causes only the last one to be passed to page

.changeset/two-carpets-rhyme.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+During `blitz new` if project name argument is set to "." change it to current folder name

.changeset/wicked-rings-walk.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Set prefix in moduleNameWrapper's options in Blitz's jest configuration

.github/CODEOWNERS

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

.github/release-drafter.yml

@@ -1,43 +0,0 @@
-name-template: "v$RESOLVED_VERSION"
-tag-template: "v$RESOLVED_VERSION"
-# categories:
-#   - title: 'Blitz'
-#     label: 'blitz'
-#   - title: '@blitzjs/next'
-#     label: 'blitz-next'
-#   - title: '@blitzjs/rpc'
-#     label: 'blitz-rpc'
-#   - title: '@blitzjs/auth'
-#     label: 'blitz-auth'
-version-resolver:
-  major:
-    labels:
-      - "major"
-  minor:
-    labels:
-      - "minor"
-  patch:
-    labels:
-      - "patch"
-  default: patch
-# autolabeler:
-#   - label: 'blitz'
-#     title:
-#      - '/blitz/i'
-#   - label: 'blitz-next'
-#     title:
-#       - '/@blitzjs\/next/i'
-#   - label: 'blitz-rpc'
-#     title:
-#       - '/@blitzjs\/rpc/i'
-#   - label: 'blitz-auth'
-#     title:
-#       - '/@blitzjs\/auth/i'
-template: |
-  ## What’s Changed
-
-  $CHANGES
-
-  ## Contributors
-
-  $CONTRIBUTORS

.github/workflows/release.yml

@@ -42,10 +42,10 @@ jobs:
       - run: pnpm build
 
       - name: Create Release Pull Request
-        uses: changesets/action@v1
+        uses: blitz-js/changesets-action@main
         with:
           publish: pnpm release
-          createGithubReleases: false
+          createGithubReleases: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.npmrc

@@ -6,4 +6,4 @@ public-hoist-pattern[]=*types*
 public-hoist-pattern[]=*eslint*
 public-hoist-pattern[]=@prettier/plugin-*
 public-hoist-pattern[]=*prettier-plugin-*
-strict-peer-dependencies=false
+

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-[Read the Contributing Guide at Blitzjs.com](https://blitzjs.com/docs/contributing)
+[Read the Contributing Guide at Blitzjs.com](https://alpha.blitzjs.com/docs/contributing)
 
 ## To run tests
 

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-381-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-386-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">
@@ -19,25 +19,12 @@
 
 <br>
 
-<h1 align="center">The Fullstack React Framework</h1>
-
-<h5 align="center">"Zero-API" Data Layer — Built on Next.js — Inspired by Ruby on Rails</h3>
-<h3 align="center"><a href="https://blitzjs.com/docs/get-started" target="_blank">Read the Documentation</a></h3>
-<br>
-
-“Zero-API” data layer **lets you import server code directly into your React components** instead of having to manually add API endpoints and do client-side fetching and caching.
-
-New Blitz apps come with **all the boring stuff already set up for you!** Like ESLint, Prettier, Jest, user sign up, log in, and password reset.
-
-Provides **helpful defaults and conventions** for things like routing, file structure, and authentication while also being extremely flexible.
-
+<h1 align="center">The Missing Fullstack Toolkit for Next.js</h1>
 
 <br>
 
 ### Quick Start
 
-You need Node.js 12 or newer
-
 #### Install Blitz
 
 Run `npm install -g blitz` or `yarn global add blitz`
@@ -53,37 +40,8 @@ _You can alternatively use [`npx`](https://www.npmjs.com/package/npx)_
 
 <br><br>
 
-<a aria-label="Bytes Newsletter" href="https://ui.dev/bytes/?r=blitzjs">
-<img alt="Bytes Newsletter" src="https://files-8wtskjofb.vercel.app/smarter-16x1.jpg">
-</a>
 
 
-<br><br>
-
-
-
-### The Foundational Principles
-
-1. Fullstack & Monolithic
-2. API Not Required
-3. Convention over Configuration
-4. Loose Opinions
-5. Easy to Start, Easy to Scale
-6. Stability
-7. Community over Code
-
-[The Blitz Manifesto](https://blitzjs.com/docs/manifesto) explains these principles in detail.
-
-<br>
-
-### What is Blitz Designed For?
-
-Blitz is designed for tiny to large database-backed applications that have one or more graphical user interfaces.
-
-While we currently only support web, we are pursuing the dream of a single monolithic application that runs on web and mobile with maximum code sharing and minimal boilerplate.
-
-<br>
-
 ## Welcome to the Blitz Community 👋
 
 The Blitz community is warm, safe, diverse, inclusive, and fun! LGBTQ+, women, and minorities are especially welcome. Please read our [Code of Conduct](https://blitzjs.com/docs/code-of-conduct).
@@ -379,7 +337,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></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>
@@ -741,6 +699,13 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <td align="center"><a href="https://github.com/c-ciobanu"><img src="https://avatars.githubusercontent.com/u/33382714?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cristi Ciobanu</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=c-ciobanu" title="Documentation">📖</a></td>
     <td align="center"><a href="https://arpitdalal.dev"><img src="https://avatars.githubusercontent.com/u/61059807?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Arpit Dalal</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=arpitdalal" title="Documentation">📖</a></td>
     <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>
   </tr>
 </table>
 

apps/toolkit-app/.npmrc

@@ -1,6 +1,7 @@
 save-exact=true
 legacy-peer-deps=true
 
+public-hoist-pattern[]=@tanstack/react-query
 public-hoist-pattern[]=next
 public-hoist-pattern[]=secure-password
 public-hoist-pattern[]=*jest*

apps/toolkit-app/app/core/layouts/Layout.tsx

@@ -1,7 +1,11 @@
+import React from "react"
 import Head from "next/head"
-import React, { FC } from "react"
+import { BlitzLayout } from "@blitzjs/next"
 
-const Layout: FC<{ title?: string; children?: React.ReactNode }> = ({ title, children }) => {
+const Layout: BlitzLayout<{ title?: string; children?: React.ReactNode }> = ({
+  title,
+  children,
+}) => {
   return (
     <>
       <Head>

apps/toolkit-app/package.json

@@ -2,7 +2,7 @@
   "name": "toolkit-app",
   "version": "1.0.1-alpha.16",
   "scripts": {
-    "start:dev": "pnpm run prisma:start && next dev",
+    "start:dev": "pnpm run prisma:start && blitz dev",
     "buildapp": "NODE_ENV=production pnpm blitz codegen && pnpm prisma generate && next build",
     "start": "next start",
     "lint": "next lint",
@@ -28,15 +28,15 @@
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
-    "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.47",
-    "next": "12.1.6-canary.17",
-    "prisma": "3.9.0",
+    "@prisma/client": "4.0.0",
+    "blitz": "workspace:2.0.0-alpha.64",
+    "next": "12.2.0",
+    "prisma": "4.0.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "react-hook-form": "7.29.0",
     "ts-node": "10.7.0",
-    "zod": "3.10.1"
+    "zod": "3.17.3"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",
@@ -46,7 +46,10 @@
     "@types/node": "17.0.16",
     "@types/preview-email": "2.0.1",
     "@types/react": "18.0.1",
+    "@typescript-eslint/eslint-plugin": "5.9.1",
     "eslint": "7.32.0",
+    "eslint-config-next": "12.2.0",
+    "eslint-config-prettier": "8.5.0",
     "husky": "7.0.4",
     "jest": "27.5.1",
     "lint-staged": "12.1.7",

apps/web/.npmrc

@@ -0,0 +1,8 @@
+save-exact=true
+legacy-peer-deps=true
+
+public-hoist-pattern[]=@tanstack/react-query
+public-hoist-pattern[]=next
+public-hoist-pattern[]=secure-password
+public-hoist-pattern[]=*jest*
+public-hoist-pattern[]=@testing-library/*

apps/web/next.config.js

@@ -10,7 +10,6 @@ module.exports = withBlitz(
       customServer: {
         hotReload: false,
       },
-      resolverBasePath: "root",
     },
   }),
 )

apps/web/package.json

@@ -20,15 +20,15 @@
     "@blitzjs/config": "workspace:*",
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
-    "@prisma/client": "3.9.0",
+    "@prisma/client": "4.0.0",
     "@types/jest": "27.4.1",
     "@types/passport-twitter": "1.0.37",
     "blitz": "workspace:*",
     "jest": "27.5.1",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "passport-mock-strategy": "2.0.0",
     "passport-twitter": "1.0.4",
-    "prisma": "3.9.0",
+    "prisma": "4.0.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "ts-node": "10.7.0"

apps/web/pages/_app.tsx

@@ -1,6 +1,6 @@
 import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
-import React from "react"
+import React, {Suspense} from "react"
 import {withBlitz} from "app/blitz-client"
 
 function RootErrorFallback({error}: ErrorFallbackProps) {
@@ -26,7 +26,9 @@ function RootErrorFallback({error}: ErrorFallbackProps) {
 function MyApp({Component, pageProps}: AppProps) {
   return (
     <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      <Component {...pageProps} />
+      <Suspense fallback="Loading...">
+        <Component {...pageProps} />
+      </Suspense>
     </ErrorBoundary>
   )
 }

integration-tests/auth/package.json

@@ -16,11 +16,11 @@
     "@blitzjs/auth": "workspace:*",
     "@blitzjs/config": "workspace:*",
     "@blitzjs/next": "workspace:*",
-    "@prisma/client": "3.9.0",
+    "@prisma/client": "4.0.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.1.6-canary.17",
-    "prisma": "3.9.0",
+    "next": "12.2.0",
+    "prisma": "4.0.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"
   },

integration-tests/auth/pages/_app.tsx

@@ -1,6 +1,6 @@
 import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
-import React from "react"
+import React, {Suspense} from "react"
 import {withBlitz} from "../app/blitz-client"
 
 function RootErrorFallback({error}: ErrorFallbackProps) {
@@ -25,9 +25,11 @@ function RootErrorFallback({error}: ErrorFallbackProps) {
 
 function MyApp({Component, pageProps}: AppProps) {
   return (
-    <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      <Component {...pageProps} />
-    </ErrorBoundary>
+    <Suspense fallback="Loading...">
+      <ErrorBoundary FallbackComponent={RootErrorFallback}>
+        <Component {...pageProps} />
+      </ErrorBoundary>
+    </Suspense>
   )
 }
 

integration-tests/middleware/next.config.js

@@ -1,4 +1,2 @@
 const {withBlitz} = require("@blitzjs/next")
-module.exports = withBlitz({
-  // update me
-})
+module.exports = withBlitz({})

integration-tests/middleware/package.json

@@ -15,7 +15,7 @@
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
     "blitz": "workspace:*",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"
   },

integration-tests/middleware/pages/_app.tsx

@@ -1,6 +1,6 @@
 import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
-import React from "react"
+import React, {Suspense} from "react"
 import {withBlitz} from "../app/blitz-client"
 
 function RootErrorFallback({error}: ErrorFallbackProps) {
@@ -25,9 +25,11 @@ function RootErrorFallback({error}: ErrorFallbackProps) {
 
 function MyApp({Component, pageProps}: AppProps) {
   return (
-    <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      <Component {...pageProps} />
-    </ErrorBoundary>
+    <Suspense fallback="Loading...">
+      <ErrorBoundary FallbackComponent={RootErrorFallback}>
+        <Component {...pageProps} />
+      </ErrorBoundary>
+    </Suspense>
   )
 }
 

integration-tests/no-suspense/package.json

@@ -16,11 +16,11 @@
     "@blitzjs/auth": "workspace:*",
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
-    "@prisma/client": "3.9.0",
+    "@prisma/client": "4.0.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.1.6-canary.17",
-    "prisma": "3.9.0",
+    "next": "12.2.0",
+    "prisma": "4.0.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"
   },

integration-tests/no-suspense/pages/_app.tsx

@@ -1,6 +1,6 @@
 import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
-import React from "react"
+import React, {Suspense} from "react"
 import {withBlitz} from "../app/blitz-client"
 
 function RootErrorFallback({error}: ErrorFallbackProps) {
@@ -25,9 +25,11 @@ function RootErrorFallback({error}: ErrorFallbackProps) {
 
 function MyApp({Component, pageProps}: AppProps) {
   return (
-    <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      <Component {...pageProps} />
-    </ErrorBoundary>
+    <Suspense fallback="Loading...">
+      <ErrorBoundary FallbackComponent={RootErrorFallback}>
+        <Component {...pageProps} />
+      </ErrorBoundary>
+    </Suspense>
   )
 }
 

integration-tests/qm/package.json

@@ -12,13 +12,13 @@
     "@blitzjs/config": "workspace:*",
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
-    "@prisma/client": "3.9.0",
+    "@prisma/client": "4.0.0",
+    "@tanstack/react-query": "4.0.10",
     "blitz": "workspace:*",
-    "next": "12.1.6-canary.17",
-    "prisma": "3.9.0",
+    "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",

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\\")."`;

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\\")."`;

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")
+    })
+  })
+})

integration-tests/rpc/next.config.js

@@ -1,4 +1,4 @@
 const {withBlitz} = require("@blitzjs/next")
 module.exports = withBlitz({
-  target: 'experimental-serverless-trace',
+  target: "experimental-serverless-trace",
 })

integration-tests/rpc/package.json

@@ -12,7 +12,7 @@
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
     "blitz": "workspace:*",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"
   },

integration-tests/trailing-slash/package.json

@@ -19,11 +19,11 @@
     "@blitzjs/auth": "workspace:*",
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
-    "@prisma/client": "3.9.0",
+    "@prisma/client": "4.0.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.1.6-canary.17",
-    "prisma": "3.9.0",
+    "next": "12.2.0",
+    "prisma": "4.0.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"
   },

integration-tests/trailing-slash/pages/_app.tsx

@@ -1,6 +1,6 @@
 import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
-import React from "react"
+import React, {Suspense} from "react"
 import {withBlitz} from "../app/blitz-client"
 
 function RootErrorFallback({error}: ErrorFallbackProps) {
@@ -25,9 +25,11 @@ function RootErrorFallback({error}: ErrorFallbackProps) {
 
 function MyApp({Component, pageProps}: AppProps) {
   return (
-    <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      <Component {...pageProps} />
-    </ErrorBoundary>
+    <Suspense fallback="Loading...">
+      <ErrorBoundary FallbackComponent={RootErrorFallback}>
+        <Component {...pageProps} />
+      </ErrorBoundary>
+    </Suspense>
   )
 }
 

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>) =>

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

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",

package.json

@@ -28,9 +28,8 @@
     "husky": "7.0.4",
     "jsdom": "^19.0.0",
     "lint-staged": "12.1.7",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "only-allow": "1.1.0",
-    "patch-package": "6.4.7",
     "prettier": "^2.5.1",
     "prettier-plugin-prisma": "3.8.0",
     "pretty-quick": "3.1.3",
@@ -39,5 +38,10 @@
     "wait-on": "6.0.1"
   },
   "npmClient": "pnpm",
-  "packageManager": "pnpm@6.21.0"
+  "packageManager": "pnpm@7.4.0-1",
+  "manypkg": {
+    "ignoredRules": [
+      "EXTERNAL_MISMATCH"
+    ]
+  }
 }

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,141 @@
 # @blitzjs/auth
 
+## 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
+
+- 83b35590: Truncate errors from `api/auth/<strategy>/callback` request to 100 characters before passing them to the `?authError=` query parameter
+- Updated dependencies [83b35590]
+  - blitz@2.0.0-alpha.58
+
+## 2.0.0-alpha.57
+
+### Patch Changes
+
+- Updated dependencies [3511d5b6]
+  - blitz@2.0.0-alpha.57
+
+## 2.0.0-alpha.56
+
+### Patch Changes
+
+- 3f20a474: Update `deleteSession` return type — allow undefined values
+- abe2afcc: Fix a long-standing issue with occasional blitz auth flakiness
+
+  This bug would sometimes cause users to be logged out or to experience an CSRFTokenMismatchError. This bug, when encountered, usually by lots of setPublicData or session.create calls, would not set the cookie headers correctly resulting in cookies being set to a previous state or in a possibly undefined state.
+
+  There are no security concerns as far as I can tell.
+
+- 8bcb471a: Fix auth issue where session token and publicData cookie were updated unnecessarily, leading to potential user logout
+
+  - Previously, we were updating the session token each time public data changed. This is not needed, and it would cause race condition bugs where a user could be unexpectedly logged out because a request already in flight would not match the new session token.
+  - Previously, we were updating the publicData cookie even when it hadn't changed. This may reduce unnecessary re-renders on the client.
+
+- Updated dependencies [abb1ad5d]
+- Updated dependencies [abe2afcc]
+- Updated dependencies [0ac6e171]
+- Updated dependencies [8bcb471a]
+  - blitz@2.0.0-alpha.56
+
+## 2.0.0-alpha.55
+
+### Patch Changes
+
+- 1c809094: Fix `Page.authenticate` not working for layout components
+- Updated dependencies [8f166a5d]
+- Updated dependencies [54a66a95]
+  - blitz@2.0.0-alpha.55
+
+## 2.0.0-alpha.54
+
+### Patch Changes
+
+- Updated dependencies [f397cc20]
+- Updated dependencies [cacb65d6]
+- Updated dependencies [348fd6f5]
+- Updated dependencies [20fc9f80]
+- Updated dependencies [a3bbe6ce]
+- Updated dependencies [ffa7b5cc]
+  - blitz@2.0.0-alpha.54
+
+## 2.0.0-alpha.53
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.53
+
+## 2.0.0-alpha.52
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.52
+
+## 2.0.0-alpha.51
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.51
+
+## 2.0.0-alpha.50
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.50
+
+## 2.0.0-alpha.49
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.49
+
+## 2.0.0-alpha.48
+
+### Patch Changes
+
+- Updated dependencies [93851d90]
+  - blitz@2.0.0-alpha.48
+
 ## 2.0.0-alpha.47
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.47",
+  "version": "2.0.0-alpha.64",
   "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.47",
+    "blitz": "2.0.0-alpha.64",
     "cookie": "0.4.1",
     "cookie-session": "2.0.0",
     "debug": "4.3.3",
@@ -39,7 +39,7 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.47",
+    "@blitzjs/config": "workspace:2.0.0-alpha.64",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/cookie": "0.4.1",
@@ -50,7 +50,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": {

packages/blitz-auth/src/client/index.tsx

@@ -216,8 +216,8 @@ export function getAuthValues<TProps = any>(
 ) {
   if (!Page) return {}
 
-  let authenticate = "authenticate" in Page && Page.authenticate
-  let redirectAuthenticatedTo = "redirectAuthenticatedTo" in Page && Page.redirectAuthenticatedTo
+  let authenticate = (Page as BlitzPage)?.authenticate
+  let redirectAuthenticatedTo = (Page as BlitzPage)?.redirectAuthenticatedTo
 
   if (authenticate === undefined && redirectAuthenticatedTo === undefined) {
     const layout = "getLayout" in Page && Page.getLayout?.(<Page {...props} />)

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)
       }

packages/blitz-auth/src/server/auth-sessions.test.ts

@@ -0,0 +1,41 @@
+import {expect, describe, it} from "vitest"
+import {setCookie} from "./auth-sessions"
+import cookie from "cookie"
+import {ServerResponse} from "http"
+
+describe("blitz-auth", () => {
+  describe("setCookie", () => {
+    it("works with empty start", async () => {
+      const res = new ServerResponse({} as any)
+      setCookie(res, cookie.serialize("A", "a-value", {}))
+      expect(res.getHeader("Set-Cookie")).toBe("A=a-value")
+    })
+
+    it("works with string start", async () => {
+      const res = new ServerResponse({} as any)
+      res.setHeader("Set-Cookie", cookie.serialize("A", "a-value", {}))
+      setCookie(res, cookie.serialize("B", "b-value", {}))
+      expect(res.getHeader("Set-Cookie")).toEqual(["A=a-value", "B=b-value"])
+    })
+
+    it("works with array start for new name", async () => {
+      const res = new ServerResponse({} as any)
+      res.setHeader("Set-Cookie", [
+        cookie.serialize("A", "a-value", {}),
+        cookie.serialize("B", "b-value", {}),
+      ])
+      setCookie(res, cookie.serialize("C", "c-value", {}))
+      expect(res.getHeader("Set-Cookie")).toEqual(["A=a-value", "B=b-value", "C=c-value"])
+    })
+
+    it("works with array start for existing name", async () => {
+      const res = new ServerResponse({} as any)
+      res.setHeader("Set-Cookie", [
+        cookie.serialize("A", "a-value", {}),
+        cookie.serialize("B", "b-value", {}),
+      ])
+      setCookie(res, cookie.serialize("A", "new-a-value", {}))
+      expect(res.getHeader("Set-Cookie")).toEqual(["A=new-a-value", "B=b-value"])
+    })
+  })
+})

packages/blitz-auth/src/server/auth-sessions.ts

@@ -385,7 +385,7 @@ const parseAnonymousSessionToken = (token: string) => {
   }
 }
 
-const setCookie = (res: ServerResponse, cookieStr: string) => {
+export const setCookie = (res: ServerResponse, cookieStr: string) => {
   const getCookieName = (c: string) => c.split("=", 2)[0]
   const appendCookie = () => append(res, "Set-Cookie", cookieStr)
 
@@ -407,7 +407,7 @@ const setCookie = (res: ServerResponse, cookieStr: string) => {
     for (let i = 0; i < cookiesHeader.length; i++) {
       if (cookieName === getCookieName(cookiesHeader[i] || "")) {
         cookiesHeader[i] = cookieStr
-        res.setHeader("Set-Cookie", cookieStr)
+        res.setHeader("Set-Cookie", cookiesHeader)
         return
       }
     }
@@ -801,30 +801,16 @@ async function refreshSession(
     const expiresAt = addYears(new Date(), 30)
     setAnonymousSessionCookie(req, res, anonymousSessionToken, expiresAt)
     setPublicDataCookie(req, res, publicDataToken, expiresAt)
-    setCSRFCookie(req, res, sessionKernel.antiCSRFToken, expiresAt)
   } else if (global.sessionConfig.method === "essential" && "sessionToken" in sessionKernel) {
     const expiresAt = addMinutes(new Date(), global.sessionConfig.sessionExpiryMinutes as number)
-    const publicDataToken = createPublicDataToken(sessionKernel.publicData)
-
-    let sessionToken: string
-    // Only generate new session token if public data actually changed
-    // Otherwise if new session token is generated just for refresh, then
-    // we have race condition bugs
-    if (publicDataChanged) {
-      sessionToken = createSessionToken(sessionKernel.handle, sessionKernel.publicData)
-    } else {
-      sessionToken = sessionKernel.sessionToken
-    }
-
-    setSessionCookie(req, res, sessionToken, expiresAt)
-    setPublicDataCookie(req, res, publicDataToken, expiresAt)
-    setCSRFCookie(req, res, sessionKernel.antiCSRFToken, expiresAt)
 
     debug("Updating session in db with", {expiresAt})
     if (publicDataChanged) {
+      debug("Public data has changed")
+      const publicDataToken = createPublicDataToken(sessionKernel.publicData)
+      setPublicDataCookie(req, res, publicDataToken, expiresAt)
       await global.sessionConfig.updateSession(sessionKernel.handle, {
         expiresAt,
-        hashedSessionToken: hash256(sessionToken),
         publicData: JSON.stringify(sessionKernel.publicData),
       })
     } else {

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

@@ -11,6 +11,7 @@ import {
   RequestMiddleware,
   MiddlewareResponse,
   secureProxyMiddleware,
+  truncateString,
 } from "blitz"
 import {IncomingMessage, ServerResponse} from "http"
 import {PublicData, SessionContext} from "../shared"
@@ -57,7 +58,7 @@ export type VerifyCallbackResult = {
 
 export type ApiHandlerIncomingMessage = IncomingMessage & {
   query: {
-    [key: string]: string | string[]
+    [key: string]: string | string[] | undefined
   }
 }
 
@@ -161,7 +162,10 @@ export function passportAuth(config: BlitzPassportConfig): ApiHandler {
                 "/"
 
               if (error) {
-                redirectUrl += "?authError=" + encodeURIComponent(error.toString())
+                console.error(`Login via ${strategyName} was unsuccessful.`)
+                console.error(error)
+                redirectUrl +=
+                  "?authError=" + encodeURIComponent(truncateString(error.toString(), 100))
                 res.setHeader("Location", redirectUrl)
                 res.statusCode = 302
                 res.end()

packages/blitz-auth/src/shared/types.ts

@@ -47,7 +47,7 @@ export interface SessionConfigMethods {
     handle: string,
     session: Partial<SessionModel>,
   ) => Promise<SessionModel | undefined>
-  deleteSession: (handle: string) => Promise<SessionModel>
+  deleteSession: (handle: string) => Promise<SessionModel | undefined>
 }
 
 export interface SessionConfig extends SessionConfigMethods {

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,128 @@
 # @blitzjs/next
 
+## 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
+
+- 6ab9db78: Infer result type in the `api` handler and allow customizing it
+- Updated dependencies [c721c104]
+  - @blitzjs/rpc@2.0.0-alpha.58
+
+## 2.0.0-alpha.57
+
+### Patch Changes
+
+- 0f18c68d: Avoid reassigning queryClient in prefetch methods
+- Updated dependencies [716e188d]
+  - @blitzjs/rpc@2.0.0-alpha.57
+
+## 2.0.0-alpha.56
+
+### Patch Changes
+
+- d9fc5d8e: Allow prefetching multiple queries in gSSP and gSP
+  - @blitzjs/rpc@2.0.0-alpha.56
+
+## 2.0.0-alpha.55
+
+### Patch Changes
+
+- 8d9ea00e: Fix prefetching multiple queries causes only the last one to be passed to page
+- Updated dependencies [df7cee84]
+  - @blitzjs/rpc@2.0.0-alpha.55
+
+## 2.0.0-alpha.54
+
+### Patch Changes
+
+- 348fd6f5: Fix redirectAuthenticatedTo errors
+- 20fc9f80: Fix SSP / SP not prefetching queries correctly
+- 80e1ead7: Add jest.config.js to newly generated typescript apps
+- Updated dependencies [20fc9f80]
+  - @blitzjs/rpc@2.0.0-alpha.54
+
+## 2.0.0-alpha.53
+
+### Patch Changes
+
+- a7e37c58: Export BlitzProvider from @blitzjs/next
+  - @blitzjs/rpc@2.0.0-alpha.53
+
+## 2.0.0-alpha.52
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.52
+
+## 2.0.0-alpha.51
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.51
+
+## 2.0.0-alpha.50
+
+### Patch Changes
+
+- dc694cf1: Removes the check for when withBlitz is mounted before rendering the users app. We had this previously to avoid the react 18 suspense error being showin in development with nextjs.
+- Updated dependencies [c11f0401]
+  - @blitzjs/rpc@2.0.0-alpha.50
+
+## 2.0.0-alpha.49
+
+### Patch Changes
+
+- bec9512e: Allow resolverPath to be a function which is ran for every file path that is converted to RPC Route
+- Updated dependencies [bec9512e]
+  - @blitzjs/rpc@2.0.0-alpha.49
+
+## 2.0.0-alpha.48
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.48
+
 ## 2.0.0-alpha.47
 
 ### Patch Changes

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"),
       },

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.47",
+  "version": "2.0.0-alpha.64",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -18,21 +18,22 @@
   "sideEffects": false,
   "license": "MIT",
   "files": [
+    "jest/**",
     "dist/**",
     "scripts/**",
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.47",
+    "@blitzjs/rpc": "2.0.0-alpha.64",
+    "@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"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.47",
+    "@blitzjs/config": "workspace:2.0.0-alpha.64",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -42,23 +43,23 @@
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.47",
+    "blitz": "2.0.0-alpha.64",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
-    "next": "12.1.6-canary.17",
+    "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "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": "*",
+    "next": ">=12.2.0",
     "react": "*"
   }
 }

packages/blitz-next/src/error-boundary.test.tsx

@@ -220,8 +220,7 @@ test("withErrorBoundary HOC", () => {
   expect(cleanStack(onErrorComponentStack)).toMatchInlineSnapshot(`
     {
       "componentStack": "
-        at __vite_ssr_import_4__.withErrorBoundary.FallbackComponent 
-        at ErrorBoundary 
+        at ErrorBoundary
         at withErrorBoundary",
     }
   `)

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

packages/blitz-next/src/index-browser.tsx

@@ -6,18 +6,19 @@ import type {
   Simplify,
 } from "blitz"
 import Head from "next/head"
-import React from "react"
-import {QueryClient, QueryClientProvider} from "react-query"
-import {Hydrate, HydrateOptions} from "react-query/hydration"
+import React, {ReactNode} from "react"
+import {QueryClient, QueryClientProvider, Hydrate, HydrateOptions} from "@tanstack/react-query"
 import {withSuperJSONPage} from "./superjson"
 import {Ctx} from "blitz"
 import {UrlObject} from "url"
 import {AppPropsType} from "next/dist/shared/lib/utils"
-import {Router} from "next/router"
+import {Router, useRouter} from "next/router"
+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 =
@@ -35,11 +36,7 @@ const buildWithBlitz = <TPlugins extends readonly ClientPlugin<object>[]>(plugin
     const BlitzOuterRoot = (props: AppProps) => {
       const component = React.useMemo(() => withPlugins(props.Component), [props.Component])
 
-      const [mounted, setMounted] = React.useState(false)
-
       React.useEffect(() => {
-        // Current workaround to fix react 18 suspense error issue
-        setMounted(true)
         // supress first render flicker
         setTimeout(() => {
           document.documentElement.classList.add("blitz-first-render-complete")
@@ -51,7 +48,7 @@ const buildWithBlitz = <TPlugins extends readonly ClientPlugin<object>[]>(plugin
           <>
             {/* @ts-ignore todo */}
             {props.Component.suppressFirstRenderFlicker && <NoPageFlicker />}
-            {mounted && <UserAppRoot {...props} Component={component} />}
+            <UserAppRoot {...props} Component={component} />
           </>
         </BlitzProvider>
       )
@@ -71,6 +68,7 @@ export type BlitzProviderProps = {
 interface RouteUrlObject extends Pick<UrlObject, "pathname" | "query"> {
   pathname: string
 }
+
 type RedirectAuthenticatedTo = string | RouteUrlObject | false
 type RedirectAuthenticatedToFnCtx = {
   session: Ctx["session"]["$publicData"]
@@ -82,34 +80,38 @@ export type BlitzPage<P = {}> = React.ComponentType<P> & {
   suppressFirstRenderFlicker?: boolean
   redirectAuthenticatedTo?: RedirectAuthenticatedTo | RedirectAuthenticatedToFn
 }
-export type BlitzLayout<P = {}> = React.ComponentType<P> & {
+export type BlitzLayout<P = {}> = React.ComponentType<P & {children: ReactNode}> & {
   authenticate?: boolean | {redirectTo?: string | RouteUrlObject}
   redirectAuthenticatedTo?: RedirectAuthenticatedTo | RedirectAuthenticatedToFn
 }
 export type AppProps<P = {}> = AppPropsType<Router, P> & {
   Component: BlitzPage
 }
-const BlitzProvider = ({
-  client,
+export const BlitzProvider = ({
+  client = globalThis.queryClient,
   contextSharing = false,
   dehydratedState,
   hydrateOptions,
   children,
 }: BlitzProviderProps) => {
-  if (globalThis.queryClient) {
+  const router = useRouter()
+
+  if (client) {
     return (
-      <QueryClientProvider
-        client={client || globalThis.queryClient}
-        contextSharing={contextSharing}
-      >
-        <Hydrate state={dehydratedState} options={hydrateOptions}>
-          {children}
-        </Hydrate>
-      </QueryClientProvider>
+      <RouterContext.Provider value={router}>
+        <QueryClientProvider
+          client={client || globalThis.queryClient}
+          contextSharing={contextSharing}
+        >
+          <Hydrate state={dehydratedState} options={hydrateOptions}>
+            {children}
+          </Hydrate>
+        </QueryClientProvider>
+      </RouterContext.Provider>
     )
   }
 
-  return children
+  return <RouterContext.Provider value={router}>{children}</RouterContext.Provider>
 }
 
 export type PluginsExports<TPlugins extends readonly ClientPlugin<object>[]> = Simplify<

packages/blitz-next/src/index-server.ts

@@ -17,11 +17,17 @@ import type {
   MiddlewareResponse,
 } from "blitz"
 import {handleRequestWithMiddleware, startWatcher, stopWatcher} from "blitz"
-import {dehydrate, getQueryKey, getInfiniteQueryKey, loaderClient, loaderServer} from "@blitzjs/rpc"
-import {DefaultOptions, QueryClient} from "react-query"
+import {
+  dehydrate,
+  getInfiniteQueryKey,
+  getQueryKey,
+  installWebpackConfig,
+  InstallWebpackConfigOptions,
+  ResolverPathOptions,
+} from "@blitzjs/rpc"
+import {DefaultOptions, QueryClient} from "@tanstack/react-query"
 import {IncomingMessage, ServerResponse} from "http"
 import {withSuperJsonProps} from "./superjson"
-import {ResolverBasePath} from "@blitzjs/rpc/src/index-server"
 import {ParsedUrlQuery} from "querystring"
 import {PreviewData} from "next/types"
 
@@ -34,10 +40,10 @@ export interface BlitzNextApiResponse
   extends MiddlewareResponse,
     Omit<NextApiResponse, keyof MiddlewareResponse> {}
 
-export type NextApiHandler = (
+export type NextApiHandler<TResult> = (
   req: NextApiRequest,
   res: BlitzNextApiResponse,
-) => void | Promise<void>
+) => TResult | void | Promise<TResult | void>
 
 type SetupBlitzOptions = {
   plugins: BlitzServerPlugin<RequestMiddleware, Ctx>[]
@@ -68,11 +74,32 @@ export type BlitzGSPHandler<
   GetStaticProps<TProps, Query, PD>
 >
 
-export type BlitzAPIHandler = (
-  req: Parameters<NextApiHandler>[0],
-  res: Parameters<NextApiHandler>[1],
+export type BlitzAPIHandler<TResult> = (
+  req: NextApiRequest,
+  res: BlitzNextApiResponse,
   ctx: Ctx,
-) => ReturnType<NextApiHandler>
+) => TResult | void | Promise<TResult | void>
+
+const prefetchQueryFactory = (
+  ctx: BlitzCtx,
+): {
+  getClient: () => QueryClient | null
+  prefetchQuery: AddParameters<PrefetchQueryFn, [boolean?]>
+} => {
+  let queryClient: null | QueryClient = null
+
+  return {
+    getClient: () => queryClient,
+    prefetchQuery: async (fn, input, defaultOptions = {}, infinite = false) => {
+      if (!queryClient) {
+        queryClient = new QueryClient({defaultOptions})
+      }
+
+      const queryKey = infinite ? getInfiniteQueryKey(fn, input) : getQueryKey(fn, input)
+      await queryClient.prefetchQuery(queryKey, () => fn(input, ctx))
+    },
+  }
+}
 
 export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {
   const middlewares = plugins.flatMap((p) => p.requestMiddlewares)
@@ -88,26 +115,15 @@ export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {
         (y, f) => (f ? f(y) : y),
         (res as MiddlewareResponse).blitzCtx,
       )
-      let queryClient: null | QueryClient = null
 
-      const prefetchQuery: AddParameters<PrefetchQueryFn, [boolean?]> = async (
-        fn,
-        input,
-        defaultOptions = {},
-        infinite = false,
-      ) => {
-        queryClient = new QueryClient({defaultOptions})
-
-        const queryKey = infinite ? getQueryKey(fn, input) : getInfiniteQueryKey(fn, input)
-        await queryClient.prefetchQuery(queryKey, () => fn(input, ctx))
-      }
+      const {getClient, prefetchQuery} = prefetchQueryFactory(ctx)
 
       ctx.prefetchQuery = prefetchQuery
       ctx.prefetchInfiniteQuery = (...args) => prefetchQuery(...args, true)
 
       try {
         const result = await handler({req, res, ctx, ...rest})
-        return withSuperJsonProps(withDehydratedState(result, queryClient))
+        return withSuperJsonProps(withDehydratedState(result, getClient()))
       } catch (err: any) {
         onError?.(err)
         throw err
@@ -120,26 +136,14 @@ export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {
     ): GetStaticProps<TProps, Query, PD> =>
     async (context) => {
       const ctx = contextMiddleware.reduceRight((y, f) => (f ? f(y) : y), {} as Ctx)
-      let queryClient: null | QueryClient = null
-
-      const prefetchQuery: AddParameters<PrefetchQueryFn, [boolean?]> = async (
-        fn,
-        input,
-        defaultOptions = {},
-        infinite = false,
-      ) => {
-        queryClient = new QueryClient({defaultOptions})
-
-        const queryKey = infinite ? getQueryKey(fn, input) : getInfiniteQueryKey(fn, input)
-        await queryClient.prefetchQuery(queryKey, () => fn(input, ctx))
-      }
+      const {getClient, prefetchQuery} = prefetchQueryFactory(ctx)
 
       ctx.prefetchQuery = prefetchQuery
       ctx.prefetchInfiniteQuery = (...args) => prefetchQuery(...args, true)
 
       try {
         const result = await handler({...context, ctx: ctx})
-        return withSuperJsonProps(withDehydratedState(result, queryClient))
+        return withSuperJsonProps(withDehydratedState(result, getClient()))
       } catch (err: any) {
         onError?.(err)
         throw err
@@ -147,7 +151,9 @@ export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {
     }
 
   const api =
-    (handler: BlitzAPIHandler): NextApiHandler =>
+    <TResult = Promise<void> | void>(
+      handler: BlitzAPIHandler<TResult>,
+    ): NextApiHandler<TResult | void> =>
     async (req, res) => {
       try {
         await handleRequestWithMiddleware(req, res, middlewares)
@@ -163,59 +169,13 @@ export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {
 
 export interface BlitzConfig extends NextConfig {
   blitz?: {
-    resolverBasePath?: ResolverBasePath
+    resolverPath?: ResolverPathOptions
     customServer?: {
       hotReload?: boolean
     }
   }
 }
 
-interface WebpackRuleOptions {
-  resolverBasePath?: ResolverBasePath
-}
-
-interface WebpackRule {
-  test: RegExp
-  use: Array<{
-    loader: string
-    options: WebpackRuleOptions
-  }>
-}
-
-interface InstallWebpackConfigOptions {
-  webpackConfig: {
-    module: {
-      rules: WebpackRule[]
-    }
-  }
-  nextConfig: BlitzConfig
-}
-
-export function installWebpackConfig({webpackConfig, nextConfig}: InstallWebpackConfigOptions) {
-  const options: WebpackRuleOptions = {
-    resolverBasePath: nextConfig.blitz?.resolverBasePath,
-  }
-
-  webpackConfig.module.rules.push({
-    test: /\/\[\[\.\.\.blitz]]\.[jt]s$/,
-    use: [
-      {
-        loader: loaderServer,
-        options,
-      },
-    ],
-  })
-  webpackConfig.module.rules.push({
-    test: /[\\/](queries|mutations)[\\/]/,
-    use: [
-      {
-        loader: loaderClient,
-        options,
-      },
-    ],
-  })
-}
-
 export function withBlitz(nextConfig: BlitzConfig = {}) {
   if (
     process.env.NODE_ENV !== "production" &&
@@ -236,7 +196,12 @@ export function withBlitz(nextConfig: BlitzConfig = {}) {
 
   const config = Object.assign({}, nextConfig, {
     webpack: (config: InstallWebpackConfigOptions["webpackConfig"], options: any) => {
-      installWebpackConfig({webpackConfig: config, nextConfig})
+      installWebpackConfig({
+        webpackConfig: config,
+        webpackRuleOptions: {
+          resolverPath: nextConfig.blitz?.resolverPath,
+        },
+      })
       if (typeof nextConfig.webpack === "function") {
         return nextConfig.webpack(config, options)
       }
@@ -259,8 +224,8 @@ function withDehydratedState<T extends Result>(result: T, queryClient: QueryClie
   if (!queryClient) {
     return result
   }
-  const dehydratedProps = dehydrate(queryClient)
-  return {...result, props: {...("props" in result ? result.props : undefined), dehydratedProps}}
+  const dehydratedState = dehydrate(queryClient)
+  return {...result, props: {...("props" in result ? result.props : undefined), dehydratedState}}
 }
 
 declare module "blitz" {

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,154 @@
 # @blitzjs/rpc
 
+## 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
+
+- c721c104: Pass `signal` from useQuery to Blitz internal rpc client to be able to cancel queries on unmount
+- Updated dependencies [83b35590]
+  - blitz@2.0.0-alpha.58
+  - @blitzjs/auth@2.0.0-alpha.58
+
+## 2.0.0-alpha.57
+
+### Patch Changes
+
+- 716e188d: Fix queries/mutations lookup on Windows
+- Updated dependencies [3511d5b6]
+  - blitz@2.0.0-alpha.57
+  - @blitzjs/auth@2.0.0-alpha.57
+
+## 2.0.0-alpha.56
+
+### Patch Changes
+
+- Updated dependencies [3f20a474]
+- Updated dependencies [abb1ad5d]
+- Updated dependencies [abe2afcc]
+- Updated dependencies [0ac6e171]
+- Updated dependencies [8bcb471a]
+  - @blitzjs/auth@2.0.0-alpha.56
+  - blitz@2.0.0-alpha.56
+
+## 2.0.0-alpha.55
+
+### Patch Changes
+
+- df7cee84: Fix pipe resolver return type
+- Updated dependencies [8f166a5d]
+- Updated dependencies [54a66a95]
+- Updated dependencies [1c809094]
+  - blitz@2.0.0-alpha.55
+  - @blitzjs/auth@2.0.0-alpha.55
+
+## 2.0.0-alpha.54
+
+### Patch Changes
+
+- 20fc9f80: Fix SSP / SP not prefetching queries correctly
+- Updated dependencies [f397cc20]
+- Updated dependencies [cacb65d6]
+- Updated dependencies [348fd6f5]
+- Updated dependencies [20fc9f80]
+- Updated dependencies [a3bbe6ce]
+- Updated dependencies [ffa7b5cc]
+  - blitz@2.0.0-alpha.54
+  - @blitzjs/auth@2.0.0-alpha.54
+
+## 2.0.0-alpha.53
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.53
+- blitz@2.0.0-alpha.53
+
+## 2.0.0-alpha.52
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.52
+- @blitzjs/auth@2.0.0-alpha.52
+
+## 2.0.0-alpha.51
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.51
+- blitz@2.0.0-alpha.51
+
+## 2.0.0-alpha.50
+
+### Patch Changes
+
+- c11f0401: Update Next.js version and addBasePath location
+  - blitz@2.0.0-alpha.50
+  - @blitzjs/auth@2.0.0-alpha.50
+
+## 2.0.0-alpha.49
+
+### Patch Changes
+
+- bec9512e: Allow resolverPath to be a function which is ran for every file path that is converted to RPC Route
+  - @blitzjs/auth@2.0.0-alpha.49
+  - blitz@2.0.0-alpha.49
+
+## 2.0.0-alpha.48
+
+### Patch Changes
+
+- Updated dependencies [93851d90]
+  - blitz@2.0.0-alpha.48
+  - @blitzjs/auth@2.0.0-alpha.48
+
 ## 2.0.0-alpha.47
 
 ### Patch Changes

packages/blitz-rpc/build.config.ts

@@ -5,6 +5,7 @@ const config: BuildConfig = {
     "./src/index-browser",
     "./src/index-server",
     "./src/loader-server",
+    "./src/loader-server-resolvers",
     "./src/loader-client",
   ],
   externals: [

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.47",
+  "version": "2.0.0-alpha.64",
   "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,31 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/auth": "2.0.0-alpha.47",
+    "@blitzjs/auth": "2.0.0-alpha.64",
+    "@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.10.1"
+    "zod": "3.17.3"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.47",
+    "@blitzjs/config": "workspace:2.0.0-alpha.64",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.47",
-    "next": "12.1.6-canary.17",
+    "blitz": "2.0.0-alpha.64",
+    "next": "12.2.0",
     "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"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-alpha.47",
-    "next": "*"
+    "blitz": "2.0.0-alpha.64",
+    "next": ">=12.2.0"
   },
   "publishConfig": {
     "access": "public"

packages/blitz-rpc/src/data-client/index.ts

@@ -8,7 +8,11 @@ export {
   setQueryData,
   getQueryClient,
 } 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"