Version Packages (beta) (#4055)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Siddharth Suresh <siddh.suresh@gmail.com>

.all-contributorsrc

@@ -2941,7 +2941,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/230500?v=4",
       "profile": "https://github.com/bravo-kernel",
       "contributions": [
-        "code"
+        "code",
+        "doc"
       ]
     },
     {
@@ -3775,6 +3776,67 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "a11rew",
+      "name": "Andrew Glago",
+      "avatar_url": "https://avatars.githubusercontent.com/u/87580113?v=4",
+      "profile": "a11rew.dev",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "tordans",
+      "name": "Tobias",
+      "avatar_url": "https://avatars.githubusercontent.com/u/111561?v=4",
+      "profile": "http://tobiasjordans.de",
+      "contributions": [
+        "code",
+        "doc",
+        "test"
+      ]
+    },
+    {
+      "login": "iagormoraes",
+      "name": "Iagor Moraes",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13892132?v=4",
+      "profile": "https://www.linkedin.com/in/iagor-moraes/",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "Trancever",
+      "name": "Dawid Urbaniak",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18584155?v=4",
+      "profile": "https://twitter.com/trensik",
+      "contributions": [
+        "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,

.changeset/big-boats-lay.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Guard `blitz g` input via an allow-list of characters; throw if unwanted characters are found. Prevents to break the blitz command by accident (https://github.com/blitz-js/blitz/issues/4021).

.changeset/chilly-candles-care.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Remove husky prepush hook & update precommit hook to only run prettier

.changeset/clean-hounds-laugh.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": minor
+---
+
+change rpc route basepath to be one folder higher when using includeRPC in monorepos

.changeset/dull-rings-arrive.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": patch
+---
+
+Fixes adding authError query param in Passport adapter.

.changeset/fluffy-coats-flow.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+
+Fix suspense error codegen patch for nextjs versions 13-13.0.6

.changeset/giant-timers-search.md

@@ -0,0 +1,5 @@
+---
+"toolkit-app": patch
+---
+
+Update zod to 3.20.2 (was 3.19.1).

.changeset/lemon-teachers-jam.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Use `src` instead of `app` folder for `blitz generate custom-template`

.changeset/perfect-baboons-relate.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Remove useEffect from reset password templates.

.changeset/plenty-kiwis-greet.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/rpc": patch
+---
+
+Updates internal functions and tests to support blitz apps that run tests with vitest

.changeset/pre.json

@@ -51,6 +51,7 @@
   "changesets": [
     "afraid-dancers-juggle",
     "afraid-ears-repair",
+    "big-boats-lay",
     "big-phones-bow",
     "blue-flowers-peel",
     "blue-pigs-tan",
@@ -67,8 +68,10 @@
     "calm-papayas-protect",
     "calm-tomatoes-drive",
     "chilled-carrots-own",
+    "chilly-candles-care",
     "chilly-nails-nail",
     "clean-hats-pump",
+    "clean-hounds-laugh",
     "clean-walls-wink",
     "clever-radios-lie",
     "cool-doors-invent",
@@ -81,6 +84,7 @@
     "cyan-cars-greet",
     "dirty-monkeys-greet",
     "dirty-planets-chew",
+    "dull-rings-arrive",
     "early-lamps-itch",
     "eighty-apes-sleep",
     "eleven-humans-sort",
@@ -99,6 +103,7 @@
     "few-hounds-worry",
     "few-shrimps-leave",
     "flat-bees-approve",
+    "fluffy-coats-flow",
     "fluffy-mangos-begin",
     "fluffy-mice-wash",
     "forty-timers-rhyme",
@@ -113,6 +118,7 @@
     "gentle-lions-explode",
     "giant-mails-tap",
     "giant-students-carry",
+    "giant-timers-search",
     "gold-horses-punch",
     "good-apes-drum",
     "good-insects-wink",
@@ -150,6 +156,7 @@
     "lemon-games-press",
     "lemon-pillows-switch",
     "lemon-seas-push",
+    "lemon-teachers-jam",
     "light-donkeys-double",
     "light-squids-draw",
     "little-pears-ring",
@@ -189,9 +196,11 @@
     "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",
@@ -200,6 +209,7 @@
     "popular-teachers-pay",
     "pretty-games-march",
     "purple-donkeys-smash",
+    "purple-jars-begin",
     "purple-singers-greet",
     "quick-cycles-confess",
     "quick-dots-fetch",
@@ -237,6 +247,7 @@
     "smooth-stingrays-drum",
     "smooth-tools-train",
     "soft-adults-smell",
+    "soft-fans-carry",
     "sour-lemons-hunt",
     "sour-mails-lick",
     "spicy-beds-float",
@@ -248,25 +259,33 @@
     "stale-parents-yawn",
     "strong-apes-reply",
     "strong-keys-lie",
+    "stupid-rabbits-jump",
     "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",
+    "three-toes-sell",
     "tidy-clouds-smoke",
     "tidy-llamas-compare",
     "tough-toes-pull",
+    "tricky-kids-press",
     "twelve-hornets-sip",
     "twelve-lemons-smile",
     "twelve-needles-worry",

.changeset/purple-jars-begin.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Fix missing MockRouter prop in test utils

.changeset/soft-fans-carry.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": minor
+---
+
+fix failed localStorage access to not crash the application

.changeset/stupid-rabbits-jump.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Support full api of tanstack invalidateQueries

.changeset/swift-glasses-laugh.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Update all links to follow Next 13 format without a child anchor tag.

.changeset/swift-poets-travel.md

@@ -0,0 +1,5 @@
+---
+"blitz": minor
+---
+
+add `currentPassword` to the default fields that are masked in the logger

.changeset/tasty-squids-sin.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add missing Layout.tsx for generated mimimalapp

.changeset/thick-moons-fry.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"blitz": patch
+---
+
+Add an href property to the generated route manifest that will return a string of the pathname and included query params.

.changeset/thick-peas-jog.md

@@ -0,0 +1,7 @@
+---
+"@blitzjs/auth": major
+---
+
+BREAKING CHANGE: secure-password is now an `optional peerDependency`, if you are using `SecurePassword` api, you need to now install `secure-password` in your application.
+
+This helps users who do not use SecurePassword from having native package build issues.

.changeset/three-toes-sell.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+add regex to support inline and non-inline codebase and proper next.js package version check

.changeset/tricky-kids-press.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": minor
+---
+
+Redesign the index page for newly generated blitz projects

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
-* @dillonraphael
+* @flybayer
 
-packages/generator/templates**/* @flybayer
+# packages/generator/templates**/* @flybayer

.github/workflows/main.yml

@@ -7,6 +7,9 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
+  
+env: 
+  PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
 
 jobs:
   lint:
@@ -140,8 +143,7 @@ jobs:
 
       - name: Install playwright
         run: |
-          npm i -g playwright
-          PLAYWRIGHT_BROWSERS_PATH=$HOME/pw-browsers npx playwright install
+            pnpx playwright@1.28.0 install --with-deps
         shell: bash
 
       - name: Build

.github/workflows/pr-release.yml

@@ -0,0 +1,102 @@
+# https://github.com/withastro/astro/blob/main/.github/workflows/snapshot-release.yml
+
+name: Create a Snapshot Release
+
+on:
+  issue_comment:
+    types: [created]
+
+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') }}
+    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"
+        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
+        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
+        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`
+        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 }}
+        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```',
+            })
+  

.kodiak.toml

@@ -0,0 +1,5 @@
+# .kodiak.toml
+# Minimal config. version is the only required field.
+version = 1
+merge.automerge_label = "0 - <(^_^)> -  merge it! ✌️"
+approve.auto_approve_usernames = ["flybayer", "depfu"]

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-399-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-405-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">
@@ -620,7 +620,7 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
   <tr>
     <td align="center"><a href="https://muyiwa.me"><img src="https://avatars.githubusercontent.com/u/6832244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Muyiwa Olu</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=muyiwaolu" title="Code">💻</a></td>
     <td align="center"><a href="http://2hr.me/"><img src="https://avatars.githubusercontent.com/u/4346154?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rabbi Hossain</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=rabbihossain" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/bravo-kernel"><img src="https://avatars.githubusercontent.com/u/230500?v=4?s=100" width="100px;" alt=""/><br /><sub><b>bravo-kernel</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=bravo-kernel" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/bravo-kernel"><img src="https://avatars.githubusercontent.com/u/230500?v=4?s=100" width="100px;" alt=""/><br /><sub><b>bravo-kernel</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=bravo-kernel" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=bravo-kernel" title="Documentation">📖</a></td>
     <td align="center"><a href="https://samholmes.net"><img src="https://avatars.githubusercontent.com/u/8385528?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Holmes</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=sam3d" title="Code">💻</a></td>
     <td align="center"><a href="https://doncicuto.medium.com"><img src="https://avatars.githubusercontent.com/u/30386061?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Miguel Cabrerizo</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=doncicuto" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=doncicuto" title="Documentation">📖</a></td>
     <td align="center"><a href="http://zackhobson.com/"><img src="https://avatars.githubusercontent.com/u/12092?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zack Hobson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=zenhob" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=zenhob" title="Documentation">📖</a></td>
@@ -734,6 +734,14 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <td align="center"><a href="https://github.com/selcukfatihsevinc"><img src="https://avatars.githubusercontent.com/u/384836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Selçuk Fatih Sevinç</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=selcukfatihsevinc" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=selcukfatihsevinc" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/usamaster"><img src="https://avatars.githubusercontent.com/u/5255330?v=4?s=100" width="100px;" alt=""/><br /><sub><b>usamaster</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=usamaster" title="Documentation">📖</a></td>
   </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="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>
 
 <!-- markdownlint-restore -->

apps/toolkit-app-passportjs/README.md

@@ -67,7 +67,7 @@ Here is the starting structure of your app.
 
 ```
 __name__
-├── app/
+├── src/
 │   ├── api/
 │   ├── auth/
 │   │   ├── components/
@@ -131,7 +131,7 @@ __name__
 
 These files are:
 
-- The `app/` folder is a container for most of your project. This is where you’ll put any pages or API routes.
+- The `src/` folder is a container for most of your project. This is where you’ll put any pages or API routes.
 
 - `db/` is where your database configuration goes. If you’re writing models or checking migrations, this is where to go.
 

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.20",
+    "blitz": "workspace:2.0.0-beta.23",
     "next": "12.2.5",
     "openid-client": "5.2.1",
     "prisma": "4.6.0",
@@ -38,7 +38,7 @@
     "react-dom": "18.2.0",
     "react-hook-form": "7.39.1",
     "ts-node": "10.9.1",
-    "zod": "3.19.1"
+    "zod": "3.20.2"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",

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()} passHref>
-            <a>Forgot your password?</a>
+          <Link href={Routes.ForgotPasswordPage()}>
+            Forgot your password?
           </Link>
         </div>
       </Form>
 
       <div style={{ marginTop: "1rem" }}>
         Or{" "}
-        <Link href={Routes.SignupPage()} passHref>
-          <a>Sign Up</a>
+        <Link href={Routes.SignupPage()}>
+          Sign Up
         </Link>
       </div>
     </div>

apps/toolkit-app-passportjs/src/pages/index.tsx

@@ -38,15 +38,11 @@ const UserInfo = () => {
   } else {
     return (
       <>
-        <Link href={Routes.SignupPage()} passHref>
-          <a className="button small">
-            <strong>Sign Up</strong>
-          </a>
+        <Link href={Routes.SignupPage()}className="button small">
+          <strong>Sign Up</strong>
         </Link>
-        <Link href={Routes.LoginPage()} passHref>
-          <a className="button small">
-            <strong>Login</strong>
-          </a>
+        <Link href={Routes.LoginPage()} className="button small">
+          <strong>Login</strong>
         </Link>
       </>
     )
@@ -90,10 +86,7 @@ const Home: BlitzPage = () => {
               <code>blitz dev</code>
             </pre>
             <p>
-              and go to{" "}
-              <Link href="/projects">
-                <a>/projects</a>
-              </Link>
+              and go to <Link href="/projects">/projects</Link>
             </p>
           </div>
           <div className="buttons" style={{ marginTop: "5rem" }}>

apps/toolkit-app/README.md

@@ -67,7 +67,7 @@ Here is the starting structure of your app.
 
 ```
 __name__
-├── app/
+├── src/
 │   ├── api/
 │   ├── auth/
 │   │   ├── components/
@@ -122,7 +122,7 @@ __name__
 ├── .eslintrc.js
 ├── babel.config.js
 ├── blitz.config.ts
-├── jest.config.ts
+├── vitest.config.ts
 ├── package.json
 ├── README.md
 ├── tsconfig.json
@@ -131,7 +131,7 @@ __name__
 
 These files are:
 
-- The `app/` folder is a container for most of your project. This is where you’ll put any pages or API routes.
+- The `src/` folder is a container for most of your project. This is where you’ll put any pages or API routes.
 
 - `db/` is where your database configuration goes. If you’re writing models or checking migrations, this is where to go.
 
@@ -149,7 +149,7 @@ These files are:
 
 - `blitz.config.ts` is for advanced custom configuration of Blitz. [Here you can learn how to use it](https://blitzjs.com/docs/blitz-config).
 
-- `jest.config.js` contains config for Jest tests. You can [customize it if needed](https://jestjs.io/docs/en/configuration).
+- `vitest.config.ts` contains config for Vitest tests. You can [customize it if needed](https://vitejs.dev/config/).
 
 You can read more about it in the [File Structure](https://blitzjs.com/docs/file-structure) section of the documentation.
 

apps/toolkit-app/package.json

@@ -31,14 +31,14 @@
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.20",
+    "blitz": "workspace:2.0.0-beta.23",
     "next": "12.2.5",
     "prisma": "4.6.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-hook-form": "7.39.1",
     "ts-node": "10.9.1",
-    "zod": "3.19.1"
+    "zod": "3.20.2"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",

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()} passHref>
-            <a>Forgot your password?</a>
+          <Link href={Routes.ForgotPasswordPage()}>
+            Forgot your password?
           </Link>
         </div>
       </Form>
 
       <div style={{ marginTop: "1rem" }}>
         Or{" "}
-        <Link href={Routes.SignupPage()} passHref>
-          <a>Sign Up</a>
+        <Link href={Routes.SignupPage()}>
+          Sign Up
         </Link>
       </div>
     </div>

apps/toolkit-app/src/auth/components/SignupForm.tsx

@@ -24,7 +24,7 @@ export const SignupForm = (props: SignupFormProps) => {
             props.onSuccess?.()
           } catch (error: any) {
             if (error.code === "P2002" && error.meta?.target?.includes("email")) {
-              // This error comes from Prisma
+              // Error "P2002" comes from Prisma (https://www.prisma.io/docs/reference/api-reference/error-reference#p2002)
               return { email: "This email is already being used" }
             } else {
               return { [FORM_ERROR]: error.toString() }

apps/toolkit-app/src/blitz-server.ts

@@ -19,5 +19,5 @@ const { gSSP, gSP, api } = setupBlitzServer({
 export { gSSP, gSP, api }
 
 export const cliConfig: BlitzCliConfig = {
-  customTemplates: "app/templates",
+  customTemplates: "src/templates",
 }

apps/toolkit-app/src/pages/_app.tsx

@@ -1,6 +1,6 @@
 import { ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps } from "@blitzjs/next"
 import { AuthenticationError, AuthorizationError } from "blitz"
-import React from "react"
+import "src/styles/globals.css"
 import { withBlitz } from "src/blitz-client"
 
 function RootErrorFallback({ error }: ErrorFallbackProps) {

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

@@ -10,14 +10,10 @@ 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>

apps/toolkit-app/src/pages/index.tsx

@@ -1,12 +1,11 @@
 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.
@@ -21,7 +20,7 @@ const UserInfo = () => {
     return (
       <>
         <button
-          className="button small"
+          className={styles.button}
           onClick={async () => {
             await logoutMutation()
           }}
@@ -38,15 +37,11 @@ const UserInfo = () => {
   } else {
     return (
       <>
-        <Link href={Routes.SignupPage()} passHref>
-          <a className="button small">
-            <strong>Sign Up</strong>
-          </a>
+        <Link href={Routes.SignupPage()} className={styles.button}>
+          <strong>Sign Up</strong>
         </Link>
-        <Link href={Routes.LoginPage()} passHref>
-          <a className="button small">
-            <strong>Login</strong>
-          </a>
+        <Link href={Routes.LoginPage()} className={styles.loginButton}>
+          <strong>Login</strong>
         </Link>
       </>
     )
@@ -56,216 +51,142 @@ const UserInfo = () => {
 const Home: BlitzPage = () => {
   return (
     <Layout title="Home">
-      <div className="container">
-        <main>
-          <div className="logo">
-            <Image src={`${logo.src}`} alt="blitzjs" width="256px" height="118px" layout="fixed" />
-          </div>
+      <div className={styles.globe} />
+
+      <div className={styles.container}>
+        <div className={styles.toastContainer}>
           <p>
             <strong>Congrats!</strong> Your app is ready, including user sign-up and log-in.
           </p>
-          <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 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>
         </main>
 
-        <footer>
+        <footer className={styles.footer}>
+          <span>Powered by</span>
           <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}
           >
-            Powered by Blitz.js
+            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>
   )

apps/toolkit-app/src/styles/Home.module.css

@@ -0,0 +1,304 @@
+.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;
+  }
+}

apps/toolkit-app/src/styles/globals.css

@@ -0,0 +1,25 @@
+: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;
+}

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 the default content from the page
+  // when you remove 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(/Documentation/i)
+  const linkElement = getByText(/Blitz Docs/i)
   expect(linkElement).toBeInTheDocument()
 })

integration-tests/auth-with-rpc/package.json

@@ -17,14 +17,14 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.20",
-    "@blitzjs/config": "workspace:2.0.0-beta.20",
-    "@blitzjs/next": "workspace:2.0.0-beta.20",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
+    "@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",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.20",
+    "blitz": "workspace:2.0.0-beta.23",
     "delay": "5.0.0",
     "next": "12.2.5",
     "prisma": "4.6.0",
@@ -32,7 +32,7 @@
     "react-dom": "18.2.0",
     "react-hook-form": "7.39.1",
     "ts-node": "10.9.1",
-    "zod": "3.19.1"
+    "zod": "3.20.2"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",

integration-tests/auth-with-rpc/src/blitz-server.ts

@@ -19,5 +19,5 @@ const {gSSP, gSP, api} = setupBlitzServer({
 export {gSSP, gSP, api}
 
 export const cliConfig: BlitzCliConfig = {
-  customTemplates: "app/templates",
+  customTemplates: "src/templates",
 }

integration-tests/auth/package.json

@@ -17,11 +17,11 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.20",
-    "@blitzjs/config": "workspace:2.0.0-beta.20",
-    "@blitzjs/next": "workspace:2.0.0-beta.20",
+    "@blitzjs/auth": "workspace:2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.23",
+    "@blitzjs/next": "workspace:2.0.0-beta.23",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.20",
+    "blitz": "workspace:2.0.0-beta.23",
     "lowdb": "3.0.0",
     "next": "12.2.5",
     "prisma": "4.6.0",

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

@@ -16,11 +16,11 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.20",
-    "@blitzjs/next": "workspace:2.0.0-beta.20",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
+    "@blitzjs/auth": "workspace:2.0.0-beta.23",
+    "@blitzjs/next": "workspace:2.0.0-beta.23",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.20",
+    "blitz": "workspace:2.0.0-beta.23",
     "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.20",
+    "@blitzjs/config": "workspace:2.0.0-beta.23",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

integration-tests/middleware/.env

@@ -1,2 +1,3 @@
 SESSION_SECRET_KEY=hsdenhJfpLHrGjgdgg3jdF8g2bYD2PaQ
-HEADLESS=true
+HEADLESS=true
+VITE_BLITZ_TEST_ENVIRONMENT=true

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.20",
-    "@blitzjs/next": "workspace:2.0.0-beta.20",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
-    "blitz": "workspace:2.0.0-beta.20",
+    "@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",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0"

integration-tests/no-suspense/package.json

@@ -16,11 +16,11 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.20",
-    "@blitzjs/next": "workspace:2.0.0-beta.20",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
+    "@blitzjs/auth": "workspace:2.0.0-beta.23",
+    "@blitzjs/next": "workspace:2.0.0-beta.23",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.20",
+    "blitz": "workspace:2.0.0-beta.23",
     "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.20",
+    "@blitzjs/config": "workspace:2.0.0-beta.23",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

integration-tests/qm/.env

@@ -0,0 +1 @@
+VITE_BLITZ_TEST_ENVIRONMENT=true

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.20",
-    "@blitzjs/config": "workspace:2.0.0-beta.20",
-    "@blitzjs/next": "workspace:2.0.0-beta.20",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
+    "@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",
     "@prisma/client": "4.6.0",
     "@tanstack/react-query": "4.0.10",
-    "blitz": "workspace:2.0.0-beta.20",
+    "blitz": "workspace:2.0.0-beta.23",
     "next": "12.2.5",
     "prisma": "4.6.0",
     "react": "18.2.0",

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

@@ -16,10 +16,10 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/next": "workspace:2.0.0-beta.20",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
+    "@blitzjs/next": "workspace:2.0.0-beta.23",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.20",
+    "blitz": "workspace:2.0.0-beta.23",
     "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.20",
+    "@blitzjs/config": "workspace:2.0.0-beta.23",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

integration-tests/rpc-path-root/next.config.js

@@ -2,6 +2,6 @@ const {withBlitz} = require("@blitzjs/next")
 module.exports = withBlitz({
   blitz: {
     resolverPath: "root",
-    includeRPCFolders: ["../no-suspense/app"],
+    includeRPCFolders: ["../no-suspense"],
   },
 })

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.20",
-    "@blitzjs/next": "workspace:2.0.0-beta.20",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
-    "blitz": "workspace:2.0.0-beta.20",
+    "@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",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0"

integration-tests/rpc-path-root/test/index.test.js

@@ -49,11 +49,16 @@ function runTests(dev = false) {
     it(
       "monorepo query works",
       async () => {
-        const data = await fetchViaHTTP(appPort, "/api/rpc/queries/getNoSuspenseBasic", null, {
-          method: "POST",
-          headers: {"Content-Type": "application/json; charset=utf-8"},
-          body: JSON.stringify({params: {}}),
-        }).then((res) => res.ok && res.json())
+        const data = await fetchViaHTTP(
+          appPort,
+          "/api/rpc/no-suspense/app/queries/getNoSuspenseBasic",
+          null,
+          {
+            method: "POST",
+            headers: {"Content-Type": "application/json; charset=utf-8"},
+            body: JSON.stringify({params: {}}),
+          },
+        ).then((res) => res.ok && res.json())
 
         expect(data).toEqual({result: "basic-result", error: null, meta: {}})
       },

integration-tests/rpc/.env

@@ -0,0 +1 @@
+VITE_BLITZ_TEST_ENVIRONMENT=true

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.20",
-    "@blitzjs/next": "workspace:2.0.0-beta.20",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
-    "blitz": "workspace:2.0.0-beta.20",
+    "@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",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0"

integration-tests/trailing-slash/package.json

@@ -16,11 +16,11 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.20",
-    "@blitzjs/next": "workspace:2.0.0-beta.20",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.20",
+    "@blitzjs/auth": "workspace:2.0.0-beta.23",
+    "@blitzjs/next": "workspace:2.0.0-beta.23",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.23",
     "@prisma/client": "4.6.0",
-    "blitz": "workspace:2.0.0-beta.20",
+    "blitz": "workspace:2.0.0-beta.23",
     "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.20",
+    "@blitzjs/config": "workspace:2.0.0-beta.23",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

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": "pnpm build && changeset publish",
+    "release": "cp README.md packages/blitz && pnpm build && changeset publish",
     "publish-release": "changeset publish && git push --follow-tags"
   },
   "dependencies": {

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @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
+
+- 82e8b64f5: Fixes adding authError query param in Passport adapter.
+- Updated dependencies [d692b4c1d]
+- Updated dependencies [10f98c681]
+- Updated dependencies [d5b8faa86]
+  - blitz@2.0.0-beta.21
+
 ## 2.0.0-beta.20
 
 ### Minor Changes

packages/blitz-auth/README.md

@@ -0,0 +1,90 @@
+[![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}
+```

packages/blitz-auth/package.json

@@ -1,6 +1,11 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.23",
+  "homepage": "https://blitzjs.com/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/blitz-js/blitz.git"
+  },
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -34,15 +39,20 @@
     "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.20"
+    "blitz": "2.0.0-beta.23",
+    "secure-password": "4.0.0"
+  },
+  "peerDependenciesMeta": {
+    "secure-password": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.20",
+    "@blitzjs/config": "workspace:2.0.0-beta.23",
     "@testing-library/react": "13.4.0",
     "@testing-library/react-hooks": "8.0.1",
     "@types/cookie": "0.4.1",
@@ -50,9 +60,10 @@
     "@types/jsonwebtoken": "8.5.8",
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.20",
+    "blitz": "2.0.0-beta.23",
     "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"

packages/blitz-auth/src/client/index.tsx

@@ -90,7 +90,11 @@ class PublicDataStore {
 
   clear() {
     deleteCookie(COOKIE_PUBLIC_DATA_TOKEN())
-    localStorage.removeItem(LOCALSTORAGE_PUBLIC_DATA_TOKEN())
+    try {
+      localStorage.removeItem(LOCALSTORAGE_PUBLIC_DATA_TOKEN())
+    } catch (err) {
+      console.error("LocalStorage is not available", err)
+    }
     this.updateState(emptyPublicData)
   }
 
@@ -105,12 +109,17 @@ class PublicDataStore {
   }
 
   private getToken() {
-    const cookieValue = readCookie(COOKIE_PUBLIC_DATA_TOKEN())
-    if (cookieValue) {
-      localStorage.setItem(LOCALSTORAGE_PUBLIC_DATA_TOKEN(), cookieValue)
-      return cookieValue
-    } else {
-      return localStorage.getItem(LOCALSTORAGE_PUBLIC_DATA_TOKEN())
+    try {
+      const cookieValue = readCookie(COOKIE_PUBLIC_DATA_TOKEN())
+      if (cookieValue) {
+        localStorage.setItem(LOCALSTORAGE_PUBLIC_DATA_TOKEN(), cookieValue)
+        return cookieValue
+      } else {
+        return localStorage.getItem(LOCALSTORAGE_PUBLIC_DATA_TOKEN())
+      }
+    } catch (err) {
+      console.error("LocalStorage is not available", err)
+      return undefined
     }
   }
 }

packages/blitz-auth/src/server/auth-utils.ts

@@ -1,43 +1,8 @@
 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()
-    }
-  },
-}

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

@@ -2,3 +2,4 @@ export * from "./auth-sessions"
 export * from "./auth-utils"
 export * from "./auth-plugin"
 export * from "./passport-adapter"
+export * from "./secure-password"

packages/blitz-auth/src/server/passport-adapter.ts

@@ -172,8 +172,13 @@ export function passportAuth(config: BlitzPassportConfig): ApiHandler {
               if (error) {
                 console.error(`Login via ${strategyName} was unsuccessful.`)
                 console.error(error)
+
+                const authErrorQueryStringKey = redirectUrl.includes("?")
+                  ? "&authError="
+                  : "?authError="
                 redirectUrl +=
-                  "?authError=" + encodeURIComponent(truncateString(error.toString(), 100))
+                  authErrorQueryStringKey +
+                  encodeURIComponent(truncateString(error.toString(), 100))
                 res.setHeader("Location", redirectUrl)
                 res.statusCode = 302
                 res.end()

packages/blitz-auth/src/server/secure-password.test.ts

@@ -1,5 +1,5 @@
 import {expect, describe, it} from "vitest"
-import {SecurePassword} from "./auth-utils"
+import {SecurePassword} from "./secure-password"
 
 describe("SecurePassword", () => {
   describe("hash", () => {

packages/blitz-auth/src/server/secure-password.ts

@@ -0,0 +1,35 @@
+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()
+    }
+  },
+}

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @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
+
+- 10f98c681: Add an href property to the generated route manifest that will return a string of the pathname and included query params.
+- Updated dependencies [d692b4c1d]
+- Updated dependencies [0025856b9]
+- Updated dependencies [10f98c681]
+- Updated dependencies [d5b8faa86]
+  - @blitzjs/rpc@2.0.0-beta.21
+  - blitz@2.0.0-beta.21
+
 ## 2.0.0-beta.20
 
 ### Minor Changes

packages/blitz-next/README.md

@@ -0,0 +1,394 @@
+[![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>
+  )
+}
+```

packages/blitz-next/package.json

@@ -1,6 +1,11 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.23",
+  "homepage": "https://blitzjs.com/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/blitz-js/blitz.git"
+  },
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,7 +29,7 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-beta.20",
+    "@blitzjs/rpc": "2.0.0-beta.23",
     "@tanstack/react-query": "4.0.10",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
@@ -34,12 +39,12 @@
     "supports-color": "8.1.1"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-beta.20",
+    "blitz": "2.0.0-beta.23",
     "next": "*",
     "react": "*"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.20",
+    "@blitzjs/config": "workspace:2.0.0-beta.23",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.4.0",
@@ -49,7 +54,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.20",
+    "blitz": "2.0.0-beta.23",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "next": "12.2.5",

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

@@ -51,7 +51,7 @@ export type BlitzProviderProps = {
   hydrateOptions?: HydrateOptions
 }
 
-interface RouteUrlObject extends Pick<UrlObject, "pathname" | "query"> {
+interface RouteUrlObject extends Pick<UrlObject, "pathname" | "query" | "href"> {
   pathname: string
 }
 

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @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
+
+- d692b4c1d: Fix suspense error codegen patch for nextjs versions 13-13.0.6
+- 0025856b9: Support full api of tanstack invalidateQueries
+- Updated dependencies [d692b4c1d]
+- Updated dependencies [10f98c681]
+- Updated dependencies [d5b8faa86]
+  - blitz@2.0.0-beta.21
+
 ## 2.0.0-beta.20
 
 ### Minor Changes

packages/blitz-rpc/README.md

@@ -0,0 +1,61 @@
+[![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)

packages/blitz-rpc/package.json

@@ -1,6 +1,11 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.23",
+  "homepage": "https://blitzjs.com/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/blitz-js/blitz.git"
+  },
   "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",
@@ -30,24 +35,24 @@
     "supports-color": "8.1.1"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-beta.20",
+    "blitz": "2.0.0-beta.23",
     "next": "*",
     "react": "*"
   },
   "devDependencies": {
-    "@blitzjs/auth": "2.0.0-beta.20",
-    "@blitzjs/config": "workspace:2.0.0-beta.20",
+    "@blitzjs/auth": "2.0.0-beta.23",
+    "@blitzjs/config": "workspace:2.0.0-beta.23",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.20",
+    "blitz": "2.0.0-beta.23",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "^4.8.4",
     "unbuild": "0.7.6",
     "watch": "1.0.2",
-    "zod": "3.19.1"
+    "zod": "3.20.2"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1,7 +1,7 @@
-import {describe, expect, it} from "vitest"
+import {describe, expect, it, vi} from "vitest"
 import superJson from "superjson"
 
-import {getQueryKey, getQueryKeyFromUrlAndParams} from "./react-query-utils"
+import {getQueryKey, getQueryKeyFromUrlAndParams, validateQueryFn} from "./react-query-utils"
 import {RpcClient} from "./rpc"
 
 const API_ENDPOINT = "http://localhost:3000"
@@ -74,4 +74,65 @@ 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()
+    })
+  })
 })

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} from "blitz"
+import {isClient, isServer, AsyncFunc, isNotInUserTestEnvironment} from "blitz"
 import {ResolverType, RpcClient} from "./rpc"
 
 export type Resolver<TInput, TResult> = (input: TInput, ctx?: any) => Promise<TResult>
@@ -83,13 +83,6 @@ 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>,
 ) => {
@@ -164,23 +157,20 @@ export function getInfiniteQueryKey<TInput, TResult, T extends AsyncFunc>(
   return [...queryKey, "infinite"]
 }
 
-type InvalidateQueryTypeWithParams = <TInput, TResult, T extends AsyncFunc>(
-  resolver: T | Resolver<TInput, TResult> | RpcClient<TInput, TResult>,
-  ...params: [TInput]
-) => Promise<void>
-type InvalidateQueryTypeAllQueries = <TInput, TResult, T extends AsyncFunc>(
-  resolver: T | Resolver<TInput, TResult> | RpcClient<TInput, TResult>,
-) => Promise<void>
-type InvalidateQueryType = InvalidateQueryTypeWithParams & InvalidateQueryTypeAllQueries
+interface InvalidateQuery {
+  <TInput, TResult, T extends AsyncFunc>(
+    resolver: T | Resolver<TInput, TResult> | RpcClient<TInput, TResult>,
+    ...params: [TInput]
+  ): Promise<void>
+  <TInput, TResult, T extends AsyncFunc>(
+    resolver: T | Resolver<TInput, TResult> | RpcClient<TInput, TResult>,
+  ): Promise<void>
+  (): Promise<void>
+}
 
-export const invalidateQuery: InvalidateQueryType = (resolver, ...params: []) => {
-  if (typeof resolver === "undefined") {
-    throw new Error(
-      "invalidateQuery is missing the first argument - it must be a resolver function",
-    )
-  }
-
-  const fullQueryKey = getQueryKey(resolver, ...params)
+export const invalidateQuery: InvalidateQuery = (resolver = undefined, ...params: []) => {
+  const fullQueryKey =
+    typeof resolver === "undefined" ? undefined : getQueryKey(resolver, ...params)
   return getQueryClient().invalidateQueries(fullQueryKey)
 }
 

packages/blitz-rpc/src/data-client/react-query.tsx

@@ -29,6 +29,10 @@ type QueryNonLazyOptions =
   | {suspense: true; enabled: true}
   | {suspense?: never; enabled?: never}
 
+class NextError extends Error {
+  digest?: string
+}
+
 // -------------------------
 // useQuery
 // -------------------------
@@ -93,8 +97,11 @@ export function useQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    const e = new Error()
+    const e = new NextError()
     e.name = "Rendering Suspense fallback..."
+    e.digest = "DYNAMIC_SERVER_USAGE"
+    // Backwards compatibility for nextjs 13.0.7
+    e.message = "DYNAMIC_SERVER_USAGE"
     delete e.stack
     throw e
   }
@@ -173,8 +180,11 @@ export function usePaginatedQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    const e = new Error()
+    const e = new NextError()
     e.name = "Rendering Suspense fallback..."
+    e.digest = "DYNAMIC_SERVER_USAGE"
+    // Backwards compatibility for nextjs 13.0.7
+    e.message = "DYNAMIC_SERVER_USAGE"
     delete e.stack
     throw e
   }
@@ -265,8 +275,11 @@ export function useInfiniteQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    const e = new Error()
+    const e = new NextError()
     e.name = "Rendering Suspense fallback..."
+    e.digest = "DYNAMIC_SERVER_USAGE"
+    // Backwards compatibility for nextjs 13.0.7
+    e.message = "DYNAMIC_SERVER_USAGE"
     delete e.stack
     throw e
   }

packages/blitz-rpc/src/loader-utils.ts

@@ -68,7 +68,7 @@ export function convertPageFilePathToRoutePath({
   } else if (resolverBasePath === "root") {
     path = path.replace(normalize(appRoot), "")
     for (const extraPath of extraRpcBasePaths) {
-      path = path.replace(join(normalize(appRoot), extraPath.replace("/", sep)), "")
+      path = path.replace(join(normalize(appRoot), extraPath.replace("/", sep), ".."), "")
     }
   } else {
     path = path.replace(/^.*?[\\/]queries[\\/]/, "/").replace(/^.*?[\\/]mutations[\\/]/, "/")

packages/blitz/CHANGELOG.md

@@ -1,5 +1,39 @@
 # 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
+
+- d692b4c1d: Fix suspense error codegen patch for nextjs versions 13-13.0.6
+- 10f98c681: Add an href property to the generated route manifest that will return a string of the pathname and included query params.
+- d5b8faa86: add regex to support inline and non-inline codebase and proper next.js package version check
+- Updated dependencies [77b7da0f3]
+  - @blitzjs/generator@2.0.0-beta.21
+
 ## 2.0.0-beta.20
 
 ### Minor Changes

packages/blitz/package.json

@@ -1,6 +1,11 @@
 {
   "name": "blitz",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.23",
+  "homepage": "https://blitzjs.com/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/blitz-js/blitz.git"
+  },
   "scripts": {
     "build": "unbuild",
     "dev": "rm -rf dist && pnpm run predev && watch unbuild src --wait=0.2",
@@ -25,7 +30,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-beta.20",
+    "@blitzjs/generator": "2.0.0-beta.23",
     "@mrleebo/prisma-ast": "0.2.6",
     "@types/global-agent": "2.1.1",
     "arg": "5.0.1",
@@ -64,6 +69,7 @@
     "resolve-cwd": "3.0.0",
     "resolve-from": "5.0.0",
     "rimraf": "3.0.2",
+    "semver": "7.3.8",
     "superjson": "1.11.0",
     "supports-color": "8.1.1",
     "tar": "6.1.11",
@@ -73,7 +79,7 @@
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.20",
+    "@blitzjs/config": "workspace:2.0.0-beta.23",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",
@@ -97,7 +103,7 @@
     "typescript": "^4.8.4",
     "unbuild": "0.7.6",
     "watch": "1.0.2",
-    "zod": "3.19.1"
+    "zod": "3.20.2"
   },
   "publishConfig": {
     "access": "public"

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

@@ -52,7 +52,7 @@ const createCustomTemplates = async () => {
   const continuePrompt = await prompts({
     type: "confirm",
     name: "value",
-    message: `This will copy the default templates to your app/templates folder. Do you want to continue?`,
+    message: `This will copy the default templates to your src/templates folder. Do you want to continue?`,
   })
   if (!continuePrompt.value) {
     process.exit(0)
@@ -61,12 +61,12 @@ const createCustomTemplates = async () => {
     type: "text",
     name: "value",
     message: `Enter the path to save the custom templates folder`,
-    initial: "app/templates",
+    initial: "src/templates",
   })
   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 app/blitz-server file`)
+  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")

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

@@ -5,11 +5,12 @@ import {join} from "path"
 import fs from "fs-extra"
 import {getPackageJson} from "./get-package-json"
 import {runPrisma} from "../../utils/run-prisma"
+import semver from "semver"
 
 import resolveFrom from "resolve-from"
 export const codegenTasks = async () => {
   try {
-    /* 
+    /*
       Updates the user's nextjs file and adds onRecoverableError to the hydrateRoot 3rd parameter object.
       We can remove this when https://github.com/vercel/next.js/pull/38207 is merged into next.js
     */
@@ -18,21 +19,22 @@ export const codegenTasks = async () => {
     const readFile = await fs.readFile(nextClientIndex)
     const packageJson = await getPackageJson()
     const nextVersion = packageJson.dependencies.next
-    if (nextVersion && nextVersion.startsWith("12")) {
+
+    if (nextVersion && /^([~^])?12/.test(nextVersion)) {
       const updatedFile = readFile
         .toString()
         .replace(
           /ReactDOM\.hydrateRoot\(.*?\);/,
-          `ReactDOM.hydrateRoot(domEl, reactEl, {onRecoverableError: (err) => (err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : console.error(err)});`,
+          `ReactDOM.hydrateRoot(domEl, reactEl, {onRecoverableError: (err) => (err.toString().includes("DYNAMIC_SERVER_USAGE") || err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : console.error(err)});`,
         )
       await fs.writeFile(nextClientIndex, updatedFile)
       log.success("Next.js was successfully patched with a React Suspense fix")
-    } else if (nextVersion && nextVersion.startsWith("13")) {
+    } else if (nextVersion && semver.satisfies(nextVersion, "13 - 13.0.6")) {
       const updatedFile = readFile
         .toString()
         .replace(
           /_client.default\.hydrateRoot\(.*?\);/,
-          `_client.default.hydrateRoot(domEl, reactEl, {onRecoverableError: (err) => (err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : console.error(err)});`,
+          `_client.default.hydrateRoot(domEl, reactEl, {onRecoverableError: (err) => (err.toString().includes("DYNAMIC_SERVER_USAGE") || err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : console.error(err)});`,
         )
       await fs.writeFile(nextClientIndex, updatedFile)
       log.success("Next.js was successfully patched with a React Suspense fix")

packages/blitz/src/cli/utils/routes-manifest.ts

@@ -368,9 +368,32 @@ export function setupManifest(routes: Record<string, RouteManifestEntry>): {
   const routesWithoutDuplicates = dedupeBy(Object.entries(routes), ([_path, {name}]) => name)
 
   const implementationLines = routesWithoutDuplicates.map(
-    ([path, {name}]) => `${name}: (query) => ({ pathname: "${path}", query })`,
+    ([path, {name}]) => `${name}: (query) => ({ 
+      pathname: "${path}", 
+      query,
+      href: query
+      ? replaceSlugsWithValues(
+          "${path}",
+          Object.keys(query),
+          Object.values(query)
+        )
+      : "${path}",
+    })`,
   )
 
+  const implementationHelpers = [
+    `function replaceSlugsWithValues(str, slugs, values) {
+      let result = str;
+      slugs.forEach((slug, i) => {
+          const value = values[i];
+          if (value) {
+              result = result.replace('[' + slug + ']', String(value));
+          }
+      });
+      return result;
+    }`,
+  ]
+
   const declarationLines = routesWithoutDuplicates.map(
     ([_path, {name, parameters, multipleParameters}]) => {
       if (parameters.length === 0 && multipleParameters.length === 0) {
@@ -392,7 +415,11 @@ export function setupManifest(routes: Record<string, RouteManifestEntry>): {
 
   return {
     implementation:
-      "exports.Routes = {\n" + implementationLines.map((line) => "  " + line).join(",\n") + "\n}",
+      "exports.Routes = {\n" +
+      implementationLines.map((line) => "  " + line).join(",\n") +
+      "\n}" +
+      "\n" +
+      implementationHelpers.join("\n"),
     declaration: `
 import type { ParsedUrlQueryInput } from "querystring"
 import type { RouteUrlObject } from "blitz"

packages/blitz/src/errors.ts

@@ -1,5 +1,6 @@
 import _SuperJson from "superjson"
 import type {UrlObject} from "url"
+import {isNotInUserTestEnvironment} from "./utils"
 
 declare module globalThis {
   let _BLITZ_ERROR_CLASS_REGISTERED: boolean
@@ -9,7 +10,7 @@ const SuperJson: typeof _SuperJson =
   "default" in _SuperJson ? (_SuperJson as any).default : _SuperJson
 
 const errorProps = ["name", "message", "code", "statusCode", "meta", "url"]
-if (process.env.JEST_WORKER_ID === undefined) {
+if (isNotInUserTestEnvironment()) {
   SuperJson.allowErrorProps(...errorProps)
 }
 
@@ -75,7 +76,7 @@ export class PaginationArgumentError extends Error {
   }
 }
 
-if (process.env.JEST_WORKER_ID === undefined && !globalThis._BLITZ_ERROR_CLASS_REGISTERED) {
+if (isNotInUserTestEnvironment() && !globalThis._BLITZ_ERROR_CLASS_REGISTERED) {
   SuperJson.registerClass(AuthenticationError, {
     identifier: "BlitzAuthenticationError",
     allowProps: errorProps,

packages/blitz/src/installer/executors/run-command-executor.tsx

@@ -79,8 +79,8 @@ export async function executeCommand(input: CliCommand): Promise<void> {
     const cp = spawn(`${command[0]}`, command.slice(1), {
       stdio: ["inherit", "pipe", "pipe"],
     })
-    cp.on("exit", resolve);
-    cp.stdout.on('data', () => {});
+    cp.on("exit", resolve)
+    cp.stdout.on("data", () => {})
   })
 }
 

packages/blitz/src/logging.ts

@@ -41,7 +41,7 @@ export const BlitzLogger = (settings: BlitzLoggerSettings = {}) => {
       bigint: "blue",
       boolean: "blue",
     },
-    maskValuesOfKeys: ["password", "passwordConfirmation"],
+    maskValuesOfKeys: ["password", "passwordConfirmation", "currentPassword"],
     exposeErrorCodeFrame: process.env.NODE_ENV !== "production",
     ...settings,
   })

packages/blitz/src/types.ts

@@ -2,12 +2,13 @@ import {UrlObject} from "url"
 // Context for plugins to declaration merge stuff into
 export interface Ctx {}
 
-export interface AuthenticatedMiddlewareCtx {}
-
-export interface RouteUrlObject extends Pick<UrlObject, "pathname" | "query"> {
+export interface RouteUrlObject extends Pick<UrlObject, "pathname" | "query" | "href"> {
   pathname: string
+  href: string
 }
 
+export interface AuthenticatedMiddlewareCtx {}
+
 export type EventHooks = {
   onSessionCreated?: OnSessionCreated
   onRpcError?: OnRpcError
@@ -35,7 +36,13 @@ export type BlitzCliConfig = {
 }
 
 export const isRouteUrlObject = (x: any): x is RouteUrlObject => {
-  return typeof x === "object" && "pathname" in x && typeof x.pathname === "string"
+  return (
+    typeof x === "object" &&
+    "pathname" in x &&
+    typeof x.pathname === "string" &&
+    "href" in x &&
+    typeof x.href === "string"
+  )
 }
 
 export type AsyncFunc = (...args: any) => Promise<any>

packages/blitz/src/utils/enhance-prisma.ts

@@ -1,5 +1,6 @@
 import {spawn} from "cross-spawn"
 import which from "npm-which"
+import {isNotInUserTestEnvironment} from "../index-browser"
 
 export interface Constructor<T = unknown> {
   new (...args: never[]): T
@@ -19,7 +20,7 @@ export const enhancePrisma = <TPrismaClientCtor extends Constructor>(
 ): EnhancedPrismaClientConstructor<TPrismaClientCtor> => {
   return new Proxy(client as EnhancedPrismaClientConstructor<TPrismaClientCtor>, {
     construct(target, args) {
-      if (typeof window !== "undefined" && process.env.JEST_WORKER_ID === undefined) {
+      if (typeof window !== "undefined" && isNotInUserTestEnvironment()) {
         // Return object with $use method if in the browser
         // Skip in Jest tests because window is defined in Jest tests
         return {$use: () => {}}
@@ -40,7 +41,9 @@ export const enhancePrisma = <TPrismaClientCtor extends Constructor>(
             const process = spawn(prismaBin, ["migrate", "reset", "--force", "--skip-generate"], {
               stdio: "ignore",
             })
-            process.on("exit", (code) => (code === 0 ? res(0) : rej(new Error(`db.$reset() failed with code ${code}`))))
+            process.on("exit", (code) =>
+              code === 0 ? res(0) : rej(new Error(`db.$reset() failed with code ${code}`)),
+            )
           })
           globalThis._blitz_prismaClient.$disconnect()
         }

packages/blitz/src/utils/index.ts

@@ -143,3 +143,11 @@ 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
+}

packages/codemod/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @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
+
+- Updated dependencies [77b7da0f3]
+- Updated dependencies [d692b4c1d]
+- Updated dependencies [10f98c681]
+- Updated dependencies [d5b8faa86]
+  - @blitzjs/generator@2.0.0-beta.21
+  - blitz@2.0.0-beta.21
+
 ## 2.0.0-beta.20
 
 ### Patch Changes

packages/codemod/package.json

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

packages/config/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @blitzjs/config
 
+## 2.0.0-beta.23
+
+## 2.0.0-beta.22
+
+## 2.0.0-beta.21
+
 ## 2.0.0-beta.20
 
 ## 2.0.0-beta.19

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @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
+
+- 77b7da0f3: Remove husky prepush hook & update precommit hook to only run prettier
+
 ## 2.0.0-beta.20
 
 ### Patch Changes

packages/generator/README.md

@@ -1,4 +1,29 @@
-# `generator`
+[![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`
 
 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.
 
@@ -33,3 +58,5 @@ if (process.env.someValue === "some test") {
   console.log("dynamic condition")
 }
 ```
+
+<br>

packages/generator/package.json

@@ -1,6 +1,11 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.23",
+  "homepage": "https://blitzjs.com/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/blitz-js/blitz.git"
+  },
   "scripts": {
     "dev": "watch unbuild src --wait=0.2",
     "build": "unbuild && pnpm build:templates",
@@ -47,7 +52,7 @@
     "vinyl": "2.2.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.20",
+    "@blitzjs/config": "2.0.0-beta.23",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",

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

@@ -41,17 +41,9 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
 
   filesToIgnore() {
     if (!this.options.useTs) {
-      return [
-        "tsconfig.json",
-        "next-env.d.ts",
-        "jest.config.ts",
-        "package.ts.json",
-        "vitest-config.ts",
-        "pre-push-ts",
-        "types.ts",
-      ]
+      return ["tsconfig.json", "next-env.d.ts", "vitest-config.ts", "package.ts.json", "types.ts"]
     }
-    return ["jsconfig.json", "package.js.json", "vitest.config.js", "pre-push-js"]
+    return ["jsconfig.json", "package.js.json", "vitest.config.js"]
   }
 
   async getTemplateValues() {
@@ -70,10 +62,6 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
   async preCommit() {
     this.fs.move(this.destinationPath("gitignore"), this.destinationPath(".gitignore"))
     this.fs.move(this.destinationPath("npmrc"), this.destinationPath(".npmrc"))
-    this.fs.move(
-      this.destinationPath(this.options.useTs ? ".husky/pre-push-ts" : ".husky/pre-push-js"),
-      this.destinationPath(".husky/pre-push"),
-    )
     this.fs.move(
       this.destinationPath(this.options.useTs ? "package.ts.json" : "package.js.json"),
       this.destinationPath("package.json"),

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

@@ -2,11 +2,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"
 
 export interface ModelGeneratorOptions extends GeneratorOptions {
   modelName: string
@@ -59,9 +60,13 @@ export class ModelGenerator extends Generator<ModelGeneratorOptions> {
     const {modelName, extraArgs, dryRun} = this.options
     let updatedOrCreated = "created"
 
-    let fields = (
-      extraArgs.length === 1 && extraArgs[0]?.includes(" ") ? extraArgs[0]?.split(" ") : extraArgs
-    ).flatMap((input) => Field.parse(input, schema))
+    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)
 

packages/generator/src/prisma/field.ts

@@ -1,4 +1,5 @@
 import * as ast from "@mrleebo/prisma-ast"
+import {checkInputsOrRaise} from "../utils/checkInputOrRaise"
 import {capitalize, singlePascal, uncapitalize} from "../utils/inflector"
 
 export enum FieldType {
@@ -55,6 +56,8 @@ export class Field {
 
   // 'name:type?[]:attribute' => Field
   static parse(input: string, schema?: ast.Schema): Field[] {
+    checkInputsOrRaise(input)
+
     const [_fieldName, _fieldType = "String", _attribute] = input.split(":")
     let attribute = _attribute as string
     let fieldName = uncapitalize(_fieldName as string)
@@ -84,7 +87,7 @@ export class Field {
     }
     // use original unmodified field name in case the list handling code
     // has modified fieldName
-    if (isRelation(_fieldName as string)) {
+    if (typeof _fieldName === "string" && isRelation(_fieldName)) {
       // this field is an object type, not a scalar type
       const relationType = Relation[_fieldName]
       // translate the type into the name since they should stay in sync

packages/generator/src/utils/checkInputOrRaise.ts

@@ -0,0 +1,28 @@
+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: - _ : = ? [ ]",
+    )
+  }
+}