Version Packages (alpha) (#3653)

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

.all-contributorsrc

@@ -970,7 +970,9 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/3496193?v=4",
       "profile": "https://twitter.com/dillonraphael",
       "contributions": [
-        "code"
+        "code",
+        "doc",
+        "test"
       ]
     },
     {
@@ -3590,6 +3592,74 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "saadaltabari",
+      "name": "saadaltabari",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29986512?v=4",
+      "profile": "https://github.com/saadaltabari",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "iojcde",
+      "name": "Jeeho Ahn",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31413538?v=4",
+      "profile": "https://github.com/iojcde",
+      "contributions": [
+        "doc",
+        "tool",
+        "code"
+      ]
+    },
+    {
+      "login": "ryanwashburne",
+      "name": "Ryan Washburne",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12566087?v=4",
+      "profile": "https://linkedin.com/in/ryanwashburne",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "sherryxiao1988",
+      "name": "Shundan Xiao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1202426?v=4",
+      "profile": "https://github.com/sherryxiao1988",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "tommywong-dev",
+      "name": "tommywong-dev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/79971095?v=4",
+      "profile": "https://github.com/tommywong-dev",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "datner",
+      "name": "Datner",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22598347?v=4",
+      "profile": "https://github.com/datner",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "chaiwattsw",
+      "name": "Chaiwat Trisuwan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30198386?v=4",
+      "profile": "https://chaiwattsw.com/",
+      "contributions": [
+        "doc",
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/breezy-moose-behave.md

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

.changeset/calm-carpets-deny.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fixes the db seed command so that the database can disconnect after running the seed file.

.changeset/calm-nails-wait.md

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

.changeset/calm-tomatoes-drive.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Include `.env.test` file to the generator templates

.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/fair-carrots-guess.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fixes loading production env variables by default for blitz build command

.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/gorgeous-games-obey.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Avoid `invalid config detected` warnings by deleting `"blitz"` key from next config object

.changeset/great-terms-rescue.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Add BlitzServerMiddleware utility function to wrap middleware in blitz server file

.changeset/green-pillows-hammer.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Runs the codegen on the blitz build command

.changeset/happy-hotels-visit.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Add missing value to "skip" option when choosing a package manager during new app scaffolding

.changeset/hot-cups-rhyme.md

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

.changeset/light-donkeys-double.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Run `prisma generate` as a `blitz codegen` step if "prisma" is found in project's dependencies

.changeset/modern-ligers-behave.md

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

.changeset/ninety-rice-tickle.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Improve `blitz new` messaging and fix minor issues

.changeset/polite-lizards-love.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Passes the correct arguments (without flags) to any bin command ran with the blitz cli

.changeset/pre.json

@@ -23,7 +23,12 @@
   "changesets": [
     "big-phones-bow",
     "breezy-cameras-double",
+    "breezy-moose-behave",
     "bright-mangos-run",
+    "calm-carpets-deny",
+    "calm-nails-wait",
+    "calm-tomatoes-drive",
+    "clean-walls-wink",
     "cool-doors-invent",
     "cool-horses-check",
     "curly-seas-serve",
@@ -32,30 +37,40 @@
     "eleven-humans-sort",
     "empty-berries-rule",
     "empty-turkeys-wave",
+    "fair-carrots-guess",
     "fair-wombats-sneeze",
     "famous-kings-explain",
     "fast-trainers-kneel",
     "flat-bees-approve",
     "four-brooms-juggle",
     "four-meals-fry",
+    "four-sheep-judge",
+    "fuzzy-bees-warn",
     "fuzzy-jars-admire",
     "gentle-dogs-reply",
     "good-apes-drum",
     "good-insects-wink",
     "gorgeous-buses-scream",
+    "gorgeous-games-obey",
     "great-months-train",
+    "great-terms-rescue",
     "green-papayas-do",
+    "green-pillows-hammer",
+    "happy-hotels-visit",
     "healthy-rice-shout",
     "heavy-apes-judge",
+    "hot-cups-rhyme",
     "hot-drinks-approve",
     "hungry-baboons-swim",
     "late-steaks-give",
     "lemon-games-press",
     "lemon-seas-push",
+    "light-donkeys-double",
     "lovely-colts-share",
     "lucky-cows-try",
     "mean-gorillas-reply",
     "modern-cameras-pull",
+    "modern-ligers-behave",
     "moody-bags-walk",
     "moody-squids-cheer",
     "nervous-beds-travel",
@@ -67,48 +82,60 @@
     "nine-onions-admire",
     "ninety-lies-press",
     "ninety-pets-heal",
+    "ninety-rice-tickle",
     "olive-bees-buy",
     "olive-feet-rhyme",
     "olive-sheep-rhyme",
     "perfect-eyes-repeat",
     "plenty-bottles-swim",
+    "polite-lizards-love",
     "poor-peas-lick",
     "poor-penguins-look",
     "poor-shrimps-think",
     "popular-teachers-pay",
+    "pretty-games-march",
     "purple-singers-greet",
     "quick-cycles-confess",
     "quiet-feet-travel",
     "quiet-pans-hunt",
     "quiet-sloths-rule",
+    "red-badgers-retire",
     "rich-chairs-invent",
     "rich-queens-travel",
     "sharp-falcons-begin",
     "shy-olives-hang",
+    "shy-pumpkins-try",
     "silent-colts-reply",
     "silly-apricots-share",
+    "six-apricots-kick",
     "slimy-needles-taste",
     "slow-walls-poke",
     "small-socks-confess",
     "smooth-planets-admire",
+    "smooth-stingrays-drum",
     "soft-adults-smell",
     "sour-lemons-hunt",
+    "spicy-beds-float",
     "strong-apes-reply",
     "stupid-walls-sell",
     "sweet-kiwis-cross",
     "swift-drinks-dress",
     "tall-meals-learn",
     "tame-keys-reply",
+    "tasty-maps-fetch",
     "tasty-news-collect",
     "ten-hairs-listen",
     "ten-rivers-burn",
     "tender-pianos-check",
     "thick-parrots-float",
     "thirty-countries-build",
+    "three-lies-pull",
     "tidy-clouds-smoke",
+    "tough-toes-pull",
     "twelve-lemons-smile",
     "twenty-beans-pump",
     "two-carpets-rhyme",
+    "two-eyes-knock",
     "two-kiwis-help",
     "two-tigers-type",
     "unlucky-papayas-sleep",
@@ -116,6 +143,8 @@
     "violet-lions-help",
     "weak-suns-shave",
     "wicked-ghosts-cough",
-    "wise-frogs-give"
+    "wicked-rings-walk",
+    "wise-frogs-give",
+    "wise-rabbits-complain"
   ]
 }

.changeset/pretty-games-march.md

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

.changeset/red-badgers-retire.md

@@ -0,0 +1,8 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+Fixes peer dependency warnings

.changeset/shy-pumpkins-try.md

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

.changeset/six-apricots-kick.md

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

.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/spicy-beds-float.md

@@ -0,0 +1,8 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"blitz": patch
+"@blitzjs/generator": patch
+---
+Fixes the supports-color warning for pnpm

.changeset/tasty-maps-fetch.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix `enhancePrisma is undefined` errors by moving the utility function to a browser entrypoint

.changeset/three-lies-pull.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+moves zod to devDependencies

.changeset/tough-toes-pull.md

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

.changeset/two-eyes-knock.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Update new app templates to use blitz-rpc's resolver function

.changeset/wicked-rings-walk.md

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

.changeset/wise-rabbits-complain.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Mocks @blitzjs/auth instead of blitz inside the forgotPassword mutation test & hardcodes blitz package version types instead of just using the alpha tag.

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-388-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> <a href="https://github.com/blitz-js/blitz/commits?author=dillonraphael" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://github.com/clgeoio"><img src="https://avatars2.githubusercontent.com/u/37571416?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cody G</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=clgeoio" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=clgeoio" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://github.com/madflow"><img src="https://avatars0.githubusercontent.com/u/183248?v=4?s=100" width="100px;" alt=""/><br /><sub><b>madflow</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=madflow" title="Documentation">📖</a></td>
     <td align="center"><a href="https://twitter.com/nitaking_"><img src="https://avatars2.githubusercontent.com/u/10850034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Satoshi Nitawaki</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nitaking" title="Code">💻</a> <a href="#maintenance-nitaking" title="Maintenance">🚧</a> <a href="#question-nitaking" title="Answering Questions">💬</a> <a href="https://github.com/blitz-js/blitz/commits?author=nitaking" title="Documentation">📖</a></td>
@@ -741,6 +699,15 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <td align="center"><a href="https://github.com/c-ciobanu"><img src="https://avatars.githubusercontent.com/u/33382714?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cristi Ciobanu</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=c-ciobanu" title="Documentation">📖</a></td>
     <td align="center"><a href="https://arpitdalal.dev"><img src="https://avatars.githubusercontent.com/u/61059807?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Arpit Dalal</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=arpitdalal" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/robertrisch"><img src="https://avatars.githubusercontent.com/u/73828816?v=4?s=100" width="100px;" alt=""/><br /><sub><b>robertrisch</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=robertrisch" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/saadaltabari"><img src="https://avatars.githubusercontent.com/u/29986512?v=4?s=100" width="100px;" alt=""/><br /><sub><b>saadaltabari</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=saadaltabari" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=saadaltabari" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/iojcde"><img src="https://avatars.githubusercontent.com/u/31413538?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeeho Ahn</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=iojcde" title="Documentation">📖</a> <a href="#tool-iojcde" title="Tools">🔧</a> <a href="https://github.com/blitz-js/blitz/commits?author=iojcde" title="Code">💻</a></td>
+    <td align="center"><a href="https://linkedin.com/in/ryanwashburne"><img src="https://avatars.githubusercontent.com/u/12566087?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ryan Washburne</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=ryanwashburne" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/sherryxiao1988"><img src="https://avatars.githubusercontent.com/u/1202426?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shundan Xiao</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sherryxiao1988" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/tommywong-dev"><img src="https://avatars.githubusercontent.com/u/79971095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tommywong-dev</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tommywong-dev" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/datner"><img src="https://avatars.githubusercontent.com/u/22598347?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Datner</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Code">💻</a></td>
+    <td align="center"><a href="https://chaiwattsw.com/"><img src="https://avatars.githubusercontent.com/u/30198386?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chaiwat Trisuwan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Code">💻</a></td>
   </tr>
 </table>
 

apps/toolkit-app/.npmrc

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

apps/toolkit-app/package.json

@@ -28,8 +28,8 @@
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
-    "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.57",
+    "@prisma/client": "4.0.0",
+    "blitz": "workspace:2.0.0-alpha.66",
     "next": "12.2.0",
     "prisma": "4.0.0",
     "react": "18.0.0",

apps/web/.npmrc

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

apps/web/package.json

@@ -20,7 +20,7 @@
     "@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:*",

integration-tests/auth/package.json

@@ -16,7 +16,7 @@
     "@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.2.0",

integration-tests/no-suspense/package.json

@@ -16,7 +16,7 @@
     "@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.2.0",

integration-tests/qm/package.json

@@ -12,13 +12,13 @@
     "@blitzjs/config": "workspace:*",
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
-    "@prisma/client": "3.9.0",
+    "@prisma/client": "4.0.0",
+    "@tanstack/react-query": "4.0.10",
     "blitz": "workspace:*",
     "next": "12.2.0",
     "prisma": "4.0.0",
     "react": "18.0.0",
-    "react-dom": "18.0.0",
-    "react-query": "3.39.0"
+    "react-dom": "18.0.0"
   },
   "devDependencies": {
     "@testing-library/react": "13.0.0",

integration-tests/qm/test/__snapshots__/use-mutation.test.tsx.snap

@@ -2,4 +2,4 @@
 
 exports[`useMutation > useMutation calls the resolver with the argument > shouldn't work with query function 1`] = `"\\"useMutation\\" was expected to be called with a mutation but was called with a \\"query\\""`;
 
-exports[`useMutation > useMutation calls the resolver with the argument > shouldn't work with regular functions 1`] = `"Either the file path to your resolver is incorrect (must be in a \\"queries\\" or \\"mutations\\" folder that isn't nested inside \\"pages\\" or \\"api\\") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from \\"react-query\\")"`;
+exports[`useMutation > useMutation calls the resolver with the argument > shouldn't work with regular functions 1`] = `"Either the file path to your resolver is incorrect (must be in a \\"queries\\" or \\"mutations\\" folder that isn't nested inside \\"pages\\" or \\"api\\") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from \\"@tanstack/react-query\\")."`;

integration-tests/qm/test/__snapshots__/use-query.test.tsx.snap

@@ -1,5 +1,5 @@
 // Vitest Snapshot v1
 
-exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with mutation function 1`] = `"Cannot read properties of null (reading 'isReady')"`;
+exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with mutation function 1`] = `"\\"useQuery\\" was expected to be called with a query but was called with a \\"mutation\\""`;
 
-exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with regular functions 1`] = `"Cannot read properties of null (reading 'isReady')"`;
+exports[`useQuery > a "query" that converts the string parameter to uppercase > shouldn't work with regular functions 1`] = `"Either the file path to your resolver is incorrect (must be in a \\"queries\\" or \\"mutations\\" folder that isn't nested inside \\"pages\\" or \\"api\\") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from \\"@tanstack/react-query\\")."`;

integration-tests/qm/test/use-query.test.tsx

@@ -1,166 +1,190 @@
 import {describe, it, expect, beforeAll, vi} from "vitest"
 import {act, screen, waitForElementToBeRemoved, waitFor} from "@testing-library/react"
-import {useQuery, useInfiniteQuery} from "@blitzjs/rpc"
+import {useQuery, useInfiniteQuery, BlitzRpcPlugin, QueryClientProvider} from "@blitzjs/rpc"
 import React from "react"
 import delay from "delay"
-import {buildMutationRpc, buildQueryRpc, render} from "../../utils/blitz-test-utils"
+import {buildMutationRpc, buildQueryRpc, mockRouter, render} from "../../utils/blitz-test-utils"
+import {RouterContext} from "next/dist/shared/lib/router-context"
+
+beforeAll(() => {
+  globalThis.__BLITZ_SESSION_COOKIE_PREFIX = "qm-test-cookie-prefix"
+  globalThis.IS_REACT_ACT_ENVIRONMENT = true
+})
 
 describe("useQuery", () => {
-  it("Placeholder", async () => {
-    console.log("placeholder")
+  const setupHook = (
+    ID: string,
+    params: any,
+    queryFn: (...args: any) => any,
+    options: Parameters<typeof useQuery>[2] = {} as any,
+  ): [{data?: any; setQueryData?: any}, Function] => {
+    let res = {}
+    const qc = BlitzRpcPlugin({})
+
+    function TestHarness() {
+      const [data, {setQueryData}] = useQuery(queryFn, params, {
+        suspense: true,
+        ...options,
+      } as any)
+
+      Object.assign(res, {data, setQueryData})
+      return (
+        <div id={`harness-${ID}`}>
+          <span>{data ? `Ready${ID}` : "No data"}</span>
+          <span>{data}</span>
+        </div>
+      )
+    }
+
+    const ui = () => (
+      <React.Suspense fallback="Loading...">
+        <TestHarness />
+      </React.Suspense>
+    )
+
+    const {rerender} = render(ui(), {
+      wrapper: ({children}) => (
+        <QueryClientProvider client={globalThis.queryClient}>
+          <RouterContext.Provider value={mockRouter}>{children}</RouterContext.Provider>
+        </QueryClientProvider>
+      ),
+    })
+    return [res, () => rerender(ui())]
+  }
+
+  describe('a "query" that converts the string parameter to uppercase', () => {
+    const upcase = async (args: string) => {
+      await delay(500)
+      return args.toUpperCase()
+    }
+
+    it("should work with Blitz queries", async () => {
+      const [res] = setupHook("2", "test", buildQueryRpc(upcase))
+      await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
+      await act(async () => {
+        await screen.findByText("Ready2")
+        expect(res.data).toBe("TEST")
+      })
+    })
+
+    it("should be able to change the data with setQueryData", async () => {
+      const [res] = setupHook("3", "fooBar", buildQueryRpc(upcase))
+      await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
+      await act(async () => {
+        await screen.findByText("Ready3")
+        expect(res.data).toBe("FOOBAR")
+        res.setQueryData((p: string) => p.substr(3, 3), {refetch: false})
+        await delay(100)
+      })
+
+      expect(res.data).toBe("BAR")
+    })
+
+    it("shouldn't work with regular functions", () => {
+      console.error = vi.fn()
+      expect(() => setupHook("4", "test", upcase)).toThrowErrorMatchingSnapshot()
+    })
+
+    it("shouldn't work with mutation function", () => {
+      console.error = vi.fn()
+      expect(() => setupHook("5", "test", buildMutationRpc(upcase))).toThrowErrorMatchingSnapshot()
+    })
+
+    it("suspense disabled if enabled is false", async () => {
+      setupHook("6", "test", buildQueryRpc(upcase), {enabled: false})
+      await screen.findByText("No data")
+    })
+
+    it("suspense disabled if enabled is undefined", async () => {
+      setupHook("7", "test", buildQueryRpc(upcase), {enabled: undefined})
+      await screen.findByText("No data")
+    })
+
+    // it("suspense disabled if enabled is false and suspense set", async () => {
+    //   setupHook("8", "test", buildQueryRpc(upcase), {
+    //     enabled: false,
+    //     suspense: true,
+    //   })
+    //   await screen.findByText("No data")
+    // })
+
+    it("works with options other than enabled & suspense without type error", () => {
+      const Demo = () => {
+        useQuery(buildQueryRpc(upcase), undefined, {refetchInterval: 10000})
+        return <div></div>
+      }
+      const ui = () => <Demo />
+
+      const {rerender} = render(ui(), {
+        wrapper: ({children}) => (
+          <QueryClientProvider client={globalThis.queryClient}>
+            <RouterContext.Provider value={mockRouter}>{children}</RouterContext.Provider>
+          </QueryClientProvider>
+        ),
+      })
+    })
   })
 })
-// beforeAll(() => {
-//   globalThis.__BLITZ_SESSION_COOKIE_PREFIX = "qm-test-cookie-prefix"
-//   globalThis.IS_REACT_ACT_ENVIRONMENT = true
-// })
 
-// describe("useQuery", () => {
-//   const setupHook = (
-//     params: any,
-//     queryFn: (...args: any) => any,
-//     options: Parameters<typeof useQuery>[2] = {} as any,
-//   ): [{data?: any; setQueryData?: any}, Function] => {
-//     let res = {}
-//     function TestHarness() {
-//       const [data, {setQueryData}] = useQuery(queryFn, params, {
-//         suspense: true,
-//         ...options,
-//       } as any)
-//       Object.assign(res, {data, setQueryData})
-//       return (
-//         <div id="harness">
-//           <span>{data ? "Ready" : "No data"}</span>
-//           <span>{data}</span>
-//         </div>
-//       )
-//     }
+describe("useInfiniteQuery", () => {
+  const setupHook = (
+    ID: string,
+    params: (arg?: any) => any,
+    queryFn: (...args: any) => any,
+  ): [{data?: any; setQueryData?: any}, Function] => {
+    let res = {}
+    const qc = BlitzRpcPlugin({})
 
-//     const ui = () => (
-//       <React.Suspense fallback="Loading...">
-//         <TestHarness />
-//       </React.Suspense>
-//     )
+    function TestHarness() {
+      // TODO - fix typing
+      //@ts-ignore
+      const [groupedData] = useInfiniteQuery(queryFn, params, {
+        suspense: true,
+        getNextPageParam: () => {},
+      })
+      Object.assign(res, {groupedData})
+      return (
+        <div id="harness">
+          <span>{groupedData ? `Ready${ID}` : "No data"}</span>
+          <div>
+            {groupedData.map((data: any, i) => (
+              <div key={i}>{data}</div>
+            ))}
+          </div>
+        </div>
+      )
+    }
 
-//     const {rerender} = render(ui())
-//     return [res, () => rerender(ui())]
-//   }
+    const ui = () => (
+      <React.Suspense fallback={`Loading${ID}...`}>
+        <TestHarness />
+      </React.Suspense>
+    )
 
-//   describe('a "query" that converts the string parameter to uppercase', () => {
-//     const upcase = async (args: string) => {
-//       await delay(1000)
-//       return args.toUpperCase()
-//     }
-//     it("should work with Blitz queries", async () => {
-//       const [res] = setupHook("test", buildQueryRpc(upcase))
-//       await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
-//       await act(async () => {
-//         await screen.findByText("Ready")
-//         expect(res.data).toBe("TEST")
-//       })
-//     })
+    const {rerender} = render(ui(), {
+      wrapper: ({children}) => (
+        <QueryClientProvider client={globalThis.queryClient}>
+          <RouterContext.Provider value={mockRouter}>{children}</RouterContext.Provider>
+        </QueryClientProvider>
+      ),
+    })
+    return [res, () => rerender(ui())]
+  }
 
-//     it("should be able to change the data with setQueryData", async () => {
-//       const [res] = setupHook("test", buildQueryRpc(upcase))
-//       await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
-//       await act(async () => {
-//         await screen.findByText("Ready")
-//         expect(res.data).toBe("TEST")
-//         res.setQueryData((p: string) => p.substr(1, 2), {refetch: false})
-//         await waitFor(() => screen.getByText("ES"))
-//       })
-//     })
-
-//     it("shouldn't work with regular functions", () => {
-//       console.error = vi.fn()
-//       expect(() => setupHook("test", upcase)).toThrowErrorMatchingSnapshot()
-//     })
-
-//     it("shouldn't work with mutation function", () => {
-//       console.error = vi.fn()
-//       expect(() => setupHook("test", buildMutationRpc(upcase))).toThrowErrorMatchingSnapshot()
-//     })
-
-//     it("suspense disabled if enabled is false", async () => {
-//       setupHook("test", buildQueryRpc(upcase), {enabled: false})
-//       await screen.findByText("No data")
-//     })
-
-//     it("suspense disabled if enabled is undefined", async () => {
-//       setupHook("test", buildQueryRpc(upcase), {enabled: undefined})
-//       await screen.findByText("No data")
-//     })
-
-//     it("suspense disabled if enabled is false and suspense set", async () => {
-//       setupHook("test", buildQueryRpc(upcase), {
-//         enabled: false,
-//         suspense: true,
-//       })
-//       await screen.findByText("No data")
-//     })
-//   })
-
-//   // it("works with options other than enabled & suspense without type error", () => {
-//   //   const queryFn = ((() => true) as unknown) as () => Promise<boolean>
-//   //   useQuery(queryFn, undefined, {refetchInterval: 10000})
-//   // })
-// })
-
-// describe("useInfiniteQuery", () => {
-//   const setupHook = (
-//     params: (arg?: any) => any,
-//     queryFn: (...args: any) => any,
-//   ): [{data?: any; setQueryData?: any}, Function] => {
-//     let res = {}
-//     function TestHarness() {
-//       // TODO - fix typing
-//       //@ts-ignore
-//       const [groupedData] = useInfiniteQuery(queryFn, params, {
-//         suspense: true,
-//         getNextPageParam: () => {},
-//       })
-//       Object.assign(res, {groupedData})
-//       return (
-//         <div id="harness">
-//           <span>{groupedData ? "Ready" : "No data"}</span>
-//           <div>
-//             {groupedData.map((data: any, i) => (
-//               <div key={i}>{data}</div>
-//             ))}
-//           </div>
-//         </div>
-//       )
-//     }
-
-//     const ui = () => (
-//       <React.Suspense fallback="Loading...">
-//         <TestHarness />
-//       </React.Suspense>
-//     )
-
-//     const {rerender} = render(ui())
-//     return [res, () => rerender(ui())]
-//   }
-
-//   const getItems = ({id}: {id: number}) => {
-//     if (id === 1) {
-//       return "item1"
-//     } else if (id === 2) {
-//       return "item2"
-//     } else {
-//       throw new Error("No item for this id")
-//     }
-//   }
-//   it("should work", async () => {
-//     setupHook(() => ({id: 1}), buildQueryRpc(getItems))
-//     await waitForElementToBeRemoved(() => screen.getByText("Loading..."))
-//     await act(async () => {
-//       await screen.findByText("item1")
-//     })
-
-//     setupHook(() => ({id: 2}), buildQueryRpc(getItems))
-//     await act(async () => {
-//       await screen.findByText("item2")
-//     })
-//   })
-// })
+  const getItems = ({id}: {id: number}) => {
+    if (id === 1) {
+      return "item1"
+    } else if (id === 2) {
+      return "item2"
+    } else {
+      throw new Error("No item for this id")
+    }
+  }
+  it("should show loading", async () => {
+    setupHook("1", () => ({id: 1}), buildQueryRpc(getItems))
+    await waitForElementToBeRemoved(() => screen.getByText("Loading1..."))
+    await act(async () => {
+      await screen.findByText("item1")
+    })
+  })
+})

integration-tests/trailing-slash/package.json

@@ -19,7 +19,7 @@
     "@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.2.0",

integration-tests/utils/blitz-test-utils.tsx

@@ -1,11 +1,12 @@
-import {render as defaultRender} from "@testing-library/react"
-import {NextRouter} from "next/router"
-import {vi} from "vitest"
-import {QueryClient, QueryClientProvider} from "react-query"
 import React from "react"
-import {BlitzRpcPlugin} from "@blitzjs/rpc"
+import {vi} from "vitest"
+import {QueryClient} from "@tanstack/react-query"
+import {BlitzRpcPlugin, QueryClientProvider} from "@blitzjs/rpc"
+import {NextRouter} from "next/router"
+import {RouterContext} from "next/dist/shared/lib/router-context"
+import {render as defaultRender} from "@testing-library/react"
 
-const mockRouter: NextRouter = {
+export const mockRouter: NextRouter = {
   basePath: "",
   pathname: "/",
   route: "/",
@@ -56,8 +57,6 @@ const BlitzProvider = ({
 
   return children
 }
-export const RouterContext = React.createContext(null as any)
-RouterContext.displayName = "RouterContext"
 const compose =
   (...rest) =>
   (x: React.ComponentType<any>) =>

integration-tests/utils/next-webdriver.d.ts

@@ -1,34 +1,24 @@
-interface ChainMethods {
-  elementByCss: (selector: string) => Chain<Element>
-  elementById: () => Chain<Element>
-  getValue: () => Chain<any>
-  text: () => Chain<string>
-  type: () => Chain<any>
-  moveTo: () => Chain<any>
-  getComputedCss: () => Chain<any>
-  getAttribute: () => Chain<any>
-  hasElementByCssSelector: () => Chain<any>
-  click: () => Chain<any>
-  elementsByCss: () => Chain<Element[]>
-  waitForElementByCss: (arg: string) => Chain<any>
-  eval: (evalStr: string) => Chain<any>
-  log: () => Chain<any>
-  url: () => Chain<any>
-  back: () => Chain<any>
-  forward: () => Chain<any>
-  refresh: () => Chain<any>
-  setDimensions: (opts: {height: number; width: number}) => Chain<any>
-  close: () => Chain<any>
-  quit: () => Chain<any>
-}
-
-interface Chain<T> extends Promise<T & ChainMethods>, ChainMethods {}
-
-type Browser = {__brand: "Browser"}
-
-export default function (
-  appPort: number,
-  path: string,
-  waitHydration?: boolean,
-  allowHydrationRetry?: boolean,
-): Promise<Chain<Browser>>
+import {BrowserInterface} from "./browsers/base"
+export declare const USE_SELENIUM: boolean
+/**
+ *
+ * @param appPortOrUrl can either be the port or the full URL
+ * @param url the path/query to append when using appPort
+ * @param options.waitHydration whether to wait for react hydration to finish
+ * @param options.retryWaitHydration allow retrying hydration wait if reload occurs
+ * @param options.disableCache disable cache for page load
+ * @param options.beforePageLoad the callback receiving page instance before loading page
+ * @returns thenable browser instance
+ */
+export default function webdriver(
+  appPortOrUrl: string | number,
+  url: string,
+  options?: {
+    waitHydration?: boolean
+    retryWaitHydration?: boolean
+    disableCache?: boolean
+    beforePageLoad?: (page: any) => void
+    locale?: string
+  },
+): Promise<BrowserInterface>
+//# sourceMappingURL=next-webdriver.d.ts.map

integration-tests/utils/package.json

@@ -5,6 +5,7 @@
   "devDependencies": {
     "@blitzjs/config": "workspace: *",
     "@blitzjs/rpc": "workspace: *",
+    "@tanstack/react-query": "4.0.10",
     "@testing-library/react": "13.0.0",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
@@ -23,7 +24,6 @@
     "playwright-chromium": "1.14.1",
     "react": "18.0.0",
     "react-dom": "18.0.0",
-    "react-query": "3.39.0",
     "resolve-cwd": "3.0.0",
     "resolve-from": "5.0.0",
     "rimraf": "3.0.2",

package.json

@@ -38,5 +38,10 @@
     "wait-on": "6.0.1"
   },
   "npmClient": "pnpm",
-  "packageManager": "pnpm@7.4.0-1"
+  "packageManager": "pnpm@7.4.0-1",
+  "manypkg": {
+    "ignoredRules": [
+      "EXTERNAL_MISMATCH"
+    ]
+  }
 }

packages/blitz-auth/CHANGELOG.md

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

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.57",
+  "version": "2.0.0-alpha.66",
   "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.57",
+    "blitz": "2.0.0-alpha.66",
     "cookie": "0.4.1",
     "cookie-session": "2.0.0",
     "debug": "4.3.3",
@@ -36,10 +36,11 @@
     "passport": "0.5.2",
     "path": "0.12.7",
     "secure-password": "4.0.0",
+    "supports-color": "8.1.1",
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.57",
+    "@blitzjs/config": "workspace:2.0.0-alpha.66",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/cookie": "0.4.1",
@@ -50,7 +51,7 @@
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
+    "unbuild": "0.7.6",
     "watch": "1.0.2"
   },
   "publishConfig": {

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/passport-adapter.ts

@@ -11,6 +11,7 @@ import {
   RequestMiddleware,
   MiddlewareResponse,
   secureProxyMiddleware,
+  truncateString,
 } from "blitz"
 import {IncomingMessage, ServerResponse} from "http"
 import {PublicData, SessionContext} from "../shared"
@@ -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-next/CHANGELOG.md

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

packages/blitz-next/build.config.ts

@@ -2,7 +2,7 @@ import {BuildConfig} from "unbuild"
 
 const config: BuildConfig = {
   entries: ["./src/index-browser", "./src/index-server"],
-  externals: ["index-browser.cjs", "index-browser.mjs", "blitz", ".blitz"],
+  externals: ["index-browser.cjs", "index-browser.mjs", "blitz", ".blitz", "next", "react"],
   declaration: true,
   rollup: {
     emitCJS: true,

packages/blitz-next/jest/index.js

@@ -21,6 +21,7 @@ function createJestConfigForNext(options) {
         // This ensures any path aliases in tsconfig also work in jest
         ...pathsToModuleNameMapper(
           (tsConfig && tsConfig.compilerOptions && tsConfig.compilerOptions.paths) || {},
+          {prefix: "<rootDir>/"},
         ),
         "\\.(jpg|jpeg|png|gif|webp|ico)$": path.resolve(__dirname, "./jest-preset/image-mock.js"),
       },

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.57",
+  "version": "2.0.0-alpha.66",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,16 +24,17 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.57",
+    "@blitzjs/rpc": "2.0.0-alpha.66",
+    "@tanstack/react-query": "4.0.10",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
     "hoist-non-react-statics": "3.3.2",
-    "react-query": "3.39.0",
-    "superjson": "1.8.0"
+    "superjson": "1.8.0",
+    "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.57",
+    "@blitzjs/config": "workspace:2.0.0-alpha.66",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -43,7 +44,7 @@
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.57",
+    "blitz": "2.0.0-alpha.66",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "next": "12.2.0",
@@ -52,14 +53,10 @@
     "resolve-from": "5.0.0",
     "ts-jest": "27.1.4",
     "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
+    "unbuild": "0.7.6",
     "watch": "1.0.2"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "peerDependencies": {
-    "next": ">=12.2.0",
-    "react": "*"
   }
 }

packages/blitz-next/src/global.ts

@@ -1,4 +1,4 @@
-import {QueryClient} from "react-query"
+import {QueryClient} from "@tanstack/react-query"
 
 declare global {
   var queryClient: QueryClient

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

@@ -7,8 +7,7 @@ import type {
 } from "blitz"
 import Head from "next/head"
 import React, {ReactNode} from "react"
-import {QueryClient, QueryClientProvider} from "react-query"
-import {Hydrate, HydrateOptions} from "react-query/hydration"
+import {QueryClient, QueryClientProvider, Hydrate, HydrateOptions} from "@tanstack/react-query"
 import {withSuperJSONPage} from "./superjson"
 import {Ctx} from "blitz"
 import {UrlObject} from "url"
@@ -19,6 +18,7 @@ import {RouterContext} from "./router-context"
 export * from "./error-boundary"
 export * from "./error-component"
 export * from "./use-params"
+export * from "./router-context"
 export {Routes} from ".blitz"
 
 const compose =

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

@@ -25,7 +25,7 @@ import {
   InstallWebpackConfigOptions,
   ResolverPathOptions,
 } from "@blitzjs/rpc"
-import {DefaultOptions, QueryClient} from "react-query"
+import {DefaultOptions, QueryClient} from "@tanstack/react-query"
 import {IncomingMessage, ServerResponse} from "http"
 import {withSuperJsonProps} from "./superjson"
 import {ParsedUrlQuery} from "querystring"
@@ -40,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>[]
@@ -74,11 +74,11 @@ 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,
@@ -151,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)
@@ -207,7 +209,8 @@ export function withBlitz(nextConfig: BlitzConfig = {}) {
     },
   })
 
-  return config
+  const {blitz, ...rest} = config
+  return rest
 }
 
 export type PrefetchQueryFn = <T extends AsyncFunc, TInput = FirstParam<T>>(

packages/blitz-rpc/CHANGELOG.md

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

packages/blitz-rpc/build.config.ts

@@ -14,6 +14,9 @@ const config: BuildConfig = {
     "index-server.cjs",
     "index-server.mjs",
     "react",
+    "blitz",
+    "next",
+    "zod",
   ],
   declaration: true,
   rollup: {

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.57",
+  "version": "2.0.0-alpha.66",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts && wait-on -d 250 ../blitz-auth/dist/index-browser.d.ts",
@@ -20,31 +20,28 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/auth": "2.0.0-alpha.57",
+    "@blitzjs/auth": "2.0.0-alpha.66",
+    "@tanstack/react-query": "4.0.10",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
     "chalk": "^4.1.0",
     "debug": "4.3.3",
-    "react-query": "3.39.0",
     "superjson": "1.8.0",
-    "zod": "3.17.3"
+    "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.57",
+    "@blitzjs/config": "workspace:2.0.0-alpha.66",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.57",
+    "blitz": "2.0.0-alpha.66",
     "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
-    "watch": "1.0.2"
-  },
-  "peerDependencies": {
-    "blitz": "2.0.0-alpha.57",
-    "next": ">=12.2.0"
+    "unbuild": "0.7.6",
+    "watch": "1.0.2",
+    "zod": "3.17.3"
   },
   "publishConfig": {
     "access": "public"

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

@@ -8,7 +8,11 @@ export {
   setQueryData,
   getQueryClient,
 } from "./react-query-utils"
-export {useQueryErrorResetBoundary, QueryClient} from "react-query"
-export {dehydrate} from "react-query/hydration"
+export {
+  useQueryErrorResetBoundary,
+  QueryClientProvider,
+  QueryClient,
+  dehydrate,
+} from "@tanstack/react-query"
 export {invoke} from "./invoke"
 export {invokeWithCtx} from "./invokeWithCtx"

packages/blitz-rpc/src/data-client/react-query-utils.ts

@@ -1,4 +1,4 @@
-import {QueryClient, QueryKey} from "react-query"
+import {QueryClient} from "@tanstack/react-query"
 import {serialize} from "superjson"
 import {isClient, isServer, AsyncFunc} from "blitz"
 import {ResolverType, RpcClient} from "./rpc"
@@ -94,7 +94,7 @@ export const validateQueryFn = <TInput, TResult>(
 ) => {
   if (isClient && !isRpcClient(queryFn) && isNotInUserTestEnvironment()) {
     throw new Error(
-      `Either the file path to your resolver is incorrect (must be in a "queries" or "mutations" folder that isn't nested inside "pages" or "api") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from "react-query")`,
+      `Either the file path to your resolver is incorrect (must be in a "queries" or "mutations" folder that isn't nested inside "pages" or "api") or you are trying to use Blitz's useQuery to fetch from third-party APIs (to do that, import useQuery directly from "@tanstack/react-query").`,
     )
   }
 }
@@ -169,14 +169,7 @@ export function invalidateQuery<TInput, TResult, T extends AsyncFunc>(
   }
 
   const fullQueryKey = getQueryKey(resolver, params)
-  let queryKey: QueryKey
-  if (params) {
-    queryKey = fullQueryKey
-  } else {
-    // Params not provided, only use first query key item (url)
-    queryKey = fullQueryKey[0]
-  }
-  return getQueryClient().invalidateQueries(queryKey)
+  return getQueryClient().invalidateQueries(fullQueryKey)
 }
 
 export function setQueryData<TInput, TResult, T extends AsyncFunc>(

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

@@ -9,7 +9,7 @@ import {
   useMutation as useReactQueryMutation,
   UseMutationOptions,
   UseMutationResult,
-} from "react-query"
+} from "@tanstack/react-query"
 import {useSession} from "@blitzjs/auth"
 import {isServer, FirstParam, PromiseReturnType, AsyncFunc} from "blitz"
 import {
@@ -85,14 +85,14 @@ 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,
   })
 
   if (
-    queryRest.isIdle &&
+    queryRest.fetchStatus === "idle" &&
     isServer &&
     suspenseEnabled !== false &&
     !data &&
@@ -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,
@@ -178,7 +178,7 @@ export function usePaginatedQuery<
   })
 
   if (
-    queryRest.isIdle &&
+    queryRest.fetchStatus === "idle" &&
     isServer &&
     suspenseEnabled !== false &&
     !data &&
@@ -267,17 +267,15 @@ 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,
   })
 
   if (
-    queryRest.isIdle &&
+    queryRest.fetchStatus === "idle" &&
     isServer &&
     suspenseEnabled !== false &&
     !data &&

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

@@ -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/global.ts

@@ -1,4 +1,4 @@
-import {QueryClient} from "react-query"
+import {QueryClient} from "@tanstack/react-query"
 
 declare global {
   var queryClient: QueryClient

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

@@ -1,6 +1,6 @@
 import "./global"
 import {createClientPlugin} from "blitz"
-import {DefaultOptions, QueryClient} from "react-query"
+import {DefaultOptions, QueryClient} from "@tanstack/react-query"
 
 export * from "./data-client/index"
 
@@ -21,7 +21,7 @@ export const BlitzRpcPlugin = createClientPlugin<BlitzRpcOptions, {queryClient:
           ...reactQueryOptions,
           queries: {
             ...(typeof window === "undefined" && {cacheTime: 0}),
-            retry: (failureCount, error: any) => {
+            retry: (failureCount: number, error: any) => {
               if (process.env.NODE_ENV !== "production") return false
 
               // Retry (max. 3 times) only if network error detected

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

@@ -68,6 +68,11 @@ interface WebpackRule {
 
 export interface InstallWebpackConfigOptions {
   webpackConfig: {
+    resolve: {
+      alias: {
+        [key: string]: boolean
+      }
+    }
     module: {
       rules: WebpackRule[]
     }
@@ -79,6 +84,8 @@ export function installWebpackConfig({
   webpackConfig,
   webpackRuleOptions,
 }: InstallWebpackConfigOptions) {
+  webpackConfig.resolve.alias["npm-which"] = false
+  webpackConfig.resolve.alias["cross-spawn"] = false
   webpackConfig.module.rules.push({
     test: /[\\/]\[\[\.\.\.blitz]]\.[jt]sx?$/,
     use: [

packages/blitz/CHANGELOG.md

@@ -1,5 +1,83 @@
 # blitz
 
+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- 928e840b: Fixes loading production env variables by default for blitz build command
+- 240f3f34: Add BlitzServerMiddleware utility function to wrap middleware in blitz server file
+- 55b1cb20: Runs the codegen on the blitz build command
+- 4d7d126d: Run `prisma generate` as a `blitz codegen` step if "prisma" is found in project's dependencies
+- 890b0c0c: Improve `blitz new` messaging and fix minor issues
+- 807a2b56: Fixes peer dependency warnings
+- a3e6c49c: Fixes the supports-color warning for pnpm
+- Updated dependencies [91aa5356]
+- Updated dependencies [890b0c0c]
+- Updated dependencies [807a2b56]
+- Updated dependencies [a3e6c49c]
+- Updated dependencies [065db256]
+- Updated dependencies [f202aac1]
+  - @blitzjs/generator@2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+### Patch Changes
+
+- dd5f5174: Fix `enhancePrisma is undefined` errors by moving the utility function to a browser entrypoint
+  - @blitzjs/generator@2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+### Patch Changes
+
+- 54db8a46: Add missing value to "skip" option when choosing a package manager during new app scaffolding
+- 62bf12b5: Fix blitz codegen to work with monorepos
+  - @blitzjs/generator@2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+### Patch Changes
+
+- 365e6709: Fixes the db seed command so that the database can disconnect after running the seed file.
+  - @blitzjs/generator@2.0.0-alpha.62
+
+## 2.0.0-alpha.61
+
+### Patch Changes
+
+- 240f378b: Passes the correct arguments (without flags) to any bin command ran with the blitz cli
+  - @blitzjs/generator@2.0.0-alpha.61
+
+## 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

packages/blitz/build.config.ts

@@ -2,7 +2,7 @@ import {BuildConfig} from "unbuild"
 
 const config: BuildConfig = {
   entries: ["./src/index-browser", "./src/index-server", "./src/cli/index"],
-  externals: ["index-browser.cjs", "index-browser.mjs", "index.cjs", "zod"],
+  externals: ["index-browser.cjs", "index-browser.mjs", "index.cjs", "zod", "react"],
   declaration: true,
   rollup: {
     emitCJS: true,

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-alpha.57",
+  "version": "2.0.0-alpha.66",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.57",
+    "@blitzjs/generator": "2.0.0-alpha.66",
     "arg": "5.0.1",
     "boxen": "7.0.0",
     "chalk": "^4.1.0",
@@ -48,13 +48,14 @@
     "resolve-cwd": "3.0.0",
     "resolve-from": "5.0.0",
     "superjson": "1.8.0",
+    "supports-color": "8.1.1",
     "ts-node": "10.7.0",
     "tsconfig-paths": "4.0.0",
     "tslog": "3.3.1",
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.57",
+    "@blitzjs/config": "workspace:2.0.0-alpha.66",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",
@@ -74,13 +75,10 @@
     "react": "18.0.0",
     "test-listen": "1.1.0",
     "typescript": "^4.5.3",
-    "unbuild": "0.6.9",
+    "unbuild": "0.7.6",
     "watch": "1.0.2",
     "zod": "3.17.3"
   },
-  "peerDependencies": {
-    "react": "*"
-  },
   "publishConfig": {
     "access": "public"
   }

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

@@ -1,37 +1,14 @@
 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"
+import {codegenTasks} from "../utils/codegen-tasks"
 
 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)
+    await codegenTasks()
+    process.exit(0)
   } catch (err) {
     console.log(err)
+    process.exit(1)
   }
-
-  try {
-    await generateManifest()
-  } catch (err) {
-    console.log(err)
-  }
-
-  process.exit(0)
 }
 
 export {codegen}

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

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

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

@@ -6,20 +6,18 @@ import hasbin from "hasbin"
 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"
+import {runPrisma} from "../../run-prisma"
 
-const forms = {
-  "react-final-form": "React Final Form" as const,
-  "react-hook-form": "React Hook Form" as const,
-  formik: "Formik" as const,
+const forms: Record<AppGeneratorOptions["form"], string> = {
+  finalform: "React Final Form (recommended)",
+  hookform: "React Hook Form",
+  formik: "Formik",
 }
 
-type TForms = keyof typeof forms
-
 const language = {
   typescript: "TypeScript",
-  javascript: "Javascript",
+  javascript: "JavaScript",
 }
 
 type TLanguage = keyof typeof language
@@ -75,7 +73,7 @@ const args = arg(
 let projectName: string = ""
 let projectPath: string = ""
 let projectLanguage: string | TLanguage = ""
-let projectFormLib: AppGeneratorOptions["form"] = undefined
+let projectFormLib: AppGeneratorOptions["form"] = "finalform"
 let projectTemplate: AppGeneratorOptions["template"] = templates.full
 let projectPkgManger: TPkgManager = PREFERABLE_PKG_MANAGER
 let shouldInstallDeps: boolean = true
@@ -110,7 +108,7 @@ const determineLanguage = async () => {
     const res = await prompts({
       type: "select",
       name: "language",
-      message: "Pick which language you'd like to use for your new blitz project",
+      message: "Pick a new project's language",
       initial: 0,
       choices: Object.entries(language).map((c) => {
         return {title: c[1], value: c[1]}
@@ -129,16 +127,16 @@ const determineFormLib = async () => {
     const res = await prompts({
       type: "select",
       name: "form",
-      message: "Pick which form you'd like to use for your new blitz project",
+      message: "Pick a form library (you can switch to something else later if you want)",
       initial: 0,
       choices: Object.entries(forms).map((c) => {
-        return {title: c[1], value: c[1]}
+        return {value: c[0], title: c[1]}
       }),
     })
 
     projectFormLib = res.form
   } else {
-    projectFormLib = forms[args["--form"] as TForms]
+    projectFormLib = args["--form"] as AppGeneratorOptions["form"]
   }
 }
 
@@ -148,14 +146,17 @@ const determineTemplate = async () => {
     !args["--template"] ||
     (args["--template"] && !Object.keys(templates).includes(args["--template"].toLowerCase()))
   ) {
+    const choices: Array<{value: keyof typeof templates; title: string}> = [
+      {value: "full", title: "Full - includes DB and auth (Recommended)"},
+      {value: "minimal", title: "Minimal — no DB, no auth"},
+    ]
+
     const res = await prompts({
       type: "select",
       name: "template",
-      message: "Pick which template you'd like to use for your new blitz project",
+      message: "Pick your new app template",
       initial: 0,
-      choices: Object.entries(templates).map((c) => {
-        return {title: c[0], value: c[0]}
-      }),
+      choices,
     })
 
     projectTemplate = templates[res.template as TTemplate]
@@ -199,11 +200,15 @@ const determinePkgManagerToInstallDeps = async () => {
           {title: "npm", value: "npm"},
           {title: "yarn", value: "yarn", disabled: !IS_YARN_INSTALLED},
           {title: "pnpm", value: "pnpm", disabled: !IS_PNPM_INSTALLED},
-          {title: "skip"},
+          {title: "skip", value: "skip"},
         ],
       })
 
-      projectPkgManger = res.pkgManager
+      if (res.pkgManager === "skip") {
+        projectPkgManger = PREFERABLE_PKG_MANAGER
+      } else {
+        projectPkgManger = res.pkgManager
+      }
 
       shouldInstallDeps = res.pkgManager !== "skip"
     } else {

packages/blitz/src/cli/commands/next/build.ts

@@ -15,7 +15,7 @@ const build: CliCommand = async () => {
   const config: ServerConfig = {
     rootFolder: process.cwd(),
     inspect: nextArgs["--inspect"],
-    env: process.env.NODE_ENV === "production" ? "prod" : "dev",
+    env: "prod",
   }
 
   await import("../../utils/next-commands").then((i) => i.build(config))

packages/blitz/src/cli/index.ts

@@ -63,6 +63,7 @@ async function runCommandFromBin() {
     process.exit(1)
   }
   let commandBin: string | null = null
+
   try {
     commandBin = await getCommandBin(args._[0])
   } catch (e: any) {
@@ -73,7 +74,7 @@ async function runCommandFromBin() {
     process.exit(1)
   }
 
-  const result = spawn.sync(commandBin, process.argv.slice(3), {stdio: "inherit"})
+  const result = spawn.sync(commandBin, args._.slice(1), {stdio: "inherit"})
   process.exit(result.status || 0)
 }
 
@@ -120,17 +121,15 @@ async function printEnvInfo() {
 }
 
 async function main() {
-  loadEnvConfig(process.cwd(), undefined, {error: console.error, info: console.info})
+  if (args["--env"]) {
+    process.env.APP_ENV = args["--env"]
+  }
 
   // Version is inlined into the file using taskr build pipeline
   if (args["_"].length === 0 && args["--version"]) {
     await printEnvInfo()
   }
 
-  if (args["--env"]) {
-    process.env.APP_ENV = args["--env"]
-  }
-
   if (args["--help"]) {
     forwardedArgs.push("--help")
   }
@@ -145,7 +144,7 @@ async function main() {
   }
 
   process.env.NODE_ENV = process.env.NODE_ENV || defaultEnv
-
+  loadEnvConfig(process.cwd(), undefined, {error: console.error, info: console.info})
   // Make sure commands gracefully respect termination signals (e.g. from Docker)
   process.on("SIGTERM", () => process.exit(0))
   process.on("SIGINT", () => process.exit(0))

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

@@ -5,6 +5,7 @@ import fs from "fs"
 import {readVersions, resolveVersionType} from "./read-versions"
 import {getPkgManager} from "./helpers"
 import superjson from "superjson"
+import {isInternalBlitzMonorepoDevelopment} from "./helpers"
 
 const returnNpmEndpoint = (packageName: string) => {
   return `https://registry.npmjs.org/-/package/${packageName}/dist-tags`
@@ -21,9 +22,6 @@ function getUpdateString(packageName: string, tag: string, isGlobal?: boolean) {
       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(

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

@@ -0,0 +1,54 @@
+import {generateManifest} from "./routes-manifest"
+import {log} from "../../logging"
+import resolveCwd from "resolve-cwd"
+import {join} from "path"
+import fs from "fs-extra"
+import {getPackageJson} from "./get-package-json"
+import {runPrisma} from "../../run-prisma"
+
+export const codegenTasks = 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)
+    log.success("Next.js was successfully patched with a React Suspense fix")
+  } catch (err) {
+    log.error(JSON.stringify(err, null, 2))
+  }
+
+  try {
+    await generateManifest()
+    log.success("Routes manifest was successfully generated")
+
+    const {dependencies, devDependencies} = await getPackageJson()
+
+    const hasPrisma = Object.keys({...dependencies, ...devDependencies}).some(
+      (name) => name === "prisma",
+    )
+
+    if (hasPrisma) {
+      let prismaSpinner = log.spinner(`Generating Prisma client`).start()
+      const result = await runPrisma(["generate"], true)
+      if (result.success) {
+        prismaSpinner.succeed()
+      } else {
+        prismaSpinner.fail()
+        console.log("\n" + result.stderr)
+        process.exit(1)
+      }
+    }
+  } catch (err) {
+    log.error(JSON.stringify(err, null, 2))
+  }
+}

packages/blitz/src/cli/utils/get-package-json.ts

@@ -0,0 +1,11 @@
+import {existsSync} from "fs"
+import {readJSON} from "fs-extra"
+import {join} from "path"
+
+export const getPackageJson = async () => {
+  const pkgJsonPath = join(process.cwd(), "package.json")
+  if (existsSync(pkgJsonPath)) {
+    return readJSON(pkgJsonPath)
+  }
+  return {}
+}

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

@@ -1,4 +1,5 @@
-import {readdirSync} from "fs-extra"
+import {readdirSync, existsSync} from "fs-extra"
+import {join} from "path"
 
 export function getPkgManager() {
   return readdirSync(process.cwd()).includes("pnpm-lock.yaml")
@@ -7,3 +8,7 @@ export function getPkgManager() {
     ? "yarn"
     : "npm"
 }
+
+export const isInternalBlitzMonorepoDevelopment =
+  existsSync(join(process.cwd(), "..", "..", "packages", "blitz", "dist", "chunks")) &&
+  existsSync(join(process.cwd(), "..", "..", "packages", "blitz-next", "dist", "chunks"))

packages/blitz/src/cli/utils/next-commands.ts

@@ -9,17 +9,18 @@ import {
 } from "./next-utils"
 import {checkLatestVersion} from "./check-latest-version"
 import {readBlitzConfig} from "../../server-utils"
+import {codegenTasks} from "./codegen-tasks"
 
 export async function build(config: ServerConfig) {
   const {rootFolder, nextBin, watch} = await normalize(config)
-
+  await codegenTasks()
   await nextBuild(nextBin, rootFolder, {} as any, config)
   if (customServerExists()) await buildCustomServer({watch})
 }
 
 export async function dev(config: ServerConfig) {
   const {rootFolder, nextBin} = await normalize({...config, env: "dev"})
-  void checkLatestVersion()
+  // void checkLatestVersion()
   if (customServerExists()) {
     console.log("Using your custom server")
 

packages/blitz/src/cli/utils/routes-manifest.ts

@@ -6,6 +6,7 @@ import {outputFile, readdir} from "fs-extra"
 import findUp from "find-up"
 import resolveFrom from "resolve-from"
 import Watchpack from "watchpack"
+import {isInternalBlitzMonorepoDevelopment} from "./helpers"
 export const CONFIG_FILE = ".blitz.config.compiled.js"
 export const NEXT_CONFIG_FILE = "next.config.js"
 export const PHASE_PRODUCTION_SERVER = "phase-production-server"
@@ -152,9 +153,9 @@ const normalizeConfig = (phase: string, config: any) => {
 }
 const loadConfig = (pagesDir: string) => {
   let userConfigModule
+
   try {
     const path = join(pagesDir, NEXT_CONFIG_FILE)
-
     // eslint-disable-next-line no-eval -- block webpack from following this module path
     userConfigModule = eval("require")(path)
   } catch {
@@ -162,6 +163,7 @@ const loadConfig = (pagesDir: string) => {
     // In case user does not have custom config
     userConfigModule = {}
   }
+
   let userConfig = normalizeConfig(
     PHASE_PRODUCTION_SERVER,
     userConfigModule.default || userConfigModule,
@@ -485,7 +487,6 @@ export function parseDefaultExportName(contents: string): string | null {
 export async function generateManifest() {
   const config = await loadConfig(process.cwd())
   const allRoutes = await collectAllRoutes(process.cwd(), config)
-
   const routes: Record<string, RouteManifestEntry> = {}
 
   for (let {filePath, route, type} of allRoutes) {
@@ -527,10 +528,6 @@ export async function generateManifest() {
   })
 }
 
-export const isInternalBlitzMonorepoDevelopment = __dirname.match(
-  /[\\/]packages[\\/]blitz[\\/]dist[\\/]chunks$/,
-)
-
 async function findNodeModulesRoot(src: string) {
   let root: string
   if (isInternalBlitzMonorepoDevelopment) {
@@ -593,7 +590,7 @@ export async function stopWatcher(): Promise<void> {
   if (!webpackWatcher) {
     return
   }
-  console.log("stopWatcher")
+
   webpackWatcher.close()
   webpackWatcher = null
 }

packages/blitz/src/index-browser.tsx

@@ -83,3 +83,4 @@ export * from "./ts-utils"
 export * from "./types"
 export * from "./errors"
 export * from "./zod-utils"
+export * from "./prisma-utils"

packages/blitz/src/index-server.ts

@@ -7,6 +7,7 @@ import {Ctx} from "./types"
 export * from "./index-browser"
 export * from "./types"
 export * from "./prisma-utils"
+export * from "./run-prisma"
 export * from "./middleware"
 export * from "./paginate"
 export {baseLogger, newLine, log} from "./logging"
@@ -59,3 +60,11 @@ export function createSetupServer<TMiddleware extends RequestMiddleware, TExport
 ) {
   return setupServerConstructor
 }
+
+export const BlitzServerMiddleware = <
+  TMiddleware extends RequestMiddleware<any, any> = RequestMiddleware,
+>(
+  middleware: TMiddleware,
+): BlitzServerPlugin => ({
+  requestMiddlewares: [middleware],
+})

packages/blitz/src/prisma-utils.ts

@@ -1,7 +1,5 @@
 import {spawn} from "cross-spawn"
 import which from "npm-which"
-import {Readable} from "stream"
-import pEvent from "p-event"
 
 export interface Constructor<T = unknown> {
   new (...args: never[]): T
@@ -54,26 +52,3 @@ export const enhancePrisma = <TPrismaClientCtor extends Constructor>(
     },
   })
 }
-
-export const runPrisma = async (args: string[], silent = false) => {
-  const prismaBin = which(process.cwd()).sync("prisma")
-
-  const cp = spawn(prismaBin, args, {
-    stdio: silent ? "pipe" : "inherit",
-    env: process.env,
-  })
-
-  const cp_stderr: string[] = []
-  if (silent) {
-    cp?.stderr?.on("data", (chunk: Readable) => {
-      cp_stderr.push(chunk.toString())
-    })
-  }
-
-  const code = await pEvent(cp, "exit", {rejectionEvents: []})
-
-  return {
-    success: code === 0,
-    stderr: silent ? cp_stderr.join("") : undefined,
-  }
-}

packages/blitz/src/run-prisma.ts

@@ -0,0 +1,27 @@
+import which from "npm-which"
+import pEvent from "p-event"
+import {Readable} from "stream"
+import {spawn} from "cross-spawn"
+
+export const runPrisma = async (args: string[], silent = false) => {
+  const prismaBin = which(process.cwd()).sync("prisma")
+
+  const cp = spawn(prismaBin, args, {
+    stdio: silent ? "pipe" : "inherit",
+    env: process.env,
+  })
+
+  const cp_stderr: string[] = []
+  if (silent) {
+    cp?.stderr?.on("data", (chunk: Readable) => {
+      cp_stderr.push(chunk.toString())
+    })
+  }
+
+  const code = await pEvent(cp, "exit", {rejectionEvents: []})
+
+  return {
+    success: code === 0,
+    stderr: silent ? cp_stderr.join("") : undefined,
+  }
+}

packages/blitz/src/utils.ts

@@ -142,3 +142,7 @@ export function prettyMs(ms: number): string {
 export function interopDefault(mod: any) {
   return mod.default || mod
 }
+
+export function truncateString(str: string, maxLength: number): string {
+  return str.length > maxLength ? str.substring(0, maxLength - 3) + "..." : str
+}

packages/codemod/CHANGELOG.md

@@ -1,5 +1,89 @@
 # @blitzjs/codemod
 
+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- Updated dependencies [91aa5356]
+- Updated dependencies [928e840b]
+- Updated dependencies [240f3f34]
+- Updated dependencies [55b1cb20]
+- Updated dependencies [4d7d126d]
+- Updated dependencies [890b0c0c]
+- Updated dependencies [807a2b56]
+- Updated dependencies [a3e6c49c]
+- Updated dependencies [065db256]
+- Updated dependencies [f202aac1]
+  - @blitzjs/generator@2.0.0-alpha.66
+  - blitz@2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+### Patch Changes
+
+- Updated dependencies [dd5f5174]
+  - blitz@2.0.0-alpha.65
+  - @blitzjs/generator@2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+### Patch Changes
+
+- Updated dependencies [54db8a46]
+- Updated dependencies [62bf12b5]
+  - blitz@2.0.0-alpha.64
+  - @blitzjs/generator@2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.63
+- blitz@2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+### Patch Changes
+
+- Updated dependencies [365e6709]
+  - blitz@2.0.0-alpha.62
+  - @blitzjs/generator@2.0.0-alpha.62
+
+## 2.0.0-alpha.61
+
+### Patch Changes
+
+- Updated dependencies [240f378b]
+  - blitz@2.0.0-alpha.61
+  - @blitzjs/generator@2.0.0-alpha.61
+
+## 2.0.0-alpha.60
+
+### Patch Changes
+
+- Updated dependencies [1d863f35]
+  - blitz@2.0.0-alpha.60
+  - @blitzjs/generator@2.0.0-alpha.60
+
+## 2.0.0-alpha.59
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.59
+- blitz@2.0.0-alpha.59
+
+## 2.0.0-alpha.58
+
+### Patch Changes
+
+- dcdcd040: 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.
+- 7e538ba4: Import ErrorComponent as DefaultErrorComponent
+- 8e00605a: Updates the error messages based on if it's a babel parse error or an unexpected error
+- Updated dependencies [83b35590]
+- Updated dependencies [e339e2fd]
+  - blitz@2.0.0-alpha.58
+  - @blitzjs/generator@2.0.0-alpha.58
+
 ## 2.0.0-alpha.57
 
 ### Patch Changes

packages/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/codemod",
-  "version": "2.0.0-alpha.57",
+  "version": "2.0.0-alpha.66",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -25,9 +25,9 @@
     "@babel/plugin-proposal-class-properties": "7.17.12",
     "@babel/plugin-syntax-jsx": "7.17.12",
     "@babel/plugin-syntax-typescript": "7.17.12",
-    "@blitzjs/generator": "2.0.0-alpha.57",
+    "@blitzjs/generator": "2.0.0-alpha.66",
     "arg": "5.0.1",
-    "blitz": "2.0.0-alpha.57",
+    "blitz": "2.0.0-alpha.66",
     "chalk": "^4.1.0",
     "cross-spawn": "7.0.3",
     "debug": "4.3.3",
@@ -42,7 +42,7 @@
     "@types/jscodeshift": "0.11.2",
     "@types/node": "17.0.16",
     "ast-types": "0.14.2",
-    "unbuild": "0.6.9",
+    "unbuild": "0.7.6",
     "watch": "1.0.2"
   },
   "publishConfig": {

packages/codemod/src/upgrade-legacy.ts

@@ -184,6 +184,10 @@ const upgradeLegacy = async () => {
         BlitzLayout: "@blitzjs/next",
       }
 
+      const renames: Record<string, string> = {
+        ErrorComponent: "DefaultErrorComponent",
+      }
+
       getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((filename) => {
         const program = getCollectionFromSource(path.resolve(appDir, filename))
         const parsedProgram = program.get()
@@ -197,7 +201,13 @@ const upgradeLegacy = async () => {
                     ? specifier.imported.value
                     : specifier.imported.name
                 if (importedName in specialImports) {
-                  addNamedImport(program, importedName, specialImports[importedName]!)
+                  addNamedImport(
+                    program,
+                    importedName,
+                    specialImports[importedName]!,
+                    undefined,
+                    renames[importedName],
+                  )
                   removeImport(program, importedName, "blitz")
                 }
               })
@@ -433,6 +443,7 @@ const upgradeLegacy = async () => {
         j.Identifier,
         (node) => node.name === "middleware",
       )
+
       if (middlewareArray.length) {
         const middlewares = middlewareArray
           .get()
@@ -451,7 +462,12 @@ const upgradeLegacy = async () => {
         let importStatements = []
         for (let nodes of blitzConfigProgram.get().value.program.body) {
           if (nodes.type === "ImportDeclaration") {
-            if (nodes.source.value !== "blitz") {
+            // Find duplicates
+            const dup = blitzServerProgram.find(
+              j.ImportDeclaration,
+              (node) => node.source.value === nodes.source.value,
+            )
+            if (nodes.source.value !== "blitz" && !dup.length) {
               importStatements.push(nodes)
             }
           }
@@ -466,11 +482,7 @@ const upgradeLegacy = async () => {
           }
         }
 
-        importStatements.forEach((s) =>
-          blitzServerProgram
-            .get()
-            .value.program.body.unshift(j.variableDeclaration(s.kind, s.declarations)),
-        )
+        importStatements.forEach((s) => blitzServerProgram.get().value.program.body.unshift(s))
 
         fs.writeFileSync(
           `${appDir}/blitz-server.${isTypescript ? "ts" : "js"}`,
@@ -741,40 +753,50 @@ const upgradeLegacy = async () => {
         const parsedProgram = program.get()
 
         const findRouterQueryImport = findImport(program, "next/router")
-        findRouterQueryImport?.forEach((node) => {
-          const getNode = node.get()
-          getNode.value.specifiers.slice().forEach((specifier: any, index: number) => {
-            const importedName =
-              specifier.imported.type === "StringLiteral"
-                ? specifier.imported.value
-                : specifier.imported.name
-            if (importedName === "useRouterQuery") {
-              addNamedImport(program, "useRouter", "next/router")
-              getNode.value.specifiers.splice(index, 1)
-              // Removed left overs
-              if (!getNode.value.specifiers?.length) {
-                const index = parsedProgram.value.program.body.indexOf(getNode.value)
-                parsedProgram.value.program.body.splice(index, 1)
+
+        if (findRouterQueryImport?.length) {
+          findRouterQueryImport?.forEach((node) => {
+            const getNode = node.get()
+            getNode.value.specifiers.slice().forEach((specifier: any, index: number) => {
+              const importedName = (): string | null => {
+                if (specifier.imported) {
+                  if (specifier.imported.type === "StringLiteral") {
+                    return specifier.imported.value
+                  } else if (specifier.imported.type === "Identifier") {
+                    return specifier.imported.name
+                  }
+                }
+                return null
               }
-            }
+
+              if (importedName() && importedName() === "useRouterQuery") {
+                addNamedImport(program, "useRouter", "next/router")
+                getNode.value.specifiers.splice(index, 1)
+                // Removed left overs
+                if (!getNode.value.specifiers?.length) {
+                  const index = parsedProgram.value.program.body.indexOf(getNode.value)
+                  parsedProgram.value.program.body.splice(index, 1)
+                }
+              }
+            })
           })
-        })
 
-        const findCallUseRouterQuery = program.find(
-          j.CallExpression,
-          (node) => node.callee.name === "useRouterQuery",
-        )
-        findCallUseRouterQuery.forEach((call) => {
-          const nodePath = call.get()
-          nodePath.parentPath.value.init = j.expressionStatement(
-            j.memberExpression(
-              j.callExpression(j.identifier("useRouter"), []),
-              j.identifier("query"),
-            ),
+          const findCallUseRouterQuery = program.find(
+            j.CallExpression,
+            (node) => node.callee.name === "useRouterQuery",
           )
-        })
+          findCallUseRouterQuery.forEach((call) => {
+            const nodePath = call.get()
+            nodePath.parentPath.value.init = j.expressionStatement(
+              j.memberExpression(
+                j.callExpression(j.identifier("useRouter"), []),
+                j.identifier("query"),
+              ),
+            )
+          })
 
-        fs.writeFileSync(filepath, program.toSource())
+          fs.writeFileSync(filepath, program.toSource())
+        }
       })
 
       getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
@@ -786,45 +808,54 @@ const upgradeLegacy = async () => {
           j.ImportDeclaration,
           (node) => node.source.value === "next/router",
         )
-        findRouterQueryImport.forEach((node) => {
-          const getNode = node.get()
-          getNode.value.specifiers.slice().forEach((specifier: any, index: number) => {
-            const importedName =
-              specifier.imported.type === "StringLiteral"
-                ? specifier.imported.value
-                : specifier.imported.name
-            if (importedName === "useRouterQuery") {
-              parsedProgram.value.program.body.unshift(
-                j.importDeclaration(
-                  [j.importSpecifier(j.identifier("useRouter"))],
-                  j.stringLiteral("next/router"),
-                ),
-              )
-              getNode.value.specifiers.splice(index, 1)
-              // Removed left overs
-              if (!getNode.value.specifiers?.length) {
-                const index = parsedProgram.value.program.body.indexOf(getNode.value)
-                parsedProgram.value.program.body.splice(index, 1)
+        if (findRouterQueryImport?.length) {
+          findRouterQueryImport.forEach((node) => {
+            const getNode = node.get()
+            getNode.value.specifiers.slice().forEach((specifier: any, index: number) => {
+              const importedName = (): string | null => {
+                if (specifier.imported) {
+                  if (specifier.imported.type === "StringLiteral") {
+                    return specifier.imported.value
+                  } else if (specifier.imported.type === "Identifier") {
+                    return specifier.imported.name
+                  }
+                }
+                return null
               }
-            }
+
+              if (importedName() && importedName() === "useRouterQuery") {
+                parsedProgram.value.program.body.unshift(
+                  j.importDeclaration(
+                    [j.importSpecifier(j.identifier("useRouter"))],
+                    j.stringLiteral("next/router"),
+                  ),
+                )
+                getNode.value.specifiers.splice(index, 1)
+                // Removed left overs
+                if (!getNode.value.specifiers?.length) {
+                  const index = parsedProgram.value.program.body.indexOf(getNode.value)
+                  parsedProgram.value.program.body.splice(index, 1)
+                }
+              }
+            })
           })
-        })
 
-        const findCallUseRouterQuery = program.find(
-          j.CallExpression,
-          (node) => node.callee.name === "useRouterQuery",
-        )
-        findCallUseRouterQuery.forEach((call) => {
-          const nodePath = call.get()
-          nodePath.parentPath.value.init = j.expressionStatement(
-            j.memberExpression(
-              j.callExpression(j.identifier("useRouter"), []),
-              j.identifier("query"),
-            ),
+          const findCallUseRouterQuery = program.find(
+            j.CallExpression,
+            (node) => node.callee.name === "useRouterQuery",
           )
-        })
+          findCallUseRouterQuery.forEach((call) => {
+            const nodePath = call.get()
+            nodePath.parentPath.value.init = j.expressionStatement(
+              j.memberExpression(
+                j.callExpression(j.identifier("useRouter"), []),
+                j.identifier("query"),
+              ),
+            )
+          })
 
-        fs.writeFileSync(filepath, program.toSource())
+          fs.writeFileSync(filepath, program.toSource())
+        }
       })
     },
   })
@@ -907,9 +938,11 @@ const upgradeLegacy = async () => {
           )
 
         const documentHead = program
-          .find(j.Identifier, (node) => node.name === "DocumentHead")
+          .find(j.JSXElement, (node) => node.openingElement.name.name === "DocumentHead")
           .get()
-        documentHead.value.name = "Head"
+
+        documentHead.value.openingElement.name.name = "Head"
+        documentHead.value.closingElement.name.name = "Head"
 
         const blitzScript = program.find(j.Identifier, (node) => node.name === "BlitzScript").get()
         blitzScript.value.name = "NextScript"
@@ -959,15 +992,20 @@ const upgradeLegacy = async () => {
           const program = getCollectionFromSource(file)
 
           const defaultExportPath = findDefaultExportPath(program)
-          if (!defaultExportPath) {
-            return
+
+          if (defaultExportPath) {
+            const {node} = defaultExportPath
+
+            if (node.declaration.type === "Identifier") {
+              node.declaration = j.callExpression(j.identifier("api"), [node.declaration as any])
+              addNamedImport(program, "api", "app/blitz-server")
+            } else if (node.declaration.type === "FunctionDeclaration") {
+              node.declaration = j.template.expression`api(${node.declaration})`
+              addNamedImport(program, "api", "app/blitz-server")
+            }
+
+            fs.writeFileSync(path.join(path.resolve(file)), program.toSource())
           }
-
-          const {node} = defaultExportPath
-          node.declaration = j.callExpression(j.identifier("api"), [node.declaration as any])
-          addNamedImport(program, "api", "app/blitz-server")
-
-          fs.writeFileSync(path.join(path.resolve(file)), program.toSource())
         })
       }
     },
@@ -1118,8 +1156,23 @@ const upgradeLegacy = async () => {
       try {
         await step.action()
       } catch (err) {
+        const error = err as {code: string} | string
         spinner.fail(`${step.name}`)
-        log.error(err as string)
+        log.error(error as string)
+
+        if (error && typeof error === "object" && error.code === "BABEL_PARSE_ERROR") {
+          log.error(
+            log.withBrand(
+              "Don't panic, go to the file with the error & manually fix it. Then run the codemod again. It will continue where it left off.",
+            ),
+          )
+        } else {
+          log.error(
+            log.withBrand(
+              "This is an unexpected error. Please ask for help in the discord #general-help channel. https://discord.blitzjs.com",
+            ),
+          )
+        }
         failedAt = index + 1
         fs.writeJsonSync(".migration.json", {
           failedAt,

packages/codemod/src/utils.ts

@@ -168,6 +168,7 @@ export function addNamedImport(
   importStatement: string,
   importFrom: string,
   defaultSpecifier?: boolean,
+  asImport?: string,
 ) {
   const existingImport = program.find(
     j.ImportDeclaration,
@@ -183,7 +184,11 @@ export function addNamedImport(
     if (existingSpecifier.length) {
       return
     }
-    existingImport.get().value.specifiers.push(j.importSpecifier(j.identifier(importStatement)))
+    existingImport
+      .get()
+      .value.specifiers.push(
+        j.importSpecifier(j.identifier(importStatement), asImport ? j.identifier(asImport) : null),
+      )
   } else {
     program
       .get()
@@ -194,7 +199,12 @@ export function addNamedImport(
               j.stringLiteral(importFrom),
             )
           : j.importDeclaration(
-              [j.importSpecifier(j.identifier(importStatement))],
+              [
+                j.importSpecifier(
+                  j.identifier(importStatement),
+                  asImport ? j.identifier(asImport) : null,
+                ),
+              ],
               j.stringLiteral(importFrom),
             ),
       )

packages/config/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.66
+
+## 2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+## 2.0.0-alpha.61
+
+## 2.0.0-alpha.60
+
+## 2.0.0-alpha.59
+
+## 2.0.0-alpha.58
+
 ## 2.0.0-alpha.57
 
 ## 2.0.0-alpha.56

packages/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blitzjs/config",
   "private": true,
-  "version": "2.0.0-alpha.57",
+  "version": "2.0.0-alpha.66",
   "license": "MIT",
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "5.9.1",

packages/generator/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.66
+
+### Patch Changes
+
+- 91aa5356: Include `.env.test` file to the generator templates
+- 890b0c0c: Improve `blitz new` messaging and fix minor issues
+- 807a2b56: Fixes peer dependency warnings
+- a3e6c49c: Fixes the supports-color warning for pnpm
+- 065db256: Update new app templates to use blitz-rpc's resolver function
+- f202aac1: Mocks @blitzjs/auth instead of blitz inside the forgotPassword mutation test & hardcodes blitz package version types instead of just using the alpha tag.
+
+## 2.0.0-alpha.65
+
+## 2.0.0-alpha.64
+
+## 2.0.0-alpha.63
+
+## 2.0.0-alpha.62
+
+## 2.0.0-alpha.61
+
+## 2.0.0-alpha.60
+
+## 2.0.0-alpha.59
+
+## 2.0.0-alpha.58
+
+### Patch Changes
+
+- e339e2fd: Add hoist pattern entry for react-query in new app templates
+
 ## 2.0.0-alpha.57
 
 ## 2.0.0-alpha.56

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.57",
+  "version": "2.0.0-alpha.66",
   "scripts": {
     "dev": "watch unbuild src --wait=0.2",
     "build": "unbuild && pnpm build:templates",
@@ -40,12 +40,13 @@
     "pluralize": "8.0.0",
     "prettier": "^2.5.1",
     "recast": "0.20.5",
+    "supports-color": "8.1.1",
     "tslog": "3.3.1",
     "username": "5.1.0",
     "vinyl": "2.2.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.57",
+    "@blitzjs/config": "2.0.0-alpha.66",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",
@@ -70,8 +71,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "peerDependencies": {
-    "react": "*"
   }
 }

packages/generator/src/generator.ts

@@ -302,7 +302,7 @@ export abstract class Generator<
       return path.join(
         __dirname,
         "..",
-        process.env.NODE_ENV === "test" ? "./templates" : "./dist/templates",
+        process.env.NODE_ENV === "test" ? "./templates" : "./templates",
         this.sourceRoot.path,
         ...paths,
       )

packages/generator/src/generators/app-generator.ts

@@ -27,7 +27,7 @@ export interface AppGeneratorOptions extends GeneratorOptions {
   version: string
   skipInstall: boolean
   skipGit: boolean
-  form?: "React Final Form" | "React Hook Form" | "Formik"
+  form?: "finalform" | "hookform" | "formik"
   onPostInstall?: () => Promise<void>
 }
 
@@ -126,6 +126,9 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
     pkg.dependencies = newDependencies
     pkg.devDependencies = newDevDependencies
     pkg.dependencies.blitz = blitzDependencyVersion
+    pkg.dependencies["@blitzjs/next"] = blitzDependencyVersion
+    pkg.dependencies["@blitzjs/rpc"] = blitzDependencyVersion
+    pkg.dependencies["@blitzjs/auth"] = blitzDependencyVersion
 
     const fallbackUsed = dependenciesUsedFallback || devDependenciesUsedFallback
 
@@ -299,21 +302,18 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
     assert(pkg, "couldn't find package.json")
 
     const ext = this.options.useTs ? "tsx" : "js"
-    let type: string = ""
 
-    switch (this.options.form) {
-      case "React Final Form":
-        type = "finalform"
+    const type = this.options.form
+    switch (type) {
+      case "finalform":
         pkg.dependencies["final-form"] = "4.x"
         pkg.dependencies["react-final-form"] = "6.x"
         break
-      case "React Hook Form":
-        type = "hookform"
+      case "hookform":
         pkg.dependencies["react-hook-form"] = "7.x"
         pkg.dependencies["@hookform/resolvers"] = "2.x"
         break
-      case "Formik":
-        type = "formik"
+      case "formik":
         pkg.dependencies["formik"] = "2.x"
         break
     }

packages/generator/templates/app/.env.test

@@ -0,0 +1,5 @@
+# SQLite is ready to go out of the box, but you can switch to Postgres
+# by first changing the provider from "sqlite" to "postgres" in the Prisma
+# schema file and by second swapping the DATABASE_URL below.
+DATABASE_URL="file:./db_test.sqlite"
+# DATABASE_URL=postgresql://__username__@localhost:5432/__name___test

packages/generator/templates/app/app/auth/mutations/changePassword.ts

@@ -1,9 +1,9 @@
 import { NotFoundError, AuthenticationError } from "blitz"
+import { resolver } from "@blitzjs/rpc"
+import { SecurePassword } from "@blitzjs/auth"
 import db from "db"
 import { authenticateUser } from "./login"
 import { ChangePassword } from "../validations"
-import { resolver } from "@blitzjs/rpc"
-import { SecurePassword } from "@blitzjs/auth"
 
 export default resolver.pipe(
   resolver.zod(ChangePassword),

packages/generator/templates/app/app/auth/mutations/forgotPassword.test.ts

@@ -9,8 +9,8 @@ beforeEach(async () => {
 })
 
 const generatedToken = "plain-token"
-jest.mock("blitz", () => ({
-  ...jest.requireActual<Record<string, unknown>>("blitz")!,
+jest.mock("@blitzjs/auth", () => ({
+  ...jest.requireActual<Record<string, unknown>>("@blitzjs/auth")!,
   generateToken: () => generatedToken,
 }))
 jest.mock("preview-email", () => jest.fn())