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>

.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,45 @@
       "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"
+      ]
     }
   ],
   "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-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/heavy-apes-judge.md

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

.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/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/popular-teachers-pay.md

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

.changeset/pre.json

@@ -23,9 +23,15 @@
   "changesets": [
     "big-phones-bow",
     "breezy-cameras-double",
+    "breezy-moose-behave",
     "bright-mangos-run",
+    "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,43 +41,72 @@
     "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",
     "healthy-rice-shout",
+    "heavy-apes-judge",
     "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",
     "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",
     "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",
@@ -79,7 +114,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",

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

.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-385-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,10 @@ 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>
 </table>
 

apps/toolkit-app/.npmrc

@@ -1,6 +1,7 @@
 save-exact=true
 legacy-peer-deps=true
 
+public-hoist-pattern[]=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.48",
-    "next": "12.1.6-canary.17",
-    "prisma": "3.9.0",
+    "@prisma/client": "4.0.0",
+    "blitz": "workspace:2.0.0-alpha.60",
+    "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[]=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,10 +12,10 @@
     "@blitzjs/config": "workspace:*",
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
-    "@prisma/client": "3.9.0",
+    "@prisma/client": "4.0.0",
     "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"

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

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,5 @@
     "wait-on": "6.0.1"
   },
   "npmClient": "pnpm",
-  "packageManager": "pnpm@6.21.0"
+  "packageManager": "pnpm@7.4.0-1"
 }

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,106 @@
 # @blitzjs/auth
 
+## 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

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.48",
+  "version": "2.0.0-alpha.60",
   "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.48",
+    "blitz": "2.0.0-alpha.60",
     "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.48",
+    "@blitzjs/config": "workspace:2.0.0-alpha.60",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/cookie": "0.4.1",

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,95 @@
 # @blitzjs/next
 
+## 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

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.48",
+  "version": "2.0.0-alpha.60",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -18,12 +18,13 @@
   "sideEffects": false,
   "license": "MIT",
   "files": [
+    "jest/**",
     "dist/**",
     "scripts/**",
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.48",
+    "@blitzjs/rpc": "2.0.0-alpha.60",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
@@ -32,7 +33,7 @@
     "superjson": "1.8.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.48",
+    "@blitzjs/config": "workspace:2.0.0-alpha.60",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -42,10 +43,10 @@
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.48",
+    "blitz": "2.0.0-alpha.60",
     "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",
@@ -58,7 +59,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "next": "*",
+    "next": ">=12.2.0",
     "react": "*"
   }
 }

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

@@ -6,18 +6,20 @@ import type {
   Simplify,
 } from "blitz"
 import Head from "next/head"
-import React from "react"
+import React, {ReactNode} from "react"
 import {QueryClient, QueryClientProvider} from "react-query"
 import {Hydrate, HydrateOptions} from "react-query/hydration"
 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 +37,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 +49,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 +69,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 +81,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 {
+  dehydrate,
+  getInfiniteQueryKey,
+  getQueryKey,
+  installWebpackConfig,
+  InstallWebpackConfigOptions,
+  ResolverPathOptions,
+} from "@blitzjs/rpc"
 import {DefaultOptions, QueryClient} from "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,113 @@
 # @blitzjs/rpc
 
+## 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

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.48",
+  "version": "2.0.0-alpha.60",
   "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,22 +20,22 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/auth": "2.0.0-alpha.48",
+    "@blitzjs/auth": "2.0.0-alpha.60",
     "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.48",
+    "@blitzjs/config": "workspace:2.0.0-alpha.60",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.48",
-    "next": "12.1.6-canary.17",
+    "blitz": "2.0.0-alpha.60",
+    "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "typescript": "^4.5.3",
@@ -43,8 +43,8 @@
     "watch": "1.0.2"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-alpha.48",
-    "next": "*"
+    "blitz": "2.0.0-alpha.60",
+    "next": ">=12.2.0"
   },
   "publishConfig": {
     "access": "public"

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

@@ -85,7 +85,7 @@ export function useQuery<
   const {data, ...queryRest} = useReactQuery({
     queryKey: routerIsReady ? queryKey : ["_routerNotReady_"],
     queryFn: routerIsReady
-      ? () => enhancedResolverRpcClient(params, {fromQueryHook: true})
+      ? ({signal}) => enhancedResolverRpcClient(params, {fromQueryHook: true}, signal)
       : (emptyQueryFn as any),
     ...options,
     enabled,
@@ -170,7 +170,7 @@ export function usePaginatedQuery<
   const {data, ...queryRest} = useReactQuery({
     queryKey: routerIsReady ? queryKey : ["_routerNotReady_"],
     queryFn: routerIsReady
-      ? () => enhancedResolverRpcClient(params, {fromQueryHook: true})
+      ? ({signal}) => enhancedResolverRpcClient(params, {fromQueryHook: true}, signal)
       : (emptyQueryFn as any),
     ...options,
     keepPreviousData: true,
@@ -267,10 +267,8 @@ export function useInfiniteQuery<
     // Without this cache for usePaginatedQuery and this will conflict and break.
     queryKey: routerIsReady ? queryKey : ["_routerNotReady_"],
     queryFn: routerIsReady
-      ? ({pageParam}) =>
-          enhancedResolverRpcClient(getQueryParams(pageParam), {
-            fromQueryHook: true,
-          })
+      ? ({pageParam, signal}) =>
+          enhancedResolverRpcClient(getQueryParams(pageParam), {fromQueryHook: true}, signal)
       : (emptyQueryFn as any),
     ...options,
     enabled,

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

@@ -1,5 +1,5 @@
 import {normalizePathTrailingSlash} from "next/dist/client/normalize-trailing-slash"
-import {addBasePath} from "next/dist/shared/lib/router/router"
+import {addBasePath} from "next/dist/client/add-base-path"
 import {deserialize, serialize} from "superjson"
 import {SuperJSONResult} from "superjson/dist/types"
 import {CSRFTokenMismatchError, isServer} from "blitz"
@@ -39,7 +39,7 @@ export interface EnhancedRpc {
 }
 
 export interface RpcClientBase<Input = unknown, Result = unknown> {
-  (params: Input, opts?: RpcOptions): Promise<Result>
+  (params: Input, opts?: RpcOptions, signal?: AbortSignal): Promise<Result>
 }
 
 export interface RpcClient<Input = unknown, Result = unknown>
@@ -57,7 +57,7 @@ export function __internal_buildRpcClient({
 }: BuildRpcClientParams): RpcClient {
   const fullRoutePath = normalizeApiRoute("/api/rpc" + routePath)
 
-  const httpClient: RpcClientBase = async (params, opts = {}) => {
+  const httpClient: RpcClientBase = async (params, opts = {}, signal = undefined) => {
     const debug = (await import("debug")).default("blitz:rpc")
     if (!opts.fromQueryHook && !opts.fromInvoke) {
       console.warn(
@@ -93,9 +93,6 @@ export function __internal_buildRpcClient({
       serialized = serialize(params)
     }
 
-    // Create a new AbortController instance for this request
-    const controller = new AbortController()
-
     const promise = window
       .fetch(fullRoutePath, {
         method: "POST",
@@ -108,7 +105,7 @@ export function __internal_buildRpcClient({
             params: serialized.meta,
           },
         }),
-        signal: controller.signal,
+        signal,
       })
       .then(async (response) => {
         debug("Received request for", routePath)

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

@@ -1,7 +1,6 @@
 import {assert, Ctx, prettyMs} from "blitz"
 import {NextApiRequest, NextApiResponse} from "next"
 import {deserialize, serialize as superjsonSerialize} from "superjson"
-import chalk from "chalk"
 import {resolve} from "path"
 
 // TODO - optimize end user server bundles by not exporting all client stuff here
@@ -26,7 +25,7 @@ function getGlobalObject<T extends Record<string, unknown>>(key: string, default
 
 type Resolver = (...args: unknown[]) => Promise<unknown>
 type ResolverFiles = Record<string, () => Promise<{default?: Resolver}>>
-export type ResolverBasePath = "queries|mutations" | "root" | undefined
+export type ResolverPathOptions = "queries|mutations" | "root" | ((path: string) => string)
 
 // We define `global.__internal_blitzRpcResolverFiles` to ensure we use the same global object.
 // Needed for Next.js. I'm guessing that Next.js is including the `node_modules/` files in a seperate bundle than user files.
@@ -51,8 +50,58 @@ export function __internal_addBlitzRpcResolver(
 }
 
 const dir = __dirname + (() => "")() // trick to avoid `@vercel/ncc` to glob import
-export const loaderServer = resolve(dir, "./loader-server.cjs")
-export const loaderClient = resolve(dir, "./loader-client.cjs")
+const loaderClient = resolve(dir, "./loader-client.cjs")
+const loaderServer = resolve(dir, "./loader-server.cjs")
+const loaderServerResolvers = resolve(dir, "./loader-server-resolvers.cjs")
+
+interface WebpackRuleOptions {
+  resolverPath: ResolverPathOptions | undefined
+}
+
+interface WebpackRule {
+  test: RegExp
+  use: Array<{
+    loader: string
+    options: WebpackRuleOptions
+  }>
+}
+
+export interface InstallWebpackConfigOptions {
+  webpackConfig: {
+    module: {
+      rules: WebpackRule[]
+    }
+  }
+  webpackRuleOptions: WebpackRuleOptions
+}
+
+export function installWebpackConfig({
+  webpackConfig,
+  webpackRuleOptions,
+}: InstallWebpackConfigOptions) {
+  webpackConfig.module.rules.push({
+    test: /[\\/]\[\[\.\.\.blitz]]\.[jt]sx?$/,
+    use: [
+      {
+        loader: loaderServer,
+        options: webpackRuleOptions,
+      },
+    ],
+  })
+  webpackConfig.module.rules.push({
+    test: /[\\/](queries|mutations)[\\/]/,
+    use: [
+      {
+        loader: loaderClient,
+        options: webpackRuleOptions,
+      },
+      {
+        loader: loaderServerResolvers,
+        options: webpackRuleOptions,
+      },
+    ],
+  })
+}
 
 // ----------
 // END LOADER
@@ -97,10 +146,10 @@ export function rpcHandler(config: RpcConfig) {
       "It seems your Blitz RPC endpoint file is not named [[...blitz]].(jt)s. Please ensure it is",
     )
 
-    const relativeRoutePath = req.query.blitz.join("/")
+    const relativeRoutePath = (req.query.blitz as string[])?.join("/")
     const routePath = "/" + relativeRoutePath
 
-    const loadableResolver = resolverMap[routePath]
+    const loadableResolver = resolverMap?.[routePath]
     if (!loadableResolver) {
       throw new Error("No resolver for path: " + routePath)
     }

packages/blitz-rpc/src/loader-client.ts

@@ -42,7 +42,7 @@ export async function transformBlitzRpcResolverClient(
 
   const resolverFilePath = "/" + posix.relative(root, id)
   assertPosixPath(resolverFilePath)
-  const routePath = convertPageFilePathToRoutePath(resolverFilePath, options?.resolverBasePath)
+  const routePath = convertPageFilePathToRoutePath(resolverFilePath, options?.resolverPath)
   const resolverName = convertFilePathToResolverName(resolverFilePath)
   const resolverType = convertFilePathToResolverType(resolverFilePath)
 

packages/blitz-rpc/src/loader-server-resolvers.test.ts

@@ -0,0 +1,50 @@
+import {describe, expect, it} from "vitest"
+import {transformBlitzRpcResolverServer} from "./loader-server-resolvers"
+
+const META_TAGS_AND_EXPORT = `
+__internal_rpcHandler._resolverName = 'test'
+__internal_rpcHandler._resolverType = 'query'
+__internal_rpcHandler._routePath = '/api/rpc/test'
+
+export default __internal_rpcHandler
+`.trim()
+
+describe("transformBlitzRpcResolverServer", () => {
+  it("should compile for function", async () => {
+    const result = await transformBlitzRpcResolverServer(
+      "export default function test() { return 'test' }",
+      "queries/test.js",
+      "/",
+    )
+
+    expect(result).toBe(
+      `const __internal_rpcHandler = function test() { return 'test' }\n\n${META_TAGS_AND_EXPORT}`,
+    )
+  })
+
+  it("should compile with resolver", async () => {
+    const result = await transformBlitzRpcResolverServer(
+      `const test = resolver.pipe(() => Promise.resolve('test'))
+export default test`,
+      "queries/test.js",
+      "/",
+    )
+
+    expect(result).toBe(
+      `const test = resolver.pipe(() => Promise.resolve('test'))
+const __internal_rpcHandler = test\n\n${META_TAGS_AND_EXPORT}`,
+    )
+  })
+
+  it("should compile for plain lambda", async () => {
+    const result = await transformBlitzRpcResolverServer(
+      "export default () => Promise.resolve('test')",
+      "queries/test.js",
+      "/",
+    )
+
+    expect(result).toBe(
+      `const __internal_rpcHandler = () => Promise.resolve('test')\n\n${META_TAGS_AND_EXPORT}`,
+    )
+  })
+})

packages/blitz-rpc/src/loader-server-resolvers.ts

@@ -0,0 +1,68 @@
+import {
+  assertPosixPath,
+  convertFilePathToResolverName,
+  convertFilePathToResolverType,
+  convertPageFilePathToRoutePath,
+  Loader,
+  LoaderOptions,
+  toPosixPath,
+} from "./loader-utils"
+import {normalizeApiRoute} from "./data-client"
+import {posix} from "path"
+
+// Subset of `import type { LoaderDefinitionFunction } from 'webpack'`
+
+export async function loader(this: Loader, input: string): Promise<string> {
+  const compiler = this._compiler!
+  const id = this.resource
+  const root = this._compiler!.context
+
+  const isSSR = compiler.name === "server"
+  if (isSSR) {
+    return await transformBlitzRpcResolverServer(
+      input,
+      toPosixPath(id),
+      toPosixPath(root),
+      this.query,
+    )
+  }
+
+  return input
+}
+
+module.exports = loader
+
+export async function transformBlitzRpcResolverServer(
+  src: string,
+  id: string,
+  root: string,
+  options?: LoaderOptions,
+) {
+  assertPosixPath(id)
+  assertPosixPath(root)
+
+  const resolverFilePath = "/" + posix.relative(root, id)
+  assertPosixPath(resolverFilePath)
+  const routePath = convertPageFilePathToRoutePath(resolverFilePath, options?.resolverPath)
+  const resolverName = convertFilePathToResolverName(resolverFilePath)
+  const resolverType = convertFilePathToResolverType(resolverFilePath)
+
+  const fullRoutePath = normalizeApiRoute("/api/rpc" + routePath)
+
+  const lines = src.split("\n")
+  const newLines = lines.map((line) => {
+    if (line.trim().startsWith("export default")) {
+      return line.replace("export default", "const __internal_rpcHandler =")
+    }
+
+    return line
+  })
+
+  return `${newLines.join("\n")}
+
+__internal_rpcHandler._resolverName = '${resolverName}'
+__internal_rpcHandler._resolverType = '${resolverType}'
+__internal_rpcHandler._routePath = '${fullRoutePath}'
+
+export default __internal_rpcHandler`
+}

packages/blitz-rpc/src/loader-server.ts

@@ -1,4 +1,4 @@
-import {dirname, join, posix} from "path"
+import {dirname, join, posix, relative} from "path"
 import {promises} from "fs"
 import {
   assertPosixPath,
@@ -37,6 +37,10 @@ export async function loader(this: Loader, input: string): Promise<string> {
 
 module.exports = loader
 
+function slash(str: string) {
+  return str.replace(/\\/g, "/")
+}
+
 export async function transformBlitzRpcServer(
   src: string,
   id: string,
@@ -54,8 +58,8 @@ export async function transformBlitzRpcServer(
   code += "\n\n"
 
   for (let resolverFilePath of resolvers) {
-    const relativeResolverPath = posix.relative(dirname(id), join(root, resolverFilePath))
-    const routePath = convertPageFilePathToRoutePath(resolverFilePath, options?.resolverBasePath)
+    const relativeResolverPath = slash(relative(dirname(id), join(root, resolverFilePath)))
+    const routePath = convertPageFilePathToRoutePath(resolverFilePath, options?.resolverPath)
     code += `__internal_addBlitzRpcResolver('${routePath}', () => import('${relativeResolverPath}'));`
     code += "\n"
   }

packages/blitz-rpc/src/loader-utils.ts

@@ -1,9 +1,9 @@
 import {assert} from "blitz"
 import {posix, sep, win32} from "path"
-import {ResolverBasePath} from "./index-server"
+import {ResolverPathOptions} from "./index-server"
 
 export interface LoaderOptions {
-  resolverBasePath?: ResolverBasePath
+  resolverPath: ResolverPathOptions
 }
 
 export interface Loader {
@@ -51,9 +51,13 @@ const fileExtensionRegex = /\.([a-z]+)$/
 
 export function convertPageFilePathToRoutePath(
   filePath: string,
-  resolverBasePath: ResolverBasePath,
+  resolverPath?: ResolverPathOptions,
 ) {
-  if (resolverBasePath === "root") {
+  if (typeof resolverPath === "function") {
+    return resolverPath(filePath)
+  }
+
+  if (resolverPath === "root") {
     return filePath.replace(fileExtensionRegex, "")
   }
 

packages/blitz-rpc/src/resolver.ts

@@ -54,7 +54,7 @@ function pipe<A, B, C, D, E, F, G, CA = Ctx, CB = CA, CC = CB, CD = CC, CE = CD,
   de: PipeFn<D, E, CD, CE>,
   ef: PipeFn<E, F, CE, CF>,
   fg: PipeFn<F, G, CF, CG>,
-): (input: A, ctx: CA) => EnsurePromise<CG>
+): (input: A, ctx: CA) => EnsurePromise<G>
 function pipe<
   A,
   B,

packages/blitz/CHANGELOG.md

@@ -1,5 +1,109 @@
 # blitz
 
+## 2.0.0-alpha.60
+
+### Patch Changes
+
+- 1d863f35: Fix APP_ENV not being set before loading env config
+  - @blitzjs/generator@2.0.0-alpha.60
+
+## 2.0.0-alpha.59
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.59
+
+## 2.0.0-alpha.58
+
+### Minor Changes
+
+- 83b35590: Truncate errors from `api/auth/<strategy>/callback` request to 100 characters before passing them to the `?authError=` query parameter
+
+### Patch Changes
+
+- Updated dependencies [e339e2fd]
+  - @blitzjs/generator@2.0.0-alpha.58
+
+## 2.0.0-alpha.57
+
+### Patch Changes
+
+- 3511d5b6: Temporarily skip version check
+  - @blitzjs/generator@2.0.0-alpha.57
+
+## 2.0.0-alpha.56
+
+### Patch Changes
+
+- abb1ad5d: Improve codemod utilities
+- 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.
+
+- 0ac6e171: fixes blitz not loading custom server
+- 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.
+  - @blitzjs/generator@2.0.0-alpha.56
+
+## 2.0.0-alpha.55
+
+### Patch Changes
+
+- 8f166a5d: Check for new versions when running CLI
+- 54a66a95: Show all blitz packages when running `blitz version` command
+- Updated dependencies [ab4d9de7]
+  - @blitzjs/generator@2.0.0-alpha.55
+
+## 2.0.0-alpha.54
+
+### Patch Changes
+
+- f397cc20: Fixes issue when generating a new blitz app with the form flag that ends up installing the wrong form library
+- cacb65d6: Fixes wrong import of the db module in `blitz db seed` command function
+- 348fd6f5: Fix redirectAuthenticatedTo errors
+- 20fc9f80: Fix SSP / SP not prefetching queries correctly
+- a3bbe6ce: Fix routes manifest showing duplicates for non queries|resolvers reso…
+- ffa7b5cc: During `blitz new` if project name argument is set to "." change it to current folder name
+- Updated dependencies [a961aff8]
+- Updated dependencies [80e1ead7]
+  - @blitzjs/generator@2.0.0-alpha.54
+
+## 2.0.0-alpha.53
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.53
+
+## 2.0.0-alpha.52
+
+### Patch Changes
+
+- Updated dependencies [12cb7a72]
+  - @blitzjs/generator@2.0.0-alpha.52
+
+## 2.0.0-alpha.51
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.51
+
+## 2.0.0-alpha.50
+
+### Patch Changes
+
+- Updated dependencies [c11f0401]
+  - @blitzjs/generator@2.0.0-alpha.50
+
+## 2.0.0-alpha.49
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.49
+
 ## 2.0.0-alpha.48
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-alpha.48",
+  "version": "2.0.0-alpha.60",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,8 +23,9 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.48",
+    "@blitzjs/generator": "2.0.0-alpha.60",
     "arg": "5.0.1",
+    "boxen": "7.0.0",
     "chalk": "^4.1.0",
     "console-table-printer": "2.10.0",
     "cross-spawn": "7.0.3",
@@ -37,6 +38,7 @@
     "find-up": "4.1.0",
     "fs-extra": "10.0.1",
     "hasbin": "1.2.3",
+    "node-fetch": "3.2.3",
     "npm-which": "3.0.1",
     "ora": "5.3.0",
     "os-name": "5.0.1",
@@ -52,7 +54,7 @@
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.48",
+    "@blitzjs/config": "workspace:2.0.0-alpha.60",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",
@@ -69,13 +71,12 @@
     "@types/test-listen": "1.1.0",
     "@types/watchpack": "1.1.1",
     "express": "4.17.3",
-    "node-fetch": "3.2.3",
     "react": "18.0.0",
     "test-listen": "1.1.0",
     "typescript": "^4.5.3",
     "unbuild": "0.6.9",
     "watch": "1.0.2",
-    "zod": "3.10.1"
+    "zod": "3.17.3"
   },
   "peerDependencies": {
     "react": "*"

packages/blitz/src/cli/commands/codegen.ts

@@ -1,8 +1,30 @@
 import {CliCommand} from "../index"
 /* @ts-ignore */
 import {generateManifest} from "../utils/routes-manifest"
+import resolveCwd from "resolve-cwd"
+import {join} from "path"
+import fs from "fs-extra"
 
 const codegen: CliCommand = async () => {
+  try {
+    /* 
+      Updates the user's nextjs file and adds onRecoverableError to the hydrateRoot 3rd parameter object.
+      We can remove this when https://github.com/vercel/next.js/pull/38207 is merged into next.js
+    */
+    const nextDir = await resolveCwd("next")
+    const nextClientIndex = join(nextDir, "../..", "client", "index.js")
+    const readFile = await fs.readFile(nextClientIndex)
+    const updatedFile = readFile
+      .toString()
+      .replace(
+        /ReactDOM\.hydrateRoot\(.*?\);/,
+        `ReactDOM.hydrateRoot(domEl, reactEl, process.env.NODE_ENV === 'development' ? {onRecoverableError: (err) => err.toString().includes("could not finish this Suspense boundary") ? null : console.error(err)} : undefined);`,
+      )
+    await fs.writeFile(nextClientIndex, updatedFile)
+  } catch (err) {
+    console.log(err)
+  }
+
   try {
     await generateManifest()
   } catch (err) {

packages/blitz/src/cli/commands/db.ts

@@ -51,7 +51,7 @@ const runSeed = async (seedBasePath: string) => {
     throw err
   }
 
-  const db = require(dbPath).db
+  const db = require(dbPath)
   await db.$disconnect()
   console.log("Done Seeding")
 }

packages/blitz/src/cli/commands/new.ts

@@ -7,6 +7,7 @@ import {CliCommand} from "../index"
 import arg from "arg"
 import {AppGenerator, AppGeneratorOptions, getLatestVersion} from "@blitzjs/generator"
 import {runPrisma} from "../../prisma-utils"
+import {checkLatestVersion} from "../utils/check-latest-version"
 
 const forms = {
   "react-final-form": "React Final Form" as const,
@@ -24,8 +25,13 @@ const language = {
 type TLanguage = keyof typeof language
 
 type TPkgManager = "npm" | "yarn" | "pnpm"
-type TTemplate = "full" | "minimal"
+const installCommandMap: Record<TPkgManager, string> = {
+  yarn: "yarn",
+  pnpm: "pnpm install",
+  npm: "npm install",
+}
 
+type TTemplate = "full" | "minimal"
 const templates: {[key in TTemplate]: AppGeneratorOptions["template"]} = {
   full: {
     path: "app",
@@ -87,6 +93,10 @@ const determineProjectName = async () => {
     projectPath = path.resolve(projectName)
   } else {
     projectName = args._.slice(1)[0] as string
+    if (projectName === ".") {
+      projectName = path.basename(process.cwd())
+    }
+
     projectPath = path.resolve(projectName)
   }
 }
@@ -128,14 +138,7 @@ const determineFormLib = async () => {
 
     projectFormLib = res.form
   } else {
-    switch (args["--form"] as TForms) {
-      case "react-final-form":
-        projectFormLib = forms["react-final-form"]
-      case "react-hook-form":
-        projectFormLib = forms["react-hook-form"]
-      case "formik":
-        projectFormLib = forms["formik"]
-    }
+    projectFormLib = forms[args["--form"] as TForms]
   }
 }
 
@@ -202,11 +205,7 @@ const determinePkgManagerToInstallDeps = async () => {
 
       projectPkgManger = res.pkgManager
 
-      if (res.pkgManager === "skip") {
-        shouldInstallDeps = false
-      } else {
-        shouldInstallDeps = true
-      }
+      shouldInstallDeps = res.pkgManager !== "skip"
     } else {
       const res = await prompts({
         type: "confirm",
@@ -220,9 +219,9 @@ const determinePkgManagerToInstallDeps = async () => {
 }
 
 const newApp: CliCommand = async (argv) => {
-  const shouldUpgrade = !args["--skip-upgrade"]
+  const shouldUpgrade = false // !args["--skip-upgrade"]
   if (shouldUpgrade) {
-    //TODO: Handle checking for updates
+    await checkLatestVersion()
   }
 
   await determineProjectName()
@@ -278,16 +277,7 @@ const newApp: CliCommand = async (argv) => {
     await generator.run()
 
     if (requireManualInstall) {
-      let cmd
-      switch (projectPkgManger) {
-        case "yarn":
-          cmd = "yarn"
-        case "npm":
-          cmd = "npm install"
-        case "pnpm":
-          cmd = "pnpm install"
-      }
-      postInstallSteps.push(cmd)
+      postInstallSteps.push(installCommandMap[projectPkgManger])
       postInstallSteps.push(
         "blitz prisma migrate dev (when asked, you can name the migration anything)",
       )

packages/blitz/src/cli/index.ts

@@ -1,12 +1,12 @@
-import {NON_STANDARD_NODE_ENV} from "./utils/constants"
 import arg from "arg"
-import {loadEnvConfig} from "../env-utils"
-import {getCommandBin} from "./utils/config"
 import spawn from "cross-spawn"
-import {readdirSync} from "fs-extra"
-import resolveFrom from "resolve-from"
-import pkgDir from "pkg-dir"
-import {join} from "path"
+
+import {loadEnvConfig} from "../env-utils"
+import {NON_STANDARD_NODE_ENV} from "./utils/constants"
+import {getCommandBin} from "./utils/config"
+import {readVersions} from "./utils/read-versions"
+
+import {getPkgManager} from "./utils/helpers"
 
 const commonArgs = {
   // Flags
@@ -57,9 +57,6 @@ if (aliases[args._[0] as Alias]) {
 
 const forwardedArgs = blitzCommand ? args._.slice(1) : args._
 
-const globalBlitzPath = resolveFrom(__dirname, "blitz")
-const localBlitzPath = resolveFrom.silent(process.cwd(), "blitz")
-
 async function runCommandFromBin() {
   if (!args._[0]) {
     console.log("No command specified")
@@ -83,18 +80,17 @@ async function runCommandFromBin() {
 async function printEnvInfo() {
   const osName = await import("os-name")
   const envinfo = await import("envinfo")
-  const pkgManager = readdirSync(process.cwd()).includes("pnpm-lock.yaml")
-    ? "pnpm"
-    : readdirSync(process.cwd()).includes("yarn-lock.yaml")
-    ? "yarn"
-    : "npm"
 
+  const pkgManager = getPkgManager()
   const env = await envinfo.default.run(
     {
       System: ["OS", "CPU", "Memory", "Shell"],
       Binaries: ["Node", "Yarn", "npm", "pnpm"],
       npmPackages: [
         "blitz",
+        "@blitzjs/rpc",
+        "@blitzjs/auth",
+        "@blitzjs/next",
         "typescript",
         "react",
         "react-dom",
@@ -106,18 +102,13 @@ async function printEnvInfo() {
     {showNotFound: true},
   )
 
-  const globalBlitzPkgJsonPath = pkgDir.sync(globalBlitzPath)
-  const localBlitzPkgJsonPath = pkgDir.sync(localBlitzPath)
-
-  if (globalBlitzPkgJsonPath && globalBlitzPkgJsonPath !== localBlitzPkgJsonPath) {
-    // This branch won't run if user does `npx blitz` or `yarn blitz`
-    const globalVersion = require(join(globalBlitzPkgJsonPath, "package.json")).version
+  const {globalVersion, localVersions} = readVersions()
+  if (globalVersion) {
     console.log(`Blitz version: ${globalVersion} (global)`)
   }
 
-  if (localBlitzPkgJsonPath) {
-    const localVersion = require(join(localBlitzPkgJsonPath, "package.json")).version
-    console.log(`Blitz version: ${localVersion} (local)`)
+  if (localVersions.blitz) {
+    console.log(`Blitz version: ${localVersions.blitz} (local)`)
   }
 
   console.log(
@@ -129,6 +120,9 @@ async function printEnvInfo() {
 }
 
 async function main() {
+  if (args["--env"]) {
+    process.env.APP_ENV = args["--env"]
+  }
   loadEnvConfig(process.cwd(), undefined, {error: console.error, info: console.info})
 
   // Version is inlined into the file using taskr build pipeline
@@ -136,10 +130,6 @@ async function main() {
     await printEnvInfo()
   }
 
-  if (args["--env"]) {
-    process.env.APP_ENV = args["--env"]
-  }
-
   if (args["--help"]) {
     forwardedArgs.push("--help")
   }

packages/blitz/src/cli/utils/check-latest-version.ts

@@ -0,0 +1,185 @@
+import findUp from "find-up"
+import resolveFrom from "resolve-from"
+import {join, dirname} from "path"
+import fs from "fs"
+import {readVersions, resolveVersionType} from "./read-versions"
+import {getPkgManager} from "./helpers"
+import superjson from "superjson"
+
+const returnNpmEndpoint = (packageName: string) => {
+  return `https://registry.npmjs.org/-/package/${packageName}/dist-tags`
+}
+
+function getUpdateString(packageName: string, tag: string, isGlobal?: boolean) {
+  const pkgManager = getPkgManager()
+  switch (pkgManager) {
+    case "npm":
+      return `npm install${isGlobal ? " -g" : ""} ${packageName}@${tag}`
+    case "yarn":
+      return `yarn${isGlobal ? " global" : ""} add ${packageName}@${tag}`
+    case "pnpm":
+      return `pnpm install${isGlobal ? " -g" : ""} ${packageName}@${tag}`
+  }
+}
+const isInternalBlitzMonorepoDevelopment = fs.existsSync(
+  join(process.cwd(), "..", "..", "packages", "blitz", "dist", "chunks"),
+)
+
+async function findNodeModulesRoot(src: string) {
+  const blitzPkgLocation = dirname(
+    (await findUp("package.json", {
+      cwd: resolveFrom(src, "blitz"),
+    })) ?? "",
+  )
+
+  if (!blitzPkgLocation) {
+    throw new Error("Internal Blitz Error: unable to find 'blitz' package location")
+  }
+
+  return blitzPkgLocation.includes(".pnpm")
+    ? join(blitzPkgLocation, "../../../../")
+    : join(blitzPkgLocation, "../")
+}
+
+export async function checkLatestVersion() {
+  if (!isInternalBlitzMonorepoDevelopment) {
+    const fetch = await import("node-fetch")
+    const boxen = await import("boxen")
+    const versions = readVersions()
+    const nodeModulesRoot = await findNodeModulesRoot(process.cwd())
+    const dotBlitzCacheExists = fs.existsSync(
+      join(nodeModulesRoot, ".blitz", "checkUpdateCache.json"),
+    )
+    let dotBlitzCache
+    let shouldRun = true
+
+    if (dotBlitzCacheExists) {
+      dotBlitzCache = fs.readFileSync(join(nodeModulesRoot, ".blitz", "checkUpdateCache.json"))
+      const now = new Date()
+      const msBetweenTimes = Math.abs(
+        superjson.parse<{lastUpdated: Date}>(dotBlitzCache.toString()).lastUpdated.getTime() -
+          now.getTime(),
+      )
+      const hoursBetweenTimes = msBetweenTimes / (60 * 60 * 1000)
+      shouldRun = hoursBetweenTimes > 24
+    }
+
+    if (shouldRun) {
+      let errors: {message: string; instructions: string}[] = []
+      try {
+        const blitzResponse = await fetch.default(returnNpmEndpoint("blitz"))
+        const remoteBlitzVersions = (await blitzResponse.json()) as Record<string, string>
+
+        const blitzNextResponse = await fetch.default(returnNpmEndpoint("@blitzjs/next"))
+        const remoteBlitzNextVersions = (await blitzNextResponse.json()) as Record<string, string>
+
+        const blitzAuthResponse = await fetch.default(returnNpmEndpoint("@blitzjs/auth"))
+        const remoteBlitzAuthVersions = (await blitzAuthResponse.json()) as Record<string, string>
+
+        const blitzRpcResponse = await fetch.default(returnNpmEndpoint("@blitzjs/rpc"))
+        const remoteBlitzRpcVersions = (await blitzRpcResponse.json()) as Record<string, string>
+
+        for (const version of Object.entries(versions)) {
+          if (version[0] === "globalVersion") {
+            const versionType = resolveVersionType(version[1] as string)
+
+            if (remoteBlitzVersions.hasOwnProperty("beta") && versionType !== "beta") {
+              errors.push({
+                message: `blitz(global) (current) ${version[1]} -> (latest) ${remoteBlitzVersions["beta"]}`,
+                instructions: `${getUpdateString("blitz", "beta", true)}`,
+              })
+            } else if (remoteBlitzVersions[versionType] !== version[1]) {
+              errors.push({
+                message: `blitz(global) (current) ${version[1]} -> (latest) ${remoteBlitzVersions[versionType]}`,
+                instructions: `${getUpdateString("blitz", versionType, true)}`,
+              })
+            }
+          } else if (version[0] === "localVersions") {
+            for (const localVersion of Object.entries(version[1])) {
+              const versionType = resolveVersionType(localVersion[1] as string)
+
+              switch (localVersion[0]) {
+                case "blitz":
+                  if (remoteBlitzVersions.hasOwnProperty("beta") && versionType !== "beta") {
+                    errors.push({
+                      message: `blitz (current) ${localVersion[1]} -> (latest) ${remoteBlitzVersions["beta"]}`,
+                      instructions: `${getUpdateString("blitz", "beta", false)}`,
+                    })
+                  } else if (remoteBlitzVersions[versionType] !== localVersion[1]) {
+                    errors.push({
+                      message: `blitz (current) ${localVersion[1]} -> (latest) ${remoteBlitzVersions[versionType]}`,
+                      instructions: `${getUpdateString("blitz", versionType, false)}`,
+                    })
+                  }
+                  break
+                case "blitzAuth":
+                  if (remoteBlitzAuthVersions.hasOwnProperty("beta") && versionType !== "beta") {
+                    errors.push({
+                      message: `@blitzjs/auth (current) ${localVersion[1]} -> (latest) ${remoteBlitzAuthVersions["beta"]}`,
+                      instructions: `${getUpdateString("@blitzjs/auth", "beta", false)}`,
+                    })
+                  } else if (remoteBlitzAuthVersions[versionType] !== localVersion[1]) {
+                    errors.push({
+                      message: `@blitzjs/auth (current) ${localVersion[1]} -> (latest) ${remoteBlitzAuthVersions[versionType]}`,
+                      instructions: `${getUpdateString("@blitzjs/auth", versionType, false)}`,
+                    })
+                  }
+                  break
+                case "blitzNext":
+                  if (remoteBlitzNextVersions.hasOwnProperty("beta") && versionType !== "beta") {
+                    errors.push({
+                      message: `@blitzjs/next (current) ${localVersion[1]} -> (latest) ${remoteBlitzNextVersions["beta"]}`,
+                      instructions: `${getUpdateString("@blitzjs/next", "beta", false)}`,
+                    })
+                  } else if (remoteBlitzNextVersions[versionType] !== localVersion[1]) {
+                    errors.push({
+                      message: `@blitzjs/next (current) ${localVersion[1]} -> (latest) ${remoteBlitzNextVersions[versionType]}`,
+                      instructions: `${getUpdateString("@blitzjs/next", versionType, false)}`,
+                    })
+                  }
+                  break
+                case "blitzRpc":
+                  if (remoteBlitzRpcVersions.hasOwnProperty("beta") && versionType !== "beta") {
+                    errors.push({
+                      message: `@blitzjs/rpc (current) ${localVersion[1]} -> (latest) ${remoteBlitzRpcVersions["beta"]}`,
+                      instructions: `${getUpdateString("@blitzjs/rpc", "beta", false)}`,
+                    })
+                  } else if (remoteBlitzRpcVersions[versionType] !== localVersion[1]) {
+                    errors.push({
+                      message: `@blitzjs/rpc (current) ${localVersion[1]} -> (latest) ${remoteBlitzRpcVersions[versionType]}`,
+                      instructions: `${getUpdateString("@blitzjs/rpc", versionType, false)}`,
+                    })
+                  }
+                  break
+              }
+            }
+          }
+        }
+
+        console.log(
+          boxen.default(
+            `You are running outdated blitz packages\n\n ${errors
+              .map((e) => e.message)
+              .join("\n")} \n\n Run the following to update:\n ${errors
+              .map((e) => e.instructions)
+              .join("\n")}`,
+            {padding: 1},
+          ),
+        )
+
+        const dotBlitz = join(nodeModulesRoot, ".blitz")
+        fs.writeFileSync(
+          join(dotBlitz, "checkUpdateCache.json"),
+          superjson.stringify({lastUpdated: new Date()}),
+        )
+      } catch (err) {
+        if (err instanceof fetch.FetchError) {
+          // TODO: Check if network error and throw otherwise
+          // pass fetch error
+        } else {
+          console.log(err)
+        }
+      }
+    }
+  }
+}

packages/blitz/src/cli/utils/helpers.ts

@@ -0,0 +1,9 @@
+import {readdirSync} from "fs-extra"
+
+export function getPkgManager() {
+  return readdirSync(process.cwd()).includes("pnpm-lock.yaml")
+    ? "pnpm"
+    : readdirSync(process.cwd()).includes("yarn-lock.yaml")
+    ? "yarn"
+    : "npm"
+}