add changeset pre exit to fix error

Create pr-release.yml
update unit tests
2026-02-07 12:00:13 -05:00 · 2023-01-11 23:53:04 +05:30 · 2023-01-11 23:36:04 +05:30 · 2023-01-11 17:10:47 +05:30 · 2023-01-11 13:45:18 +05:30 · 2023-01-11 13:32:04 +05:30
144 changed files with 2264 additions and 2130 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -3794,8 +3794,7 @@
      "profile": "http://tobiasjordans.de",
      "contributions": [
        "code",
-        "doc",
-        "test"
+        "doc"
      ]
    },
    {
@@ -3817,26 +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"
-      ]
    }
  ],
  "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/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-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
@@ -51,7 +51,6 @@
  "changesets": [
    "afraid-dancers-juggle",
    "afraid-ears-repair",
-    "big-boats-lay",
    "big-phones-bow",
    "blue-flowers-peel",
    "blue-pigs-tan",
@@ -71,7 +70,6 @@
    "chilly-candles-care",
    "chilly-nails-nail",
    "clean-hats-pump",
-    "clean-hounds-laugh",
    "clean-walls-wink",
    "clever-radios-lie",
    "cool-doors-invent",
@@ -118,7 +116,6 @@
    "gentle-lions-explode",
    "giant-mails-tap",
    "giant-students-carry",
-    "giant-timers-search",
    "gold-horses-punch",
    "good-apes-drum",
    "good-insects-wink",
@@ -156,7 +153,6 @@
    "lemon-games-press",
    "lemon-pillows-switch",
    "lemon-seas-push",
-    "lemon-teachers-jam",
    "light-donkeys-double",
    "light-squids-draw",
    "little-pears-ring",
@@ -196,11 +192,9 @@
    "olive-sheep-rhyme",
    "orange-mirrors-tap",
    "orange-zebras-reflect",
-    "perfect-baboons-relate",
    "perfect-eyes-repeat",
    "perfect-trains-double",
    "plenty-bottles-swim",
-    "plenty-kiwis-greet",
    "polite-lizards-love",
    "poor-peas-lick",
    "poor-penguins-look",
@@ -209,7 +203,6 @@
    "popular-teachers-pay",
    "pretty-games-march",
    "purple-donkeys-smash",
-    "purple-jars-begin",
    "purple-singers-greet",
    "quick-cycles-confess",
    "quick-dots-fetch",
@@ -247,7 +240,6 @@
    "smooth-stingrays-drum",
    "smooth-tools-train",
    "soft-adults-smell",
-    "soft-fans-carry",
    "sour-lemons-hunt",
    "sour-mails-lick",
    "spicy-beds-float",
@@ -263,21 +255,17 @@
    "stupid-walls-sell",
    "sweet-kiwis-cross",
    "swift-drinks-dress",
-    "swift-glasses-laugh",
-    "swift-poets-travel",
    "tall-meals-learn",
    "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",
@@ -285,7 +273,6 @@
    "tidy-clouds-smoke",
    "tidy-llamas-compare",
    "tough-toes-pull",
-    "tricky-kids-press",
    "twelve-hornets-sip",
    "twelve-lemons-smile",
    "twelve-needles-worry",
--- a/.changeset/silly-peas-work.md
+++ b/.changeset/silly-peas-work.md
@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Multiple fields forms using templates during generation - TODO
--- a/.changeset/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/tasty-squids-sin.md
+++ b/.changeset/tasty-squids-sin.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/generator": patch
---
-
-Add missing Layout.tsx for generated mimimalapp
--- 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/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,9 +7,6 @@ on:
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true
-  
-env: 
-  PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1

 jobs:
  lint:
@@ -139,6 +136,8 @@ jobs:

      - name: Install dependencies
        run: pnpm install --frozen-lockfile
+        env: 
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
        shell: bash

      - name: Install playwright
--- a/.github/workflows/pr-release.yml
+++ b/.github/workflows/pr-release.yml
@@ -1,102 +1,47 @@
-# https://github.com/withastro/astro/blob/main/.github/workflows/snapshot-release.yml
-
-name: Create a Snapshot Release
+name: PR-Release

 on:
-  issue_comment:
-    types: [created]
+  pull_request:
+    types: [issue_comment]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

-defaults:
-  run:
-    shell: bash
 jobs:
-  snapshot-release:
-    name: Create a snapshot release of a pull request
-    if: ${{ github.repository_owner == 'blitz-js' && github.event.issue.pull_request && startsWith(github.event.comment.body, '!preview') }}
+  changeset:
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'release/next') && github.event.pull_request.merged == false && contains(github.event.comment.body,'/publish') && github.event.comment.author_association == 'MEMBER' }}
    runs-on: ubuntu-latest
    steps:
-      - name: "Check if user has admin access (only admins can publish snapshot releases)."
-        uses: "lannonbr/repo-permission-check-action@2.0.0"
+      - name: Checkout Repo
+        uses: actions/checkout@v2
        with:
-          permission: "admin"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: resolve pr refs
-        id: refs
-        uses: eficode/resolve-pr-refs@main
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ steps.refs.outputs.head_ref }}
-
-      - name: Setup PNPM
-        uses: pnpm/action-setup@v2.2.1
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
+          fetch-depth: 0
+      - name: Setup node
+        uses: actions/setup-node@v2
        with:
          node-version: 16
-          registry-url: 'https://registry.npmjs.org'
-          cache: 'pnpm'
-      
-      - name: Short SHA
-        id: vars
-        run: echo "sha_short=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT
-          
-      - name: Extract the snapshot name from comment body
-        id: getSnapshotName
-        uses: actions/github-script@v6
-        with:
-          script:  |
-            const splitComment = context.payload.comment.body.split(' ');
-            if(splitComment.length !== 2) {
-              return "${{ steps.vars.outputs.sha_short }}";
-            }
-            return splitComment[1].trim();
-          result-encoding: string
-
-      - name: Install dependencies
-        run: pnpm install
-        env: 
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-
-      - name: Build Packages
-        run: pnpm run build
-
-      - name: Bump Package Versions
-        id: changesets
+          cache: "pnpm"
+      - run: pnpm install --frozen-lockfile
+      - name: Build
+        run: pnpm build
+      - name: Version
        run: |
-          pnpm changeset pre exit
-          pnpm changeset version --snapshot ${{ steps.getSnapshotName.outputs.result }} > changesets.output.txt 2>&1
-          echo ::set-output name=result::`cat changesets.output.txt`
+          pnpm changeset pre exit 
+          pnpm changeset version --snapshot next-${{ github.event.pull_request.number }}
+      - name: Publish
+        run: pnpm changeset publish --tag next@${{ github.event.pull_request.number }}
        env:
-          # Needs access to run the script
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish Release
-        id: publish
-        run: |
-          pnpm run release --tag next--${{ steps.getSnapshotName.outputs.result }} > publish.output.txt 2>&1
-          echo ::set-output name=result::`cat publish.output.txt`
-        env:
-          # Needs access to publish to npm
          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Pull Request Notification
-        uses: actions/github-script@v6
-        env:
-          MESSAGE: ${{ steps.publish.outputs.result }}
+      - name: Comment on PR
+        uses: peter-evans/create-or-update-comment@v2
        with:
-          script: |
-            console.log(process.env.MESSAGE);
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: '```\n' + process.env.MESSAGE + '\n```',
-            })
-  
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            The new version of this PR is available as next in npm:
+            ```
+            npm install <package>@next${{ github.event.pull_request.number }}
+            ```
+      
+      
+
--- 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-405-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">
@@ -736,11 +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>
  </tr>
 </table>

--- a/apps/toolkit-app-passportjs/package.json
+++ b/apps/toolkit-app-passportjs/package.json
@@ -30,7 +30,7 @@
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
    "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.23",
+    "blitz": "workspace:2.0.0-beta.21",
    "next": "12.2.5",
    "openid-client": "5.2.1",
    "prisma": "4.6.0",
--- a/apps/toolkit-app-passportjs/src/auth/components/LoginForm.tsx
+++ b/apps/toolkit-app-passportjs/src/auth/components/LoginForm.tsx
@@ -40,16 +40,16 @@ 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 href={Routes.ForgotPasswordPage()} passHref>
+            <a>Forgot your password?</a>
          </Link>
        </div>
      </Form>

      <div style={{ marginTop: "1rem" }}>
        Or{" "}
-        <Link href={Routes.SignupPage()}>
-          Sign Up
+        <Link href={Routes.SignupPage()} passHref>
+          <a>Sign Up</a>
        </Link>
      </div>
    </div>
--- 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>
      </>
    )
@@ -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/package.json
+++ b/apps/toolkit-app/package.json
@@ -31,7 +31,7 @@
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
    "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.23",
+    "blitz": "workspace:2.0.0-beta.21",
    "next": "12.2.5",
    "prisma": "4.6.0",
    "react": "18.2.0",
--- a/apps/toolkit-app/src/auth/components/LoginForm.tsx
+++ b/apps/toolkit-app/src/auth/components/LoginForm.tsx
@@ -40,16 +40,16 @@ 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 href={Routes.ForgotPasswordPage()} passHref>
+            <a>Forgot your password?</a>
          </Link>
        </div>
      </Form>

      <div style={{ marginTop: "1rem" }}>
        Or{" "}
-        <Link href={Routes.SignupPage()}>
-          Sign Up
+        <Link href={Routes.SignupPage()} passHref>
+          <a>Sign Up</a>
        </Link>
      </div>
    </div>
--- a/apps/toolkit-app/src/core/components/LabelSelectField.tsx
+++ b/apps/toolkit-app/src/core/components/LabelSelectField.tsx
@@ -0,0 +1,63 @@
+import { ComponentPropsWithoutRef, forwardRef, PropsWithoutRef } from "react"
+import { useFormContext } from "react-hook-form"
+import { ErrorMessage } from "@hookform/error-message"
+
+export interface LabeledSelectFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["select"]> {
+  /** Field name. */
+  name: string
+  /** Field label. */
+  label: string
+  /** Field type. Doesn't include radio buttons and checkboxes */
+  options: any[]
+  outerProps?: PropsWithoutRef<JSX.IntrinsicElements["div"]>
+  labelProps?: ComponentPropsWithoutRef<"label">
+}
+
+export const LabeledSelectField = forwardRef<HTMLSelectElement, LabeledSelectFieldProps>(
+  ({ label, outerProps, labelProps, name, options, ...props }, ref) => {
+    const {
+      register,
+      formState: { isSubmitting, errors },
+    } = useFormContext()
+    return (
+      <div {...outerProps}>
+        <label {...labelProps}>
+          {label}
+          <select {...register(name)} disabled={isSubmitting} {...props}>
+            {options &&
+              options.map((value) => (
+                <option value={value.id} key={value.id}>
+                  {value[name]}
+                </option>
+              ))}
+          </select>
+        </label>
+        <ErrorMessage
+          render={({ message }) => (
+            <div role="alert" style={{ color: "red" }}>
+              {message}
+            </div>
+          )}
+          errors={errors}
+          name={name}
+        />
+        <style jsx>{`
+          label {
+            display: flex;
+            flex-direction: column;
+            align-items: start;
+            font-size: 1rem;
+          }
+          select {
+            font-size: 1rem;
+            padding: 0.25rem 0.5rem;
+            border-radius: 3px;
+            border: 1px solid purple;
+            appearance: none;
+            margin-top: 0.5rem;
+          }
+        `}</style>
+      </div>
+    )
+  }
+)
--- a/apps/toolkit-app/src/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/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,11 +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 { Routes, BlitzPage } from "@blitzjs/next"
-import styles from "src/styles/Home.module.css"

 /*
 * This file is just for a pleasant getting started page for your new app.
@@ -20,7 +21,7 @@ const UserInfo = () => {
    return (
      <>
        <button
-          className={styles.button}
+          className="button small"
          onClick={async () => {
            await logoutMutation()
          }}
@@ -37,11 +38,15 @@ const UserInfo = () => {
  } else {
    return (
      <>
-        <Link href={Routes.SignupPage()} className={styles.button}>
-          <strong>Sign Up</strong>
+        <Link href={Routes.SignupPage()} passHref>
+          <a className="button small">
+            <strong>Sign Up</strong>
+          </a>
        </Link>
-        <Link href={Routes.LoginPage()} className={styles.loginButton}>
-          <strong>Login</strong>
+        <Link href={Routes.LoginPage()} passHref>
+          <a className="button small">
+            <strong>Login</strong>
+          </a>
        </Link>
      </>
    )
@@ -51,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
@@ -0,0 +1,31 @@
+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/integration-tests/auth-with-rpc/package.json
+++ b/integration-tests/auth-with-rpc/package.json
@@ -17,14 +17,14 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.23",
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
-    "@blitzjs/next": "workspace:2.0.0-beta.23",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
+    "@blitzjs/auth": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/next": "workspace:2.0.0-beta.21",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
    "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.23",
+    "blitz": "workspace:2.0.0-beta.21",
    "delay": "5.0.0",
    "next": "12.2.5",
    "prisma": "4.6.0",
--- a/integration-tests/auth/package.json
+++ b/integration-tests/auth/package.json
@@ -17,11 +17,11 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.23",
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
-    "@blitzjs/next": "workspace:2.0.0-beta.23",
+    "@blitzjs/auth": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/next": "workspace:2.0.0-beta.21",
    "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.23",
+    "blitz": "workspace:2.0.0-beta.21",
    "lowdb": "3.0.0",
    "next": "12.2.5",
    "prisma": "4.6.0",
--- a/integration-tests/get-initial-props/package.json
+++ b/integration-tests/get-initial-props/package.json
@@ -16,11 +16,11 @@
    "schema": "db/schema.prisma"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.23",
-    "@blitzjs/next": "workspace:2.0.0-beta.23",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
+    "@blitzjs/auth": "workspace:2.0.0-beta.21",
+    "@blitzjs/next": "workspace:2.0.0-beta.21",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
    "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.23",
+    "blitz": "workspace:2.0.0-beta.21",
    "lowdb": "3.0.0",
    "next": "12.2.5",
    "prisma": "4.6.0",
@@ -28,7 +28,7 @@
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
    "@next/bundle-analyzer": "12.0.8",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
--- 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/integration-tests/middleware/package.json
+++ b/integration-tests/middleware/package.json
@@ -11,10 +11,10 @@
    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
  },
  "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
-    "@blitzjs/next": "workspace:2.0.0-beta.23",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
-    "blitz": "workspace:2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/next": "workspace:2.0.0-beta.21",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.21",
    "next": "12.2.5",
    "react": "18.2.0",
    "react-dom": "18.2.0"
--- a/integration-tests/no-suspense/package.json
+++ b/integration-tests/no-suspense/package.json
@@ -16,11 +16,11 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.23",
-    "@blitzjs/next": "workspace:2.0.0-beta.23",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
+    "@blitzjs/auth": "workspace:2.0.0-beta.21",
+    "@blitzjs/next": "workspace:2.0.0-beta.21",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
    "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.23",
+    "blitz": "workspace:2.0.0-beta.21",
    "lowdb": "3.0.0",
    "next": "12.2.5",
    "prisma": "4.6.0",
@@ -28,7 +28,7 @@
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
    "@next/bundle-analyzer": "12.0.8",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
--- a/integration-tests/qm/.env
+++ b/integration-tests/qm/.env
@@ -1 +0,0 @@
-VITE_BLITZ_TEST_ENVIRONMENT=true
--- a/integration-tests/qm/package.json
+++ b/integration-tests/qm/package.json
@@ -8,13 +8,13 @@
    "clean": "rm -rf .turbo && rm -rf node_modules"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.23",
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
-    "@blitzjs/next": "workspace:2.0.0-beta.23",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
+    "@blitzjs/auth": "workspace:2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/next": "workspace:2.0.0-beta.21",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
    "@prisma/client": "4.6.0",
    "@tanstack/react-query": "4.0.10",
-    "blitz": "workspace:2.0.0-beta.23",
+    "blitz": "workspace:2.0.0-beta.21",
    "next": "12.2.5",
    "prisma": "4.6.0",
    "react": "18.2.0",
--- a/integration-tests/react-query-utils/package.json
+++ b/integration-tests/react-query-utils/package.json
@@ -16,10 +16,10 @@
    "schema": "db/schema.prisma"
  },
  "dependencies": {
-    "@blitzjs/next": "workspace:2.0.0-beta.23",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
+    "@blitzjs/next": "workspace:2.0.0-beta.21",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
    "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.23",
+    "blitz": "workspace:2.0.0-beta.21",
    "lowdb": "3.0.0",
    "next": "12.2.5",
    "prisma": "4.6.0",
@@ -27,7 +27,7 @@
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
    "@next/bundle-analyzer": "12.0.8",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
--- a/integration-tests/rpc-path-root/package.json
+++ b/integration-tests/rpc-path-root/package.json
@@ -7,10 +7,10 @@
    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
  },
  "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
-    "@blitzjs/next": "workspace:2.0.0-beta.23",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
-    "blitz": "workspace:2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/next": "workspace:2.0.0-beta.21",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.21",
    "next": "12.2.5",
    "react": "18.2.0",
    "react-dom": "18.2.0"
--- a/integration-tests/rpc/.env
+++ b/integration-tests/rpc/.env
@@ -1 +0,0 @@
-VITE_BLITZ_TEST_ENVIRONMENT=true
--- a/integration-tests/rpc/package.json
+++ b/integration-tests/rpc/package.json
@@ -7,10 +7,10 @@
    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
  },
  "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
-    "@blitzjs/next": "workspace:2.0.0-beta.23",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
-    "blitz": "workspace:2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
+    "@blitzjs/next": "workspace:2.0.0-beta.21",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
+    "blitz": "workspace:2.0.0-beta.21",
    "next": "12.2.5",
    "react": "18.2.0",
    "react-dom": "18.2.0"
--- a/integration-tests/trailing-slash/package.json
+++ b/integration-tests/trailing-slash/package.json
@@ -16,11 +16,11 @@
    "schema": "db/schema.prisma"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.23",
-    "@blitzjs/next": "workspace:2.0.0-beta.23",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
+    "@blitzjs/auth": "workspace:2.0.0-beta.21",
+    "@blitzjs/next": "workspace:2.0.0-beta.21",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.21",
    "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.23",
+    "blitz": "workspace:2.0.0-beta.21",
    "lowdb": "3.0.0",
    "next": "12.2.5",
    "prisma": "4.6.0",
@@ -28,7 +28,7 @@
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
    "@next/bundle-analyzer": "12.0.8",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
    "clean": "turbo run clean && rm -rf node_modules",
    "format": "prettier --write \"**/*.{ts,tsx,md}\"",
    "pre-publish": "changeset add && changeset version && pnpm build && git add . && git commit -v",
-    "release": "cp README.md packages/blitz && pnpm build && changeset publish",
+    "release": "pnpm build && changeset publish",
    "publish-release": "changeset publish && git push --follow-tags"
  },
  "dependencies": {
--- a/packages/blitz-auth/CHANGELOG.md
+++ b/packages/blitz-auth/CHANGELOG.md
@@ -1,30 +1,5 @@
 # @blitzjs/auth

-## 2.0.0-beta.23
-
-### Major Changes
-
- 42a2cf951: 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.
-
-### Patch Changes
-
- Updated dependencies [c3c789740]
-  - blitz@2.0.0-beta.23
-
-## 2.0.0-beta.22
-
-### Minor Changes
-
- 145d5a02b: fix failed localStorage access to not crash the application
-
-### Patch Changes
-
- Updated dependencies [989691ec8]
- Updated dependencies [8aa22a0b2]
-  - blitz@2.0.0-beta.22
-
 ## 2.0.0-beta.21

 ### Patch Changes
--- a/packages/blitz-auth/README.md
+++ b/packages/blitz-auth/README.md
@@ -1,90 +0,0 @@
-[![Blitz.js](https://raw.githubusercontent.com/blitz-js/art/master/github-cover-photo.png)](https://blitzjs.com)
-
-<!-- prettier-ignore-start -->
-<p align="center">
-  <a aria-label="Join our Discord Community" href="https://discord.blitzjs.com">
-    <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
-  </a>
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-403-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
-<!-- 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">
-  </a>
-  <a aria-label="NPM version" href="https://www.npmjs.com/package/@blitzjs/auth">
-    <img alt="" src="https://img.shields.io/npm/v/blitz.svg?style=for-the-badge&labelColor=000000&color=E65528">
-  </a>
-</p>
-<!-- prettier-ignore-end -->
-
-<br>
-
-<h1 align="center">
-Blitz Auth - Framework Agnostic Authentication
-</h1>
-
-<br>
-
-### [Documentation Link](https://blitzjs.com/docs/auth)
-
-### [GitHub Link](https://github.com/blitz-js/blitz/tree/main/packages/blitz-auth)
-
-### Quick Start
-
-#### Install Blitz Auth
-
-```bash
-`npm i @blitzjs/auth`
-# yarn add @blitzjs/auth
-# pnpm add @blitzjs/auth
-```
-
-_You can alternatively use [`npx`](https://www.npmjs.com/package/npx)_
-
-### Framework Support
-
-Currently Blitz Auth usage is only documented with Next.js. We are working on adding additional support for other frameworks.
-
-#### Setup Blitz Auth in Next.js
-
-##### Client setup
-
-Add the following to your blitz-client.ts file:
-
-```ts
-import {AuthClientPlugin} from "@blitzjs/auth"
-import {setupBlitzClient} from "@blitzjs/next"
-
-export const authConfig = {
-  cookiePrefix: "testapp",
-}
-
-const {withBlitz} = setupBlitzClient({
-  plugins: [AuthClientPlugin(authConfig)],
-})
-
-export {withBlitz}
-```
-
-##### Server setup
-
-Then, add the following to the blitz-server.ts file:
-
-```ts
-import {setupBlitzServer} from "@blitzjs/next"
-import {AuthServerPlugin, PrismaStorage, simpleRolesIsAuthorized} from "@blitzjs/auth"
-import {db} from "db"
-import {authConfig} from "./blitz-client"
-
-const {gSSP, gSP, api} = setupBlitzServer({
-  plugins: [
-    AuthServerPlugin({
-      ...authConfig,
-      storage: PrismaStorage(db),
-      isAuthorized: simpleRolesIsAuthorized,
-    }),
-  ],
-})
-
-export {gSSP, gSP, api}
-```
--- a/packages/blitz-auth/package.json
+++ b/packages/blitz-auth/package.json
@@ -1,11 +1,6 @@
 {
  "name": "@blitzjs/auth",
-  "version": "2.0.0-beta.23",
-  "homepage": "https://blitzjs.com/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/blitz-js/blitz.git"
-  },
+  "version": "2.0.0-beta.21",
  "scripts": {
    "build": "unbuild",
    "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -39,20 +34,15 @@
    "nanoid": "3.2.0",
    "passport": "0.5.2",
    "path": "0.12.7",
+    "secure-password": "4.0.0",
    "supports-color": "8.1.1",
    "url": "0.11.0"
  },
  "peerDependencies": {
-    "blitz": "2.0.0-beta.23",
-    "secure-password": "4.0.0"
-  },
-  "peerDependenciesMeta": {
-    "secure-password": {
-      "optional": true
-    }
+    "blitz": "2.0.0-beta.21"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
    "@testing-library/react": "13.4.0",
    "@testing-library/react-hooks": "8.0.1",
    "@types/cookie": "0.4.1",
@@ -60,10 +50,9 @@
    "@types/jsonwebtoken": "8.5.8",
    "@types/react": "18.0.25",
    "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.23",
+    "blitz": "2.0.0-beta.21",
    "react": "18.2.0",
    "react-dom": "18.2.0",
-    "secure-password": "4.0.0",
    "typescript": "^4.8.4",
    "unbuild": "0.7.6",
    "watch": "1.0.2"
--- a/packages/blitz-auth/src/server/secure-password.test.ts
+++ b/packages/blitz-auth/src/server/secure-password.test.ts
@@ -1,5 +1,5 @@
 import {expect, describe, it} from "vitest"
-import {SecurePassword} from "./secure-password"
+import {SecurePassword} from "./auth-utils"

 describe("SecurePassword", () => {
  describe("hash", () => {
--- a/packages/blitz-auth/src/server/auth-utils.ts
+++ b/packages/blitz-auth/src/server/auth-utils.ts
@@ -1,8 +1,43 @@
 import * as crypto from "crypto"
 import {nanoid} from "nanoid"
+import SecurePasswordLib from "secure-password"
+import {AuthenticationError} from "blitz"

 export const hash256 = (input: string = "") => {
  return crypto.createHash("sha256").update(input).digest("hex")
 }

 export const generateToken = (numberOfCharacters: number = 32) => nanoid(numberOfCharacters)
+
+const SP = () => new SecurePasswordLib()
+
+export const SecurePassword = {
+  ...SecurePasswordLib,
+  async hash(password: string | null | undefined) {
+    if (!password) {
+      throw new AuthenticationError()
+    }
+    const hashedBuffer = await SP().hash(Buffer.from(password))
+    return hashedBuffer.toString("base64")
+  },
+  async verify(hashedPassword: string | null | undefined, password: string | null | undefined) {
+    if (!hashedPassword || !password) {
+      throw new AuthenticationError()
+    }
+    try {
+      const result = await SP().verify(Buffer.from(password), Buffer.from(hashedPassword, "base64"))
+      // Return result for valid results.
+      switch (result) {
+        case SecurePassword.VALID:
+        case SecurePassword.VALID_NEEDS_REHASH:
+          return result
+        default:
+          // For everything else throw AuthenticationError
+          throw new AuthenticationError()
+      }
+    } catch (error) {
+      // Could be error like failed to hash password
+      throw new AuthenticationError()
+    }
+  },
+}
--- a/packages/blitz-auth/src/server/index.ts
+++ b/packages/blitz-auth/src/server/index.ts
@@ -2,4 +2,3 @@ export * from "./auth-sessions"
 export * from "./auth-utils"
 export * from "./auth-plugin"
 export * from "./passport-adapter"
-export * from "./secure-password"
--- a/packages/blitz-auth/src/server/secure-password.ts
+++ b/packages/blitz-auth/src/server/secure-password.ts
@@ -1,35 +0,0 @@
-import SecurePasswordLib from "secure-password"
-import {AuthenticationError} from "blitz"
-
-const SP = () => new SecurePasswordLib()
-
-export const SecurePassword = {
-  ...SecurePasswordLib,
-  async hash(password: string | null | undefined) {
-    if (!password) {
-      throw new AuthenticationError()
-    }
-    const hashedBuffer = await SP().hash(Buffer.from(password))
-    return hashedBuffer.toString("base64")
-  },
-  async verify(hashedPassword: string | null | undefined, password: string | null | undefined) {
-    if (!hashedPassword || !password) {
-      throw new AuthenticationError()
-    }
-    try {
-      const result = await SP().verify(Buffer.from(password), Buffer.from(hashedPassword, "base64"))
-      // Return result for valid results.
-      switch (result) {
-        case SecurePassword.VALID:
-        case SecurePassword.VALID_NEEDS_REHASH:
-          return result
-        default:
-          // For everything else throw AuthenticationError
-          throw new AuthenticationError()
-      }
-    } catch (error) {
-      // Could be error like failed to hash password
-      throw new AuthenticationError()
-    }
-  },
-}
--- a/packages/blitz-next/CHANGELOG.md
+++ b/packages/blitz-next/CHANGELOG.md
@@ -1,23 +1,5 @@
 # @blitzjs/next

-## 2.0.0-beta.23
-
-### Patch Changes
-
- Updated dependencies [c3c789740]
-  - blitz@2.0.0-beta.23
-  - @blitzjs/rpc@2.0.0-beta.23
-
-## 2.0.0-beta.22
-
-### Patch Changes
-
- Updated dependencies [270361886]
- Updated dependencies [989691ec8]
- Updated dependencies [8aa22a0b2]
-  - @blitzjs/rpc@2.0.0-beta.22
-  - blitz@2.0.0-beta.22
-
 ## 2.0.0-beta.21

 ### Patch Changes
--- a/packages/blitz-next/README.md
+++ b/packages/blitz-next/README.md
@@ -1,394 +0,0 @@
-[![Blitz.js](https://raw.githubusercontent.com/blitz-js/art/master/github-cover-photo.png)](https://blitzjs.com)
-
-<!-- prettier-ignore-start -->
-<p align="center">
-  <a aria-label="Join our Discord Community" href="https://discord.blitzjs.com">
-    <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
-  </a>
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-403-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
-<!-- 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">
-  </a>
-  <a aria-label="NPM version" href="https://www.npmjs.com/package/@blitzjs/next">
-    <img alt="" src="https://img.shields.io/npm/v/blitz.svg?style=for-the-badge&labelColor=000000&color=E65528">
-  </a>
-</p>
-<!-- prettier-ignore-end -->
-
-<br>
-
-<h1 align="center">
-Blitz Adapter for Next.js
-</h1>
-
-<br>
-
-### [Blitzjs Website](https://blitzjs.com)
-
-### [GitHub](https://github.com/blitz-js/blitz/tree/main/packages/blitz-next)
-
-## Overview
-
-The `@blitzjs/next` adapter exposes functions & components specific for
-the Next.js framework.
-
-## Setup
-
-You can install `@blitzjs/next` by running the following command:
-
-```bash
-npm i @blitzjs/next # yarn add @blitzjs/next # pnpm add @blitzjs/next
-```
-
-### Next Config
-
-Blitz.js extends the `next.config.js` file by accepting a `blitz`
-property.
-
-```ts
-blitz?: {
-  resolverPath?: ResolverPathOptions;
-  customServer?: {
-      hotReload?: boolean;
-  };
-};
-```
-
-<Card type="note">
-  For more information on setting a custom `resolverPath`, read more at
-  the [RPC Specification](/docs/rpc-specification#url)
-</Card>
-
-## Client
-
-### Example
-
-Inside `src/blitz-client.ts`:
-
-```ts
-import {setupBlitzClient} from "@blitzjs/next"
-
-export const {withBlitz} = setupBlitzClient({
-  plugins: [],
-})
-```
-
-Then inside `src/pages/_app.tsx` wrap `MyApp` function with the
-`withBlitz` HOC component.
-
-```ts
-import {ErrorFallbackProps, ErrorComponent, ErrorBoundary} from "@blitzjs/next"
-import {AuthenticationError, AuthorizationError} from "blitz"
-import type {AppProps} from "next/app"
-import React, {Suspense} from "react"
-import {withBlitz} from "src/blitz-client"
-
-function RootErrorFallback({error}: ErrorFallbackProps) {
-  if (error instanceof AuthenticationError) {
-    return <div>Error: You are not authenticated</div>
-  } else if (error instanceof AuthorizationError) {
-    return (
-      <ErrorComponent
-        statusCode={error.statusCode}
-        title="Sorry, you are not authorized to access this"
-      />
-    )
-  } else {
-    return (
-      <ErrorComponent
-        statusCode={(error as any)?.statusCode || 400}
-        title={error.message || error.name}
-      />
-    )
-  }
-}
-
-function MyApp({Component, pageProps}: AppProps) {
-  return (
-    <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      <Component {...pageProps} />
-    </ErrorBoundary>
-  )
-}
-
-export default withBlitz(MyApp)
-```
-
-<Card type="note">
-  An `<ErrorBoundary />` provider and `<ErrorComponent />` component is
-  supplied by `@blitzjs/next`
-</Card>
-
-### API
-
-```ts
-setupBlitzClient({
-  plugins: [],
-})
-```
-
-#### Arguments
-
- `plugins:` An array of Blitz.js plugins
-  - **Required**
-
-#### Returns
-
-An object with the `withBlitz` HOC wrapper
-
-## Server
-
-### Example
-
-Inside `src/blitz-server.ts`
-
-```ts
-import {setupBlitzServer} from "@blitzjs/next"
-
-export const {gSSP, gSP, api} = setupBlitzServer({
-  plugins: [],
-})
-```
-
-### API
-
-```ts
-setupBlitzServer({
-  plugins: [],
-  onError?: (err) => void
-})
-```
-
-#### Arguments
-
- `plugins:` An array of Blitz.js plugins
-  - **Required**
- `onError:` Catch all errors _(Great for services like sentry)_
-
-#### Returns
-
-An object with the [`gSSP`](#blitzjs-next-gssp),
-[`gSP`](#blitzjs-next-gsp) & [`api`](#blitzjs-next-api) wrappers.
-
-### Custom Server
-
-The Blitz CLI supports running custom Next.js servers. This means you can
-compile both javascript & typescript while using the Blitz.js CLI to
-inject env variables. By default, the CLI checks for
-`src/server/index.[ts | js]` or `src/server.[ts | js]`
-
-For more information about custom Next.js servers, check the
-[`official docs`](https://nextjs.org/docs/advanced-features/custom-server)
-
-## Wrappers
-
-All Next.js wrapper functions are serialized with
-[`superjson`](https://github.com/blitz-js/superjson). That means you can
-use `Date`, `Map`, `Set` & `BigInt` when returning data. Another thing to
-note is that Blitz runs the middlewares from plugins before calling the
-Next.js request handler.
-
-<Card type="note">
-  The `gSSP`, `gSP` & `api` functions all pass down the context of the
-  session if you're using the auth plugin. Read more about the auth plugin
-  here [@blitzjs/auth](/docs/auth).
-</Card>
-
-### Examples
-
-#### getStaticProps
-
-```ts
-import {gSP} from "src/blitz-server"
-
-export const getStaticProps = gSP(async ({ctx}) => {
-  return {
-    props: {
-      data: {
-        userId: ctx?.session.userId,
-        session: {
-          id: ctx?.session.userId,
-          publicData: ctx?.session.$publicData,
-        },
-      },
-    },
-  }
-})
-```
-
-#### getServerSideProps
-
-```ts
-import {gSSP} from "src/blitz-server"
-
-export const getServerSideProps = gSSP(async ({ctx}) => {
-  return {
-    props: {
-      userId: ctx?.session.userId,
-      publicData: ctx?.session.$publicData,
-    },
-  }
-})
-```
-
-#### api
-
-```ts
-import {api} from "src/blitz-server"
-
-export default api(async (req, res, ctx) => {
-  res.status(200).json({userId: ctx?.session.userId})
-})
-```
-
-_For more information about Next.js API routes, visit their docs at
-[https://nextjs.org/docs/api-routes/introduction](https://nextjs.org/docs/api-routes/introduction)_
-
-## Concepts
-
-### Authenticate user before page loads
-
-You may want to check if the user is logged in before your page loads.
-We’re going to use the `getCurrentUser` query inside
-`getServerSideProps()` by calling the query directly. Then you can check
-if the user is logged in on the server and use the built-in Next.js
-redirect property.
-
-```ts
-import {Routes, BlitzPage} from "@blitzjs/next"
-import {gSSP} from "src/blitz-server"
-import getCurrentUser from "src/users/queries/getCurrentUser"
-
-export const getServerSideProps = gSSP(async ({ctx}) => {
-  const currentUser = await getCurrentUser(null, ctx)
-
-  if (currentUser) {
-    return {
-      props: {
-        user: currentUser,
-      },
-    }
-  } else {
-    return {
-      redirect: {
-        destination: Routes.LoginPage(),
-        permanent: false,
-      },
-    }
-  }
-})
-```
-
-### Return types when data fetching on the server
-
-You can set the types returned from the Next.js data fetching functions.
-All Blitz.js wrappers for the Next.js functions accept a generic. Same
-with the `BlitzPage` type.
-
-So for example, we can use some typescript utilities to help use get the
-types returned by `getCurrentUser()`
-
-```ts
-import {Routes, BlitzPage} from "@blitzjs/next"
-import {gSSP} from "src/blitz-server"
-import getCurrentUser from "src/users/queries/getCurrentUser"
-
-type TCurrentUser = Awaited<ReturnType<typeof getCurrentUser>>
-
-export const getServerSideProps = gSSP<{user: TCurrentUser}>(async ({ctx}) => {
-  const currentUser = await getCurrentUser(null, ctx)
-
-  if (currentUser) {
-    return {
-      props: {
-        user: currentUser,
-      },
-    }
-  } else {
-    return {
-      redirect: {
-        destination: Routes.LoginPage(),
-        permanent: false,
-      },
-    }
-  }
-})
-
-const Page: BlitzPage<{user: TCurrentUser}> = ({user}) => {
-  return (
-    <Layout title="Page">
-      <div className="container">
-        <p>User Page</p>
-        {user && <p>{user.email}</p>}
-      </div>
-    </Layout>
-  )
-}
-
-export default Page
-```
-
-### Handling errors on initial page load
-
-There’s an edge case where you may be throwing an error in a query that’s
-being called on an initial page load, causing a server error instead of
-hitting the `<ErrorBoundary />`. This is because when initially loading
-the page, there is no ErrorBoundary component rendered until `_app.tsx` is
-mounted. Though, this is expected behaviour, there is a workaround.
-
-For an example, in a query where the user is not found you can create a
-`NotFoundError()` then return the status code.
-
-```ts
-export default resolver.pipe(resolver.zod(GetUser), async (input) => {
-  const {id} = input
-
-  const user = await db.user.findFirst({where: {id}})
-
-  if (!user) {
-    const userError = new NotFoundError("User not found")
-    return {
-      error: userError.statusCode,
-    }
-  } else {
-    return {
-      user,
-    }
-  }
-})
-```
-
-Then on the server (in this case `getServerSideProps()`) you can call the
-query and if the error key is found in the return object then show an
-error.
-
-```ts
-export const getServerSideProps = gSSP(async ({ ctx }) => {
-
-  const user = await getUser({ 1 }, ctx)
-  if("error" in user) {
-    return { props: { error: user.error}}
-  } else {
-    return { props: { user }}
-  }
-})
-```
-
-You can also catch server errors in `_app.tsx` and show the errors with a
-toast component.
-
-```tsx
-function MyApp({Component, pageProps}: AppProps) {
-  const getLayout = Component.getLayout || ((page) => page)
-  if (pageProps.error) {
-    return <ToastComponent>{pageProps.error.statusCode}</ToastComponent>
-  }
-  return (
-    <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      {getLayout(<Component {...pageProps} />)}
-    </ErrorBoundary>
-  )
-}
-```
--- a/packages/blitz-next/package.json
+++ b/packages/blitz-next/package.json
@@ -1,11 +1,6 @@
 {
  "name": "@blitzjs/next",
-  "version": "2.0.0-beta.23",
-  "homepage": "https://blitzjs.com/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/blitz-js/blitz.git"
-  },
+  "version": "2.0.0-beta.21",
  "scripts": {
    "build": "unbuild",
    "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -29,7 +24,7 @@
    "eslint.js"
  ],
  "dependencies": {
-    "@blitzjs/rpc": "2.0.0-beta.23",
+    "@blitzjs/rpc": "2.0.0-beta.21",
    "@tanstack/react-query": "4.0.10",
    "@types/hoist-non-react-statics": "3.3.1",
    "debug": "4.3.3",
@@ -39,12 +34,12 @@
    "supports-color": "8.1.1"
  },
  "peerDependencies": {
-    "blitz": "2.0.0-beta.23",
+    "blitz": "2.0.0-beta.21",
    "next": "*",
    "react": "*"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
    "@testing-library/dom": "8.13.0",
    "@testing-library/jest-dom": "5.16.3",
    "@testing-library/react": "13.4.0",
@@ -54,7 +49,7 @@
    "@types/react": "18.0.25",
    "@types/react-dom": "17.0.14",
    "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-beta.23",
+    "blitz": "2.0.0-beta.21",
    "cross-spawn": "7.0.3",
    "find-up": "4.1.0",
    "next": "12.2.5",
--- a/packages/blitz-rpc/CHANGELOG.md
+++ b/packages/blitz-rpc/CHANGELOG.md
@@ -1,25 +1,5 @@
 # @blitzjs/rpc

-## 2.0.0-beta.23
-
-### Patch Changes
-
- c3c789740: Updates internal functions and tests to support blitz apps that run tests with vitest
- Updated dependencies [c3c789740]
-  - blitz@2.0.0-beta.23
-
-## 2.0.0-beta.22
-
-### Minor Changes
-
- 270361886: change rpc route basepath to be one folder higher when using includeRPC in monorepos
-
-### Patch Changes
-
- Updated dependencies [989691ec8]
- Updated dependencies [8aa22a0b2]
-  - blitz@2.0.0-beta.22
-
 ## 2.0.0-beta.21

 ### Patch Changes
--- a/packages/blitz-rpc/README.md
+++ b/packages/blitz-rpc/README.md
@@ -1,61 +0,0 @@
-[![Blitz.js](https://raw.githubusercontent.com/blitz-js/art/master/github-cover-photo.png)](https://blitzjs.com)
-
-<!-- prettier-ignore-start -->
-<p align="center">
-  <a aria-label="Join our Discord Community" href="https://discord.blitzjs.com">
-    <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
-  </a>
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-403-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
-<!-- 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">
-  </a>
-  <a aria-label="NPM version" href="https://www.npmjs.com/package/@blitzjs/auth">
-    <img alt="" src="https://img.shields.io/npm/v/blitz.svg?style=for-the-badge&labelColor=000000&color=E65528">
-  </a>
-</p>
-<!-- prettier-ignore-end -->
-
-<br>
-
-<h1 align="center">
-Blitz "Zero-API" data layer (Blitz RPC) 
-</h1>
-
-<br>
-
-### [Documentation Link](https://blitzjs.com/docs/rpc-overview)
-
-### [GitHub Link](https://github.com/blitz-js/blitz/tree/main/packages/blitz-rpc)
-
-### Quick Start
-
-#### Install Blitz RPC
-
-```bash
-`npm i @blitzjs/rpc`
-# yarn add @blitzjs/rpc
-# pnpm add @blitzjs/rpc
-```
-
-_You can alternatively use [`npx`](https://www.npmjs.com/package/npx)_
-
-### Overview
-
-Blitz "Zero-API" data layer (Blitz RPC) is focused on making the communication between server and client seamless. It lets you
-
-import server code directly into your components instead of having to manually add API endpoints and do client-side fetching and caching.
-Here's a quick overview:
-
-![Blitz RPC Overview](https://blitzjs.com/img/architecture-alt.png)
-
-#### Queries and mutations
-
-Queries and mutations only run on the server — at build time, the direct function import is replaced with an RPC network call. So the query function code is never included in your client code. It's instead moved to an API layer.
-
-### Framework Support
-
-Currently Blitz RPC is only supported in Next.js. We are working on adding support for other frameworks.
-
-### [Setup Blitz RPC in Next.js](https://blitzjs.com/docs/rpc-setup)
--- a/packages/blitz-rpc/package.json
+++ b/packages/blitz-rpc/package.json
@@ -1,11 +1,6 @@
 {
  "name": "@blitzjs/rpc",
-  "version": "2.0.0-beta.23",
-  "homepage": "https://blitzjs.com/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/blitz-js/blitz.git"
-  },
+  "version": "2.0.0-beta.21",
  "scripts": {
    "build": "unbuild",
    "predev": "wait-on -d 400 ../blitz/dist/index-server.d.ts && wait-on -d 400 ../blitz-auth/dist/index-browser.d.ts",
@@ -35,17 +30,17 @@
    "supports-color": "8.1.1"
  },
  "peerDependencies": {
-    "blitz": "2.0.0-beta.23",
+    "blitz": "2.0.0-beta.21",
    "next": "*",
    "react": "*"
  },
  "devDependencies": {
-    "@blitzjs/auth": "2.0.0-beta.23",
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
+    "@blitzjs/auth": "2.0.0-beta.21",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
    "@types/debug": "4.1.7",
    "@types/react": "18.0.25",
    "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.23",
+    "blitz": "2.0.0-beta.21",
    "next": "12.2.5",
    "react": "18.2.0",
    "react-dom": "18.2.0",
--- a/packages/blitz-rpc/src/data-client/react-query-utils.test.ts
+++ b/packages/blitz-rpc/src/data-client/react-query-utils.test.ts
@@ -1,7 +1,7 @@
-import {describe, expect, it, vi} from "vitest"
+import {describe, expect, it} from "vitest"
 import superJson from "superjson"

-import {getQueryKey, getQueryKeyFromUrlAndParams, validateQueryFn} from "./react-query-utils"
+import {getQueryKey, getQueryKeyFromUrlAndParams} from "./react-query-utils"
 import {RpcClient} from "./rpc"

 const API_ENDPOINT = "http://localhost:3000"
@@ -74,65 +74,4 @@ describe("react-query-utils", () => {
      expect(queryKey).toEqual([API_ENDPOINT])
    })
  })
-
-  describe("validateQueryFn", () => {
-    const originalEnv = process.env
-
-    function mockEnv() {
-      const originalEnv = process.env
-
-      process.env = {
-        ...originalEnv,
-      }
-
-      delete process.env.JEST_WORKER_ID
-      delete process.env.VITEST_WORKER_ID
-      delete process.env.BLITZ_TEST_ENVIRONMENT
-
-      return process.env
-    }
-
-    function restoreEnv() {
-      process.env = originalEnv
-    }
-
-    const notAQuery = vi.fn()
-    const realQuery = vi.fn()
-    //@ts-ignore
-    realQuery._isRpcClient = true
-
-    vi.mock("blitz", async () => {
-      const actualBlitz = await import("blitz")
-      return {
-        ...actualBlitz,
-        isClient: true,
-      }
-    })
-
-    describe("when called from test environments", () => {
-      it("always validate as true, allowing query functions to be mocked in tests")
-      const jestEnv = mockEnv()
-      jestEnv.JEST_WORKER_ID = "123"
-      expect(() => validateQueryFn(notAQuery)).not.toThrowError()
-      expect(() => validateQueryFn(realQuery)).not.toThrowError()
-      restoreEnv()
-
-      const vitestEnv = mockEnv()
-      vitestEnv.VITEST_WORKER_ID = "123"
-      expect(() => validateQueryFn(notAQuery)).not.toThrowError()
-      expect(() => validateQueryFn(realQuery)).not.toThrowError()
-      restoreEnv()
-    })
-
-    describe("when called from outside of test environments", () => {
-      it("throws an error when the passed function is not a query function")
-      // removes jest and vitest env vars
-      mockEnv()
-
-      expect(() => validateQueryFn(notAQuery)).toThrowError()
-      expect(() => validateQueryFn(realQuery)).not.toThrowError()
-
-      restoreEnv()
-    })
-  })
 })
--- a/packages/blitz-rpc/src/data-client/react-query-utils.ts
+++ b/packages/blitz-rpc/src/data-client/react-query-utils.ts
@@ -1,6 +1,6 @@
 import {QueryClient} from "@tanstack/react-query"
 import {serialize} from "superjson"
-import {isClient, isServer, AsyncFunc, isNotInUserTestEnvironment} from "blitz"
+import {isClient, isServer, AsyncFunc} from "blitz"
 import {ResolverType, RpcClient} from "./rpc"

 export type Resolver<TInput, TResult> = (input: TInput, ctx?: any) => Promise<TResult>
@@ -83,6 +83,13 @@ export const emptyQueryFn: RpcClient<unknown, unknown> = (() => {
  return fn
 })()

+const isNotInUserTestEnvironment = () => {
+  if (process.env.JEST_WORKER_ID === undefined) return true
+  if (process.env.VITEST_WORKER_ID === undefined) return true
+  if (process.env.BLITZ_TEST_ENVIRONMENT !== undefined) return true
+  return false
+}
+
 export const validateQueryFn = <TInput, TResult>(
  queryFn: Resolver<TInput, TResult> | RpcClient<TInput, TResult>,
 ) => {
--- a/packages/blitz/CHANGELOG.md
+++ b/packages/blitz/CHANGELOG.md
@@ -1,29 +1,5 @@
 # blitz

-## 2.0.0-beta.23
-
-### Patch Changes
-
- c3c789740: Updates internal functions and tests to support blitz apps that run tests with vitest
- Updated dependencies [cb63a0ea5]
- Updated dependencies [6ec020c6d]
- Updated dependencies [d316d0db7]
- Updated dependencies [79c5e86d7]
-  - @blitzjs/generator@2.0.0-beta.23
-
-## 2.0.0-beta.22
-
-### Minor Changes
-
- 8aa22a0b2: add `currentPassword` to the default fields that are masked in the logger
-
-### Patch Changes
-
- 989691ec8: Use `src` instead of `app` folder for `blitz generate custom-template`
- Updated dependencies [bcef81fad]
- Updated dependencies [7abfb9086]
-  - @blitzjs/generator@2.0.0-beta.22
-
 ## 2.0.0-beta.21

 ### Patch Changes
--- a/packages/blitz/package.json
+++ b/packages/blitz/package.json
@@ -1,11 +1,6 @@
 {
  "name": "blitz",
-  "version": "2.0.0-beta.23",
-  "homepage": "https://blitzjs.com/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/blitz-js/blitz.git"
-  },
+  "version": "2.0.0-beta.21",
  "scripts": {
    "build": "unbuild",
    "dev": "rm -rf dist && pnpm run predev && watch unbuild src --wait=0.2",
@@ -30,7 +25,7 @@
    "blitz": "bin/blitz"
  },
  "dependencies": {
-    "@blitzjs/generator": "2.0.0-beta.23",
+    "@blitzjs/generator": "2.0.0-beta.21",
    "@mrleebo/prisma-ast": "0.2.6",
    "@types/global-agent": "2.1.1",
    "arg": "5.0.1",
@@ -79,7 +74,7 @@
    "watchpack": "2.1.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.21",
    "@types/cookie": "0.4.1",
    "@types/cross-spawn": "6.0.2",
    "@types/debug": "4.1.7",
--- a/packages/blitz/src/cli/commands/generate.ts
+++ b/packages/blitz/src/cli/commands/generate.ts
@@ -15,6 +15,10 @@ import {
  MutationsGenerator,
  ModelGenerator,
  QueryGenerator,
+  ModelName,
+  modelName,
+  ModelNames,
+  modelNames,
  customTemplatesBlitzConfig,
 } from "@blitzjs/generator"
 import {log} from "../../logging"
@@ -35,19 +39,6 @@ enum ResourceType {
  CustomTemplates = "custom-templates",
 }

-function modelName(input: string = "") {
-  return singleCamel(input)
-}
-function modelNames(input: string = "") {
-  return pluralCamel(input)
-}
-function ModelName(input: string = "") {
-  return singlePascal(input)
-}
-function ModelNames(input: string = "") {
-  return pluralPascal(input)
-}
-
 const createCustomTemplates = async () => {
  const continuePrompt = await prompts({
    type: "confirm",
@@ -66,7 +57,6 @@ const createCustomTemplates = async () => {
  const templatesPathValue: string = templatesPath.value
  const isTypeScript = await getIsTypeScript()
  await customTemplatesBlitzConfig(isTypeScript, templatesPathValue, true) // to run the codemod
-  log.success(`🚀 Custom templates path added/updated in src/blitz-server file`)
  const customTemplatesPath = require("path").join(process.cwd(), templatesPathValue)
  const fsExtra = await import("fs-extra")
  const blitzGeneratorPath = require.resolve("@blitzjs/generator")
@@ -286,6 +276,7 @@ const generate: CliCommand = async () => {
        modelNames: modelNames(singularRootContext),
        ModelName: ModelName(singularRootContext),
        ModelNames: ModelNames(singularRootContext),
+        rawParentModelName: args["--parent"],
        parentModel: modelName(selectedParent),
        parentModels: modelNames(selectedParent),
        ParentModel: ModelName(selectedParent),
--- a/packages/blitz/src/errors.ts
+++ b/packages/blitz/src/errors.ts
@@ -1,6 +1,5 @@
 import _SuperJson from "superjson"
 import type {UrlObject} from "url"
-import {isNotInUserTestEnvironment} from "./utils"

 declare module globalThis {
  let _BLITZ_ERROR_CLASS_REGISTERED: boolean
@@ -10,7 +9,7 @@ const SuperJson: typeof _SuperJson =
  "default" in _SuperJson ? (_SuperJson as any).default : _SuperJson

 const errorProps = ["name", "message", "code", "statusCode", "meta", "url"]
-if (isNotInUserTestEnvironment()) {
+if (process.env.JEST_WORKER_ID === undefined) {
  SuperJson.allowErrorProps(...errorProps)
 }

@@ -76,7 +75,7 @@ export class PaginationArgumentError extends Error {
  }
 }

-if (isNotInUserTestEnvironment() && !globalThis._BLITZ_ERROR_CLASS_REGISTERED) {
+if (process.env.JEST_WORKER_ID === undefined && !globalThis._BLITZ_ERROR_CLASS_REGISTERED) {
  SuperJson.registerClass(AuthenticationError, {
    identifier: "BlitzAuthenticationError",
    allowProps: errorProps,
--- a/packages/blitz/src/types.ts
+++ b/packages/blitz/src/types.ts
@@ -2,6 +2,16 @@ import {UrlObject} from "url"
 // Context for plugins to declaration merge stuff into
 export interface Ctx {}

+export interface AuthenticatedMiddlewareCtx {}
+
+export type CodegenField = {
+  component: string
+  inputType: string
+  zodType: string
+  prismaType: string
+  default?: string
+}
+
 export interface RouteUrlObject extends Pick<UrlObject, "pathname" | "query" | "href"> {
  pathname: string
  href: string
@@ -32,9 +42,33 @@ export type ResolverConfig = {
 }

 export type BlitzCliConfig = {
+  codegen?: {
+    fieldTypeMap?: Record<
+      | "string"
+      | "boolean"
+      | "int"
+      | "number"
+      | "bigint"
+      | "float"
+      | "decimal"
+      | "datetime"
+      | "uuid"
+      | "json",
+      CodegenField
+    >
+  }
  customTemplates?: string
 }

+export type CodegenConfig = {
+  templateDir?: string
+  fieldTypeMap?: Record<string, CodegenField>
+}
+
+export interface RouteUrlObject extends Pick<UrlObject, "pathname" | "query"> {
+  pathname: string
+}
+
 export const isRouteUrlObject = (x: any): x is RouteUrlObject => {
  return (
    typeof x === "object" &&
--- a/packages/blitz/src/utils/enhance-prisma.ts
+++ b/packages/blitz/src/utils/enhance-prisma.ts
@@ -1,6 +1,5 @@
 import {spawn} from "cross-spawn"
 import which from "npm-which"
-import {isNotInUserTestEnvironment} from "../index-browser"

 export interface Constructor<T = unknown> {
  new (...args: never[]): T
@@ -20,7 +19,7 @@ export const enhancePrisma = <TPrismaClientCtor extends Constructor>(
 ): EnhancedPrismaClientConstructor<TPrismaClientCtor> => {
  return new Proxy(client as EnhancedPrismaClientConstructor<TPrismaClientCtor>, {
    construct(target, args) {
-      if (typeof window !== "undefined" && isNotInUserTestEnvironment()) {
+      if (typeof window !== "undefined" && process.env.JEST_WORKER_ID === undefined) {
        // Return object with $use method if in the browser
        // Skip in Jest tests because window is defined in Jest tests
        return {$use: () => {}}
--- a/packages/blitz/src/utils/index.ts
+++ b/packages/blitz/src/utils/index.ts
@@ -143,11 +143,3 @@ export function interopDefault(mod: any) {
 export function truncateString(str: string, maxLength: number): string {
  return str.length > maxLength ? str.substring(0, maxLength - 3) + "..." : str
 }
-
-export function isNotInUserTestEnvironment() {
-  if (process.env.VITE_BLITZ_TEST_ENVIRONMENT) {
-    return true
-  }
-
-  return process.env.JEST_WORKER_ID === undefined && process.env.VITEST_WORKER_ID === undefined
-}
--- a/packages/codemod/CHANGELOG.md
+++ b/packages/codemod/CHANGELOG.md
@@ -1,28 +1,5 @@
 # @blitzjs/codemod

-## 2.0.0-beta.23
-
-### Patch Changes
-
- Updated dependencies [cb63a0ea5]
- Updated dependencies [6ec020c6d]
- Updated dependencies [c3c789740]
- Updated dependencies [d316d0db7]
- Updated dependencies [79c5e86d7]
-  - @blitzjs/generator@2.0.0-beta.23
-  - blitz@2.0.0-beta.23
-
-## 2.0.0-beta.22
-
-### Patch Changes
-
- Updated dependencies [989691ec8]
- Updated dependencies [bcef81fad]
- Updated dependencies [8aa22a0b2]
- Updated dependencies [7abfb9086]
-  - blitz@2.0.0-beta.22
-  - @blitzjs/generator@2.0.0-beta.22
-
 ## 2.0.0-beta.21

 ### Patch Changes
--- a/packages/codemod/package.json
+++ b/packages/codemod/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/codemod",
-  "version": "2.0.0-beta.23",
+  "version": "2.0.0-beta.21",
  "scripts": {
    "build": "unbuild",
    "dev": "watch unbuild src --wait=0.2",
@@ -25,9 +25,9 @@
    "@babel/plugin-proposal-class-properties": "7.17.12",
    "@babel/plugin-syntax-jsx": "7.17.12",
    "@babel/plugin-syntax-typescript": "7.17.12",
-    "@blitzjs/generator": "2.0.0-beta.23",
+    "@blitzjs/generator": "2.0.0-beta.21",
    "arg": "5.0.1",
-    "blitz": "2.0.0-beta.23",
+    "blitz": "2.0.0-beta.21",
    "chalk": "^4.1.0",
    "cross-spawn": "7.0.3",
    "debug": "4.3.3",
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,9 +1,5 @@
 # @blitzjs/config

-## 2.0.0-beta.23
-
-## 2.0.0-beta.22
-
 ## 2.0.0-beta.21

 ## 2.0.0-beta.20
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@blitzjs/config",
  "private": true,
-  "version": "2.0.0-beta.23",
+  "version": "2.0.0-beta.21",
  "license": "MIT",
  "dependencies": {
    "@typescript-eslint/eslint-plugin": "5.42.1",
--- a/packages/generator/CHANGELOG.md
+++ b/packages/generator/CHANGELOG.md
@@ -1,24 +1,5 @@
 # @blitzjs/generator

-## 2.0.0-beta.23
-
-### Patch Changes
-
- cb63a0ea5: 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).
- 6ec020c6d: Remove useEffect from reset password templates.
- d316d0db7: Update all links to follow Next 13 format without a child anchor tag.
- 79c5e86d7: Add missing Layout.tsx for generated mimimalapp
-
-## 2.0.0-beta.22
-
-### Minor Changes
-
- 7abfb9086: Redesign the index page for newly generated blitz projects
-
-### Patch Changes
-
- bcef81fad: Fix missing MockRouter prop in test utils
-
 ## 2.0.0-beta.21

 ### Patch Changes
--- a/packages/generator/README.md
+++ b/packages/generator/README.md
@@ -1,29 +1,4 @@
-[![Blitz.js](https://raw.githubusercontent.com/blitz-js/art/master/github-cover-photo.png)](https://blitzjs.com)
-
-<!-- prettier-ignore-start -->
-<p align="center">
-  <a aria-label="Join our Discord Community" href="https://discord.blitzjs.com">
-    <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
-  </a>
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-403-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
-<!-- 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">
-  </a>
-  <a aria-label="NPM version" href="https://www.npmjs.com/package/blitz">
-    <img alt="" src="https://img.shields.io/npm/v/blitz.svg?style=for-the-badge&labelColor=000000&color=E65528">
-  </a>
-</p>
-<!-- prettier-ignore-end -->
-
-<br>
-
-<h1 align="center">The Missing Fullstack Toolkit for Next.js</h1>
-
-# Blitz Generator
-
-## `Generator`
+# `generator`

 This package houses all files related to Blitz codegen. In the main `src` directory you'll find the base `generator` class and a directory of `generators` that extend it. The subclasses aren't terribly interesting, most of the fun happens in the abstract parent class. Each generator may (depending on whether it's a net new addition or modifying existing files) have a corresponding template defined in the `templates` directory.

@@ -58,5 +33,3 @@ if (process.env.someValue === "some test") {
  console.log("dynamic condition")
 }
 ```
-
-<br>
--- a/packages/generator/build.config.ts
+++ b/packages/generator/build.config.ts
@@ -2,7 +2,7 @@ import {BuildConfig} from "unbuild"

 const config: BuildConfig = {
  entries: ["./src/index"],
-  externals: ["react"],
+  externals: ["react", "zod"],
  declaration: true,
  rollup: {
    emitCJS: true,
--- a/packages/generator/package.json
+++ b/packages/generator/package.json
@@ -1,11 +1,6 @@
 {
  "name": "@blitzjs/generator",
-  "version": "2.0.0-beta.23",
-  "homepage": "https://blitzjs.com/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/blitz-js/blitz.git"
-  },
+  "version": "2.0.0-beta.21",
  "scripts": {
    "dev": "watch unbuild src --wait=0.2",
    "build": "unbuild && pnpm build:templates",
@@ -35,6 +30,7 @@
    "cross-spawn": "7.0.3",
    "diff": "5.0.0",
    "enquirer": "2.3.6",
+    "fast-glob": "3.2.12",
    "fs-extra": "10.0.1",
    "globby": "13.1.2",
    "got": "^11.8.1",
@@ -52,7 +48,7 @@
    "vinyl": "2.2.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.23",
+    "@blitzjs/config": "2.0.0-beta.21",
    "@juanm04/cpx": "2.0.1",
    "@types/babel__core": "7.1.19",
    "@types/diff": "5.0.2",
@@ -73,7 +69,8 @@
    "react": "18.2.0",
    "typescript": "^4.8.4",
    "unbuild": "0.6.9",
-    "watch": "1.0.2"
+    "watch": "1.0.2",
+    "zod": "3.20.2"
  },
  "publishConfig": {
    "access": "public"
--- a/packages/generator/src/generator.ts
+++ b/packages/generator/src/generator.ts
@@ -1,10 +1,13 @@
 import * as babel from "@babel/core"
 // @ts-ignore TS wants types for this module but none exist
 import babelTransformTypescript from "@babel/plugin-transform-typescript"
+import {escapePath} from "fast-glob"
 import Enquirer from "enquirer"
 import {EventEmitter} from "events"
 import * as fs from "fs-extra"
 import j from "jscodeshift"
+import {CommonTemplateValues, IBuilder} from "./generators/template-builders/builder"
+import {NullBuilder} from "./generators/template-builders/null-builder"
 import {create as createStore, Store} from "mem-fs"
 import {create as createEditor, Editor} from "mem-fs-editor"
 import * as path from "path"
@@ -14,6 +17,7 @@ import {ConflictChecker} from "./conflict-checker"
 import {pipe} from "./utils/pipe"
 import {readdirRecursive} from "./utils/readdir-recursive"
 import prettier from "prettier"
+import {log} from "./utils/log"
 const debug = require("debug")("blitz:generator")

 export function getProjectRootSync() {
@@ -40,7 +44,7 @@ export const customTemplatesBlitzConfig = async (
  if (blitzServer.length > 1) {
    throw new Error("Found more than one blitz-server.js or blitz-server.ts in app or src folder")
  }
-  const blitzServerPath = require("path").join(process.cwd(), blitzServer.at(0))
+  const blitzServerPath = require("path").join(process.cwd(), blitzServer[0])
  const userConfigModuleSource = fs.readFileSync(blitzServerPath, {encoding: "utf-8"})
  const userConfigModule = j(userConfigModuleSource, {parser: customTsParser})
  const program = userConfigModule.get()
@@ -267,7 +271,16 @@ export abstract class Generator<
    if (!this.options.destinationRoot) this.options.destinationRoot = process.cwd()
  }

-  abstract getTemplateValues(): Promise<any>
+  public templateValuesBuilder: IBuilder<T, any> = NullBuilder
+
+  async getTemplateValues(): Promise<any> {
+    const values = await this.templateValuesBuilder.getTemplateValues(this.options)
+    return values
+  }
+
+  public fieldTemplateRegExp: RegExp = new RegExp(
+    /({?\/\*\s*template: (.*) \*\/}?|\s*\/\/\s*template: (.*))/g,
+  )

  abstract getTargetDirectory(): string

@@ -295,6 +308,12 @@ export abstract class Generator<
  replaceTemplateValues(input: string, templateValues: any) {
    let result = input
    for (let templateKey in templateValues) {
+      const token = `__${templateKey}__`
+      if (result.includes(token)) {
+        result = result.replace(new RegExp(token, "g"), templateValues[templateKey] as string)
+      }
+    }
+    for (let templateKey in templateValues.fieldTemplateValues) {
      const token = `__${templateKey}__`
      if (result.includes(token)) {
        result = result.replace(new RegExp(token, "g"), templateValues[templateKey])
@@ -319,6 +338,21 @@ export abstract class Generator<
    if (codeFileExtensions.test(pathEnding)) {
      templatedFile = this.replaceConditionals(inputStr, templateValues, prettierOptions || {})
    }
+    const fieldTemplateString = templatedFile
+      ?.match(this.fieldTemplateRegExp)
+      ?.at(0)
+      ?.replace(this.fieldTemplateRegExp, "$2$3")
+
+    if (fieldTemplateString) {
+      const fieldTemplatePosition = templatedFile.search(this.fieldTemplateRegExp)
+      templatedFile = [
+        templatedFile.slice(0, fieldTemplatePosition),
+        ...(templateValues.fieldTemplateValues?.map((values: any) =>
+          this.replaceTemplateValues(fieldTemplateString, values),
+        ) || []),
+        templatedFile.slice(fieldTemplatePosition),
+      ].join("")
+    }
    templatedFile = this.replaceTemplateValues(templatedFile, templateValues)
    if (!this.useTs && tsExtension.test(pathEnding)) {
      templatedFile =
@@ -343,12 +377,21 @@ export abstract class Generator<
      try {
        templatedFile = this.prettier.format(templatedFile, options)
      } catch (error) {
-        console.warn(`Failed trying to run prettier: ` + error)
+        console.error(`Failed trying to run prettier: ` + error)
      }
    }
    return templatedFile
  }

+  async preFileWrite(filePath: string): Promise<CommonTemplateValues> {
+    // allow subclasses to do something before writing a file
+    return this.getTemplateValues()
+  }
+
+  async postFileWrite(filePath: string, templateValues: CommonTemplateValues): Promise<void> {
+    // allow subclasses to do something after writing a file
+  }
+
  async write(): Promise<void> {
    debug("Generator.write...")
    const sourcePath = this.sourcePath()
@@ -356,33 +399,45 @@ export abstract class Generator<
      const additionalFilesToIgnore = this.filesToIgnore()
      return ![...alwaysIgnoreFiles, ...additionalFilesToIgnore].includes(name)
    })
-
    const prettierOptions = await this.prettier?.resolveConfig(sourcePath)
-
    for (let filePath of paths) {
      try {
-        let pathSuffix = filePath
-        pathSuffix = path.join(this.getTargetDirectory(), pathSuffix)
-        const templateValues = await this.getTemplateValues()
-
+        let templateValues = await this.getTemplateValues()
+        const pathSuffix = path.join(this.getTargetDirectory(), filePath)
+        const sourcePath = this.sourcePath(filePath)
+        const destinationPath = this.destinationPath(pathSuffix)
        let templatedPathSuffix = this.replaceTemplateValues(pathSuffix, templateValues)
+        const templatedDestinationPath = this.destinationPath(templatedPathSuffix)
+        const destinationExists = fs.existsSync(templatedDestinationPath)

-        const newContent = this.process(
-          this.fs.read(this.sourcePath(filePath), {raw: true}) as any,
-          pathSuffix,
-          templateValues,
-          prettierOptions ?? undefined,
-        )
-        this.fs.write(this.destinationPath(pathSuffix), newContent)
+        templateValues = await this.preFileWrite(templatedPathSuffix)

        if (!this.useTs && tsExtension.test(this.destinationPath(pathSuffix))) {
          templatedPathSuffix = templatedPathSuffix.replace(tsExtension, ".js")
        }
-        if (templatedPathSuffix !== pathSuffix) {
-          this.fs.move(this.destinationPath(pathSuffix), this.destinationPath(templatedPathSuffix))
+
+        if (destinationExists) {
+          const newContent = this.process(
+            this.fs.read(templatedDestinationPath, {raw: true}) as any,
+            pathSuffix,
+            templateValues,
+            prettierOptions ?? undefined,
+          )
+          this.fs.write(templatedDestinationPath, newContent)
+        } else {
+          this.fs.copy(escapePath(sourcePath), escapePath(destinationPath), {
+            process: (input) =>
+              this.process(input, pathSuffix, templateValues, prettierOptions ?? undefined),
+          })
+
+          if (templatedPathSuffix !== pathSuffix) {
+            this.fs.move(destinationPath, templatedDestinationPath)
+          }
        }
+
+        await this.postFileWrite(templatedPathSuffix, templateValues)
      } catch (error) {
-        console.error(`Error generating ${filePath}`)
+        log.error(`Error generating ${filePath}`)
        throw error
      }
    }
--- a/packages/generator/src/generators/app-generator.ts
+++ b/packages/generator/src/generators/app-generator.ts
@@ -2,7 +2,7 @@ import spawn from "cross-spawn"
 import chalk from "chalk"
 import {readJSONSync, writeJson} from "fs-extra"
 import {join} from "path"
-import username from "username"
+import {AppValuesBuilder} from "./template-builders/app-values-builder"
 import {Generator, GeneratorOptions, SourceRootType} from "../generator"
 import {baseLogger, log} from "../utils/log"
 import {fetchLatestVersionsFor} from "../utils/fetch-latest-version-for"
@@ -12,6 +12,12 @@ function assert(condition: any, message: string): asserts condition {
  if (!condition) throw new Error(message)
 }

+export interface AppTemplateValues {
+  name: string
+  safeNameSlug: string
+  username: string | undefined
+}
+
 type TemplateConfig = {
  path: string
  skipForms?: boolean
@@ -46,13 +52,7 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
    return ["jsconfig.json", "package.js.json", "vitest.config.js"]
  }

-  async getTemplateValues() {
-    return {
-      name: this.options.appName,
-      safeNameSlug: this.options.appName.replace(/[^a-zA-Z0-9-_]/g, "-"),
-      username: await username(),
-    }
-  }
+  templateValuesBuilder = new AppValuesBuilder(this.fs)

  getTargetDirectory() {
    return ""
--- a/packages/generator/src/generators/form-generator.ts
+++ b/packages/generator/src/generators/form-generator.ts
@@ -1,17 +1,21 @@
-import {Generator, GeneratorOptions, SourceRootType} from "../generator"
 import {getTemplateRoot} from "../utils/get-template-root"
 import {camelCaseToKebabCase} from "../utils/inflector"
+import {
+  CommonTemplateValues,
+  createFieldTemplateValues,
+  FieldValuesBuilder,
+  ResourceGeneratorOptions,
+} from ".."
+import {customTsParser, Generator, SourceRootType} from "../generator"
+import j from "jscodeshift"
+import {
+  insertImportPagnatedQuery,
+  insertImportQuery,
+  insertLabeledSelectField,
+  updateFormWithParent,
+} from "../../src/utils/codemod-utils"

-export interface FormGeneratorOptions extends GeneratorOptions {
-  ModelName: string
-  ModelNames: string
-  modelName: string
-  modelNames: string
-  parentModel?: string
-  parentModels?: string
-  ParentModel?: string
-  ParentModels?: string
-}
+export interface FormGeneratorOptions extends ResourceGeneratorOptions {}

 export class FormGenerator extends Generator<FormGeneratorOptions> {
  sourceRoot: SourceRootType
@@ -22,31 +26,35 @@ export class FormGenerator extends Generator<FormGeneratorOptions> {

  static subdirectory = "queries"

-  private getId(input: string = "") {
-    if (!input) return input
-    return `${input}Id`
+  templateValuesBuilder = new FieldValuesBuilder()
+
+  async preFileWrite(): Promise<CommonTemplateValues> {
+    let templateValues = await this.getTemplateValues()
+    if (templateValues.parentModel) {
+      const newFieldTemplateValues = await createFieldTemplateValues(
+        templateValues.parentModelId,
+        templateValues.parentModelIdZodType,
+        true,
+      )
+      if (templateValues.fieldTemplateValues) {
+        templateValues.fieldTemplateValues.push(newFieldTemplateValues)
+      } else {
+        templateValues.fieldTemplateValues = [newFieldTemplateValues]
+      }
+    }
+    return templateValues
  }

-  private getParam(input: string = "") {
-    if (!input) return input
-    return `[${input}]`
-  }
-
-  // eslint-disable-next-line require-await
-  async getTemplateValues() {
-    return {
-      parentModelId: this.getId(this.options.parentModel),
-      parentModelParam: this.getParam(this.getId(this.options.parentModel)),
-      parentModel: this.options.parentModel,
-      parentModels: this.options.parentModels,
-      ParentModel: this.options.ParentModel,
-      ParentModels: this.options.ParentModels,
-      modelId: this.getId(this.options.modelName),
-      modelIdParam: this.getParam(this.getId(this.options.modelName)),
-      modelName: this.options.modelName,
-      modelNames: this.options.modelNames,
-      ModelName: this.options.ModelName,
-      ModelNames: this.options.ModelNames,
+  async postFileWrite(filePath: string, templateValues: CommonTemplateValues): Promise<void> {
+    if (templateValues.parentModel && filePath.match(/components/g)) {
+      let program = j(this.fs.read(filePath), {
+        parser: customTsParser,
+      })
+      program = insertLabeledSelectField(program)
+      program = insertImportQuery(program, templateValues)
+      program = insertImportPagnatedQuery(program)
+      program = updateFormWithParent(program, templateValues)
+      this.fs.write(filePath, program.toSource())
    }
  }

--- a/packages/generator/src/generators/model-generator.ts
+++ b/packages/generator/src/generators/model-generator.ts
@@ -1,13 +1,12 @@
 import * as ast from "@mrleebo/prisma-ast"
 import {spawn} from "cross-spawn"
 import which from "npm-which"
-import path from "path"
+import {log} from "../utils/log"
 import {Generator, GeneratorOptions, SourceRootType} from "../generator"
 import {Field} from "../prisma/field"
 import {Model} from "../prisma/model"
-import {checkInputsOrRaise} from "../utils/checkInputOrRaise"
 import {getTemplateRoot} from "../utils/get-template-root"
-import {log} from "../utils/log"
+import {getPrismaSchema} from "../utils/get-prisma-schema"

 export interface ModelGeneratorOptions extends GeneratorOptions {
  modelName: string
@@ -23,8 +22,7 @@ export class ModelGenerator extends Generator<ModelGeneratorOptions> {
  // default subdirectory is /app/[name], we need to back out of there to generate the model
  static subdirectory = "../.."
  unsafe_disableConflictChecker = true
-
-  async getTemplateValues() {}
+  prisma = true

  getTargetDirectory() {
    return ""
@@ -42,77 +40,68 @@ export class ModelGenerator extends Generator<ModelGeneratorOptions> {

  // eslint-disable-next-line require-await
  async write() {
-    const pkgJson = this.fs.readJSON("package.json", {}) as {[key: string]: any}
-    const rawSchemaPath = pkgJson?.prisma?.schema || "db/schema.prisma"
+    const obj = getPrismaSchema(this.fs)
+    if (typeof obj !== "boolean") {
+      const {schema, schemaPath} = obj
+      const {modelName, extraArgs, dryRun} = this.options
+      let updatedOrCreated = "created"

-    const schemaPath = path.resolve(rawSchemaPath)
-    if (!this.fs.exists(schemaPath)) {
-      throw new Error("Prisma schema file was not found")
-    }
+      let fieldPromises = (
+        extraArgs.length === 1 && extraArgs[0]?.includes(" ") ? extraArgs[0]?.split(" ") : extraArgs
+      ).map((input) => Field.parse(input, schema))
+      let fields = (await Promise.all(fieldPromises)).flatMap((fieldArray) => fieldArray)
+      const modelDefinition = new Model(modelName, fields)

-    let schema: ast.Schema
-    try {
-      schema = ast.getSchema(this.fs.read(schemaPath))
-    } catch (err) {
-      console.error(`Failed to parse ${rawSchemaPath} file`)
-      throw err
-    }
-    const {modelName, extraArgs, dryRun} = this.options
-    let updatedOrCreated = "created"
-
-    const splitInputCommans = (input: typeof extraArgs) => {
-      const inputs = input.length === 1 && input[0]?.includes(" ") ? input[0]?.split(" ") : input
-      checkInputsOrRaise(inputs)
-      return inputs
-    }
-
-    let fields = splitInputCommans(extraArgs).flatMap((input) => Field.parse(input, schema))
-
-    const modelDefinition = new Model(modelName, fields)
-
-    let model: ast.Model | undefined
-    if (!dryRun) {
-      model = schema.list.find(function (component): component is ast.Model {
-        return component.type === "model" && component.name === modelDefinition.name
-      })
-      try {
-        if (model) {
-          for (const field of fields) field.appendTo(model)
-          this.fs.write(schemaPath, ast.printSchema(schema))
-          updatedOrCreated = "updated"
-        } else {
-          model = modelDefinition.appendTo(schema)
-          this.fs.write(schemaPath, ast.printSchema(schema))
+      let model: ast.Model | undefined
+      if (!dryRun) {
+        model = schema.list.find(function (component): component is ast.Model {
+          return component.type === "model" && component.name === modelDefinition.name
+        })
+        try {
+          if (model) {
+            for (const field of fields) field.appendTo(model)
+            this.fs.write(schemaPath, ast.printSchema(schema))
+            updatedOrCreated = "updated"
+          } else {
+            model = modelDefinition.appendTo(schema)
+            this.fs.write(schemaPath, ast.printSchema(schema))
+          }
+        } catch (err) {
+          console.error(`Failed to apply changes to model '${modelDefinition.name}'`)
+          throw err
        }
-      } catch (err) {
-        console.error(`Failed to apply changes to model '${modelDefinition.name}'`)
-        throw err
      }
-    }

-    if (model) {
-      console.log("\n")
-      console.log(
-        `Model '${modelDefinition.name}'${
-          dryRun ? "" : ` ${updatedOrCreated} in schema.prisma`
-        }:\n`,
-      )
-      ast
-        .printSchema({type: "schema", list: [model]})
-        .split("\n")
-        .map(log.progress)
-      console.log("\n")
+      if (model) {
+        console.log("\n")
+        console.log(
+          `Model '${modelDefinition.name}'${
+            dryRun ? "" : ` ${updatedOrCreated} in schema.prisma`
+          }:\n`,
+        )
+        ast
+          .printSchema({type: "schema", list: [model]})
+          .split("\n")
+          .map(log.progress)
+        console.log("\n")
+      }
+    } else {
+      this.prisma = false
    }
  }

  async postWrite() {
-    const shouldMigrate = await this.prismaMigratePrompt()
-    if (shouldMigrate) {
-      await new Promise<void>((res, rej) => {
-        const prismaBin = which(process.cwd()).sync("prisma")
-        const child = spawn(prismaBin, ["migrate", "dev"], {stdio: "inherit"})
-        child.on("exit", (code) => (code === 0 ? res() : rej()))
-      })
+    if (this.prisma) {
+      const prismaBin = which(process.cwd()).sync("prisma")
+      //@ts-ignore
+      spawn.sync(prismaBin, ["format"], {stdio: "inherit"})
+      const shouldMigrate = await this.prismaMigratePrompt()
+      if (shouldMigrate) {
+        await new Promise<void>((res, rej) => {
+          const child = spawn(prismaBin, ["migrate", "dev"], {stdio: "inherit"})
+          child.on("exit", (code) => (code === 0 ? res() : rej()))
+        })
+      }
    }
  }
 }
--- a/packages/generator/src/generators/mutations-generator.ts
+++ b/packages/generator/src/generators/mutations-generator.ts
@@ -1,17 +1,16 @@
-import {Generator, GeneratorOptions, SourceRootType} from "../generator"
 import {getTemplateRoot} from "../utils/get-template-root"
 import {camelCaseToKebabCase} from "../utils/inflector"
+import j from "jscodeshift"
+import {
+  CommonTemplateValues,
+  createFieldTemplateValues,
+  FieldValuesBuilder,
+  ResourceGeneratorOptions,
+} from ".."
+import {customTsParser, Generator, SourceRootType} from "../generator"
+import {replaceImportDbWithPrismaFolder} from "../../src/utils/codemod-utils"

-export interface MutationsGeneratorOptions extends GeneratorOptions {
-  ModelName: string
-  ModelNames: string
-  modelName: string
-  modelNames: string
-  parentModel?: string
-  parentModels?: string
-  ParentModel?: string
-  ParentModels?: string
-}
+export interface MutationsGeneratorOptions extends ResourceGeneratorOptions {}

 export class MutationsGenerator extends Generator<MutationsGeneratorOptions> {
  sourceRoot: SourceRootType
@@ -21,32 +20,31 @@ export class MutationsGenerator extends Generator<MutationsGeneratorOptions> {
  }
  static subdirectory = "mutations"

-  private getId(input: string = "") {
-    if (!input) return input
-    return `${input}Id`
-  }
+  templateValuesBuilder = new FieldValuesBuilder(this.fs)

-  private getParam(input: string = "") {
-    if (!input) return input
-    return `[${input}]`
-  }
-
-  // eslint-disable-next-line require-await
-  async getTemplateValues() {
-    return {
-      parentModelId: this.getId(this.options.parentModel),
-      parentModelParam: this.getParam(this.getId(this.options.parentModel)),
-      parentModel: this.options.parentModel,
-      parentModels: this.options.parentModels,
-      ParentModel: this.options.ParentModel,
-      ParentModels: this.options.ParentModels,
-      modelId: this.getId(this.options.modelName),
-      modelIdParam: this.getParam(this.getId(this.options.modelName)),
-      modelName: this.options.modelName,
-      modelNames: this.options.modelNames,
-      ModelName: this.options.ModelName,
-      ModelNames: this.options.ModelNames,
+  async preFileWrite(filePath: string): Promise<CommonTemplateValues> {
+    let templateValues = await this.getTemplateValues()
+    if (templateValues.parentModel && filePath.match(/.*mutations.*create.*/g)) {
+      const newFieldTemplateValues = await createFieldTemplateValues(
+        templateValues.parentModelId,
+        templateValues.parentModelIdZodType,
+        true,
+      )
+      if (templateValues.fieldTemplateValues) {
+        templateValues.fieldTemplateValues.push(newFieldTemplateValues)
+      } else {
+        templateValues.fieldTemplateValues = [newFieldTemplateValues]
+      }
    }
+    if (this.fs.exists(filePath)) {
+      let program = j(this.fs.read(filePath) as any, {
+        parser: customTsParser,
+      })
+      program = replaceImportDbWithPrismaFolder(program)
+      this.fs.write(filePath, program.toSource())
+    }
+
+    return templateValues
  }

  getTargetDirectory() {
--- a/packages/generator/src/generators/page-generator.ts
+++ b/packages/generator/src/generators/page-generator.ts
@@ -1,19 +1,12 @@
-import {Generator, GeneratorOptions, SourceRootType} from "../generator"
+import {CommonTemplateValues, FieldValuesBuilder, ResourceGeneratorOptions} from ".."
+import {Generator, SourceRootType} from "../generator"
 import {getTemplateRoot} from "../utils/get-template-root"
 import {camelCaseToKebabCase} from "../utils/inflector"
 import {spawn} from "cross-spawn"
 import which from "npm-which"
+import * as fs from "fs-extra"

-export interface PageGeneratorOptions extends GeneratorOptions {
-  ModelName: string
-  ModelNames: string
-  modelName: string
-  modelNames: string
-  parentModel?: string
-  parentModels?: string
-  ParentModel?: string
-  ParentModels?: string
-}
+export interface PageGeneratorOptions extends ResourceGeneratorOptions {}

 export class PageGenerator extends Generator<PageGeneratorOptions> {
  sourceRoot: SourceRootType
@@ -23,34 +16,7 @@ export class PageGenerator extends Generator<PageGeneratorOptions> {
  }
  static subdirectory = "../../.."

-  private getId(input: string = "") {
-    if (!input) return input
-    return `${input}Id`
-  }
-
-  private getParam(input: string = "") {
-    if (!input) return input
-    return `[${input}]`
-  }
-
-  // eslint-disable-next-line require-await
-  async getTemplateValues() {
-    return {
-      parentModelId: this.getId(this.options.parentModel),
-      parentModelParam: this.getParam(this.getId(this.options.parentModel)),
-      parentModel: this.options.parentModel,
-      parentModels: this.options.parentModels,
-      ParentModel: this.options.ParentModel,
-      ParentModels: this.options.ParentModels,
-      modelId: this.getId(this.options.modelName),
-      modelIdParam: this.getParam(this.getId(this.options.modelName)),
-      modelName: this.options.modelName,
-      modelNames: this.options.modelNames,
-      ModelName: this.options.ModelName,
-      ModelNames: this.options.ModelNames,
-      modelNamesPath: this.getModelNamesPath(),
-    }
-  }
+  templateValuesBuilder = new FieldValuesBuilder(this.fs)

  getModelNamesPath() {
    const kebabCaseContext = this.options.context
@@ -68,6 +34,28 @@ export class PageGenerator extends Generator<PageGeneratorOptions> {
    return `src/pages/${parent}${kebabCaseModelName}`
  }

+  async preFileWrite(): Promise<CommonTemplateValues> {
+    const templateValues = await this.getTemplateValues()
+    const targetDirectory = this.getTargetDirectory().replace(
+      "__parentModelParam__",
+      templateValues.parentModelParam,
+    )
+    if (templateValues.parentModel) {
+      const modelPages = fs.existsSync(
+        `src/pages/${camelCaseToKebabCase(templateValues.modelNames)}`,
+      )
+      if (modelPages) {
+        if (!fs.existsSync(targetDirectory)) {
+          fs.moveSync(
+            `src/pages/${camelCaseToKebabCase(templateValues.modelNames)}`,
+            targetDirectory,
+          )
+        }
+      }
+    }
+    return templateValues
+  }
+
  async postWrite() {
    await new Promise<void>((res, rej) => {
      const blitzBin = which(process.cwd()).sync("blitz")
--- a/packages/generator/src/generators/queries-generator.ts
+++ b/packages/generator/src/generators/queries-generator.ts
@@ -1,17 +1,11 @@
-import {Generator, GeneratorOptions, SourceRootType} from "../generator"
+import {CommonTemplateValues, FieldValuesBuilder, ResourceGeneratorOptions} from ".."
+import {customTsParser, Generator, SourceRootType} from "../generator"
 import {getTemplateRoot} from "../utils/get-template-root"
 import {camelCaseToKebabCase} from "../utils/inflector"
+import j from "jscodeshift"
+import {replaceImportDbWithPrismaFolder} from "../../src/utils/codemod-utils"

-export interface QueriesGeneratorOptions extends GeneratorOptions {
-  ModelName: string
-  ModelNames: string
-  modelName: string
-  modelNames: string
-  parentModel?: string
-  parentModels?: string
-  ParentModel?: string
-  ParentModels?: string
-}
+export interface QueriesGeneratorOptions extends ResourceGeneratorOptions {}

 export class QueriesGenerator extends Generator<QueriesGeneratorOptions> {
  sourceRoot: SourceRootType
@@ -21,32 +15,19 @@ export class QueriesGenerator extends Generator<QueriesGeneratorOptions> {
  }
  static subdirectory = "queries"

-  private getId(input: string = "") {
-    if (!input) return input
-    return `${input}Id`
-  }
+  templateValuesBuilder = new FieldValuesBuilder(this.fs)

-  private getParam(input: string = "") {
-    if (!input) return input
-    return `[${input}]`
-  }
-
-  // eslint-disable-next-line require-await
-  async getTemplateValues() {
-    return {
-      parentModelId: this.getId(this.options.parentModel),
-      parentModelParam: this.getParam(this.getId(this.options.parentModel)),
-      parentModel: this.options.parentModel,
-      parentModels: this.options.parentModels,
-      ParentModel: this.options.ParentModel,
-      ParentModels: this.options.ParentModels,
-      modelId: this.getId(this.options.modelName),
-      modelIdParam: this.getParam(this.getId(this.options.modelName)),
-      modelName: this.options.modelName,
-      modelNames: this.options.modelNames,
-      ModelName: this.options.ModelName,
-      ModelNames: this.options.ModelNames,
+  async preFileWrite(filePath: string): Promise<CommonTemplateValues> {
+    let templateValues = await this.getTemplateValues()
+    if (this.fs.exists(filePath)) {
+      let program = j(this.fs.read(filePath) as any, {
+        parser: customTsParser,
+      })
+      program = replaceImportDbWithPrismaFolder(program)
+      this.fs.write(filePath, program.toSource())
    }
+
+    return templateValues
  }

  getTargetDirectory() {
--- a/packages/generator/src/generators/template-builders/app-values-builder.ts
+++ b/packages/generator/src/generators/template-builders/app-values-builder.ts
@@ -0,0 +1,14 @@
+import username from "username"
+import {AppGeneratorOptions, AppTemplateValues} from "../.."
+import {Builder} from "./builder"
+
+export class AppValuesBuilder extends Builder<AppGeneratorOptions, AppTemplateValues> {
+  public async getTemplateValues(options: AppGeneratorOptions): Promise<AppTemplateValues> {
+    const values = {
+      name: options.appName,
+      safeNameSlug: options.appName.replace(/[^a-zA-Z0-9-_]/g, "-"),
+      username: await username(),
+    }
+    return values
+  }
+}
--- a/packages/generator/src/generators/template-builders/builder.ts
+++ b/packages/generator/src/generators/template-builders/builder.ts
@@ -0,0 +1,139 @@
+import {Editor} from "mem-fs-editor"
+import {GeneratorOptions} from "../../generator"
+import {getCodegen, getResourceValueFromCodegen} from "../../utils/get-codegen"
+import {CodegenField} from "../../utils/get-codegen"
+import {
+  addSpaceBeforeCapitals,
+  camelCaseToKebabCase,
+  singleCamel,
+  singlePascal,
+} from "../../utils/inflector"
+
+export interface IBuilder<T, U> {
+  getTemplateValues(Options: T): Promise<U>
+}
+
+const defaultFieldConfig: CodegenField = {
+  component: "LabeledTextField",
+  inputType: "text",
+  zodType: "string",
+  prismaType: "String",
+}
+
+export async function createFieldTemplateValues(
+  valueName: string | undefined,
+  typeName: string | undefined,
+  parent = false,
+): Promise<{[x: string]: any}> {
+  {
+    let values: {[x: string]: any} = {
+      attributeName: singleCamel(valueName),
+      fieldName: singleCamel(valueName),
+      FieldName: singlePascal(valueName),
+      field_name: addSpaceBeforeCapitals(`${valueName}`).toLocaleLowerCase(), // field name
+      Field_name: singlePascal(addSpaceBeforeCapitals(`${valueName}`).toLocaleLowerCase()), // Field name
+      Field_Name: singlePascal(addSpaceBeforeCapitals(`${valueName}`)), // Field Name
+    }
+    const codegen = await getCodegen()
+    // iterate over resources defined for this field type
+    const fieldConfig =
+      codegen.fieldTypeMap?.[typeName as keyof typeof codegen.fieldTypeMap] || defaultFieldConfig
+    values = {...values, ...fieldConfig}
+    if (parent) {
+      values.inputType = singleCamel(valueName).replace("Id", "s")
+      values.component = "LabeledSelectField"
+      values.fieldName = "id"
+      return values
+    }
+    values.inputType = fieldConfig.inputType
+    return values
+  }
+}
+
+export interface ResourceGeneratorOptions extends GeneratorOptions {
+  ModelName: string
+  ModelNames: string
+  modelName: string
+  modelNames: string
+  rawParentModelName?: string
+  parentModel?: string
+  parentModels?: string
+  ParentModel?: string
+  ParentModels?: string
+  extraArgs?: string[]
+}
+
+export interface CommonTemplateValues {
+  prismaFolder?: string
+  parentModelId: string
+  parentModelParam: string
+  parentModel?: string
+  parentModels?: string
+  ParentModel?: string
+  ParentModels?: string
+  parentModelIdZodType?: string
+  modelId: string
+  modelIdZodType?: string
+  modelIdParam: string
+  modelName: string
+  modelNames: string
+  ModelName: string
+  ModelNames: string
+  modelNamesPath: string
+  fieldTemplateValues?: {[x: string]: any}
+}
+
+export abstract class Builder<T, U> implements IBuilder<T, U> {
+  public constructor(fs?: Editor) {
+    this.fs = fs
+  }
+
+  abstract getTemplateValues(Options: T): Promise<U>
+
+  public fs: Editor | undefined
+
+  public defaultFieldConfig = defaultFieldConfig
+
+  public getId(input: string = "") {
+    if (!input) return input
+    return `${input}Id`
+  }
+
+  public getParam(input: string = "") {
+    if (!input) return input
+    return `[${input}]`
+  }
+
+  public getModelNamesPath(context: string | undefined, modelNames: string) {
+    const kebabCaseContext = context ? `${camelCaseToKebabCase(context)}/` : ""
+    const kebabCaseModelNames = camelCaseToKebabCase(modelNames)
+    return kebabCaseContext + kebabCaseModelNames
+  }
+
+  // eslint-disable-next-line require-await
+  public async getZodType(type: string = "") {
+    return getResourceValueFromCodegen(type, "zodType")
+  }
+
+  // eslint-disable-next-line require-await
+  public async getComponentForType(type: string = "") {
+    return getResourceValueFromCodegen(type, "component")
+  }
+
+  // eslint-disable-next-line require-await
+  public async getInputType(type: string = "") {
+    return getResourceValueFromCodegen(type, "inputType")
+  }
+  // eslint-disable-next-line require-await
+  public async getFieldTemplateValues(args: string[]) {
+    const argsPromises = args.map(async (arg: string) => {
+      let [valueName, typeName] = arg.split(":")
+      if (typeName?.includes("?")) {
+        typeName = typeName.replace("?", "")
+      }
+      const values = await createFieldTemplateValues(valueName, typeName)
+      return values
+    })
+    return Promise.all(argsPromises)
+  }
+}
--- a/packages/generator/src/generators/template-builders/field-values-builder.ts
+++ b/packages/generator/src/generators/template-builders/field-values-builder.ts
@@ -0,0 +1,120 @@
+import * as ast from "@mrleebo/prisma-ast"
+import {create as createStore} from "mem-fs"
+import {create as createEditor, Editor} from "mem-fs-editor"
+import {getResourceValueFromCodegen} from "../../utils/get-codegen"
+import {getPrismaSchema} from "../../utils/get-prisma-schema"
+import {ModelName, modelName, ModelNames, modelNames} from "../../utils/model-names"
+import {Builder, CommonTemplateValues, ResourceGeneratorOptions} from "./builder"
+
+export class FieldValuesBuilder extends Builder<ResourceGeneratorOptions, CommonTemplateValues> {
+  private getEditor = (): Editor => {
+    if (this.fs !== undefined) {
+      return this.fs
+    }
+    const store = createStore()
+    this.fs = createEditor(store)
+    return this.fs
+  }
+
+  // eslint-disable-next-line require-await
+  public async getTemplateValues(options: ResourceGeneratorOptions): Promise<CommonTemplateValues> {
+    const prismaFolder = getPrismaSchema(this.getEditor())
+    let values: CommonTemplateValues = {
+      prismaFolder: typeof prismaFolder !== "boolean" ? prismaFolder.dbFolder : "db",
+      parentModelId: this.getId(options.parentModel),
+      parentModelIdZodType: undefined,
+      parentModelParam: this.getParam(this.getId(options.parentModel)),
+      parentModel: options.parentModel,
+      parentModels: options.parentModels,
+      ParentModel: options.ParentModel,
+      ParentModels: options.ParentModels,
+      modelId: this.getId(options.modelName),
+      modelIdZodType: "number",
+      modelIdParam: this.getParam(this.getId(options.modelName)),
+      modelName: options.modelName,
+      modelNames: options.modelNames,
+      ModelName: options.ModelName,
+      ModelNames: options.ModelNames,
+      modelNamesPath: this.getModelNamesPath(options.context, options.modelNames),
+    }
+    if (options.extraArgs) {
+      // specialArgs - these are arguments like 'id' or 'belongsTo', which are not meant to
+      // be processed as fields but have their own special logic
+      const specialArgs: {[key in string]: string} = {}
+
+      const processSpecialArgs: Promise<void>[] = options.extraArgs.map(async (arg) => {
+        const [valueName, typeName] = arg.split(":")
+        if (valueName === "id") {
+          values.modelIdZodType = await this.getZodType(typeName)
+          specialArgs[arg] = "present"
+        }
+        if (valueName === "belongsTo") {
+          specialArgs[arg] = "present"
+          process.env.parentModel = typeName
+          options.rawParentModelName = typeName
+          options.parentModel = modelName(typeName)
+          options.parentModels = modelNames(typeName)
+          options.ParentModel = ModelName(typeName)
+          options.ParentModels = ModelNames(typeName)
+          values.parentModelId = this.getId(modelName(typeName))
+        }
+      })
+      await Promise.all(processSpecialArgs)
+      // Filter out special args by making sure the argument isn't present in the list
+      const nonSpecialArgs = options.extraArgs.filter((arg) => specialArgs[arg] !== "present")
+
+      // Get the parent model it type if options.parentModel exists
+      if (options.parentModel !== undefined && options.parentModel.length > 0) {
+        const obj = getPrismaSchema(this.getEditor())
+        if (typeof obj !== "boolean") {
+          const schema = obj.schema
+          // O(N) - N is total ast Blocks
+          const model = schema.list.find(function (component): component is ast.Model {
+            return component.type === "model" && component.name === options.rawParentModelName
+          })
+
+          if (model !== undefined) {
+            // O(N) - N is number of properties in parent model
+            const idField = model.properties.find(function (property): property is ast.Field {
+              return (
+                property.type === "field" &&
+                property.attributes?.findIndex((attr) => attr.name === "id") !== -1
+              )
+            })
+
+            // TODO: Do we want a map between prisma types and "user types", we can then use that map instead of these conditionals
+            // We have a map from "user types" (which are what users type into the blitz generate command)
+            // to primsa type and other types, but we dont have a reverse map 1:1. This is because we lose
+            // some information for certain maps. E.g.: fieldname:uuid will be converted into a Prisma field with
+            // the String type, and the uuid portion is added to a decorator at the end of the field.
+            // This means it is more complicated to extract the original "user specified type" than creating a reverse map
+            if (idField?.fieldType === "Int") {
+              // TODO: Check if ints have decorators that make them a different type, like Bigint, etc.
+              // And see if that has to map to a different user specified type
+              values.parentModelIdZodType = await getResourceValueFromCodegen("int", "zodType")
+            } else if (idField?.fieldType === "String") {
+              if (
+                idField.attributes?.find(
+                  (attr) =>
+                    attr.name === "default" &&
+                    attr.args?.findIndex((arg) => arg.value === "uuid") !== -1,
+                )
+              ) {
+                values.parentModelIdZodType = await getResourceValueFromCodegen("uuid", "zodType")
+              } else {
+                values.parentModelIdZodType = await getResourceValueFromCodegen("string", "zodType")
+              }
+            }
+          }
+        } else {
+          // TODO: handle scenario where parent wasnt found in existing schema. Should we throw an error, or a warning asking the user to verify that the parent model exists?
+        }
+      }
+      if (nonSpecialArgs.length > 0) {
+        const ftv = await this.getFieldTemplateValues(nonSpecialArgs)
+        return {...values, fieldTemplateValues: ftv}
+      }
+    }
+    return values
+  }
+}
--- a/packages/generator/src/generators/template-builders/null-builder.ts
+++ b/packages/generator/src/generators/template-builders/null-builder.ts
@@ -0,0 +1,8 @@
+import {IBuilder} from "./builder"
+
+export const NullBuilder: IBuilder<any, any> = {
+  // eslint-disable-next-line require-await
+  getTemplateValues: async () => {
+    return {}
+  },
+}
--- a/packages/generator/src/index.ts
+++ b/packages/generator/src/index.ts
@@ -7,6 +7,11 @@ export * from "./generators/queries-generator"
 export * from "./generators/query-generator"
 export * from "./generators/form-generator"
 export * from "./generator"
+export * from "./generators/template-builders/builder"
+export * from "./generators/template-builders/null-builder"
+export * from "./generators/template-builders/app-values-builder"
+export * from "./generators/template-builders/field-values-builder"
+export * from "./utils/model-names"
 export * from "./conflict-checker"
 export {getLatestVersion} from "./utils/get-latest-version"
 export * from "./utils/npm-fetch"
@@ -18,4 +23,5 @@ export {
  pluralPascal,
  capitalize,
  uncapitalize,
+  addSpaceBeforeCapitals,
 } from "./utils/inflector"
--- a/packages/generator/src/prisma/field.ts
+++ b/packages/generator/src/prisma/field.ts
@@ -1,6 +1,7 @@
 import * as ast from "@mrleebo/prisma-ast"
-import {checkInputsOrRaise} from "../utils/checkInputOrRaise"
+import {getResourceConfigFromCodegen} from "../utils/get-codegen"
 import {capitalize, singlePascal, uncapitalize} from "../utils/inflector"
+const debug = require("debug")("blitz:field")

 export enum FieldType {
  Boolean = "Boolean",
@@ -55,9 +56,8 @@ export class Field {
  relationToFields?: string[]

  // 'name:type?[]:attribute' => Field
-  static parse(input: string, schema?: ast.Schema): Field[] {
-    checkInputsOrRaise(input)
-
+  static async parse(input: string, schema?: ast.Schema): Promise<Field[]> {
+    debug(`parsing "Field" for input ${input}`)
    const [_fieldName, _fieldType = "String", _attribute] = input.split(":")
    let attribute = _attribute as string
    let fieldName = uncapitalize(_fieldName as string)
@@ -76,6 +76,16 @@ export class Field {
      fieldType = fieldType.replace("?", "")
      isRequired = false
    }
+
+    const {prismaType, default: defaultConfigValue} =
+      (await Field.getConfigForPrismaType(fieldType)) ?? {}
+    if (prismaType) {
+      fieldType = prismaType
+    }
+    if (defaultConfigValue) {
+      attribute = `default=${defaultConfigValue}`
+    }
+
    if (fieldType.includes("[]")) {
      fieldType = fieldType.replace("[]", "")
      fieldName = uncapitalize(fieldName)
@@ -89,7 +99,7 @@ export class Field {
    // has modified fieldName
    if (typeof _fieldName === "string" && isRelation(_fieldName)) {
      // this field is an object type, not a scalar type
-      const relationType = Relation[_fieldName]
+      const relationType = Relation[_fieldName as keyof typeof Relation]
      // translate the type into the name since they should stay in sync
      fieldName = uncapitalize(fieldType)
      fieldType = singlePascal(fieldType)
@@ -162,6 +172,10 @@ export class Field {
    }
  }

+  public static getConfigForPrismaType = async (fieldType: string) => {
+    return await getResourceConfigFromCodegen(fieldType.toLowerCase())
+  }
+
  constructor(name: string, options: FieldArgs) {
    if (!name) throw new MissingFieldNameError("[PrismaField]: A field name is required")
    if (!options.type) {
@@ -217,7 +231,12 @@ export class Field {
      args: [
        {
          type: "attributeArgument",
-          value: typeof this.default === "object" ? `${this.default.name}()` : String(this.default),
+          value:
+            typeof this.default === "object"
+              ? `${this.default.name}()`
+              : this.type === FieldType.String
+              ? `"${this.default}"`
+              : this.default,
        },
      ],
    }
--- a/packages/generator/src/utils/checkInputOrRaise.ts
+++ b/packages/generator/src/utils/checkInputOrRaise.ts
@@ -1,28 +0,0 @@
-import chalk from "chalk"
-import {log} from "./log"
-
-export const checkInputsOrRaise = (inputs: string[] | string) => {
-  if (typeof inputs === "string") {
-    checkInputOrRaise(inputs)
-  } else {
-    inputs.forEach((input) => checkInputOrRaise(input))
-  }
-}
-
-const checkInputOrRaise = (input: string) => {
-  const regex = /^[a-zA-Z0-9-_:=\?[\]\s]+$/
-  if (!regex.test(input)) {
-    const firstInvalidCharacter = input.match(/[^a-zA-Z0-9-_:=\?[\]\s]/)
-    if (firstInvalidCharacter) {
-      log.branded(
-        "Blitz Generator Parser Error: " +
-          chalk.red(
-            `Input contains invalid character: "${firstInvalidCharacter[0]}" in ${firstInvalidCharacter.input} at position ${firstInvalidCharacter.index}`,
-          ),
-      )
-    }
-    throw new Error(
-      "Input should only contain alphanumeric characters, spaces, and the following characters: - _ : = ? [ ]",
-    )
-  }
-}
--- a/packages/generator/src/utils/codemod-utils.ts
+++ b/packages/generator/src/utils/codemod-utils.ts
@@ -0,0 +1,155 @@
+import j, {Collection} from "jscodeshift"
+import {capitalize, singleCamel} from "./inflector"
+
+export function replaceImportDbWithPrismaFolder(program: Collection<any>) {
+  const importDb = program.find(j.ImportDeclaration).filter((path) => {
+    return path.value.source.value === "db"
+  })
+  importDb.replaceWith((path) => {
+    path.value.source.value = "__prismaFolder__"
+    return path.value
+  })
+
+  return program
+}
+
+export function insertLabeledSelectField(program: Collection<any>) {
+  const importExists = program
+    .find(j.ImportDeclaration)
+    .filter((path) => path.node.source.value === "src/core/components/LabelSelectField")
+    .size()
+  if (!importExists) {
+    program
+      .find(j.ImportDeclaration)
+      .at(-1)
+      .insertAfter(
+        j.importDeclaration(
+          [j.importSpecifier(j.identifier("LabeledSelectField"))],
+          j.literal("src/core/components/LabelSelectField"),
+        ),
+      )
+  }
+  return program
+}
+
+export function insertImportQuery(program: Collection<any>, templateValues: any) {
+  program
+    .find(j.ImportDeclaration)
+    .at(-1)
+    .insertAfter(
+      j.importDeclaration(
+        [
+          j.importDefaultSpecifier(
+            j.identifier(
+              singleCamel("get" + capitalize(templateValues.parentModelId)).replace("Id", "s"),
+            ),
+          ),
+        ],
+        j.literal(
+          `src/${templateValues.parentModelId.replace("Id", "s")}/queries/${
+            "get" + capitalize(templateValues.parentModelId).replace("Id", "s")
+          }`,
+        ),
+      ),
+    )
+  return program
+}
+
+export function insertImportPagnatedQuery(program: Collection<any>) {
+  const importPaginatedQuery = program
+    .find(j.ImportDeclaration)
+    .filter((path) => {
+      if (path.node.specifiers) {
+        return (
+          path.node.source.value === "@blitzjs/rpc" &&
+          path.node.specifiers.filter((specifier) => {
+            if (specifier.type === "ImportSpecifier") {
+              return specifier.imported.name === "usePaginatedQuery"
+            } else {
+              return false
+            }
+          }).length > 0
+        )
+      } else {
+        return false
+      }
+    })
+    .size()
+  if (!importPaginatedQuery) {
+    program
+      .find(j.ImportDeclaration)
+      .at(-1)
+      .insertAfter(
+        j.importDeclaration(
+          [j.importSpecifier(j.identifier("usePaginatedQuery"))],
+          j.literal("@blitzjs/rpc"),
+        ),
+      )
+  }
+  return program
+}
+
+export function updateFormWithParent(program: Collection<any>, templateValues: any) {
+  const modalFormSuspense = program.find(j.FunctionDeclaration).filter((path) => {
+    if (path.node.id?.name) {
+      return path.node.id.name.includes("Form")
+    }
+    return false
+  })
+  if (modalFormSuspense.size()) {
+    modalFormSuspense
+      .find(j.ReturnStatement)
+      .at(-1)
+      .insertBefore(
+        j.variableDeclaration("const", [
+          j.variableDeclarator(
+            j.arrayPattern([
+              j.objectPattern([
+                j.objectProperty(
+                  j.identifier(`${templateValues.parentModelId.replace("Id", "s")}`),
+                  j.identifier(`${templateValues.parentModelId.replace("Id", "s")}`),
+                ),
+              ]),
+            ]),
+            j.callExpression(j.identifier("usePaginatedQuery"), [
+              j.identifier("get" + capitalize(templateValues.parentModelId).replace("Id", "s")),
+              j.objectExpression([
+                j.objectProperty(
+                  j.identifier("orderBy"),
+                  j.objectExpression([
+                    j.objectProperty(j.identifier("id"), j.stringLiteral("asc")),
+                  ]),
+                ),
+              ]),
+            ]),
+          ),
+        ]),
+      )
+    modalFormSuspense
+      .find(j.JSXElement)
+      .filter((path) => {
+        return (
+          path.node.openingElement.name.type === "JSXIdentifier" &&
+          path.node.openingElement.name.name === "LabeledSelectField"
+        )
+      })
+      .forEach((path) => {
+        let value = ""
+        path.node.openingElement.attributes = path.node.openingElement.attributes?.filter(
+          (attribute) => {
+            if (attribute.type === "JSXAttribute" && attribute.name.name === "type") {
+              if (attribute.value?.type === "StringLiteral") {
+                value = attribute.value.value
+              }
+              return false
+            }
+            return true
+          },
+        )
+        path.node.openingElement.attributes?.push(
+          j.jsxAttribute(j.jsxIdentifier("options"), j.jsxExpressionContainer(j.identifier(value))),
+        )
+      })
+  }
+  return program
+}
--- a/packages/generator/src/utils/get-codegen.ts
+++ b/packages/generator/src/utils/get-codegen.ts
@@ -0,0 +1,165 @@
+import {log} from "../utils/log"
+import * as z from "zod"
+
+export type CodegenField = {
+  component: string
+  inputType: string
+  zodType: string
+  prismaType: string
+  default?: string
+}
+
+export type CodegenConfig = {
+  fieldTypeMap?: Record<
+    | "string"
+    | "boolean"
+    | "int"
+    | "number"
+    | "bigint"
+    | "float"
+    | "decimal"
+    | "datetime"
+    | "uuid"
+    | "json",
+    CodegenField
+  >
+}
+
+const CodegenSchema = z.object({
+  fieldTypeMap: z.record(
+    z.union([
+      z.literal("string"),
+      z.literal("boolean"),
+      z.literal("int"),
+      z.literal("number"),
+      z.literal("bigint"),
+      z.literal("float"),
+      z.literal("decimal"),
+      z.literal("datetime"),
+      z.literal("uuid"),
+      z.literal("json"),
+    ]),
+    z.object({
+      component: z.string(),
+      inputType: z.string(),
+      zodType: z.string(),
+      prismaType: z.string(),
+      default: z.string().optional(),
+    }),
+  ),
+})
+
+export const defaultCodegenConfig: CodegenConfig = {
+  fieldTypeMap: {
+    string: {
+      component: "LabeledTextField",
+      inputType: "text",
+      zodType: "string",
+      prismaType: "String",
+    },
+    boolean: {
+      component: "LabeledTextField",
+      inputType: "text",
+      zodType: "boolean",
+      prismaType: "Boolean",
+    },
+    int: {
+      component: "LabeledTextField",
+      inputType: "number",
+      zodType: "number",
+      prismaType: "Int",
+    },
+    number: {
+      component: "LabeledTextField",
+      inputType: "number",
+      zodType: "number",
+      prismaType: "Int",
+    },
+    bigint: {
+      component: "LabeledTextField",
+      inputType: "number",
+      zodType: "number",
+      prismaType: "BigInt",
+    },
+    float: {
+      component: "LabeledTextField",
+      inputType: "number",
+      zodType: "number",
+      prismaType: "Float",
+    },
+    decimal: {
+      component: "LabeledTextField",
+      inputType: "number",
+      zodType: "number",
+      prismaType: "Decimal",
+    },
+    datetime: {
+      component: "LabeledTextField",
+      inputType: "text",
+      zodType: "string().datetime()",
+      prismaType: "DateTime",
+    },
+    uuid: {
+      component: "LabeledTextField",
+      inputType: "text",
+      zodType: "string().uuid",
+      prismaType: "String",
+      default: "uuid",
+    },
+    json: {
+      component: "LabeledTextField",
+      inputType: "text",
+      zodType: "any",
+      prismaType: "Json",
+    },
+  },
+}
+
+export const getResourceValueFromCodegen = async (
+  fieldType: string,
+  resource: keyof CodegenField,
+): Promise<string | undefined> => {
+  const codegen = await getCodegen()
+  const templateValue = codegen.fieldTypeMap?.[fieldType]?.[resource]
+  return templateValue
+}
+
+export const getResourceConfigFromCodegen = async (
+  fieldType: string,
+): Promise<CodegenField | undefined> => {
+  const codegen = await getCodegen()
+  const config = codegen.fieldTypeMap?.[fieldType]
+  return config
+}
+
+const getIsTypeScript = async () =>
+  require("fs").existsSync(require("path").join(process.cwd(), "tsconfig.json"))
+
+export const getCodegen = async () => {
+  try {
+    const isTypeScript = await getIsTypeScript()
+    const blitzServerPath = isTypeScript ? "app/blitz-server.ts" : "app/blitz-server.js"
+    const blitzServer = require("path").join(process.cwd(), blitzServerPath)
+    const {register} = require("esbuild-register/dist/node")
+    const {unregister} = register({
+      target: "es6",
+    })
+    const blitzConfig = require(blitzServer)
+    const config = blitzConfig
+    const {cliConfig} = config
+    unregister()
+
+    if (cliConfig.codegen !== undefined) {
+      const result = CodegenSchema.safeParse(cliConfig.codegen)
+      if (!result.success) {
+        log.error("Failed parsing codegen config. Check if it is well formed. Using default config")
+        return defaultCodegenConfig
+      }
+      return cliConfig.codegen
+    }
+    return defaultCodegenConfig
+  } catch (ex) {
+    log.debug("Failed loading config" + ex)
+    return defaultCodegenConfig
+  }
+}
--- a/packages/generator/src/utils/get-prisma-schema.ts
+++ b/packages/generator/src/utils/get-prisma-schema.ts
@@ -0,0 +1,65 @@
+import * as ast from "@mrleebo/prisma-ast"
+import {Editor} from "mem-fs-editor"
+import {log} from "../utils/log"
+import fs from "fs"
+import path from "path"
+
+//create a custom error class when prisma does not exist
+export class PrismaSchemaNotFoundError extends Error {
+  constructor() {
+    super("Prisma schema not found.")
+    this.name = "PrismaSchemaNotFoundError"
+  }
+}
+
+function getDbFolder() {
+  try {
+    const packageJsonPath = path.join(process.cwd(), "package.json")
+    if (fs.existsSync(packageJsonPath)) {
+      const packageJson = fs.readFileSync(packageJsonPath, "utf8")
+      const packageJsonObj = JSON.parse(packageJson)
+      if (!packageJsonObj.prisma || !packageJsonObj.prisma.schema) {
+        throw new PrismaSchemaNotFoundError()
+      }
+      const prismaSchemaPath = path.join(process.cwd(), packageJsonObj.prisma.schema)
+      if (!fs.existsSync(prismaSchemaPath)) {
+        throw new PrismaSchemaNotFoundError()
+      }
+      const folder = packageJsonObj.prisma.schema.split("/")[0] as string
+      return folder
+    } else {
+      throw new PrismaSchemaNotFoundError()
+    }
+  } catch (e) {
+    if (fs.existsSync(path.join(process.cwd(), "db/schema.prisma"))) {
+      return "db"
+    }
+    throw e
+  }
+}
+
+export const getPrismaSchema = (
+  memFsEditor: Editor,
+): {schema: ast.Schema; schemaPath: string; dbFolder: string} | boolean => {
+  let dbFolder: string, schemaPath: string
+  try {
+    dbFolder = getDbFolder()
+    schemaPath = path.join(process.cwd(), dbFolder, "schema.prisma")
+  } catch (e) {
+    if (e instanceof PrismaSchemaNotFoundError) {
+      return false
+    }
+    throw e
+  }
+  if (!fs.existsSync(schemaPath)) {
+    return {schema: {type: "schema", list: []}, schemaPath, dbFolder}
+  }
+  let schema: ast.Schema
+  try {
+    schema = ast.getSchema(memFsEditor.read(schemaPath))
+  } catch (err) {
+    log.debug("Failed to parse schema.prisma file")
+    throw err
+  }
+  return {schema, schemaPath, dbFolder}
+}
--- a/packages/generator/src/utils/inflector.ts
+++ b/packages/generator/src/utils/inflector.ts
@@ -5,6 +5,10 @@ export function plural(input: string): string {
  return pluralize.isPlural(input) ? input : pluralize.plural(input)
 }

+export function addSpaceBeforeCapitals(input: string): string {
+  return singleCamel(input).replace(/(?!^)([A-Z])/g, " $1")
+}
+
 export function singular(input: string): string {
  return pluralize.isSingular(input) ? input : pluralize.singular(input)
 }
--- a/packages/generator/src/utils/log.ts
+++ b/packages/generator/src/utils/log.ts
@@ -167,6 +167,19 @@ const withProgress = (str: string) => {
  return withCaret(str)
 }

+const greenText = (str: string) => {
+  return `${c.green(str)}`
+}
+
+/**
+ * Logs a red error message to stdout.
+ *
+ * @param {string} msg
+ */
+const error = (msg: string) => {
+  console.log(`${c.red(msg)}`)
+}
+
 /**
 * Logs a branded purple message to stdout.
 *
@@ -248,6 +261,8 @@ export const log = {
  progress,
  spinner,
  success,
+  greenText,
+  error,
  variable,
  debug,
  Table,
--- a/packages/generator/src/utils/model-names.ts
+++ b/packages/generator/src/utils/model-names.ts
@@ -0,0 +1,14 @@
+import {pluralCamel, pluralPascal, singleCamel, singlePascal} from "../index"
+
+export function modelName(input: string = "") {
+  return singleCamel(input)
+}
+export function modelNames(input: string = "") {
+  return pluralCamel(input)
+}
+export function ModelName(input: string = "") {
+  return singlePascal(input)
+}
+export function ModelNames(input: string = "") {
+  return pluralPascal(input)
+}
--- a/packages/generator/templates/app/_forms/finalform/LabelSelectField.tsx
+++ b/packages/generator/templates/app/_forms/finalform/LabelSelectField.tsx
@@ -0,0 +1,60 @@
+import { forwardRef, PropsWithoutRef } from "react"
+import { useField } from "react-final-form"
+
+export interface LabeledSelectFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["select"]> {
+  /** Field name. */
+  name: string
+  /** Field label. */
+  label: string
+  type?: "number" | "string"
+  options: any
+  outerProps?: PropsWithoutRef<JSX.IntrinsicElements["div"]>
+}
+
+export const LabeledSelectField = forwardRef<HTMLSelectElement, LabeledSelectFieldProps>(
+  ({ name, label, outerProps, options, type="number", ...props }, ref) => {
+    const {
+      input,
+      meta: { touched, error, submitError, submitting },
+    } = useField(name, {
+      parse: type === "number" ? Number : undefined,
+    })
+
+    const normalizedError = Array.isArray(error) ? error.join(", ") : error || submitError
+
+    return (
+      <div {...outerProps}>
+        <label>
+          {label}
+          <select {...input} disabled={submitting} {...props} ref={ref}>
+          {options && options.map((value) => <option value={value.id}>{value[name]}</option>)}
+          </select>
+        </label>
+
+        {touched && normalizedError && (
+          <div role="alert" style={{ color: "red" }}>
+            {normalizedError}
+          </div>
+        )}
+
+        <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;
+            appearance: none;
+            margin-top: 0.5rem;
+          }
+        `}</style>
+      </div>
+    )
+  }
+)
+
+export default LabeledSelectField
--- a/packages/generator/templates/app/_forms/formik/LabelSelectField.tsx
+++ b/packages/generator/templates/app/_forms/formik/LabelSelectField.tsx
@@ -0,0 +1,68 @@
+import { forwardRef, PropsWithoutRef } from "react";
+import { useFormikContext, ErrorMessage, Field } from "formik";
+
+export interface LabeledSelectFieldProps
+  extends PropsWithoutRef<JSX.IntrinsicElements["select"]> {
+  /** Field name. */
+  name: string;
+  /** Field label. */
+  label: string;
+  /** Field options. */
+  options: any;
+  outerProps?: PropsWithoutRef<JSX.IntrinsicElements["div"]>;
+}
+
+export const LabeledSelectField = forwardRef<
+  HTMLSelectElement,
+  LabeledSelectFieldProps
+>(({ name, label, outerProps, options, ...props }, ref) => {
+  const { isSubmitting } = useFormikContext();
+  return (
+    <div {...outerProps}>
+      <label
+        style={{
+          display: "flex",
+          flexDirection: "column",
+          alignItems: "start",
+          fontSize: "1rem",
+        }}
+      >
+        {label}
+        <Field
+          {...props}
+          disabled={isSubmitting}
+          ref={ref}
+          name={name}
+          as="select"
+          style={{
+            fontSize: "1rem",
+            padding: " 0.25rem 0.4rem",
+            borderRadius: "3px",
+            border: "1px solid purple",
+            marginTop: "0.5rem",
+            backgroundColor: "white",
+          }}
+        >
+          <option value="" selected disabled hidden>
+            Select {label}
+          </option>
+          {options.map((option, index) => (
+            <option key={index} value={option.id}>
+              {option[name]}
+            </option>
+          ))}
+        </Field>
+      </label>
+
+      <ErrorMessage name={name}>
+        {(msg) => (
+          <div role="alert" style={{ color: "red" }}>
+            {msg}
+          </div>
+        )}
+      </ErrorMessage>
+    </div>
+  );
+});
+
+export default LabeledSelectField;
--- a/packages/generator/templates/app/_forms/hookform/LabelSelectField.tsx
+++ b/packages/generator/templates/app/_forms/hookform/LabelSelectField.tsx
@@ -0,0 +1,58 @@
+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}>{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/packages/generator/templates/app/package.js.json
+++ b/packages/generator/templates/app/package.js.json
@@ -31,7 +31,6 @@
    "prisma": "4.6.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
-    "secure-password": "4.0.0",
    "zod": "3.19.1"
  },
  "devDependencies": {
--- a/packages/generator/templates/app/package.ts.json
+++ b/packages/generator/templates/app/package.ts.json
@@ -31,7 +31,6 @@
    "prisma": "4.6.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
-    "secure-password": "4.0.0",
    "zod": "3.20.2"
  },
  "devDependencies": {
--- a/packages/generator/templates/app/src/auth/components/LoginForm.tsx
+++ b/packages/generator/templates/app/src/auth/components/LoginForm.tsx
@@ -41,7 +41,7 @@ export const LoginForm = (props: LoginFormProps) => {
        <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
        <div>
          <Link href={Routes.ForgotPasswordPage()}>
-            Forgot your password?
+            <a>Forgot your password?</a>
          </Link>
        </div>
      </Form>
@@ -49,7 +49,7 @@ export const LoginForm = (props: LoginFormProps) => {
      <div style={{ marginTop: "1rem" }}>
        Or{" "}
        <Link href={Routes.SignupPage()}>
-          Sign Up
+          <a>Sign Up</a>
        </Link>
      </div>
    </div>
--- a/packages/generator/templates/app/src/pages/auth/reset-password.tsx
+++ b/packages/generator/templates/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>
@@ -36,7 +40,7 @@ const ResetPasswordPage: BlitzPage = () => {
          }}
          onSubmit={async (values) => {
            try {
-              await resetPasswordMutation({ ...values, token })
+              await resetPasswordMutation({...values, token})
            } catch (error: any) {
              if (error.name === "ResetPasswordError") {
                return {
--- a/packages/generator/templates/app/src/pages/index.tsx
+++ b/packages/generator/templates/app/src/pages/index.tsx
@@ -61,10 +61,10 @@ const Home: BlitzPage = () => {
        </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>
@@ -173,7 +173,7 @@ const Home: BlitzPage = () => {
                  <span className={styles.arrowIcon} />
                </a>
              </div>
-
+  
            </div>
          </div>
        </main>
--- a/packages/generator/templates/app/src/styles/Home.module.css
+++ b/packages/generator/templates/app/src/styles/Home.module.css
@@ -51,7 +51,7 @@
  width: 100%;
  flex-direction: row;
  align-self: center;
-  max-width: calc(min(var(--screen-width),800px));
+  max-width: var(--screen-width);
 }


--- a/packages/generator/templates/app/test/index.test.tsx
+++ b/packages/generator/templates/app/test/index.test.tsx
@@ -4,19 +4,19 @@

 import { expect, vi, test } from "vitest"
 import { render } from "test/utils"
-
+ 
 import Home from "../src/pages/index"
-
+ 
 vi.mock("public/logo.png", () => ({
   default: {src: "/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", () => (
    {
@@ -28,9 +28,10 @@
      })
    }
  ))
-
+ 
   const { getByText } = render(<Home />)
-   const linkElement = getByText(/Blitz Docs/i)
+   const linkElement = getByText(/Documentation/i)
   expect(linkElement).toBeInTheDocument()
 })
-
+ 
+ 
--- a/packages/generator/templates/form/ModelNameForm.tsx
+++ b/packages/generator/templates/form/ModelNameForm.tsx
@@ -1,13 +1,14 @@
+import React, {Suspense} from "react"
 import {Form, FormProps} from "src/core/components/Form"
 import {LabeledTextField} from "src/core/components/LabeledTextField"
+
 import {z} from "zod"
 export {FORM_ERROR} from "src/core/components/Form"

 export function __ModelName__Form<S extends z.ZodType<any, any>>(props: FormProps<S>) {
  return (
    <Form<S> {...props}>
-      <LabeledTextField name="name" label="Name" placeholder="Name" />
+      {/* template: <__component__ name="__fieldName__" label="__Field_Name__" placeholder="__Field_Name__"  type="__inputType__" /> */}
    </Form>
  )
 }
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Siddharth Suresh	1ecc5ca714	add changeset pre exit to fix error	2023-01-11 23:53:04 +05:30
Siddharth Suresh	80bbe8e849	Create pr-release.yml	2023-01-11 23:36:04 +05:30
Siddharth Suresh	985ce05eba	update unit tests	2023-01-11 17:10:47 +05:30
Siddharth Suresh	58d7f053e6	update zod to 3.20.0 in generator	2023-01-11 13:45:18 +05:30
Siddharth Suresh	154a287aa5	pnpm lock	2023-01-11 13:32:04 +05:30
Siddharth Suresh	558d9132c5	Merge branch 'port-subtemplate' of https://github.com/blitz-js/blitz into port-subtemplate	2023-01-11 13:29:30 +05:30
Siddharth Suresh	cc13affe9c	add new zod `datetime` Co-authored-by: Tobias <tobias@fixmycity.de>	2023-01-11 13:26:54 +05:30
Siddharth Suresh	ad3e202ef0	Merge branch 'main' into port-subtemplate	2023-01-11 13:26:27 +05:30
Siddharth Suresh	1bea6b33b0	cleanup	2023-01-10 20:42:16 +05:30
Siddharth Suresh	484853edc2	fix version	2023-01-10 20:32:46 +05:30
Siddharth Suresh	ae410d5720	with deps	2023-01-10 20:26:14 +05:30
Siddharth Suresh	6c5256b262	try another way	2023-01-10 20:20:11 +05:30
Siddharth Suresh	38d16177d5	fix version	2023-01-10 20:13:51 +05:30
Siddharth Suresh	e335061157	fix path	2023-01-10 20:07:16 +05:30
Siddharth Suresh	2cb2dd2910	fix env location	2023-01-10 20:01:48 +05:30
Siddharth Suresh	2b6bd18629	try agin	2023-01-10 19:55:49 +05:30
Siddharth Suresh	f715d7fc6f	Merge branch 'port-subtemplate' of https://github.com/blitz-js/blitz into port-subtemplate	2023-01-10 19:52:48 +05:30
Siddharth Suresh	ba1087c031	Update main.yml	2023-01-10 19:52:01 +05:30
Siddharth Suresh	cb7a08aea4	fix playwright issue	2023-01-10 18:42:21 +05:30
Siddharth Suresh	384ca635de	Merge branch 'main' into port-subtemplate	2023-01-10 18:25:48 +05:30
Siddharth Suresh	ae0488335a	Merge branch 'main' into port-subtemplate	2023-01-05 17:47:57 +05:30
Siddharth Suresh	3b5bff1b56	Update main.yml	2022-12-26 21:06:22 +05:30
Siddharth Suresh	959f975c3b	minor fix	2022-12-25 18:50:56 +05:30
Siddharth Suresh	b4b20d5223	minor fix	2022-12-22 22:08:02 +05:30
Siddharth Suresh	74bcc213c2	initial revert changes to log and add better types	2022-12-22 22:04:49 +05:30
Siddharth Suresh	48c3b74ae9	Merge branch 'main' into port-subtemplate	2022-12-22 18:13:03 +05:30
Siddharth Suresh	4b258b0f01	Update packages/generator/src/generators/template-builders/field-values-builder.ts Co-authored-by: John Vandivier <vandivier_john@yahoo.com>	2022-12-22 18:12:39 +05:30
Siddharth Suresh	799b7431c4	fix pnpm lock	2022-12-19 23:05:14 +05:30
Siddharth Suresh	d8d047db7e	Merge branch 'main' into port-subtemplate	2022-12-19 22:53:35 +05:30
Siddharth Suresh	34a1ffea99	Merge branch 'main' into port-subtemplate	2022-12-14 18:48:30 +05:30
Siddharth Suresh	7dddab6afe	preWriteFile and postWriteFile hooks	2022-12-12 13:11:24 +05:30
Siddharth Suresh	d33acf0538	Merge branch 'main' into port-subtemplate	2022-12-10 22:16:09 +05:30
Siddharth Suresh	a2ecc9f20b	fix zod version	2022-12-08 17:00:27 +05:30
Siddharth Suresh	fa0d10121d	move zod to devDeps	2022-12-08 16:42:11 +05:30
Siddharth Suresh	5c930dcdb3	works without prisma	2022-12-08 16:26:38 +05:30
Siddharth Suresh	4620d00640	remove error log if no prisma schema	2022-12-08 13:42:06 +05:30
Siddharth Suresh	41cf34fea7	add required test and remove error if prisma does not exist	2022-12-08 13:40:54 +05:30
Siddharth Suresh	b8ed7b9af9	fix tests and remove custom log	2022-12-08 13:28:23 +05:30
Siddharth Suresh	9c78c5f3c7	implement suggessions	2022-12-08 13:13:46 +05:30
Siddharth Suresh	fbd9b98d9f	Merge branch 'main' into port-subtemplate	2022-12-08 12:13:38 +05:30
Siddharth Suresh	b721bda375	Merge branch 'main' into port-subtemplate	2022-11-26 17:33:49 +05:30
Siddharth Suresh	4918acdf59	update to latest changes	2022-11-23 23:15:48 +05:30
Siddharth Suresh	842934cf15	Merge branch 'main' into port-subtemplate	2022-11-23 16:23:40 +05:30
Siddharth Suresh	01bf82a605	Merge branch 'main' into port-subtemplate	2022-11-09 13:09:55 +05:30
Siddharth Suresh	2e8d899f81	Update apps/toolkit-app/app/blitz-server.ts	2022-11-09 13:08:41 +05:30
Siddharth Suresh	92a1b59118	Merge branch 'main' into port-subtemplate	2022-10-31 10:48:22 +05:30
Siddharth Suresh	fbd8585a3e	Merge branch 'main' into port-subtemplate	2022-10-28 10:45:20 +05:30
Siddharth Suresh	646b92a439	Merge branch 'main' into port-subtemplate	2022-10-20 15:14:21 +05:30
Siddharth Suresh	a17ea51595	Merge branch 'main' into port-subtemplate	2022-10-18 15:28:20 +05:30
Siddharth Suresh	3ac434b265	Merge branch 'main' into port-subtemplate	2022-10-17 13:14:38 +05:30
Siddharth Suresh	b3782a21b4	fix default bug for string values in #2863	2022-10-16 12:55:20 +05:30
Siddharth Suresh	c36cfb7d09	fix lock file and add react-final-form select component	2022-10-14 23:22:06 +05:30
Siddharth Suresh	b502c45d74	Merge branch 'main' into port-subtemplate	2022-10-13 11:35:28 +05:30
Siddharth Suresh	f6f5468151	Update blitz-server.ts	2022-10-12 23:36:51 +05:30
Siddharth Suresh	97b64699a3	update tests	2022-10-12 23:30:01 +05:30
Siddharth Suresh	bd9bd166ca	update prop type to options for --parent or belongsTo option and add LabelSelectField	2022-10-12 23:19:29 +05:30
Siddharth Suresh	f8fffc122f	fix duplicate	2022-10-12 22:08:06 +05:30
Siddharth Suresh	11c4ff3272	Merge branch 'main' into port-subtemplate	2022-10-12 22:01:50 +05:30
Siddharth Suresh	b3953c445f	Update getUsers.ts	2022-10-06 19:08:04 +05:30
Siddharth Suresh	2e7cb3a062	fix type	2022-10-06 11:10:05 +05:30
Siddharth Suresh	d6b760bb06	fix --parent flag	2022-10-05 23:13:26 +05:30
Siddharth Suresh	aef3bb2efc	cleanup	2022-10-05 22:53:55 +05:30
Siddharth Suresh	bf4f2b9214	initial commit adding dropdown option when using belongTo and parent flag	2022-10-05 22:45:34 +05:30
Siddharth Suresh	e49f138e1d	Merge branch 'main' into port-subtemplate	2022-10-04 16:03:00 +05:30
Siddharth Suresh	caac3522ec	Merge branch 'main' into port-subtemplate	2022-10-04 14:15:28 +05:30
Siddharth Suresh	56b8656826	generic prisma to work on subsequent runs	2022-10-04 00:48:39 +05:30
Siddharth Suresh	2674f5dcfb	update tests	2022-10-04 00:29:07 +05:30
Siddharth Suresh	e3524b8279	make prisma import generic	2022-10-04 00:12:25 +05:30
Siddharth Suresh	49b5339e4c	Merge branch 'main' into port-subtemplate	2022-10-03 23:40:34 +05:30
Siddharth Suresh	93e4c29d8a	Merge branch 'main' into port-subtemplate	2022-10-03 22:27:01 +05:30
Siddharth Suresh	af3dd373a8	cleanup	2022-10-03 20:43:19 +05:30
Siddharth Suresh	08d0d1e0ca	show error when structure of codegen is incorrect using zod	2022-10-03 20:39:36 +05:30
Siddharth Suresh	d7e88dece5	use latest blitz logging setup in generator	2022-10-03 19:13:50 +05:30
Siddharth Suresh	4671586454	fix pnpm-lock	2022-10-03 19:01:51 +05:30
Siddharth Suresh	0fb4439fc5	Merge branch 'main' into port-subtemplate	2022-10-03 18:56:30 +05:30
Siddharth Suresh	900c19159e	fix belongsTo not working	2022-10-03 18:55:29 +05:30
Siddharth Suresh	6a07489043	add types for codegen	2022-10-03 18:42:06 +05:30
Siddharth Suresh	4459fbfe4d	Update .changeset/silly-peas-work.md	2022-10-03 18:13:31 +05:30
Siddharth Suresh	8d5fa13cb2	Create silly-peas-work.md	2022-10-03 18:09:20 +05:30
Siddharth Suresh	13de89321c	Merge branch 'main' into port-subtemplate	2022-10-03 18:07:49 +05:30
Siddharth Suresh	85ef684e31	cleanup	2022-10-03 18:06:32 +05:30
Siddharth Suresh	948acafe6a	fix parent generation in createMutation and components, and move existing pages when --parent is called	2022-10-03 18:03:20 +05:30
Siddharth Suresh	27dcfd81e1	cleanup	2022-10-02 15:49:56 +05:30
Siddharth Suresh	20d17b7561	fix blitz genrate not updating values	2022-10-02 11:33:00 +05:30
Siddharth Suresh	4afa6b5b1b	make db import generic	2022-10-01 13:54:58 +05:30
Siddharth Suresh	0effae154d	remove comments	2022-10-01 00:09:37 +05:30
Siddharth Suresh	aaa0b67861	add unit tests	2022-09-30 23:22:10 +05:30
Siddharth Suresh	ed54550c46	fix unit tests	2022-09-30 23:04:05 +05:30
Siddharth Suresh	ff52627cbb	read custom template values from blitz-server	2022-09-30 22:38:39 +05:30
Siddharth Suresh	fe9a423862	initial port	2022-09-30 20:34:01 +05:30