Revert "#3775 Only generate prisma client if it has not been generated (#3780)"

This reverts commit 161270e3b1.

.all-contributorsrc

@@ -3703,6 +3703,15 @@
         "maintenance",
         "doc"
       ]
+    },
+    {
+      "login": "corydeppen",
+      "name": "Cory Deppen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/313264?v=4",
+      "profile": "https://github.com/corydeppen",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/afraid-dancers-juggle.md

@@ -0,0 +1,13 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"@blitzjs/codemod": patch
+"@blitzjs/config": patch
+"@blitzjs/generator": patch
+---
+
+Bump react, react-dom, @types/react and next versions
+
+This fixes a console warning: `Warning: Received `true` for a non-boolean attribute `global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.

.changeset/cyan-bulldogs-heal.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Allow setting static page properties (e.g. `getInitialProps`) on the App component

.changeset/fast-clocks-push.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Fix tsconfig.json referencing blitz-env.d.ts insetad of next-env.d.ts in new app templates

.changeset/fluffy-mangos-begin.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Prevent `Minified react error #419` in production

.changeset/forty-timers-rhyme.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Change ES6 import for `withBlitz` during the codemod to the require syntax.

.changeset/gold-horses-punch.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add vscode debugging configuration to new app templates

.changeset/gorgeous-birds-warn.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add `BlitzPage` types to auth pages in new app template

.changeset/lazy-maps-sort.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Patch Next.js Suspense issue in all node environments. Previously we only patched it in the `development` environment, but now we make sure it gets patched in the `production` env (with the `blitz build` command) as well.

.changeset/long-lobsters-drop.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Include ResetPasswordPage in new app template

.changeset/lucky-months-guess.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Improve RPC logging: print `resolverName()` insetad of `/resolverName()`

.changeset/orange-zebras-reflect.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Fix upgrade-legacy codemod replacing identifiers with an invalid value. Previously new values were hardcoded to `NextApiRequest`. Now we're using correct values provided as `replaceIdentifiers` function argument.

.changeset/poor-walls-relax.md

@@ -0,0 +1,10 @@
+---
+"@blitzjs/codemod": patch
+"@blitzjs/generator": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"@blitzjs/config": patch
+---
+
+Set current Blitz tag to latest

.changeset/pre.json

@@ -22,6 +22,7 @@
     "test-react-query-utils": "0.0.0"
   },
   "changesets": [
+    "afraid-dancers-juggle",
     "big-phones-bow",
     "blue-pigs-tan",
     "breezy-cameras-double",
@@ -52,14 +53,18 @@
     "fast-trainers-kneel",
     "few-dogs-fetch",
     "flat-bees-approve",
+    "fluffy-mangos-begin",
+    "forty-timers-rhyme",
     "four-brooms-juggle",
     "four-meals-fry",
     "four-sheep-judge",
     "fuzzy-bees-warn",
     "fuzzy-jars-admire",
     "gentle-dogs-reply",
+    "gold-horses-punch",
     "good-apes-drum",
     "good-insects-wink",
+    "gorgeous-birds-warn",
     "gorgeous-buses-scream",
     "gorgeous-games-obey",
     "great-candles-stare",
@@ -75,10 +80,12 @@
     "hungry-baboons-swim",
     "kind-walls-suffer",
     "late-steaks-give",
+    "lazy-maps-sort",
     "lemon-games-press",
     "lemon-seas-push",
     "light-donkeys-double",
     "long-bees-hope",
+    "long-lobsters-drop",
     "lovely-berries-sell",
     "lovely-colts-share",
     "lucky-cows-try",
@@ -100,6 +107,7 @@
     "olive-bees-buy",
     "olive-feet-rhyme",
     "olive-sheep-rhyme",
+    "orange-zebras-reflect",
     "perfect-eyes-repeat",
     "perfect-trains-double",
     "plenty-bottles-swim",
@@ -107,8 +115,10 @@
     "poor-peas-lick",
     "poor-penguins-look",
     "poor-shrimps-think",
+    "poor-walls-relax",
     "popular-teachers-pay",
     "pretty-games-march",
+    "purple-donkeys-smash",
     "purple-singers-greet",
     "quick-cycles-confess",
     "quiet-feet-travel",
@@ -138,6 +148,7 @@
     "sour-mails-lick",
     "spicy-beds-float",
     "spotty-dingos-stare",
+    "spotty-peas-hope",
     "stale-jobs-drum",
     "strong-apes-reply",
     "stupid-walls-sell",
@@ -162,6 +173,7 @@
     "two-eyes-knock",
     "two-kiwis-help",
     "two-tigers-type",
+    "two-turtles-poke",
     "unlucky-avocados-fix",
     "unlucky-papayas-sleep",
     "violet-bags-leave",

.changeset/purple-donkeys-smash.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Exit CLI process after `blitz new` command is finished

.changeset/spotty-peas-hope.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Add a new codemod step to update the .eslintrc.js file

.changeset/two-turtles-poke.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Add `Script` as a default import from next.js during the codemod.

.gitignore

@@ -48,13 +48,13 @@ tsconfig.tsbuildinfo
 .next
 dist
 .now
+
 # local env files
 **/.env.local
 **/.env.*.local
 **/.envrc
 .blitz-*
 .blitz-cli-cache
-.vscode
 .tsbuildinfo
 .nvmrc
 **/.test*
@@ -65,7 +65,6 @@ db.sqlite-journal
 **/db/db.sqlite
 test/integration/**/db.json
 test/**/*/out
-test/**/blitz-env.d.ts
-examples/**/blitz-env.d.ts
+test/**/next-env.d.ts
+examples/**/next-env.d.ts
 .blitz**
-

CONTRIBUTING.md

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

README.md

@@ -6,7 +6,7 @@
     <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
   </a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-391-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-393-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/main/LICENSE">
     <img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -713,7 +713,10 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <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>
+    <td align="center"><a href="http://jins.dev"><img src="https://avatars.githubusercontent.com/u/39466936?v=4?s=100" 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>
+  <tr>
+    <td align="center"><a href="https://github.com/corydeppen"><img src="https://avatars.githubusercontent.com/u/313264?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cory Deppen</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=corydeppen" title="Documentation">📖</a></td>
   </tr>
 </table>
 

apps/toolkit-app/.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Blitz: debug server-side",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "pnpm start:dev"
+    },
+    {
+      "name": "Blitz: debug client-side",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:3000"
+    },
+    {
+      "name": "Blitz: debug full stack",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "pnpm start:dev",
+      "serverReadyAction": {
+        "pattern": "started server on .+, url: (https?://.+)",
+        "uriFormat": "%s",
+        "action": "debugWithChrome"
+      }
+    }
+  ]
+}

apps/toolkit-app/mailers/forgotPasswordMailer.ts

@@ -13,7 +13,7 @@ type ResetPasswordMailer = {
 export function forgotPasswordMailer({ to, token }: ResetPasswordMailer) {
   // In production, set APP_ORIGIN to your production server origin
   const origin = process.env.APP_ORIGIN || process.env.BLITZ_DEV_SERVER_ORIGIN
-  const resetUrl = `${origin}/reset-password?token=${token}`
+  const resetUrl = `${origin}/auth/reset-password?token=${token}`
 
   const msg = {
     from: "TODO@example.com",

apps/toolkit-app/package.json

@@ -29,11 +29,11 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-beta.0",
-    "next": "12.2.0",
+    "blitz": "workspace:2.0.0-beta.3",
+    "next": "12.2.5",
     "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "react-hook-form": "7.29.0",
     "ts-node": "10.7.0",
     "zod": "3.17.3"
@@ -45,7 +45,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
     "@types/preview-email": "2.0.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "@typescript-eslint/eslint-plugin": "5.9.1",
     "eslint": "7.32.0",
     "eslint-config-next": "12.2.0",

apps/toolkit-app/pages/auth/forgot-password.tsx

@@ -4,8 +4,9 @@ import { Form, FORM_ERROR } from "app/core/components/Form"
 import { ForgotPassword } from "app/auth/validations"
 import forgotPassword from "app/auth/mutations/forgotPassword"
 import { useMutation } from "@blitzjs/rpc"
+import { BlitzPage } from "@blitzjs/next"
 
-const ForgotPasswordPage = () => {
+const ForgotPasswordPage: BlitzPage = () => {
   const [forgotPasswordMutation, { isSuccess }] = useMutation(forgotPassword)
 
   return (

apps/toolkit-app/pages/auth/login.tsx

@@ -1,8 +1,9 @@
 import Layout from "app/core/layouts/Layout"
 import { LoginForm } from "app/auth/components/LoginForm"
 import { useRouter } from "next/router"
+import { BlitzPage } from "@blitzjs/next"
 
-const LoginPage = () => {
+const LoginPage: BlitzPage = () => {
   const router = useRouter()
 
   return (

apps/toolkit-app/pages/auth/reset-password.tsx

@@ -0,0 +1,66 @@
+import Layout from "app/core/layouts/Layout"
+import { LabeledTextField } from "app/core/components/LabeledTextField"
+import { Form, FORM_ERROR } from "app/core/components/Form"
+import { ResetPassword } from "app/auth/validations"
+import resetPassword from "app/auth/mutations/resetPassword"
+import { BlitzPage, Routes } from "@blitzjs/next"
+import { useRouter } from "next/router"
+import { useMutation } from "@blitzjs/rpc"
+import Link from "next/link"
+
+const ResetPasswordPage: BlitzPage = () => {
+  const router = useRouter()
+  const [resetPasswordMutation, { isSuccess }] = useMutation(resetPassword)
+
+  return (
+    <div>
+      <h1>Set a New Password</h1>
+
+      {isSuccess ? (
+        <div>
+          <h2>Password Reset Successfully</h2>
+          <p>
+            Go to the <Link href={Routes.Home()}>homepage</Link>
+          </p>
+        </div>
+      ) : (
+        <Form
+          submitText="Reset Password"
+          schema={ResetPassword}
+          initialValues={{
+            password: "",
+            passwordConfirmation: "",
+            token: router.query.token as string,
+          }}
+          onSubmit={async (values) => {
+            try {
+              await resetPasswordMutation(values)
+            } catch (error: any) {
+              if (error.name === "ResetPasswordError") {
+                return {
+                  [FORM_ERROR]: error.message,
+                }
+              } else {
+                return {
+                  [FORM_ERROR]: "Sorry, we had an unexpected error. Please try again.",
+                }
+              }
+            }
+          }}
+        >
+          <LabeledTextField name="password" label="New Password" type="password" />
+          <LabeledTextField
+            name="passwordConfirmation"
+            label="Confirm New Password"
+            type="password"
+          />
+        </Form>
+      )}
+    </div>
+  )
+}
+
+ResetPasswordPage.redirectAuthenticatedTo = "/"
+ResetPasswordPage.getLayout = (page) => <Layout title="Reset Your Password">{page}</Layout>
+
+export default ResetPasswordPage

apps/toolkit-app/pages/auth/signup.tsx

@@ -1,9 +1,9 @@
 import { useRouter } from "next/router"
 import Layout from "app/core/layouts/Layout"
 import { SignupForm } from "app/auth/components/SignupForm"
-import { Routes } from "@blitzjs/next"
+import { BlitzPage, Routes } from "@blitzjs/next"
 
-const SignupPage = () => {
+const SignupPage: BlitzPage = () => {
   const router = useRouter()
 
   return (

apps/toolkit-app/tsconfig.json

@@ -20,5 +20,5 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "exclude": ["node_modules", "**/*.e2e.ts", "cypress"],
-  "include": ["blitz-env.d.ts", "**/*.ts", "**/*.tsx", "types"]
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"]
 }

apps/web/package.json

@@ -25,17 +25,17 @@
     "@types/passport-twitter": "1.0.37",
     "blitz": "workspace:*",
     "jest": "27.5.1",
-    "next": "12.2.0",
+    "next": "12.2.5",
     "passport-mock-strategy": "2.0.0",
     "passport-twitter": "1.0.4",
     "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "ts-node": "10.7.0"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "eslint": "7.32.0",
     "typescript": "^4.5.3"
   }

integration-tests/auth/package.json

@@ -19,17 +19,17 @@
     "@prisma/client": "4.0.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.2.0",
+    "next": "12.2.5",
     "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@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",
+    "@types/react": "18.0.17",
     "b64-lite": "1.4.0",
     "eslint": "7.32.0",
     "fs-extra": "10.0.1",

integration-tests/get-initial-props/.env

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

integration-tests/get-initial-props/.eslintrc.js

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

integration-tests/get-initial-props/.gitignore

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

integration-tests/get-initial-props/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: "trailing-slash-tests-cookie-prefix",
+    }),
+    BlitzRpcPlugin({}),
+  ],
+})
+
+export {withBlitz}

integration-tests/get-initial-props/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: "trailing-slash-tests-cookie-prefix",
+      storage: PrismaStorage(db),
+      isAuthorized: simpleRolesIsAuthorized,
+    }),
+  ],
+})
+
+export {gSSP, gSP, api}

integration-tests/get-initial-props/app/queries/getBasic.ts

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

integration-tests/get-initial-props/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/get-initial-props/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/get-initial-props/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/get-initial-props/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/get-initial-props/db/seed.ts

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

integration-tests/get-initial-props/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/get-initial-props/next.config.js

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

integration-tests/get-initial-props/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "test-trailing-slash",
+  "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.5",
+    "prisma": "4.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.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.17",
+    "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/get-initial-props/pages/_app.tsx

@@ -0,0 +1,46 @@
+import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
+import {AuthenticationError, AuthorizationError} from "blitz"
+import App, {AppContext} from "next/app"
+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, testProp}: AppProps & {testProp: any}) {
+  return (
+    <Suspense fallback="Loading...">
+      <ErrorBoundary FallbackComponent={RootErrorFallback}>
+        <Component {...pageProps} testProp={testProp} />
+      </ErrorBoundary>
+    </Suspense>
+  )
+}
+
+MyApp.getInitialProps = async (context: AppContext) => {
+  const props = await App.getInitialProps(context)
+
+  return {
+    ...props,
+    testProp: "_app.tsx: testing getInitialProps",
+  }
+}
+
+export default withBlitz(MyApp)

integration-tests/get-initial-props/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/get-initial-props/pages/index.tsx

@@ -0,0 +1,22 @@
+import {NextPage} from "next"
+import {Suspense} from "react"
+
+const Page: NextPage = (props) => {
+  return (
+    <div id="page">
+      <Suspense fallback={"Loading..."}>
+        <div id="content">{JSON.stringify(props, null, 2)}</div>
+      </Suspense>
+    </div>
+  )
+}
+
+Page.getInitialProps = async (context) => {
+  return {
+    props: {
+      anotherTestProp: "index.tsx: testing getInitialProps",
+    },
+  }
+}
+
+export default Page

integration-tests/get-initial-props/test/index.test.ts

@@ -0,0 +1,67 @@
+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("getInitialProps", () => {
+    it(
+      "should render a custom prop provided in getInitialProps in _app.tsx",
+      async () => {
+        const browser = await webdriver(appPort, "/")
+        await browser.waitForElementByCss("#content", 0)
+        const text = await browser.elementByCss("#content").text()
+        expect(text).toMatch(/_app.tsx: testing getInitialProps/)
+        if (browser) await browser.close()
+      },
+      5000 * 60 * 2,
+    )
+    it(
+      "should render custom props provided in getInitialProps in both _app.tsx and index.tsx",
+      async () => {
+        const browser = await webdriver(appPort, "/")
+        await browser.waitForElementByCss("#content", 0)
+        const text = await browser.elementByCss("#content").text()
+        expect(text).toMatch(/_app.tsx: testing getInitialProps/)
+        expect(text).toMatch(/index.tsx: testing getInitialProps/)
+        if (browser) await browser.close()
+      },
+      5000 * 60 * 2,
+    )
+  })
+}
+
+describe("getInitialProps 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/get-initial-props/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/get-initial-props/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
+    }
+  }
+}

integration-tests/middleware/package.json

@@ -15,16 +15,16 @@
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
     "blitz": "workspace:*",
-    "next": "12.2.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "next": "12.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@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",
+    "@types/react": "18.0.17",
     "eslint": "7.32.0",
     "fs-extra": "10.0.1",
     "get-port": "6.1.2",

integration-tests/no-suspense/package.json

@@ -19,10 +19,10 @@
     "@prisma/client": "4.0.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.2.0",
+    "next": "12.2.5",
     "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@blitzjs/config": "workspace:*",
@@ -30,7 +30,7 @@
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "b64-lite": "1.4.0",
     "eslint": "7.32.0",
     "fs-extra": "10.0.1",

integration-tests/qm/package.json

@@ -15,14 +15,14 @@
     "@prisma/client": "4.0.0",
     "@tanstack/react-query": "4.0.10",
     "blitz": "workspace:*",
-    "next": "12.2.0",
+    "next": "12.2.5",
     "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@testing-library/react": "13.0.0",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "@vitejs/plugin-react": "1.3.0",
     "delay": "5.0.0",
     "eslint": "7.32.0",

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

@@ -22,10 +22,10 @@
     "@prisma/client": "4.0.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.2.0",
+    "next": "12.2.5",
     "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@blitzjs/config": "workspace:*",
@@ -33,7 +33,7 @@
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "b64-lite": "1.4.0",
     "eslint": "7.32.0",
     "fs-extra": "10.0.1",

integration-tests/rpc/package.json

@@ -12,15 +12,15 @@
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
     "blitz": "workspace:*",
-    "next": "12.2.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "next": "12.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "b64-lite": "1.4.0",
     "eslint": "7.32.0",
     "fs-extra": "10.0.1",

integration-tests/trailing-slash/package.json

@@ -22,10 +22,10 @@
     "@prisma/client": "4.0.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.2.0",
+    "next": "12.2.5",
     "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@blitzjs/config": "workspace:*",
@@ -33,7 +33,7 @@
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "b64-lite": "1.4.0",
     "eslint": "7.32.0",
     "fs-extra": "10.0.1",

integration-tests/utils/package.json

@@ -10,7 +10,7 @@
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "@types/rimraf": "3.0.2",
     "@types/selenium-webdriver": "4.0.18",
     "chromedriver": "100.0.0",
@@ -22,8 +22,8 @@
     "node-fetch": "3.2.3",
     "pkg-dir": "5.0.0",
     "playwright-chromium": "1.14.1",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "resolve-cwd": "3.0.0",
     "resolve-from": "5.0.0",
     "rimraf": "3.0.2",

package.json

@@ -28,7 +28,7 @@
     "husky": "7.0.4",
     "jsdom": "^19.0.0",
     "lint-staged": "12.1.7",
-    "next": "12.2.0",
+    "next": "12.2.5",
     "only-allow": "1.1.0",
     "prettier": "^2.5.1",
     "prettier-plugin-prisma": "3.8.0",

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @blitzjs/auth
 
+## 2.0.0-beta.3
+
+### Patch Changes
+
+- Updated dependencies [638f2319]
+  - blitz@2.0.0-beta.3
+
+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- Updated dependencies [db7233db]
+- Updated dependencies [0936cb38]
+- Updated dependencies [3f9fe8f0]
+  - blitz@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+  - blitz@2.0.0-beta.1
+
 ## 2.0.0-beta.72
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.3",
   "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-beta.0",
+    "blitz": "2.0.0-beta.3",
     "cookie": "0.4.1",
     "cookie-session": "2.0.0",
     "debug": "4.3.3",
@@ -40,16 +40,16 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.0",
+    "@blitzjs/config": "workspace:2.0.0-beta.3",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/cookie": "0.4.1",
     "@types/debug": "4.1.7",
     "@types/jsonwebtoken": "8.5.8",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "typescript": "^4.5.3",
     "unbuild": "0.7.6",
     "watch": "1.0.2"

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @blitzjs/next
 
+## 2.0.0-beta.3
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-beta.3
+
+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- Updated dependencies [db7233db]
+  - @blitzjs/rpc@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+- Updated dependencies [0f4926fd]
+  - @blitzjs/rpc@2.0.0-beta.1
+
 ## 2.0.0-beta.72
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.3",
   "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-beta.0",
+    "@blitzjs/rpc": "2.0.0-beta.3",
     "@tanstack/react-query": "4.0.10",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
@@ -34,22 +34,22 @@
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.0",
+    "@blitzjs/config": "workspace:2.0.0-beta.3",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@testing-library/user-event": "13.5.0",
     "@types/node": "17.0.16",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-beta.0",
+    "blitz": "2.0.0-beta.3",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
-    "next": "12.2.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "next": "12.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "resolve-from": "5.0.0",
     "ts-jest": "27.1.4",
     "typescript": "^4.5.3",

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

@@ -30,9 +30,10 @@ const buildWithBlitz = <TPlugins extends readonly ClientPlugin<object>[]>(plugin
   const providers = plugins.reduce((acc, plugin) => {
     return plugin.withProvider ? acc.concat(plugin.withProvider) : acc
   }, [] as BlitzProviderType[])
+
   const withPlugins = compose(...providers)
 
-  return function withBlitzAppRoot(UserAppRoot: React.ComponentType<any>) {
+  return function withBlitzAppRoot(UserAppRoot: React.ComponentType<AppProps>) {
     const BlitzOuterRoot = (props: AppProps) => {
       const component = React.useMemo(() => withPlugins(props.Component), [props.Component])
 
@@ -46,13 +47,14 @@ const buildWithBlitz = <TPlugins extends readonly ClientPlugin<object>[]>(plugin
       return (
         <BlitzProvider dehydratedState={props.pageProps?.dehydratedState}>
           <>
-            {/* @ts-ignore todo */}
             {props.Component.suppressFirstRenderFlicker && <NoPageFlicker />}
             <UserAppRoot {...props} Component={component} />
           </>
         </BlitzProvider>
       )
     }
+
+    Object.assign(BlitzOuterRoot, UserAppRoot)
     return withSuperJSONPage(BlitzOuterRoot)
   }
 }
@@ -146,10 +148,9 @@ const setupBlitzClient = <TPlugins extends readonly ClientPlugin<object>[]>({
 
   // todo: finish this
   // Used to build BlitzPage type
-  const types = {} as {plugins: typeof plugins}
+  // const types = {} as {plugins: typeof plugins}
 
   return {
-    types,
     withBlitz,
     ...(exports as PluginsExports<TPlugins>),
   }

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @blitzjs/rpc
 
+## 2.0.0-beta.3
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-beta.3
+
+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- Updated dependencies [db7233db]
+  - @blitzjs/auth@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+- Updated dependencies [0f4926fd]
+  - @blitzjs/auth@2.0.0-beta.1
+
 ## 2.0.0-beta.72
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.3",
   "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-beta.0",
+    "@blitzjs/auth": "2.0.0-beta.3",
     "@tanstack/react-query": "4.0.10",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
@@ -30,14 +30,14 @@
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.0",
+    "@blitzjs/config": "workspace:2.0.0-beta.3",
     "@types/debug": "4.1.7",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.0",
-    "next": "12.2.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "blitz": "2.0.0-beta.3",
+    "next": "12.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "typescript": "^4.5.3",
     "unbuild": "0.7.6",
     "watch": "1.0.2",

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

@@ -158,7 +158,7 @@ export function rpcHandler(config: RpcConfig) {
     const routePath = "/" + relativeRoutePath
 
     const log = baseLogger().getChildLogger({
-      prefix: [routePath.replace("/api/rpc/", "") + "()"],
+      prefix: [routePath.replace(/(\/api\/rpc)?\//, "") + "()"],
     })
     const customChalk = new chalk.Instance({
       level: log.settings.type === "json" ? 0 : chalk.level,

packages/blitz/CHANGELOG.md

@@ -1,5 +1,35 @@
 # blitz
 
+## 2.0.0-beta.3
+
+### Patch Changes
+
+- 638f2319: Prevent `Minified react error #419` in production
+- Updated dependencies [b72d1215]
+  - @blitzjs/generator@2.0.0-beta.3
+
+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- 0936cb38: Patch Next.js Suspense issue in all node environments. Previously we only patched it in the `development` environment, but now we make sure it gets patched in the `production` env (with the `blitz build` command) as well.
+- 3f9fe8f0: Exit CLI process after `blitz new` command is finished
+- Updated dependencies [db7233db]
+- Updated dependencies [eb971568]
+- Updated dependencies [8ada2c26]
+  - @blitzjs/generator@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- Updated dependencies [0f4926fd]
+  - @blitzjs/generator@2.0.0-beta.1
+
 ## 2.0.0-beta.72
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.3",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-beta.0",
+    "@blitzjs/generator": "2.0.0-beta.3",
     "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-beta.0",
+    "@blitzjs/config": "workspace:2.0.0-beta.3",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",
@@ -67,12 +67,12 @@
     "@types/node-fetch": "2.6.1",
     "@types/npm-which": "3.0.1",
     "@types/prompts": "2.0.14",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
     "@types/test-listen": "1.1.0",
     "@types/watchpack": "1.1.1",
     "express": "4.17.3",
-    "react": "18.0.0",
+    "react": "18.2.0",
     "test-listen": "1.1.0",
     "typescript": "^4.5.3",
     "unbuild": "0.7.6",

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

@@ -300,8 +300,10 @@ const newApp: CliCommand = async (argv) => {
       console.log(chalk.yellow(`   ${index + 1}. ${step}`))
     })
     console.log("") // new line
+    process.exit(0)
   } catch (error) {
     console.error(error)
+    process.exit(1)
   }
 }
 

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

@@ -19,7 +19,7 @@ export const codegenTasks = async () => {
       .toString()
       .replace(
         /ReactDOM\.hydrateRoot\(.*?\);/,
-        `ReactDOM.hydrateRoot(domEl, reactEl, process.env.NODE_ENV === 'development' ? {onRecoverableError: (err) => err.toString().includes("could not finish this Suspense boundary") ? null : console.error(err)} : undefined);`,
+        `ReactDOM.hydrateRoot(domEl, reactEl, {onRecoverableError: (err) => (err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : console.error(err)});`,
       )
     await fs.writeFile(nextClientIndex, updatedFile)
     log.success("Next.js was successfully patched with a React Suspense fix")

packages/blitz/src/utils/index.ts

@@ -104,7 +104,6 @@ export function compose(middleware: RequestMiddleware<any, any>[]) {
       }
 
       try {
-        console.log(`[${handler.name}] Starting handler...`)
         return Promise.resolve(handler(req, res, dispatch.bind(null, i + 1)))
       } catch (err) {
         return Promise.reject(err)

packages/codemod/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @blitzjs/codemod
 
+## 2.0.0-beta.3
+
+### Patch Changes
+
+- 2313fa61: Fix upgrade-legacy codemod replacing identifiers with an invalid value. Previously new values were hardcoded to `NextApiRequest`. Now we're using correct values provided as `replaceIdentifiers` function argument.
+- 1bf185d6: Add a new codemod step to update the .eslintrc.js file
+- Updated dependencies [638f2319]
+- Updated dependencies [b72d1215]
+  - blitz@2.0.0-beta.3
+  - @blitzjs/generator@2.0.0-beta.3
+
+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- a3b5fdd0: Change ES6 import for `withBlitz` during the codemod to the require syntax.
+- ebfb562b: Add `Script` as a default import from next.js during the codemod.
+- Updated dependencies [db7233db]
+- Updated dependencies [eb971568]
+- Updated dependencies [0936cb38]
+- Updated dependencies [8ada2c26]
+- Updated dependencies [3f9fe8f0]
+  - blitz@2.0.0-beta.2
+  - @blitzjs/generator@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+- Updated dependencies [0f4926fd]
+  - @blitzjs/generator@2.0.0-beta.1
+  - blitz@2.0.0-beta.1
+
 ## 2.0.0-beta.72
 
 ### Patch Changes

packages/codemod/package.json

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

packages/codemod/src/upgrade-legacy.ts

@@ -23,7 +23,7 @@ import {
 } from "./utils"
 import {log} from "blitz"
 
-const CURRENT_BLITZ_TAG = "alpha"
+const CURRENT_BLITZ_TAG = "latest"
 
 class ExpectedError extends Error {
   constructor(message: string) {
@@ -90,8 +90,14 @@ const upgradeLegacy = async () => {
         },
       })
       let createdConfig = config.get().value.right
-
-      addNamedImport(program, "withBlitz", "@blitzjs/next")
+      let importWithBlitz = j.expressionStatement(
+        j.assignmentExpression(
+          "=",
+          j.identifier("const { withBlitz }"),
+          j.callExpression(j.identifier("require"), [j.identifier(`"@blitzjs/next"`)]),
+        ),
+      )
+      parsedProgram.value.program.body.unshift(importWithBlitz)
       config.remove()
 
       let moduleExportStatement = j.expressionStatement(
@@ -107,6 +113,31 @@ const upgradeLegacy = async () => {
     },
   })
 
+  steps.push({
+    name: "update .eslintrc.js configuration",
+    action: async (stepIndex) => {
+      if (fs.existsSync(path.resolve(".eslintrc.js"))) {
+        const program = getCollectionFromSource(".eslintrc.js")
+        const parsedProgram = program.get()
+        parsedProgram.value.program.body = []
+        const moduleExport = j.expressionStatement(
+          j.assignmentExpression(
+            "=",
+            j.memberExpression(j.identifier("module"), j.identifier("exports")),
+            j.callExpression(j.identifier("require"), [j.identifier(`"@blitzjs/next/eslint"`)]),
+          ),
+        )
+        parsedProgram.value.program.body.push(moduleExport)
+        fs.writeFileSync(path.resolve(".eslintrc.js"), program.toSource())
+      } else {
+        collectedErrors.push({
+          message: ".eslintrc.js does not exist",
+          step: stepIndex,
+        })
+      }
+    },
+  })
+
   steps.push({
     name: "update dependencies in package.json",
     action: async () => {
@@ -257,6 +288,7 @@ const upgradeLegacy = async () => {
         const nextLink = findImport(program, "next/link")
         const nextHead = findImport(program, "next/head")
         const dynamic = findImport(program, "next/dynamic")
+        const nextScript = findImport(program, "next/script")
 
         if (nextImage?.length) {
           nextImage.remove()
@@ -270,6 +302,18 @@ const upgradeLegacy = async () => {
             )
         }
 
+        if (nextScript?.length) {
+          nextScript.remove()
+          program
+            .get()
+            .value.program.body.unshift(
+              j.importDeclaration(
+                [j.importDefaultSpecifier(j.identifier("Script"))],
+                j.stringLiteral("next/script"),
+              ),
+            )
+        }
+
         if (nextLink?.length) {
           nextLink.remove()
           program
@@ -1008,18 +1052,23 @@ const upgradeLegacy = async () => {
         // Remove the old import statements
         importStatements?.remove()
 
-        const documentHead = program
-          .find(j.JSXElement, (node) => node.openingElement.name.name === "DocumentHead")
-          .get()
+        const document = program.find(
+          j.JSXElement,
+          (node) => node.openingElement.name.name === "DocumentHead",
+        )
 
-        documentHead.value.openingElement.name.name = "Head"
-        if (documentHead.value.closingElement) {
-          documentHead.value.closingElement.name.name = "Head"
+        if (document.length) {
+          const documentHead = document.get()
+          documentHead.value.openingElement.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"
         }
 
-        const blitzScript = program.find(j.Identifier, (node) => node.name === "BlitzScript").get()
-        blitzScript.value.name = "NextScript"
-
         fs.writeFileSync(
           path.join(pagesDir, `_document.${isTypescript ? "tsx" : "jsx"}`),
           program.toSource(),
@@ -1033,25 +1082,27 @@ const upgradeLegacy = async () => {
     action: async () => {
       const pagesDir = path.resolve("pages")
       getAllFiles(pagesDir, [], ["api"], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
-        const program = getCollectionFromSource(file)
-
-        // 1. getServerSideProps
-        const getServerSidePropsPath = findFunction(program, "getServerSideProps")
-        if (getServerSidePropsPath) {
-          getServerSidePropsPath.forEach((path) =>
-            wrapDeclaration(path, "getServerSideProps", "gSSP"),
-          )
-          addNamedImport(program, "gSSP", "app/blitz-server")
+        try {
+          const program = getCollectionFromSource(file)
+          // 1. getServerSideProps
+          const getServerSidePropsPath = findFunction(program, "getServerSideProps")
+          if (getServerSidePropsPath) {
+            getServerSidePropsPath.forEach((path) =>
+              wrapDeclaration(path, "getServerSideProps", "gSSP"),
+            )
+            addNamedImport(program, "gSSP", "app/blitz-server")
+          }
+          // 2. getStaticProps
+          const getStaticPropsPath = findFunction(program, "getStaticProps")
+          if (getStaticPropsPath) {
+            getStaticPropsPath.forEach((path) => wrapDeclaration(path, "getStaticProps", "gSP"))
+            addNamedImport(program, "gSP", "app/blitz-server")
+          }
+          fs.writeFileSync(path.join(path.resolve(file)), program.toSource())
+        } catch (e:any) {
+          log.error(`Error in wrapping getServerSideProps, getStaticProps in ${file}`)
+          throw new Error(e)
         }
-
-        // 2. getStaticProps
-        const getStaticPropsPath = findFunction(program, "getStaticProps")
-        if (getStaticPropsPath) {
-          getStaticPropsPath.forEach((path) => wrapDeclaration(path, "getStaticProps", "gSP"))
-          addNamedImport(program, "gSP", "app/blitz-server")
-        }
-
-        fs.writeFileSync(path.join(path.resolve(file)), program.toSource())
       })
 
       // 3. api
@@ -1062,22 +1113,25 @@ const upgradeLegacy = async () => {
           ["rpc"],
           [".ts", ".tsx", ".js", ".jsx"],
         ).forEach((file) => {
-          const program = getCollectionFromSource(file)
+          try {
+            const program = getCollectionFromSource(file)
+            const defaultExportPath = findDefaultExportPath(program)
+            if (defaultExportPath) {
+              const {node} = defaultExportPath
 
-          const defaultExportPath = findDefaultExportPath(program)
+              if (node.declaration.type === "Identifier") {
+                node.declaration = j.callExpression(j.identifier("api"), [node.declaration as any])
+                addNamedImport(program, "api", "app/blitz-server")
+              } else if (node.declaration.type === "FunctionDeclaration") {
+                node.declaration = j.template.expression`api(${node.declaration})`
+                addNamedImport(program, "api", "app/blitz-server")
+              }
 
-          if (defaultExportPath) {
-            const {node} = defaultExportPath
-
-            if (node.declaration.type === "Identifier") {
-              node.declaration = j.callExpression(j.identifier("api"), [node.declaration as any])
-              addNamedImport(program, "api", "app/blitz-server")
-            } else if (node.declaration.type === "FunctionDeclaration") {
-              node.declaration = j.template.expression`api(${node.declaration})`
-              addNamedImport(program, "api", "app/blitz-server")
+              fs.writeFileSync(path.join(path.resolve(file)), program.toSource())
             }
-
-            fs.writeFileSync(path.join(path.resolve(file)), program.toSource())
+          } catch (e:any) {
+            log.error(`Error in wrapping api in ${file}`)
+            throw new Error(e)
           }
         })
       }

packages/codemod/src/utils.ts

@@ -325,7 +325,7 @@ export function replaceIdentifiers(
   findIdentifier(program, identifier)
     .paths()
     .forEach((path) => {
-      path.value.name = "NextApiRequest"
+      path.value.name = newIdentifier
     })
 }
 

packages/config/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @blitzjs/config
 
+## 2.0.0-beta.3
+
+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+
 ## 2.0.0-beta.72
 
 ### Patch Changes

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @blitzjs/generator
 
+## 2.0.0-beta.3
+
+### Patch Changes
+
+- b72d1215: Add vscode debugging configuration to new app templates
+
+## 2.0.0-beta.2
+
+### Patch Changes
+
+- db7233db: Bump react, react-dom, @types/react and next versions
+
+  This fixes a console warning: `Warning: Received`true`for a non-boolean attribute`global`.` when using `styled-jsx`. Versions bump also fixes React Hydration error that happens on and off when using `redirectAuthenticatedTo`.
+
+- eb971568: Add `BlitzPage` types to auth pages in new app template
+- 8ada2c26: Include ResetPasswordPage in new app template
+
+## 2.0.0-beta.1
+
+### Patch Changes
+
+- 0f4926fd: Set current Blitz tag to latest
+
 ## 2.0.0-beta.72
 
 ### Patch Changes

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.3",
   "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-beta.0",
+    "@blitzjs/config": "2.0.0-beta.3",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",
@@ -56,7 +56,7 @@
     "@types/mem-fs-editor": "7.0.1",
     "@types/pluralize": "0.0.29",
     "@types/prettier": "2.4.4",
-    "@types/react": "18.0.1",
+    "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
     "@types/vinyl": "2.0.6",
     "@typescript-eslint/eslint-plugin": "5.9.1",
@@ -64,7 +64,7 @@
     "babylon": "6.18.0",
     "debug": "4.3.3",
     "eslint": "7.32.0",
-    "react": "18.0.0",
+    "react": "18.2.0",
     "typescript": "^4.5.3",
     "unbuild": "0.6.9",
     "watch": "1.0.2"

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

@@ -43,7 +43,7 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
     if (!this.options.useTs) {
       return [
         "tsconfig.json",
-        "blitz-env.d.ts",
+        "next-env.d.ts",
         "jest.config.ts",
         "package.ts.json",
         "pre-push-ts",

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

@@ -1,7 +1,7 @@
 import {logFailedVersionFetch} from "./get-latest-version"
 import {fetchDistTags} from "./npm-fetch"
 
-const CURRENT_BLITZ_TAG = "alpha"
+const CURRENT_BLITZ_TAG = "latest"
 
 export const getBlitzDependencyVersion = async () => {
   try {

packages/generator/templates/app/.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Blitz: debug server-side",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "npm run dev"
+    },
+    {
+      "name": "Blitz: debug client-side",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:3000"
+    },
+    {
+      "name": "Blitz: debug full stack",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "npm run dev",
+      "serverReadyAction": {
+        "pattern": "started server on .+, url: (https?://.+)",
+        "uriFormat": "%s",
+        "action": "debugWithChrome"
+      }
+    }
+  ]
+}

packages/generator/templates/app/mailers/forgotPasswordMailer.ts

@@ -13,7 +13,7 @@ type ResetPasswordMailer = {
 export function forgotPasswordMailer({ to, token }: ResetPasswordMailer) {
   // In production, set APP_ORIGIN to your production server origin
   const origin = process.env.APP_ORIGIN || process.env.BLITZ_DEV_SERVER_ORIGIN
-  const resetUrl = `${origin}/reset-password?token=${token}`
+  const resetUrl = `${origin}/auth/reset-password?token=${token}`
 
   const msg = {
     from: "TODO@example.com",

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

@@ -22,15 +22,15 @@
     "*.{js}": ["eslint --fix"]
   },
   "dependencies": {
-    "@blitzjs/auth": "alpha",
-    "@blitzjs/next": "alpha",
-    "@blitzjs/rpc": "alpha",
+    "@blitzjs/auth": "latest",
+    "@blitzjs/next": "latest",
+    "@blitzjs/rpc": "latest",
     "@prisma/client": "4.0.0",
-    "blitz": "alpha",
-    "next": "12.2.0",
+    "blitz": "latest",
+    "next": "12.2.5",
     "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "zod": "3.17.3"
   },
   "devDependencies": {
@@ -39,7 +39,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
     "@types/preview-email": "2.0.1",
-    "@types/react": "18.0.1",
+     "@types/react": "18.0.17",
     "eslint": "7.32.0",
     "eslint-config-next": "12.2.0",
     "eslint-config-prettier": "8.5.0",

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

@@ -22,15 +22,15 @@
     "*.{js,ts,tsx}": ["eslint --fix"]
   },
   "dependencies": {
-    "@blitzjs/auth": "alpha",
-    "@blitzjs/next": "alpha",
-    "@blitzjs/rpc": "alpha",
+    "@blitzjs/auth": "latest",
+    "@blitzjs/next": "latest",
+    "@blitzjs/rpc": "latest",
     "@prisma/client": "4.0.0",
-    "blitz": "alpha",
-    "next": "12.2.0",
+    "blitz": "latest",
+    "next": "12.2.5",
     "prisma": "4.0.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "zod": "3.17.3"
   },
   "devDependencies": {
@@ -39,7 +39,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
     "@types/preview-email": "2.0.1",
-    "@types/react": "18.0.1",
+     "@types/react": "18.0.17",
     "@typescript-eslint/eslint-plugin": "5.30.5",
     "eslint": "7.32.0",
     "eslint-config-next": "12.2.0",

packages/generator/templates/app/pages/auth/forgot-password.tsx

@@ -4,8 +4,9 @@ import { Form, FORM_ERROR } from "app/core/components/Form"
 import { ForgotPassword } from "app/auth/validations"
 import forgotPassword from "app/auth/mutations/forgotPassword"
 import { useMutation } from "@blitzjs/rpc"
+import { BlitzPage } from "@blitzjs/next"
 
-const ForgotPasswordPage = () => {
+const ForgotPasswordPage: BlitzPage = () => {
   const [forgotPasswordMutation, { isSuccess }] = useMutation(forgotPassword)
 
   return (

packages/generator/templates/app/pages/auth/login.tsx

@@ -1,8 +1,9 @@
+import { BlitzPage } from "@blitzjs/next"
 import Layout from "app/core/layouts/Layout"
 import { LoginForm } from "app/auth/components/LoginForm"
 import { useRouter } from "next/router"
 
-const LoginPage = () => {
+const LoginPage: BlitzPage = () => {
   const router = useRouter()
 
   return (

packages/generator/templates/app/pages/auth/reset-password.tsx

@@ -0,0 +1,62 @@
+import Layout from "app/core/layouts/Layout"
+import { LabeledTextField } from "app/core/components/LabeledTextField"
+import { Form, FORM_ERROR } from "app/core/components/Form"
+import { ResetPassword } from "app/auth/validations"
+import resetPassword from "app/auth/mutations/resetPassword"
+import { BlitzPage, Routes } from "@blitzjs/next"
+import { useRouter } from "next/router"
+import { useMutation } from "@blitzjs/rpc"
+import Link from "next/link"
+
+const ResetPasswordPage: BlitzPage = () => {
+  const router = useRouter()
+  const [resetPasswordMutation, { isSuccess }] = useMutation(resetPassword)
+
+  return (
+    <div>
+      <h1>Set a New Password</h1>
+
+      {isSuccess ? (
+        <div>
+          <h2>Password Reset Successfully</h2>
+          <p>
+            Go to the <Link href={Routes.Home()}>homepage</Link>
+          </p>
+        </div>
+      ) : (
+        <Form
+          submitText="Reset Password"
+          schema={ResetPassword}
+          initialValues={{ password: "", passwordConfirmation: "", token: router.query.token as string }}
+          onSubmit={async (values) => {
+            try {
+              await resetPasswordMutation(values)
+            } catch (error: any) {
+              if (error.name === "ResetPasswordError") {
+                return {
+                  [FORM_ERROR]: error.message,
+                }
+              } else {
+                return {
+                  [FORM_ERROR]: "Sorry, we had an unexpected error. Please try again.",
+                }
+              }
+            }
+          }}
+        >
+          <LabeledTextField name="password" label="New Password" type="password" />
+          <LabeledTextField
+            name="passwordConfirmation"
+            label="Confirm New Password"
+            type="password"
+          />
+        </Form>
+      )}
+    </div>
+  )
+}
+
+ResetPasswordPage.redirectAuthenticatedTo = "/"
+ResetPasswordPage.getLayout = (page) => <Layout title="Reset Your Password">{page}</Layout>
+
+export default ResetPasswordPage

packages/generator/templates/app/pages/auth/signup.tsx

@@ -1,9 +1,9 @@
 import { useRouter } from "next/router"
 import Layout from "app/core/layouts/Layout"
 import { SignupForm } from "app/auth/components/SignupForm"
-import { Routes } from "@blitzjs/next"
+import { BlitzPage, Routes } from "@blitzjs/next"
 
-const SignupPage = () => {
+const SignupPage: BlitzPage = () => {
   const router = useRouter()
 
   return (

packages/generator/templates/app/tsconfig.json

@@ -20,5 +20,5 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "exclude": ["node_modules", "**/*.e2e.ts", "cypress"],
-  "include": ["blitz-env.d.ts", "**/*.ts", "**/*.tsx", "types"]
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"]
 }

packages/generator/templates/minimalapp/.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Blitz: debug server-side",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "npm run dev"
+    },
+    {
+      "name": "Blitz: debug client-side",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:3000"
+    },
+    {
+      "name": "Blitz: debug full stack",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "npm run dev",
+      "serverReadyAction": {
+        "pattern": "started server on .+, url: (https?://.+)",
+        "uriFormat": "%s",
+        "action": "debugWithChrome"
+      }
+    }
+  ]
+}

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

@@ -18,11 +18,11 @@
     "*.{js}": ["eslint --fix"]
   },
   "dependencies": {
-    "@blitzjs/next": "alpha",
-    "blitz": "alpha",
-    "next": "12.2.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "@blitzjs/next": "latest",
+    "blitz": "latest",
+    "next": "12.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "ts-node": "10.7.0"
   },
   "devDependencies": {
@@ -30,7 +30,7 @@
     "@testing-library/jest-dom": "5.16.3",
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
-    "@types/react": "18.0.1",
+     "@types/react": "18.0.17",
     "eslint": "7.32.0",
     "eslint-config-next": "12.2.0",
     "eslint-config-prettier": "8.5.0",

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

@@ -20,11 +20,11 @@
     ]
   },
   "dependencies": {
-    "@blitzjs/next": "alpha",
-    "blitz": "alpha",
-    "next": "12.2.0",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "@blitzjs/next": "latest",
+    "blitz": "latest",
+    "next": "12.2.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "ts-node": "10.7.0"
   },
   "devDependencies": {
@@ -32,7 +32,7 @@
     "@testing-library/jest-dom": "5.16.3",
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
-    "@types/react": "18.0.1",
+     "@types/react": "18.0.17",
     "@typescript-eslint/eslint-plugin": "5.30.5",
     "eslint": "7.32.0",
     "eslint-config-prettier": "8.5.0",

packages/generator/templates/minimalapp/tsconfig.json

@@ -20,5 +20,5 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "exclude": ["node_modules", "**/*.e2e.ts", "cypress"],
-  "include": ["blitz-env.d.ts", "**/*.ts", "**/*.tsx"]
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]
 }

packages/pkg-template/package.json

@@ -25,10 +25,10 @@
     "@typescript-eslint/parser": "5.9.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.0",
-    "@types/react": "18.0.1",
+    "@blitzjs/config": "2.0.0-beta.3",
+    "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
-    "react": "18.0.0",
+    "react": "18.2.0",
     "typescript": "^4.5.3",
     "unbuild": "0.7.6",
     "watch": "1.0.2"