Version Packages (beta) (#4216 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Update location of resolve-href in next 13.5.2 (#4222 )
2026-02-07 03:00:10 -05:00 · 2023-10-03 12:07:42 +05:30 · 2023-10-03 12:02:46 +05:30 · 2023-09-19 23:18:53 +05:30 · 2023-09-19 23:00:39 +05:30 · 2023-09-11 23:53:47 +05:30
385 changed files with 14634 additions and 7862 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -3794,7 +3794,8 @@
      "profile": "http://tobiasjordans.de",
      "contributions": [
        "code",
-        "doc"
+        "doc",
+        "test"
      ]
    },
    {
@@ -3816,6 +3817,174 @@
        "doc",
        "code"
      ]
+    },
+    {
+      "login": "jhonnymichel",
+      "name": "Jhonny Michel",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7006387?v=4",
+      "profile": "https://github.com/jhonnymichel",
+      "contributions": [
+        "doc",
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "sweetliquid",
+      "name": "sweetliquid",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18693190?v=4",
+      "profile": "sweetliquid.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "exKAZUu",
+      "name": "Sakamoto, Kazunori",
+      "avatar_url": "https://avatars.githubusercontent.com/u/436237?v=4",
+      "profile": "https://github.com/exKAZUu",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "jeliasson",
+      "name": "Johan Eliasson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/865493?v=4",
+      "profile": "https://github.com/jeliasson",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "jafarlihi",
+      "name": "Hikmat Jafarli",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43515211?v=4",
+      "profile": "https://github.com/jafarlihi",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "maotora",
+      "name": "Maotora ᕙ(⇀‸↼‶)ᕗ",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5174884?v=4",
+      "profile": "https://maotoramm.com",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "vitaliemiron",
+      "name": "Vitalie",
+      "avatar_url": "https://avatars.githubusercontent.com/u/45145592?v=4",
+      "profile": "https://github.com/vitaliemiron",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "nelsonmestevao",
+      "name": "Nelson Estevão",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19409687?v=4",
+      "profile": "https://estevao.org",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "dbrxnds",
+      "name": "David",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32268383?v=4",
+      "profile": "https://github.com/dbrxnds",
+      "contributions": [
+        "doc",
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "gjmoed",
+      "name": "G.J. Moed",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4458993?v=4",
+      "profile": "https://github.com/gjmoed",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "GHKEN",
+      "name": "Tetsuya Fukuda",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5304351?v=4",
+      "profile": "https://ghken.com",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "nerixim",
+      "name": "Nikita Kamaev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26106502?v=4",
+      "profile": "https://github.com/nerixim",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "nikola-wd",
+      "name": "Nikola Ivanov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11588823?v=4",
+      "profile": "https://webredone.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "jayu",
+      "name": "Jakub Mazurek",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11561585?v=4",
+      "profile": "jayu.dev",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "maciej-ka",
+      "name": "Maciej Kasprzyk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5403694?v=4",
+      "profile": "https://github.com/maciej-ka",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "justinsmid",
+      "name": "Justin Smid",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34271675?v=4",
+      "profile": "https://github.com/justinsmid",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "rodobre",
+      "name": "rodobre",
+      "avatar_url": "https://avatars.githubusercontent.com/u/52138375?v=4",
+      "profile": "https://github.com/rodobre",
+      "contributions": [
+        "doc",
+        "code"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.changeset/big-boats-lay.md
+++ b/.changeset/big-boats-lay.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Guard `blitz g` input via an allow-list of characters; throw if unwanted characters are found. Prevents to break the blitz command by accident (https://github.com/blitz-js/blitz/issues/4021).
--- a/.changeset/big-turtles-tease.md
+++ b/.changeset/big-turtles-tease.md
@@ -0,0 +1,9 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+(feat) upgrade tslog to v4.8.2
--- a/.changeset/chatty-fireants-leave.md
+++ b/.changeset/chatty-fireants-leave.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Fix a type error in reset password templates.
--- a/.changeset/chatty-gifts-whisper.md
+++ b/.changeset/chatty-gifts-whisper.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": minor
+"@blitzjs/rpc": minor
+---
+
+Add ability to format the error on the server before returning it to the client.
--- a/.changeset/chilly-jeans-fix.md
+++ b/.changeset/chilly-jeans-fix.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Update examples of generate all in docs to include one column in model.
--- a/.changeset/clever-hornets-talk.md
+++ b/.changeset/clever-hornets-talk.md
@@ -0,0 +1,9 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+Upgrade tslog to `4.9.0`.
+
+This due a [tslog issue](https://github.com/fullstack-build/tslog/issues/227) that causes tslog to crash when attempting to log an error whose constructor expects more than one argument.
--- a/.changeset/cuddly-singers-perform.md
+++ b/.changeset/cuddly-singers-perform.md
@@ -0,0 +1,11 @@
+---
+"blitz": minor
+"@blitzjs/auth": minor
+"@blitzjs/next": minor
+"@blitzjs/rpc": minor
+---
+
+- New Blitz Auth Function `getAppSession`, This function will use the cookies and headers provided by the server component and returns the current session.
+- New Blitz Auth Hook `useAuthenticatedAppSession`, This hook is implemented as the replacement of the BlitzPage seurity auth utilities provided for the pages directory to work with React Server Components in the Nextjs 13 app directory
+- New Blitz React Server Component Wrapper, `BlitzProvider` is to be imported from setupBlitzClient in src/blitz-client.ts and to used to ideally wrap the entire application in the `RootLayout` in the root layout.ts file of next app directory.
+- Fix failing tests due to the error `NextRouter is not mounted` in next 13 blitz apps
--- a/.changeset/curvy-drinks-perform.md
+++ b/.changeset/curvy-drinks-perform.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/auth": patch
+"blitz": patch
+---
+
+blitz-auth: Fix webpack from following next-auth
--- a/.changeset/empty-spiders-lay.md
+++ b/.changeset/empty-spiders-lay.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/recipe-chakra-ui": patch
+"@blitzjs/recipe-next-ui": patch
+---
+
+Fix LabeledTextField update on next-ui and chakra-ui recipes
--- a/.changeset/fast-adults-guess.md
+++ b/.changeset/fast-adults-guess.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/auth": minor
+"blitz": minor
+---
+
+feature: Next Auth Adapter
--- a/.changeset/fast-pans-impress.md
+++ b/.changeset/fast-pans-impress.md
@@ -0,0 +1,7 @@
+---
+"@blitzjs/next": minor
+---
+
+Fix Next 13.2 compatibility
+
+This updates the suspense patch to work with Next.js 13.2+. Hopefully soon we can stop patching once Next.js catches up with all the other frameworks and properly [exposes the `onRecoverableError` react hook](https://github.com/vercel/next.js/discussions/36641).
--- a/.changeset/fast-toys-wash.md
+++ b/.changeset/fast-toys-wash.md
@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Consolidate mutations schema to new schema.{ts|js} file.
--- a/.changeset/few-elephants-approve.md
+++ b/.changeset/few-elephants-approve.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Fix return type of `requestMiddlewares` in `RpcServerPlugin`
--- a/.changeset/fifty-drinks-cry.md
+++ b/.changeset/fifty-drinks-cry.md
@@ -0,0 +1,8 @@
+---
+"@blitzjs/auth": patch
+"blitz": patch
+---
+
+blitz-auth: Support for Prisma v5
+
+Internal: Make `handle` a required paramter while updating the `session` modal.
--- a/.changeset/four-radios-tickle.md
+++ b/.changeset/four-radios-tickle.md
@@ -0,0 +1,20 @@
+---
+"@blitzjs/auth": major
+"@blitzjs/codemod": minor
+---
+
+## ⚠️ Breaking Changes for Blitz Auth
+
+Automatically upgrade using codemod
+(Make sure to git commit before running this command to avoid losing changes)
+
+```bash
+npx @blitz/codemod secure-password
+```
+
+Introduce a new import path for the Blitz wrapper `SecurePassword` to fully decouple the library from `@blitzjs/auth`
+
+```diff
+- import {SecurePassword} from "@blitzjs/auth"
+ import {SecurePassword} from "@blitzjs/auth/secure-password"
+```
--- a/.changeset/fresh-camels-return.md
+++ b/.changeset/fresh-camels-return.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": patch
+---
+
+Updated `useAuthenticatedBlitzContext` to now return `AuthenticatedCtx`
--- a/.changeset/fresh-crews-chew.md
+++ b/.changeset/fresh-crews-chew.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": minor
+---
+
+Fix the DYNAMIC_SERVER_USAGE error for Next.js 13.3.1+
--- a/.changeset/good-oranges-pretend.md
+++ b/.changeset/good-oranges-pretend.md
@@ -0,0 +1,26 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Fixes enormous memory consumption of the dev server by changing the default import strategy to "require" instead of "import" which in webpack causes multiple chunks to be created for each import.
+
+## Blitz Configuration
+
+To configure this behaviour, you can add the following to your next.config.js:
+
+```js
+/**
+ * @type {import('@blitzjs/next').BlitzConfig}
+ **/
+const config = {
+  blitz: {
+    resolversDynamicImport: true,
+  },
+}
+```
+
+When `resolversDynamicImport` is set to `true`, the import strategy will be "import" instead of "require".
+
+### On Vercel
+
+If you are using Vercel, `resolversDynamicImport` will be set to `true` by default, since it is better for the separate chunks to be create for serverless lambdas.
--- a/.changeset/large-hairs-battle.md
+++ b/.changeset/large-hairs-battle.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Make Next.js version stick to 13.4.5 when generating a new app
--- a/.changeset/little-cycles-hang.md
+++ b/.changeset/little-cycles-hang.md
@@ -0,0 +1,6 @@
+---
+"blitz": patch
+---
+
+- Removes language selection step from `blitz new` menu
+- Make `formik` the default/recommended form library
--- a/.changeset/lucky-teachers-sleep.md
+++ b/.changeset/lucky-teachers-sleep.md
@@ -0,0 +1,10 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/next": major
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+⚠️ Breaking Change:
+Next.js version 13.5 or above is now required to use `@blitzjs/next`
+
+Fix `Error: Cannot find module 'next/dist/shared/lib/router/utils/resolve-href'` by updating the location of next.js internal function.
--- a/.changeset/many-fans-fetch.md
+++ b/.changeset/many-fans-fetch.md
@@ -0,0 +1,7 @@
+---
+"@blitzjs/recipe-chakra-ui": patch
+"@blitzjs/recipe-next-ui": patch
+"@blitzjs/recipe-tailwind": patch
+---
+
+This change reflects the directory change from app/pages to src/pages for the receipts chakra-ui, next-ui, tailwind. It checks for which directories exists and is compatible with either versions.
--- a/.changeset/mean-ears-speak.md
+++ b/.changeset/mean-ears-speak.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+For new applications, update Prisma (`prisma` and `@prisma/client`) from `4.6.0` to `4.6.1` to solve enum issue with postgresql https://github.com/prisma/prisma/issues/16180
--- a/.changeset/moody-crews-travel.md
+++ b/.changeset/moody-crews-travel.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": minor
+---
+
+Stop exporting `useAuthenticatedBlitzContext` from `@blitzjs/auth` this must be imported from `app/blitz-server.ts` file in order to work correctly
--- a/.changeset/nervous-shrimps-serve.md
+++ b/.changeset/nervous-shrimps-serve.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+
+Fix for tslog error `TypeError: Cannot read properties of undefined (reading 'map')` while using custom errors.
--- a/.changeset/nice-boxes-travel.md
+++ b/.changeset/nice-boxes-travel.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Fix return type of the `invoke` method from returning type function to return the type of resolved data
--- a/.changeset/nice-cats-lay.md
+++ b/.changeset/nice-cats-lay.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+
+Allow `.tsx` & `.jsx` file extensions to be used for resolvers
--- a/.changeset/nine-bags-rhyme.md
+++ b/.changeset/nine-bags-rhyme.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+fix: add missing key prop to LabelSelectField
--- a/.changeset/ninety-pots-learn.md
+++ b/.changeset/ninety-pots-learn.md
@@ -0,0 +1,9 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Update the version of next in the new template from 13.2 to 13.3.0
--- a/.changeset/perfect-baboons-relate.md
+++ b/.changeset/perfect-baboons-relate.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Remove useEffect from reset password templates.
--- a/.changeset/plenty-gifts-provide.md
+++ b/.changeset/plenty-gifts-provide.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+The issue is that the version provided, "13.2", is not a valid SemVer version. A valid SemVer version must have three components: major, minor, and patch (e.g., "13.2.0").
--- a/.changeset/plenty-kiwis-greet.md
+++ b/.changeset/plenty-kiwis-greet.md
@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/rpc": patch
+---
+
+Updates internal functions and tests to support blitz apps that run tests with vitest
--- a/.changeset/poor-crabs-drum.md
+++ b/.changeset/poor-crabs-drum.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+blitz-rpc: Cleanup Event Listeners - Fix potential memory leak by cleaning up any residual event listeners set by blitz.
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -46,12 +46,16 @@
    "@blitzjs/recipe-theme-ui": "0.34.0-canary.0",
    "@blitzjs/recipe-vanilla-extract": "0.34.0-canary.0",
    "test-rpc-path-root": "0.0.0",
-    "test-full-auth-with-rpc": "0.0.0"
+    "test-full-auth-with-rpc": "0.0.0",
+    "next-blitz-auth": "0.1.0",
+    "test-app-dir": "0.0.0"
  },
  "changesets": [
    "afraid-dancers-juggle",
    "afraid-ears-repair",
+    "big-boats-lay",
    "big-phones-bow",
+    "big-turtles-tease",
    "blue-flowers-peel",
    "blue-pigs-tan",
    "brave-zebras-deny",
@@ -66,19 +70,25 @@
    "calm-nails-wait",
    "calm-papayas-protect",
    "calm-tomatoes-drive",
+    "chatty-fireants-leave",
+    "chatty-gifts-whisper",
    "chilled-carrots-own",
    "chilly-candles-care",
+    "chilly-jeans-fix",
    "chilly-nails-nail",
    "clean-hats-pump",
    "clean-hounds-laugh",
    "clean-walls-wink",
+    "clever-hornets-talk",
    "clever-radios-lie",
    "cool-doors-invent",
    "cool-horses-check",
    "cuddly-pugs-crash",
+    "cuddly-singers-perform",
    "curly-rules-speak",
    "curly-seas-serve",
    "curvy-days-attend",
+    "curvy-drinks-perform",
    "cyan-bulldogs-heal",
    "cyan-cars-greet",
    "dirty-monkeys-greet",
@@ -90,17 +100,23 @@
    "eleven-lobsters-drop",
    "empty-berries-rule",
    "empty-pants-search",
+    "empty-spiders-lay",
    "empty-turkeys-wave",
    "fair-carrots-guess",
    "fair-kangaroos-clean",
    "fair-wombats-sneeze",
    "famous-kings-explain",
+    "fast-adults-guess",
    "fast-clocks-push",
+    "fast-pans-impress",
    "fast-papayas-grow",
+    "fast-toys-wash",
    "fast-trainers-kneel",
    "few-dogs-fetch",
+    "few-elephants-approve",
    "few-hounds-worry",
    "few-shrimps-leave",
+    "fifty-drinks-cry",
    "flat-bees-approve",
    "fluffy-coats-flow",
    "fluffy-mangos-begin",
@@ -108,7 +124,10 @@
    "forty-timers-rhyme",
    "four-brooms-juggle",
    "four-meals-fry",
+    "four-radios-tickle",
    "four-sheep-judge",
+    "fresh-camels-return",
+    "fresh-crews-chew",
    "funny-cups-pay",
    "fuzzy-bees-warn",
    "fuzzy-dots-cross",
@@ -121,6 +140,7 @@
    "gold-horses-punch",
    "good-apes-drum",
    "good-insects-wink",
+    "good-oranges-pretend",
    "gorgeous-birds-warn",
    "gorgeous-buses-scream",
    "gorgeous-games-obey",
@@ -150,6 +170,7 @@
    "khaki-ducks-cheer",
    "khaki-pens-rest",
    "kind-walls-suffer",
+    "large-hairs-battle",
    "late-steaks-give",
    "lazy-maps-sort",
    "lemon-games-press",
@@ -158,6 +179,7 @@
    "lemon-teachers-jam",
    "light-donkeys-double",
    "light-squids-draw",
+    "little-cycles-hang",
    "little-pears-ring",
    "long-bees-hope",
    "long-dancers-jog",
@@ -167,25 +189,34 @@
    "lovely-colts-share",
    "lucky-cows-try",
    "lucky-months-guess",
+    "lucky-teachers-sleep",
    "lucky-years-turn",
+    "many-fans-fetch",
+    "mean-ears-speak",
    "mean-gorillas-reply",
    "modern-cameras-pull",
    "modern-games-dream",
    "modern-ligers-behave",
    "moody-bags-walk",
+    "moody-crews-travel",
    "moody-spoons-rhyme",
    "moody-squids-cheer",
    "nasty-suns-wash",
    "nervous-beds-travel",
    "nervous-dolls-rule",
+    "nervous-shrimps-serve",
    "new-coats-turn",
    "new-olives-protect",
+    "nice-boxes-travel",
+    "nice-cats-lay",
    "nice-deers-dream",
    "nice-starfishes-live",
+    "nine-bags-rhyme",
    "nine-birds-confess",
    "nine-onions-admire",
    "ninety-lies-press",
    "ninety-pets-heal",
+    "ninety-pots-learn",
    "ninety-rice-tickle",
    "odd-bears-run",
    "olive-bees-buy",
@@ -195,10 +226,14 @@
    "olive-sheep-rhyme",
    "orange-mirrors-tap",
    "orange-zebras-reflect",
+    "perfect-baboons-relate",
    "perfect-eyes-repeat",
    "perfect-trains-double",
    "plenty-bottles-swim",
+    "plenty-gifts-provide",
+    "plenty-kiwis-greet",
    "polite-lizards-love",
+    "poor-crabs-drum",
    "poor-peas-lick",
    "poor-penguins-look",
    "poor-shrimps-think",
@@ -208,6 +243,7 @@
    "purple-donkeys-smash",
    "purple-jars-begin",
    "purple-singers-greet",
+    "quick-crews-occur",
    "quick-cycles-confess",
    "quick-dots-fetch",
    "quiet-feet-travel",
@@ -222,6 +258,7 @@
    "rotten-rocks-remember",
    "rude-trainers-visit",
    "serious-mugs-leave",
+    "shaggy-boxes-exercise",
    "shaggy-carpets-brake",
    "sharp-falcons-begin",
    "sharp-olives-sip",
@@ -231,13 +268,16 @@
    "silent-colts-reply",
    "silent-lies-run",
    "silly-apricots-share",
+    "silly-peas-work",
    "silly-shoes-agree",
    "six-apricots-kick",
+    "sixty-rockets-count",
    "slimy-humans-impress",
    "slimy-needles-taste",
    "slow-impalas-tap",
    "slow-walls-camp",
    "slow-walls-poke",
+    "small-monkeys-battle",
    "small-socks-confess",
    "smooth-planets-admire",
    "smooth-rice-clap",
@@ -255,23 +295,29 @@
    "stale-jobs-drum",
    "stale-parents-yawn",
    "strong-apes-reply",
+    "strong-chicken-study",
    "strong-keys-lie",
    "stupid-rabbits-jump",
    "stupid-walls-sell",
    "sweet-kiwis-cross",
    "swift-drinks-dress",
+    "swift-glasses-laugh",
    "swift-poets-travel",
    "tall-meals-learn",
+    "tall-radios-clean",
    "tame-keys-reply",
    "tame-pumpkins-nail",
+    "tame-rocks-unite",
    "tasty-maps-fetch",
    "tasty-news-collect",
+    "tasty-squids-sin",
    "ten-hairs-listen",
    "ten-rivers-burn",
    "tender-cooks-tie",
    "tender-pianos-check",
    "thick-moons-fry",
    "thick-parrots-float",
+    "thick-peas-jog",
    "thirty-countries-build",
    "thirty-spies-applaud",
    "three-lies-pull",
@@ -299,7 +345,9 @@
    "wicked-rings-walk",
    "wise-eels-visit",
    "wise-frogs-give",
+    "wise-lies-relate",
    "wise-rabbits-complain",
+    "yellow-numbers-serve",
    "young-birds-talk"
  ]
 }
--- a/.changeset/quick-crews-occur.md
+++ b/.changeset/quick-crews-occur.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Remove rouge `console.log` during start
--- a/.changeset/shaggy-boxes-exercise.md
+++ b/.changeset/shaggy-boxes-exercise.md
@@ -0,0 +1,9 @@
+---
+"@blitzjs/next": patch
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+- Updates `ts-log` peer dependency to `4.9.0`
+- Removes `javascript` from `blitz new` menu
+- Hot Fix the `Update Schema` when using blitz generator
--- a/.changeset/silly-peas-work.md
+++ b/.changeset/silly-peas-work.md
@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Multiple fields forms using templates during generation - TODO
--- a/.changeset/sixty-rockets-count.md
+++ b/.changeset/sixty-rockets-count.md
@@ -0,0 +1,68 @@
+---
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+
+### Now we can configure Blitz RPC in the following way,
+
+In your `[[...blitz]].ts` api file you can see the following settings
+```ts
+logging?: {
+  /**
+   * allowList Represents the list of routes for which logging should be enabled
+   * If whiteList is defined then only those routes will be logged
+   */
+  allowList?: string[]
+  /**
+   * blockList Represents the list of routes for which logging should be disabled
+   * If blockList is defined then all routes except those will be logged
+   */
+  blockList?: string[]
+  /**
+   * verbose Represents the flag to enable/disable logging
+   * If verbose is true then Blitz RPC will log the input and output of each resolver
+   */
+  verbose?: boolean
+  /**
+   * disablelevel Represents the flag to enable/disable logging for a particular level
+   */
+  disablelevel?: "debug" | "info"
+}
+```
+```ts
+import { rpcHandler } from "@blitzjs/rpc"
+import { api } from "src/blitz-server"
+
+export default api(
+  rpcHandler({
+    onError: console.log,
+    formatError: (error) => {
+      error.message = `FormatError handler: ${error.message}`
+      return error
+    },
+   logging: {
+...
+}
+  })
+)
+```
+
+Example:
+```ts
+export default api(
+  rpcHandler({
+    onError: console.log,
+    formatError: (error) => {
+      error.message = `FormatError handler: ${error.message}`
+      return error
+    },
+    logging: {
+      verbose: true,
+      blockList: ["getCurrentUser", ...], //just write the resolver name [which is the resolver file name]
+    },
+  })
+)
+```
+
+This is enable verbose blitz rpc logging for all resolvers except the resolvers `getCurrentUser` and others mentioned in the `blockList`
+
--- a/.changeset/small-monkeys-battle.md
+++ b/.changeset/small-monkeys-battle.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/auth": patch
+"blitz": patch
+---
+
+Fix Next-Auth integration: `Unable to use next-auth with provider: Error [ERR_PACKAGE_PATH_NOT_EXPORTED]`
--- a/.changeset/strong-chicken-study.md
+++ b/.changeset/strong-chicken-study.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": patch
+---
+
+Fixed security vulnerabilities in passport-adapter by upgrading `passport` and `jsonwebtoken`
--- a/.changeset/swift-glasses-laugh.md
+++ b/.changeset/swift-glasses-laugh.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Update all links to follow Next 13 format without a child anchor tag.
--- a/.changeset/tall-radios-clean.md
+++ b/.changeset/tall-radios-clean.md
@@ -0,0 +1,67 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+
+feature: Nextjs 13 App Directory Utility Methods
+
+### 🔧 New Blitz Auth Hook `useAuthenticatedBlitzContext`
+
+This hook is implemented as the replacement of the [`BlitzPage` seurity auth utilities](https://blitzjs.com/docs/authorization#secure-your-pages) provided for the pages directory to work with React Server Components in the Nextjs 13 app directory
+It can be used in any asynchronous server component be it in `page.ts` or in the layouts in `layout.ts`
+It uses the new [`redirect` function](https://beta.nextjs.org/docs/api-reference/redirect) to provide the required authorization in server side
+
+#### API
+
+```ts
+useAuthenticatedBlitzContext({
+  redirectTo,
+  redirectAuthenticatedTo,
+  role,
+}: {
+  redirectTo?: string | RouteUrlObject
+  redirectAuthenticatedTo?: string | RouteUrlObject | ((ctx: Ctx) => string | RouteUrlObject)
+  role?: string | string[]
+}): Promise<void>
+```
+
+#### Usage
+
+**Example Usage in React Server Component in `app` directory in Next 13**
+
+```ts
+import {getAppSession, useAuthenticatedBlitzContext} from "src/blitz-server"
+...
+await useAuthenticatedBlitzContext({
+    redirectTo: "/auth/login",
+    role: ["admin"],
+    redirectAuthenticatedTo: "/dashboard",
+})
+```
+
+### 🔧 New Blitz RPC Hook `invokeResolver`
+
+#### API
+
+```ts
+invokeResolver<T extends (...args: any) => any, TInput = FirstParam<T>>(
+  queryFn: T,
+  params: TInput,
+): Promise<PromiseReturnType<T>>
+```
+
+#### Example Usage
+
+```ts
+...
+import {invokeResolver, useAuthenticatedBlitzContext} from "../src/blitz-server"
+import getCurrentUser from "../src/users/queries/getCurrentUser"
+
+export default async function Home() {
+  await useAuthenticatedBlitzContext({
+    redirectTo: "/auth/login",
+  })
+  const user = await invokeResolver(getCurrentUser, null)
+...
+```
--- a/.changeset/tame-rocks-unite.md
+++ b/.changeset/tame-rocks-unite.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix log formatting to not show the path of blitz rpc
--- a/.changeset/thick-peas-jog.md
+++ b/.changeset/thick-peas-jog.md
@@ -0,0 +1,7 @@
+---
+"@blitzjs/auth": major
+---
+
+BREAKING CHANGE: secure-password is now an `optional peerDependency`, if you are using `SecurePassword` api, you need to now install `secure-password` in your application.
+
+This helps users who do not use SecurePassword from having native package build issues.
--- a/.changeset/wise-lies-relate.md
+++ b/.changeset/wise-lies-relate.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": patch
+---
+
+Fix: Add missing entry to expose next-auth adapter in Blitz Auth
--- a/.changeset/yellow-numbers-serve.md
+++ b/.changeset/yellow-numbers-serve.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/recipe-tailwind": minor
+---
+
+support both directory style in tailwind recipe
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,8 +7,8 @@ on:
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true
-  
-env: 
+
+env:
  PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1

 jobs:
@@ -17,13 +17,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
-      - uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
+      - uses: pnpm/action-setup@v2.2.4
        with:
-          version: 7.11.0
+          version: 8.6.5
      - name: Setup node
        uses: actions/setup-node@v2
        with:
-          node-version: 16
+          node-version: 18
          cache: "pnpm"
      - name: Install dependencies
        run: pnpm install  --frozen-lockfile
@@ -38,13 +38,13 @@ jobs:
    name: Build
    steps:
      - uses: actions/checkout@v2
-      - uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
+      - uses: pnpm/action-setup@v2.2.4
        with:
-          version: 7.11.0
+          version: 8.6.5
      - name: Setup node
        uses: actions/setup-node@v2
        with:
-          node-version: 16
+          node-version: 18
          cache: "pnpm"
      - run: pnpm install --frozen-lockfile
      - name: Build
@@ -62,20 +62,20 @@ jobs:
          - windows-latest
      fail-fast: false
    env:
-      NODE_VERSION: 16
+      NODE_VERSION: 18
    steps:
      - name: Checkout
        uses: actions/checkout@v3

      - name: Setup PNPM
-        uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
+        uses: pnpm/action-setup@v2.2.4
        with:
-          version: 7.11.0
+          version: 8.6.5

      - name: Setup node@16
        uses: actions/setup-node@v2
        with:
-          node-version: 16
+          node-version: 18
          cache: "pnpm"

      - name: Install dependencies
@@ -111,7 +111,7 @@ jobs:
          echo "folders=$folders" >> $GITHUB_OUTPUT

  Integration-Tests:
-    name: "Integration Test: ${{matrix.folder}} @ ${{ matrix.os }} "
+    name: "Integration Test: ${{matrix.folder}} @ ${{ matrix.os }}"
    needs: [find-integration-tests]
    strategy:
      matrix:
@@ -124,32 +124,39 @@ jobs:
    steps:
      - run: echo ${{matrix.folder}}
      - name: Checkout
+        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
        uses: actions/checkout@v3

      - name: Setup PNPM
-        uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
+        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
+        uses: pnpm/action-setup@v2.2.4
        with:
-          version: 7.11.0
+          version: 8.6.5

-      - name: Setup node@${{ matrix.NODE_VERSION }}
+      - name: Setup node@18
+        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
        uses: actions/setup-node@v2
        with:
-          node-version: ${{ matrix.NODE_VERSION }}
+          node-version: 18
          cache: "pnpm"

      - name: Install dependencies
+        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
        run: pnpm install --frozen-lockfile
        shell: bash

      - name: Install playwright
+        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
        run: |
-            pnpx playwright@1.28.0 install --with-deps
+          pnpx playwright@1.28.0 install --with-deps
        shell: bash

      - name: Build
+        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
        run: pnpm build
        shell: bash

      - name: Test Packages
+        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
        run: pnpm test -- --filter=./integration-tests/${{matrix.folder}}
        shell: bash
--- a/.github/workflows/pr-release.yml
+++ b/.github/workflows/pr-release.yml
@@ -99,4 +99,3 @@ jobs:
              repo: context.repo.repo,
              body: '```\n' + process.env.MESSAGE + '\n```',
            })
-  
--- a/.npmrc
+++ b/.npmrc
@@ -1,4 +1,5 @@
 save-exact=true
+dedupe-peer-dependents=true
 strict-peer-dependencies=false

 public-hoist-pattern[]=secure-password
--- a/README.md
+++ b/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-403-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-420-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">
@@ -94,6 +94,11 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 <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/main/assets/boostry.svg" width="200px">
 </a></td>
+<td>
+<a aria-label="Byteflow" href="https://byteflow.app/?ref=blitzjs">
+<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/byteflow.png" width="70px">
+</a>
+</td>
  </tr>
 </table>

@@ -121,9 +126,11 @@ Your financial contributions help ensure Blitz continues to be developed and mai

 <table>
  <tr>
+    <td>
    <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>
+    </td>
  </tr>
 </table>

@@ -135,7 +142,15 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 <table>
  <tr>
    <td align="center"><a href="https://twitter.com/flybayer"><img src="https://avatars3.githubusercontent.com/u/8813276?v=4" width="100px;" alt=""/><br /><sub><b>Brandon Bayer</b></sub></a><br />Creator</td>
-    <td align="center"><a href="http://twitter.com/dillonraphael"><img src="https://avatars.githubusercontent.com/u/3496193?v=4" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br />Lead Maintainer</td>
+    <td align="center"><a href="http://twitter.com/dillonraphael"><img src="https://avatars.githubusercontent.com/u/3496193?v=4" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br /></td>
+      <td align="center">
+     <a href="https://siddharthsuresh.vercel.app/">
+      <img src="https://avatars.githubusercontent.com/u/83594610?v=4" width="100px;" alt="Siddharth Suresh avatar" /><br />
+        <sub>
+          <b>Siddharth Suresh</b>
+        </sub>
+      </a>
+    </td>

  </tr>
 </table>
@@ -155,7 +170,6 @@ _Code ownership, pull request approvals and merging, etc_ (see [Maintainers L2](
  <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>
 <!-- markdownlint-enable -->
@@ -173,38 +187,6 @@ _Issue triage, pull request triage, community encouragement and moderation, etc_
 <table>
  <tr>
    <td align="center"><a href="http://jeremyliberman.com/"><img src="https://avatars3.githubusercontent.com/u/2754163?v=4" width="100px;" alt=""/><br /><sub><b>Jeremy Liberman</b></td>
-     <td align="center">
-       <a href="https://mina.ca">
-        <img src="https://avatars.githubusercontent.com/mabadir" width="100px;" alt="Mina Abadir avatar" /><br />
-          <sub>
-            <b>Mina Abadir</b>
-          </sub>
-      </a>
-    </td>
-     <td align="center">
-       <a href="https://builtforfifty.com">
-        <img src="https://avatars.githubusercontent.com/abuuzayr" width="100px;" alt="Abu Uzayr avatar" /><br />
-          <sub>
-            <b>Abu Uzayr</b>
-          </sub>
-      </a>
-    </td>
-    <td align="center">
-     <a href="https://damilolarandolph.com/">
-      <img src="https://avatars.githubusercontent.com/damilolarandolph" width="100px;" alt="Damilola Randolph avatar" /><br />
-        <sub>
-          <b>Damilola Randolph</b>
-        </sub>
-      </a>
-    </td>
-      <td align="center">
-     <a href="https://siddharthsuresh.vercel.app/">
-      <img src="https://avatars.githubusercontent.com/u/83594610?v=4" width="100px;" alt="Siddharth Suresh avatar" /><br />
-        <sub>
-          <b>Siddharth Suresh</b>
-        </sub>
-      </a>
-    </td>
  </tr>
 </table>
 <!-- markdownlint-enable -->
@@ -736,9 +718,30 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
  </tr>
  <tr>
    <td align="center"><a href="a11rew.dev"><img src="https://avatars.githubusercontent.com/u/87580113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrew Glago</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=a11rew" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=a11rew" title="Code">💻</a></td>
-    <td align="center"><a href="http://tobiasjordans.de"><img src="https://avatars.githubusercontent.com/u/111561?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tordans" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=tordans" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://tobiasjordans.de"><img src="https://avatars.githubusercontent.com/u/111561?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=tordans" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=tordans" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=tordans" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://www.linkedin.com/in/iagor-moraes/"><img src="https://avatars.githubusercontent.com/u/13892132?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Iagor Moraes</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=iagormoraes" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=iagormoraes" title="Code">💻</a></td>
    <td align="center"><a href="https://twitter.com/trensik"><img src="https://avatars.githubusercontent.com/u/18584155?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dawid Urbaniak</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Trancever" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=Trancever" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/jhonnymichel"><img src="https://avatars.githubusercontent.com/u/7006387?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jhonny Michel</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jhonnymichel" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=jhonnymichel" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=jhonnymichel" title="Tests">⚠️</a></td>
+    <td align="center"><a href="sweetliquid.me"><img src="https://avatars.githubusercontent.com/u/18693190?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sweetliquid</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sweetliquid" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/exKAZUu"><img src="https://avatars.githubusercontent.com/u/436237?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sakamoto, Kazunori</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=exKAZUu" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=exKAZUu" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/jeliasson"><img src="https://avatars.githubusercontent.com/u/865493?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Johan Eliasson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jeliasson" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/jafarlihi"><img src="https://avatars.githubusercontent.com/u/43515211?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hikmat Jafarli</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jafarlihi" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=jafarlihi" title="Code">💻</a></td>
+    <td align="center"><a href="https://maotoramm.com"><img src="https://avatars.githubusercontent.com/u/5174884?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maotora ᕙ(⇀‸↼‶)ᕗ</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=maotora" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=maotora" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/vitaliemiron"><img src="https://avatars.githubusercontent.com/u/45145592?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitalie</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=vitaliemiron" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=vitaliemiron" title="Code">💻</a></td>
+    <td align="center"><a href="https://estevao.org"><img src="https://avatars.githubusercontent.com/u/19409687?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nelson Estevão</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nelsonmestevao" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=nelsonmestevao" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/dbrxnds"><img src="https://avatars.githubusercontent.com/u/32268383?v=4?s=100" width="100px;" alt=""/><br /><sub><b>David</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/gjmoed"><img src="https://avatars.githubusercontent.com/u/4458993?v=4?s=100" width="100px;" alt=""/><br /><sub><b>G.J. Moed</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=gjmoed" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=gjmoed" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://ghken.com"><img src="https://avatars.githubusercontent.com/u/5304351?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tetsuya Fukuda</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=GHKEN" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=GHKEN" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/nerixim"><img src="https://avatars.githubusercontent.com/u/26106502?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikita Kamaev</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nerixim" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://webredone.com/"><img src="https://avatars.githubusercontent.com/u/11588823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikola Ivanov</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nikola-wd" title="Documentation">📖</a></td>
+    <td align="center"><a href="jayu.dev"><img src="https://avatars.githubusercontent.com/u/11561585?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jakub Mazurek</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jayu" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=jayu" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/maciej-ka"><img src="https://avatars.githubusercontent.com/u/5403694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maciej Kasprzyk</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=maciej-ka" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=maciej-ka" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/justinsmid"><img src="https://avatars.githubusercontent.com/u/34271675?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Justin Smid</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=justinsmid" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=justinsmid" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/rodobre"><img src="https://avatars.githubusercontent.com/u/52138375?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rodobre</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=rodobre" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=rodobre" title="Code">💻</a></td>
  </tr>
 </table>

--- a/apps/next13/CHANGELOG.md
+++ b/apps/next13/CHANGELOG.md
@@ -0,0 +1,205 @@
+# next-blitz-auth
+
+## 0.1.1-beta.10
+
+### Patch Changes
+
+- Updated dependencies [30fd61316]
+- Updated dependencies [3ddb57072]
+- Updated dependencies [fe8c937d2]
+  - blitz@2.0.0-beta.34
+  - @blitzjs/auth@2.0.0-beta.34
+  - @blitzjs/next@2.0.0-beta.34
+  - @blitzjs/rpc@2.0.0-beta.34
+  - @blitzjs/config@2.0.0-beta.34
+
+## 0.1.1-beta.9
+
+### Patch Changes
+
+- Updated dependencies [19898a488]
+- Updated dependencies [6811eab1a]
+- Updated dependencies [022392c12]
+  - @blitzjs/rpc@2.0.0-beta.33
+  - blitz@2.0.0-beta.33
+  - @blitzjs/next@2.0.0-beta.33
+  - @blitzjs/auth@2.0.0-beta.33
+  - @blitzjs/config@2.0.0-beta.33
+
+## 0.1.1-beta.8
+
+### Patch Changes
+
+- Updated dependencies [82649f341]
+- Updated dependencies [8b01175b4]
+  - blitz@2.0.0-beta.32
+  - @blitzjs/next@2.0.0-beta.32
+  - @blitzjs/auth@2.0.0-beta.32
+  - @blitzjs/rpc@2.0.0-beta.32
+  - @blitzjs/config@2.0.0-beta.32
+
+## 0.1.1-beta.7
+
+### Patch Changes
+
+- Updated dependencies [90f1741da]
+- Updated dependencies [df3265b85]
+  - @blitzjs/auth@2.0.0-beta.31
+  - blitz@2.0.0-beta.31
+  - @blitzjs/rpc@2.0.0-beta.31
+  - @blitzjs/next@2.0.0-beta.31
+  - @blitzjs/config@2.0.0-beta.31
+
+## 0.1.1-beta.6
+
+### Patch Changes
+
+- Updated dependencies [c5572bec6]
+- Updated dependencies [727734955]
+  - @blitzjs/auth@2.0.0-beta.30
+  - blitz@2.0.0-beta.30
+  - @blitzjs/rpc@2.0.0-beta.30
+  - @blitzjs/next@2.0.0-beta.30
+  - @blitzjs/config@2.0.0-beta.30
+
+## 0.1.1-beta.5
+
+### Patch Changes
+
+- Updated dependencies [b6b9a1c5a]
+- Updated dependencies [61888d1a3]
+  - @blitzjs/auth@2.0.0-beta.29
+  - blitz@2.0.0-beta.29
+  - @blitzjs/rpc@2.0.0-beta.29
+  - @blitzjs/next@2.0.0-beta.29
+  - @blitzjs/config@2.0.0-beta.29
+
+## 0.1.1-beta.4
+
+### Patch Changes
+
+- Updated dependencies [5166e5e03]
+- Updated dependencies [2533caf48]
+- Updated dependencies [c7ac86b85]
+- Updated dependencies [1bb3a6556]
+  - @blitzjs/auth@2.0.0-beta.28
+  - @blitzjs/next@2.0.0-beta.28
+  - @blitzjs/rpc@2.0.0-beta.28
+  - blitz@2.0.0-beta.28
+  - @blitzjs/config@2.0.0-beta.28
+
+## 0.1.1-beta.3
+
+### Patch Changes
+
+- Updated dependencies [eda14fa8a]
+- Updated dependencies [3d004dc41]
+- Updated dependencies [29c2b029a]
+  - @blitzjs/next@2.0.0-beta.27
+  - @blitzjs/rpc@2.0.0-beta.27
+  - @blitzjs/auth@2.0.0-beta.27
+  - blitz@2.0.0-beta.27
+  - @blitzjs/config@2.0.0-beta.27
+
+## 0.1.1-beta.2
+
+### Patch Changes
+
+- Updated dependencies [e82a79be5]
+- Updated dependencies [38d945a3f]
+  - @blitzjs/auth@2.0.0-beta.26
+  - @blitzjs/next@2.0.0-beta.26
+  - @blitzjs/rpc@2.0.0-beta.26
+  - blitz@2.0.0-beta.26
+  - @blitzjs/config@2.0.0-beta.26
+
+## 0.1.1-beta.1
+
+### Patch Changes
+
+- Updated dependencies [f84d77a42]
+  - @blitzjs/rpc@2.0.0-beta.25
+  - @blitzjs/next@2.0.0-beta.25
+  - @blitzjs/auth@2.0.0-beta.25
+  - @blitzjs/config@2.0.0-beta.25
+  - blitz@2.0.0-beta.25
+
+## 0.1.1-beta.0
+
+### Patch Changes
+
+- 37aeaa7fa: feature: Nextjs 13 App Directory Utility Methods
+
+  ### 🔧 New Blitz Auth Hook `useAuthenticatedBlitzContext`
+
+  This hook is implemented as the replacement of the [`BlitzPage` seurity auth utilities](https://blitzjs.com/docs/authorization#secure-your-pages) provided for the pages directory to work with React Server Components in the Nextjs 13 app directory
+  It can be used in any asynchronous server component be it in `page.ts` or in the layouts in `layout.ts`
+  It uses the new [`redirect` function](https://beta.nextjs.org/docs/api-reference/redirect) to provide the required authorization in server side
+
+  #### API
+
+  ```ts
+  useAuthenticatedBlitzContext({
+    redirectTo,
+    redirectAuthenticatedTo,
+    role,
+  }: {
+    redirectTo?: string | RouteUrlObject
+    redirectAuthenticatedTo?: string | RouteUrlObject | ((ctx: Ctx) => string | RouteUrlObject)
+    role?: string | string[]
+  }): Promise<void>
+  ```
+
+  #### Usage
+
+  **Example Usage in React Server Component in `app` directory in Next 13**
+
+  ```ts
+  import {getAppSession, useAuthenticatedBlitzContext} from "src/blitz-server"
+  ...
+  await useAuthenticatedBlitzContext({
+      redirectTo: "/auth/login",
+      role: ["admin"],
+      redirectAuthenticatedTo: "/dashboard",
+  })
+  ```
+
+  ### 🔧 New Blitz RPC Hook `invokeResolver`
+
+  #### API
+
+  ```ts
+  invokeResolver<T extends (...args: any) => any, TInput = FirstParam<T>>(
+    queryFn: T,
+    params: TInput,
+  ): Promise<PromiseReturnType<T>>
+  ```
+
+  #### Example Usage
+
+  ```ts
+  ...
+  import {invokeResolver, useAuthenticatedBlitzContext} from "../src/blitz-server"
+  import getCurrentUser from "../src/users/queries/getCurrentUser"
+
+  export default async function Home() {
+    await useAuthenticatedBlitzContext({
+      redirectTo: "/auth/login",
+    })
+    const user = await invokeResolver(getCurrentUser, null)
+  ...
+  ```
+
+- Updated dependencies [cadefb88e]
+- Updated dependencies [6f18cbdc9]
+- Updated dependencies [acc07ce94]
+- Updated dependencies [ea7561b8e]
+- Updated dependencies [9529dbd6f]
+- Updated dependencies [ea7561b8e]
+- Updated dependencies [6e88a847f]
+- Updated dependencies [37aeaa7fa]
+  - blitz@2.0.0-beta.24
+  - @blitzjs/auth@2.0.0-beta.24
+  - @blitzjs/next@2.0.0-beta.24
+  - @blitzjs/rpc@2.0.0-beta.24
+  - @blitzjs/config@2.0.0-beta.24
--- a/apps/next13/app/auth/layout.tsx
+++ b/apps/next13/app/auth/layout.tsx
@@ -0,0 +1,8 @@
+import {useAuthenticatedBlitzContext} from "@blitzjs/auth"
+
+export default async function RootLayout({children}: {children: React.ReactNode}) {
+  await useAuthenticatedBlitzContext({
+    redirectAuthenticatedTo: "/",
+  })
+  return <>{children}</>
+}
--- a/apps/next13/app/auth/login/page.tsx
+++ b/apps/next13/app/auth/login/page.tsx
@@ -7,16 +7,7 @@ import {useSearchParams} from "next/navigation"
 const LoginPage = () => {
  const router = useRouter()
  const searchParams = useSearchParams()
-  return (
-    <LoginForm
-      onSuccess={(_user) => {
-        const next = searchParams.get("next")
-          ? decodeURIComponent(searchParams.get("next") as string)
-          : "/"
-        return router.push(next)
-      }}
-    />
-  )
+  return <LoginForm onSuccess={(_user) => {}} />
 }

 export default LoginPage
--- a/apps/next13/app/error.tsx
+++ b/apps/next13/app/error.tsx
@@ -1,6 +1,6 @@
 "use client" // Error components must be Client components

-import {useEffect} from "react"
+import React, {useEffect} from "react"

 export default function Error({error, reset}: {error: Error; reset: () => void}) {
  useEffect(() => {
--- a/apps/next13/app/layout.tsx
+++ b/apps/next13/app/layout.tsx
@@ -1,5 +1,5 @@
 import "src/styles/globals.css"
-import BlitzProvider from "./provider"
+import {BlitzProvider} from "../src/blitz-client"
 import styles from "src/styles/Home.module.css"

 export default function RootLayout({children}: {children: React.ReactNode}) {
--- a/apps/next13/app/page.tsx
+++ b/apps/next13/app/page.tsx
@@ -1,13 +1,15 @@
 import Link from "next/link"
-import Test from "./react-query"
 import styles from "src/styles/Home.module.css"
-// import { getSessionContext } from "@blitzjs/auth"
-// import getCurrentUser from "../src/users/queries/getCurrentUser"
+import Test from "./react-query"
+import {invoke, useAuthenticatedBlitzContext} from "../src/blitz-server"
+import getCurrentUser from "../src/users/queries/getCurrentUser"
+
 export default async function Home() {
-  // const ctx = await getSessionContext()
-  // console.log(ctx)
-  // const user = getCurrentUser(null, ctx)
-  console.log(user)
+  await useAuthenticatedBlitzContext({
+    redirectTo: "/auth/login",
+  })
+  const user = await invoke(getCurrentUser, null)
+  console.log("user", user)
  return (
    <div
      style={{
@@ -23,7 +25,7 @@ export default async function Home() {
          display: "flex",
          justifyContent: "center",
          alignItems: "center",
-          flexDirection: "row",
+          flexDirection: "column",
        }}
      >
        <Link href={"/auth/signup"} className={styles.button}>
@@ -32,8 +34,14 @@ export default async function Home() {
        <Link href={"/auth/login"} className={styles.loginButton}>
          <strong>Login</strong>
        </Link>
+        <div style={{height: 20}} />
+        <p>Server Session</p>
+        <p>UserId: {user?.id}</p>
+        <p>Email: {user?.email}</p>
+        <div style={{height: 20}} />
+        <p>Client Session</p>
+        <Test />
      </div>
-      <Test />
    </div>
  )
 }
--- a/apps/next13/app/provider.tsx
+++ b/apps/next13/app/provider.tsx
@@ -1,15 +0,0 @@
-"use client"
-
-import {queryClient, RSC_BlitzProvider} from "../src/blitz-client"
-
-type Props = {
-  children: React.ReactNode
-}
-
-globalThis.__BLITZ_RSC = true
-
-const BlitzProvider = ({children}: Props) => (
-  <RSC_BlitzProvider client={queryClient}>{children}</RSC_BlitzProvider>
-)
-
-export default BlitzProvider
--- a/apps/next13/app/react-query.tsx
+++ b/apps/next13/app/react-query.tsx
@@ -1,15 +1,34 @@
 "use client"

-import {useQuery} from "@blitzjs/rpc"
+import {useQuery, useMutation} from "@blitzjs/rpc"
+import logout from "../src/auth/mutations/logout"
 import getCurrentUser from "../src/users/queries/getCurrentUser"
+import {useTransition} from "react"
+import {useRouter} from "next/navigation"

 export default function Test() {
-  const [user] = useQuery(getCurrentUser, undefined)
+  const router = useRouter()
+  const [user] = useQuery(getCurrentUser, null)
+  const [isPending, startTransition] = useTransition()
+  const [logoutMutation] = useMutation(logout)
  console.log(user)
  return (
    <div>
      <h1>Test</h1>
      <p>{user?.email}</p>
+      <button
+        className="button small"
+        onClick={async () => {
+          await logoutMutation()
+          startTransition(() => {
+            // Refresh the current route and fetch new data from the server without
+            // losing client-side browser or React state.
+            router.refresh()
+          })
+        }}
+      >
+        Logout
+      </button>
    </div>
  )
 }
--- a/apps/next13/next.config.js
+++ b/apps/next13/next.config.js
@@ -4,6 +4,7 @@ const {withBlitz} = require("@blitzjs/next")
 const nextConfig = {
  experimental: {
    appDir: true,
+    serverComponentsExternalPackages: ["@prisma/client", "prisma"],
  },
 }

--- a/apps/next13/package.json
+++ b/apps/next13/package.json
@@ -1,6 +1,6 @@
 {
  "name": "next-blitz-auth",
-  "version": "0.1.0",
+  "version": "0.1.1-beta.10",
  "private": true,
  "scripts": {
    "blitz:dev": "next dev",
@@ -9,18 +9,23 @@
    "lint": "next lint"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:*",
-    "@blitzjs/config": "workspace:*",
-    "@blitzjs/next": "workspace:*",
-    "@blitzjs/rpc": "workspace:*",
+    "@blitzjs/auth": "2.0.0-beta.34",
+    "@blitzjs/config": "2.0.0-beta.34",
+    "@blitzjs/next": "2.0.0-beta.34",
+    "@blitzjs/rpc": "2.0.0-beta.34",
+    "@hookform/error-message": "2.0.0",
+    "@hookform/resolvers": "2.9.10",
    "@prisma/client": "^4.5.0",
    "@tanstack/react-query": "4.0.10",
-    "blitz": "workspace:*",
-    "next": "13.1.2",
+    "blitz": "2.0.0-beta.34",
+    "flatted": "3.2.7",
+    "next": "13.5.2",
    "prisma": "^4.5.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
-    "superjson": "1.11.0"
+    "react-hook-form": "7.39.1",
+    "superjson": "1.11.0",
+    "zod": "3.20.2"
  },
  "devDependencies": {
    "@types/node": "18.11.7",
--- a/apps/next13/prisma/dev.db
+++ b/apps/next13/prisma/dev.db
--- a/apps/next13/prisma/migrations/20230206052436_/migration.sql
+++ b/apps/next13/prisma/migrations/20230206052436_/migration.sql
@@ -0,0 +1,48 @@
+/*
+  Warnings:
+
+  - You are about to drop the `Token` table. If the table is not empty, all the data it contains will be lost.
+  - You are about to drop the column `createdAt` on the `User` table. All the data in the column will be lost.
+  - You are about to drop the column `role` on the `User` table. All the data in the column will be lost.
+  - You are about to drop the column `updatedAt` on the `User` table. All the data in the column will be lost.
+  - You are about to drop the column `createdAt` on the `Session` table. All the data in the column will be lost.
+  - You are about to drop the column `updatedAt` on the `Session` table. All the data in the column will be lost.
+
+*/
+-- DropIndex
+DROP INDEX "Token_hashedToken_type_key";
+
+-- DropTable
+PRAGMA foreign_keys=off;
+DROP TABLE "Token";
+PRAGMA foreign_keys=on;
+
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_User" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "name" TEXT,
+    "email" TEXT NOT NULL,
+    "hashedPassword" TEXT
+);
+INSERT INTO "new_User" ("email", "hashedPassword", "id", "name") SELECT "email", "hashedPassword", "id", "name" FROM "User";
+DROP TABLE "User";
+ALTER TABLE "new_User" RENAME TO "User";
+CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
+CREATE TABLE "new_Session" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "expiresAt" DATETIME,
+    "handle" TEXT NOT NULL,
+    "hashedSessionToken" TEXT,
+    "antiCSRFToken" TEXT,
+    "publicData" TEXT,
+    "privateData" TEXT,
+    "userId" INTEGER,
+    CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+INSERT INTO "new_Session" ("antiCSRFToken", "expiresAt", "handle", "hashedSessionToken", "id", "privateData", "publicData", "userId") SELECT "antiCSRFToken", "expiresAt", "handle", "hashedSessionToken", "id", "privateData", "publicData", "userId" FROM "Session";
+DROP TABLE "Session";
+ALTER TABLE "new_Session" RENAME TO "Session";
+CREATE UNIQUE INDEX "Session_handle_key" ON "Session"("handle");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;
--- a/apps/next13/src/auth/components/LoginForm.tsx
+++ b/apps/next13/src/auth/components/LoginForm.tsx
@@ -5,6 +5,8 @@ import {Form, FORM_ERROR} from "../../core/components/Form"
 import login from "../../auth/mutations/login"
 import {Login} from "../../auth/validations"
 import {useMutation} from "@blitzjs/rpc"
+import {startTransition} from "react"
+import {useRouter} from "next/navigation"

 type LoginFormProps = {
  onSuccess?: (user: PromiseReturnType<typeof login>) => void
@@ -12,6 +14,7 @@ type LoginFormProps = {

 export const LoginForm = (props: LoginFormProps) => {
  const [loginMutation] = useMutation(login)
+  const router = useRouter()
  return (
    <div>
      <h1>Login</h1>
@@ -24,6 +27,11 @@ export const LoginForm = (props: LoginFormProps) => {
          try {
            const user = await loginMutation(values)
            props.onSuccess?.(user)
+            startTransition(() => {
+              // Refresh the current route and fetch new data from the server without
+              // losing client-side browser or React state.
+              router.refresh()
+            })
          } catch (error: any) {
            if (error instanceof AuthenticationError) {
              return {[FORM_ERROR]: "Sorry, those credentials are invalid"}
--- a/apps/next13/src/auth/components/SignupForm.tsx
+++ b/apps/next13/src/auth/components/SignupForm.tsx
@@ -3,6 +3,8 @@ import {Form, FORM_ERROR} from "../../core/components/Form"
 import signup from "../../auth/mutations/signup"
 import {Signup} from "../../auth/validations"
 import {useMutation} from "@blitzjs/rpc"
+import {startTransition} from "react"
+import {useRouter} from "next/navigation"

 type SignupFormProps = {
  onSuccess?: () => void
@@ -10,6 +12,8 @@ type SignupFormProps = {

 export const SignupForm = (props: SignupFormProps) => {
  const [signupMutation] = useMutation(signup)
+  const router = useRouter()
+
  return (
    <div>
      <h1>Create an Account</h1>
@@ -22,6 +26,11 @@ export const SignupForm = (props: SignupFormProps) => {
          try {
            await signupMutation(values)
            props.onSuccess?.()
+            startTransition(() => {
+              // Refresh the current route and fetch new data from the server without
+              // losing client-side browser or React state.
+              router.refresh()
+            })
          } catch (error: any) {
            if (error.code === "P2002" && error.meta?.target?.includes("email")) {
              // Error "P2002" comes from Prisma (https://www.prisma.io/docs/reference/api-reference/error-reference#p2002)
--- a/apps/next13/src/auth/mutations/changePassword.ts
+++ b/apps/next13/src/auth/mutations/changePassword.ts
@@ -1,23 +1,24 @@
 import {NotFoundError} from "blitz"
 import db from "../../../prisma"
-import {authenticateUser} from "./login"
+// import {authenticateUser} from "./login"
 import {ChangePassword} from "../validations"
 import {resolver} from "@blitzjs/rpc"
-import {SecurePassword} from "@blitzjs/auth"
+// import {SecurePassword} from "@blitzjs/auth"

 export default resolver.pipe(
+  //@ts-ignore
  resolver.zod(ChangePassword),
  resolver.authorize(),
  async ({currentPassword, newPassword}, ctx) => {
    const user = await db.user.findFirst({where: {id: ctx.session.userId}})
    if (!user) throw new NotFoundError()

-    await authenticateUser(user.email, currentPassword)
+    // await authenticateUser(user.email, currentPassword)

-    const hashedPassword = await SecurePassword.hash(newPassword.trim())
+    // const hashedPassword = await SecurePassword.hash(newPassword.trim())
    await db.user.update({
      where: {id: user.id},
-      data: {hashedPassword},
+      data: {hashedPassword: newPassword},
    })

    return true
--- a/apps/next13/src/auth/mutations/forgotPassword.ts
+++ b/apps/next13/src/auth/mutations/forgotPassword.ts
@@ -4,7 +4,7 @@ import db from "../../../prisma"
 import {ForgotPassword} from "../validations"

 const RESET_PASSWORD_TOKEN_EXPIRATION_IN_HOURS = 4
-
+//@ts-ignore
 export default resolver.pipe(resolver.zod(ForgotPassword), async ({email}) => {
  // 1. Get the user
  const user = await db.user.findFirst({where: {email: email.toLowerCase()}})
--- a/apps/next13/src/auth/mutations/login.ts
+++ b/apps/next13/src/auth/mutations/login.ts
@@ -1,31 +1,31 @@
-import {SecurePassword} from "@blitzjs/auth"
 import {resolver} from "@blitzjs/rpc"
-import {AuthenticationError} from "blitz"
+// import {AuthenticationError} from "blitz"
 import db from "../../../prisma"
 import {Login} from "../validations"

-export const authenticateUser = async (rawEmail: string, rawPassword: string) => {
-  const {email, password} = Login.parse({email: rawEmail, password: rawPassword})
-  const user = await db.user.findFirst({where: {email}})
-  if (!user) throw new AuthenticationError()
+// export const authenticateUser = async (rawEmail: string, rawPassword: string) => {
+//   const {email, password} = Login.parse({email: rawEmail, password: rawPassword})
+//   const user = await db.user.findFirst({where: {email}})
+//   if (!user) throw new AuthenticationError()

-  const result = await SecurePassword.verify(user.hashedPassword, password)
+//   const result = await SecurePassword.verify(user.hashedPassword, password)

-  if (result === SecurePassword.VALID_NEEDS_REHASH) {
-    // Upgrade hashed password with a more secure hash
-    const improvedHash = await SecurePassword.hash(password)
-    await db.user.update({where: {id: user.id}, data: {hashedPassword: improvedHash}})
-  }
-
-  const {hashedPassword, ...rest} = user
-  return rest
-}
+//   if (result === SecurePassword.VALID_NEEDS_REHASH) {
+//     // Upgrade hashed password with a more secure hash
+//     const improvedHash = await SecurePassword.hash(password)
+//     await db.user.update({where: {id: user.id}, data: {hashedPassword: improvedHash}})
+//   }

+//   const {hashedPassword, ...rest} = user
+//   return rest
+// }
+//@ts-ignore
 export default resolver.pipe(resolver.zod(Login), async ({email, password}, ctx) => {
  // This throws an error if credentials are invalid
-  const user = await authenticateUser(email, password)
+  // const user = await authenticateUser(email, password)
+  const user = await db.user.findFirst({where: {email}})
  //@ts-ignore
  await ctx.session.$create({userId: user.id, role: user.role})
-
+  console.log("user", user)
  return user
 })
--- a/apps/next13/src/auth/mutations/resetPassword.ts
+++ b/apps/next13/src/auth/mutations/resetPassword.ts
@@ -1,4 +1,4 @@
-import {SecurePassword, hash256} from "@blitzjs/auth"
+import {hash256} from "@blitzjs/auth"
 import db from "../../../prisma"
 import {ResetPassword} from "../validations"
 import login from "./login"
@@ -32,10 +32,12 @@ export default async function resetPassword(input: any, ctx: any) {
  }

  // 5. Since token is valid, now we can update the user's password
-  const hashedPassword = await SecurePassword.hash(input.password.trim())
+  // const hashedPassword = await SecurePassword.hash(input.password.trim())
  const user = await db.user.update({
    where: {id: savedToken.userId},
-    data: {hashedPassword},
+    data: {
+      hashedPassword: input.password,
+    },
  })

  // 6. Revoke all existing login sessions for this user
--- a/apps/next13/src/auth/mutations/signup.ts
+++ b/apps/next13/src/auth/mutations/signup.ts
@@ -1,18 +1,18 @@
 import db from "../../../prisma"
-import {SecurePassword} from "@blitzjs/auth"
+// import {SecurePassword} from "@blitzjs/auth"

 export default async function signup(input: {password: string; email: string}, ctx: any) {
  const blitzContext = ctx
-  const hashedPassword = await SecurePassword.hash((input.password as string) || "test-password")
+  // const hashedPassword = await SecurePassword.hash((input.password as string) || "test-password")
+  const hashedPassword = (input.password as string) || "test-password"
  const email = (input.email as string) || "test" + Math.random() + "@test.com"
  const user = await db.user.create({
-    data: {email, hashedPassword, role: "user"},
-    select: {id: true, name: true, email: true, role: true},
+    data: {email, hashedPassword},
  })

  await blitzContext.session.$create({
    userId: user.id,
-    role: user.role,
+    role: "user",
  })

  return {userId: blitzContext.session.userId, ...user, email: input.email}
--- a/apps/next13/src/blitz-client.ts
+++ b/apps/next13/src/blitz-client.ts
@@ -1,8 +1,9 @@
+"use client"
 import {AuthClientPlugin} from "@blitzjs/auth"
 import {setupBlitzClient} from "@blitzjs/next"
 import {BlitzRpcPlugin} from "@blitzjs/rpc"

-export const {withBlitz, useSession, queryClient, RSC_BlitzProvider} = setupBlitzClient({
+export const {withBlitz, useSession, queryClient, BlitzProvider} = setupBlitzClient({
  plugins: [
    AuthClientPlugin({
      cookiePrefix: "web-cookie-prefix",
--- a/apps/next13/src/blitz-server.ts
+++ b/apps/next13/src/blitz-server.ts
@@ -4,19 +4,21 @@ import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
 import db from "../prisma"
 import {simpleRolesIsAuthorized} from "@blitzjs/auth"
 import {BlitzLogger} from "blitz"
+import {RpcServerPlugin} from "@blitzjs/rpc"

-const {gSSP, gSP, api} = setupBlitzServer({
+const {api, getBlitzContext, useAuthenticatedBlitzContext, invoke} = setupBlitzServer({
  plugins: [
    AuthServerPlugin({
      cookiePrefix: "web-cookie-prefix",
      storage: PrismaStorage(db),
      isAuthorized: simpleRolesIsAuthorized,
    }),
+    RpcServerPlugin({}),
  ],
  logger: BlitzLogger({}),
 })

-export {gSSP, gSP, api}
+export {api, getBlitzContext, useAuthenticatedBlitzContext, invoke}

 export const cliConfig: BlitzCliConfig = {
  customTemplates: "src/templates",
--- a/apps/next13/src/core/components/LabeledTextField.tsx
+++ b/apps/next13/src/core/components/LabeledTextField.tsx
@@ -58,4 +58,6 @@ export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldPro
  },
 )

+LabeledTextField.displayName = "LabeledTextField"
+
 export default LabeledTextField
--- a/apps/next13/src/pages/_app.tsx
+++ b/apps/next13/src/pages/_app.tsx
@@ -1,8 +0,0 @@
-import {AppProps} from "@blitzjs/next"
-import {withBlitz} from "../blitz-client"
-
-function MyApp({Component, pageProps}: AppProps) {
-  return <Component {...pageProps} />
-}
-
-export default withBlitz(MyApp, true)
--- a/apps/next13/src/pages/api/auth/session.ts
+++ b/apps/next13/src/pages/api/auth/session.ts
@@ -0,0 +1,8 @@
+import {api} from "../../../blitz-server"
+
+export default api((req, res, ctx) => {
+  // console.log("session", ctx.session)
+  //get cookie
+  console.dir("cookie", req.headers.cookie)
+  res.json({session: ctx.session.userId})
+})
--- a/apps/next13/src/pages/api/rpc/[[...blitz]].ts
+++ b/apps/next13/src/pages/api/rpc/[[...blitz]].ts
@@ -1,4 +1,4 @@
 import {rpcHandler} from "@blitzjs/rpc"
-import {api} from "src/blitz-server"
+import {api} from "../../../blitz-server"

 export default api(rpcHandler({onError: console.log}))
--- a/apps/next13/src/users/queries/getCurrentUser.ts
+++ b/apps/next13/src/users/queries/getCurrentUser.ts
@@ -1,11 +1,11 @@
 import {Ctx} from "blitz"
 import db from "../../../prisma"

-export default async function getCurrentUser() {
-  // if (!session.userId) return null
-  console.log("getCurrentUser")
+export default async function getCurrentUser(input: null, ctx: Ctx) {
+  if (!ctx.session.userId) return null
  const user = await db.user.findFirst({
-    select: {id: true, name: true, email: true, role: true},
+    where: {id: ctx.session.userId},
+    select: {id: true, name: true, email: true},
  })

  return user
--- a/apps/toolkit-app-passportjs/package.json
+++ b/apps/toolkit-app-passportjs/package.json
@@ -23,17 +23,17 @@
    ]
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:*",
-    "@blitzjs/config": "workspace:*",
-    "@blitzjs/next": "workspace:*",
-    "@blitzjs/rpc": "workspace:*",
+    "@blitzjs/auth": "2.0.0-beta.34",
+    "@blitzjs/config": "2.0.0-beta.34",
+    "@blitzjs/next": "2.0.0-beta.34",
+    "@blitzjs/rpc": "2.0.0-beta.34",
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
-    "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.22",
-    "next": "13.1.2",
+    "@prisma/client": "4.6.1",
+    "blitz": "2.0.0-beta.34",
+    "next": "13.5.2",
    "openid-client": "5.2.1",
-    "prisma": "4.6.0",
+    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0",
    "react-hook-form": "7.39.1",
--- a/apps/toolkit-app-passportjs/src/auth/components/LoginForm.tsx
+++ b/apps/toolkit-app-passportjs/src/auth/components/LoginForm.tsx
@@ -40,17 +40,12 @@ export const LoginForm = (props: LoginFormProps) => {
        <LabeledTextField name="email" label="Email" placeholder="Email" />
        <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
        <div>
-          <Link href={Routes.ForgotPasswordPage()} passHref>
-            <a>Forgot your password?</a>
-          </Link>
+          <Link href={Routes.ForgotPasswordPage()}>Forgot your password?</Link>
        </div>
      </Form>

      <div style={{ marginTop: "1rem" }}>
-        Or{" "}
-        <Link href={Routes.SignupPage()} passHref>
-          <a>Sign Up</a>
-        </Link>
+        Or <Link href={Routes.SignupPage()}>Sign Up</Link>
      </div>
    </div>
  )
--- a/apps/toolkit-app-passportjs/src/auth/mutations/changePassword.ts
+++ b/apps/toolkit-app-passportjs/src/auth/mutations/changePassword.ts
@@ -3,7 +3,7 @@ import db from "db"
 import { authenticateUser } from "./login"
 import { ChangePassword } from "../validations"
 import { resolver } from "@blitzjs/rpc"
-import { SecurePassword } from "@blitzjs/auth"
+import { SecurePassword } from "@blitzjs/auth/secure-password"

 export default resolver.pipe(
  resolver.zod(ChangePassword),
--- a/apps/toolkit-app-passportjs/src/auth/mutations/login.ts
+++ b/apps/toolkit-app-passportjs/src/auth/mutations/login.ts
@@ -1,4 +1,4 @@
-import { SecurePassword } from "@blitzjs/auth"
+import { SecurePassword } from "@blitzjs/auth/secure-password"
 import { resolver } from "@blitzjs/rpc"
 import { AuthenticationError } from "blitz"
 import db from "db"
--- a/apps/toolkit-app-passportjs/src/auth/mutations/resetPassword.ts
+++ b/apps/toolkit-app-passportjs/src/auth/mutations/resetPassword.ts
@@ -1,6 +1,7 @@
-import { SecurePassword, hash256 } from "@blitzjs/auth"
+import { hash256 } from "@blitzjs/auth"
 import db from "db"
 import { ResetPassword } from "../validations"
+import { SecurePassword } from "@blitzjs/auth/secure-password"
 import login from "./login"

 export class ResetPasswordError extends Error {
--- a/apps/toolkit-app-passportjs/src/auth/mutations/signup.ts
+++ b/apps/toolkit-app-passportjs/src/auth/mutations/signup.ts
@@ -1,5 +1,5 @@
 import db from "db"
-import { SecurePassword } from "@blitzjs/auth"
+import { SecurePassword } from "@blitzjs/auth/secure-password"
 import { Role } from "types"

 export default async function signup(input, ctx) {
--- a/apps/toolkit-app-passportjs/src/pages/index.tsx
+++ b/apps/toolkit-app-passportjs/src/pages/index.tsx
@@ -38,15 +38,11 @@ const UserInfo = () => {
  } else {
    return (
      <>
-        <Link href={Routes.SignupPage()} passHref>
-          <a className="button small">
-            <strong>Sign Up</strong>
-          </a>
+        <Link href={Routes.SignupPage()} className="button small">
+          <strong>Sign Up</strong>
        </Link>
-        <Link href={Routes.LoginPage()} passHref>
-          <a className="button small">
-            <strong>Login</strong>
-          </a>
+        <Link href={Routes.LoginPage()} className="button small">
+          <strong>Login</strong>
        </Link>
      </>
    )
@@ -59,7 +55,7 @@ const Home: BlitzPage = () => {
      <div className="container">
        <main>
          <div className="logo">
-            <Image src={`${logo.src}`} alt="blitzjs" width="256px" height="118px" layout="fixed" />
+            <Image src={`${logo.src}`} alt="blitzjs" width={256} height={118} layout="fixed" />
          </div>
          <p>
            <strong>Congrats!</strong> Your app is ready, including user sign-up and log-in.
@@ -90,10 +86,7 @@ const Home: BlitzPage = () => {
              <code>blitz dev</code>
            </pre>
            <p>
-              and go to{" "}
-              <Link href="/projects">
-                <a>/projects</a>
-              </Link>
+              and go to <Link href="/projects">/projects</Link>
            </p>
          </div>
          <div className="buttons" style={{ marginTop: "5rem" }}>
--- a/apps/toolkit-app/next.config.js
+++ b/apps/toolkit-app/next.config.js
@@ -1,15 +1,14 @@
-// @ts-check
-
-const withBundleAnalyzer = require("@next/bundle-analyzer")({
-  enabled: process.env.ANALYZE === "true",
-})
+const { withNextAuthAdapter } = require("@blitzjs/auth")
 const { withBlitz } = require("@blitzjs/next")

 /**
- * @type {import('@blitzjs/next').BlitzConfig}
+ * @type {import('next').NextConfig}
 **/
 const config = {
  reactStrictMode: true,
+  blitz: {
+    resolversDynamicImport: true,
+  },
 }

-module.exports = withBlitz(withBundleAnalyzer(config))
+module.exports = withBlitz(withNextAuthAdapter(config))
--- a/apps/toolkit-app/package.json
+++ b/apps/toolkit-app/package.json
@@ -24,16 +24,17 @@
    ]
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:*",
-    "@blitzjs/config": "workspace:*",
-    "@blitzjs/next": "workspace:*",
-    "@blitzjs/rpc": "workspace:*",
+    "@blitzjs/auth": "2.0.0-beta.34",
+    "@blitzjs/config": "2.0.0-beta.34",
+    "@blitzjs/next": "2.0.0-beta.34",
+    "@blitzjs/rpc": "2.0.0-beta.34",
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
-    "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.22",
-    "next": "13.1.2",
-    "prisma": "4.6.0",
+    "@prisma/client": "4.6.1",
+    "blitz": "2.0.0-beta.34",
+    "next": "13.5.2",
+    "next-auth": "4.18.7",
+    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0",
    "react-hook-form": "7.39.1",
--- a/apps/toolkit-app/src/auth/components/LoginForm.tsx
+++ b/apps/toolkit-app/src/auth/components/LoginForm.tsx
@@ -40,17 +40,12 @@ export const LoginForm = (props: LoginFormProps) => {
        <LabeledTextField name="email" label="Email" placeholder="Email" />
        <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
        <div>
-          <Link href={Routes.ForgotPasswordPage()} passHref>
-            <a>Forgot your password?</a>
-          </Link>
+          <Link href={Routes.ForgotPasswordPage()}>Forgot your password?</Link>
        </div>
      </Form>

      <div style={{ marginTop: "1rem" }}>
-        Or{" "}
-        <Link href={Routes.SignupPage()} passHref>
-          <a>Sign Up</a>
-        </Link>
+        Or <Link href={Routes.SignupPage()}>Sign Up</Link>
      </div>
    </div>
  )
--- a/apps/toolkit-app/src/auth/components/SignupForm.tsx
+++ b/apps/toolkit-app/src/auth/components/SignupForm.tsx
@@ -10,6 +10,7 @@ type SignupFormProps = {

 export const SignupForm = (props: SignupFormProps) => {
  const [signupMutation] = useMutation(signup)
+
  return (
    <div>
      <h1>Create an Account</h1>
--- a/apps/toolkit-app/src/auth/mutations/changePassword.ts
+++ b/apps/toolkit-app/src/auth/mutations/changePassword.ts
@@ -3,7 +3,7 @@ import db from "db"
 import { authenticateUser } from "./login"
 import { ChangePassword } from "../validations"
 import { resolver } from "@blitzjs/rpc"
-import { SecurePassword } from "@blitzjs/auth"
+import { SecurePassword } from "@blitzjs/auth/secure-password"

 export default resolver.pipe(
  resolver.zod(ChangePassword),
--- a/apps/toolkit-app/src/auth/mutations/login.ts
+++ b/apps/toolkit-app/src/auth/mutations/login.ts
@@ -1,4 +1,4 @@
-import { SecurePassword } from "@blitzjs/auth"
+import { SecurePassword } from "@blitzjs/auth/secure-password"
 import { resolver } from "@blitzjs/rpc"
 import { AuthenticationError } from "blitz"
 import db from "db"
@@ -24,9 +24,10 @@ export const authenticateUser = async (rawEmail: string, rawPassword: string) =>

 export default resolver.pipe(resolver.zod(Login), async ({ email, password }, ctx) => {
  // This throws an error if credentials are invalid
-  const user = await authenticateUser(email, password)
+  // const user = await authenticateUser(email, password)
+  const user = await db.user.findFirst({ where: { email } })

-  await ctx.session.$create({ userId: user.id, role: user.role as Role })
+  await ctx.session.$create({ userId: user!.id, role: user!.role as Role })

  return user
 })
--- a/apps/toolkit-app/src/auth/mutations/resetPassword.test.ts
+++ b/apps/toolkit-app/src/auth/mutations/resetPassword.test.ts
@@ -1,7 +1,8 @@
 import { vi, describe, it, beforeEach, expect } from "vitest"
 import resetPassword from "./resetPassword"
 import db from "db"
-import { SecurePassword, hash256 } from "@blitzjs/auth"
+import { hash256 } from "@blitzjs/auth"
+import { SecurePassword } from "@blitzjs/auth/secure-password"

 beforeEach(async () => {
  await db.$reset()
--- a/apps/toolkit-app/src/auth/mutations/resetPassword.ts
+++ b/apps/toolkit-app/src/auth/mutations/resetPassword.ts
@@ -1,4 +1,5 @@
-import { SecurePassword, hash256 } from "@blitzjs/auth"
+import { hash256 } from "@blitzjs/auth"
+import { SecurePassword } from "@blitzjs/auth/secure-password"
 import db from "db"
 import { ResetPassword } from "../validations"
 import login from "./login"
--- a/apps/toolkit-app/src/auth/mutations/signup.ts
+++ b/apps/toolkit-app/src/auth/mutations/signup.ts
@@ -1,11 +1,11 @@
 import db from "db"
-import { SecurePassword } from "@blitzjs/auth"
 import { Role } from "types"

 export default async function signup(input, ctx) {
  const blitzContext = ctx

-  const hashedPassword = await SecurePassword.hash((input.password as string) || "test-password")
+  // const hashedPassword = await SecurePassword.hash((input.password as string) || "test-password")
+  const hashedPassword = (input.password as string) || "test-password"
  const email = (input.email as string) || "test" + Math.random() + "@test.com"
  const user = await db.user.create({
    data: { email, hashedPassword, role: "user" },
--- a/apps/toolkit-app/src/blitz-server.ts
+++ b/apps/toolkit-app/src/blitz-server.ts
@@ -1,9 +1,22 @@
 import type { BlitzCliConfig } from "blitz"
-import { setupBlitzServer } from "@blitzjs/next"
-import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
-import db from "db"
-import { simpleRolesIsAuthorized } from "@blitzjs/auth"
 import { BlitzLogger } from "blitz"
+import { setupBlitzServer } from "@blitzjs/next"
+import { AuthServerPlugin, PrismaStorage, simpleRolesIsAuthorized } from "@blitzjs/auth"
+import db from "db"
+
+export const cliConfig: BlitzCliConfig = {
+  customTemplates: "src/templates",
+  codegen: {
+    fieldTypeMap: {
+      string: {
+        component: "LabeledTextField",
+        inputType: "text",
+        zodType: "date",
+        prismaType: "String",
+      },
+    },
+  },
+}

 const { gSSP, gSP, api } = setupBlitzServer({
  plugins: [
@@ -13,11 +26,10 @@ const { gSSP, gSP, api } = setupBlitzServer({
      isAuthorized: simpleRolesIsAuthorized,
    }),
  ],
+  formatError: (error) => {
+    return new Error("Formatted error" + error.message)
+  },
  logger: BlitzLogger({}),
 })

 export { gSSP, gSP, api }
-
-export const cliConfig: BlitzCliConfig = {
-  customTemplates: "src/templates",
-}
--- a/apps/toolkit-app/src/core/components/LabelSelectField.tsx
+++ b/apps/toolkit-app/src/core/components/LabelSelectField.tsx
@@ -0,0 +1,63 @@
+import { ComponentPropsWithoutRef, forwardRef, PropsWithoutRef } from "react"
+import { useFormContext } from "react-hook-form"
+import { ErrorMessage } from "@hookform/error-message"
+
+export interface LabeledSelectFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["select"]> {
+  /** Field name. */
+  name: string
+  /** Field label. */
+  label: string
+  /** Field type. Doesn't include radio buttons and checkboxes */
+  options: any[]
+  outerProps?: PropsWithoutRef<JSX.IntrinsicElements["div"]>
+  labelProps?: ComponentPropsWithoutRef<"label">
+}
+
+export const LabeledSelectField = forwardRef<HTMLSelectElement, LabeledSelectFieldProps>(
+  ({ label, outerProps, labelProps, name, options, ...props }, ref) => {
+    const {
+      register,
+      formState: { isSubmitting, errors },
+    } = useFormContext()
+    return (
+      <div {...outerProps}>
+        <label {...labelProps}>
+          {label}
+          <select {...register(name)} disabled={isSubmitting} {...props}>
+            {options &&
+              options.map((value) => (
+                <option value={value.id} key={value.id}>
+                  {value[name]}
+                </option>
+              ))}
+          </select>
+        </label>
+        <ErrorMessage
+          render={({ message }) => (
+            <div role="alert" style={{ color: "red" }}>
+              {message}
+            </div>
+          )}
+          errors={errors}
+          name={name}
+        />
+        <style jsx>{`
+          label {
+            display: flex;
+            flex-direction: column;
+            align-items: start;
+            font-size: 1rem;
+          }
+          select {
+            font-size: 1rem;
+            padding: 0.25rem 0.5rem;
+            border-radius: 3px;
+            border: 1px solid purple;
+            appearance: none;
+            margin-top: 0.5rem;
+          }
+        `}</style>
+      </div>
+    )
+  }
+)
--- a/apps/toolkit-app/src/custom-plugin/plugin.ts
+++ b/apps/toolkit-app/src/custom-plugin/plugin.ts
@@ -0,0 +1,37 @@
+import { createClientPlugin } from "blitz"
+
+type CustomPluginOptions = {
+  // ... your options
+}
+
+export const BlitzCustomPlugin = createClientPlugin<CustomPluginOptions, {}>(
+  (options?: CustomPluginOptions) => {
+    // ... your plugin code
+    console.log("Custom plugin loaded")
+    return {
+      events: {
+        onSessionCreated: async () => {
+          // Called when a new session is created - Usually when the user logs in or logs out
+          console.log("onSessionCreated in custom plugin")
+        },
+        onRpcError: async () => {
+          // Called when an RPC call fails
+          console.log("onRpcError in custom plugin")
+        },
+      },
+      middleware: {
+        beforeHttpRequest: (req) => {
+          //make changes to the request options before RPC call
+          return req
+        },
+        beforeHttpResponse: (res) => {
+          //make changes to the response before returning to the caller
+          return res
+        },
+      },
+      exports: () => ({
+        // ... your exports
+      }),
+    }
+  }
+)
--- a/apps/toolkit-app/src/pages/_app.tsx
+++ b/apps/toolkit-app/src/pages/_app.tsx
@@ -1,6 +1,6 @@
 import { ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps } from "@blitzjs/next"
 import { AuthenticationError, AuthorizationError } from "blitz"
-import React from "react"
+import "src/styles/globals.css"
 import { withBlitz } from "src/blitz-client"

 function RootErrorFallback({ error }: ErrorFallbackProps) {
--- a/apps/toolkit-app/src/pages/api/auth/[...nextauth].ts
+++ b/apps/toolkit-app/src/pages/api/auth/[...nextauth].ts
@@ -0,0 +1,43 @@
+import { api } from "src/blitz-server"
+import GithubProvider from "next-auth/providers/github"
+import { NextAuthAdapter, BlitzNextAuthOptions } from "@blitzjs/auth/next-auth"
+import db, { User } from "db"
+import { Role } from "types"
+
+// Has to be defined separately for `profile` to be correctly typed below
+const providers = [
+  GithubProvider({
+    clientId: process.env.GITHUB_CLIENT_ID as string,
+    clientSecret: process.env.GITHUB_CLIENT_SECRET as string,
+  }),
+]
+
+export default api(
+  NextAuthAdapter({
+    successRedirectUrl: "/",
+    errorRedirectUrl: "/error",
+    providers,
+    callback: async (user, account, profile, session) => {
+      console.log("USER SIDE PROFILE_DATA", { user, account, profile })
+      let newUser: User
+      try {
+        newUser = await db.user.findFirstOrThrow({ where: { name: { equals: user.name } } })
+      } catch (e) {
+        newUser = await db.user.create({
+          data: {
+            email: user.email as string,
+            name: user.name as string,
+            role: "USER",
+          },
+        })
+      }
+      const publicData = {
+        userId: newUser.id,
+        role: newUser.role as Role,
+        source: "github",
+      }
+      await session.$create(publicData)
+      return { redirectUrl: "/" }
+    },
+  })
+)
--- a/apps/toolkit-app/src/pages/api/rpc/[[...blitz]].ts
+++ b/apps/toolkit-app/src/pages/api/rpc/[[...blitz]].ts
@@ -1,4 +1,16 @@
 import { rpcHandler } from "@blitzjs/rpc"
 import { api } from "src/blitz-server"

-export default api(rpcHandler({ onError: console.log }))
+export default api(
+  rpcHandler({
+    onError: console.log,
+    formatError: (error) => {
+      error.message = `FormatError handler: ${error.message}`
+      return error
+    },
+    // logging: {
+    //   verbose: true,
+    //   blockList: ["/getCurrentUser"],
+    // },
+  })
+)
--- a/apps/toolkit-app/src/pages/auth/login.tsx
+++ b/apps/toolkit-app/src/pages/auth/login.tsx
@@ -11,11 +11,15 @@ const LoginPage: BlitzPage = () => {
      <LoginForm
        onSuccess={(_user) => {
          const next = router.query.next ? decodeURIComponent(router.query.next as string) : "/"
-          return router.push(next)
+          // return router.push(next)
        }}
      />
    </Layout>
  )
 }

+LoginPage.authenticate = {
+  redirectTo: "/",
+}
+
 export default LoginPage
--- a/Show More
+++ b/Show More