initial

2026-02-04 03:01:17 -05:00 · 2023-01-20 23:54:48 +05:30
340 changed files with 2232 additions and 7837 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -3794,8 +3794,7 @@
      "profile": "http://tobiasjordans.de",
      "contributions": [
        "code",
-        "doc",
-        "test"
+        "doc"
      ]
    },
    {
@@ -3817,85 +3816,6 @@
        "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"
-      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.changeset/big-boats-lay.md
+++ b/.changeset/big-boats-lay.md
@@ -1,5 +0,0 @@
---
-"@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/chatty-fireants-leave.md
+++ b/.changeset/chatty-fireants-leave.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/generator": patch
---
-
-Fix a type error in reset password templates.
--- a/.changeset/cuddly-singers-perform.md
+++ b/.changeset/cuddly-singers-perform.md
@@ -1,11 +0,0 @@
---
-"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/empty-spiders-lay.md
+++ b/.changeset/empty-spiders-lay.md
@@ -1,6 +0,0 @@
---
-"@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
@@ -1,6 +0,0 @@
---
-"@blitzjs/auth": minor
-"blitz": minor
---
-
-feature: Next Auth Adapter
--- a/.changeset/fast-pans-impress.md
+++ b/.changeset/fast-pans-impress.md
@@ -1,7 +0,0 @@
---
-"@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
@@ -1,6 +0,0 @@
---
-"blitz": patch
-"@blitzjs/generator": patch
---
-
-Consolidate mutations schema to new schema.{ts|js} file.
--- a/.changeset/four-radios-tickle.md
+++ b/.changeset/four-radios-tickle.md
@@ -1,20 +0,0 @@
---
-"@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/many-fans-fetch.md
+++ b/.changeset/many-fans-fetch.md
@@ -1,7 +0,0 @@
---
-"@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
@@ -1,5 +0,0 @@
---
-"@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/nice-boxes-travel.md
+++ b/.changeset/nice-boxes-travel.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/rpc": patch
---
-
-Fix return type of the `invoke` method from returning type function to return the type of resolved data
--- a/.changeset/nine-bags-rhyme.md
+++ b/.changeset/nine-bags-rhyme.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/generator": patch
---
-
-fix: add missing key prop to LabelSelectField
--- a/.changeset/ninety-pots-learn.md
+++ b/.changeset/ninety-pots-learn.md
@@ -1,9 +0,0 @@
---
-"@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
@@ -1,5 +0,0 @@
---
-"@blitzjs/generator": patch
---
-
-Remove useEffect from reset password templates.
--- a/.changeset/plenty-gifts-provide.md
+++ b/.changeset/plenty-gifts-provide.md
@@ -1,5 +0,0 @@
---
-"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
@@ -1,6 +0,0 @@
---
-"blitz": patch
-"@blitzjs/rpc": patch
---
-
-Updates internal functions and tests to support blitz apps that run tests with vitest
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -46,14 +46,11 @@
    "@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",
-    "next-blitz-auth": "0.1.0",
-    "test-app-dir": "0.0.0"
+    "test-full-auth-with-rpc": "0.0.0"
  },
  "changesets": [
    "afraid-dancers-juggle",
    "afraid-ears-repair",
-    "big-boats-lay",
    "big-phones-bow",
    "blue-flowers-peel",
    "blue-pigs-tan",
@@ -69,7 +66,6 @@
    "calm-nails-wait",
    "calm-papayas-protect",
    "calm-tomatoes-drive",
-    "chatty-fireants-leave",
    "chilled-carrots-own",
    "chilly-candles-care",
    "chilly-nails-nail",
@@ -80,7 +76,6 @@
    "cool-doors-invent",
    "cool-horses-check",
    "cuddly-pugs-crash",
-    "cuddly-singers-perform",
    "curly-rules-speak",
    "curly-seas-serve",
    "curvy-days-attend",
@@ -95,17 +90,13 @@
    "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-hounds-worry",
@@ -117,7 +108,6 @@
    "forty-timers-rhyme",
    "four-brooms-juggle",
    "four-meals-fry",
-    "four-radios-tickle",
    "four-sheep-judge",
    "funny-cups-pay",
    "fuzzy-bees-warn",
@@ -178,8 +168,6 @@
    "lucky-cows-try",
    "lucky-months-guess",
    "lucky-years-turn",
-    "many-fans-fetch",
-    "mean-ears-speak",
    "mean-gorillas-reply",
    "modern-cameras-pull",
    "modern-games-dream",
@@ -192,14 +180,12 @@
    "nervous-dolls-rule",
    "new-coats-turn",
    "new-olives-protect",
-    "nice-boxes-travel",
    "nice-deers-dream",
    "nice-starfishes-live",
    "nine-birds-confess",
    "nine-onions-admire",
    "ninety-lies-press",
    "ninety-pets-heal",
-    "ninety-pots-learn",
    "ninety-rice-tickle",
    "odd-bears-run",
    "olive-bees-buy",
@@ -209,12 +195,9 @@
    "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-peas-lick",
    "poor-penguins-look",
@@ -248,7 +231,6 @@
    "silent-colts-reply",
    "silent-lies-run",
    "silly-apricots-share",
-    "silly-peas-work",
    "silly-shoes-agree",
    "six-apricots-kick",
    "slimy-humans-impress",
@@ -273,28 +255,23 @@
    "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",
    "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",
--- a/.changeset/silly-peas-work.md
+++ b/.changeset/silly-peas-work.md
@@ -1,6 +0,0 @@
---
-"blitz": patch
-"@blitzjs/generator": patch
---
-
-Multiple fields forms using templates during generation - TODO
--- a/.changeset/strong-chicken-study.md
+++ b/.changeset/strong-chicken-study.md
@@ -1,5 +0,0 @@
---
-"@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
@@ -1,5 +0,0 @@
---
-"@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
@@ -1,67 +0,0 @@
---
-"@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/thick-peas-jog.md
+++ b/.changeset/thick-peas-jog.md
@@ -1,7 +0,0 @@
---
-"@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
@@ -1,5 +0,0 @@
---
-"@blitzjs/auth": patch
---
-
-Fix: Add missing entry to expose next-auth adapter in Blitz Auth
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -109,44 +109,9 @@ jobs:
          tree -J -d -L 1 | jq -c  '.[0].contents | map(.name | tostring) | map(select(. != "utils"))'
          folders=$(tree -J -d -L 1 | jq -c  '.[0].contents | map(.name | tostring) | map(select(. != "utils"))')
          echo "folders=$folders" >> $GITHUB_OUTPUT
-  
-  Generator:
-    name: :"Generator Test ${{matrix.language}}"
-    strategy:
-      matrix:
-        language:
-          - javascript
-          - typescript
-        os:
-          - ubuntu-latest
-      fail-fast: false
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup PNPM
-        uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
-        with:
-          version: 7.11.0
-      - name: Setup node@${{ matrix.NODE_VERSION }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.NODE_VERSION }}
-          cache: "pnpm"
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-        shell: bash
-      - name: Build
-        run: pnpm build
-        shell: bash
-      - name: Generate
-        run: |
-          mkdir test
-          cd test
-          pnpm blitz new . --language=${{matrix.language}}
-      
+
  Integration-Tests:
-    name: "Integration Test: ${{matrix.folder}} @ ${{matrix.os}} "
+    name: "Integration Test: ${{matrix.folder}} @ ${{ matrix.os }} "
    needs: [find-integration-tests]
    strategy:
      matrix:
@@ -154,6 +119,7 @@ jobs:
        os:
          - ubuntu-latest
          - windows-latest
+      fail-fast: false
    runs-on: ${{ matrix.os }}
    steps:
      - run: echo ${{matrix.folder}}
--- a/.github/workflows/pr-release.yml
+++ b/.github/workflows/pr-release.yml
@@ -99,3 +99,4 @@ jobs:
              repo: context.repo.repo,
              body: '```\n' + process.env.MESSAGE + '\n```',
            })
+  
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -2,5 +2,5 @@
 . "$(dirname "$0")/_/husky.sh"

 pnpm manypkg check
-pnpm lint
+# pnpm lint
 pnpm pretty-quick --staged
--- 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-411-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-403-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">
@@ -135,15 +135,7 @@ 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 /></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>
+    <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>

  </tr>
 </table>
@@ -163,6 +155,7 @@ _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 -->
@@ -180,6 +173,38 @@ _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 -->
@@ -711,19 +736,9 @@ 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> <a href="https://github.com/blitz-js/blitz/commits?author=tordans" title="Tests">⚠️</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="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>
  </tr>
 </table>

--- a/apps/next13/CHANGELOG.md
+++ b/apps/next13/CHANGELOG.md
@@ -1,104 +0,0 @@
-# next-blitz-auth
-
-## 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
@@ -1,8 +0,0 @@
-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,7 +7,16 @@ import {useSearchParams} from "next/navigation"
 const LoginPage = () => {
  const router = useRouter()
  const searchParams = useSearchParams()
-  return <LoginForm onSuccess={(_user) => {}} />
+  return (
+    <LoginForm
+      onSuccess={(_user) => {
+        const next = searchParams.get("next")
+          ? decodeURIComponent(searchParams.get("next") as string)
+          : "/"
+        return router.push(next)
+      }}
+    />
+  )
 }

 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 React, {useEffect} from "react"
+import {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 "../src/blitz-client"
+import BlitzProvider from "./provider"
 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,15 +1,13 @@
 import Link from "next/link"
-import styles from "src/styles/Home.module.css"
 import Test from "./react-query"
-import {invoke, useAuthenticatedBlitzContext} from "../src/blitz-server"
-import getCurrentUser from "../src/users/queries/getCurrentUser"
-
+import styles from "src/styles/Home.module.css"
+// import { getSessionContext } from "@blitzjs/auth"
+// import getCurrentUser from "../src/users/queries/getCurrentUser"
 export default async function Home() {
-  await useAuthenticatedBlitzContext({
-    redirectTo: "/auth/login",
-  })
-  const user = await invoke(getCurrentUser, null)
-  console.log("user", user)
+  // const ctx = await getSessionContext()
+  // console.log(ctx)
+  // const user = getCurrentUser(null, ctx)
+  console.log(user)
  return (
    <div
      style={{
@@ -25,7 +23,7 @@ export default async function Home() {
          display: "flex",
          justifyContent: "center",
          alignItems: "center",
-          flexDirection: "column",
+          flexDirection: "row",
        }}
      >
        <Link href={"/auth/signup"} className={styles.button}>
@@ -34,14 +32,8 @@ 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
@@ -0,0 +1,15 @@
+"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,34 +1,15 @@
 "use client"

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

 export default function Test() {
-  const router = useRouter()
-  const [user] = useQuery(getCurrentUser, null)
-  const [isPending, startTransition] = useTransition()
-  const [logoutMutation] = useMutation(logout)
+  const [user] = useQuery(getCurrentUser, undefined)
  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,7 +4,6 @@ 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.1-beta.2",
+  "version": "0.1.0",
  "private": true,
  "scripts": {
    "blitz:dev": "next dev",
@@ -13,19 +13,14 @@
    "@blitzjs/config": "workspace:*",
    "@blitzjs/next": "workspace:*",
    "@blitzjs/rpc": "workspace:*",
-    "@hookform/error-message": "2.0.0",
-    "@hookform/resolvers": "2.9.10",
    "@prisma/client": "^4.5.0",
    "@tanstack/react-query": "4.0.10",
    "blitz": "workspace:*",
-    "flatted": "3.2.7",
-    "next": "13.3.0",
+    "next": "13.1.2",
    "prisma": "^4.5.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
-    "react-hook-form": "7.39.1",
-    "superjson": "1.11.0",
-    "zod": "3.20.2"
+    "superjson": "1.11.0"
  },
  "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
@@ -1,48 +0,0 @@
-/*
-  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,8 +5,6 @@ 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
@@ -14,7 +12,6 @@ type LoginFormProps = {

 export const LoginForm = (props: LoginFormProps) => {
  const [loginMutation] = useMutation(login)
-  const router = useRouter()
  return (
    <div>
      <h1>Login</h1>
@@ -27,11 +24,6 @@ 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,8 +3,6 @@ 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
@@ -12,8 +10,6 @@ type SignupFormProps = {

 export const SignupForm = (props: SignupFormProps) => {
  const [signupMutation] = useMutation(signup)
-  const router = useRouter()
-
  return (
    <div>
      <h1>Create an Account</h1>
@@ -26,11 +22,6 @@ 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,24 +1,23 @@
 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: newPassword},
+      data: {hashedPassword},
    })

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

-//   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 db.user.findFirst({where: {email}})
+  const user = await authenticateUser(email, password)
  //@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 {hash256} from "@blitzjs/auth"
+import {SecurePassword, hash256} from "@blitzjs/auth"
 import db from "../../../prisma"
 import {ResetPassword} from "../validations"
 import login from "./login"
@@ -32,12 +32,10 @@ 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: input.password,
-    },
+    data: {hashedPassword},
  })

  // 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 = (input.password as string) || "test-password"
+  const hashedPassword = await SecurePassword.hash((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},
+    data: {email, hashedPassword, role: "user"},
+    select: {id: true, name: true, email: true, role: true},
  })

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

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

-export const {withBlitz, useSession, queryClient, BlitzProvider} = setupBlitzClient({
+export const {withBlitz, useSession, queryClient, RSC_BlitzProvider} = setupBlitzClient({
  plugins: [
    AuthClientPlugin({
      cookiePrefix: "web-cookie-prefix",
--- a/apps/next13/src/blitz-server.ts
+++ b/apps/next13/src/blitz-server.ts
@@ -4,21 +4,19 @@ 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 {api, getBlitzContext, useAuthenticatedBlitzContext, invoke} = setupBlitzServer({
+const {gSSP, gSP, api} = setupBlitzServer({
  plugins: [
    AuthServerPlugin({
      cookiePrefix: "web-cookie-prefix",
      storage: PrismaStorage(db),
      isAuthorized: simpleRolesIsAuthorized,
    }),
-    RpcServerPlugin({}),
  ],
  logger: BlitzLogger({}),
 })

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

 export const cliConfig: BlitzCliConfig = {
  customTemplates: "src/templates",
--- a/apps/next13/src/core/components/LabeledTextField.tsx
+++ b/apps/next13/src/core/components/LabeledTextField.tsx
@@ -58,6 +58,4 @@ 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
@@ -0,0 +1,8 @@
+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
@@ -1,8 +0,0 @@
-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 "../../../blitz-server"
+import {api} from "src/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(input: null, ctx: Ctx) {
-  if (!ctx.session.userId) return null
+export default async function getCurrentUser() {
+  // if (!session.userId) return null
+  console.log("getCurrentUser")
  const user = await db.user.findFirst({
-    where: {id: ctx.session.userId},
-    select: {id: true, name: true, email: true},
+    select: {id: true, name: true, email: true, role: true},
  })

  return user
--- a/apps/toolkit-app-passportjs/package.json
+++ b/apps/toolkit-app-passportjs/package.json
@@ -29,11 +29,11 @@
    "@blitzjs/rpc": "workspace:*",
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
-    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
-    "next": "13.3.0",
+    "@prisma/client": "4.6.0",
+    "blitz": "workspace:2.0.0-beta.22",
+    "next": "13.1.2",
    "openid-client": "5.2.1",
-    "prisma": "4.6.1",
+    "prisma": "4.6.0",
    "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,12 +40,17 @@ 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()}>Forgot your password?</Link>
+          <Link href={Routes.ForgotPasswordPage()} passHref>
+            <a>Forgot your password?</a>
+          </Link>
        </div>
      </Form>

      <div style={{ marginTop: "1rem" }}>
-        Or <Link href={Routes.SignupPage()}>Sign Up</Link>
+        Or{" "}
+        <Link href={Routes.SignupPage()} passHref>
+          <a>Sign Up</a>
+        </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/secure-password"
+import { SecurePassword } from "@blitzjs/auth"

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

 /**
@@ -8,4 +12,4 @@ const config = {
  reactStrictMode: true,
 }

-module.exports = withBlitz(withNextAuthAdapter(config))
+module.exports = withBlitz(withBundleAnalyzer(config))
--- a/apps/toolkit-app/package.json
+++ b/apps/toolkit-app/package.json
@@ -30,11 +30,10 @@
    "@blitzjs/rpc": "workspace:*",
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
-    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
-    "next": "13.3.0",
-    "next-auth": "4.18.7",
-    "prisma": "4.6.1",
+    "@prisma/client": "4.6.0",
+    "blitz": "workspace:2.0.0-beta.22",
+    "next": "13.1.2",
+    "prisma": "4.6.0",
    "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,12 +40,17 @@ 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()}>Forgot your password?</Link>
+          <Link href={Routes.ForgotPasswordPage()} passHref>
+            <a>Forgot your password?</a>
+          </Link>
        </div>
      </Form>

      <div style={{ marginTop: "1rem" }}>
-        Or <Link href={Routes.SignupPage()}>Sign Up</Link>
+        Or{" "}
+        <Link href={Routes.SignupPage()} passHref>
+          <a>Sign Up</a>
+        </Link>
      </div>
    </div>
  )
--- 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/secure-password"
+import { SecurePassword } from "@blitzjs/auth"

 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/secure-password"
+import { SecurePassword } from "@blitzjs/auth"
 import { resolver } from "@blitzjs/rpc"
 import { AuthenticationError } from "blitz"
 import db from "db"
@@ -24,10 +24,9 @@ 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 db.user.findFirst({ where: { email } })
+  const user = await authenticateUser(email, password)

-  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,8 +1,7 @@
 import { vi, describe, it, beforeEach, expect } from "vitest"
 import resetPassword from "./resetPassword"
 import db from "db"
-import { hash256 } from "@blitzjs/auth"
-import { SecurePassword } from "@blitzjs/auth/secure-password"
+import { SecurePassword, hash256 } from "@blitzjs/auth"

 beforeEach(async () => {
  await db.$reset()
--- a/apps/toolkit-app/src/auth/mutations/resetPassword.ts
+++ b/apps/toolkit-app/src/auth/mutations/resetPassword.ts
@@ -1,5 +1,4 @@
-import { hash256 } from "@blitzjs/auth"
-import { SecurePassword } from "@blitzjs/auth/secure-password"
+import { SecurePassword, hash256 } from "@blitzjs/auth"
 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,12 +1,11 @@
 import db from "db"
-import { SecurePassword } from "@blitzjs/auth/secure-password"
+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 = (input.password as string) || "test-password"
+  const hashedPassword = await SecurePassword.hash((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
@@ -5,20 +5,6 @@ import db from "db"
 import { simpleRolesIsAuthorized } from "@blitzjs/auth"
 import { BlitzLogger } from "blitz"

-export const cliConfig: BlitzCliConfig = {
-  customTemplates: "src/templates",
-  codegen: {
-    fieldTypeMap: {
-      string: {
-        component: "LabeledTextField",
-        inputType: "text",
-        zodType: "date",
-        prismaType: "String",
-      },
-    },
-  },
-}
-
 const { gSSP, gSP, api } = setupBlitzServer({
  plugins: [
    AuthServerPlugin({
@@ -31,3 +17,7 @@ const { gSSP, gSP, api } = setupBlitzServer({
 })

 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
@@ -1,63 +0,0 @@
-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
@@ -1,37 +0,0 @@
-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 "src/styles/globals.css"
+import React from "react"
 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
@@ -1,43 +0,0 @@
-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/auth/login.tsx
+++ b/apps/toolkit-app/src/pages/auth/login.tsx
@@ -11,15 +11,11 @@ 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/apps/toolkit-app/src/pages/auth/reset-password.tsx
+++ b/apps/toolkit-app/src/pages/auth/reset-password.tsx
@@ -10,10 +10,14 @@ import { useMutation } from "@blitzjs/rpc"
 import Link from "next/link"

 const ResetPasswordPage: BlitzPage = () => {
+  const [token, setToken] = useState("")
  const router = useRouter()
-  const token = router.query.token?.toString()
  const [resetPasswordMutation, { isSuccess }] = useMutation(resetPassword)

+  useEffect(() => {
+    setToken(router.query.token as string)
+  }, [router.isReady])
+
  return (
    <div>
      <h1>Set a New Password</h1>
--- a/apps/toolkit-app/src/pages/index.tsx
+++ b/apps/toolkit-app/src/pages/index.tsx
@@ -1,12 +1,12 @@
 import { Suspense } from "react"
+import Image from "next/image"
 import Link from "next/link"
 import Layout from "src/core/layouts/Layout"
 import { useCurrentUser } from "src/users/hooks/useCurrentUser"
 import logout from "src/auth/mutations/logout"
+import logo from "public/logo.png"
 import { useMutation } from "@blitzjs/rpc"
-import { BlitzPage } from "@blitzjs/next"
-import { Routes } from ".blitz"
-import styles from "src/styles/Home.module.css"
+import { Routes, BlitzPage } from "@blitzjs/next"

 /*
 * This file is just for a pleasant getting started page for your new app.
@@ -21,7 +21,7 @@ const UserInfo = () => {
    return (
      <>
        <button
-          className={styles.button}
+          className="button small"
          onClick={async () => {
            await logoutMutation()
          }}
@@ -38,15 +38,14 @@ const UserInfo = () => {
  } else {
    return (
      <>
-        <Link href={Routes.SignupPage()} className={styles.button}>
-          <strong>Sign Up</strong>
-        </Link>
-        <Link href={Routes.LoginPage()} className={styles.loginButton}>
-          <strong>Login</strong>
-        </Link>
-        <Link href="/api/auth/github/login" passHref>
+        <Link href={Routes.SignupPage()} passHref>
          <a className="button small">
-            <strong>Sign in with GitHub</strong>
+            <strong>Sign Up</strong>
+          </a>
+        </Link>
+        <Link href={Routes.LoginPage()} passHref>
+          <a className="button small">
+            <strong>Login</strong>
          </a>
        </Link>
      </>
@@ -57,142 +56,216 @@ const UserInfo = () => {
 const Home: BlitzPage = () => {
  return (
    <Layout title="Home">
-      <div className={styles.globe} />
-
-      <div className={styles.container}>
-        <div className={styles.toastContainer}>
+      <div className="container">
+        <main>
+          <div className="logo">
+            <Image src={`${logo.src}`} alt="blitzjs" width="256px" height="118px" layout="fixed" />
+          </div>
          <p>
            <strong>Congrats!</strong> Your app is ready, including user sign-up and log-in.
          </p>
-        </div>
-
-        <main className={styles.main}>
-          <div className={styles.wrapper}>
-            <div className={styles.header}>
-              <div className={styles.logo}>
-                <svg viewBox="0 0 165 66">
-                  <path d="M104.292 56.033C104.292 56.408 104.206 56.6636 104.036 56.8C103.9 56.9363 103.627 57.0045 103.218 57.0045H99.7409C99.4001 57.0045 99.1615 56.9533 99.0251 56.8511C98.8888 56.7147 98.8206 56.4932 98.8206 56.1864L98.9229 19.8324C98.9229 19.3211 99.1444 19.0654 99.5876 19.0654H103.627C103.839 19.0654 104.292 19.0672 104.292 19.0672V19.8324V56.033ZM64.3531 57.0081C64.1145 57.0081 63.927 56.9399 63.7906 56.8035C63.6543 56.6672 63.5861 56.4968 63.5861 56.2922V19.9383C63.5861 19.3588 63.8588 19.069 64.4042 19.069H76.829C81.533 19.069 85.1463 19.9212 87.6687 21.6256C90.1912 23.2958 91.4524 25.7331 91.4524 28.9373C91.4524 30.9484 90.924 32.6528 89.8673 34.0504C88.8106 35.4138 87.1063 36.5217 84.7543 37.3739C84.6179 37.4079 84.5497 37.4932 84.5497 37.6295C84.5497 37.7318 84.6179 37.7999 84.7543 37.834C87.2767 38.5158 89.1686 39.5895 90.4298 41.0553C91.7251 42.521 92.3727 44.4469 92.3727 46.833C92.3727 50.2418 91.0945 52.7983 88.5379 54.5027C85.9814 56.1729 82.2318 57.0081 77.2892 57.0081H64.3531ZM77.5448 35.5843C79.6923 35.5843 81.516 35.1071 83.0158 34.1526C84.5157 33.1982 85.2656 31.6983 85.2656 29.6531C85.2656 27.6079 84.5157 26.0569 83.0158 25.0002C81.5501 23.9435 79.5219 23.4151 76.9313 23.4151H70.5399C70.0286 23.4151 69.7729 23.6367 69.7729 24.0798V34.8684C69.7729 35.3457 69.9604 35.5843 70.3354 35.5843H77.5448ZM77.0335 52.662C82.9647 52.662 85.9303 50.5997 85.9303 46.4751C85.9303 44.3276 85.1633 42.7255 83.6294 41.6688C82.0955 40.6121 80.0673 40.0838 77.5448 40.0838H70.591C70.2843 40.0838 70.0627 40.1349 69.9263 40.2372C69.8241 40.3394 69.7729 40.5099 69.7729 40.7485V51.895C69.7729 52.4063 69.9604 52.662 70.3354 52.662H77.0335ZM142.707 56.8624C142.81 56.9647 142.997 57.0158 143.27 57.0158H163.876C164.387 57.0158 164.643 56.7772 164.643 56.3V53.948V53.3344H163.978H149.866C149.593 53.3344 149.457 53.2492 149.457 53.0788C149.457 52.9765 149.508 52.8572 149.61 52.7208L163.876 33.8536C164.251 33.2741 164.438 32.7628 164.438 32.3197V30.479V29.9144C164.438 29.9144 164.051 29.9165 163.876 29.9165H144.241C143.866 29.9165 143.679 30.121 143.679 30.5301V32.831C143.679 33.1037 143.713 33.2911 143.781 33.3934C143.883 33.4957 144.071 33.5468 144.344 33.5468H157.075C157.382 33.5468 157.535 33.632 157.535 33.8025L157.382 34.1092L143.219 52.9765C142.946 53.3515 142.759 53.6412 142.656 53.8457C142.588 54.0502 142.554 54.3059 142.554 54.6127V56.3C142.554 56.5727 142.605 56.7602 142.707 56.8624ZM116.929 19.0676H111.51V27.7684C114.503 27.7684 116.929 25.3419 116.929 22.3486V19.0676ZM116.926 56.0308C116.926 56.4058 116.841 56.6614 116.67 56.7978C116.534 56.9341 116.278 57.0023 115.903 57.0023H112.427C112.086 57.0023 111.847 56.9512 111.711 56.8489C111.574 56.7126 111.506 56.491 111.506 56.1842V30.6699C111.506 30.3972 111.557 30.2098 111.66 30.1075C111.762 29.9712 111.949 29.903 112.222 29.903H117.028L116.926 56.0308ZM132.183 34.3137C132.183 33.9728 132.336 33.8024 132.643 33.8024H138.779C139.256 33.8024 139.495 33.5979 139.495 33.1888V30.4789V29.9165H138.881H132.745C132.439 29.9165 132.285 29.7631 132.285 29.4563V21.531V20.713L131.621 20.7129H128.093C127.752 20.7129 127.547 20.9515 127.479 21.4288L126.865 29.4563C126.865 29.7631 126.729 29.9165 126.456 29.9165H122.366C121.957 29.9165 121.752 30.1039 121.752 30.4789V33.1888C121.752 33.5979 121.974 33.8024 122.417 33.8024H126.252C126.593 33.8024 126.763 34.0069 126.763 34.416V50.6244C126.763 52.806 127.309 54.4252 128.399 55.4819C129.49 56.5045 131.16 57.0158 133.41 57.0158C135.796 57.0158 137.535 56.9306 138.625 56.7601C139.137 56.6579 139.392 56.3681 139.392 55.8909V53.6923V53.0787H138.779H135.507C134.348 53.0787 133.495 52.806 132.95 52.2606C132.439 51.7152 132.183 50.7267 132.183 49.295V34.3137Z"></path>
-                  <path d="M0.241243 33.2639H10.9742C15.0585 33.2639 18.9054 35.1835 21.3612 38.4471L31.9483 52.5165C32.1484 52.7824 32.1786 53.1393 32.026 53.435L25.9232 65.2592C25.6304 65.8265 24.8455 65.8932 24.4612 65.3835L0.241243 33.2639Z"></path>
-                  <path d="M42.4727 33.2822H31.7398C27.6555 33.2822 23.8086 31.3626 21.3528 28.0991L10.7656 14.0297C10.5656 13.7638 10.5354 13.4068 10.688 13.1111L16.7908 1.28696C17.0836 0.719654 17.8684 0.652924 18.2528 1.16266L42.4727 33.2822Z"></path>
-                </svg>
-              </div>
-
-              <h1>Your database & authentication is ready. Try it by signing up.</h1>
-
-              {/* Auth */}
-
-              <div className={styles.buttonContainer}>
-                <Suspense fallback="Loading...">
-                  <UserInfo />
-                </Suspense>
-              </div>
-            </div>
-
-            <div className={styles.body}>
-              {/* Instructions */}
-              <div className={styles.instructions}>
-                <p>
-                  <strong>Add a new model by running the following in your terminal:</strong>
-                </p>
-
-                <div>
-                  <div className={styles.code}>
-                    <span>1</span>
-                    <pre>
-                      <code>blitz generate all project</code>
-                    </pre>
-                  </div>
-
-                  <div className={styles.code}>
-                    <span>2</span>
-                    <pre>
-                      <code>Ctrl + c</code>
-                    </pre>
-                  </div>
-
-                  <div className={styles.code}>
-                    <span>3</span>
-                    <pre>
-                      <code>blitz dev</code>
-                    </pre>
-                  </div>
-
-                  <div className={styles.code}>
-                    <span>4</span>
-                    <pre>
-                      <code>
-                        Go to{" "}
-                        <Link href="/projects" className={styles.textLink}>
-                          /projects
-                        </Link>
-                      </code>
-                    </pre>
-                  </div>
-                </div>
-              </div>
-              {/* Links */}
-              <div className={styles.linkGrid}>
-                <a
-                  href="https://blitzjs.com/docs/getting-started?utm_source=blitz-new&utm_medium=app-template&utm_campaign=blitz-new"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className={styles.card}
-                >
-                  Blitz Docs
-                  <span className={styles.arrowIcon} />
-                </a>
-                <a
-                  href="https://nextjs.org/docs/getting-started"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className={styles.card}
-                >
-                  Next.js Docs
-                  <span className={styles.arrowIcon} />
-                </a>
-                <a
-                  href="https://github.com/blitz-js/blitz"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className={styles.card}
-                >
-                  Github Repo
-                  <span className={styles.arrowIcon} />
-                </a>
-                <a
-                  href="https://twitter.com/blitz_js"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className={styles.card}
-                >
-                  Blitz Twitter
-                  <span className={styles.arrowIcon} />
-                </a>
-                <a
-                  href="https://discord.blitzjs.com"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className={styles.card}
-                >
-                  Discord Community
-                  <span className={styles.arrowIcon} />
-                </a>
-              </div>
-            </div>
+          <div className="buttons" style={{ marginTop: "1rem", marginBottom: "1rem" }}>
+            <Suspense fallback="Loading...">
+              <UserInfo />
+            </Suspense>
+          </div>
+          <p>
+            <strong>
+              To add a new model to your app, <br />
+              run the following in your terminal:
+            </strong>
+          </p>
+          <pre>
+            <code>blitz generate all project name:string</code>
+          </pre>
+          <div style={{ marginBottom: "1rem" }}>(And select Yes to run prisma migrate)</div>
+          <div>
+            <p>
+              Then <strong>restart the server</strong>
+            </p>
+            <pre>
+              <code>Ctrl + c</code>
+            </pre>
+            <pre>
+              <code>blitz dev</code>
+            </pre>
+            <p>
+              and go to{" "}
+              <Link href="/projects">
+                <a>/projects</a>
+              </Link>
+            </p>
+          </div>
+          <div className="buttons" style={{ marginTop: "5rem" }}>
+            <a
+              className="button"
+              href="https://blitzjs.com/docs/getting-started?utm_source=blitz-new&utm_medium=app-template&utm_campaign=blitz-new"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              Documentation
+            </a>
+            <a
+              className="button-outline"
+              href="https://github.com/blitz-js/blitz"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              Github Repo
+            </a>
+            <a
+              className="button-outline"
+              href="https://discord.blitzjs.com"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              Discord Community
+            </a>
          </div>
        </main>

-        <footer className={styles.footer}>
-          <span>Powered by</span>
+        <footer>
          <a
            href="https://blitzjs.com?utm_source=blitz-new&utm_medium=app-template&utm_campaign=blitz-new"
            target="_blank"
            rel="noopener noreferrer"
-            className={styles.textLink}
          >
-            Blitz.js
+            Powered by Blitz.js
          </a>
        </footer>
+
+        <style jsx global>{`
+          @import url("https://fonts.googleapis.com/css2?family=Libre+Franklin:wght@300;700&display=swap");
+
+          html,
+          body {
+            padding: 0;
+            margin: 0;
+            font-family: "Libre Franklin", -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
+              Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+          }
+
+          * {
+            -webkit-font-smoothing: antialiased;
+            -moz-osx-font-smoothing: grayscale;
+            box-sizing: border-box;
+          }
+          .container {
+            min-height: 100vh;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+          }
+
+          main {
+            padding: 5rem 0;
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+          }
+
+          main p {
+            font-size: 1.2rem;
+          }
+
+          p {
+            text-align: center;
+          }
+
+          footer {
+            width: 100%;
+            height: 60px;
+            border-top: 1px solid #eaeaea;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            background-color: #45009d;
+          }
+
+          footer a {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+
+          footer a {
+            color: #f4f4f4;
+            text-decoration: none;
+          }
+
+          .logo {
+            margin-bottom: 2rem;
+          }
+
+          .logo img {
+            width: 300px;
+          }
+
+          .buttons {
+            display: grid;
+            grid-auto-flow: column;
+            grid-gap: 0.5rem;
+          }
+          .button {
+            font-size: 1rem;
+            background-color: #6700eb;
+            padding: 1rem 2rem;
+            color: #f4f4f4;
+            text-align: center;
+          }
+
+          .button.small {
+            padding: 0.5rem 1rem;
+          }
+
+          .button:hover {
+            background-color: #45009d;
+          }
+
+          .button-outline {
+            border: 2px solid #6700eb;
+            padding: 1rem 2rem;
+            color: #6700eb;
+            text-align: center;
+          }
+
+          .button-outline:hover {
+            border-color: #45009d;
+            color: #45009d;
+          }
+
+          pre {
+            background: #fafafa;
+            border-radius: 5px;
+            padding: 0.75rem;
+            text-align: center;
+          }
+          code {
+            font-size: 0.9rem;
+            font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
+              Bitstream Vera Sans Mono, Courier New, monospace;
+          }
+
+          .grid {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            flex-wrap: wrap;
+
+            max-width: 800px;
+            margin-top: 3rem;
+          }
+
+          @media (max-width: 600px) {
+            .grid {
+              width: 100%;
+              flex-direction: column;
+            }
+          }
+        `}</style>
      </div>
    </Layout>
  )
--- a/apps/toolkit-app/src/styles/Home.module.css
+++ b/apps/toolkit-app/src/styles/Home.module.css
@@ -1,304 +0,0 @@
-.container {
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-}
-
-.main {
-  flex: 1;
-  padding: 0rem 1rem;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-evenly;
-}
-
-.wrapper {
-  display: flex;
-  flex-direction: column;
-  gap: 2rem;
-}
-
-.frost {
-  background: rgba(255, 255, 255, 0.2);
-  border-radius: 16px;
-  box-shadow: 0 4px 30px rgba(0, 0, 0, 0.1);
-  backdrop-filter: blur(5px);
-  -webkit-backdrop-filter: blur(5px);
-  border: 1px solid rgba(255, 255, 255, 0.31);
-}
-
-.header {
-  display: flex;
-  flex-direction: column;
-  padding: 4rem 0rem 2rem 0rem;
-  text-align: center;
-  gap: 2rem;
-}
-
-.header h1 {
-  max-width: 620px;
-  align-self: center;
-}
-
-.body {
-  composes: frost;
-  border-radius: var(--border-radius);
-  display: flex;
-  padding: 1rem;
-  width: 100%;
-  flex-direction: row;
-  align-self: center;
-  max-width: calc(min(var(--screen-width), 700px));
-}
-
-.instructions {
-  display: inline-flex;
-  flex-direction: column;
-  padding: 1rem;
-  width: 100%;
-}
-
-.globe {
-  position: fixed;
-  width: 350vmin;
-  height: 75vmin;
-  left: 20%;
-  top: 50%;
-  transform: translate(-50%, calc(-50% + 40px));
-  z-index: -1;
-  border-radius: 100%;
-  background-image: radial-gradient(
-    95.63% 95.63% at 95.92% 0%,
-    rgba(255, 255, 255, 0.62) 0%,
-    #8155ff38 60.42%,
-    #002fff5c 169%
-  );
-  filter: blur(8vmin);
-}
-
-.footer {
-  display: flex;
-  padding: 2rem 0;
-  justify-content: center;
-  align-items: center;
-}
-
-.footer span {
-  margin-right: 0.2rem;
-}
-
-.code {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-}
-
-.code span {
-  background: rgba(124, 58, 237, 50%);
-  border-radius: 50rem;
-  font-size: 14px;
-  font-weight: 500;
-  padding: 17px;
-  width: 20px;
-  height: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: rgb(57, 33, 97);
-}
-
-.code pre {
-  background: rgba(124, 58, 237, 12%);
-  border-radius: 4px;
-  padding: 0.7em 1.4em;
-  text-align: center;
-}
-
-.code code {
-  font-size: 0.86em;
-  font-weight: bold;
-  color: rgb(124, 58, 237);
-  font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
-    Bitstream Vera Sans Mono, Courier New, monospace;
-}
-
-.toastContainer {
-  border: 1px solid #edff;
-  padding: 0 1rem;
-  background: #eeff;
-  color: #62af;
-  text-align: center;
-}
-
-.toastContainer strong {
-  color: rgb(124, 58, 237);
-}
-
-.textLink {
-  color: rgb(124, 58, 237);
-  background: linear-gradient(to right, rgba(231, 216, 246, 1), rgba(231, 216, 246, 1)),
-    linear-gradient(to right, rgba(99, 1, 235, 1), rgba(124, 58, 237, 1), rgba(231, 216, 246, 1));
-  background-size: 100% 1px, 0 1px;
-  background-position: 100% 100%, 0 100%;
-  background-repeat: no-repeat;
-  transition: background-size 400ms;
-}
-
-.textLink:hover,
-.textLink:focus,
-.textLink:active {
-  background-size: 0 1px, 100% 1px;
-}
-
-.arrowIcon {
-  box-sizing: border-box;
-  display: block;
-  width: 8px;
-  height: 8px;
-  border-top: 2px solid;
-  transform: scale(var(--ggs, 1));
-  border-right: 2px solid;
-  position: absolute;
-  right: 6px;
-  top: 6px;
-  color: #b1a5c4;
-}
-
-.arrowIcon::after {
-  content: "";
-  display: block;
-  box-sizing: border-box;
-  position: absolute;
-  width: 8px;
-  height: 2px;
-  background: currentColor;
-  transform: rotate(-45deg);
-  top: 2px;
-  right: -1px;
-}
-
-.buttonContainer {
-  display: flex;
-  flex-direction: row;
-  gap: 1rem;
-  justify-content: center;
-  align-items: center;
-  flex: 1;
-}
-
-.button {
-  background: linear-gradient(to top, rgb(124, 58, 237), rgb(117, 81, 236));
-  border: 1px solid rgb(231, 216, 246);
-  color: white;
-  text-shadow: rgba(0, 0, 0, 0.25) 0px 3px 8px;
-  padding: 0 24px;
-  height: 48px;
-  width: 200px;
-  max-width: 300px;
-  position: relative;
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  flex-shrink: 0;
-  user-select: none;
-  white-space: nowrap;
-  border-radius: 0.75rem;
-  border-bottom-left-radius: 0px;
-  font-size: 15px;
-  transition: all 0.3s ease 0s;
-  cursor: pointer;
-}
-
-.button:hover {
-  color: white;
-  text-shadow: rgb(0 0 0 / 56%) 0px 3px 12px;
-  box-shadow: rgb(80 63 205 / 50%) 0px 1px 40px;
-}
-
-.loginButton {
-  composes: button;
-  background: rgb(248 250 252);
-  border: 1px solid rgb(231, 216, 246);
-  color: rgb(30 41 59);
-  text-shadow: none;
-}
-
-.loginButton:hover {
-  color: rgb(30 41 59);
-  text-shadow: none;
-}
-
-.card:hover .arrowIcon {
-  color: #7450ec;
-}
-
-.linkGrid {
-  display: flex;
-  flex-direction: column;
-  flex-wrap: wrap;
-  gap: 1rem;
-}
-
-.card {
-  composes: frost;
-  padding: 1rem 0rem;
-  text-align: center;
-  color: inherit;
-  text-decoration: none;
-  border-radius: 10px;
-  border-bottom-left-radius: 0px;
-  transition: color 0.15s ease, border-color 0.15s ease;
-  max-width: 200px;
-  min-width: 200px;
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-}
-
-.card:hover,
-.card:focus,
-.card:active {
-  color: #7450ec;
-  border-color: #7450ec;
-}
-
-.card h2 {
-  margin: 0 0 1rem 0;
-  font-size: 1.5rem;
-}
-
-.card p {
-  margin: 0;
-  font-size: 1.25rem;
-  line-height: 1.5;
-}
-
-.logo {
-  flex: 1;
-  padding: 1rem 2rem;
-}
-
-.logo svg {
-  height: 100%;
-  width: 200px;
-  fill: #7450ec;
-}
-
-/* MOBILE */
-@media (max-width: 800px) {
-  .linkGrid {
-    width: 100%;
-  }
-
-  .card {
-    max-width: 100%;
-  }
-
-  .body {
-    flex-wrap: wrap;
-  }
-
-  .buttonContainer {
-    flex-wrap: wrap;
-  }
-}
--- a/apps/toolkit-app/src/styles/globals.css
+++ b/apps/toolkit-app/src/styles/globals.css
@@ -1,25 +0,0 @@
-:root {
-  --border-radius: 0.75rem;
-  --screen-width: 90vmin;
-}
-
-html,
-body {
-  padding: 0;
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell,
-    Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
-}
-
-a {
-  color: inherit;
-  text-decoration: none;
-}
-
-i {
-  font-size: 0.8rem;
-}
-
-* {
-  box-sizing: border-box;
-}
--- a/apps/toolkit-app/src/users/queries/getUsers.ts
+++ b/apps/toolkit-app/src/users/queries/getUsers.ts
@@ -1,31 +0,0 @@
-import { paginate } from "blitz"
-import { resolver } from "@blitzjs/rpc"
-import db, { Prisma } from "db"
-
-interface GetProjectsInput
-  extends Pick<Prisma.UserFindManyArgs, "where" | "orderBy" | "skip" | "take"> {}
-
-export default resolver.pipe(
-  resolver.authorize(),
-  async ({ where, orderBy, skip = 0, take = 100 }: GetProjectsInput) => {
-    // TODO: in multi-tenant app, you must add validation to ensure correct tenant
-    const {
-      items: users,
-      hasMore,
-      nextPage,
-      count,
-    } = await paginate({
-      skip,
-      take,
-      count: () => db.user.count({ where }),
-      query: (paginateArgs) => db.user.findMany({ ...paginateArgs, where, orderBy }),
-    })
-
-    return {
-      users,
-      nextPage,
-      hasMore,
-      count,
-    }
-  }
-)
--- a/apps/toolkit-app/test/index.test.tsx
+++ b/apps/toolkit-app/test/index.test.tsx
@@ -14,7 +14,7 @@ vi.mock("public/logo.png", () => ({
 test.skip("renders blitz documentation link", () => {
  // This is an example of how to ensure a specific item is in the document
  // But it's disabled by default (by test.skip) so the test doesn't fail
-  // when you remove the default content from the page
+  // when you remove the the default content from the page

  // This is an example on how to mock api hooks when testing
  vi.mock("src/users/hooks/useCurrentUser", () => ({
@@ -27,6 +27,6 @@ test.skip("renders blitz documentation link", () => {
  }))

  const { getByText } = render(<Home />)
-  const linkElement = getByText(/Blitz Docs/i)
+  const linkElement = getByText(/Documentation/i)
  expect(linkElement).toBeInTheDocument()
 })
--- a/apps/toolkit-app/test/utils.tsx
+++ b/apps/toolkit-app/test/utils.tsx
@@ -82,13 +82,12 @@ export const mockRouter: NextRouter = {
  query: {},
  isReady: true,
  isLocaleDomain: false,
-  forward: vi.fn(),
-  prefetch: vi.fn(),
  isPreview: false,
  push: vi.fn(),
  replace: vi.fn(),
  reload: vi.fn(),
  back: vi.fn(),
+  prefetch: vi.fn(),
  beforePopState: vi.fn(),
  events: {
    on: vi.fn(),
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -20,16 +20,16 @@
    "@blitzjs/config": "workspace:*",
    "@blitzjs/next": "workspace:*",
    "@blitzjs/rpc": "workspace:*",
-    "@prisma/client": "4.6.1",
+    "@prisma/client": "4.6.0",
    "@types/jest": "29.2.2",
    "@types/passport-twitter": "1.0.37",
    "blitz": "workspace:*",
    "jest": "29.3.0",
    "jest-environment-jsdom": "29.3.0",
-    "next": "13.3.0",
+    "next": "13.1.2",
    "passport-mock-strategy": "2.0.0",
    "passport-twitter": "1.0.4",
-    "prisma": "4.6.1",
+    "prisma": "4.6.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
    "ts-node": "10.9.1"
--- a/apps/web/src/pages/api/signin.ts
+++ b/apps/web/src/pages/api/signin.ts
@@ -1,6 +1,6 @@
 import {api} from "src/blitz-server"
 import db from "db"
-import {SecurePassword} from "@blitzjs/auth/secure-password"
+import {SecurePassword} from "@blitzjs/auth"

 export const authenticateUser = async (email: string, password: string) => {
  const user = await db.user.findFirst({where: {email}})
--- a/apps/web/src/pages/api/signup.ts
+++ b/apps/web/src/pages/api/signup.ts
@@ -1,6 +1,6 @@
 import {api} from "src/blitz-server"
 import db from "db"
-import {SecurePassword} from "@blitzjs/auth/secure-password"
+import {SecurePassword} from "@blitzjs/auth"

 export default api(async (req, res, ctx) => {
  const blitzContext = ctx
--- a/integration-tests/auth-with-rpc/db/seed.ts
+++ b/integration-tests/auth-with-rpc/db/seed.ts
@@ -1,5 +1,5 @@
 import prisma from "./index"
-import {SecurePassword} from "@blitzjs/auth/secure-password"
+import {SecurePassword} from "@blitzjs/auth"

 const seed = async () => {
  const hashedPassword = await SecurePassword.hash("abcd1234")
--- a/integration-tests/auth-with-rpc/package.json
+++ b/integration-tests/auth-with-rpc/package.json
@@ -17,17 +17,17 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.26",
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
+    "@blitzjs/auth": "workspace:2.0.0-beta.22",
+    "@blitzjs/config": "workspace:2.0.0-beta.22",
+    "@blitzjs/next": "workspace:2.0.0-beta.22",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.22",
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
-    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "@prisma/client": "4.6.0",
+    "blitz": "workspace:2.0.0-beta.22",
    "delay": "5.0.0",
-    "next": "13.3.0",
-    "prisma": "4.6.1",
+    "next": "13.1.2",
+    "prisma": "4.6.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
    "react-hook-form": "7.39.1",
--- a/integration-tests/auth-with-rpc/test/index.test.ts
+++ b/integration-tests/auth-with-rpc/test/index.test.ts
@@ -15,15 +15,14 @@ let appPort: number

 const runTests = () => {
  describe("Auth", () => {
-   /* TODO - Add a non flaky Integration Test for custom plugin 
-   describe("custom plugin", () => {
+    describe("custom plugin", () => {
      it("custom plugin - events", async () => {
        const browser = await webdriver(appPort, "/custom-plugin")
        let text = await browser.elementByCss("#page").text()
        await waitFor(250)
        text = await browser.elementByCss("#page").text()
        expect(text).toBe("Custom plugin Session Created")
-        await waitFor(3000)
+        await waitFor(2000)
        text = await browser.elementByCss("#page").text()
        expect(text).toBe("Custom plugin RPC Error")
        if (browser) {
@@ -35,7 +34,7 @@ const runTests = () => {
        await waitFor(100)
        let text = await browser.elementByCss("#before-req").text()
        expect(text).toBe("customHeaderValue")
-        await waitFor(2000)
+        await waitFor(1000)
        text = await browser.elementByCss("#before-res").text()
        expect(text).toBe("55")
        if (browser) {
@@ -43,7 +42,6 @@ const runTests = () => {
        }
      })
    })
-    */
    describe("unauthenticated", () => {
      it("should render result for open query", async () => {
        const browser = await webdriver(appPort, "/noauth-query")
--- a/integration-tests/auth/app/blitz-client.ts
+++ b/integration-tests/auth/app/blitz-client.ts
--- a/integration-tests/auth/app/blitz-server.ts
+++ b/integration-tests/auth/app/blitz-server.ts
--- a/integration-tests/auth/db/seed.ts
+++ b/integration-tests/auth/db/seed.ts
@@ -1,5 +1,5 @@
 import prisma from "./index"
-import {SecurePassword} from "@blitzjs/auth/secure-password"
+import {SecurePassword} from "@blitzjs/auth"

 const seed = async () => {
  const hashedPassword = await SecurePassword.hash("abcd1234")
--- a/integration-tests/auth/package.json
+++ b/integration-tests/auth/package.json
@@ -17,18 +17,16 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.26",
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "@blitzjs/auth": "workspace:2.0.0-beta.22",
+    "@blitzjs/config": "workspace:2.0.0-beta.22",
+    "@blitzjs/next": "workspace:2.0.0-beta.22",
+    "@prisma/client": "4.6.0",
+    "blitz": "workspace:2.0.0-beta.22",
    "lowdb": "3.0.0",
-    "next": "13.3.0",
-    "prisma": "4.6.1",
+    "next": "13.1.2",
+    "prisma": "4.6.0",
    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "secure-password": "4.0.0",
-    "wait-port": "1.0.4"
+    "react-dom": "18.2.0"
  },
  "devDependencies": {
    "@next/bundle-analyzer": "12.0.8",
@@ -42,7 +40,6 @@
    "fs-extra": "10.0.1",
    "get-port": "6.1.2",
    "node-fetch": "3.2.3",
-    "playwright": "1.28.0",
    "ts-node": "10.9.1",
    "typescript": "^4.8.4"
  }
--- a/integration-tests/auth/pages/_app.tsx
+++ b/integration-tests/auth/pages/_app.tsx
@@ -1,7 +1,7 @@
 import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
 import React, {Suspense} from "react"
-import {withBlitz} from "../src/blitz-client"
+import {withBlitz} from "../app/blitz-client"

 function RootErrorFallback({error}: ErrorFallbackProps) {
  if (error instanceof AuthenticationError) {
--- a/integration-tests/auth/pages/api/logout.ts
+++ b/integration-tests/auth/pages/api/logout.ts
@@ -1,4 +1,4 @@
-import {api} from "../../src/blitz-server"
+import {api} from "../../app/blitz-server"

 export default api(async (_req, res, ctx) => {
  const blitzContext = ctx
--- a/integration-tests/auth/pages/api/noauth.ts
+++ b/integration-tests/auth/pages/api/noauth.ts
@@ -1,4 +1,4 @@
-import {api} from "../../src/blitz-server"
+import {api} from "../../app/blitz-server"

 export default api(async (_req, res, ctx) => {
  res.status(200).end()
--- a/integration-tests/auth/pages/api/signin.ts
+++ b/integration-tests/auth/pages/api/signin.ts
@@ -1,6 +1,6 @@
-import {api} from "../../src/blitz-server"
+import {api} from "../../app/blitz-server"
 import prisma from "../../db/index"
-import {SecurePassword} from "@blitzjs/auth/secure-password"
+import {SecurePassword} from "@blitzjs/auth"
 import {Role} from "../../types"

 export const authenticateUser = async (email: string, password: string) => {
--- a/integration-tests/auth/test/index.test.ts
+++ b/integration-tests/auth/test/index.test.ts
@@ -1,8 +1,10 @@
 import {describe, it, expect, beforeAll, afterAll} from "vitest"
-import waitPort from "wait-port"
 import {
  killApp,
  findPort,
+  launchApp,
+  nextBuild,
+  nextStart,
  runBlitzCommand,
  blitzLaunchApp,
  blitzBuild,
@@ -10,11 +12,15 @@ import {
 } from "../../utils/next-test-utils"
 import webdriver from "../../utils/next-webdriver"

+import {join} from "path"
 import fetch from "node-fetch"
 import {fromBase64} from "b64-lite"
+import seed from "../db/seed"
+import prisma from "../db"

 let app: any
 let appPort: number
+const appDir = join(__dirname, "../")
 const HEADER_CSRF = "anti-csrf"
 const COOKIE_PUBLIC_DATA_TOKEN = "auth-tests-cookie-prefix_sPublicDataToken"
 const COOKIE_SESSION_TOKEN = "auth-tests-cookie-prefix_sSessionToken"
@@ -39,7 +45,6 @@ const runTests = (mode?: string) => {
      it(
        "should render error for protected query",
        async () => {
-          await waitPort({port: appPort})
          const browser = await webdriver(appPort, "/authenticated-page")
          let errorMsg = await browser.elementById(`error`).text()
          expect(errorMsg).toMatch(/Error: You are not authenticated/)
@@ -129,7 +134,7 @@ const runTests = (mode?: string) => {
 }

 describe("Auth Tests", () => {
-  describe("dev mode", async () => {
+  describe("dev mode", () => {
    beforeAll(async () => {
      try {
        await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
@@ -139,25 +144,24 @@ describe("Auth Tests", () => {
        console.log(error)
      }
    }, 5000 * 60 * 2)
-    afterAll(async () => {
-      await killApp(app)
-    })
+    afterAll(async () => await killApp(app))
    runTests()
  })

-  // describe("server mode", () => {
-  //   beforeAll(async () => {
-  //     try {
-  //       await runBlitzCommand(["prisma", "generate"])
-  //       await runBlitzCommand(["prisma", "migrate", "deploy"])
-  //       await blitzBuild()
-  //       // appPort = await findPort()
-  //       app = await blitzStart(appPort, {cwd: process.cwd()})
-  //     } catch (err) {
-  //       console.log(err)
-  //     }
-  //   }, 5000 * 60 * 2)
-  //   afterAll(async () => await killApp(app))
-  //   runTests()
-  // })
+  describe("server mode", () => {
+    beforeAll(async () => {
+      try {
+        await runBlitzCommand(["prisma", "generate"])
+        await runBlitzCommand(["prisma", "migrate", "deploy"])
+        await blitzBuild()
+        appPort = await findPort()
+        app = await blitzStart(appPort, {cwd: process.cwd()})
+      } catch (err) {
+        console.log(err)
+      }
+    }, 5000 * 60 * 2)
+    afterAll(async () => await killApp(app))
+
+    runTests()
+  })
 })
--- a/integration-tests/get-initial-props/package.json
+++ b/integration-tests/get-initial-props/package.json
@@ -16,19 +16,19 @@
    "schema": "db/schema.prisma"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.26",
-    "@blitzjs/next": "workspace:2.0.0-beta.26",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.26",
-    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.26",
+    "@blitzjs/auth": "workspace:2.0.0-beta.22",
+    "@blitzjs/next": "workspace:2.0.0-beta.22",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.22",
+    "@prisma/client": "4.6.0",
+    "blitz": "workspace:2.0.0-beta.22",
    "lowdb": "3.0.0",
-    "next": "13.3.0",
-    "prisma": "4.6.1",
+    "next": "13.1.2",
+    "prisma": "4.6.0",
    "react": "18.2.0",
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.26",
+    "@blitzjs/config": "workspace:2.0.0-beta.22",
    "@next/bundle-analyzer": "12.0.8",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
--- a/integration-tests/get-initial-props/pages/_app.tsx
+++ b/integration-tests/get-initial-props/pages/_app.tsx
@@ -28,7 +28,6 @@ function MyApp({Component, pageProps, testProp}: AppProps & {testProp: any}) {
  return (
    <Suspense fallback="Loading...">
      <ErrorBoundary FallbackComponent={RootErrorFallback}>
-        {/* @ts-ignore */}
        <Component {...pageProps} testProp={testProp} />
      </ErrorBoundary>
    </Suspense>
--- a/integration-tests/middleware/.env
+++ b/integration-tests/middleware/.env
@@ -1,3 +1,2 @@
 SESSION_SECRET_KEY=hsdenhJfpLHrGjgdgg3jdF8g2bYD2PaQ
-HEADLESS=true
-VITE_BLITZ_TEST_ENVIRONMENT=true
+HEADLESS=true
--- a/Show More
+++ b/Show More