pnpmlock

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.changeset/big-phones-bow.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+add mounted check inside withBlitz

.changeset/breezy-cameras-double.md

@@ -0,0 +1,7 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+Fix codegen and postinstall to make work with pnpm

.changeset/config.json

@@ -7,5 +7,5 @@
   "access": "restricted",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": ["web", "test-*"]
+  "ignore": ["web", "test-*", "toolkit-app"]
 }

.changeset/cool-doors-invent.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Add invokeWithCtx function

.changeset/dirty-monkeys-greet.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Use alpha version for blitz dependency, fix package manager selection

.changeset/eleven-humans-sort.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/codemod": patch
+"@blitzjs/generator": patch
+---
+
+codemod fixes

.changeset/empty-berries-rule.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+fix app generator for pnpm unmet dependency

.changeset/fair-wombats-sneeze.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+added superjson

.changeset/famous-kings-explain.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+updated nextjs version in generator & npmrc file

.changeset/fast-trainers-kneel.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Export Zod utils from blitz core package

.changeset/flat-bees-approve.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+set default enviornment variable to development unless build and start command

.changeset/four-meals-fry.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+export BlitzPage & BlitzLayout types from @blitzjs/next

.changeset/great-months-train.md

@@ -0,0 +1,9 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/auth": patch
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+fix route manifest codegen

.changeset/healthy-rice-shout.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+detailed print env info

.changeset/hot-drinks-approve.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+Upgrade @types/react, fix typings inside @blitzjs/next

.changeset/lovely-colts-share.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+fix broken cli versioning

.changeset/modern-cameras-pull.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Support `prefetchBlitzQuery` in gSSP and gSP

.changeset/moody-squids-cheer.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+test automated publish

.changeset/nice-starfishes-live.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+add mounted check to app generator template

.changeset/olive-bees-buy.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Fix templates source in RPC codemod step

.changeset/olive-feet-rhyme.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Add codemod to upgrade from legacy framework to the Blitz Toolkit

.changeset/plenty-bottles-swim.md

@@ -0,0 +1,11 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+- Add mounted check to withBlitz
+- Upgrade @types/react, fix typings inside @blitzjs/next
+- Support prefetchBlitzQuery in gSP and gSSP
+- Add db seed cli command
+- Add try/catch to changePassword mutation

.changeset/poor-penguins-look.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+add `db seed` cli command

.changeset/poor-shrimps-think.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Setup SuperJson for GSSP and GSP

.changeset/pre.json

@@ -12,14 +12,60 @@
     "@blitzjs/rpc": "2.0.0-alpha.0",
     "@blitzjs/config": "0.0.0",
     "@blitzjs/generator": "2.0.0-alpha.0",
+    "@blitzjs/codemod": "2.0.0-alpha.0",
     "template": "0.0.0",
-    "toolkit-app": "1.0.0"
+    "toolkit-app": "1.0.0",
+    "test-qm": "0.0.0",
+    "test-no-suspense": "0.0.0",
+    "test-trailing-slash": "0.0.0"
   },
   "changesets": [
+    "big-phones-bow",
+    "breezy-cameras-double",
+    "cool-doors-invent",
+    "dirty-monkeys-greet",
+    "eleven-humans-sort",
+    "empty-berries-rule",
+    "fair-wombats-sneeze",
+    "famous-kings-explain",
+    "fast-trainers-kneel",
+    "flat-bees-approve",
+    "four-meals-fry",
+    "great-months-train",
+    "healthy-rice-shout",
+    "hot-drinks-approve",
+    "lovely-colts-share",
+    "modern-cameras-pull",
+    "moody-squids-cheer",
+    "nice-starfishes-live",
     "nine-onions-admire",
     "ninety-pets-heal",
+    "olive-bees-buy",
+    "olive-feet-rhyme",
+    "plenty-bottles-swim",
     "poor-peas-lick",
+    "poor-penguins-look",
+    "poor-shrimps-think",
+    "quiet-feet-travel",
+    "rich-chairs-invent",
+    "sharp-falcons-begin",
+    "shy-olives-hang",
+    "silent-colts-reply",
+    "small-socks-confess",
+    "stupid-walls-sell",
+    "swift-drinks-dress",
+    "tasty-news-collect",
     "ten-rivers-burn",
-    "twenty-beans-pump"
+    "tender-pianos-check",
+    "thick-parrots-float",
+    "thirty-countries-build",
+    "twenty-beans-pump",
+    "two-kiwis-help",
+    "unlucky-papayas-sleep",
+    "violet-bags-leave",
+    "violet-lions-help",
+    "weak-suns-shave",
+    "wicked-ghosts-cough",
+    "wise-frogs-give"
   ]
 }

.changeset/quiet-feet-travel.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+fix source path for templates

.changeset/rich-chairs-invent.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Rename prefetchBlitzQuery to prefetchQuery, add prefetchInfiniteQuery

.changeset/sharp-falcons-begin.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Use routes manifest in template app

.changeset/shy-olives-hang.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+Update RPC plugin setup in templates

.changeset/silent-colts-reply.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+added index.cjs to blitz externals

.changeset/small-socks-confess.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": patch
+---
+
+Add passport adapter to @blitzjs/auth

.changeset/stupid-walls-sell.md

@@ -0,0 +1,8 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+testing set dist-tag

.changeset/swift-drinks-dress.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Fix postinstall script not being found

.changeset/tasty-news-collect.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/codemod": patch
+---
+
+init codemod generator

.changeset/tender-pianos-check.md

@@ -0,0 +1,7 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+various improvements and fixes

.changeset/thick-parrots-float.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+allow extension catch in getAllFiles codemod util

.changeset/thirty-countries-build.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+add @blitzjs/generator as external

.changeset/two-kiwis-help.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+fix generate cli command

.changeset/unlucky-papayas-sleep.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+remove console logs inside onPostInstall in the new cli command

.changeset/violet-bags-leave.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Update templates directory for codemod

.changeset/violet-lions-help.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Add resolverBasePath to Blitz config to change the way rpc routes are generated

.changeset/weak-suns-shave.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Move blitz config to next.config.js

.changeset/wicked-ghosts-cough.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+fix template sourcepath because of new env variable

.changeset/wise-frogs-give.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+use latest tag for generator template on rpc & auth packages

.github/workflows/release.yml

@@ -0,0 +1,44 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js 16.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16.x
+
+      - name: Creating .npmrc
+        run: |
+          cat << EOF > "$HOME/.npmrc"
+            //registry.npmjs.org/:_authToken=$NPM_TOKEN
+          EOF
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Pre-publish
+        uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
+        with:
+          version: 6.32.6
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm build
+
+      - name: Create Release Pull Request
+        uses: changesets/action@v1
+        with:
+          publish: pnpm release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -62,6 +62,7 @@ examples/auth2
 .idea
 .ultra.cache.json
 db.sqlite-journal
+**/db/db.sqlite
 test/integration/**/db.json
 test/**/*/out
 test/**/blitz-env.d.ts

.npmrc

@@ -1,7 +1,9 @@
 save-exact=true
+strict-peer-dependencies=false
 
 public-hoist-pattern[]=secure-password
 public-hoist-pattern[]=*types*
 public-hoist-pattern[]=*eslint*
 public-hoist-pattern[]=@prettier/plugin-*
 public-hoist-pattern[]=*prettier-plugin-*
+strict-peer-dependencies=false

README.md

@@ -174,6 +174,7 @@ Your financial contributions help ensure Blitz continues to be developed and mai
   <tr>
     <td align="center"><a href="https://twitter.com/flybayer"><img src="https://avatars3.githubusercontent.com/u/8813276?v=4" width="100px;" alt=""/><br /><sub><b>Brandon Bayer</b></sub></a><br />Creator</td>
     <td align="center"><a href="http://aleksandra.codes"><img src="https://avatars.githubusercontent.com/u/9019397?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aleksandra Sikora</b></sub></a><br />Lead Maintainer</td>
+    <td align="center"><a href="http://twitter.com/dillonraphael"><img src="https://avatars.githubusercontent.com/u/3496193?v=4" width="100px;" alt=""/><br /><sub><b>Dillon Raphael</b></sub></a><br />Senior Maintainer</td>
 
   </tr>
 </table>

apps/toolkit-app/.eslintrc.js

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

apps/toolkit-app/CHANGELOG.md

@@ -1,5 +1,178 @@
 # toolkit-app
 
+## 1.0.1-alpha.16
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.21
+- @blitzjs/auth@2.0.0-alpha.21
+- @blitzjs/next@2.0.0-alpha.21
+- @blitzjs/rpc@2.0.0-alpha.21
+- @blitzjs/config@2.0.0-alpha.21
+
+## 1.0.1-alpha.15
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.20
+  - @blitzjs/auth@2.0.0-alpha.20
+  - @blitzjs/next@2.0.0-alpha.20
+  - @blitzjs/rpc@2.0.0-alpha.20
+  - @blitzjs/config@2.0.0-alpha.20
+
+## 1.0.1-alpha.14
+
+### Patch Changes
+
+- Updated dependencies
+- Updated dependencies [2150dcc3]
+  - @blitzjs/next@2.0.0-alpha.19
+  - blitz@2.0.0-alpha.19
+  - @blitzjs/auth@2.0.0-alpha.19
+  - @blitzjs/rpc@2.0.0-alpha.19
+  - @blitzjs/config@2.0.0-alpha.19
+
+## 1.0.1-alpha.13
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.18
+  - @blitzjs/auth@2.0.0-alpha.18
+  - @blitzjs/next@2.0.0-alpha.18
+  - @blitzjs/rpc@2.0.0-alpha.18
+  - @blitzjs/config@2.0.0-alpha.18
+
+## 1.0.1-alpha.12
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.17
+- @blitzjs/auth@2.0.0-alpha.17
+- @blitzjs/next@2.0.0-alpha.17
+- @blitzjs/rpc@2.0.0-alpha.17
+- @blitzjs/config@2.0.0-alpha.17
+
+## 1.0.1-alpha.11
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.16
+  - @blitzjs/auth@2.0.0-alpha.16
+  - @blitzjs/next@2.0.0-alpha.16
+  - @blitzjs/rpc@2.0.0-alpha.16
+  - @blitzjs/config@2.0.0-alpha.16
+
+## 1.0.1-alpha.10
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.15
+- @blitzjs/auth@2.0.0-alpha.15
+- @blitzjs/next@2.0.0-alpha.15
+- @blitzjs/rpc@2.0.0-alpha.15
+- @blitzjs/config@2.0.0-alpha.15
+
+## 1.0.1-alpha.9
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.14
+  - @blitzjs/auth@2.0.0-alpha.14
+  - @blitzjs/next@2.0.0-alpha.14
+  - @blitzjs/rpc@2.0.0-alpha.14
+  - @blitzjs/config@2.0.0-alpha.14
+
+## 1.0.1-alpha.8
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.13
+  - @blitzjs/next@2.0.0-alpha.13
+  - @blitzjs/auth@2.0.0-alpha.13
+  - @blitzjs/rpc@2.0.0-alpha.13
+  - @blitzjs/config@2.0.0-alpha.13
+
+## 1.0.1-alpha.7
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.12
+  - @blitzjs/auth@2.0.0-alpha.12
+  - @blitzjs/next@2.0.0-alpha.12
+  - @blitzjs/rpc@2.0.0-alpha.12
+  - @blitzjs/config@2.0.0-alpha.12
+
+## 1.0.1-alpha.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @blitzjs/next@2.0.0-alpha.11
+  - @blitzjs/auth@2.0.0-alpha.11
+  - @blitzjs/rpc@2.0.0-alpha.11
+  - @blitzjs/config@2.0.0-alpha.11
+  - blitz@2.0.0-alpha.11
+
+## 1.0.1-alpha.5
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.10
+- @blitzjs/auth@2.0.0-alpha.10
+- @blitzjs/next@2.0.0-alpha.10
+- @blitzjs/rpc@2.0.0-alpha.10
+- @blitzjs/config@2.0.0-alpha.10
+
+## 1.0.1-alpha.4
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.9
+  - @blitzjs/auth@2.0.0-alpha.9
+  - @blitzjs/next@2.0.0-alpha.9
+  - @blitzjs/rpc@2.0.0-alpha.9
+  - @blitzjs/config@2.0.0-alpha.9
+
+## 1.0.1-alpha.3
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.8
+  - @blitzjs/auth@2.0.0-alpha.8
+  - @blitzjs/next@2.0.0-alpha.8
+  - @blitzjs/rpc@2.0.0-alpha.8
+  - @blitzjs/config@2.0.0-alpha.8
+
+## 1.0.1-alpha.2
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.7
+  - @blitzjs/auth@2.0.0-alpha.7
+  - @blitzjs/next@2.0.0-alpha.7
+  - @blitzjs/rpc@2.0.0-alpha.7
+  - @blitzjs/config@2.0.0-alpha.7
+
+## 1.0.1-alpha.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @blitzjs/next@2.0.0-alpha.6
+  - blitz@2.0.0-alpha.6
+  - @blitzjs/auth@2.0.0-alpha.6
+  - @blitzjs/rpc@2.0.0-alpha.6
+  - @blitzjs/config@2.0.0-alpha.6
+
 ## 1.0.1-alpha.0
 
 ### Patch Changes

apps/toolkit-app/app/auth/components/LoginForm.tsx

@@ -5,6 +5,7 @@ import { Form, FORM_ERROR } from "app/core/components/Form"
 import login from "app/auth/mutations/login"
 import { Login } from "app/auth/validations"
 import { useMutation } from "@blitzjs/rpc"
+import { Routes } from "@blitzjs/next"
 
 type LoginFormProps = {
   onSuccess?: (user: PromiseReturnType<typeof login>) => void
@@ -39,7 +40,7 @@ export const LoginForm = (props: LoginFormProps) => {
         <LabeledTextField name="email" label="Email" placeholder="Email" />
         <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
         <div>
-          <Link href="/auth/forgot-password" passHref>
+          <Link href={Routes.ForgotPasswordPage()} passHref>
             <a>Forgot your password?</a>
           </Link>
         </div>
@@ -47,7 +48,7 @@ export const LoginForm = (props: LoginFormProps) => {
 
       <div style={{ marginTop: "1rem" }}>
         Or{" "}
-        <Link href="/auth/signup" passHref>
+        <Link href={Routes.SignupPage()} passHref>
           <a>Sign Up</a>
         </Link>
       </div>

apps/toolkit-app/app/auth/mutations/changePassword.ts

@@ -1,26 +1,25 @@
-import { NotFoundError, Ctx } from "blitz"
-import { prisma } from "db"
+import { NotFoundError } from "blitz"
+import { db } from "db"
 import { authenticateUser } from "./login"
 import { ChangePassword } from "../validations"
+import { resolver } from "@blitzjs/rpc"
 import { SecurePassword } from "@blitzjs/auth"
 
-export default async function changePassword(input, ctx: Ctx) {
-  ChangePassword.parse(input)
-  ctx.session.$isAuthorized()
+export default resolver.pipe(
+  resolver.zod(ChangePassword),
+  resolver.authorize(),
+  async ({ currentPassword, newPassword }, ctx) => {
+    const user = await db.user.findFirst({ where: { id: ctx.session.userId as number } })
+    if (!user) throw new NotFoundError()
 
-  const user = await prisma.user.findFirst({
-    where: {
-      id: ctx.session.userId as number,
-    },
-  })
+    await authenticateUser(user.email, currentPassword)
 
-  if (!user) throw new NotFoundError()
-  await authenticateUser(user.email, input.currentPassword)
+    const hashedPassword = await SecurePassword.hash(newPassword.trim())
+    await db.user.update({
+      where: { id: user.id },
+      data: { hashedPassword },
+    })
 
-  const hashedPassword = await SecurePassword.hash(input.newPassword.trim())
-
-  await prisma.user.update({
-    where: { id: user.id },
-    data: { hashedPassword },
-  })
-}
+    return true
+  }
+)

apps/toolkit-app/app/auth/mutations/forgotPassword.ts

@@ -1,15 +1,14 @@
-import { prisma } from "db"
 import { generateToken, hash256 } from "@blitzjs/auth"
+import { resolver } from "@blitzjs/rpc"
+import { db } from "db"
 import { forgotPasswordMailer } from "mailers/forgotPasswordMailer"
 import { ForgotPassword } from "../validations"
-import { Ctx } from "@blitzjs/next"
 
 const RESET_PASSWORD_TOKEN_EXPIRATION_IN_HOURS = 4
 
-export default async function forgotPassword(input, ctx: Ctx) {
-  ForgotPassword.parse(input)
+export default resolver.pipe(resolver.zod(ForgotPassword), async ({ email }) => {
   // 1. Get the user
-  const user = await prisma.user.findFirst({ where: { email: input.email.toLowerCase() } })
+  const user = await db.user.findFirst({ where: { email: email.toLowerCase() } })
 
   // 2. Generate the token and expiration date.
   const token = generateToken()
@@ -20,9 +19,9 @@ export default async function forgotPassword(input, ctx: Ctx) {
   // 3. If user with this email was found
   if (user) {
     // 4. Delete any existing password reset tokens
-    await prisma.token.deleteMany({ where: { type: "RESET_PASSWORD", userId: user.id } })
+    await db.token.deleteMany({ where: { type: "RESET_PASSWORD", userId: user.id } })
     // 5. Save this new token in the database.
-    await prisma.token.create({
+    await db.token.create({
       data: {
         user: { connect: { id: user.id } },
         type: "RESET_PASSWORD",
@@ -40,4 +39,4 @@ export default async function forgotPassword(input, ctx: Ctx) {
 
   // 8. Return the same result whether a password reset email was sent or not
   return
-}
+})

apps/toolkit-app/app/auth/mutations/login.ts

@@ -1,11 +1,13 @@
-import { AuthenticationError } from "blitz"
-import { prisma } from "db"
-import { Login } from "../validations"
 import { SecurePassword } from "@blitzjs/auth"
+import { resolver } from "@blitzjs/rpc"
+import { AuthenticationError } from "blitz"
+import { db } from "db"
+import { Role } from "types"
+import { Login } from "../validations"
 
 export const authenticateUser = async (rawEmail: string, rawPassword: string) => {
   const { email, password } = Login.parse({ email: rawEmail, password: rawPassword })
-  const user = await prisma.user.findFirst({ where: { email } })
+  const user = await db.user.findFirst({ where: { email } })
   if (!user) throw new AuthenticationError()
 
   const result = await SecurePassword.verify(user.hashedPassword, password)
@@ -13,16 +15,18 @@ export const authenticateUser = async (rawEmail: string, rawPassword: string) =>
   if (result === SecurePassword.VALID_NEEDS_REHASH) {
     // Upgrade hashed password with a more secure hash
     const improvedHash = await SecurePassword.hash(password)
-    await prisma.user.update({ where: { id: user.id }, data: { hashedPassword: improvedHash } })
+    await db.user.update({ where: { id: user.id }, data: { hashedPassword: improvedHash } })
   }
 
   const { hashedPassword, ...rest } = user
   return rest
 }
 
-export default async function login(input, ctx) {
-  const user = await authenticateUser(input.email, input.password)
-  await ctx.session.$create({ userId: user.id, role: user.role })
+export default resolver.pipe(resolver.zod(Login), async ({ email, password }, ctx) => {
+  // This throws an error if credentials are invalid
+  const user = await authenticateUser(email, password)
+
+  await ctx.session.$create({ userId: user.id, role: user.role as Role })
 
   return user
-}
+})

apps/toolkit-app/app/auth/mutations/resetPassword.ts

@@ -1,5 +1,5 @@
 import { SecurePassword, hash256 } from "@blitzjs/auth"
-import { prisma } from "db"
+import { db } from "db"
 import { ResetPassword } from "../validations"
 import login from "./login"
 
@@ -12,7 +12,7 @@ export default async function resetPassword(input, ctx) {
   ResetPassword.parse(input)
   // 1. Try to find this token in the database
   const hashedToken = hash256(input.token)
-  const possibleToken = await prisma.token.findFirst({
+  const possibleToken = await db.token.findFirst({
     where: { hashedToken, type: "RESET_PASSWORD" },
     include: { user: true },
   })
@@ -24,7 +24,7 @@ export default async function resetPassword(input, ctx) {
   const savedToken = possibleToken
 
   // 3. Delete token so it can't be used again
-  await prisma.token.delete({ where: { id: savedToken.id } })
+  await db.token.delete({ where: { id: savedToken.id } })
 
   // 4. If token has expired, error
   if (savedToken.expiresAt < new Date()) {
@@ -33,13 +33,13 @@ export default async function resetPassword(input, ctx) {
 
   // 5. Since token is valid, now we can update the user's password
   const hashedPassword = await SecurePassword.hash(input.password.trim())
-  const user = await prisma.user.update({
+  const user = await db.user.update({
     where: { id: savedToken.userId },
     data: { hashedPassword },
   })
 
   // 6. Revoke all existing login sessions for this user
-  await prisma.session.deleteMany({ where: { userId: user.id } })
+  await db.session.deleteMany({ where: { userId: user.id } })
 
   // 7. Now log the user in with the new credentials
   await login({ email: user.email, password: input.password }, ctx)

apps/toolkit-app/app/auth/mutations/signup.ts

@@ -1,4 +1,4 @@
-import { prisma } from "db"
+import { db } from "db"
 import { SecurePassword } from "@blitzjs/auth"
 
 export default async function signup(input, ctx) {
@@ -6,7 +6,7 @@ export default async function signup(input, ctx) {
 
   const hashedPassword = await SecurePassword.hash((input.password as string) || "test-password")
   const email = (input.email as string) || "test" + Math.random() + "@test.com"
-  const user = await prisma.user.create({
+  const user = await db.user.create({
     data: { email, hashedPassword, role: "user" },
     select: { id: true, name: true, email: true, role: true },
   })

apps/toolkit-app/app/blitz-client.ts

@@ -1,20 +1,12 @@
 import { AuthClientPlugin } from "@blitzjs/auth"
-import { setupClient } from "@blitzjs/next"
+import { setupBlitzClient } from "@blitzjs/next"
 import { BlitzRpcPlugin } from "@blitzjs/rpc"
 
-const { withBlitz } = setupClient({
+export const { withBlitz } = setupBlitzClient({
   plugins: [
     AuthClientPlugin({
       cookiePrefix: "web-cookie-prefix",
     }),
-    BlitzRpcPlugin({
-      reactQueryOptions: {
-        queries: {
-          staleTime: 7000,
-        },
-      },
-    }),
+    BlitzRpcPlugin({}),
   ],
 })
-
-export { withBlitz }

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

@@ -1,9 +1,9 @@
-import { setupBlitz } from "@blitzjs/next"
+import { setupBlitzServer } from "@blitzjs/next"
 import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
-import { prisma as db } from "../db/index"
+import { db } from "db"
 import { simpleRolesIsAuthorized } from "@blitzjs/auth"
 
-const { gSSP, gSP, api } = setupBlitz({
+const { gSSP, gSP, api } = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "web-cookie-prefix",

apps/toolkit-app/app/users/queries/getCurrentUser.ts

@@ -1,10 +1,10 @@
 import { Ctx } from "blitz"
-import { prisma } from "db"
+import { db } from "db"
 
 export default async function getCurrentUser(_ = null, { session }: Ctx) {
   if (!session.userId) return null
 
-  const user = await prisma.user.findFirst({
+  const user = await db.user.findFirst({
     where: { id: session.userId as number },
     select: { id: true, name: true, email: true, role: true },
   })

apps/toolkit-app/db/index.ts

@@ -4,5 +4,5 @@ import { PrismaClient } from "@prisma/client"
 const EnhancedPrisma = enhancePrisma(PrismaClient)
 
 export * from "@prisma/client"
-const prisma = new EnhancedPrisma()
-export { prisma }
+const db = new EnhancedPrisma()
+export { db }

apps/toolkit-app/db/migrations/20220427214932_/migration.sql

@@ -0,0 +1,47 @@
+-- CreateTable
+CREATE TABLE "User" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "name" TEXT,
+    "email" TEXT NOT NULL,
+    "hashedPassword" TEXT,
+    "role" TEXT NOT NULL DEFAULT 'USER'
+);
+
+-- CreateTable
+CREATE TABLE "Session" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "expiresAt" DATETIME,
+    "handle" TEXT NOT NULL,
+    "hashedSessionToken" TEXT,
+    "antiCSRFToken" TEXT,
+    "publicData" TEXT,
+    "privateData" TEXT,
+    "userId" INTEGER,
+    CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "Token" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "hashedToken" TEXT NOT NULL,
+    "type" TEXT NOT NULL,
+    "expiresAt" DATETIME NOT NULL,
+    "sentTo" TEXT NOT NULL,
+    "userId" INTEGER NOT NULL,
+    CONSTRAINT "Token_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Session_handle_key" ON "Session"("handle");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Token_hashedToken_type_key" ON "Token"("hashedToken", "type");

apps/toolkit-app/db/seeds.ts

@@ -1,4 +1,4 @@
-// import db from "./index"
+import { db } from "./index"
 
 /*
  * This seed function is executed when you run `blitz db seed`.
@@ -7,9 +7,15 @@
  * to easily generate realistic data.
  */
 const seed = async () => {
-  // for (let i = 0; i < 5; i++) {
-  //   await db.project.create({ data: { name: "Project " + i } })
-  // }
+  await db.$reset()
+
+  for (let i = 0; i < 1; i++) {
+    await db.user.create({
+      data: {
+        email: "test@test.com",
+      },
+    })
+  }
 }
 
 export default seed

apps/toolkit-app/package.json

@@ -1,9 +1,9 @@
 {
   "name": "toolkit-app",
-  "version": "1.0.1-alpha.0",
+  "version": "1.0.1-alpha.16",
   "scripts": {
     "start:dev": "pnpm run prisma:start && next dev",
-    "buildapp": "prisma generate && next build",
+    "buildapp": "NODE_ENV=production pnpm blitz codegen && pnpm prisma generate && next build",
     "start": "next start",
     "lint": "next lint",
     "prisma:start": "prisma generate && prisma migrate deploy",
@@ -29,8 +29,8 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.5",
-    "next": "12.1.1",
+    "blitz": "workspace:2.0.0-alpha.35",
+    "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
@@ -45,7 +45,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
     "@types/preview-email": "2.0.1",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "eslint": "7.32.0",
     "husky": "7.0.4",
     "jest": "27.5.1",

apps/toolkit-app/pages/_app.tsx

@@ -1,7 +1,6 @@
-import { ErrorFallbackProps, ErrorComponent, ErrorBoundary } from "@blitzjs/next"
+import { ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps } from "@blitzjs/next"
 import { AuthenticationError, AuthorizationError } from "blitz"
-import type { AppProps } from "next/app"
-import React, { Suspense } from "react"
+import React from "react"
 import { withBlitz } from "app/blitz-client"
 
 function RootErrorFallback({ error }: ErrorFallbackProps) {
@@ -27,9 +26,7 @@ function RootErrorFallback({ error }: ErrorFallbackProps) {
 function MyApp({ Component, pageProps }: AppProps) {
   return (
     <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      <Suspense fallback="Loading...">
-        <Component {...pageProps} />
-      </Suspense>
+      <Component {...pageProps} />
     </ErrorBoundary>
   )
 }

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

@@ -1,13 +1,14 @@
 import { useRouter } from "next/router"
 import Layout from "app/core/layouts/Layout"
 import { SignupForm } from "app/auth/components/SignupForm"
+import { Routes } from "@blitzjs/next"
 
 const SignupPage = () => {
   const router = useRouter()
 
   return (
     <Layout title="Sign Up">
-      <SignupForm onSuccess={() => router.push("/")} />
+      <SignupForm onSuccess={() => router.push(Routes.Home())} />
     </Layout>
   )
 }

apps/toolkit-app/pages/index.tsx

@@ -6,6 +6,7 @@ import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 import logout from "app/auth/mutations/logout"
 import logo from "public/logo.png"
 import { useMutation } from "@blitzjs/rpc"
+import { Routes } from "@blitzjs/next"
 
 /*
  * This file is just for a pleasant getting started page for your new app.
@@ -37,12 +38,12 @@ const UserInfo = () => {
   } else {
     return (
       <>
-        <Link href="/auth/signup" passHref>
+        <Link href={Routes.SignupPage()} passHref>
           <a className="button small">
             <strong>Sign Up</strong>
           </a>
         </Link>
-        <Link href="/auth/login" passHref>
+        <Link href={Routes.LoginPage()} passHref>
           <a className="button small">
             <strong>Login</strong>
           </a>

apps/toolkit-app/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "baseUrl": "./",
+    "baseUrl": ".",
     "allowJs": true,
     "skipLibCheck": true,
     "strict": false,
@@ -20,5 +20,5 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "exclude": ["node_modules", "**/*.e2e.ts", "cypress"],
-  "include": ["blitz-env.d.ts", "**/*.ts", "**/*.tsx"]
+  "include": ["blitz-env.d.ts", "**/*.ts", "**/*.tsx", "types"]
 }

apps/toolkit-app/types.ts

@@ -0,0 +1,15 @@
+import { SimpleRolesIsAuthorized } from "@blitzjs/auth"
+import { User } from "db"
+
+export type Role = "ADMIN" | "USER"
+
+declare module "@blitzjs/auth" {
+  export interface Session {
+    isAuthorized: SimpleRolesIsAuthorized<Role>
+    PublicData: {
+      userId: User["id"]
+      role: Role
+      views?: number
+    }
+  }
+}

apps/web/app/blitz-client.ts

@@ -1,8 +1,8 @@
 import {AuthClientPlugin} from "@blitzjs/auth"
-import {setupClient} from "@blitzjs/next"
+import {setupBlitzClient} from "@blitzjs/next"
 import {BlitzRpcPlugin} from "@blitzjs/rpc"
 
-const {withBlitz} = setupClient({
+const {withBlitz} = setupBlitzClient({
   plugins: [
     AuthClientPlugin({
       cookiePrefix: "webapp-cookie-prefix",

apps/web/app/blitz-server.ts

@@ -1,9 +1,9 @@
-import {setupBlitz} from "@blitzjs/next"
+import {setupBlitzServer} from "@blitzjs/next"
 import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
-import {prisma as db} from "../prisma/index"
+import db from "db"
 import {simpleRolesIsAuthorized} from "@blitzjs/auth"
 
-const {gSSP, gSP, api} = setupBlitz({
+const {gSSP, gSP, api} = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "webapp-cookie-prefix",

apps/web/app/mutations/createUser.ts

@@ -1,6 +1,5 @@
 import {Ctx} from "blitz"
-import {prisma} from "../../prisma"
-import {User} from "prisma"
+import db, {User} from "db"
 
 export default async function createUser(
   input: {name: string; email: string},
@@ -8,7 +7,7 @@ export default async function createUser(
 ): Promise<User> {
   ctx.session.$authorize()
 
-  const user = await prisma.user.create({data: {name: input.name, email: input.email}})
+  const user = await db.user.create({data: {name: input.name, email: input.email}})
 
   return user
 }

apps/web/app/queries/getInfiniteUsers.ts

@@ -0,0 +1,27 @@
+import {resolver} from "@blitzjs/rpc"
+import {paginate} from "blitz"
+import db, {Prisma} from "db"
+
+interface GetUsersInput
+  extends Pick<Prisma.UserFindManyArgs, "where" | "orderBy" | "skip" | "take"> {}
+
+export default resolver.pipe(async ({where, orderBy, skip = 0, take = 100}: GetUsersInput) => {
+  const {
+    items: users,
+    hasMore,
+    nextPage,
+    count,
+  } = await paginate({
+    skip,
+    take,
+    count: () => db.user.count({where}),
+    query: (paginateArgs) => db.user.findMany({...paginateArgs, where, orderBy}),
+  })
+
+  return {
+    users,
+    nextPage,
+    hasMore,
+    count,
+  }
+})

apps/web/app/queries/getUsers.ts

@@ -1,11 +1,10 @@
 import {Ctx} from "blitz"
-import {prisma} from "../../prisma"
-import {User} from "prisma"
+import db, {User} from "db"
 
 export default async function getUsers(_input: {}, ctx: Ctx): Promise<User[]> {
   ctx.session.$authorize()
 
-  const users = await prisma.user.findMany()
+  const users = await db.user.findMany()
 
   return users
 }

apps/web/app/queries/getUsersAuth.ts

@@ -0,0 +1,8 @@
+import {resolver} from "@blitzjs/rpc"
+import db from "db"
+
+export default resolver.pipe(resolver.authorize(), async () => {
+  const users = await db.user.findMany()
+
+  return users
+})

apps/web/db/index.ts

@@ -0,0 +1,8 @@
+import {enhancePrisma} from "blitz"
+import {PrismaClient} from "@prisma/client"
+
+const EnhancedPrisma = enhancePrisma(PrismaClient)
+
+export * from "@prisma/client"
+const prisma = new EnhancedPrisma()
+export default prisma

apps/web/next.config.js

@@ -6,5 +6,11 @@ const {withBlitz} = require("@blitzjs/next")
 module.exports = withBlitz(
   withBundleAnalyzer({
     reactStrictMode: true,
+    blitz: {
+      customServer: {
+        hotReload: false,
+      },
+      resolverBasePath: "root",
+    },
   }),
 )

apps/web/package.json

@@ -12,6 +12,9 @@
     "prisma:studio": "prisma studio",
     "test": "jest"
   },
+  "prisma": {
+    "schema": "./db/schema.prisma"
+  },
   "dependencies": {
     "@blitzjs/auth": "workspace:*",
     "@blitzjs/config": "workspace:*",
@@ -19,9 +22,12 @@
     "@blitzjs/rpc": "workspace:*",
     "@prisma/client": "3.9.0",
     "@types/jest": "27.4.1",
+    "@types/passport-twitter": "1.0.37",
     "blitz": "workspace:*",
     "jest": "27.5.1",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
+    "passport-mock-strategy": "2.0.0",
+    "passport-twitter": "1.0.4",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
@@ -29,7 +35,7 @@
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "eslint": "7.32.0",
     "typescript": "^4.5.3"
   }

apps/web/pages/_app.tsx

@@ -1,7 +1,6 @@
-import {ErrorFallbackProps, ErrorComponent, ErrorBoundary} from "@blitzjs/next"
+import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
-import type {AppProps} from "next/app"
-import React, {Suspense} from "react"
+import React from "react"
 import {withBlitz} from "app/blitz-client"
 
 function RootErrorFallback({error}: ErrorFallbackProps) {
@@ -27,9 +26,7 @@ function RootErrorFallback({error}: ErrorFallbackProps) {
 function MyApp({Component, pageProps}: AppProps) {
   return (
     <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      <Suspense fallback="Loading...">
-        <Component {...pageProps} />
-      </Suspense>
+      <Component {...pageProps} />
     </ErrorBoundary>
   )
 }

apps/web/pages/api/auth/[...auth].ts

@@ -0,0 +1,44 @@
+import {passportAuth} from "@blitzjs/auth"
+import {api} from "app/blitz-server"
+import db from "db"
+import {Strategy as TwitterStrategy} from "passport-twitter"
+
+export default api(
+  passportAuth({
+    successRedirectUrl: "/",
+    errorRedirectUrl: "/",
+    strategies: [
+      {
+        strategy: new TwitterStrategy(
+          {
+            consumerKey: process.env.TWITTER_CONSUMER_KEY as string,
+            consumerSecret: process.env.TWITTER_CONSUMER_SECRET as string,
+            accessTokenURL: "https://api.twitter.com/oauth/access_token",
+            callbackURL: "http://127.0.0.1:3000/api/auth/twitter/callback",
+            includeEmail: true,
+          },
+          async function (_token, _tokenSecret, profile, done) {
+            const email = profile.emails?.[0]?.value ?? "blitz@test.com"
+
+            const user = await db.user.upsert({
+              where: {email},
+              create: {
+                email,
+                name: profile.displayName,
+              },
+              update: {email},
+            })
+
+            const publicData = {
+              userId: user.id,
+              roles: [user.role],
+              source: "twitter",
+            }
+
+            done(undefined, {publicData})
+          },
+        ),
+      },
+    ],
+  }),
+)

apps/web/pages/api/get-user.ts

@@ -1,14 +1,13 @@
 import {api} from "app/blitz-server"
-import {SessionContext} from "@blitzjs/auth"
-import {prisma} from "../../prisma/index"
+import db from "db"
 
 export default api(async (_req, res, ctx) => {
   const blitzContext = ctx
 
   const publicData = blitzContext.session.$publicData
 
-  const sessions = await prisma.session.findMany({})
-  const sessionsCount = await prisma.session.count({})
+  const sessions = await db.session.findMany({})
+  const sessionsCount = await db.session.count({})
 
   res.status(200).json({
     userId: blitzContext.session.userId,

apps/web/pages/api/multiply.ts

@@ -1,8 +1,8 @@
 import {NextApiRequest, NextApiResponse} from "next"
-import {prisma} from "../../prisma/index"
+import db from "db"
 
 export default async function handle(req: NextApiRequest, res: NextApiResponse) {
-  const session = await prisma.session.findFirst({
+  const session = await db.session.findFirst({
     where: {
       handle: "test",
     },

apps/web/pages/api/revoke-all-sessions.ts

@@ -1,9 +1,9 @@
 import {api} from "app/blitz-server"
-import {prisma} from "../../prisma/index"
+import db from "db"
 
 export default api(async (_req, res) => {
-  const sessions = await prisma.session.deleteMany()
-  const sessionsCount = await prisma.session.count()
+  const sessions = await db.session.deleteMany()
+  const sessionsCount = await db.session.count()
 
   res.status(200).json({
     activeSessions: sessions,

apps/web/pages/api/set-public-data.ts

@@ -1,12 +1,12 @@
 import {setPublicDataForUser} from "@blitzjs/auth"
 import {api} from "app/blitz-server"
-import {prisma} from "../../prisma/index"
+import db from "db"
 
 export default api(async (req, res, ctx) => {
   if (ctx.session.$thisIsAuthorized()) {
     ctx.session.$publicData
 
-    await prisma.user.update({
+    await db.user.update({
       where: {id: ctx.session.userId as number},
       data: {role: req.query.role as string},
     })

apps/web/pages/api/signin.ts

@@ -1,9 +1,9 @@
 import {api} from "app/blitz-server"
-import {prisma} from "../../prisma/index"
+import db from "db"
 import {SecurePassword} from "@blitzjs/auth"
 
 export const authenticateUser = async (email: string, password: string) => {
-  const user = await prisma.user.findFirst({where: {email}})
+  const user = await db.user.findFirst({where: {email}})
   if (!user) throw new Error("Authentication Error")
 
   const result = await SecurePassword.verify(user.hashedPassword, password)
@@ -11,7 +11,7 @@ export const authenticateUser = async (email: string, password: string) => {
   if (result === SecurePassword.VALID_NEEDS_REHASH) {
     // Upgrade hashed password with a more secure hash
     const improvedHash = await SecurePassword.hash(password)
-    await prisma.user.update({where: {id: user.id}, data: {hashedPassword: improvedHash}})
+    await db.user.update({where: {id: user.id}, data: {hashedPassword: improvedHash}})
   }
 
   const {hashedPassword, ...rest} = user
@@ -25,6 +25,7 @@ export default api(async (req, res, ctx) => {
 
   await blitzContext.session.$create({
     userId: user.id,
+    role: "USER",
   })
 
   res.status(200).json({email: req.query.email, userId: blitzContext.session.userId})

apps/web/pages/api/signup.ts

@@ -1,5 +1,5 @@
 import {api} from "app/blitz-server"
-import {prisma} from "../../prisma/index"
+import db from "db"
 import {SecurePassword} from "@blitzjs/auth"
 
 export default api(async (req, res, ctx) => {
@@ -9,13 +9,14 @@ export default api(async (req, res, ctx) => {
     (req.query.password as string) || "test-password",
   )
   const email = (req.query.email as string) || "test" + Math.random() + "@test.com"
-  const user = await prisma.user.create({
+  const user = await db.user.create({
     data: {email, hashedPassword, role: "user"},
     select: {id: true, name: true, email: true, role: true},
   })
 
   await blitzContext.session.$create({
     userId: user.id,
+    role: "USER",
   })
 
   res.status(200).json({userId: blitzContext.session.userId, ...user, email: req.query.email})

apps/web/pages/create-user.tsx

@@ -1,8 +1,7 @@
 import {useState} from "react"
-import {SessionContext} from "@blitzjs/auth"
 import {useMutation} from "@blitzjs/rpc"
 import createUser from "app/mutations/createUser"
-import {User} from "prisma"
+import {User} from "db"
 
 function Page() {
   const [name, setName] = useState("")

apps/web/pages/page-with-gsp.tsx

@@ -1,14 +1,11 @@
 import {gSP} from "app/blitz-server"
 
-export const getStaticProps = gSP(async ({ctx}) => {
+export const getStaticProps = gSP<{data: {test: string}}>(async ({ctx}) => {
   return {
     props: {
       data: {
-        // userId: ctx?.session.userId,
-        // session: {
-        //   id: session.userId,
-        //   publicData: session.$publicData,
-        // },
+        test: "hello",
+        date: new Date(),
       },
     },
   }

apps/web/pages/page-with-gssp.tsx

@@ -12,6 +12,7 @@ export const getServerSideProps = gSSP<Props>(async ({ctx}) => {
     props: {
       userId: session.userId,
       publicData: session.$publicData,
+      publishedAt: new Date(0),
     },
   }
 })

apps/web/pages/page-with-inf-prefetch.tsx

@@ -0,0 +1,32 @@
+import {useInfiniteQuery} from "@blitzjs/rpc"
+import {gSSP} from "app/blitz-server"
+import getInfiniteUsers from "app/queries/getInfiniteUsers"
+
+export const getServerSideProps = gSSP(async ({ctx}) => {
+  const {prefetchInfiniteQuery} = ctx
+
+  await prefetchInfiniteQuery(getInfiniteUsers, {}, {})
+  return {props: {}}
+})
+
+function PageWithPrefetchInfiniteQuery(props) {
+  const [usersPages] = useInfiniteQuery(getInfiniteUsers, (page = {take: 3, skip: 0}) => page, {
+    getNextPageParam: (lastPage) => lastPage.nextPage,
+  })
+  return (
+    <div>
+      {usersPages.map((usersPage) =>
+        usersPage?.users.map((u) => (
+          <div key={u.createdAt.toDateString()}>
+            <p>name: {u.name}</p>
+            <p>role: {u.role}</p>
+            <p>email: {u.email}</p>
+            <hr />
+          </div>
+        )),
+      )}
+    </div>
+  )
+}
+
+export default PageWithPrefetchInfiniteQuery

apps/web/pages/page-with-invoke-ctx.tsx

@@ -0,0 +1,31 @@
+import {SessionContext} from "@blitzjs/auth"
+import {invokeWithCtx} from "@blitzjs/rpc"
+import {gSSP} from "app/blitz-server"
+import getUsersAuth from "app/queries/getUsersAuth"
+
+type Props = {
+  userId: unknown
+  publicData: SessionContext["$publicData"]
+}
+
+export const getServerSideProps = gSSP<Props>(async ({ctx}) => {
+  const {session} = ctx
+
+  const users = await invokeWithCtx(getUsersAuth, {}, ctx)
+
+  console.log({users})
+
+  return {
+    props: {
+      userId: session.userId,
+      publicData: session.$publicData,
+      publishedAt: new Date(0),
+    },
+  }
+})
+
+function PageWithInvokeCtx(props: Props) {
+  return <div>{JSON.stringify(props, null, 2)}</div>
+}
+
+export default PageWithInvokeCtx

apps/web/pages/page-with-prefetch.tsx

@@ -0,0 +1,28 @@
+import {useQuery} from "@blitzjs/rpc"
+import {gSSP} from "app/blitz-server"
+import getUsers from "app/queries/getUsers"
+
+export const getServerSideProps = gSSP(async ({ctx}) => {
+  const {prefetchQuery} = ctx
+
+  await prefetchQuery(getUsers, {}, {})
+  return {props: {}}
+})
+
+function PageWithPrefetch(props) {
+  const [users] = useQuery(getUsers, {})
+  return (
+    <div>
+      {users.map((u) => (
+        <div key={u.createdAt.toDateString()}>
+          <p>name: {u.name}</p>
+          <p>role: {u.role}</p>
+          <p>email: {u.email}</p>
+          <hr />
+        </div>
+      ))}
+    </div>
+  )
+}
+
+export default PageWithPrefetch

apps/web/types.ts

@@ -0,0 +1,15 @@
+import {SimpleRolesIsAuthorized} from "@blitzjs/auth"
+import {User} from "db"
+
+export type Role = "ADMIN" | "USER"
+
+declare module "@blitzjs/auth" {
+  export interface Session {
+    isAuthorized: SimpleRolesIsAuthorized<Role>
+    PublicData: {
+      userId: User["id"]
+      role: Role
+      views?: number
+    }
+  }
+}

integration-tests/auth/app/blitz-client.ts

@@ -1,7 +1,7 @@
 import {AuthClientPlugin} from "@blitzjs/auth"
-import {setupClient} from "@blitzjs/next"
+import {setupBlitzClient} from "@blitzjs/next"
 
-const {withBlitz} = setupClient({
+const {withBlitz} = setupBlitzClient({
   plugins: [
     AuthClientPlugin({
       cookiePrefix: "auth-tests-cookie-prefix",

integration-tests/auth/app/blitz-server.ts

@@ -1,9 +1,9 @@
-import {setupBlitz} from "@blitzjs/next"
+import {setupBlitzServer} from "@blitzjs/next"
 import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
 import {simpleRolesIsAuthorized} from "@blitzjs/auth"
 import {prisma as db} from "../prisma/index"
 
-const {gSSP, gSP, api} = setupBlitz({
+const {gSSP, gSP, api} = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "auth-tests-cookie-prefix",

integration-tests/auth/package.json

@@ -19,7 +19,7 @@
     "@prisma/client": "3.9.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"
@@ -29,7 +29,7 @@
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/node-fetch": "2.6.1",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "b64-lite": "1.4.0",
     "eslint": "7.32.0",
     "fs-extra": "10.0.1",

integration-tests/auth/pages/_app.tsx

@@ -1,12 +1,11 @@
-import {ErrorFallbackProps, ErrorComponent, ErrorBoundary} from "@blitzjs/next"
+import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
-import type {AppProps} from "next/app"
 import React from "react"
 import {withBlitz} from "../app/blitz-client"
 
 function RootErrorFallback({error}: ErrorFallbackProps) {
   if (error instanceof AuthenticationError) {
-    return <div>Error: You are not authenticated</div>
+    return <div id="error">Error: You are not authenticated</div>
   } else if (error instanceof AuthorizationError) {
     return (
       <ErrorComponent