Merge branch 'main' into remove-unmaintained-forms

fix
remove formik and final form
2026-02-07 03:00:10 -05:00 · 2023-06-05 19:16:40 +05:30 · 2023-05-16 16:04:54 +05:30 · 2023-05-16 15:58:57 +05:30
114 changed files with 5976 additions and 7280 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -3945,16 +3945,6 @@
      "contributions": [
        "doc"
      ]
-    },
-    {
-      "login": "jayu",
-      "name": "Jakub Mazurek",
-      "avatar_url": "https://avatars.githubusercontent.com/u/11561585?v=4",
-      "profile": "jayu.dev",
-      "contributions": [
-        "doc",
-        "code"
-      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.changeset/big-turtles-tease.md
+++ b/.changeset/big-turtles-tease.md
@@ -1,9 +0,0 @@
---
-"@blitzjs/auth": patch
-"@blitzjs/next": patch
-"@blitzjs/rpc": patch
-"blitz": patch
-"@blitzjs/generator": patch
---
-
-(feat) upgrade tslog to v4.8.2
--- a/.changeset/curvy-drinks-perform.md
+++ b/.changeset/curvy-drinks-perform.md
@@ -1,6 +0,0 @@
---
-"@blitzjs/auth": patch
-"blitz": patch
---
-
-blitz-auth: Fix webpack from following next-auth
--- a/.changeset/few-elephants-approve.md
+++ b/.changeset/few-elephants-approve.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/rpc": patch
---
-
-Fix return type of `requestMiddlewares` in `RpcServerPlugin`
--- a/.changeset/fifty-drinks-cry.md
+++ b/.changeset/fifty-drinks-cry.md
@@ -1,8 +0,0 @@
---
-"@blitzjs/auth": patch
-"blitz": patch
---
-
-blitz-auth: Support for Prisma v5
-
-Internal: Make `handle` a required paramter while updating the `session` modal.
--- a/.changeset/good-oranges-pretend.md
+++ b/.changeset/good-oranges-pretend.md
@@ -1,26 +0,0 @@
---
-"@blitzjs/rpc": patch
---
-
-Fixes enormous memory consumption of the dev server by changing the default import strategy to "require" instead of "import" which in webpack causes multiple chunks to be created for each import.
-
-## Blitz Configuration
-
-To configure this behaviour, you can add the following to your next.config.js:
-
-```js
-/**
- * @type {import('@blitzjs/next').BlitzConfig}
- **/
-const config = {
-  blitz: {
-    resolversDynamicImport: true,
-  },
-}
-```
-
-When `resolversDynamicImport` is set to `true`, the import strategy will be "import" instead of "require".
-
-### On Vercel
-
-If you are using Vercel, `resolversDynamicImport` will be set to `true` by default, since it is better for the separate chunks to be create for serverless lambdas.
--- a/.changeset/large-hairs-battle.md
+++ b/.changeset/large-hairs-battle.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/generator": patch
---
-
-Make Next.js version stick to 13.4.5 when generating a new app
--- a/.changeset/moody-crews-travel.md
+++ b/.changeset/moody-crews-travel.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/auth": minor
---
-
-Stop exporting `useAuthenticatedBlitzContext` from `@blitzjs/auth` this must be imported from `app/blitz-server.ts` file in order to work correctly
--- a/.changeset/poor-crabs-drum.md
+++ b/.changeset/poor-crabs-drum.md
@@ -1,5 +0,0 @@
---
-"blitz": patch
---
-
-blitz-rpc: Cleanup Event Listeners - Fix potential memory leak by cleaning up any residual event listeners set by blitz.
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -55,7 +55,6 @@
    "afraid-ears-repair",
    "big-boats-lay",
    "big-phones-bow",
-    "big-turtles-tease",
    "blue-flowers-peel",
    "blue-pigs-tan",
    "brave-zebras-deny",
@@ -86,7 +85,6 @@
    "curly-rules-speak",
    "curly-seas-serve",
    "curvy-days-attend",
-    "curvy-drinks-perform",
    "cyan-bulldogs-heal",
    "cyan-cars-greet",
    "dirty-monkeys-greet",
@@ -111,10 +109,8 @@
    "fast-toys-wash",
    "fast-trainers-kneel",
    "few-dogs-fetch",
-    "few-elephants-approve",
    "few-hounds-worry",
    "few-shrimps-leave",
-    "fifty-drinks-cry",
    "flat-bees-approve",
    "fluffy-coats-flow",
    "fluffy-mangos-begin",
@@ -137,7 +133,6 @@
    "gold-horses-punch",
    "good-apes-drum",
    "good-insects-wink",
-    "good-oranges-pretend",
    "gorgeous-birds-warn",
    "gorgeous-buses-scream",
    "gorgeous-games-obey",
@@ -167,7 +162,6 @@
    "khaki-ducks-cheer",
    "khaki-pens-rest",
    "kind-walls-suffer",
-    "large-hairs-battle",
    "late-steaks-give",
    "lazy-maps-sort",
    "lemon-games-press",
@@ -193,7 +187,6 @@
    "modern-games-dream",
    "modern-ligers-behave",
    "moody-bags-walk",
-    "moody-crews-travel",
    "moody-spoons-rhyme",
    "moody-squids-cheer",
    "nasty-suns-wash",
@@ -226,7 +219,6 @@
    "plenty-gifts-provide",
    "plenty-kiwis-greet",
    "polite-lizards-love",
-    "poor-crabs-drum",
    "poor-peas-lick",
    "poor-penguins-look",
    "poor-shrimps-think",
@@ -262,13 +254,11 @@
    "silly-peas-work",
    "silly-shoes-agree",
    "six-apricots-kick",
-    "sixty-rockets-count",
    "slimy-humans-impress",
    "slimy-needles-taste",
    "slow-impalas-tap",
    "slow-walls-camp",
    "slow-walls-poke",
-    "small-monkeys-battle",
    "small-socks-confess",
    "smooth-planets-admire",
    "smooth-rice-clap",
@@ -298,7 +288,6 @@
    "tall-radios-clean",
    "tame-keys-reply",
    "tame-pumpkins-nail",
-    "tame-rocks-unite",
    "tasty-maps-fetch",
    "tasty-news-collect",
    "tasty-squids-sin",
@@ -338,7 +327,6 @@
    "wise-frogs-give",
    "wise-lies-relate",
    "wise-rabbits-complain",
-    "yellow-numbers-serve",
    "young-birds-talk"
  ]
 }
--- a/.changeset/sixty-rockets-count.md
+++ b/.changeset/sixty-rockets-count.md
@@ -1,68 +0,0 @@
---
-"@blitzjs/rpc": patch
-"blitz": patch
---
-
-### Now we can configure Blitz RPC in the following way,
-
-In your `[[...blitz]].ts` api file you can see the following settings
-```ts
-logging?: {
-  /**
-   * allowList Represents the list of routes for which logging should be enabled
-   * If whiteList is defined then only those routes will be logged
-   */
-  allowList?: string[]
-  /**
-   * blockList Represents the list of routes for which logging should be disabled
-   * If blockList is defined then all routes except those will be logged
-   */
-  blockList?: string[]
-  /**
-   * verbose Represents the flag to enable/disable logging
-   * If verbose is true then Blitz RPC will log the input and output of each resolver
-   */
-  verbose?: boolean
-  /**
-   * disablelevel Represents the flag to enable/disable logging for a particular level
-   */
-  disablelevel?: "debug" | "info"
-}
-```
-```ts
-import { rpcHandler } from "@blitzjs/rpc"
-import { api } from "src/blitz-server"
-
-export default api(
-  rpcHandler({
-    onError: console.log,
-    formatError: (error) => {
-      error.message = `FormatError handler: ${error.message}`
-      return error
-    },
-   logging: {
-...
-}
-  })
-)
-```
-
-Example:
-```ts
-export default api(
-  rpcHandler({
-    onError: console.log,
-    formatError: (error) => {
-      error.message = `FormatError handler: ${error.message}`
-      return error
-    },
-    logging: {
-      verbose: true,
-      blockList: ["getCurrentUser", ...], //just write the resolver name [which is the resolver file name]
-    },
-  })
-)
-```
-
-This is enable verbose blitz rpc logging for all resolvers except the resolvers `getCurrentUser` and others mentioned in the `blockList`
-
--- a/.changeset/small-monkeys-battle.md
+++ b/.changeset/small-monkeys-battle.md
@@ -1,6 +0,0 @@
---
-"@blitzjs/auth": patch
-"blitz": patch
---
-
-Fix Next-Auth integration: `Unable to use next-auth with provider: Error [ERR_PACKAGE_PATH_NOT_EXPORTED]`
--- a/.changeset/tame-rocks-unite.md
+++ b/.changeset/tame-rocks-unite.md
@@ -1,5 +0,0 @@
---
-"blitz": patch
---
-
-Fix log formatting to not show the path of blitz rpc
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,8 +7,8 @@ on:
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true
-
-env:
+  
+env: 
  PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1

 jobs:
@@ -17,9 +17,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
-      - uses: pnpm/action-setup@v2.2.4
+      - uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
        with:
-          version: 8.6.5
+          version: 7.11.0
      - name: Setup node
        uses: actions/setup-node@v2
        with:
@@ -38,9 +38,9 @@ jobs:
    name: Build
    steps:
      - uses: actions/checkout@v2
-      - uses: pnpm/action-setup@v2.2.4
+      - uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
        with:
-          version: 8.6.5
+          version: 7.11.0
      - name: Setup node
        uses: actions/setup-node@v2
        with:
@@ -68,9 +68,9 @@ jobs:
        uses: actions/checkout@v3

      - name: Setup PNPM
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
        with:
-          version: 8.6.5
+          version: 7.11.0

      - name: Setup node@16
        uses: actions/setup-node@v2
@@ -127,9 +127,9 @@ jobs:
        uses: actions/checkout@v3

      - name: Setup PNPM
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
        with:
-          version: 8.6.5
+          version: 7.11.0

      - name: Setup node@${{ matrix.NODE_VERSION }}
        uses: actions/setup-node@v2
@@ -143,7 +143,7 @@ jobs:

      - name: Install playwright
        run: |
-          pnpx playwright@1.28.0 install --with-deps
+            pnpx playwright@1.28.0 install --with-deps
        shell: bash

      - name: Build
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,6 +1,6 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"

-pnpm manypkg check
+# pnpm manypkg check
 # pnpm lint
-pnpm pretty-quick --staged
+# pnpm pretty-quick --staged
--- a/.npmrc
+++ b/.npmrc
@@ -1,5 +1,4 @@
 save-exact=true
-dedupe-peer-dependents=true
 strict-peer-dependencies=false

 public-hoist-pattern[]=secure-password
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
    <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
  </a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-417-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-416-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">
@@ -731,7 +731,6 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
    <td align="center"><a href="https://ghken.com"><img src="https://avatars.githubusercontent.com/u/5304351?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tetsuya Fukuda</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=GHKEN" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=GHKEN" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/nerixim"><img src="https://avatars.githubusercontent.com/u/26106502?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikita Kamaev</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nerixim" title="Documentation">📖</a></td>
    <td align="center"><a href="https://webredone.com/"><img src="https://avatars.githubusercontent.com/u/11588823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikola Ivanov</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nikola-wd" title="Documentation">📖</a></td>
-    <td align="center"><a href="jayu.dev"><img src="https://avatars.githubusercontent.com/u/11561585?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jakub Mazurek</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jayu" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=jayu" title="Code">💻</a></td>
  </tr>
 </table>

--- a/apps/next13/CHANGELOG.md
+++ b/apps/next13/CHANGELOG.md
@@ -1,55 +1,5 @@
 # next-blitz-auth

-## 0.1.1-beta.7
-
-### Patch Changes
-
- Updated dependencies [90f1741da]
- Updated dependencies [df3265b85]
-  - @blitzjs/auth@2.0.0-beta.31
-  - blitz@2.0.0-beta.31
-  - @blitzjs/rpc@2.0.0-beta.31
-  - @blitzjs/next@2.0.0-beta.31
-  - @blitzjs/config@2.0.0-beta.31
-
-## 0.1.1-beta.6
-
-### Patch Changes
-
- Updated dependencies [c5572bec6]
- Updated dependencies [727734955]
-  - @blitzjs/auth@2.0.0-beta.30
-  - blitz@2.0.0-beta.30
-  - @blitzjs/rpc@2.0.0-beta.30
-  - @blitzjs/next@2.0.0-beta.30
-  - @blitzjs/config@2.0.0-beta.30
-
-## 0.1.1-beta.5
-
-### Patch Changes
-
- Updated dependencies [b6b9a1c5a]
- Updated dependencies [61888d1a3]
-  - @blitzjs/auth@2.0.0-beta.29
-  - blitz@2.0.0-beta.29
-  - @blitzjs/rpc@2.0.0-beta.29
-  - @blitzjs/next@2.0.0-beta.29
-  - @blitzjs/config@2.0.0-beta.29
-
-## 0.1.1-beta.4
-
-### Patch Changes
-
- Updated dependencies [5166e5e03]
- Updated dependencies [2533caf48]
- Updated dependencies [c7ac86b85]
- Updated dependencies [1bb3a6556]
-  - @blitzjs/auth@2.0.0-beta.28
-  - @blitzjs/next@2.0.0-beta.28
-  - @blitzjs/rpc@2.0.0-beta.28
-  - blitz@2.0.0-beta.28
-  - @blitzjs/config@2.0.0-beta.28
-
 ## 0.1.1-beta.3

 ### Patch Changes
--- a/apps/next13/package.json
+++ b/apps/next13/package.json
@@ -1,6 +1,6 @@
 {
  "name": "next-blitz-auth",
-  "version": "0.1.1-beta.7",
+  "version": "0.1.1-beta.3",
  "private": true,
  "scripts": {
    "blitz:dev": "next dev",
--- a/apps/toolkit-app-passportjs/package.json
+++ b/apps/toolkit-app-passportjs/package.json
@@ -30,7 +30,7 @@
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.31",
+    "blitz": "workspace:2.0.0-beta.27",
    "next": "13.3.0",
    "openid-client": "5.2.1",
    "prisma": "4.6.1",
--- a/apps/toolkit-app/next.config.js
+++ b/apps/toolkit-app/next.config.js
@@ -1,14 +1,11 @@
-const { withNextAuthAdapter } = require("@blitzjs/auth")
+const { withNextAuthAdapter } = require("@blitzjs/auth/next-auth")
 const { withBlitz } = require("@blitzjs/next")

 /**
- * @type {import('next').NextConfig}
+ * @type {import('@blitzjs/next').BlitzConfig}
 **/
 const config = {
  reactStrictMode: true,
-  blitz: {
-    resolversDynamicImport: true,
-  },
 }

 module.exports = withBlitz(withNextAuthAdapter(config))
--- a/apps/toolkit-app/package.json
+++ b/apps/toolkit-app/package.json
@@ -31,7 +31,7 @@
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.31",
+    "blitz": "workspace:2.0.0-beta.27",
    "next": "13.3.0",
    "next-auth": "4.18.7",
    "prisma": "4.6.1",
--- a/apps/toolkit-app/src/pages/api/rpc/[[...blitz]].ts
+++ b/apps/toolkit-app/src/pages/api/rpc/[[...blitz]].ts
@@ -8,9 +8,5 @@ export default api(
      error.message = `FormatError handler: ${error.message}`
      return error
    },
-    // logging: {
-    //   verbose: true,
-    //   blockList: ["/getCurrentUser"],
-    // },
  })
 )
--- a/apps/toolkit-app/src/pages/index.tsx
+++ b/apps/toolkit-app/src/pages/index.tsx
@@ -38,10 +38,10 @@ const UserInfo = () => {
  } else {
    return (
      <>
-        <Link href={"/signup"} className={styles.button}>
+        <Link href={Routes.SignupPage()} className={styles.button}>
          <strong>Sign Up</strong>
        </Link>
-        <Link href={"/login"} className={styles.loginButton}>
+        <Link href={Routes.LoginPage()} className={styles.loginButton}>
          <strong>Login</strong>
        </Link>
        <Link href="/api/auth/github/login" passHref legacyBehavior>
--- a/apps/web/src/blitz-server.ts
+++ b/apps/web/src/blitz-server.ts
@@ -13,6 +13,7 @@ const {gSSP, gSP, api} = setupBlitzServer({
    }),
  ],
  logger: BlitzLogger({
+    colorizePrettyLogs: true,
    prefix: ["[blitz]>>>>>"],
  }),
 })
--- a/flake.lock
+++ b/flake.lock
@@ -1,61 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1687709756,
-        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1688221086,
-        "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
--- a/flake.nix
+++ b/flake.nix
@@ -1,39 +0,0 @@
-{
-  description = "The Blitzjs Monorepo";
-  nixConfig.bash-prompt = "\[nix:blitz\]$ ";
-
-  inputs = {
-    nixpkgs = {
-      url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    };
-
-    flake-utils = {
-      url = "github:numtide/flake-utils";
-    };
-  };
-  
-  outputs = {
-    nixpkgs,
-    flake-utils,
-    ...
-  }:
-    flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = nixpkgs.legacyPackages.${system};
-    in {
-      formatter = pkgs.alejandra;
-
-      devShells = {
-        default = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            nodejs-18_x
-          ];
-          
-          shellHook = ''
-          mkdir -p $out/bin
-          ${pkgs.nodejs-18_x}/bin/corepack enable --install-directory $out/bin
-          export PATH="$out/bin:$PATH"
-          '';
-        };
-      };
-    });
-}
--- a/integration-tests/auth-with-rpc/package.json
+++ b/integration-tests/auth-with-rpc/package.json
@@ -17,14 +17,14 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.31",
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
-    "@blitzjs/next": "workspace:2.0.0-beta.31",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.31",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.31",
+    "blitz": "workspace:2.0.0-beta.27",
    "delay": "5.0.0",
    "next": "13.3.0",
    "prisma": "4.6.1",
--- a/integration-tests/auth/package.json
+++ b/integration-tests/auth/package.json
@@ -17,11 +17,11 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.31",
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
-    "@blitzjs/next": "workspace:2.0.0-beta.31",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.31",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
    "next": "13.3.0",
    "prisma": "4.6.1",
--- a/integration-tests/get-initial-props/package.json
+++ b/integration-tests/get-initial-props/package.json
@@ -16,11 +16,11 @@
    "schema": "db/schema.prisma"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.31",
-    "@blitzjs/next": "workspace:2.0.0-beta.31",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.31",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.31",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
    "next": "13.3.0",
    "prisma": "4.6.1",
@@ -28,7 +28,7 @@
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
    "@next/bundle-analyzer": "12.0.8",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
--- a/integration-tests/middleware/package.json
+++ b/integration-tests/middleware/package.json
@@ -11,10 +11,10 @@
    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
  },
  "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
-    "@blitzjs/next": "workspace:2.0.0-beta.31",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.31",
-    "blitz": "workspace:2.0.0-beta.31",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
+    "blitz": "workspace:2.0.0-beta.27",
    "next": "13.3.0",
    "react": "18.2.0",
    "react-dom": "18.2.0"
--- a/integration-tests/next-13-app-dir/package.json
+++ b/integration-tests/next-13-app-dir/package.json
@@ -17,12 +17,12 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.31",
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
-    "@blitzjs/next": "workspace:2.0.0-beta.31",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.31",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.31",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
    "next": "13.3.0",
    "prisma": "4.6.1",
--- a/integration-tests/no-suspense/package.json
+++ b/integration-tests/no-suspense/package.json
@@ -16,11 +16,11 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.31",
-    "@blitzjs/next": "workspace:2.0.0-beta.31",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.31",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.31",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
    "next": "13.3.0",
    "prisma": "4.6.1",
@@ -28,7 +28,7 @@
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
    "@next/bundle-analyzer": "12.0.8",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
--- a/integration-tests/qm/package.json
+++ b/integration-tests/qm/package.json
@@ -8,13 +8,13 @@
    "clean": "rm -rf .turbo && rm -rf node_modules"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.31",
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
-    "@blitzjs/next": "workspace:2.0.0-beta.31",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.31",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
    "@prisma/client": "4.6.1",
    "@tanstack/react-query": "4.0.10",
-    "blitz": "workspace:2.0.0-beta.31",
+    "blitz": "workspace:2.0.0-beta.27",
    "next": "13.3.0",
    "prisma": "4.6.1",
    "react": "18.2.0",
--- a/integration-tests/react-query-utils/package.json
+++ b/integration-tests/react-query-utils/package.json
@@ -16,10 +16,10 @@
    "schema": "db/schema.prisma"
  },
  "dependencies": {
-    "@blitzjs/next": "workspace:2.0.0-beta.31",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.31",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.31",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
    "next": "13.3.0",
    "prisma": "4.6.1",
@@ -27,7 +27,7 @@
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
    "@next/bundle-analyzer": "12.0.8",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
--- a/integration-tests/rpc-path-root/package.json
+++ b/integration-tests/rpc-path-root/package.json
@@ -7,10 +7,10 @@
    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
  },
  "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
-    "@blitzjs/next": "workspace:2.0.0-beta.31",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.31",
-    "blitz": "workspace:2.0.0-beta.31",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
+    "blitz": "workspace:2.0.0-beta.27",
    "next": "13.3.0",
    "react": "18.2.0",
    "react-dom": "18.2.0"
--- a/integration-tests/rpc/package.json
+++ b/integration-tests/rpc/package.json
@@ -7,10 +7,10 @@
    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
  },
  "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
-    "@blitzjs/next": "workspace:2.0.0-beta.31",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.31",
-    "blitz": "workspace:2.0.0-beta.31",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
+    "blitz": "workspace:2.0.0-beta.27",
    "next": "13.3.0",
    "react": "18.2.0",
    "react-dom": "18.2.0"
--- a/integration-tests/trailing-slash/package.json
+++ b/integration-tests/trailing-slash/package.json
@@ -16,11 +16,11 @@
    "schema": "db/schema.prisma"
  },
  "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.31",
-    "@blitzjs/next": "workspace:2.0.0-beta.31",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.31",
+    "@blitzjs/auth": "workspace:2.0.0-beta.27",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
    "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.31",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
    "next": "13.3.0",
    "prisma": "4.6.1",
@@ -28,7 +28,7 @@
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
    "@next/bundle-analyzer": "12.0.8",
    "@types/express": "4.17.13",
    "@types/fs-extra": "9.0.13",
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
    "prepare": "husky install",
    "build": "turbo run build",
    "build:apps": "turbo run buildapp --concurrency=1",
-    "dev": "turbo run dev --filter='./packages/*'",
+    "dev": "turbo run dev --no-cache --parallel",
    "lint": "turbo run lint",
    "test": "turbo run test",
    "clean": "turbo run clean && rm -rf node_modules",
@@ -34,12 +34,12 @@
    "prettier": "^2.7.1",
    "prettier-plugin-prisma": "4.4.0",
    "pretty-quick": "3.1.3",
-    "turbo": "1.10.7",
+    "turbo": "1.4.2",
    "vitest": "0.25.3",
    "wait-on": "6.0.1"
  },
  "npmClient": "pnpm",
-  "packageManager": "pnpm@8.6.6",
+  "packageManager": "pnpm@7.11.0",
  "manypkg": {
    "ignoredRules": [
      "EXTERNAL_MISMATCH"
--- a/packages/blitz-auth/CHANGELOG.md
+++ b/packages/blitz-auth/CHANGELOG.md
@@ -1,47 +1,5 @@
 # @blitzjs/auth

-## 2.0.0-beta.31
-
-### Patch Changes
-
- 90f1741da: blitz-auth: Support for Prisma v5
-
-  Internal: Make `handle` a required paramter while updating the `session` modal.
-
- Updated dependencies [90f1741da]
- Updated dependencies [df3265b85]
-  - blitz@2.0.0-beta.31
-
-## 2.0.0-beta.30
-
-### Patch Changes
-
- c5572bec6: blitz-auth: Fix webpack from following next-auth
- Updated dependencies [c5572bec6]
- Updated dependencies [727734955]
-  - blitz@2.0.0-beta.30
-
-## 2.0.0-beta.29
-
-### Patch Changes
-
- b6b9a1c5a: Fix Next-Auth integration: `Unable to use next-auth with provider: Error [ERR_PACKAGE_PATH_NOT_EXPORTED]`
- Updated dependencies [b6b9a1c5a]
- Updated dependencies [61888d1a3]
-  - blitz@2.0.0-beta.29
-
-## 2.0.0-beta.28
-
-### Minor Changes
-
- 1bb3a6556: Stop exporting `useAuthenticatedBlitzContext` from `@blitzjs/auth` this must be imported from `app/blitz-server.ts` file in order to work correctly
-
-### Patch Changes
-
- 5166e5e03: (feat) upgrade tslog to v4.8.2
- Updated dependencies [5166e5e03]
-  - blitz@2.0.0-beta.28
-
 ## 2.0.0-beta.27

 ### Patch Changes
--- a/packages/blitz-auth/package.json
+++ b/packages/blitz-auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/auth",
-  "version": "2.0.0-beta.31",
+  "version": "2.0.0-beta.27",
  "homepage": "https://blitzjs.com/",
  "repository": {
    "type": "git",
@@ -37,7 +37,6 @@
    "cookie": "0.4.1",
    "cookie-session": "2.0.0",
    "debug": "4.3.3",
-    "find-up": "4.1.0",
    "http": "0.0.1-security",
    "jsonwebtoken": "9.0.0",
    "nanoid": "3.2.0",
@@ -45,12 +44,11 @@
    "openid-client": "5.2.1",
    "passport": "0.6.0",
    "path": "0.12.7",
-    "resolve-from": "5.0.0",
    "supports-color": "8.1.1",
    "url": "0.11.0"
  },
  "peerDependencies": {
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "next": "*",
    "next-auth": "*",
    "secure-password": "4.0.0"
@@ -67,7 +65,7 @@
    }
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
    "@testing-library/react": "13.4.0",
    "@testing-library/react-hooks": "8.0.1",
    "@types/cookie": "0.4.1",
@@ -75,7 +73,7 @@
    "@types/jsonwebtoken": "8.5.8",
    "@types/react": "18.0.25",
    "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "next": "13.3.0",
    "next-auth": "4.18.7",
    "react": "18.2.0",
--- a/packages/blitz-auth/src/server/adapters/index.ts
+++ b/packages/blitz-auth/src/server/adapters/index.ts
@@ -1,2 +1 @@
 export * from "./passport/adapter"
-export * from "./next-auth/webpack"
--- a/packages/blitz-auth/src/server/adapters/next-auth.ts
+++ b/packages/blitz-auth/src/server/adapters/next-auth.ts
@@ -1,2 +1,3 @@
 export * from "./next-auth/adapter"
 export * from "./next-auth/types"
+export * from "./next-auth/webpack"
--- a/packages/blitz-auth/src/server/adapters/next-auth/adapter.ts
+++ b/packages/blitz-auth/src/server/adapters/next-auth/adapter.ts
@@ -27,9 +27,7 @@ import type {
 } from "./types"
 import {Provider} from "next-auth/providers"

-import {init} from "next-auth/core/init"
-import getAuthorizationUrl from "next-auth/core/lib/oauth/authorization-url"
-import oAuthCallback from "next-auth/core/lib/oauth/callback"
+export {withNextAuthAdapter} from "./webpack"

 const INTERNAL_REDIRECT_URL_KEY = "_redirectUrl"

@@ -104,6 +102,7 @@ export function NextAuthAdapter<P extends Provider[]>(
    if (providerId?.includes("?")) {
      providerId = providerId.split("?")[0]
    }
+    const {init} = await import("next-auth/core/init").then((m) => m)
    const {options, cookies} = await init({
      // @ts-ignore
      url: new URL(
@@ -159,6 +158,9 @@ async function AuthHandler<P extends Provider[]>(
  if (action === "login") {
    middleware.push(async (req, res, next) => {
      try {
+        const getAuthorizationUrl = await import("next-auth/core/lib/oauth/authorization-url").then(
+          (m) => m.default,
+        )
        const _signin = await getAuthorizationUrl({options: options, query: req.query})
        if (_signin.cookies) cookies.push(..._signin.cookies)
        const session = res.blitzCtx.session as SessionContext
@@ -189,6 +191,9 @@ async function AuthHandler<P extends Provider[]>(
    middleware.push(
      // eslint-disable-next-line no-shadow
      connectMiddleware(async (req, res, next) => {
+        const oAuthCallback = await import("next-auth/core/lib/oauth/callback").then(
+          (m) => m.default,
+        )
        try {
          const {profile, account, OAuthProfile} = await oAuthCallback({
            query: internalRequest.query,
--- a/packages/blitz-auth/src/server/adapters/next-auth/webpack.ts
+++ b/packages/blitz-auth/src/server/adapters/next-auth/webpack.ts
@@ -1,30 +1,15 @@
 //@ts-nocheck
-import path from "path"
-
 export function withNextAuthAdapter(nextConfig) {
  const config = Object.assign({}, nextConfig)
-  try {
-    const nextAuthPath = path.dirname(require.resolve("next-auth"))
-    const webpack = (config) => {
-      config.resolve.alias = {
-        ...config.resolve.alias,
-        "next-auth/core/lib/oauth/callback": path.join(nextAuthPath, "core/lib/oauth/callback.js"),
-        "next-auth/core/lib/oauth/authorization-url": path.join(
-          nextAuthPath,
-          "core/lib/oauth/authorization-url.js",
-        ),
-        "next-auth/core/init": path.join(nextAuthPath, "core/init.js"),
-      }
-      return config
-    }
-    if (typeof nextConfig.webpack === "function") {
-      config.webpack = (config, options) => {
-        return nextConfig.webpack(webpack(config), options)
-      }
-    }
-    config.webpack = webpack
-    return config
-  } catch (e) {
+  config.webpack = (config) => {
+    //add a required resolve alias
+    config.resolve.alias["next-auth/core/lib/oauth/callback"] =
+      process.cwd() + "/node_modules/next-auth/core/lib/oauth/callback.js"
+    config.resolve.alias["next-auth/core/lib/oauth/authorization-url"] =
+      process.cwd() + "/node_modules/next-auth/core/lib/oauth/authorization-url.js"
+    config.resolve.alias["next-auth/core/init"] =
+      process.cwd() + "/node_modules/next-auth/core/init.js"
    return config
  }
+  return config
 }
--- a/packages/blitz-auth/src/server/auth-plugin.ts
+++ b/packages/blitz-auth/src/server/auth-plugin.ts
@@ -31,7 +31,7 @@ interface PrismaClientWithSession {
    }): Promise<SessionModel>
    update(args: {
      data: Partial<SessionModel>
-      where: {handle: SessionModel["handle"]}
+      where: {handle?: SessionModel["handle"]}
    }): Promise<SessionModel>
    delete(args: {where: {handle?: SessionModel["handle"]}}): Promise<SessionModel>
  }
--- a/packages/blitz-auth/src/server/auth-sessions.ts
+++ b/packages/blitz-auth/src/server/auth-sessions.ts
@@ -220,7 +220,7 @@ export async function useAuthenticatedBlitzContext({
  redirectAuthenticatedTo?: string | RouteUrlObject | ((ctx: Ctx) => string | RouteUrlObject)
  role?: string | string[]
 }): Promise<void> {
-  const log = baseLogger().getSubLogger({name: "useAuthenticatedBlitzContext"})
+  const log = baseLogger().getChildLogger()
  const customChalk = new chalk.Instance({
    level: log.settings.type === "json" ? 0 : chalk.level,
  })
--- a/packages/blitz-auth/src/server/index.ts
+++ b/packages/blitz-auth/src/server/index.ts
@@ -1,16 +1,4 @@
+export * from "./auth-sessions"
 export * from "./auth-utils"
 export * from "./auth-plugin"
 export * from "./adapters"
-
-export {
-  SessionContextClass,
-  getAllSessionHandlesForUser,
-  getCookieParser,
-  getSession,
-  isLocalhost,
-  setPublicDataForUser,
-  setCookie,
-  simpleRolesIsAuthorized,
-  getBlitzContext,
-} from "./auth-sessions"
-export type {AnonymousSessionPayload, SimpleRolesIsAuthorized} from "./auth-sessions"
--- a/packages/blitz-auth/turbo.json
+++ b/packages/blitz-auth/turbo.json
@@ -1,11 +0,0 @@
-{
-  "$schema": "https://turbo.build/schema.json",
-  "extends": ["//"],
-  "pipeline": {
-    "dev": {
-      "dependsOn": ["blitz#build"],
-      "persistent": true,
-      "cache": false
-    }
-  }
-}
--- a/packages/blitz-next/CHANGELOG.md
+++ b/packages/blitz-next/CHANGELOG.md
@@ -1,43 +1,5 @@
 # @blitzjs/next

-## 2.0.0-beta.31
-
-### Patch Changes
-
- Updated dependencies [90f1741da]
- Updated dependencies [df3265b85]
-  - blitz@2.0.0-beta.31
-  - @blitzjs/rpc@2.0.0-beta.31
-
-## 2.0.0-beta.30
-
-### Patch Changes
-
- Updated dependencies [c5572bec6]
- Updated dependencies [727734955]
-  - blitz@2.0.0-beta.30
-  - @blitzjs/rpc@2.0.0-beta.30
-
-## 2.0.0-beta.29
-
-### Patch Changes
-
- Updated dependencies [b6b9a1c5a]
- Updated dependencies [61888d1a3]
-  - blitz@2.0.0-beta.29
-  - @blitzjs/rpc@2.0.0-beta.29
-
-## 2.0.0-beta.28
-
-### Patch Changes
-
- 5166e5e03: (feat) upgrade tslog to v4.8.2
- Updated dependencies [5166e5e03]
- Updated dependencies [2533caf48]
- Updated dependencies [c7ac86b85]
-  - @blitzjs/rpc@2.0.0-beta.28
-  - blitz@2.0.0-beta.28
-
 ## 2.0.0-beta.27

 ### Minor Changes
--- a/packages/blitz-next/package.json
+++ b/packages/blitz-next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/next",
-  "version": "2.0.0-beta.31",
+  "version": "2.0.0-beta.27",
  "homepage": "https://blitzjs.com/",
  "repository": {
    "type": "git",
@@ -29,7 +29,7 @@
    "eslint.js"
  ],
  "dependencies": {
-    "@blitzjs/rpc": "2.0.0-beta.31",
+    "@blitzjs/rpc": "2.0.0-beta.27",
    "@types/hoist-non-react-statics": "3.3.1",
    "debug": "4.3.3",
    "fs-extra": "10.0.1",
@@ -38,24 +38,22 @@
    "supports-color": "8.1.1"
  },
  "peerDependencies": {
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "next": "*",
-    "react": "*",
-    "tslog": "*"
+    "react": "*"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
    "@testing-library/dom": "8.13.0",
    "@testing-library/jest-dom": "5.16.3",
    "@testing-library/react": "13.4.0",
    "@testing-library/react-hooks": "8.0.1",
    "@testing-library/user-event": "13.5.0",
-    "@types/debug": "4.1.7",
    "@types/node": "18.11.9",
    "@types/react": "18.0.25",
    "@types/react-dom": "17.0.14",
    "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "cross-spawn": "7.0.3",
    "find-up": "4.1.0",
    "next": "13.3.0",
@@ -64,7 +62,6 @@
    "react-dom": "18.2.0",
    "resolve-from": "5.0.0",
    "ts-jest": "27.1.4",
-    "tslog": "4.8.2",
    "typescript": "^4.8.4",
    "unbuild": "0.7.6",
    "watch": "1.0.2"
--- a/packages/blitz-next/src/error-boundary.test.tsx
+++ b/packages/blitz-next/src/error-boundary.test.tsx
@@ -211,9 +211,8 @@ test("withErrorBoundary HOC", () => {
  expect(cleanStack(onErrorComponentStack)).toMatchInlineSnapshot(`
    {
      "componentStack": "
-        at __vite_ssr_import_4__.withErrorBoundary.FallbackComponent 
-        at ErrorBoundaryRoot 
-        at WithRouterWrapper 
+        at ErrorBoundaryRoot
+        at withRouter
        at withErrorBoundary",
    }
  `)
--- a/packages/blitz-next/src/error-boundary.tsx
+++ b/packages/blitz-next/src/error-boundary.tsx
@@ -3,7 +3,6 @@ import {NextRouter, withRouter} from "next/router"
 import * as React from "react"
 import {RouterContext} from "./router-context"
 import _debug from "debug"
-import {ExcludeRouterProps} from "next/dist/client/with-router"

 const debug = _debug("blitz:errorboundary")

@@ -73,9 +72,7 @@ type ErrorBoundaryState = {error: Error | null}

 const initialState: ErrorBoundaryState = {error: null}

-const ErrorBoundary: React.ComponentType<
-  ExcludeRouterProps<React.PropsWithChildren<ErrorBoundaryProps>>
-> = withRouter(
+const ErrorBoundary = withRouter(
  class ErrorBoundaryRoot extends React.Component<
    React.PropsWithRef<React.PropsWithChildren<ErrorBoundaryProps>>,
    ErrorBoundaryState
--- a/packages/blitz-next/src/index-server.ts
+++ b/packages/blitz-next/src/index-server.ts
@@ -230,7 +230,6 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
 export interface BlitzConfig extends NextConfig {
  blitz?: {
    resolverPath?: ResolverPathOptions
-    resolversDynamicImport?: boolean
    includeRPCFolders?: string[]
    customServer?: {
      hotReload?: boolean
@@ -262,8 +261,6 @@ export function withBlitz(nextConfig: BlitzConfig = {}): NextConfig {
        webpackConfig: config,
        webpackRuleOptions: {
          resolverPath: nextConfig.blitz?.resolverPath,
-          resolversDynamicImport:
-            nextConfig.blitz?.resolversDynamicImport ?? Boolean(process.env.VERCEL),
          includeRPCFolders: nextConfig.blitz?.includeRPCFolders,
        },
      })
--- a/packages/blitz-next/turbo.json
+++ b/packages/blitz-next/turbo.json
@@ -1,11 +0,0 @@
-{
-  "$schema": "https://turbo.build/schema.json",
-  "extends": ["//"],
-  "pipeline": {
-    "dev": {
-      "dependsOn": ["@blitzjs/rpc#build", "blitz#build"],
-      "persistent": true,
-      "cache": false
-    }
-  }
-}
--- a/packages/blitz-rpc/CHANGELOG.md
+++ b/packages/blitz-rpc/CHANGELOG.md
@@ -1,127 +1,5 @@
 # @blitzjs/rpc

-## 2.0.0-beta.31
-
-### Patch Changes
-
- Updated dependencies [90f1741da]
- Updated dependencies [df3265b85]
-  - blitz@2.0.0-beta.31
-
-## 2.0.0-beta.30
-
-### Patch Changes
-
- 727734955: ### Now we can configure Blitz RPC in the following way,
-
-  In your `[[...blitz]].ts` api file you can see the following settings
-
-  ```ts
-  logging?: {
-    /**
-     * allowList Represents the list of routes for which logging should be enabled
-     * If whiteList is defined then only those routes will be logged
-     */
-    allowList?: string[]
-    /**
-     * blockList Represents the list of routes for which logging should be disabled
-     * If blockList is defined then all routes except those will be logged
-     */
-    blockList?: string[]
-    /**
-     * verbose Represents the flag to enable/disable logging
-     * If verbose is true then Blitz RPC will log the input and output of each resolver
-     */
-    verbose?: boolean
-    /**
-     * disablelevel Represents the flag to enable/disable logging for a particular level
-     */
-    disablelevel?: "debug" | "info"
-  }
-  ```
-
-  ```ts
-  import { rpcHandler } from "@blitzjs/rpc"
-  import { api } from "src/blitz-server"
-
-  export default api(
-    rpcHandler({
-      onError: console.log,
-      formatError: (error) => {
-        error.message = `FormatError handler: ${error.message}`
-        return error
-      },
-     logging: {
-  ...
-  }
-    })
-  )
-  ```
-
-  Example:
-
-  ```ts
-  export default api(
-    rpcHandler({
-      onError: console.log,
-      formatError: (error) => {
-        error.message = `FormatError handler: ${error.message}`
-        return error
-      },
-      logging: {
-        verbose: true,
-        blockList: ["getCurrentUser", ...], //just write the resolver name [which is the resolver file name]
-      },
-    })
-  )
-  ```
-
-  This is enable verbose blitz rpc logging for all resolvers except the resolvers `getCurrentUser` and others mentioned in the `blockList`
-
- Updated dependencies [c5572bec6]
- Updated dependencies [727734955]
-  - blitz@2.0.0-beta.30
-
-## 2.0.0-beta.29
-
-### Patch Changes
-
- Updated dependencies [b6b9a1c5a]
- Updated dependencies [61888d1a3]
-  - blitz@2.0.0-beta.29
-
-## 2.0.0-beta.28
-
-### Patch Changes
-
- 5166e5e03: (feat) upgrade tslog to v4.8.2
- 2533caf48: Fix return type of `requestMiddlewares` in `RpcServerPlugin`
- c7ac86b85: Fixes enormous memory consumption of the dev server by changing the default import strategy to "require" instead of "import" which in webpack causes multiple chunks to be created for each import.
-
-  ## Blitz Configuration
-
-  To configure this behaviour, you can add the following to your next.config.js:
-
-  ```js
-  /**
-   * @type {import('@blitzjs/next').BlitzConfig}
-   **/
-  const config = {
-    blitz: {
-      resolversDynamicImport: true,
-    },
-  }
-  ```
-
-  When `resolversDynamicImport` is set to `true`, the import strategy will be "import" instead of "require".
-
-  ### On Vercel
-
-  If you are using Vercel, `resolversDynamicImport` will be set to `true` by default, since it is better for the separate chunks to be create for serverless lambdas.
-
- Updated dependencies [5166e5e03]
-  - blitz@2.0.0-beta.28
-
 ## 2.0.0-beta.27

 ### Minor Changes
--- a/packages/blitz-rpc/package.json
+++ b/packages/blitz-rpc/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/rpc",
-  "version": "2.0.0-beta.31",
+  "version": "2.0.0-beta.27",
  "homepage": "https://blitzjs.com/",
  "repository": {
    "type": "git",
@@ -37,18 +37,18 @@
  },
  "peerDependencies": {
    "@tanstack/query-core": "4.24.4",
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "next": "*",
    "react": "*"
  },
  "devDependencies": {
-    "@blitzjs/auth": "2.0.0-beta.31",
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
+    "@blitzjs/auth": "2.0.0-beta.27",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
    "@tanstack/query-core": "4.24.4",
    "@types/debug": "4.1.7",
    "@types/react": "18.0.25",
    "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "next": "13.3.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
--- a/packages/blitz-rpc/src/index-server.ts
+++ b/packages/blitz-rpc/src/index-server.ts
@@ -3,7 +3,6 @@ import {NextApiRequest, NextApiResponse} from "next"
 import {deserialize, parse, serialize as superjsonSerialize} from "superjson"
 import {resolve} from "path"
 import chalk from "chalk"
-import {LoaderOptions} from "./server/loader/utils/loader-utils"

 // TODO - optimize end user server bundles by not exporting all client stuff here
 export * from "./index-browser"
@@ -61,11 +60,16 @@ const loaderClient = resolve(dir, "./loader-client.cjs")
 const loaderServer = resolve(dir, "./loader-server.cjs")
 const loaderServerResolvers = resolve(dir, "./loader-server-resolvers.cjs")

+interface WebpackRuleOptions {
+  resolverPath: ResolverPathOptions | undefined
+  includeRPCFolders: string[] | undefined
+}
+
 interface WebpackRule {
  test: RegExp
  use: Array<{
    loader: string
-    options: LoaderOptions
+    options: WebpackRuleOptions
  }>
 }

@@ -80,7 +84,7 @@ export interface InstallWebpackConfigOptions {
      rules: WebpackRule[]
    }
  }
-  webpackRuleOptions: LoaderOptions
+  webpackRuleOptions: WebpackRuleOptions
 }

 export function installWebpackConfig({
@@ -146,59 +150,6 @@ async function getResolverMap(): Promise<ResolverFiles | null | undefined> {
 interface RpcConfig {
  onError?: (error: Error) => void
  formatError?: (error: Error) => Error
-  logging?: {
-    /**
-     * allowList Represents the list of routes for which logging should be enabled
-     * If allowList is defined then only those routes will be logged
-     */
-    allowList?: string[]
-    /**
-     * blockList Represents the list of routes for which logging should be disabled
-     * If blockList is defined then all routes except those will be logged
-     */
-    blockList?: string[]
-    /**
-     * verbose Represents the flag to enable/disable logging
-     * If verbose is true then Blitz RPC will log the input and output of each resolver
-     */
-    verbose?: boolean
-    /**
-     * disablelevel Represents the flag to enable/disable logging for a particular level
-     */
-    disablelevel?: "debug" | "info"
-  }
-}
-
-function isBlitzRPCVerbose(resolverName: string, config: RpcConfig, level: string) {
-  // blitz rpc is by default verbose - to keep current behaviour
-  if (!config.logging) {
-    return true
-  }
-  //if logging exists and verbose is not defined then default to true
-  if (config.logging && !("verbose" in config.logging)) {
-    return true
-  }
-  const isLevelDisabled = config.logging?.disablelevel === level
-  if (config.logging?.verbose) {
-    // If allowList array is defined then allow only those routes in allowList
-    if (config.logging?.allowList) {
-      if (config.logging?.allowList?.includes(resolverName) && !isLevelDisabled) {
-        return true
-      }
-    }
-    // If blockList array is defined then allow all routes except those in blockList
-    if (config.logging?.blockList) {
-      if (!config.logging?.blockList?.includes(resolverName) && !isLevelDisabled) {
-        return true
-      }
-    }
-    // if both allowList and blockList are not defined, then allow all routes
-    if (!config.logging?.allowList && !config.logging?.blockList && !isLevelDisabled) {
-      return true
-    }
-    return false
-  }
-  return false
 }

 export function rpcHandler(config: RpcConfig) {
@@ -212,11 +163,9 @@ export function rpcHandler(config: RpcConfig) {

    const relativeRoutePath = (req.query.blitz as string[])?.join("/")
    const routePath = "/" + relativeRoutePath
-    const resolverName = routePath.replace(/(\/api\/rpc)?\//, "")

-    const log = baseLogger().getSubLogger({
-      name: "blitz-rpc",
-      prefix: [resolverName + "()"],
+    const log = baseLogger().getChildLogger({
+      prefix: [routePath.replace(/(\/api\/rpc)?\//, "") + "()"],
    })
    const customChalk = new chalk.Instance({
      level: log.settings.type === "json" ? 0 : chalk.level,
@@ -267,16 +216,11 @@ export function rpcHandler(config: RpcConfig) {
              ? parse(`${req.query.meta}`)
              : undefined,
        })
-        if (isBlitzRPCVerbose(resolverName, config, "info")) {
-          log.info(customChalk.dim("Starting with input:"), data ? data : JSON.stringify(data))
-        }
+        log.info(customChalk.dim("Starting with input:"), data ? data : JSON.stringify(data))
        const startTime = Date.now()
        const result = await resolver(data, (res as any).blitzCtx)
        const resolverDuration = Date.now() - startTime
-
-        if (isBlitzRPCVerbose(resolverName, config, "debug")) {
-          log.debug(customChalk.dim("Result:"), result ? result : JSON.stringify(result))
-        }
+        log.debug(customChalk.dim("Result:"), result ? result : JSON.stringify(result))

        const serializerStartTime = Date.now()
        const serializedResult = superjsonSerialize(result)
@@ -290,26 +234,21 @@ export function rpcHandler(config: RpcConfig) {
            result: serializedResult.meta,
          },
        })
-
-        if (isBlitzRPCVerbose(resolverName, config, "debug")) {
-          log.debug(
-            customChalk.dim(
-              `Next.js serialization:${prettyMs(Date.now() - nextSerializerStartTime)}`,
-            ),
-          )
-        }
-
+        log.debug(
+          customChalk.dim(
+            `Next.js serialization:${prettyMs(Date.now() - nextSerializerStartTime)}`,
+          ),
+        )
        const serializerDuration = Date.now() - serializerStartTime
        const duration = Date.now() - startTime
-        if (isBlitzRPCVerbose(resolverName, config, "info")) {
-          log.info(
-            customChalk.dim(
-              `Finished: resolver:${prettyMs(resolverDuration)} serializer:${prettyMs(
-                serializerDuration,
-              )} total:${prettyMs(duration)}`,
-            ),
-          )
-        }
+
+        log.info(
+          customChalk.dim(
+            `Finished: resolver:${prettyMs(resolverDuration)} serializer:${prettyMs(
+              serializerDuration,
+            )} total:${prettyMs(duration)}`,
+          ),
+        )
        newLine()

        return
--- a/packages/blitz-rpc/src/server/loader/server/loader-server.ts
+++ b/packages/blitz-rpc/src/server/loader/server/loader-server.ts
@@ -64,14 +64,12 @@ export async function transformBlitzRpcServer(
      extraRpcBasePaths: options?.includeRPCFolders,
    })

-    const importStrategy = options?.resolversDynamicImport ? "import" : "require"
-
-    code += `__internal_addBlitzRpcResolver('${routePath}',() => ${importStrategy}('${slash(
+    code += `__internal_addBlitzRpcResolver('${routePath}',() => import('${slash(
      resolverFilePath,
    )}'));`
    code += "\n"
  }
-
+  // console.log("NEW CODE", code)
  return code
 }

--- a/packages/blitz-rpc/src/server/loader/utils/loader-utils.ts
+++ b/packages/blitz-rpc/src/server/loader/utils/loader-utils.ts
@@ -3,9 +3,8 @@ import {posix, sep, win32, join, normalize} from "path"
 import {ResolverPathOptions} from "../../../index-server"

 export interface LoaderOptions {
-  resolverPath?: ResolverPathOptions
+  resolverPath: ResolverPathOptions
  includeRPCFolders?: string[]
-  resolversDynamicImport?: boolean
 }

 export interface Loader {
--- a/packages/blitz-rpc/src/server/plugin.ts
+++ b/packages/blitz-rpc/src/server/plugin.ts
@@ -1,9 +1,9 @@
-import {RequestMiddleware, createServerPlugin} from "blitz"
+import {createServerPlugin} from "blitz"
 import {invoke} from "../client/invoke"

 export const RpcServerPlugin = createServerPlugin(() => {
  return {
-    requestMiddlewares: [] as RequestMiddleware<any, any, void | Promise<void>>[],
+    requestMiddlewares: [],
    exports: () => ({
      invoke,
    }),
--- a/packages/blitz-rpc/turbo.json
+++ b/packages/blitz-rpc/turbo.json
@@ -1,11 +0,0 @@
-{
-  "$schema": "https://turbo.build/schema.json",
-  "extends": ["//"],
-  "pipeline": {
-    "dev": {
-      "dependsOn": ["@blitzjs/auth#build", "blitz#build"],
-      "persistent": true,
-      "cache": false
-    }
-  }
-}
--- a/packages/blitz/CHANGELOG.md
+++ b/packages/blitz/CHANGELOG.md
@@ -1,106 +1,5 @@
 # blitz

-## 2.0.0-beta.31
-
-### Patch Changes
-
- 90f1741da: blitz-auth: Support for Prisma v5
-
-  Internal: Make `handle` a required paramter while updating the `session` modal.
-
- df3265b85: blitz-rpc: Cleanup Event Listeners - Fix potential memory leak by cleaning up any residual event listeners set by blitz.
-  - @blitzjs/generator@2.0.0-beta.31
-
-## 2.0.0-beta.30
-
-### Patch Changes
-
- c5572bec6: blitz-auth: Fix webpack from following next-auth
- 727734955: ### Now we can configure Blitz RPC in the following way,
-
-  In your `[[...blitz]].ts` api file you can see the following settings
-
-  ```ts
-  logging?: {
-    /**
-     * allowList Represents the list of routes for which logging should be enabled
-     * If whiteList is defined then only those routes will be logged
-     */
-    allowList?: string[]
-    /**
-     * blockList Represents the list of routes for which logging should be disabled
-     * If blockList is defined then all routes except those will be logged
-     */
-    blockList?: string[]
-    /**
-     * verbose Represents the flag to enable/disable logging
-     * If verbose is true then Blitz RPC will log the input and output of each resolver
-     */
-    verbose?: boolean
-    /**
-     * disablelevel Represents the flag to enable/disable logging for a particular level
-     */
-    disablelevel?: "debug" | "info"
-  }
-  ```
-
-  ```ts
-  import { rpcHandler } from "@blitzjs/rpc"
-  import { api } from "src/blitz-server"
-
-  export default api(
-    rpcHandler({
-      onError: console.log,
-      formatError: (error) => {
-        error.message = `FormatError handler: ${error.message}`
-        return error
-      },
-     logging: {
-  ...
-  }
-    })
-  )
-  ```
-
-  Example:
-
-  ```ts
-  export default api(
-    rpcHandler({
-      onError: console.log,
-      formatError: (error) => {
-        error.message = `FormatError handler: ${error.message}`
-        return error
-      },
-      logging: {
-        verbose: true,
-        blockList: ["getCurrentUser", ...], //just write the resolver name [which is the resolver file name]
-      },
-    })
-  )
-  ```
-
-  This is enable verbose blitz rpc logging for all resolvers except the resolvers `getCurrentUser` and others mentioned in the `blockList`
-
-  - @blitzjs/generator@2.0.0-beta.30
-
-## 2.0.0-beta.29
-
-### Patch Changes
-
- b6b9a1c5a: Fix Next-Auth integration: `Unable to use next-auth with provider: Error [ERR_PACKAGE_PATH_NOT_EXPORTED]`
- 61888d1a3: Fix log formatting to not show the path of blitz rpc
- Updated dependencies [7aef610d8]
-  - @blitzjs/generator@2.0.0-beta.29
-
-## 2.0.0-beta.28
-
-### Patch Changes
-
- 5166e5e03: (feat) upgrade tslog to v4.8.2
- Updated dependencies [5166e5e03]
-  - @blitzjs/generator@2.0.0-beta.28
-
 ## 2.0.0-beta.27

 ### Patch Changes
--- a/packages/blitz/package.json
+++ b/packages/blitz/package.json
@@ -1,6 +1,6 @@
 {
  "name": "blitz",
-  "version": "2.0.0-beta.31",
+  "version": "2.0.0-beta.27",
  "homepage": "https://blitzjs.com/",
  "repository": {
    "type": "git",
@@ -30,7 +30,7 @@
    "blitz": "bin/blitz"
  },
  "dependencies": {
-    "@blitzjs/generator": "2.0.0-beta.31",
+    "@blitzjs/generator": "2.0.0-beta.27",
    "@mrleebo/prisma-ast": "0.2.6",
    "@types/global-agent": "2.1.1",
    "arg": "5.0.1",
@@ -76,11 +76,11 @@
    "tar": "6.1.11",
    "ts-node": "10.9.1",
    "tsconfig-paths": "4.0.0",
-    "tslog": "4.8.2",
+    "tslog": "3.3.4",
    "watchpack": "2.1.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.31",
+    "@blitzjs/config": "workspace:2.0.0-beta.27",
    "@types/cookie": "0.4.1",
    "@types/cross-spawn": "6.0.2",
    "@types/debug": "4.1.7",
--- a/packages/blitz/src/cli/commands/install.ts
+++ b/packages/blitz/src/cli/commands/install.ts
@@ -45,7 +45,7 @@ const pipeline = promisify(Stream.pipeline)
 const got = async (url: string) => {
  return require("got")(url).catch((e: any) => {
    if (e.response.statusCode === 403) {
-      baseLogger().error(e.response.body)
+      baseLogger({displayDateTime: false}).error(e.response.body)
    } else {
      return e
    }
@@ -264,7 +264,7 @@ const install: CliCommand = async () => {

      if (!(await isUrlValid(packageJsonPath))) {
        debug("Url is invalid for ", packageJsonPath)
-        baseLogger().error(`Could not find recipe "${args._[1]}"\n`)
+        baseLogger({displayDateTime: false}).error(`Could not find recipe "${args._[1]}"\n`)
        console.log(`${chalk.bold("Please provide one of the following:")}

 1. The name of a recipe to install (e.g. "tailwind")
--- a/packages/blitz/src/cli/commands/new.ts
+++ b/packages/blitz/src/cli/commands/new.ts
@@ -12,9 +12,8 @@ import {codegenTasks} from "../utils/codegen-tasks"

 type NotUndefined<T> = T extends undefined ? never : T
 const forms: Record<NotUndefined<AppGeneratorOptions["form"]>, string> = {
-  finalform: "React Final Form (recommended)",
+  tanstack: "Tanstack Form (Recommended)",
  hookform: "React Hook Form",
-  formik: "Formik",
 }

 const language = {
@@ -75,7 +74,7 @@ const args = arg(
 let projectName: string = ""
 let projectPath: string = ""
 let projectLanguage: string | TLanguage = ""
-let projectFormLib: AppGeneratorOptions["form"] = "finalform"
+let projectFormLib: AppGeneratorOptions["form"] = "tanstack"
 let projectTemplate: AppGeneratorOptions["template"] = templates.full
 let projectPkgManger: TPkgManager = PREFERABLE_PKG_MANAGER
 let shouldInstallDeps: boolean = true
--- a/packages/blitz/src/global.ts
+++ b/packages/blitz/src/global.ts
@@ -5,5 +5,4 @@ declare global {
    beforeHttpRequest: BeforeHttpRequest
    beforeHttpResponse: BeforeHttpResponse
  }
-  var __BLITZ_CLEAN_UP_LISTENERS: () => void
 }
--- a/packages/blitz/src/installer/recipe-executor.tsx
+++ b/packages/blitz/src/installer/recipe-executor.tsx
@@ -41,9 +41,11 @@ export class RecipeExecutor<Options extends RecipeMeta> {
        {exitOnCtrlC: false},
      )
      await waitUntilExit()
-      baseLogger().info(`\n🎉 The ${this.options.name} recipe has been installed!\n`)
+      baseLogger({displayDateTime: false, displayLogLevel: false}).info(
+        `\n🎉 The ${this.options.name} recipe has been installed!\n`,
+      )
    } catch (e) {
-      baseLogger().error(e as any)
+      baseLogger({displayDateTime: false}).error(e as any)
      return
    }
  }
--- a/packages/blitz/src/logging.ts
+++ b/packages/blitz/src/logging.ts
@@ -1,18 +1,18 @@
-import {ILogObj, ISettingsParam, Logger, IMeta} from "tslog"
+import {ISettingsParam, Logger, TLogLevelName} from "tslog"
 import c from "chalk"
 import {Table} from "console-table-printer"
 import ora from "ora"
 import readline from "readline"

-export type BlitzLoggerSettings = ISettingsParam<ILogObj>
-export type BlitzLogLevel = "trace" | "debug" | "info" | "warn" | "error" | "fatal"
+export type BlitzLoggerSettings = ISettingsParam
+export type BlitzLogLevel = TLogLevelName

 declare namespace globalThis {
-  let _blitz_baseLogger: Logger<ILogObj>
+  let _blitz_baseLogger: Logger
  let _blitz_logLevel: BlitzLogLevel
 }

-export const baseLogger = (options: BlitzLoggerSettings = {}): Logger<ILogObj> => {
+export const baseLogger = (options: BlitzLoggerSettings = {}): Logger => {
  if (globalThis._blitz_baseLogger) return globalThis._blitz_baseLogger

  globalThis._blitz_baseLogger = BlitzLogger(options)
@@ -22,18 +22,34 @@ export const baseLogger = (options: BlitzLoggerSettings = {}): Logger<ILogObj> =

 export const BlitzLogger = (settings: BlitzLoggerSettings = {}) => {
  const baseLogger = new Logger({
-    prettyLogTimeZone: process.env.NODE_ENV === "production" ? "UTC" : "local",
+    minLevel: "info",
+    type: "pretty",
+    dateTimePattern:
+      process.env.NODE_ENV === "production"
+        ? "year-month-day hour:minute:second.millisecond"
+        : "hour:minute:second.millisecond",
+    displayFunctionName: false,
+    displayFilePath: "hidden",
+    displayRequestId: false,
+    dateTimeTimezone:
+      process.env.NODE_ENV === "production"
+        ? "utc"
+        : Intl.DateTimeFormat().resolvedOptions().timeZone,
+    prettyInspectHighlightStyles: {
+      name: "yellow",
+      number: "blue",
+      bigint: "blue",
+      boolean: "blue",
+    },
    maskValuesOfKeys: ["password", "passwordConfirmation", "currentPassword"],
-    type: process.env.NODE_ENV === "production" ? "json" : "pretty",
-    prettyLogTemplate:
-      "{{yyyy}}.{{mm}}.{{dd}} {{hh}}:{{MM}}:{{ss}}:{{ms}}\t{{logLevelName}}\t[{{name}}]\t",
+    exposeErrorCodeFrame: process.env.NODE_ENV !== "production",
    ...settings,
  })

  return baseLogger
 }

-export const initializeLogger = (logger: Logger<ILogObj>) => {
+export const initializeLogger = (logger: Logger) => {
  globalThis._blitz_baseLogger = logger
 }

--- a/packages/blitz/src/plugin.ts
+++ b/packages/blitz/src/plugin.ts
@@ -89,23 +89,13 @@ export function reduceBlitzClientPlugins<TPlugins extends readonly ClientPlugin<
  globalThis.__BLITZ_MIDDLEWARE_HOOKS = middleware

  if (isClient) {
-    if (globalThis.__BLITZ_CLEAN_UP_LISTENERS) {
-      globalThis.__BLITZ_CLEAN_UP_LISTENERS()
-    }
-    const onSessionCreated = async () => {
+    document.addEventListener("blitz:session-created", async () => {
      await Promise.all(events.onSessionCreated())
-    }
-    const onRpcError = async (e: Event): Promise<void> => {
+    })
+    document.addEventListener("blitz:rpc-error", async (e) => {
      const customEvent = e as CustomEvent<Error>
      await Promise.all(events.onRpcError(customEvent.detail))
-    }
-    document.addEventListener("blitz:session-created", onSessionCreated)
-    document.addEventListener("blitz:rpc-error", onRpcError)
-
-    globalThis.__BLITZ_CLEAN_UP_LISTENERS = () => {
-      document.removeEventListener("blitz:session-created", onSessionCreated)
-      document.removeEventListener("blitz:rpc-error", onRpcError)
-    }
+    })
  }

  const withPlugins = compose(...providers)
--- a/packages/blitz/turbo.json
+++ b/packages/blitz/turbo.json
@@ -1,11 +0,0 @@
-{
-  "$schema": "https://turbo.build/schema.json",
-  "extends": ["//"],
-  "pipeline": {
-    "dev": {
-      "dependsOn": ["@blitzjs/generator#build"],
-      "persistent": true,
-      "cache": false
-    }
-  }
-}
--- a/packages/codemod/CHANGELOG.md
+++ b/packages/codemod/CHANGELOG.md
@@ -1,41 +1,5 @@
 # @blitzjs/codemod

-## 2.0.0-beta.31
-
-### Patch Changes
-
- Updated dependencies [90f1741da]
- Updated dependencies [df3265b85]
-  - blitz@2.0.0-beta.31
-  - @blitzjs/generator@2.0.0-beta.31
-
-## 2.0.0-beta.30
-
-### Patch Changes
-
- Updated dependencies [c5572bec6]
- Updated dependencies [727734955]
-  - blitz@2.0.0-beta.30
-  - @blitzjs/generator@2.0.0-beta.30
-
-## 2.0.0-beta.29
-
-### Patch Changes
-
- Updated dependencies [7aef610d8]
- Updated dependencies [b6b9a1c5a]
- Updated dependencies [61888d1a3]
-  - @blitzjs/generator@2.0.0-beta.29
-  - blitz@2.0.0-beta.29
-
-## 2.0.0-beta.28
-
-### Patch Changes
-
- Updated dependencies [5166e5e03]
-  - blitz@2.0.0-beta.28
-  - @blitzjs/generator@2.0.0-beta.28
-
 ## 2.0.0-beta.27

 ### Patch Changes
--- a/packages/codemod/package.json
+++ b/packages/codemod/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/codemod",
-  "version": "2.0.0-beta.31",
+  "version": "2.0.0-beta.27",
  "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.31",
+    "@blitzjs/generator": "2.0.0-beta.27",
    "arg": "5.0.1",
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "chalk": "^4.1.0",
    "cross-spawn": "7.0.3",
    "debug": "4.3.3",
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,13 +1,5 @@
 # @blitzjs/config

-## 2.0.0-beta.31
-
-## 2.0.0-beta.30
-
-## 2.0.0-beta.29
-
-## 2.0.0-beta.28
-
 ## 2.0.0-beta.27

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

-## 2.0.0-beta.31
-
-## 2.0.0-beta.30
-
-## 2.0.0-beta.29
-
-### Patch Changes
-
- 7aef610d8: Make Next.js version stick to 13.4.5 when generating a new app
-
-## 2.0.0-beta.28
-
-### Patch Changes
-
- 5166e5e03: (feat) upgrade tslog to v4.8.2
-
 ## 2.0.0-beta.27

 ### Patch Changes
--- a/packages/generator/package.json
+++ b/packages/generator/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/generator",
-  "version": "2.0.0-beta.31",
+  "version": "2.0.0-beta.27",
  "homepage": "https://blitzjs.com/",
  "repository": {
    "type": "git",
@@ -48,13 +48,13 @@
    "prettier": "^2.7.1",
    "recast": "0.20.5",
    "supports-color": "8.1.1",
-    "tslog": "4.8.2",
+    "tslog": "3.3.4",
    "username": "5.1.0",
    "vinyl": "2.2.1",
    "zod": "3.20.2"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.31",
+    "@blitzjs/config": "2.0.0-beta.27",
    "@juanm04/cpx": "2.0.1",
    "@types/babel__core": "7.1.19",
    "@types/diff": "5.0.2",
--- a/packages/generator/src/generators/app-generator.ts
+++ b/packages/generator/src/generators/app-generator.ts
@@ -33,7 +33,7 @@ export interface AppGeneratorOptions extends GeneratorOptions {
  version: string
  skipInstall: boolean
  skipGit: boolean
-  form: "finalform" | "hookform" | "formik"
+  form: "tanstack" | "hookform"
  onPostInstall?: () => Promise<void>
 }

@@ -90,8 +90,8 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {

      gitInitSuccessful = initResult.status === 0
      if (!gitInitSuccessful) {
-        baseLogger().warn("Failed to run git init.")
-        baseLogger().warn(
+        baseLogger({displayDateTime: false}).warn("Failed to run git init.")
+        baseLogger({displayDateTime: false}).warn(
          "Find out more about how to install git here: https://git-scm.com/downloads.",
        )
      }
@@ -284,18 +284,14 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {

    const type = this.options.form
    switch (type) {
-      case "finalform":
-        pkg.dependencies["final-form"] = "4.x"
-        pkg.dependencies["react-final-form"] = "6.x"
+      case "tanstack":
+        pkg.dependencies["@tanstack/react-form"] = "0.x" 
        break
      case "hookform":
        pkg.dependencies["react-hook-form"] = "7.x"
        pkg.dependencies["@hookform/resolvers"] = "2.x"
        pkg.dependencies["@hookform/error-message"] = "2.x"
        break
-      case "formik":
-        pkg.dependencies["formik"] = "2.x"
-        break
    }
    this.fs.move(
      this.destinationPath(`_forms/${type}/Form.${ext}`),
--- a/packages/generator/src/utils/log.ts
+++ b/packages/generator/src/utils/log.ts
@@ -1,4 +1,4 @@
-import {ILogObj, ISettingsParam, Logger} from "tslog"
+import {ISettingsParam, Logger} from "tslog"
 import c from "chalk"
 import {Table} from "console-table-printer"
 import ora from "ora"
@@ -8,7 +8,7 @@ import {defaultConfig} from "./default-config"

 // eslint-disable-next-line
 declare module globalThis {
-  let _blitz_baseLogger: Logger<ILogObj>
+  let _blitz_baseLogger: Logger
  let _blitz_logLevel: LogLevel
 }

@@ -103,7 +103,7 @@ export const newline = () => {
  }
 }

-export const baseLogger = (options?: ISettingsParam<ILogObj>): Logger<ILogObj> => {
+export const baseLogger = (options?: ISettingsParam): Logger => {
  if (globalThis._blitz_baseLogger) return globalThis._blitz_baseLogger

  let config
@@ -114,14 +114,28 @@ export const baseLogger = (options?: ISettingsParam<ILogObj>): Logger<ILogObj> =
  }

  globalThis._blitz_baseLogger = new Logger({
-    minLevel: config.log?.level || 3,
+    minLevel: config.log?.level || "info",
    type: config.log?.type || "pretty",
-    prettyLogTemplate:
+    dateTimePattern:
      process.env.NODE_ENV === "production"
-        ? "{{yyyy}}-{{mm}}-{{dd}} {{hh}}:{{MM}}:{{ss}}:{{ms}}"
-        : "{{hh}}:{{MM}}:{{ss}}:{{ms}}",
-    prettyLogTimeZone: process.env.NODE_ENV === "production" ? "UTC" : "local",
-    maskValuesOfKeys: ["password", "passwordConfirmation", "currentPassword"],
+        ? "year-month-day hour:minute:second.millisecond"
+        : "hour:minute:second.millisecond",
+    displayFunctionName: false,
+    displayFilePath: "hidden",
+    displayRequestId: false,
+    dateTimeTimezone:
+      process.env.NODE_ENV === "production"
+        ? "utc"
+        : Intl.DateTimeFormat().resolvedOptions().timeZone,
+    prettyInspectHighlightStyles: {
+      name: "yellow",
+      number: "blue",
+      bigint: "blue",
+      boolean: "blue",
+    },
+    colorizePrettyLogs: process.env.FORCE_COLOR === "0" ? false : true,
+    maskValuesOfKeys: ["password", "passwordConfirmation"],
+    exposeErrorCodeFrame: process.env.NODE_ENV !== "production",
    ...options,
  })

--- a/packages/generator/templates/app/_forms/finalform/Form.tsx
+++ b/packages/generator/templates/app/_forms/finalform/Form.tsx
@@ -1,59 +0,0 @@
-import { ReactNode, PropsWithoutRef } from "react"
-import { Form as FinalForm, FormProps as FinalFormProps } from "react-final-form"
-import { z } from "zod"
-import { validateZodSchema } from "blitz"
-export { FORM_ERROR } from "final-form"
-
-export interface FormProps<S extends z.ZodType<any, any>>
-  extends Omit<PropsWithoutRef<JSX.IntrinsicElements["form"]>, "onSubmit"> {
-  /** All your form fields */
-  children?: ReactNode
-  /** Text to display in the submit button */
-  submitText?: string
-  schema?: S
-  onSubmit: FinalFormProps<z.infer<S>>["onSubmit"]
-  initialValues?: FinalFormProps<z.infer<S>>["initialValues"]
-}
-
-export function Form<S extends z.ZodType<any, any>>({
-  children,
-  submitText,
-  schema,
-  initialValues,
-  onSubmit,
-  ...props
-}: FormProps<S>) {
-  return (
-    <FinalForm
-      initialValues={initialValues}
-      validate={validateZodSchema(schema)}
-      onSubmit={onSubmit}
-      render={({ handleSubmit, submitting, submitError }) => (
-        <form onSubmit={handleSubmit} className="form" {...props}>
-          {/* Form fields supplied as children are rendered here */}
-          {children}
-
-          {submitError && (
-            <div role="alert" style={{ color: "red" }}>
-              {submitError}
-            </div>
-          )}
-
-          {submitText && (
-            <button type="submit" disabled={submitting}>
-              {submitText}
-            </button>
-          )}
-
-          <style global jsx>{`
-            .form > * + * {
-              margin-top: 1rem;
-            }
-          `}</style>
-        </form>
-      )}
-    />
-  )
-}
-
-export default Form
--- a/packages/generator/templates/app/_forms/finalform/LabelSelectField.tsx
+++ b/packages/generator/templates/app/_forms/finalform/LabelSelectField.tsx
@@ -1,60 +0,0 @@
-import { forwardRef, PropsWithoutRef } from "react"
-import { useField } from "react-final-form"
-
-export interface LabeledSelectFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["select"]> {
-  /** Field name. */
-  name: string
-  /** Field label. */
-  label: string
-  type?: "number" | "string"
-  options: any
-  outerProps?: PropsWithoutRef<JSX.IntrinsicElements["div"]>
-}
-
-export const LabeledSelectField = forwardRef<HTMLSelectElement, LabeledSelectFieldProps>(
-  ({ name, label, outerProps, options, type="number", ...props }, ref) => {
-    const {
-      input,
-      meta: { touched, error, submitError, submitting },
-    } = useField(name, {
-      parse: type === "number" ? Number : undefined,
-    })
-
-    const normalizedError = Array.isArray(error) ? error.join(", ") : error || submitError
-
-    return (
-      <div {...outerProps}>
-        <label>
-          {label}
-          <select {...input} disabled={submitting} {...props} ref={ref}>
-          {options && options.map((value) => <option key={value.id} value={value.id}>{value[name]}</option>)}
-          </select>
-        </label>
-
-        {touched && normalizedError && (
-          <div role="alert" style={{ color: "red" }}>
-            {normalizedError}
-          </div>
-        )}
-
-        <style jsx>{`
-          label {
-            display: flex;
-            flex-direction: column;
-            align-items: start;
-            font-size: 1rem;
-          }
-          select {
-            font-size: 1rem;
-            padding: 0.25rem 0.5rem;
-            border-radius: 3px;
-            appearance: none;
-            margin-top: 0.5rem;
-          }
-        `}</style>
-      </div>
-    )
-  }
-)
-
-export default LabeledSelectField
--- a/packages/generator/templates/app/_forms/finalform/LabeledTextField.tsx
+++ b/packages/generator/templates/app/_forms/finalform/LabeledTextField.tsx
@@ -1,66 +0,0 @@
-import { forwardRef, ComponentPropsWithoutRef, PropsWithoutRef } from "react"
-import { useField, UseFieldConfig } from "react-final-form"
-
-export interface LabeledTextFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["input"]> {
-  /** Field name. */
-  name: string
-  /** Field label. */
-  label: string
-  /** Field type. Doesn't include radio buttons and checkboxes */
-  type?: "text" | "password" | "email" | "number"
-  outerProps?: PropsWithoutRef<JSX.IntrinsicElements["div"]>
-  labelProps?: ComponentPropsWithoutRef<"label">
-  fieldProps?: UseFieldConfig<string>
-}
-
-export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldProps>(
-  ({ name, label, outerProps, fieldProps, labelProps, ...props }, ref) => {
-    const {
-      input,
-      meta: { touched, error, submitError, submitting },
-    } = useField(name, {
-      parse:
-        props.type === "number"
-          ? (Number as any)
-          : // Converting `""` to `null` ensures empty values will be set to null in the DB
-            (v) => (v === "" ? null : v),
-      ...fieldProps,
-    })
-
-    const normalizedError = Array.isArray(error) ? error.join(", ") : error || submitError
-
-    return (
-      <div {...outerProps}>
-        <label {...labelProps}>
-          {label}
-          <input {...input} disabled={submitting} {...props} ref={ref} />
-        </label>
-
-        {touched && normalizedError && (
-          <div role="alert" style={{ color: "red" }}>
-            {normalizedError}
-          </div>
-        )}
-
-        <style jsx>{`
-          label {
-            display: flex;
-            flex-direction: column;
-            align-items: start;
-            font-size: 1rem;
-          }
-          input {
-            font-size: 1rem;
-            padding: 0.25rem 0.5rem;
-            border-radius: 3px;
-            border: 1px solid purple;
-            appearance: none;
-            margin-top: 0.5rem;
-          }
-        `}</style>
-      </div>
-    )
-  }
-)
-
-export default LabeledTextField
--- a/packages/generator/templates/app/_forms/formik/Form.tsx
+++ b/packages/generator/templates/app/_forms/formik/Form.tsx
@@ -1,77 +0,0 @@
-import { useState, ReactNode, PropsWithoutRef } from "react"
-import { Formik, FormikProps } from "formik"
-import { validateZodSchema } from "blitz"
-import { z } from "zod"
-
-export interface FormProps<S extends z.ZodType<any, any>>
-  extends Omit<PropsWithoutRef<JSX.IntrinsicElements["form"]>, "onSubmit"> {
-  /** All your form fields */
-  children?: ReactNode
-  /** Text to display in the submit button */
-  submitText?: string
-  schema?: S
-  onSubmit: (values: z.infer<S>) => Promise<void | OnSubmitResult>
-  initialValues?: FormikProps<z.infer<S>>["initialValues"]
-}
-
-interface OnSubmitResult {
-  FORM_ERROR?: string
-  [prop: string]: any
-}
-
-export const FORM_ERROR = "FORM_ERROR"
-
-export function Form<S extends z.ZodType<any, any>>({
-  children,
-  submitText,
-  schema,
-  initialValues,
-  onSubmit,
-  ...props
-}: FormProps<S>) {
-  const [formError, setFormError] = useState<string | null>(null)
-  return (
-    <Formik
-      initialValues={initialValues || {}}
-      validate={validateZodSchema(schema)}
-      onSubmit={async (values, { setErrors }) => {
-        const { FORM_ERROR, ...otherErrors } = (await onSubmit(values)) || {}
-
-        if (FORM_ERROR) {
-          setFormError(FORM_ERROR)
-        }
-
-        if (Object.keys(otherErrors).length > 0) {
-          setErrors(otherErrors)
-        }
-      }}
-    >
-      {({ handleSubmit, isSubmitting }) => (
-        <form onSubmit={handleSubmit} className="form" {...props}>
-          {/* Form fields supplied as children are rendered here */}
-          {children}
-
-          {formError && (
-            <div role="alert" style={{ color: "red" }}>
-              {formError}
-            </div>
-          )}
-
-          {submitText && (
-            <button type="submit" disabled={isSubmitting}>
-              {submitText}
-            </button>
-          )}
-
-          <style global jsx>{`
-            .form > * + * {
-              margin-top: 1rem;
-            }
-          `}</style>
-        </form>
-      )}
-    </Formik>
-  )
-}
-
-export default Form
--- a/packages/generator/templates/app/_forms/formik/LabelSelectField.tsx
+++ b/packages/generator/templates/app/_forms/formik/LabelSelectField.tsx
@@ -1,68 +0,0 @@
-import { forwardRef, PropsWithoutRef } from "react";
-import { useFormikContext, ErrorMessage, Field } from "formik";
-
-export interface LabeledSelectFieldProps
-  extends PropsWithoutRef<JSX.IntrinsicElements["select"]> {
-  /** Field name. */
-  name: string;
-  /** Field label. */
-  label: string;
-  /** Field options. */
-  options: any;
-  outerProps?: PropsWithoutRef<JSX.IntrinsicElements["div"]>;
-}
-
-export const LabeledSelectField = forwardRef<
-  HTMLSelectElement,
-  LabeledSelectFieldProps
->(({ name, label, outerProps, options, ...props }, ref) => {
-  const { isSubmitting } = useFormikContext();
-  return (
-    <div {...outerProps}>
-      <label
-        style={{
-          display: "flex",
-          flexDirection: "column",
-          alignItems: "start",
-          fontSize: "1rem",
-        }}
-      >
-        {label}
-        <Field
-          {...props}
-          disabled={isSubmitting}
-          ref={ref}
-          name={name}
-          as="select"
-          style={{
-            fontSize: "1rem",
-            padding: " 0.25rem 0.4rem",
-            borderRadius: "3px",
-            border: "1px solid purple",
-            marginTop: "0.5rem",
-            backgroundColor: "white",
-          }}
-        >
-          <option value="" selected disabled hidden>
-            Select {label}
-          </option>
-          {options.map((option, index) => (
-            <option key={index} value={option.id}>
-              {option[name]}
-            </option>
-          ))}
-        </Field>
-      </label>
-
-      <ErrorMessage name={name}>
-        {(msg) => (
-          <div role="alert" style={{ color: "red" }}>
-            {msg}
-          </div>
-        )}
-      </ErrorMessage>
-    </div>
-  );
-});
-
-export default LabeledSelectField;
--- a/packages/generator/templates/app/_forms/formik/LabeledTextField.tsx
+++ b/packages/generator/templates/app/_forms/formik/LabeledTextField.tsx
@@ -1,55 +0,0 @@
-import { forwardRef, PropsWithoutRef } from "react"
-import { useField, useFormikContext, ErrorMessage } from "formik"
-
-export interface LabeledTextFieldProps extends PropsWithoutRef<JSX.IntrinsicElements["input"]> {
-  /** Field name. */
-  name: string
-  /** Field label. */
-  label: string
-  /** Field type. Doesn't include radio buttons and checkboxes */
-  type?: "text" | "password" | "email" | "number"
-  outerProps?: PropsWithoutRef<JSX.IntrinsicElements["div"]>
-}
-
-export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldProps>(
-  ({ name, label, outerProps, ...props }, ref) => {
-    const [input] = useField(name)
-    const { isSubmitting } = useFormikContext()
-
-    return (
-      <div {...outerProps}>
-        <label>
-          {label}
-          <input {...input} disabled={isSubmitting} {...props} ref={ref} />
-        </label>
-
-        <ErrorMessage name={name}>
-          {(msg) => (
-            <div role="alert" style={{ color: "red" }}>
-              {msg}
-            </div>
-          )}
-        </ErrorMessage>
-
-        <style jsx>{`
-          label {
-            display: flex;
-            flex-direction: column;
-            align-items: start;
-            font-size: 1rem;
-          }
-          input {
-            font-size: 1rem;
-            padding: 0.25rem 0.5rem;
-            border-radius: 3px;
-            border: 1px solid purple;
-            appearance: none;
-            margin-top: 0.5rem;
-          }
-        `}</style>
-      </div>
-    )
-  }
-)
-
-export default LabeledTextField
--- a/packages/generator/templates/app/package.js.json
+++ b/packages/generator/templates/app/package.js.json
@@ -27,7 +27,7 @@
    "@blitzjs/rpc": "latest",
    "@prisma/client": "4.6.1",
    "blitz": "latest",
-    "next": "13.4.5",
+    "next": "^13.3.0",
    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0",
--- a/packages/generator/templates/app/package.ts.json
+++ b/packages/generator/templates/app/package.ts.json
@@ -27,7 +27,7 @@
    "@blitzjs/rpc": "latest",
    "@prisma/client": "4.6.1",
    "blitz": "latest",
-    "next": "13.4.5",
+    "next": "^13.3.0",
    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0",
--- a/packages/generator/templates/minimalapp/package.js.json
+++ b/packages/generator/templates/minimalapp/package.js.json
@@ -20,7 +20,7 @@
  "dependencies": {
    "@blitzjs/next": "latest",
    "blitz": "latest",
-    "next": "13.4.5",
+    "next": "^13.3.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
    "ts-node": "10.9.1"
--- a/packages/generator/templates/minimalapp/package.ts.json
+++ b/packages/generator/templates/minimalapp/package.ts.json
@@ -20,7 +20,7 @@
  "dependencies": {
    "@blitzjs/next": "latest",
    "blitz": "latest",
-    "next": "13.4.5",
+    "next": "^13.3.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
    "ts-node": "10.9.1"
--- a/packages/pkg-template/package.json
+++ b/packages/pkg-template/package.json
@@ -25,7 +25,7 @@
    "@typescript-eslint/parser": "5.9.1"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.31",
+    "@blitzjs/config": "2.0.0-beta.27",
    "@types/react": "18.0.25",
    "@types/react-dom": "17.0.14",
    "react": "18.2.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/recipes/base-web/package.json
+++ b/recipes/base-web/package.json
@@ -23,7 +23,7 @@
  },
  "homepage": "https://github.com/blitz-js/blitz#readme",
  "dependencies": {
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "jscodeshift": "0.13.0"
  },
  "devDependencies": {
--- a/recipes/bulma/package.json
+++ b/recipes/bulma/package.json
@@ -22,7 +22,7 @@
  },
  "homepage": "https://github.com/blitz-js/blitz#readme",
  "dependencies": {
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "jscodeshift": "0.13.0"
  },
  "devDependencies": {
--- a/recipes/bumbag-ui/package.json
+++ b/recipes/bumbag-ui/package.json
@@ -24,7 +24,7 @@
  },
  "homepage": "https://github.com/blitz-js/blitz#readme",
  "dependencies": {
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "jscodeshift": "0.13.0"
  },
  "devDependencies": {
--- a/recipes/chakra-ui/package.json
+++ b/recipes/chakra-ui/package.json
@@ -24,7 +24,7 @@
  },
  "homepage": "https://github.com/blitz-js/blitz#readme",
  "dependencies": {
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "jscodeshift": "0.13.0"
  },
  "devDependencies": {
--- a/recipes/emotion/package.json
+++ b/recipes/emotion/package.json
@@ -22,7 +22,7 @@
  },
  "homepage": "https://github.com/blitz-js/blitz#readme",
  "dependencies": {
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "jscodeshift": "0.13.0"
  },
  "devDependencies": {
--- a/recipes/gh-action-yarn-mariadb/package.json
+++ b/recipes/gh-action-yarn-mariadb/package.json
@@ -24,6 +24,6 @@
  },
  "homepage": "https://github.com/blitz-js/blitz#readme",
  "dependencies": {
-    "blitz": "2.0.0-beta.31"
+    "blitz": "2.0.0-beta.27"
  }
 }
--- a/recipes/gh-action-yarn-postgres/package.json
+++ b/recipes/gh-action-yarn-postgres/package.json
@@ -24,6 +24,6 @@
  },
  "homepage": "https://github.com/blitz-js/blitz#readme",
  "dependencies": {
-    "blitz": "2.0.0-beta.31"
+    "blitz": "2.0.0-beta.27"
  }
 }
--- a/recipes/ghost/package.json
+++ b/recipes/ghost/package.json
@@ -23,7 +23,7 @@
  },
  "homepage": "https://github.com/blitz-js/blitz#readme",
  "dependencies": {
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "jscodeshift": "0.13.0"
  },
  "devDependencies": {
--- a/recipes/graphql-apollo-server/package.json
+++ b/recipes/graphql-apollo-server/package.json
@@ -22,7 +22,7 @@
  },
  "homepage": "https://github.com/blitz-js/blitz#readme",
  "dependencies": {
-    "blitz": "2.0.0-beta.31",
+    "blitz": "2.0.0-beta.27",
    "jscodeshift": "0.13.0",
    "uuid": "^8.3.1"
  },
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Siddharth Suresh	4229e89825	Merge branch 'main' into remove-unmaintained-forms	2023-06-05 19:16:40 +05:30
Siddharth Suresh	cf6632340d	fix	2023-05-16 16:04:54 +05:30
Siddharth Suresh	49cb7344dc	remove formik and final form	2023-05-16 15:58:57 +05:30