Version Packages (alpha) (#3540 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Fix Page.authenticate not working for layout components (#3547 )
2026-02-04 12:08:33 -05:00 · 2022-07-18 11:29:22 +02:00 · 2022-07-18 10:39:07 +02:00 · 2022-07-18 10:03:44 +02:00 · 2022-07-17 19:28:45 +02:00 · 2022-07-17 18:08:08 +02:00
300 changed files with 11252 additions and 2325 deletions
--- a/.changeset/big-phones-bow.md
+++ b/.changeset/big-phones-bow.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+add mounted check inside withBlitz
--- a/.changeset/bright-mangos-run.md
+++ b/.changeset/bright-mangos-run.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Add queryClient to RPC Plugin exports
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -7,5 +7,5 @@
  "access": "restricted",
  "baseBranch": "main",
  "updateInternalDependencies": "patch",
-  "ignore": ["web", "test-*"]
+  "ignore": ["web", "test-*", "toolkit-app"]
 }
--- a/.changeset/cool-doors-invent.md
+++ b/.changeset/cool-doors-invent.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Add invokeWithCtx function
--- a/.changeset/cool-horses-check.md
+++ b/.changeset/cool-horses-check.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fixes issue when generating a new blitz app with the form flag that ends up installing the wrong form library
--- a/.changeset/curly-seas-serve.md
+++ b/.changeset/curly-seas-serve.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Check for new versions when running CLI
--- a/.changeset/eleven-humans-sort.md
+++ b/.changeset/eleven-humans-sort.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/codemod": patch
+"@blitzjs/generator": patch
+---
+
+codemod fixes
--- a/.changeset/empty-turkeys-wave.md
+++ b/.changeset/empty-turkeys-wave.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Use `useRouter` from next/router in useParams function
--- a/.changeset/famous-kings-explain.md
+++ b/.changeset/famous-kings-explain.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+updated nextjs version in generator & npmrc file
--- a/.changeset/fast-trainers-kneel.md
+++ b/.changeset/fast-trainers-kneel.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Export Zod utils from blitz core package
--- a/.changeset/four-brooms-juggle.md
+++ b/.changeset/four-brooms-juggle.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+---
+
+Add missing RouteUrlObject on Page.authenticate.redirectTo
--- a/.changeset/four-meals-fry.md
+++ b/.changeset/four-meals-fry.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+export BlitzPage & BlitzLayout types from @blitzjs/next
--- a/.changeset/fuzzy-jars-admire.md
+++ b/.changeset/fuzzy-jars-admire.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+fix codemod for wrapping \_app arrow function & fix codemod for nested pages directory
--- a/.changeset/gentle-dogs-reply.md
+++ b/.changeset/gentle-dogs-reply.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Update queryClient import in codemod
--- a/.changeset/good-apes-drum.md
+++ b/.changeset/good-apes-drum.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fixes wrong import of the db module in `blitz db seed` command function
--- a/.changeset/good-insects-wink.md
+++ b/.changeset/good-insects-wink.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Allow passing optional type argument for ParamsType in GSSP
--- a/.changeset/green-papayas-do.md
+++ b/.changeset/green-papayas-do.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Update codemod and template with a new queryClient import location
--- a/.changeset/healthy-rice-shout.md
+++ b/.changeset/healthy-rice-shout.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+detailed print env info
--- a/.changeset/heavy-apes-judge.md
+++ b/.changeset/heavy-apes-judge.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Show all blitz packages when running `blitz version` command
--- a/.changeset/hot-drinks-approve.md
+++ b/.changeset/hot-drinks-approve.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+Upgrade @types/react, fix typings inside @blitzjs/next
--- a/.changeset/late-steaks-give.md
+++ b/.changeset/late-steaks-give.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+Support RPC error middleware
--- a/.changeset/lemon-games-press.md
+++ b/.changeset/lemon-games-press.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+Update Next.js version and addBasePath location
--- a/.changeset/lemon-seas-push.md
+++ b/.changeset/lemon-seas-push.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Don't try to copy RPC API endpoint in templates that don't have it
--- a/.changeset/lucky-cows-try.md
+++ b/.changeset/lucky-cows-try.md
@@ -0,0 +1,7 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+---
+
+rename middleware type for blitz server plugin
--- a/.changeset/modern-cameras-pull.md
+++ b/.changeset/modern-cameras-pull.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Support `prefetchBlitzQuery` in gSSP and gSP
--- a/.changeset/moody-bags-walk.md
+++ b/.changeset/moody-bags-walk.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"blitz": patch
+---
+
+Fix redirectAuthenticatedTo errors
--- a/.changeset/moody-squids-cheer.md
+++ b/.changeset/moody-squids-cheer.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+test automated publish
--- a/.changeset/nervous-beds-travel.md
+++ b/.changeset/nervous-beds-travel.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+useParam & useParams functions now accessible from @blitzjs/next
--- a/.changeset/nervous-dolls-rule.md
+++ b/.changeset/nervous-dolls-rule.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Move middlewares from blitz config to blitz server with codemod
--- a/.changeset/new-coats-turn.md
+++ b/.changeset/new-coats-turn.md
@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/codemod": patch
+---
+
+Handle duplicate imports with Blitz upgrade-legacy codemod
--- a/.changeset/nice-deers-dream.md
+++ b/.changeset/nice-deers-dream.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Export BlitzProvider from @blitzjs/next
--- a/.changeset/nice-starfishes-live.md
+++ b/.changeset/nice-starfishes-live.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+add mounted check to app generator template
--- a/.changeset/nine-birds-confess.md
+++ b/.changeset/nine-birds-confess.md
@@ -0,0 +1,7 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+
+Fix SSP / SP not prefetching queries correctly
--- a/.changeset/olive-bees-buy.md
+++ b/.changeset/olive-bees-buy.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Fix templates source in RPC codemod step
--- a/.changeset/olive-feet-rhyme.md
+++ b/.changeset/olive-feet-rhyme.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Add codemod to upgrade from legacy framework to the Blitz Toolkit
--- a/.changeset/olive-sheep-rhyme.md
+++ b/.changeset/olive-sheep-rhyme.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add missing lint deps to the new app templates
--- a/.changeset/perfect-eyes-repeat.md
+++ b/.changeset/perfect-eyes-repeat.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Fix pipe resolver return type
--- a/.changeset/plenty-bottles-swim.md
+++ b/.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
--- a/.changeset/poor-penguins-look.md
+++ b/.changeset/poor-penguins-look.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+add `db seed` cli command
--- a/.changeset/popular-teachers-pay.md
+++ b/.changeset/popular-teachers-pay.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Handle next/dynamic default import in codemod
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -12,31 +12,101 @@
    "@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",
+    "test-middleware": "0.0.0"
  },
  "changesets": [
+    "big-phones-bow",
    "breezy-cameras-double",
+    "bright-mangos-run",
+    "cool-doors-invent",
+    "cool-horses-check",
+    "curly-seas-serve",
    "dirty-monkeys-greet",
+    "eleven-humans-sort",
    "empty-berries-rule",
+    "empty-turkeys-wave",
    "fair-wombats-sneeze",
+    "famous-kings-explain",
+    "fast-trainers-kneel",
    "flat-bees-approve",
+    "four-brooms-juggle",
+    "four-meals-fry",
+    "fuzzy-jars-admire",
+    "gentle-dogs-reply",
+    "good-apes-drum",
+    "good-insects-wink",
    "great-months-train",
+    "green-papayas-do",
+    "healthy-rice-shout",
+    "heavy-apes-judge",
+    "hot-drinks-approve",
+    "late-steaks-give",
+    "lemon-games-press",
+    "lemon-seas-push",
    "lovely-colts-share",
+    "lucky-cows-try",
+    "modern-cameras-pull",
+    "moody-bags-walk",
+    "moody-squids-cheer",
+    "nervous-beds-travel",
+    "nervous-dolls-rule",
+    "new-coats-turn",
+    "nice-deers-dream",
+    "nice-starfishes-live",
+    "nine-birds-confess",
    "nine-onions-admire",
    "ninety-pets-heal",
+    "olive-bees-buy",
+    "olive-feet-rhyme",
+    "olive-sheep-rhyme",
+    "perfect-eyes-repeat",
+    "plenty-bottles-swim",
    "poor-peas-lick",
+    "poor-penguins-look",
    "poor-shrimps-think",
+    "popular-teachers-pay",
+    "purple-singers-greet",
    "quiet-feet-travel",
+    "quiet-pans-hunt",
+    "quiet-sloths-rule",
+    "rich-chairs-invent",
+    "rich-queens-travel",
    "sharp-falcons-begin",
+    "shy-olives-hang",
    "silent-colts-reply",
+    "slimy-needles-taste",
+    "slow-walls-poke",
+    "small-socks-confess",
+    "smooth-planets-admire",
+    "soft-adults-smell",
+    "strong-apes-reply",
    "stupid-walls-sell",
    "swift-drinks-dress",
+    "tall-meals-learn",
+    "tame-keys-reply",
+    "tasty-news-collect",
+    "ten-hairs-listen",
    "ten-rivers-burn",
+    "tender-pianos-check",
+    "thick-parrots-float",
    "thirty-countries-build",
+    "tidy-clouds-smoke",
+    "twelve-lemons-smile",
    "twenty-beans-pump",
+    "two-carpets-rhyme",
    "two-kiwis-help",
+    "two-tigers-type",
    "unlucky-papayas-sleep",
-    "wicked-ghosts-cough"
+    "violet-bags-leave",
+    "violet-lions-help",
+    "weak-suns-shave",
+    "wicked-ghosts-cough",
+    "wise-frogs-give"
  ]
 }
--- a/.changeset/purple-singers-greet.md
+++ b/.changeset/purple-singers-greet.md
@@ -0,0 +1,7 @@
+---
+"@blitzjs/rpc": patch
+"@blitzjs/codemod": patch
+"@blitzjs/generator": patch
+---
+
+getQueryClient function & queryClient codemod updates & shared plugin config
--- a/.changeset/quiet-pans-hunt.md
+++ b/.changeset/quiet-pans-hunt.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Removes the suspense wrapper from withBlitz since it's not needed
--- a/.changeset/quiet-sloths-rule.md
+++ b/.changeset/quiet-sloths-rule.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Removes the check for when withBlitz is mounted before rendering the users app. We had this previously to avoid the react 18 suspense error being showin in development with nextjs.
--- a/.changeset/rich-chairs-invent.md
+++ b/.changeset/rich-chairs-invent.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Rename prefetchBlitzQuery to prefetchQuery, add prefetchInfiniteQuery
--- a/.changeset/rich-queens-travel.md
+++ b/.changeset/rich-queens-travel.md
@@ -0,0 +1,8 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+Remove references to the logging package
--- a/.changeset/shy-olives-hang.md
+++ b/.changeset/shy-olives-hang.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+Update RPC plugin setup in templates
--- a/.changeset/slimy-needles-taste.md
+++ b/.changeset/slimy-needles-taste.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+Add jest.config.js to newly generated typescript apps
--- a/.changeset/slow-walls-poke.md
+++ b/.changeset/slow-walls-poke.md
@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+Allow resolverPath to be a function which is ran for every file path that is converted to RPC Route
--- a/.changeset/small-socks-confess.md
+++ b/.changeset/small-socks-confess.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": patch
+---
+
+Add passport adapter to @blitzjs/auth
--- a/.changeset/smooth-planets-admire.md
+++ b/.changeset/smooth-planets-admire.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add missing \_document.tsx and 404.tsx pages to the new app templates
--- a/.changeset/soft-adults-smell.md
+++ b/.changeset/soft-adults-smell.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": patch
+---
+
+Fix `Page.authenticate` not working for layout components
--- a/.changeset/strong-apes-reply.md
+++ b/.changeset/strong-apes-reply.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Remove as any assertion for the PrismaStorage argument
--- a/.changeset/tall-meals-learn.md
+++ b/.changeset/tall-meals-learn.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Upgrade Prisma to v4.0.0
--- a/.changeset/tame-keys-reply.md
+++ b/.changeset/tame-keys-reply.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Add aliases for Blitz CLI commands
--- a/.changeset/tasty-news-collect.md
+++ b/.changeset/tasty-news-collect.md
@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/codemod": patch
+---
+
+init codemod generator
--- a/.changeset/ten-hairs-listen.md
+++ b/.changeset/ten-hairs-listen.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Allow customizing PreviewData in gSSP
--- a/.changeset/tender-pianos-check.md
+++ b/.changeset/tender-pianos-check.md
@@ -0,0 +1,7 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+various improvements and fixes
--- a/.changeset/thick-parrots-float.md
+++ b/.changeset/thick-parrots-float.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+allow extension catch in getAllFiles codemod util
--- a/.changeset/tidy-clouds-smoke.md
+++ b/.changeset/tidy-clouds-smoke.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix routes manifest showing duplicates for non queries|resolvers reso…
--- a/.changeset/twelve-lemons-smile.md
+++ b/.changeset/twelve-lemons-smile.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Fix prefetching multiple queries causes only the last one to be passed to page
--- a/.changeset/two-carpets-rhyme.md
+++ b/.changeset/two-carpets-rhyme.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+During `blitz new` if project name argument is set to "." change it to current folder name
--- a/.changeset/two-tigers-type.md
+++ b/.changeset/two-tigers-type.md
@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix running bin commands with Blitz CLI
--- a/.changeset/violet-bags-leave.md
+++ b/.changeset/violet-bags-leave.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Update templates directory for codemod
--- a/.changeset/violet-lions-help.md
+++ b/.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
--- a/.changeset/weak-suns-shave.md
+++ b/.changeset/weak-suns-shave.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Move blitz config to next.config.js
--- a/.changeset/wise-frogs-give.md
+++ b/.changeset/wise-frogs-give.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+use latest tag for generator template on rpc & auth packages
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners

-* @flybayer @beerose
+* @flybayer @beerose @dillonraphael

 packages/generator/templates**/* @flybayer
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -0,0 +1,58 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+permissions:
+  contents: read
+
+jobs:
+  release:
+    name: Release
+    permissions:
+      contents: write
+      pull-requests: write
+    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 --no-frozen-lockfile
+      - run: pnpm build
+
+      - name: Create Release Pull Request
+        uses: blitz-js/changesets-action@main
+        with:
+          publish: pnpm release
+          createGithubReleases: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      # - name: Github Release
+      #   uses: release-drafter/release-drafter@v5.19.0
+      #   with:
+      #     config-name: release-drafter.yml
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.npmrc
+++ b/.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-*
+
--- a/apps/toolkit-app/CHANGELOG.md
+++ b/apps/toolkit-app/CHANGELOG.md
@@ -1,5 +1,15 @@
 # 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
--- a/apps/toolkit-app/app/auth/mutations/changePassword.ts
+++ b/apps/toolkit-app/app/auth/mutations/changePassword.ts
@@ -1,5 +1,5 @@
 import { NotFoundError } from "blitz"
-import { db } from "db"
+import db from "db"
 import { authenticateUser } from "./login"
 import { ChangePassword } from "../validations"
 import { resolver } from "@blitzjs/rpc"
--- a/apps/toolkit-app/app/auth/mutations/forgotPassword.ts
+++ b/apps/toolkit-app/app/auth/mutations/forgotPassword.ts
@@ -1,6 +1,6 @@
 import { generateToken, hash256 } from "@blitzjs/auth"
 import { resolver } from "@blitzjs/rpc"
-import { db } from "db"
+import db from "db"
 import { forgotPasswordMailer } from "mailers/forgotPasswordMailer"
 import { ForgotPassword } from "../validations"

--- a/apps/toolkit-app/app/auth/mutations/login.ts
+++ b/apps/toolkit-app/app/auth/mutations/login.ts
@@ -1,7 +1,7 @@
 import { SecurePassword } from "@blitzjs/auth"
 import { resolver } from "@blitzjs/rpc"
 import { AuthenticationError } from "blitz"
-import { db } from "db"
+import db from "db"
 import { Role } from "types"
 import { Login } from "../validations"

--- a/apps/toolkit-app/app/auth/mutations/resetPassword.ts
+++ b/apps/toolkit-app/app/auth/mutations/resetPassword.ts
@@ -1,5 +1,5 @@
 import { SecurePassword, hash256 } from "@blitzjs/auth"
-import { db } from "db"
+import db from "db"
 import { ResetPassword } from "../validations"
 import login from "./login"

--- a/apps/toolkit-app/app/auth/mutations/signup.ts
+++ b/apps/toolkit-app/app/auth/mutations/signup.ts
@@ -1,5 +1,6 @@
-import { db } from "db"
+import db from "db"
 import { SecurePassword } from "@blitzjs/auth"
+import { Role } from "types"

 export default async function signup(input, ctx) {
  const blitzContext = ctx
@@ -13,6 +14,7 @@ export default async function signup(input, ctx) {

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

  return { userId: blitzContext.session.userId, ...user, email: input.email }
--- a/apps/toolkit-app/app/blitz-client.ts
+++ b/apps/toolkit-app/app/blitz-client.ts
@@ -7,12 +7,6 @@ export const { withBlitz } = setupBlitzClient({
    AuthClientPlugin({
      cookiePrefix: "web-cookie-prefix",
    }),
-    BlitzRpcPlugin({
-      reactQueryOptions: {
-        queries: {
-          staleTime: 7000,
-        },
-      },
-    }),
+    BlitzRpcPlugin({}),
  ],
 })
--- a/apps/toolkit-app/app/blitz-server.ts
+++ b/apps/toolkit-app/app/blitz-server.ts
@@ -1,14 +1,13 @@
 import { setupBlitzServer } from "@blitzjs/next"
 import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
-import { db } from "db"
+import db from "db"
 import { simpleRolesIsAuthorized } from "@blitzjs/auth"

 const { gSSP, gSP, api } = setupBlitzServer({
  plugins: [
    AuthServerPlugin({
      cookiePrefix: "web-cookie-prefix",
-      // TODO fix type
-      storage: PrismaStorage(db as any),
+      storage: PrismaStorage(db),
      isAuthorized: simpleRolesIsAuthorized,
    }),
  ],
--- a/apps/toolkit-app/app/core/layouts/Layout.tsx
+++ b/apps/toolkit-app/app/core/layouts/Layout.tsx
@@ -1,7 +1,11 @@
+import React from "react"
 import Head from "next/head"
-import React, { FC } from "react"
+import { BlitzLayout } from "@blitzjs/next"

-const Layout: FC<{ title?: string; children?: React.ReactNode }> = ({ title, children }) => {
+const Layout: BlitzLayout<{ title?: string; children?: React.ReactNode }> = ({
+  title,
+  children,
+}) => {
  return (
    <>
      <Head>
--- a/apps/toolkit-app/app/users/queries/getCurrentUser.ts
+++ b/apps/toolkit-app/app/users/queries/getCurrentUser.ts
@@ -1,5 +1,5 @@
 import { Ctx } from "blitz"
-import { db } from "db"
+import db from "db"

 export default async function getCurrentUser(_ = null, { session }: Ctx) {
  if (!session.userId) return null
--- a/apps/toolkit-app/db/index.ts
+++ b/apps/toolkit-app/db/index.ts
@@ -5,4 +5,4 @@ const EnhancedPrisma = enhancePrisma(PrismaClient)

 export * from "@prisma/client"
 const db = new EnhancedPrisma()
-export { db }
+export default db
--- a/apps/toolkit-app/db/seeds.ts
+++ b/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
--- a/apps/toolkit-app/package.json
+++ b/apps/toolkit-app/package.json
@@ -1,9 +1,9 @@
 {
  "name": "toolkit-app",
-  "version": "1.0.1-alpha.15",
+  "version": "1.0.1-alpha.16",
  "scripts": {
    "start:dev": "pnpm run prisma:start && next dev",
-    "buildapp": "pnpm i && pnpm 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,14 +29,14 @@
    "@blitzjs/rpc": "workspace:*",
    "@hookform/resolvers": "2.8.8",
    "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.20",
-    "next": "12.1.6-canary.17",
-    "prisma": "3.9.0",
+    "blitz": "workspace:2.0.0-alpha.55",
+    "next": "12.2.0",
+    "prisma": "4.0.0",
    "react": "18.0.0",
    "react-dom": "18.0.0",
    "react-hook-form": "7.29.0",
    "ts-node": "10.7.0",
-    "zod": "3.10.1"
+    "zod": "3.17.3"
  },
  "devDependencies": {
    "@next/bundle-analyzer": "12.0.8",
@@ -45,8 +45,11 @@
    "@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",
+    "@typescript-eslint/eslint-plugin": "5.9.1",
    "eslint": "7.32.0",
+    "eslint-config-next": "12.2.0",
+    "eslint-config-prettier": "8.5.0",
    "husky": "7.0.4",
    "jest": "27.5.1",
    "lint-staged": "12.1.7",
--- a/apps/toolkit-app/pages/404.tsx
+++ b/apps/toolkit-app/pages/404.tsx
@@ -0,0 +1,20 @@
+import Head from "next/head"
+import { ErrorComponent } from "@blitzjs/next"
+
+// ------------------------------------------------------
+// This page is rendered if a route match is not found
+// ------------------------------------------------------
+export default function Page404() {
+  const statusCode = 404
+  const title = "This page could not be found"
+  return (
+    <>
+      <Head>
+        <title>
+          {statusCode}: {title}
+        </title>
+      </Head>
+      <ErrorComponent statusCode={statusCode} title={title} />
+    </>
+  )
+}
--- a/apps/toolkit-app/pages/_app.tsx
+++ b/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>
  )
 }
--- a/apps/toolkit-app/pages/_document.tsx
+++ b/apps/toolkit-app/pages/_document.tsx
@@ -0,0 +1,22 @@
+import Document, { Html, Main, NextScript, Head } from "next/document"
+
+class MyDocument extends Document {
+  // Only uncomment if you need to customize this behaviour
+  // static async getInitialProps(ctx: DocumentContext) {
+  //   const initialProps = await Document.getInitialProps(ctx)
+  //   return {...initialProps}
+  // }
+  render() {
+    return (
+      <Html lang="en">
+        <Head />
+        <body>
+          <Main />
+          <NextScript />
+        </body>
+      </Html>
+    )
+  }
+}
+
+export default MyDocument
--- a/apps/web/app/blitz-server.ts
+++ b/apps/web/app/blitz-server.ts
@@ -1,14 +1,13 @@
 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} = setupBlitzServer({
  plugins: [
    AuthServerPlugin({
      cookiePrefix: "webapp-cookie-prefix",
-      // TODO fix type
-      storage: PrismaStorage(db as any),
+      storage: PrismaStorage(db),
      isAuthorized: simpleRolesIsAuthorized,
    }),
  ],
--- a/apps/web/app/mutations/createUser.ts
+++ b/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
 }
--- a/apps/web/app/queries/getInfiniteUsers.ts
+++ b/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,
+  }
+})
--- a/apps/web/app/queries/getUsers.ts
+++ b/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
 }
--- a/apps/web/app/queries/getUsersAuth.ts
+++ b/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
+})
--- a/apps/web/prisma/index.ts
+++ b/apps/web/prisma/index.ts
@@ -5,4 +5,4 @@ const EnhancedPrisma = enhancePrisma(PrismaClient)

 export * from "@prisma/client"
 const prisma = new EnhancedPrisma()
-export {prisma}
+export default prisma
--- a/apps/web/prisma/migrations/20220209111643_init/migration.sql
+++ b/apps/web/prisma/migrations/20220209111643_init/migration.sql
--- a/apps/web/prisma/migrations/migration_lock.toml
+++ b/apps/web/prisma/migrations/migration_lock.toml
--- a/apps/web/prisma/schema.prisma
+++ b/apps/web/prisma/schema.prisma
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -6,5 +6,10 @@ const {withBlitz} = require("@blitzjs/next")
 module.exports = withBlitz(
  withBundleAnalyzer({
    reactStrictMode: true,
+    blitz: {
+      customServer: {
+        hotReload: false,
+      },
+    },
  }),
 )
--- a/apps/web/package.json
+++ b/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,17 +22,20 @@
    "@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.6-canary.17",
-    "prisma": "3.9.0",
+    "next": "12.2.0",
+    "passport-mock-strategy": "2.0.0",
+    "passport-twitter": "1.0.4",
+    "prisma": "4.0.0",
    "react": "18.0.0",
    "react-dom": "18.0.0",
    "ts-node": "10.7.0"
  },
  "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"
  }
--- a/apps/web/pages/_app.tsx
+++ b/apps/web/pages/_app.tsx
@@ -1,6 +1,5 @@
-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 {withBlitz} from "app/blitz-client"

--- a/apps/web/pages/api/auth/[...auth].ts
+++ b/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})
+          },
+        ),
+      },
+    ],
+  }),
+)
--- a/apps/web/pages/api/get-user.ts
+++ b/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,
--- a/Show More
+++ b/Show More