Version Packages (alpha) (#3724)

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

.all-contributorsrc

@@ -3660,6 +3660,49 @@
         "doc",
         "code"
       ]
+    },
+    {
+      "login": "oltdaniel",
+      "name": "Daniel Oltmanns",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53529846?v=4",
+      "profile": "oltdaniel.eu",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "edrickleong",
+      "name": "Edrick Leong",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10529706?v=4",
+      "profile": "https://github.com/edrickleong",
+      "contributions": [
+        "doc",
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "siddhsuresh",
+      "name": "Siddharth Suresh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/83594610?v=4",
+      "profile": "https://github.com/siddhsuresh",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "orionmiz",
+      "name": "JH.Lee",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39466936?v=4",
+      "profile": "http://jins.dev",
+      "contributions": [
+        "code",
+        "test",
+        "maintenance",
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/blue-pigs-tan.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Throw error if cookiePrefix is undefined when running codemod

.changeset/brown-avocados-wink.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Print model added or updated in schema.prisma after running model generator

.changeset/calm-horses-tie.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Add back blitz generate command

.changeset/chilled-carrots-own.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add `BlitzPage` type to Home pages in app templates

.changeset/clean-hats-pump.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Allow using `RouteUrlObject` as `redirect.destination` in `getStaticProps` and `getServerSideProps`

.changeset/clever-radios-lie.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+Add DocumentProps & DocumentContext to the codemod import map
+

.changeset/cuddly-pugs-crash.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Wrap middlewares with BlitzServerMiddleware function with codemod

.changeset/curly-rules-speak.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Comment out generate command import until we add the full support back

.changeset/few-dogs-fetch.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Use correct path for log utilities import

.changeset/great-candles-stare.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+
+Use internal branded blitz logger for @blitzjs/rpc

.changeset/kind-walls-suffer.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Run codegen tasks on blitz dev command

.changeset/long-bees-hope.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add type checking to next.config.js files in new app templates

.changeset/lovely-berries-sell.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Remove trailing comma when removing BlitzConfig from next.config.js & Fix codemod so if route (eg. `app/auth/pages`) convert to (eg. `pages/`) instead of (eg. `pages/auth`)

.changeset/perfect-trains-double.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Wrap `blitz.config.ts` with the `withBlitz` function during the codemod step instead of creating a blank `next.config.js` file.

.changeset/pre.json

@@ -18,19 +18,28 @@
     "test-qm": "0.0.0",
     "test-no-suspense": "0.0.0",
     "test-trailing-slash": "0.0.0",
-    "test-middleware": "0.0.0"
+    "test-middleware": "0.0.0",
+    "test-react-query-utils": "0.0.0"
   },
   "changesets": [
     "big-phones-bow",
+    "blue-pigs-tan",
     "breezy-cameras-double",
     "breezy-moose-behave",
     "bright-mangos-run",
+    "brown-avocados-wink",
     "calm-carpets-deny",
+    "calm-horses-tie",
     "calm-nails-wait",
     "calm-tomatoes-drive",
+    "chilled-carrots-own",
+    "clean-hats-pump",
     "clean-walls-wink",
+    "clever-radios-lie",
     "cool-doors-invent",
     "cool-horses-check",
+    "cuddly-pugs-crash",
+    "curly-rules-speak",
     "curly-seas-serve",
     "dirty-monkeys-greet",
     "dirty-planets-chew",
@@ -41,6 +50,7 @@
     "fair-wombats-sneeze",
     "famous-kings-explain",
     "fast-trainers-kneel",
+    "few-dogs-fetch",
     "flat-bees-approve",
     "four-brooms-juggle",
     "four-meals-fry",
@@ -52,6 +62,7 @@
     "good-insects-wink",
     "gorgeous-buses-scream",
     "gorgeous-games-obey",
+    "great-candles-stare",
     "great-months-train",
     "great-terms-rescue",
     "green-papayas-do",
@@ -62,10 +73,13 @@
     "hot-cups-rhyme",
     "hot-drinks-approve",
     "hungry-baboons-swim",
+    "kind-walls-suffer",
     "late-steaks-give",
     "lemon-games-press",
     "lemon-seas-push",
     "light-donkeys-double",
+    "long-bees-hope",
+    "lovely-berries-sell",
     "lovely-colts-share",
     "lucky-cows-try",
     "mean-gorillas-reply",
@@ -87,6 +101,7 @@
     "olive-feet-rhyme",
     "olive-sheep-rhyme",
     "perfect-eyes-repeat",
+    "perfect-trains-double",
     "plenty-bottles-swim",
     "polite-lizards-love",
     "poor-peas-lick",
@@ -102,6 +117,7 @@
     "red-badgers-retire",
     "rich-chairs-invent",
     "rich-queens-travel",
+    "rotten-rocks-remember",
     "shaggy-carpets-brake",
     "sharp-falcons-begin",
     "shy-olives-hang",
@@ -109,14 +125,20 @@
     "silent-colts-reply",
     "silly-apricots-share",
     "six-apricots-kick",
+    "slimy-humans-impress",
     "slimy-needles-taste",
     "slow-walls-poke",
     "small-socks-confess",
     "smooth-planets-admire",
+    "smooth-rice-clap",
     "smooth-stingrays-drum",
+    "smooth-tools-train",
     "soft-adults-smell",
     "sour-lemons-hunt",
+    "sour-mails-lick",
     "spicy-beds-float",
+    "spotty-dingos-stare",
+    "stale-jobs-drum",
     "strong-apes-reply",
     "stupid-walls-sell",
     "sweet-kiwis-cross",
@@ -133,12 +155,14 @@
     "three-lies-pull",
     "tidy-clouds-smoke",
     "tough-toes-pull",
+    "twelve-hornets-sip",
     "twelve-lemons-smile",
     "twenty-beans-pump",
     "two-carpets-rhyme",
     "two-eyes-knock",
     "two-kiwis-help",
     "two-tigers-type",
+    "unlucky-avocados-fix",
     "unlucky-papayas-sleep",
     "violet-bags-leave",
     "violet-lions-help",

.changeset/rotten-rocks-remember.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Run codegen tasks after creating a new app if user chose yarn as a package manager

.changeset/slimy-humans-impress.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Remove trailing comma from tsconfig.json file in the new app template"

.changeset/smooth-rice-clap.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Fix typo in a next.config.js file name

.changeset/smooth-tools-train.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add ts-jest to dependencies in new app templates

.changeset/sour-mails-lick.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Allow codemod to finish if `cookiePrefix` is undefined. Then show error at the end of running the codemod.

.changeset/spotty-dingos-stare.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Add `getQueryData` utility to get an existing query's cached data

.changeset/stale-jobs-drum.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Set correct packages versions in package.json with upgrade-legacy codemod

.changeset/twelve-hornets-sip.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Fix codemod to accept a self closing `DocumentHead` in the `_document` page

.changeset/unlucky-avocados-fix.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add `@testing-library/jest-dom` to new app dependecies

README.md

@@ -6,9 +6,9 @@
     <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
   </a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-388-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
+<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-391-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
-  <a aria-label="License" href="https://github.com/blitz-js/blitz/blob/canary/LICENSE">
+  <a aria-label="License" href="https://github.com/blitz-js/blitz/blob/main/LICENSE">
     <img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
   </a>
   <a aria-label="NPM version" href="https://www.npmjs.com/package/blitz">
@@ -66,16 +66,16 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 <table>
   <tr>
  <td><a aria-label="Andreas Asprou" href="https://andreas.fyi">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/andreas.jpg" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/andreas.jpg" width="40px"/>
 </a></td>
  <td><a aria-label="Digas" href="https://digsas.com">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/digsas.svg" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/digsas.svg" width="40px"/>
 </a></td>
  <td><a aria-label="userTrack" href="https://www.usertrack.net/?ref=blitzjs">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/usertrack.png" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/usertrack.png" width="40px"/>
 </a></td>
  <td><a aria-label="MeetKai" href="https://meetkai.com/?ref=blitzjs">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/meetkai.png" width="40px"/>
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/meetkai.png" width="40px"/>
 </a></td>
   </tr>
 </table>
@@ -85,14 +85,11 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 
 <table>
   <tr>
-<td><a aria-label="Render.com" href="https://render.com?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/render-logo-color2.png" width="200px">
-</a></td>
 <td><a aria-label="RIT" href="https://rit-inc.co.jp/?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2021">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/rit_logo.png" width="200px">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/rit_logo.png" width="200px">
 </a></td>
 <td><a aria-label="Boostry" href="https://boostry.co.jp/?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2021">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/boostry.svg" width="200px">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/boostry.svg" width="200px">
 </a></td>
   </tr>
 </table>
@@ -105,7 +102,7 @@ Your financial contributions help ensure Blitz continues to be developed and mai
   <tr>
   <td>
 <a aria-label="Fauna" href="https://dashboard.fauna.com/accounts/register?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2020">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/canary/assets/Fauna_Logo_Blue.png" width="300px">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/Fauna_Logo_Blue.png" width="300px">
 </a>
 </td>
   </tr>
@@ -119,9 +116,13 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 
 ### 💎 Diamond Sponsors
 
-<a aria-label="Your Company" href="#">
-<img alt="" src="https://dummyimage.com/1000x330/efe8ff/000000.png&text=Your+Logo+Here" width="500px">
-</a>
+<table>
+  <tr>
+    <a aria-label="Flightcontrol" href="https://www.flightcontrol.dev?ref=blitzjs">
+    <img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/flightcontrol.png" width="400px">
+    </a>
+  </tr>
+</table>
 
 <br>
 
@@ -151,6 +152,7 @@ _Code ownership, pull request approvals and merging, etc_ (see [Maintainers L2](
 <table>
   <tr>
     <td align="center"><a href="http://simonknott.de"><img src="https://avatars1.githubusercontent.com/u/14912729?v=4" width="100px;" alt=""/><br /><sub><b>Simon Knott</b></sub></a><br />SuperJSON</td>
+    <td align="center"><a href="http://jins.dev"><img src="https://avatars.githubusercontent.com/u/39466936?v=4" width="100px;" alt=""/><br /><sub><b>JH.Lee</b></sub></a><br />SuperJSON</td>
     <td align="center"><a href="https://juanm04.com"><img src="https://avatars0.githubusercontent.com/u/16712703?v=4" width="100px;" alt=""/><br /><sub><b>Juan Martín Seery</b></sub></a><br />Website/Docs</td>
   </tr>
 </table>
@@ -708,6 +710,10 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <td align="center"><a href="https://github.com/tommywong-dev"><img src="https://avatars.githubusercontent.com/u/79971095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tommywong-dev</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tommywong-dev" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/datner"><img src="https://avatars.githubusercontent.com/u/22598347?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Datner</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=datner" title="Code">💻</a></td>
     <td align="center"><a href="https://chaiwattsw.com/"><img src="https://avatars.githubusercontent.com/u/30198386?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chaiwat Trisuwan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=chaiwattsw" title="Code">💻</a></td>
+    <td align="center"><a href="oltdaniel.eu"><img src="https://avatars.githubusercontent.com/u/53529846?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Oltmanns</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=oltdaniel" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=oltdaniel" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/edrickleong"><img src="https://avatars.githubusercontent.com/u/10529706?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Edrick Leong</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=edrickleong" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=edrickleong" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=edrickleong" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/siddhsuresh"><img src="https://avatars.githubusercontent.com/u/83594610?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Siddharth Suresh</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=siddhsuresh" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=siddhsuresh" title="Code">💻</a></td>
+    <td align="center"><a href="http://jins.dev"><img src="https://avatars.githubusercontent.com/u/39466936?v=4" width="100px;" alt=""/><br /><sub><b>JH.Lee</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=orionmiz" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=orionmiz" title="Tests">⚠️</a> <a href="#maintenance-orionmiz" title="Maintenance">🚧</a> <a href="https://github.com/blitz-js/blitz/commits?author=orionmiz" title="Documentation">📖</a></td>
   </tr>
 </table>
 

apps/toolkit-app/next.config.js

@@ -1,10 +1,15 @@
+// @ts-check
+
 const withBundleAnalyzer = require("@next/bundle-analyzer")({
   enabled: process.env.ANALYZE === "true",
 })
 const { withBlitz } = require("@blitzjs/next")
 
-module.exports = withBlitz(
-  withBundleAnalyzer({
-    reactStrictMode: true,
-  })
-)
+/**
+ * @type {import('@blitzjs/next').BlitzConfig}
+ **/
+const config = {
+  reactStrictMode: true,
+}
+
+module.exports = withBlitz(withBundleAnalyzer(config))

apps/toolkit-app/package.json

@@ -29,7 +29,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-alpha.67",
+    "blitz": "workspace:2.0.0-alpha.71",
     "next": "12.2.0",
     "prisma": "4.0.0",
     "react": "18.0.0",

apps/toolkit-app/pages/index.tsx

@@ -6,7 +6,7 @@ import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 import logout from "app/auth/mutations/logout"
 import logo from "public/logo.png"
 import { useMutation } from "@blitzjs/rpc"
-import { Routes } from "@blitzjs/next"
+import { Routes, BlitzPage } from "@blitzjs/next"
 
 /*
  * This file is just for a pleasant getting started page for your new app.
@@ -53,7 +53,7 @@ const UserInfo = () => {
   }
 }
 
-const Home = () => {
+const Home: BlitzPage = () => {
   return (
     <Layout title="Home">
       <div className="container">

apps/web/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "start:dev": "pnpm run prisma:start && next dev",
-    "buildapp": "prisma generate && next build",
+    "buildapp": "NODE_ENV=production pnpm blitz codegen && pnpm prisma generate && next build",
     "start": "next start",
     "lint": "next lint",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",

apps/web/pages/[postId]/index.tsx

@@ -0,0 +1,7 @@
+export default function Post() {
+  return (
+    <div>
+      <h1>Post</h1>
+    </div>
+  )
+}

apps/web/pages/page-with-get-query-data.tsx

@@ -0,0 +1,24 @@
+import {getQueryData, useQuery} from "@blitzjs/rpc"
+import getBasic from "../app/queries/getBasic"
+import {useState} from "react"
+
+function PageWithGetQueryData() {
+  const [data] = useQuery(getBasic, {})
+  const [newData, setNewData] = useState<string>()
+  return (
+    <div>
+      <div>{data}</div>
+      {newData && <div id="new-data">{newData}</div>}
+      <button
+        onClick={async () => {
+          const newData = getQueryData(getBasic, {})
+          setNewData(newData)
+        }}
+      >
+        Call getQueryData
+      </button>
+    </div>
+  )
+}
+
+export default PageWithGetQueryData

apps/web/pages/page-with-gssp-redirect.tsx

@@ -0,0 +1,27 @@
+import {SessionContext} from "@blitzjs/auth"
+import {Routes} from "@blitzjs/next"
+import {gSSP} from "app/blitz-server"
+
+type Props = {
+  userId: unknown
+  publicData: SessionContext["$publicData"]
+}
+
+export const getServerSideProps = gSSP<Props>(async ({ctx}) => {
+  const {session} = ctx
+
+  return {
+    redirect: {destination: Routes.Post({postId: "1"})},
+    props: {
+      userId: session.userId,
+      publicData: session.$publicData,
+      publishedAt: new Date(0),
+    },
+  }
+})
+
+function PageWithGsspRedirect(props: Props) {
+  return <div>{JSON.stringify(props, null, 2)}</div>
+}
+
+export default PageWithGsspRedirect

integration-tests/react-query-utils/.env

@@ -0,0 +1,2 @@
+SESSION_SECRET_KEY=hsdenhJfpLHrGjgdgg3jdF8g2bYD2PaQ
+HEADLESS=true

integration-tests/react-query-utils/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = require("@blitzjs/config/eslint")

integration-tests/react-query-utils/.gitignore

@@ -0,0 +1,3 @@
+node_modules
+# Keep environment variables out of version control
+*.sqlite

integration-tests/react-query-utils/app/blitz-client.ts

@@ -0,0 +1,14 @@
+import {BlitzRpcPlugin} from "@blitzjs/rpc"
+import {setupBlitzClient} from "@blitzjs/next"
+import {AuthClientPlugin} from "@blitzjs/auth"
+
+const {withBlitz} = setupBlitzClient({
+  plugins: [
+    AuthClientPlugin({
+      cookiePrefix: "react-query-utils-tests-cookie-prefix",
+    }),
+    BlitzRpcPlugin({}),
+  ],
+})
+
+export {withBlitz}

integration-tests/react-query-utils/app/blitz-server.ts

@@ -0,0 +1,16 @@
+import {setupBlitzServer} from "@blitzjs/next"
+import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
+import {simpleRolesIsAuthorized} from "@blitzjs/auth"
+import db from "../db"
+
+const {gSSP, gSP, api} = setupBlitzServer({
+  plugins: [
+    AuthServerPlugin({
+      cookiePrefix: "react-query-utils-tests-cookie-prefix",
+      storage: PrismaStorage(db),
+      isAuthorized: simpleRolesIsAuthorized,
+    }),
+  ],
+})
+
+export {gSSP, gSP, api}

integration-tests/react-query-utils/app/queries/getBasic.ts

@@ -0,0 +1,3 @@
+export default async function getBasic() {
+  return "basic-result"
+}

integration-tests/react-query-utils/db/index.ts

@@ -0,0 +1,8 @@
+import {enhancePrisma} from "blitz"
+import {PrismaClient} from "@prisma/client"
+
+const EnhancedPrisma = enhancePrisma(PrismaClient)
+
+export * from "@prisma/client"
+const prisma = new EnhancedPrisma()
+export default prisma

integration-tests/react-query-utils/db/migrations/20220330155417_init/migration.sql

@@ -0,0 +1,47 @@
+-- CreateTable
+CREATE TABLE "User" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "name" TEXT,
+    "email" TEXT NOT NULL,
+    "hashedPassword" TEXT,
+    "role" TEXT NOT NULL DEFAULT 'user'
+);
+
+-- CreateTable
+CREATE TABLE "Session" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "expiresAt" DATETIME,
+    "handle" TEXT NOT NULL,
+    "userId" INTEGER,
+    "hashedSessionToken" TEXT,
+    "antiCSRFToken" TEXT,
+    "publicData" TEXT,
+    "privateData" TEXT,
+    CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "Token" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "hashedToken" TEXT NOT NULL,
+    "type" TEXT NOT NULL,
+    "expiresAt" DATETIME NOT NULL,
+    "sentTo" TEXT NOT NULL,
+    "userId" INTEGER NOT NULL,
+    CONSTRAINT "Token_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Session_handle_key" ON "Session"("handle");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Token_hashedToken_type_key" ON "Token"("hashedToken", "type");

integration-tests/react-query-utils/db/migrations/migration_lock.toml

@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
+provider = "sqlite"

integration-tests/react-query-utils/db/schema.prisma

@@ -0,0 +1,50 @@
+datasource sqlite {
+  provider = "sqlite"
+  url      = "file:./db.sqlite"
+}
+
+generator client {
+  provider = "prisma-client-js"
+}
+
+model User {
+  id             Int      @id @default(autoincrement())
+  createdAt      DateTime @default(now())
+  updatedAt      DateTime @updatedAt
+  name           String?
+  email          String   @unique
+  hashedPassword String?
+  role           String   @default("user")
+
+  sessions Session[]
+  tokens   Token[]
+}
+
+model Session {
+  id                 Int       @id @default(autoincrement())
+  createdAt          DateTime  @default(now())
+  updatedAt          DateTime  @updatedAt
+  expiresAt          DateTime?
+  handle             String    @unique
+  user               User?     @relation(fields: [userId], references: [id])
+  userId             Int?
+  hashedSessionToken String?
+  antiCSRFToken      String?
+  publicData         String?
+  privateData        String?
+}
+
+model Token {
+  id          Int      @id @default(autoincrement())
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+  hashedToken String
+  type        String
+  expiresAt   DateTime
+  sentTo      String
+
+  user   User @relation(fields: [userId], references: [id])
+  userId Int
+
+  @@unique([hashedToken, type])
+}

integration-tests/react-query-utils/db/seed.ts

@@ -0,0 +1,7 @@
+import prisma from "./index"
+
+const seed = async () => {
+  await prisma.$reset()
+}
+
+export default seed

integration-tests/react-query-utils/next-env.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.

integration-tests/react-query-utils/next.config.js

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

integration-tests/react-query-utils/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "test-react-query-utils",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "start:dev": "pnpm run prisma:start && next dev",
+    "test": "pnpm run prisma:start && vitest run",
+    "test-watch": "vitest",
+    "start": "next start",
+    "lint": "next lint",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
+    "prisma:start": "prisma generate && prisma migrate deploy",
+    "prisma:studio": "prisma studio"
+  },
+  "prisma": {
+    "schema": "db/schema.prisma"
+  },
+  "dependencies": {
+    "@blitzjs/auth": "workspace:*",
+    "@blitzjs/next": "workspace:*",
+    "@blitzjs/rpc": "workspace:*",
+    "@prisma/client": "4.0.0",
+    "blitz": "workspace:*",
+    "lowdb": "3.0.0",
+    "next": "12.2.0",
+    "prisma": "4.0.0",
+    "react": "18.0.0",
+    "react-dom": "18.0.0"
+  },
+  "devDependencies": {
+    "@blitzjs/config": "workspace:*",
+    "@next/bundle-analyzer": "12.0.8",
+    "@types/express": "4.17.13",
+    "@types/fs-extra": "9.0.13",
+    "@types/node-fetch": "2.6.1",
+    "@types/react": "18.0.1",
+    "b64-lite": "1.4.0",
+    "eslint": "7.32.0",
+    "fs-extra": "10.0.1",
+    "get-port": "6.1.2",
+    "node-fetch": "3.2.3",
+    "typescript": "^4.5.3"
+  }
+}

integration-tests/react-query-utils/pages/_app.tsx

@@ -0,0 +1,36 @@
+import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
+import {AuthenticationError, AuthorizationError} from "blitz"
+import React, {Suspense} from "react"
+import {withBlitz} from "../app/blitz-client"
+
+function RootErrorFallback({error}: ErrorFallbackProps) {
+  if (error instanceof AuthenticationError) {
+    return <div>Error: You are not authenticated</div>
+  } else if (error instanceof AuthorizationError) {
+    return (
+      <ErrorComponent
+        statusCode={error.statusCode}
+        title="Sorry, you are not authorized to access this"
+      />
+    )
+  } else {
+    return (
+      <ErrorComponent
+        statusCode={(error as any)?.statusCode || 400}
+        title={error.message || error.name}
+      />
+    )
+  }
+}
+
+function MyApp({Component, pageProps}: AppProps) {
+  return (
+    <Suspense fallback="Loading...">
+      <ErrorBoundary FallbackComponent={RootErrorFallback}>
+        <Component {...pageProps} />
+      </ErrorBoundary>
+    </Suspense>
+  )
+}
+
+export default withBlitz(MyApp)

integration-tests/react-query-utils/pages/api/rpc/[[...blitz]].ts

@@ -0,0 +1,4 @@
+import {rpcHandler} from "@blitzjs/rpc"
+import {api} from "../../../app/blitz-server"
+
+export default api(rpcHandler({onError: console.log}))

integration-tests/react-query-utils/pages/page-with-get-query-data.tsx

@@ -0,0 +1,35 @@
+import {getQueryData, useQuery} from "@blitzjs/rpc"
+import {Suspense, useState} from "react"
+import getBasic from "../app/queries/getBasic"
+
+function Content() {
+  const [data] = useQuery(getBasic, undefined)
+  const [newData, setNewData] = useState<string>()
+  return (
+    <div>
+      <div>{data}</div>
+      {newData && <div id="new-data">{newData}</div>}
+      <button
+        id="button"
+        onClick={async () => {
+          const newData = getQueryData(getBasic, undefined)
+          setNewData(newData)
+        }}
+      >
+        Call getQueryData
+      </button>
+    </div>
+  )
+}
+
+function PageWithGetQueryData() {
+  return (
+    <div id="page">
+      <Suspense fallback={"Loading..."}>
+        <Content />
+      </Suspense>
+    </div>
+  )
+}
+
+export default PageWithGetQueryData

integration-tests/react-query-utils/test/index.test.ts

@@ -0,0 +1,59 @@
+import {describe, it, expect, beforeAll, afterAll} from "vitest"
+import {killApp, findPort, launchApp, nextBuild, nextStart} from "../../utils/next-test-utils"
+import webdriver from "../../utils/next-webdriver"
+
+import {join} from "path"
+
+let app: any
+let appPort: number
+const appDir = join(__dirname, "../")
+
+const runTests = (mode?: string) => {
+  describe("get query data", () => {
+    it(
+      "should work",
+      async () => {
+        const browser = await webdriver(appPort, "/page-with-get-query-data")
+
+        browser.waitForElementByCss("#button", 0)
+        await browser.elementByCss("#button").click()
+
+        browser.waitForElementByCss("#new-data", 0)
+        const newText = await browser.elementByCss("#new-data").text()
+        expect(newText).toMatch(/basic-result/)
+
+        if (browser) await browser.close()
+      },
+      5000 * 60 * 2,
+    )
+  })
+}
+describe("React Query Utils Tests", () => {
+  describe("dev mode", () => {
+    beforeAll(async () => {
+      try {
+        appPort = await findPort()
+        app = await launchApp(appDir, appPort, {cwd: process.cwd()})
+      } catch (error) {
+        console.log(error)
+      }
+    }, 5000 * 60 * 2)
+    afterAll(async () => await killApp(app))
+    runTests()
+  })
+
+  describe("server mode", () => {
+    beforeAll(async () => {
+      try {
+        await nextBuild(appDir)
+        appPort = await findPort()
+        app = await nextStart(appDir, appPort, {cwd: process.cwd()})
+      } catch (err) {
+        console.log(err)
+      }
+    }, 5000 * 60 * 2)
+    afterAll(async () => await killApp(app))
+
+    runTests()
+  })
+})

integration-tests/react-query-utils/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "@blitzjs/config/tsconfig.nextjs.json",
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
+  "compilerOptions": {
+    "paths": {
+      "react": ["./node_modules/@types/react"]
+    }
+  },
+  "exclude": ["node_modules"],
+  "baseUrl": "."
+}

integration-tests/react-query-utils/types.ts

@@ -0,0 +1,15 @@
+import {SimpleRolesIsAuthorized} from "@blitzjs/auth"
+import {User} from "./db"
+
+export type Role = "ADMIN" | "USER"
+
+declare module "@blitzjs/auth" {
+  export interface Session {
+    isAuthorized: SimpleRolesIsAuthorized<Role>
+    PublicData: {
+      userId: User["id"]
+      role: Role
+      views?: number
+    }
+  }
+}

package.json

@@ -11,7 +11,7 @@
     "preinstall": "npx only-allow pnpm",
     "prepare": "husky install",
     "build": "turbo run build",
-    "build:apps": "turbo run buildapp",
+    "build:apps": "turbo run buildapp --concurrency=1",
     "dev": "turbo run dev --no-cache --parallel",
     "lint": "turbo run lint",
     "test": "turbo run test",

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @blitzjs/auth
 
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- Updated dependencies [fd31e56b]
+  - blitz@2.0.0-alpha.69
+
+## 2.0.0-alpha.68
+
+### Patch Changes
+
+- Updated dependencies [271c58ac]
+- Updated dependencies [630c7181]
+- Updated dependencies [f0ca738d]
+- Updated dependencies [41608c4c]
+  - blitz@2.0.0-alpha.68
+
 ## 2.0.0-alpha.67
 
 ### Patch Changes

packages/blitz-auth/package.json

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

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @blitzjs/next
 
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- a3c92cb8: Allow using `RouteUrlObject` as `redirect.destination` in `getStaticProps` and `getServerSideProps`
+- Updated dependencies [49028024]
+  - @blitzjs/rpc@2.0.0-alpha.69
+
+## 2.0.0-alpha.68
+
+### Patch Changes
+
+- Updated dependencies [630c7181]
+  - @blitzjs/rpc@2.0.0-alpha.68
+
 ## 2.0.0-alpha.67
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.67",
+  "version": "2.0.0-alpha.71",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,7 +24,7 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.67",
+    "@blitzjs/rpc": "2.0.0-alpha.71",
     "@tanstack/react-query": "4.0.10",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
@@ -34,7 +34,7 @@
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.67",
+    "@blitzjs/config": "workspace:2.0.0-alpha.71",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -44,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.67",
+    "blitz": "2.0.0-alpha.71",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "next": "12.2.0",

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

@@ -1,5 +1,5 @@
-import type {NextConfig} from "next"
-import {
+import type {
+  NextConfig,
   GetServerSideProps,
   GetServerSidePropsResult,
   GetStaticProps,
@@ -30,6 +30,8 @@ import {IncomingMessage, ServerResponse} from "http"
 import {withSuperJsonProps} from "./superjson"
 import {ParsedUrlQuery} from "querystring"
 import {PreviewData} from "next/types"
+import {resolveHref} from "next/dist/shared/lib/router/router"
+import {RouteUrlObject, isRouteUrlObject} from "blitz"
 
 export * from "./index-browser"
 
@@ -50,6 +52,25 @@ type SetupBlitzOptions = {
   onError?: (err: Error) => void
 }
 
+export type Redirect =
+  | {
+      statusCode: 301 | 302 | 303 | 307 | 308
+      destination: string | RouteUrlObject
+      basePath?: false
+    }
+  | {
+      permanent: boolean
+      destination: string | RouteUrlObject
+      basePath?: false
+    }
+
+export type BlitzGSSPResult<P> = {props: P | Promise<P>} | {redirect: Redirect} | {notFound: true}
+
+export type BlitzGSPResult<P> =
+  | {props: P; revalidate?: number | boolean}
+  | {redirect: Redirect; revalidate?: number | boolean}
+  | {notFound: true; revalidate?: number | boolean}
+
 export type BlitzGSSPHandler<
   TProps,
   Query extends ParsedUrlQuery = ParsedUrlQuery,
@@ -59,8 +80,8 @@ export type BlitzGSSPHandler<
   req,
   res,
   ...args
-}: Parameters<GetServerSideProps<TProps, Query, PD>>[0] & {ctx: Ctx}) => ReturnType<
-  GetServerSideProps<TProps, Query, PD>
+}: Parameters<GetServerSideProps<TProps, Query, PD>>[0] & {ctx: Ctx}) => Promise<
+  BlitzGSSPResult<TProps>
 >
 
 export type BlitzGSPHandler<
@@ -70,9 +91,9 @@ export type BlitzGSPHandler<
 > = ({
   ctx,
   ...args
-}: Parameters<GetStaticProps<TProps, Query, PD>>[0] & {ctx: Ctx}) => ReturnType<
-  GetStaticProps<TProps, Query, PD>
->
+}: Parameters<GetStaticProps<TProps, Query, PD>>[0] & {ctx: Ctx}) =>
+  | Promise<BlitzGSPResult<TProps>>
+  | BlitzGSPResult<TProps>
 
 export type BlitzAPIHandler<TResult> = (
   req: NextApiRequest,
@@ -123,7 +144,12 @@ export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {
 
       try {
         const result = await handler({req, res, ctx, ...rest})
-        return withSuperJsonProps(withDehydratedState(result, getClient()))
+        return withSuperJsonProps(
+          withDehydratedState(
+            normalizeRedirectValues<GetServerSidePropsResult<TProps>>(result),
+            getClient(),
+          ),
+        )
       } catch (err: any) {
         onError?.(err)
         throw err
@@ -143,7 +169,12 @@ export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {
 
       try {
         const result = await handler({...context, ctx: ctx})
-        return withSuperJsonProps(withDehydratedState(result, getClient()))
+        return withSuperJsonProps(
+          withDehydratedState(
+            normalizeRedirectValues<GetStaticPropsResult<TProps>>(result),
+            getClient(),
+          ),
+        )
       } catch (err: any) {
         onError?.(err)
         throw err
@@ -219,6 +250,7 @@ export type PrefetchQueryFn = <T extends AsyncFunc, TInput = FirstParam<T>>(
   options?: DefaultOptions,
 ) => Promise<void>
 
+type BlitzResult = Partial<BlitzGSPResult<any> & BlitzGSSPResult<any>>
 type Result = Partial<GetServerSidePropsResult<any> & GetStaticPropsResult<any>>
 
 function withDehydratedState<T extends Result>(result: T, queryClient: QueryClient | null) {
@@ -229,6 +261,27 @@ function withDehydratedState<T extends Result>(result: T, queryClient: QueryClie
   return {...result, props: {...("props" in result ? result.props : undefined), dehydratedState}}
 }
 
+// Converts Blitz's GetServerSidePropsResult and GetStaticPropsResult to a NextJS compatible format
+// Blitz accepts string | RouteUrlObject as redirect.destination — this function converts it to a string
+const normalizeRedirectValues = <NormalizedResult extends Result>(
+  result: BlitzResult,
+): NormalizedResult => {
+  if ("redirect" in result) {
+    const dest = result.redirect?.destination
+    if (dest && isRouteUrlObject(dest)) {
+      // Todo: find a better way to resolve href without `as any` assertion.
+      const resolvedDest = resolveHref({asPath: "/", pathname: "/"} as any, dest, true)
+
+      return {
+        ...result,
+        redirect: {...result.redirect, destination: resolvedDest[1] || resolvedDest[0]},
+      } as NormalizedResult
+    }
+  }
+
+  return result as NormalizedResult
+}
+
 declare module "blitz" {
   export interface Ctx {
     prefetchQuery: PrefetchQueryFn

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @blitzjs/rpc
 
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- 49028024: Add `getQueryData` utility to get an existing query's cached data
+  - @blitzjs/auth@2.0.0-alpha.69
+
+## 2.0.0-alpha.68
+
+### Patch Changes
+
+- 630c7181: Use internal branded blitz logger for @blitzjs/rpc
+  - @blitzjs/auth@2.0.0-alpha.68
+
 ## 2.0.0-alpha.67
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.67",
+  "version": "2.0.0-alpha.71",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts && wait-on -d 250 ../blitz-auth/dist/index-browser.d.ts",
@@ -20,7 +20,7 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/auth": "2.0.0-alpha.67",
+    "@blitzjs/auth": "2.0.0-alpha.71",
     "@tanstack/react-query": "4.0.10",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
@@ -30,11 +30,11 @@
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.67",
+    "@blitzjs/config": "workspace:2.0.0-alpha.71",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.67",
+    "blitz": "2.0.0-alpha.71",
     "next": "12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",

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

@@ -7,6 +7,7 @@ export {
   invalidateQuery,
   setQueryData,
   getQueryClient,
+  getQueryData,
 } from "./react-query-utils"
 export {
   useQueryErrorResetBoundary,

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

@@ -1,4 +1,4 @@
-import {QueryClient} from "@tanstack/react-query"
+import {QueryClient, QueryFilters} from "@tanstack/react-query"
 import {serialize} from "superjson"
 import {isClient, isServer, AsyncFunc} from "blitz"
 import {ResolverType, RpcClient} from "./rpc"
@@ -199,3 +199,15 @@ export function setQueryData<TInput, TResult, T extends AsyncFunc>(
     }
   })
 }
+
+export function getQueryData<TInput, TResult, T extends AsyncFunc>(
+  resolver: T | Resolver<TInput, TResult> | RpcClient<TInput, TResult>,
+  params: TInput,
+): TResult | undefined {
+  if (typeof resolver === "undefined") {
+    throw new Error("getQueryData is missing the first argument - it must be a resolver function")
+  }
+  const queryKey = getQueryKey(resolver, params)
+
+  return getQueryClient().getQueryData(queryKey)
+}

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

@@ -1,7 +1,8 @@
-import {assert, Ctx, prettyMs} from "blitz"
+import {assert, baseLogger, Ctx, newLine, prettyMs} from "blitz"
 import {NextApiRequest, NextApiResponse} from "next"
 import {deserialize, serialize as superjsonSerialize} from "superjson"
 import {resolve} from "path"
+import chalk from "chalk"
 
 // TODO - optimize end user server bundles by not exporting all client stuff here
 export * from "./index-browser"
@@ -156,6 +157,13 @@ export function rpcHandler(config: RpcConfig) {
     const relativeRoutePath = (req.query.blitz as string[])?.join("/")
     const routePath = "/" + relativeRoutePath
 
+    const log = baseLogger().getChildLogger({
+      prefix: [routePath.replace("/api/rpc/", "") + "()"],
+    })
+    const customChalk = new chalk.Instance({
+      level: log.settings.type === "json" ? 0 : chalk.level,
+    })
+
     const loadableResolver = resolverMap?.[routePath]
     if (!loadableResolver) {
       throw new Error("No resolver for path: " + routePath)
@@ -175,7 +183,7 @@ export function rpcHandler(config: RpcConfig) {
 
       if (typeof req.body.params === "undefined") {
         const error = {message: "Request body is missing the `params` key"}
-        console.error(error.message)
+        log.error(error.message)
         res.status(400).json({
           result: null,
           error,
@@ -189,11 +197,11 @@ export function rpcHandler(config: RpcConfig) {
           meta: req.body.meta?.params,
         })
 
-        console.info("Starting with input:", data ? data : JSON.stringify(data))
+        log.info(customChalk.dim("Starting with input:"), data ? data : JSON.stringify(data))
         const startTime = Date.now()
         const result = await resolver(data, (res as any).blitzCtx)
         const resolverDuration = Date.now() - startTime
-        console.debug("Result:", result ? result : JSON.stringify(result))
+        log.debug(customChalk.dim("Result:"), result ? result : JSON.stringify(result))
 
         const serializerStartTime = Date.now()
         const serializedResult = superjsonSerialize(result)
@@ -207,16 +215,22 @@ export function rpcHandler(config: RpcConfig) {
             result: serializedResult.meta,
           },
         })
-        console.debug(`Next.js serialization:${prettyMs(Date.now() - nextSerializerStartTime)}`)
+        log.debug(
+          customChalk.dim(
+            `Next.js serialization:${prettyMs(Date.now() - nextSerializerStartTime)}`,
+          ),
+        )
         const serializerDuration = Date.now() - serializerStartTime
         const duration = Date.now() - startTime
 
-        console.info(
-          `Finished: resolver:${prettyMs(resolverDuration)} serializer:${prettyMs(
-            serializerDuration,
-          )} total:${prettyMs(duration)}`,
+        log.info(
+          customChalk.dim(
+            `Finished: resolver:${prettyMs(resolverDuration)} serializer:${prettyMs(
+              serializerDuration,
+            )} total:${prettyMs(duration)}`,
+          ),
         )
-        console.log("\n")
+        newLine()
 
         return
       } catch (error: any) {
@@ -226,8 +240,8 @@ export function rpcHandler(config: RpcConfig) {
 
         config.onError?.(error)
 
-        console.error(error)
-        console.log("\n")
+        log.error(error)
+        newLine()
 
         if (!error.statusCode) {
           error.statusCode = 500
@@ -246,7 +260,7 @@ export function rpcHandler(config: RpcConfig) {
       }
     } else {
       // Everything else is error
-      console.warn(`${req.method} method not supported`)
+      log.warn(`${req.method} method not supported`)
       res.status(404).end()
       return
     }

packages/blitz/CHANGELOG.md

@@ -1,5 +1,43 @@
 # blitz
 
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- Updated dependencies [176c7b8b]
+  - @blitzjs/generator@2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- Updated dependencies [4656e6ec]
+- Updated dependencies [1e0ec7a9]
+  - @blitzjs/generator@2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- fd31e56b: Add back blitz generate command
+- Updated dependencies [fd31e56b]
+- Updated dependencies [6baab190]
+- Updated dependencies [37623a4f]
+  - @blitzjs/generator@2.0.0-alpha.69
+
+## 2.0.0-alpha.68
+
+### Patch Changes
+
+- 271c58ac: Comment out generate command import until we add the full support back
+- 630c7181: Use internal branded blitz logger for @blitzjs/rpc
+- f0ca738d: Run codegen tasks on blitz dev command
+- 41608c4c: Run codegen tasks after creating a new app if user chose yarn as a package manager
+- Updated dependencies [70b334a2]
+- Updated dependencies [dd299ae8]
+- Updated dependencies [078fe474]
+  - @blitzjs/generator@2.0.0-alpha.68
+
 ## 2.0.0-alpha.67
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-alpha.67",
+  "version": "2.0.0-alpha.71",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.67",
+    "@blitzjs/generator": "2.0.0-alpha.71",
     "arg": "5.0.1",
     "boxen": "7.0.0",
     "chalk": "^4.1.0",
@@ -55,7 +55,7 @@
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.67",
+    "@blitzjs/config": "workspace:2.0.0-alpha.71",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

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

@@ -1,261 +1,256 @@
-export {}
-// import arg from "arg"
-// import {CliCommand} from "../index"
-// import prompts from "prompts"
+import arg from "arg"
+import {CliCommand} from "../index"
+import prompts from "prompts"
+import {
+  capitalize,
+  pluralCamel,
+  pluralPascal,
+  singleCamel,
+  singlePascal,
+  uncapitalize,
+  PageGenerator,
+  FormGenerator,
+  QueriesGenerator,
+  MutationGenerator,
+  MutationsGenerator,
+  ModelGenerator,
+  QueryGenerator,
+} from "@blitzjs/generator"
 
-// const getIsTypeScript = async () =>
-//   require("fs").existsSync(require("path").join(process.cwd(), "tsconfig.json"))
+const getIsTypeScript = async () =>
+  require("fs").existsSync(require("path").join(process.cwd(), "tsconfig.json"))
 
-// enum ResourceType {
-//   All = "all",
-//   Crud = "crud",
-//   Model = "model",
-//   Pages = "pages",
-//   Queries = "queries",
-//   Query = "query",
-//   Mutations = "mutations",
-//   Mutation = "mutation",
-//   Resource = "resource",
-// }
+enum ResourceType {
+  All = "all",
+  Crud = "crud",
+  Model = "model",
+  Pages = "pages",
+  Queries = "queries",
+  Query = "query",
+  Mutations = "mutations",
+  Mutation = "mutation",
+  Resource = "resource",
+}
 
-// function modelName(input: string = "") {
-//   return singleCamel(input)
-// }
-// function modelNames(input: string = "") {
-//   return pluralCamel(input)
-// }
-// function ModelName(input: string = "") {
-//   return singlePascal(input)
-// }
-// function ModelNames(input: string = "") {
-//   return pluralPascal(input)
-// }
+function modelName(input: string = "") {
+  return singleCamel(input)
+}
+function modelNames(input: string = "") {
+  return pluralCamel(input)
+}
+function ModelName(input: string = "") {
+  return singlePascal(input)
+}
+function ModelNames(input: string = "") {
+  return pluralPascal(input)
+}
 
-// const generatorMap = {
-//   [ResourceType.All]: [
-//     PageGenerator,
-//     FormGenerator,
-//     QueriesGenerator,
-//     MutationsGenerator,
-//     ModelGenerator,
-//   ],
-//   [ResourceType.Crud]: [MutationsGenerator, QueriesGenerator],
-//   [ResourceType.Model]: [ModelGenerator],
-//   [ResourceType.Pages]: [PageGenerator, FormGenerator],
-//   [ResourceType.Queries]: [QueriesGenerator],
-//   [ResourceType.Query]: [QueryGenerator],
-//   [ResourceType.Mutations]: [MutationsGenerator],
-//   [ResourceType.Mutation]: [MutationGenerator],
-//   [ResourceType.Resource]: [QueriesGenerator, MutationsGenerator, ModelGenerator],
-// }
+const generatorMap = {
+  [ResourceType.All]: [
+    PageGenerator,
+    FormGenerator,
+    QueriesGenerator,
+    MutationsGenerator,
+    ModelGenerator,
+  ],
+  [ResourceType.Crud]: [MutationsGenerator, QueriesGenerator],
+  [ResourceType.Model]: [ModelGenerator],
+  [ResourceType.Pages]: [PageGenerator, FormGenerator],
+  [ResourceType.Queries]: [QueriesGenerator],
+  [ResourceType.Query]: [QueryGenerator],
+  [ResourceType.Mutations]: [MutationsGenerator],
+  [ResourceType.Mutation]: [MutationGenerator],
+  [ResourceType.Resource]: [QueriesGenerator, MutationsGenerator, ModelGenerator],
+}
 
-// const args = arg(
-//   {
-//     // Types
-//     "--help": Boolean,
-//     "--type": String,
-//     "--name": String,
-//     "--context": String,
-//     "--parent": String,
-//     "--dry-run": Boolean,
-//     "--env": String,
+const args = arg(
+  {
+    // Types
+    "--help": Boolean,
+    "--type": String,
+    "--context": String,
+    "--parent": String,
+    "--dry-run": Boolean,
+    "--env": String,
 
-//     // Aliases
-//     "-e": "--env",
-//     "-n": "--name",
-//     "-t": "--type",
-//     "-c": "--context",
-//     "-p": "--dry-run",
-//   },
-//   {
-//     permissive: true,
-//   },
-// )
+    // Aliases
+    "-e": "--env",
+    "-t": "--type",
+    "-c": "--context",
+    "-p": "--parent",
+    "-d": "--dry-run",
+  },
+  {
+    permissive: true,
+  },
+)
 
-// let selectedType: string | keyof typeof generatorMap
-// let selectedModelName: string | undefined
-// let selectedContext: string | undefined
-// let selectedParent: string | undefined = args["--parent"] ?? undefined
+let selectedType: string | keyof typeof generatorMap
+let selectedModelName: string | undefined
+let selectedContext: string | undefined
+let selectedParent: string | undefined = args["--parent"] ?? undefined
 
-// const getModelNameAndContext = (
-//   modelName: string,
-//   context?: string,
-// ): {model: string; context?: string} => {
-//   const modelSegments = modelName.split(/[\\/]/)
+const getModelNameAndContext = (
+  modelName: string,
+  context?: string,
+): {model: string; context?: string} => {
+  const modelSegments = modelName.split(/[\\/]/)
 
-//   if (modelSegments.length > 1) {
-//     return {
-//       model: modelSegments[modelSegments.length - 1] as string,
-//       context: require("path").join(...modelSegments.slice(0, modelSegments.length - 1)),
-//     }
-//   }
+  if (modelSegments.length > 1) {
+    return {
+      model: modelSegments[modelSegments.length - 1] as string,
+      context: require("path").join(...modelSegments.slice(0, modelSegments.length - 1)),
+    }
+  }
 
-//   if (Boolean(context)) {
-//     const contextSegments = (context as string).split(/[\\/]/)
+  if (Boolean(context)) {
+    const contextSegments = (context as string).split(/[\\/]/)
 
-//     return {
-//       model: modelName,
-//       context: require("path").join(...contextSegments),
-//     }
-//   }
+    return {
+      model: modelName,
+      context: require("path").join(...contextSegments),
+    }
+  }
 
-//   return {
-//     model: modelName,
-//   }
-// }
+  return {
+    model: modelName,
+  }
+}
 
-// const validateModelName = (modelName: string): void => {
-//   const RESERVED_MODEL_NAMES = ["page", "api", "query", "mutation"]
-//   if (RESERVED_MODEL_NAMES.includes(modelName)) {
-//     throw new Error(`Names ${RESERVED_MODEL_NAMES} or their plurals cannot be used as model names`)
-//   }
-//   if (!/^[A-Za-z][A-Za-z0-9_]*$/.test(modelName)) {
-//     throw new Error(
-//       `Invalid model name: "${modelName}". Model names need to adhere to this regular expression: [A-Za-z][A-Za-z0-9_]*`,
-//     )
-//   }
-// }
+const validateModelName = (modelName: string): void => {
+  const RESERVED_MODEL_NAMES = ["page", "api", "query", "mutation"]
+  if (RESERVED_MODEL_NAMES.includes(modelName)) {
+    throw new Error(`Names ${RESERVED_MODEL_NAMES} or their plurals cannot be used as model names`)
+  }
+  if (!/^[A-Za-z][A-Za-z0-9_]*$/.test(modelName)) {
+    throw new Error(
+      `Invalid model name: "${modelName}". Model names need to adhere to this regular expression: [A-Za-z][A-Za-z0-9_]*`,
+    )
+  }
+}
 
-// const determineType = async () => {
-//   if (
-//     !args["_"].slice(1)[0] ||
-//     (args["_"].slice(1)[0] &&
-//       !Object.keys(generatorMap).includes(args["_"].slice(1)[0]?.toLowerCase() as string))
-//   ) {
-//     const res = await prompts({
-//       type: "select",
-//       name: "type",
-//       message: "Which files to generate",
-//       initial: 0,
-//       choices: Object.entries(generatorMap).map((c) => {
-//         return {title: c[0], value: c[0]}
-//       }),
-//     })
+const determineType = async () => {
+  if (
+    !args["_"].slice(1)[0] ||
+    (args["_"].slice(1)[0] &&
+      !Object.keys(generatorMap).includes(args["_"].slice(1)[0]?.toLowerCase() as string))
+  ) {
+    const res = await prompts({
+      type: "select",
+      name: "type",
+      message: "Which files to generate",
+      initial: 0,
+      choices: Object.entries(generatorMap).map((c) => {
+        return {title: c[0], value: c[0]}
+      }),
+    })
 
-//     selectedType = res.type
-//   } else {
-//     selectedType = args["_"].slice(1)[0]?.toLowerCase() as string
-//   }
-// }
+    selectedType = res.type
+  } else {
+    selectedType = args["_"].slice(1)[0]?.toLowerCase() as string
+  }
+}
 
-// const determineName = async () => {
-//   if (!args["_"].slice(1)[1]) {
-//     const res = await prompts({
-//       type: "text",
-//       name: "model",
-//       message: `The name of your model, like "user". Can be singular or plural - same result`,
-//     })
+const determineName = async () => {
+  if (!args["_"].slice(1)[1]) {
+    const res = await prompts({
+      type: "text",
+      name: "model",
+      message: `The name of your model, like "user". Can be singular or plural - same result`,
+    })
 
-//     const {model, context} = getModelNameAndContext(res.model)
-//     selectedModelName = model
-//     selectedContext = context
-//   } else {
-//     const {model, context} = getModelNameAndContext(args["_"].slice(1)[1]!)
-//     selectedModelName = model
-//     selectedContext = context
-//   }
-// }
+    const {model, context} = getModelNameAndContext(res.model)
+    selectedModelName = model
+    selectedContext = context
+  } else {
+    const {model, context} = getModelNameAndContext(args["_"].slice(1)[1]!)
+    selectedModelName = model
+    selectedContext = context
+  }
+}
 
-// const determineContext = async () => {
-//   if (args["--context"] && !selectedModelName) {
-//     if (args["--name"] && args["--name"].includes("/")) {
-//       throw new Error("Your model should not contain a context when supplying a context explicitly")
-//     }
+const determineContext = async () => {
+  if (args["--context"] && selectedModelName && !selectedContext) {
+    selectedContext = args["--context"]
+  }
+}
 
-//     const res = await prompts({
-//       type: "text",
-//       name: "model",
-//       message: `The name of your model, like "user". Can be singular or plural - same result`,
-//     })
+const getHelp = async () => {
+  if (args["--help"]) {
+    console.log(`
+      # The 'crud' type will generate all queries & mutations for a model
 
-//     if (res.model.includes("/")) {
-//       throw new Error("Your model should not contain a context when supplying a context explicitly")
-//     }
-//     const {model, context} = getModelNameAndContext(res.model, args["--context"])
-//     selectedModelName = model
-//     selectedContext = context
-//   }
-// }
+        > blitz generate crud productVariant
 
-// const getHelp = async () => {
-//   if (args["--help"]) {
-//     console.log(`
-//       # The 'crud' type will generate all queries & mutations for a model
+      # The 'all' generator will scaffold out everything possible for a model
 
-//         > blitz generate --type crud --name productVariant
+        > blitz generate all products
 
-//       # The 'all' generator will scaffold out everything possible for a model
+      # The '--context' flag will allow you to generate files such as components, queries & mutations in a nested folder
 
-//         > blitz generate --type all --name products
+        > blitz generate pages projects --context=admin
 
-//       # The '--context' flag will allow you to generate files in a nested folder
+      # Context can also be supplied in the model name directly
 
-//         > blitz generate --type pages --name projects --context admin
+        > blitz generate pages admin/projects
 
-//       # Context can also be supplied in the model name directly
+      # To generate nested routes for dependent models (e.g. Projects that contain Tasks), specify a parent model.
+      For example, this command generates pages under pages/projects/[projectId]/tasks/
 
-//         > blitz generate --type pages --name admin/projects
+        > blitz generate all tasks --parent=projects
 
-//       # To generate nested routes for dependent models (e.g. Projects that contain Tasks), specify a parent model.
-//       For example, this command generates pages under app/tasks/pages/projects/[projectId]/tasks/
+      # Database models can also be generated directly from the CLI.
+        Model fields can be specified with any generator that generates a database model ("all", "model", "resource").
+        Both of the commands below will generate the proper database model for a Task.
 
-//         > blitz generate --type all --name tasks --parent=projects
+        > blitz generate model task name:string completed:boolean:default=false belongsTo:project?
 
-//       # Database models can also be generated directly from the CLI.
-//         Model fields can be specified with any generator that generates a database model ("all", "model", "resource").
-//         Both of the commands below will generate the proper database model for a Task.
+        > blitz generate all tasks name:string completed:boolean:default=false belongsTo:project?
 
-//         > blitz generate --type model --name task name:string completed:boolean:default=false belongsTo:project?
+    `)
 
-//         > blitz generate --type all --name tasks name:string completed:boolean:default=false belongsTo:project?
+    process.exit(0)
+  }
+}
 
-//     `)
+const generate: CliCommand = async () => {
+  await getHelp()
+  await determineType()
+  if (!selectedModelName) {
+    await determineName()
+  }
+  await determineContext()
 
-//     process.exit(0)
-//   }
-// }
+  try {
+    const singularRootContext = modelName(selectedModelName)
+    validateModelName(singularRootContext)
 
-// const generate: CliCommand = async (argv) => {
-//   await getHelp()
-//   await determineType()
-//   await determineContext()
-//   if (!selectedModelName) {
-//     await determineName()
-//   }
+    const generators = generatorMap[selectedType as keyof typeof generatorMap]
 
-//   try {
-//     const singularRootContext = modelName(selectedModelName)
-//     validateModelName(singularRootContext)
+    for (const GeneratorClass of generators) {
+      const generator = new GeneratorClass({
+        destinationRoot: require("path").resolve(),
+        extraArgs: args["_"].slice(3) as string[],
+        modelName: singularRootContext,
+        modelNames: modelNames(singularRootContext),
+        ModelName: ModelName(singularRootContext),
+        ModelNames: ModelNames(singularRootContext),
+        parentModel: modelName(selectedParent),
+        parentModels: modelNames(selectedParent),
+        ParentModel: ModelName(selectedParent),
+        ParentModels: ModelNames(selectedParent),
+        name: uncapitalize(selectedModelName!),
+        Name: capitalize(selectedModelName!),
+        dryRun: args["--dry-run"],
+        context: selectedContext,
+        useTs: await getIsTypeScript(),
+      })
+      await generator.run()
+    }
+  } catch (error) {
+    console.log(error)
+    process.exit(1)
+  }
+}
 
-//     // const {loadConfigProduction} = await import("next/dist/server/config-shared")
-//     // const blitzConfig = loadConfigProduction(process.cwd())
-//     const generators = generatorMap[selectedType as keyof typeof generatorMap]
-
-//     for (const GeneratorClass of generators) {
-//       const generator = new GeneratorClass({
-//         destinationRoot: require("path").resolve(),
-//         // templateDir: blitzConfig.codegen?.templateDir,
-//         extraArgs: args["_"].slice(3) as string[],
-//         modelName: singularRootContext,
-//         modelNames: modelNames(singularRootContext),
-//         ModelName: ModelName(singularRootContext),
-//         ModelNames: ModelNames(singularRootContext),
-//         parentModel: modelName(selectedParent),
-//         parentModels: modelNames(selectedParent),
-//         ParentModel: ModelName(selectedParent),
-//         ParentModels: ModelNames(selectedParent),
-//         name: uncapitalize(selectedModelName!),
-//         Name: capitalize(selectedModelName!),
-//         dryRun: args["--dry-run"],
-//         context: selectedContext,
-//         useTs: await getIsTypeScript(),
-//       })
-//       await generator.run()
-//     }
-//   } catch (error) {
-//     console.log(error)
-//     process.exit(1)
-//   }
-// }
-
-// export {generate}
+export {generate}

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

@@ -8,6 +8,7 @@ import {AppGenerator, AppGeneratorOptions, getLatestVersion} from "@blitzjs/gene
 import {loadEnvConfig} from "../../utils/env"
 import {runPrisma} from "../../utils/run-prisma"
 import {checkLatestVersion} from "../utils/check-latest-version"
+import {codegenTasks} from "../utils/codegen-tasks"
 
 const forms: Record<AppGeneratorOptions["form"], string> = {
   finalform: "React Final Form (recommended)",
@@ -269,6 +270,10 @@ const newApp: CliCommand = async (argv) => {
           )
           const result = await runPrisma(["migrate", "dev", "--name", "Initial migration"], true)
           if (!result.success) throw new Error()
+
+          if (projectPkgManger === "yarn") {
+            await codegenTasks()
+          }
         } catch (error) {
           postInstallSteps.push(
             "blitz prisma migrate dev (when asked, you can name the migration anything)",

packages/blitz/src/cli/index.ts

@@ -31,7 +31,7 @@ const commands = {
   build: () => import("./commands/next/build").then((i) => i.build),
   start: () => import("./commands/next/start").then((i) => i.start),
   new: () => import("./commands/new").then((i) => i.newApp),
-  // generate: () => import("./commands/generate").then((i) => i.generate),
+  generate: () => import("./commands/generate").then((i) => i.generate),
   codegen: () => import("./commands/codegen").then((i) => i.codegen),
   db: () => import("./commands/db").then((i) => i.db),
 }

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

@@ -41,7 +41,7 @@ export const codegenTasks = async () => {
       let prismaSpinner = log.spinner(`Generating Prisma client`).start()
       const result = await runPrisma(["generate"], true)
       if (result.success) {
-        prismaSpinner.succeed()
+        prismaSpinner.succeed(log.greenText("Generated Prisma client"))
       } else {
         prismaSpinner.fail()
         console.log("\n" + result.stderr)

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

@@ -20,6 +20,7 @@ export async function build(config: ServerConfig) {
 
 export async function dev(config: ServerConfig) {
   const {rootFolder, nextBin} = await normalize({...config, env: "dev"})
+  await codegenTasks()
   // void checkLatestVersion()
   if (customServerExists()) {
     console.log("Using your custom server")

packages/blitz/src/cli/utils/read-versions.ts

@@ -58,17 +58,19 @@ export function readVersions() {
   return versions
 }
 
-export function resolveVersionType(version: string) {
+export function resolveVersionType(
+  version: string,
+): "alpha" | "beta" | "canary" | "stable" | "danger" | "latest" {
   if (version.includes("alpha")) {
-    return "alpha" as const
+    return "alpha"
   }
 
   if (version.includes("beta")) {
-    return "beta" as const
+    return "beta"
   }
 
   if (version.includes("danger")) {
-    return "danger" as const
+    return "danger"
   }
 
   if (version.includes("canary")) {

packages/blitz/src/logging.ts

@@ -92,6 +92,10 @@ const withProgress = (str: string) => {
   return withCaret(str)
 }
 
+const greenText = (str: string) => {
+  return `${c.green(str)}`
+}
+
 /**
  * Logs a branded purple message to stdout.
  *
@@ -182,6 +186,7 @@ export const log = {
   progress,
   spinner,
   success,
+  greenText,
   error,
   variable,
   debug,

packages/blitz/src/types.ts

@@ -6,6 +6,10 @@ export interface RouteUrlObject extends Pick<UrlObject, "pathname" | "query"> {
   pathname: string
 }
 
+export const isRouteUrlObject = (x: any): x is RouteUrlObject => {
+  return typeof x === "object" && "pathname" in x && typeof x.pathname === "string"
+}
+
 export type AsyncFunc = (...args: any) => Promise<any>
 
 /**

packages/codemod/CHANGELOG.md

@@ -1,5 +1,54 @@
 # @blitzjs/codemod
 
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- Updated dependencies [176c7b8b]
+  - @blitzjs/generator@2.0.0-alpha.71
+  - blitz@2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- f88702c1: Remove trailing comma when removing BlitzConfig from next.config.js & Fix codemod so if route (eg. `app/auth/pages`) convert to (eg. `pages/`) instead of (eg. `pages/auth`)
+- Updated dependencies [4656e6ec]
+- Updated dependencies [1e0ec7a9]
+  - @blitzjs/generator@2.0.0-alpha.70
+  - blitz@2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- 86af6dec: Wrap middlewares with BlitzServerMiddleware function with codemod
+- 72a332e0: Wrap `blitz.config.ts` with the `withBlitz` function during the codemod step instead of creating a blank `next.config.js` file.
+- 2d1482fc: Allow codemod to finish if `cookiePrefix` is undefined. Then show error at the end of running the codemod.
+- Updated dependencies [fd31e56b]
+- Updated dependencies [6baab190]
+- Updated dependencies [37623a4f]
+  - blitz@2.0.0-alpha.69
+  - @blitzjs/generator@2.0.0-alpha.69
+
+## 2.0.0-alpha.68
+
+### Patch Changes
+
+- 06427f67: Throw error if cookiePrefix is undefined when running codemod
+- f120f672: Add DocumentProps & DocumentContext to the codemod import map
+- 8dfaad08: Set correct packages versions in package.json with upgrade-legacy codemod
+- cb55ed26: Fix codemod to accept a self closing `DocumentHead` in the `_document` page
+- Updated dependencies [271c58ac]
+- Updated dependencies [630c7181]
+- Updated dependencies [f0ca738d]
+- Updated dependencies [41608c4c]
+- Updated dependencies [70b334a2]
+- Updated dependencies [dd299ae8]
+- Updated dependencies [078fe474]
+  - blitz@2.0.0-alpha.68
+  - @blitzjs/generator@2.0.0-alpha.68
+
 ## 2.0.0-alpha.67
 
 ### Patch Changes

packages/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/codemod",
-  "version": "2.0.0-alpha.67",
+  "version": "2.0.0-alpha.71",
   "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.67",
+    "@blitzjs/generator": "2.0.0-alpha.71",
     "arg": "5.0.1",
-    "blitz": "2.0.0-alpha.67",
+    "blitz": "2.0.0-alpha.71",
     "chalk": "^4.1.0",
     "cross-spawn": "7.0.3",
     "debug": "4.3.3",

packages/codemod/src/upgrade-legacy.ts

@@ -1,4 +1,9 @@
-import j, {ImportDeclaration} from "jscodeshift"
+import j, {
+  Expression,
+  ImportDeclaration,
+  ImportDefaultSpecifier,
+  ImportSpecifier,
+} from "jscodeshift"
 import * as fs from "fs-extra"
 import path from "path"
 import {
@@ -11,17 +16,26 @@ import {
   getAllFiles,
   getCollectionFromSource,
   wrapDeclaration,
-  findIdentifier,
   removeImport,
   replaceImport,
   replaceIdentifiers,
+  replaceBlitzPkgsVersions,
 } from "./utils"
 import {log} from "blitz"
 
+const CURRENT_BLITZ_TAG = "alpha"
+
+class ExpectedError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = "Expected Error"
+  }
+}
+
 const isInternalBlitzMonorepoDevelopment = fs.existsSync(
   path.join(__dirname, "../../../blitz-next"),
 )
-
+type Step = {name: string; action: (stepIndex: number) => Promise<void>}
 const upgradeLegacy = async () => {
   let isTypescript = fs.existsSync(path.resolve("tsconfig.json"))
   let blitzConfigFile = `blitz.config.${isTypescript ? "ts" : "js"}`
@@ -29,11 +43,8 @@ const upgradeLegacy = async () => {
   const appDir = path.resolve("app")
   let failedAt =
     fs.existsSync(path.resolve(".migration.json")) && fs.readJSONSync("./.migration.json").failedAt
-
-  let steps: {
-    name: string
-    action: () => Promise<void>
-  }[] = []
+  let collectedErrors: {message: string; step: number}[] = []
+  let steps: Step[] = []
 
   // Add steps in order
 
@@ -43,36 +54,54 @@ const upgradeLegacy = async () => {
       const program = getCollectionFromSource(blitzConfigFile)
       const parsedProgram = program.get()
 
-      // Clear file
-      parsedProgram.value.program.body = []
+      // Remove BlitzConfig type annotation
+      let findBlitzConfigType = program.find(j.Identifier, (node) => node.name === "BlitzConfig")
+      if (findBlitzConfigType) {
+        findBlitzConfigType.forEach((c) => {
+          if (c.name === "typeName") {
+            j(c.parentPath.parentPath).remove()
+          }
+
+          if (c.name === "imported") {
+            j(c.parentPath).remove()
+          }
+        })
+      }
+
+      // Remove all typescript stuff
+      let findTypes = program.find(j.TSType, (node) => node)
+      if (findTypes) {
+        findTypes.forEach((t) => j(t.parentPath).remove())
+      }
 
-      // We create an object property eg. {withBlitz: withBlitz}
       let withBlitz = j.objectProperty(j.identifier("withBlitz"), j.identifier("withBlitz"))
-      // Then set the shorthand to true so we get {withBlitz}
       withBlitz.shorthand = true
+      let config = program.find(j.AssignmentExpression, {
+        left: {
+          type: "MemberExpression",
+          object: {
+            type: "Identifier",
+            name: "module",
+          },
+          property: {
+            type: "Identifier",
+            name: "exports",
+          },
+        },
+      })
+      let createdConfig = config.get().value.right
 
-      /* Declare the variable using the object above that equals to a require expression, eg.
-        const {withBlitz} = require("@blitzjs/next")
-      */
-      let blitzDeclare = j.variableDeclaration("const", [
-        j.variableDeclarator(
-          j.objectPattern([withBlitz]),
-          j.callExpression(j.identifier("require"), [j.stringLiteral("@blitzjs/next")]),
-        ),
-      ])
-      parsedProgram.value.program.body.push(blitzDeclare)
+      addNamedImport(program, "withBlitz", "@blitzjs/next")
+      config.remove()
 
-      // Create the module.exports with the withBlitz callExpression and empty arguments. Giving us module.exports = withBlitz()
-      let moduleExportExpression = j.expressionStatement(
+      let moduleExportStatement = j.expressionStatement(
         j.assignmentExpression(
           "=",
           j.memberExpression(j.identifier("module"), j.identifier("exports")),
-          j.callExpression(j.identifier("withBlitz"), [
-            j.objectExpression([j.objectProperty(j.identifier("blitz"), j.objectExpression([]))]),
-          ]),
+          j.callExpression(j.identifier("withBlitz"), [createdConfig]),
         ),
       )
-      parsedProgram.value.program.body.push(moduleExportExpression)
+      parsedProgram.value.program.body.push(moduleExportStatement)
 
       fs.writeFileSync(path.resolve("next.config.js"), program.toSource())
     },
@@ -81,19 +110,11 @@ const upgradeLegacy = async () => {
   steps.push({
     name: "update dependencies in package.json",
     action: async () => {
-      let packageJsonPath = require(path.resolve("package.json"))
-      packageJsonPath.dependencies["react"] = "latest"
-      packageJsonPath.dependencies["react-dom"] = "latest"
-      packageJsonPath.dependencies["@blitzjs/next"] = "alpha"
-      packageJsonPath.dependencies["@blitzjs/rpc"] = "alpha"
-      packageJsonPath.dependencies["@blitzjs/auth"] = "alpha"
-      packageJsonPath.dependencies["blitz"] = "alpha"
-      packageJsonPath.dependencies["next"] = "latest"
-      packageJsonPath.dependencies["prisma"] = "latest"
-      packageJsonPath.dependencies["@prisma/client"] = "latest"
-      packageJsonPath.devDependencies["typescript"] = isTypescript && "latest"
+      const packageJson = require(path.resolve("package.json"))
 
-      fs.writeFileSync(path.resolve("package.json"), JSON.stringify(packageJsonPath, null, " "))
+      const newPackageJson = await replaceBlitzPkgsVersions(packageJson, CURRENT_BLITZ_TAG)
+
+      fs.writeFileSync(path.resolve("package.json"), JSON.stringify(newPackageJson, null, " "))
     },
   })
 
@@ -111,6 +132,8 @@ const upgradeLegacy = async () => {
 
         Document: "next/document",
         DocumentHead: "next/document",
+        DocumentProps: "next/document",
+        DocumentContext: "next/document",
         Html: "next/document",
         Main: "next/document",
         BlitzScript: "next/document",
@@ -401,14 +424,14 @@ const upgradeLegacy = async () => {
           replaceTemplateValues(blitzClient),
         )
       } else {
-        throw new Error("App directory doesn't exit")
+        throw new ExpectedError("App directory doesn't exit")
       }
     },
   })
 
   steps.push({
     name: "Add cookiePrefix to blitz server",
-    action: async () => {
+    action: async (stepIndex) => {
       const blitzConfigProgram = getCollectionFromSource(blitzConfigFile)
       const cookieIdentifier = blitzConfigProgram.find(
         j.Identifier,
@@ -416,19 +439,28 @@ const upgradeLegacy = async () => {
       )
       if (cookieIdentifier.length) {
         const cookiePrefix = cookieIdentifier.get().parentPath.value.value.value
-        const blitzClientProgram = getCollectionFromSource(
-          path.join(appDir, `blitz-client.${isTypescript ? "ts" : "js"}`),
-        )
-        const cookieIdentifierBlitzClient = blitzClientProgram.find(
-          j.Identifier,
-          (node) => node.name === "cookiePrefix",
-        )
-        cookieIdentifierBlitzClient.get().parentPath.value.value.value = cookiePrefix
+        if (cookiePrefix) {
+          const blitzClientProgram = getCollectionFromSource(
+            path.join(appDir, `blitz-client.${isTypescript ? "ts" : "js"}`),
+          )
+          const cookieIdentifierBlitzClient = blitzClientProgram.find(
+            j.Identifier,
+            (node) => node.name === "cookiePrefix",
+          )
+          cookieIdentifierBlitzClient.get().parentPath.value.value.value = cookiePrefix
 
-        fs.writeFileSync(
-          `${appDir}/blitz-client.${isTypescript ? "ts" : "js"}`,
-          blitzClientProgram.toSource(),
-        )
+          fs.writeFileSync(
+            `${appDir}/blitz-client.${isTypescript ? "ts" : "js"}`,
+            blitzClientProgram.toSource(),
+          )
+        } else {
+          // Show error at end of codemod
+          collectedErrors.push({
+            message:
+              "Detected cookiePrefix is undefined. Please set your cookie prefix manually in app/blitz-client",
+            step: stepIndex,
+          })
+        }
       } else {
         log.error("Cookie Prefix not found in blitz config file")
       }
@@ -456,7 +488,7 @@ const upgradeLegacy = async () => {
 
         pluginArray.get().parentPath.value.value.elements = [
           ...pluginArray.get().parentPath.value.value.elements,
-          ...middlewares,
+          ...middlewares.map((m: Node) => j.template.expression`BlitzServerMiddleware(${m})`),
         ]
 
         let importStatements = []
@@ -483,11 +515,21 @@ const upgradeLegacy = async () => {
         }
 
         importStatements.forEach((s) => blitzServerProgram.get().value.program.body.unshift(s))
+        addNamedImport(blitzServerProgram, "BlitzServerMiddleware", "blitz")
 
         fs.writeFileSync(
           `${appDir}/blitz-server.${isTypescript ? "ts" : "js"}`,
           blitzServerProgram.toSource(),
         )
+
+        // Remove middleware array from next.config.js
+        const nextConfigProgram = getCollectionFromSource(path.resolve("next.config.js"))
+        const nextConfigMiddlewareArray = nextConfigProgram.find(
+          j.Identifier,
+          (node) => node.name === "middleware",
+        )
+        j(nextConfigMiddlewareArray.get().parentPath).remove()
+        fs.writeFileSync(`next.config.js`, nextConfigProgram.toSource())
       } else {
         log.error("Middleware array not found in blit config file")
       }
@@ -583,7 +625,7 @@ const upgradeLegacy = async () => {
                     }
                   } else {
                     arr.push({
-                      model: file,
+                      model: "",
                       path: dirPath + "/" + file + "/pages",
                     })
                     break
@@ -617,6 +659,7 @@ const upgradeLegacy = async () => {
           // If the directory exists without a sub model (sub page directory), loop through the directory manually move each file/directory
           if (fs.existsSync(path.join(path.resolve("pages"), pages.model))) {
             let subs = fs.readdirSync(pages.path)
+
             subs.forEach((sub) => {
               fs.moveSync(
                 path.join(pages.path, sub),
@@ -921,28 +964,58 @@ const upgradeLegacy = async () => {
         )
 
         const importStatements = findImport(program, "next/document")
-        importStatements?.remove()
+
+        let nextDocumentImportPaths: (ImportSpecifier | ImportDefaultSpecifier)[] = []
+        importStatements?.forEach((path) => {
+          path.value.specifiers?.forEach((s) => {
+            if (s.type === "ImportSpecifier") {
+              // Go through the typical imports required for Next.js and build the correct import specifier
+              switch (s.imported.name) {
+                case "Document":
+                  nextDocumentImportPaths.unshift(
+                    j.importDefaultSpecifier(j.identifier("Document")),
+                  )
+                  break
+                case "BlitzScript":
+                  nextDocumentImportPaths.push(j.importSpecifier(j.identifier("NextScript")))
+                  break
+                case "Html":
+                  nextDocumentImportPaths.push(j.importSpecifier(j.identifier("Html")))
+                  break
+                case "Main":
+                  nextDocumentImportPaths.push(j.importSpecifier(j.identifier("Main")))
+                  break
+                case "DocumentHead":
+                  nextDocumentImportPaths.push(j.importSpecifier(j.identifier("Head")))
+                  break
+                case "DocumentProps":
+                  nextDocumentImportPaths.push(j.importSpecifier(j.identifier("DocumentProps")))
+                  break
+                case "DocumentContext":
+                  nextDocumentImportPaths.push(j.importSpecifier(j.identifier("DocumentContext")))
+                  break
+              }
+            }
+          })
+        })
+
+        // Add new import statement to the top of the _document page
         program
           .get()
           .value.program.body.unshift(
-            j.importDeclaration(
-              [
-                j.importDefaultSpecifier(j.identifier("Document")),
-                j.importSpecifier(j.identifier("Html")),
-                j.importSpecifier(j.identifier("Head")),
-                j.importSpecifier(j.identifier("Main")),
-                j.importSpecifier(j.identifier("NextScript")),
-              ],
-              j.stringLiteral("next/document"),
-            ),
+            j.importDeclaration([...nextDocumentImportPaths], j.stringLiteral("next/document")),
           )
+        // Remove the old import statements
+        importStatements?.remove()
 
         const documentHead = program
           .find(j.JSXElement, (node) => node.openingElement.name.name === "DocumentHead")
           .get()
 
         documentHead.value.openingElement.name.name = "Head"
-        documentHead.value.closingElement.name.name = "Head"
+        if (documentHead.value.closingElement) {
+          documentHead.value.closingElement.name.name = "Head"
+        }
 
         const blitzScript = program.find(j.Identifier, (node) => node.name === "BlitzScript").get()
         blitzScript.value.name = "NextScript"
@@ -1026,7 +1099,7 @@ const upgradeLegacy = async () => {
       })
 
       if (errors > 0) {
-        throw new Error("Local middleware is not supported")
+        throw new ExpectedError("Local middleware is not supported")
       }
     },
   })
@@ -1071,7 +1144,7 @@ const upgradeLegacy = async () => {
 
   steps.push({
     name: "check for usages of invokeWithMiddleware",
-    action: async () => {
+    action: async (stepIndex) => {
       let errors = 0
 
       getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
@@ -1093,58 +1166,21 @@ const upgradeLegacy = async () => {
       })
 
       if (errors > 0) {
-        throw new Error(
-          "\n invokeWithMiddleware is not supported. \n Use invokeWithCtx instead: https://canary.blitzjs.com/docs/resolver-server-utilities#invoke-with-ctx \n Fix the files above, then run the codemod again.",
-        )
+        collectedErrors.push({
+          message:
+            "\n invokeWithMiddleware is not supported. \n Use invokeWithCtx instead: https://canary.blitzjs.com/docs/resolver-server-utilities#invoke-with-ctx \n Fix the files above, then run the codemod again.",
+          step: stepIndex,
+        })
+
+        // Write to the migration file so the user can run the migration again from this point
+        failedAt = stepIndex + 1
+        fs.writeJsonSync(".migration.json", {
+          failedAt,
+        })
       }
     },
   })
 
-  // steps.push({
-  //   name: "Update invokeMiddleware to invoke",
-  //   action: async () => {
-  //     getAllFiles(appDir, [], [], [".css"]).forEach((file) => {
-  //       const program = getCollectionFromSource(file)
-  //       const importSpecifier = findImportSpecifier(program, "invokeWithMiddleware")
-  //       importSpecifier?.paths().forEach((path) => {
-  //         path.get().value.imported.name = "invoke"
-  //       })
-
-  //       const invokeWithMiddlewarePath = findCallExpression(program, "invokeWithMiddleware")
-  //       if (invokeWithMiddlewarePath?.length) {
-  //         invokeWithMiddlewarePath?.paths().forEach((path) => {
-  //           path.get().value.callee.name = "invoke"
-  //           if (path.get().value.arguments.length === 3) {
-  //             delete path.get().value.arguments[2]
-  //           }
-  //         })
-  //       }
-
-  //       fs.writeFileSync(path.resolve(file), program.toSource())
-  //     })
-
-  //     getAllFiles(path.resolve("pages"), [], [], [".css"]).forEach((file) => {
-  //       const program = getCollectionFromSource(file)
-  //       const importSpecifier = findImportSpecifier(program, "invokeWithMiddleware")
-  //       importSpecifier?.paths().forEach((path) => {
-  //         path.get().value.imported.name = "invoke"
-  //       })
-
-  //       const invokeWithMiddlewarePath = findCallExpression(program, "invokeWithMiddleware")
-  //       if (invokeWithMiddlewarePath?.length) {
-  //         invokeWithMiddlewarePath?.paths().forEach((path) => {
-  //           path.get().value.callee.name = "invoke"
-  //           if (path.get().value.arguments.length === 3) {
-  //             delete path.get().value.arguments[2]
-  //           }
-  //         })
-  //       }
-
-  //       fs.writeFileSync(path.resolve(file), program.toSource())
-  //     })
-  //   },
-  // })
-
   // Loop through steps and run the action
   if ((failedAt && failedAt < steps.length) || failedAt !== "SUCCESS" || isLegacyBlitz) {
     for (let [index, step] of steps.entries()) {
@@ -1154,8 +1190,15 @@ const upgradeLegacy = async () => {
       }
       const spinner = log.spinner(log.withBrand(`Running ${step.name}...`)).start()
       try {
-        await step.action()
+        await step.action(index)
+        if (collectedErrors.filter((e) => e.step === index).length) {
+          // Soft stored error
+          spinner.fail(`${step.name}`)
+        } else {
+          spinner.succeed(`Successfully ran ${step.name}`)
+        }
       } catch (err) {
+        // Hard exit error
         const error = err as {code: string} | string
         spinner.fail(`${step.name}`)
         log.error(error as string)
@@ -1166,7 +1209,7 @@ const upgradeLegacy = async () => {
               "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 {
+        } else if (!(err instanceof ExpectedError)) {
           log.error(
             log.withBrand(
               "This is an unexpected error. Please ask for help in the discord #general-help channel. https://discord.blitzjs.com",
@@ -1179,10 +1222,12 @@ const upgradeLegacy = async () => {
         })
         process.exit(1)
       }
-
-      spinner.succeed(`Successfully ran ${step.name}`)
     }
-
+    if (collectedErrors.length) {
+      for (const error of collectedErrors) {
+        log.error(`⚠️  ${error.message}`)
+      }
+    }
     fs.writeJsonSync(".migration.json", {
       failedAt: "SUCCESS",
     })

packages/codemod/src/utils.ts

@@ -12,6 +12,8 @@ import j, {
   Identifier,
 } from "jscodeshift"
 import {parseSync} from "@babel/core"
+import {fetchDistTags} from "@blitzjs/generator"
+import {PromiseReturnType} from "blitz"
 
 export function findIdentifier(program: Collection<any>, name: string): Collection<Identifier> {
   return program.find(j.Identifier, (node) => node.name === name)
@@ -326,3 +328,30 @@ export function replaceIdentifiers(
       path.value.name = "NextApiRequest"
     })
 }
+
+export const replaceBlitzPkgsVersions = async (
+  packageJson: {dependencies?: Record<string, any>},
+  npmTag: string,
+) => {
+  let blitzPkgVersion = npmTag
+  const result = await fetchDistTags("blitz")
+  if (npmTag in result) {
+    blitzPkgVersion = result[npmTag]
+  }
+
+  if (!packageJson.dependencies) {
+    packageJson.dependencies = {}
+  }
+
+  packageJson.dependencies["@blitzjs/next"] = blitzPkgVersion
+  packageJson.dependencies["@blitzjs/rpc"] = blitzPkgVersion
+  packageJson.dependencies["@blitzjs/auth"] = blitzPkgVersion
+  packageJson.dependencies["blitz"] = blitzPkgVersion
+  packageJson.dependencies["next"] = "12.2.0"
+
+  // for zod, we want to use the latest version
+  const zodResult = await fetchDistTags("zod")
+  packageJson.dependencies["zod"] = zodResult["latest"] || "latest"
+
+  return packageJson
+}

packages/codemod/tests/codemod.unit.test.ts

@@ -0,0 +1,90 @@
+import {describe, it, expect, vi, afterAll} from "vitest"
+import {replaceBlitzPkgsVersions} from "../src/utils"
+
+describe("replaceBlitzPkgsVersions", () => {
+  afterAll(() => {
+    vi.clearAllMocks()
+  })
+
+  vi.mock("@blitzjs/generator", async () => {
+    return {
+      fetchDistTags: vi.fn((pkg: string) => {
+        if (pkg === "blitz") {
+          return {alpha: "1.0.0", beta: "2.0.0", danger: "3.0.0"}
+        }
+        if (pkg === "zod") {
+          return {latest: "1.2.3"}
+        }
+      }),
+    }
+  })
+
+  const pkgJson = {
+    dependencies: {},
+  }
+
+  it("correctly updates versions with the alpha tag", async () => {
+    expect(await replaceBlitzPkgsVersions(pkgJson, "alpha")).toEqual({
+      dependencies: {
+        blitz: "1.0.0",
+        "@blitzjs/rpc": "1.0.0",
+        "@blitzjs/auth": "1.0.0",
+        "@blitzjs/next": "1.0.0",
+        next: "12.2.0",
+        zod: "1.2.3",
+      },
+    })
+  })
+
+  it("correctly updates versions with the beta tag", async () => {
+    expect(await replaceBlitzPkgsVersions(pkgJson, "beta")).toEqual({
+      dependencies: {
+        blitz: "2.0.0",
+        "@blitzjs/rpc": "2.0.0",
+        "@blitzjs/auth": "2.0.0",
+        "@blitzjs/next": "2.0.0",
+        next: "12.2.0",
+        zod: "1.2.3",
+      },
+    })
+  })
+
+  it("correctly updates versions with the danger tag", async () => {
+    expect(await replaceBlitzPkgsVersions(pkgJson, "danger")).toEqual({
+      dependencies: {
+        blitz: "3.0.0",
+        "@blitzjs/rpc": "3.0.0",
+        "@blitzjs/auth": "3.0.0",
+        "@blitzjs/next": "3.0.0",
+        next: "12.2.0",
+        zod: "1.2.3",
+      },
+    })
+  })
+
+  it("sets version as a provided tag if it wasn't found with fetchDistTag function", async () => {
+    expect(await replaceBlitzPkgsVersions(pkgJson, "custom")).toEqual({
+      dependencies: {
+        blitz: "custom",
+        "@blitzjs/rpc": "custom",
+        "@blitzjs/auth": "custom",
+        "@blitzjs/next": "custom",
+        next: "12.2.0",
+        zod: "1.2.3",
+      },
+    })
+  })
+
+  it("handles package.json without dependecies key", async () => {
+    expect(await replaceBlitzPkgsVersions({}, "custom")).toEqual({
+      dependencies: {
+        blitz: "custom",
+        "@blitzjs/rpc": "custom",
+        "@blitzjs/auth": "custom",
+        "@blitzjs/next": "custom",
+        next: "12.2.0",
+        zod: "1.2.3",
+      },
+    })
+  })
+})

packages/config/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.71
+
+## 2.0.0-alpha.70
+
+## 2.0.0-alpha.69
+
+## 2.0.0-alpha.68
+
 ## 2.0.0-alpha.67
 
 ## 2.0.0-alpha.66

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.71
+
+### Patch Changes
+
+- 176c7b8b: Use correct path for log utilities import
+
+## 2.0.0-alpha.70
+
+### Patch Changes
+
+- 4656e6ec: Print model added or updated in schema.prisma after running model generator
+- 1e0ec7a9: Add `BlitzPage` type to Home pages in app templates
+
+## 2.0.0-alpha.69
+
+### Patch Changes
+
+- fd31e56b: Add back blitz generate command
+- 6baab190: Add type checking to next.config.js files in new app templates
+- 37623a4f: Fix typo in a next.config.js file name
+
+## 2.0.0-alpha.68
+
+### Patch Changes
+
+- 70b334a2: Remove trailing comma from tsconfig.json file in the new app template"
+- dd299ae8: Add ts-jest to dependencies in new app templates
+- 078fe474: Add `@testing-library/jest-dom` to new app dependecies
+
 ## 2.0.0-alpha.67
 
 ### Patch Changes

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.67",
+  "version": "2.0.0-alpha.71",
   "scripts": {
     "dev": "watch unbuild src --wait=0.2",
     "build": "unbuild && pnpm build:templates",
@@ -46,7 +46,7 @@
     "vinyl": "2.2.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.67",
+    "@blitzjs/config": "2.0.0-alpha.71",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",

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

@@ -27,7 +27,7 @@ export interface AppGeneratorOptions extends GeneratorOptions {
   version: string
   skipInstall: boolean
   skipGit: boolean
-  form?: "finalform" | "hookform" | "formik"
+  form: "finalform" | "hookform" | "formik"
   onPostInstall?: () => Promise<void>
 }
 
@@ -120,7 +120,7 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
     ] = await Promise.all([
       fetchLatestVersionsFor(pkg.dependencies),
       fetchLatestVersionsFor(pkg.devDependencies),
-      getBlitzDependencyVersion(this.options.version),
+      getBlitzDependencyVersion(),
     ])
 
     pkg.dependencies = newDependencies

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

@@ -2,6 +2,7 @@ import * as ast from "@mrleebo/prisma-ast"
 import {spawn} from "cross-spawn"
 import which from "npm-which"
 import path from "path"
+import {log} from "../utils/log"
 import {Generator, GeneratorOptions, SourceRootType} from "../generator"
 import {Field} from "../prisma/field"
 import {Model} from "../prisma/model"
@@ -88,8 +89,10 @@ export class ModelGenerator extends Generator<ModelGeneratorOptions> {
           dryRun ? "" : ` ${updatedOrCreated} in schema.prisma`
         }:\n`,
       )
-      ast.printSchema({type: "schema", list: [model]}).split("\n")
-      // .map(log.progress) // todo
+      ast
+        .printSchema({type: "schema", list: [model]})
+        .split("\n")
+        .map(log.progress)
       console.log("\n")
     }
   }

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

@@ -1,6 +1,8 @@
 import {Generator, GeneratorOptions, SourceRootType} from "../generator"
 import {getTemplateRoot} from "../utils/get-template-root"
 import {camelCaseToKebabCase} from "../utils/inflector"
+import {spawn} from "cross-spawn"
+import which from "npm-which"
 
 export interface PageGeneratorOptions extends GeneratorOptions {
   ModelName: string
@@ -67,9 +69,10 @@ export class PageGenerator extends Generator<PageGeneratorOptions> {
   }
 
   async postWrite() {
-    // const {loadConfigProduction} = await import("next/dist/server/config-shared")
-    // const {saveRouteManifest} = await import("next/dist/build/routes")
-    // const config = loadConfigProduction(process.cwd())
-    // await saveRouteManifest(process.cwd(), config)
+    await new Promise<void>((res, rej) => {
+      const blitzBin = which(process.cwd()).sync("blitz")
+      const child = spawn(blitzBin, ["codegen"], {stdio: "inherit"})
+      child.on("exit", (code) => (code === 0 ? res() : rej()))
+    })
   }
 }

packages/generator/src/index.ts

@@ -9,6 +9,8 @@ export * from "./generators/form-generator"
 export * from "./generator"
 export * from "./conflict-checker"
 export {getLatestVersion} from "./utils/get-latest-version"
+export * from "./utils/npm-fetch"
+export * from "./utils/get-blitz-dependency-version"
 export {
   singleCamel,
   singlePascal,

packages/generator/src/utils/get-blitz-dependency-version.ts

@@ -1,16 +1,14 @@
-import {Fallbackable} from "./fallbackable"
 import {logFailedVersionFetch} from "./get-latest-version"
 import {fetchDistTags} from "./npm-fetch"
 
-export const getBlitzDependencyVersion = async (
-  cliVersion: string,
-): Promise<Fallbackable<string>> => {
-  try {
-    // TODO: Need to update this to handle alpha, beta and major
-    const {alpha} = await fetchDistTags("blitz")
+const CURRENT_BLITZ_TAG = "alpha"
 
-    if (alpha) {
-      return {value: alpha}
+export const getBlitzDependencyVersion = async () => {
+  try {
+    const result = await fetchDistTags("blitz")
+
+    if (CURRENT_BLITZ_TAG in result) {
+      return {value: result[CURRENT_BLITZ_TAG]}
     }
 
     logFailedVersionFetch("blitz")

packages/generator/src/utils/log.ts

@@ -67,7 +67,7 @@ export function assignDefaultsBase(userConfig: {[key: string]: any}) {
 export function loadConfigProduction(pagesDir: string) {
   let userConfigModule
   try {
-    const path = join(pagesDir, "next.confi.js")
+    const path = join(pagesDir, "next.config.js")
     debug("Loading config from ", path)
     // eslint-disable-next-line no-eval -- block webpack from following this module path
     userConfigModule = eval("require")(path)

packages/generator/src/utils/npm-fetch.ts

@@ -1,25 +1,23 @@
 import got from "got"
 
 type PackageInformation = any
-type NpmDepResponse = {versions: Record<string, PackageInformation>}
+export type NpmDepResponse = {versions: Record<string, PackageInformation>}
 
 export const fetchAllVersions = async (dependency: string) => {
-  const res = await got(`https://registry.npmjs.org/${dependency}`, {
+  const res = (await got(`https://registry.npmjs.org/${dependency}`, {
     retry: {limit: 3},
     timeout: 3000,
     responseType: "json",
-  }).json<NpmDepResponse>()
+  }).json<NpmDepResponse>()) as unknown as NpmDepResponse
   return Object.keys(res.versions)
 }
 
-type NpmDistTagsResponse = {latest: string; canary: string; alpha: string}
-
 export const fetchDistTags = async (dependency: string) => {
-  const res = await got(`https://registry.npmjs.org/-/package/${dependency}/dist-tags`, {
+  const res = (await got(`https://registry.npmjs.org/-/package/${dependency}/dist-tags`, {
     retry: {limit: 3},
     timeout: 3000,
     responseType: "json",
-  }).json<NpmDistTagsResponse>()
+  }).json()) as unknown as Record<string, any>
   return res
 }
 

packages/generator/templates/app/next.config.js

@@ -1,3 +1,9 @@
+// @ts-check
 const {withBlitz} = require("@blitzjs/next")
 
-module.exports = withBlitz()
+/**
+ * @type {import('@blitzjs/next').BlitzConfig}
+ **/
+const config = {}
+
+module.exports = withBlitz(config)

packages/generator/templates/app/package.js.json

@@ -35,6 +35,7 @@
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",
+    "@testing-library/jest-dom": "5.16.3",
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
     "@types/preview-email": "2.0.1",

packages/generator/templates/app/package.ts.json

@@ -35,6 +35,7 @@
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",
+    "@testing-library/jest-dom": "5.16.3",
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
     "@types/preview-email": "2.0.1",
@@ -50,6 +51,7 @@
     "prettier-plugin-prisma": "3.8.0",
     "pretty-quick": "3.1.3",
     "preview-email": "3.x",
+    "ts-jest": "28.0.7",
     "typescript": "^4.5.3"
   },
   "private": true

packages/generator/templates/app/pages/index.tsx

@@ -6,7 +6,7 @@ import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 import logout from "app/auth/mutations/logout"
 import logo from "public/logo.png"
 import { useMutation } from "@blitzjs/rpc"
-import { Routes } from "@blitzjs/next"
+import { Routes, BlitzPage } from "@blitzjs/next"
 
 /*
  * This file is just for a pleasant getting started page for your new app.
@@ -53,7 +53,7 @@ const UserInfo = () => {
   }
 }
 
-const Home = () => {
+const Home: BlitzPage = () => {
   return (
     <Layout title="Home">
       <div className="container">

packages/generator/templates/app/tsconfig.json

@@ -17,7 +17,7 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "incremental": true,
-    "tsBuildInfoFile": ".tsbuildinfo",
+    "tsBuildInfoFile": ".tsbuildinfo"
   },
   "exclude": ["node_modules", "**/*.e2e.ts", "cypress"],
   "include": ["blitz-env.d.ts", "**/*.ts", "**/*.tsx", "types"]

packages/generator/templates/minimalapp/next.config.js

@@ -1,10 +1,9 @@
-const withBundleAnalyzer = require("@next/bundle-analyzer")({
-  enabled: process.env.ANALYZE === "true",
-})
+// @ts-check
 const {withBlitz} = require("@blitzjs/next")
 
-module.exports = withBlitz(
-  withBundleAnalyzer({
-    reactStrictMode: true,
-  }),
-)
+/**
+ * @type {import('@blitzjs/next').BlitzConfig}
+ **/
+const config = {}
+
+module.exports = withBlitz(config)

packages/generator/templates/minimalapp/package.js.json

@@ -27,6 +27,7 @@
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",
+    "@testing-library/jest-dom": "5.16.3",
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
     "@types/react": "18.0.1",

packages/generator/templates/minimalapp/package.ts.json

@@ -29,6 +29,7 @@
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",
+    "@testing-library/jest-dom": "5.16.3",
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
     "@types/react": "18.0.1",
@@ -41,6 +42,7 @@
     "lint-staged": "12.1.7",
     "prettier": "^2.5.1",
     "pretty-quick": "3.1.3",
+    "ts-jest": "28.0.7",
     "typescript": "^4.5.3"
   },
   "private": true

packages/generator/templates/minimalapp/pages/index.tsx

@@ -1,5 +1,5 @@
 import Image from 'next/image'
-import { NextPage } from "next"
+import { BlitzPage } from "@blitzjs/next"
 import logo from "public/logo.png"
 
 /*
@@ -7,7 +7,7 @@ import logo from "public/logo.png"
  * You can delete everything in here and start from scratch if you like.
  */
 
-const Home: NextPage = () => {
+const Home: BlitzPage = () => {
   return (
     <div className="container">
       <main>