fixes

make code cleaner
Update .changeset/good-oranges-pretend.md
2026-02-06 09:00:12 -05:00 · 2023-06-09 12:38:56 -04:00 · 2023-06-09 21:16:45 +05:30 · 2023-06-09 19:33:32 +05:30 · 2023-06-09 19:08:27 +05:30 · 2023-06-09 19:03:03 +05:30
171 changed files with 1052 additions and 3443 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -3945,65 +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"
-      ]
-    },
-    {
-      "login": "maciej-ka",
-      "name": "Maciej Kasprzyk",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5403694?v=4",
-      "profile": "https://github.com/maciej-ka",
-      "contributions": [
-        "doc",
-        "code"
-      ]
-    },
-    {
-      "login": "justinsmid",
-      "name": "Justin Smid",
-      "avatar_url": "https://avatars.githubusercontent.com/u/34271675?v=4",
-      "profile": "https://github.com/justinsmid",
-      "contributions": [
-        "doc",
-        "code"
-      ]
-    },
-    {
-      "login": "rodobre",
-      "name": "rodobre",
-      "avatar_url": "https://avatars.githubusercontent.com/u/52138375?v=4",
-      "profile": "https://github.com/rodobre",
-      "contributions": [
-        "doc",
-        "code"
-      ]
-    },
-    {
-      "login": "Zamfi99",
-      "name": "Zamfira Costin-Andrei",
-      "avatar_url": "https://avatars.githubusercontent.com/u/19189337?v=4",
-      "profile": "https://github.com/Zamfi99",
-      "contributions": [
-        "doc",
-        "code"
-      ]
-    },
-    {
-      "login": "potikhanovsergey",
-      "name": "Sergey",
-      "avatar_url": "https://avatars.githubusercontent.com/u/71494201?v=4",
-      "profile": "https://github.com/potikhanovsergey",
-      "contributions": [
-        "doc"
-      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.changeset/afraid-ligers-build.md
+++ b/.changeset/afraid-ligers-build.md
@@ -1,6 +0,0 @@
---
-"@blitzjs/auth": patch
-"blitz": patch
---
-
-Fix bug that did not allow `Page.authenicate = {role: "" }` to correctly work
--- a/.changeset/chatty-scissors-jump.md
+++ b/.changeset/chatty-scissors-jump.md
@@ -1,6 +0,0 @@
---
-"@blitzjs/next": patch
-"blitz": patch
---
-
-blitz-next: Fix `next/head` used in app directory warning
--- a/.changeset/chilly-jeans-fix.md
+++ b/.changeset/chilly-jeans-fix.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/generator": patch
---
-
-Update examples of generate all in docs to include one column in model.
--- a/.changeset/clever-hornets-talk.md
+++ b/.changeset/clever-hornets-talk.md
@@ -1,9 +0,0 @@
---
-"blitz": patch
-"@blitzjs/next": patch
-"@blitzjs/generator": patch
---
-
-Upgrade tslog to `4.9.0`.
-
-This due a [tslog issue](https://github.com/fullstack-build/tslog/issues/227) that causes tslog to crash when attempting to log an error whose constructor expects more than one argument.
--- 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/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/fresh-camels-return.md
+++ b/.changeset/fresh-camels-return.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/auth": patch
---
-
-Updated `useAuthenticatedBlitzContext` to now return `AuthenticatedCtx`
--- a/.changeset/green-years-behave.md
+++ b/.changeset/green-years-behave.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/generator": patch
---
-
-Upgrade next, prisma and zod to latest versions in a newly created app
--- 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/little-cycles-hang.md
+++ b/.changeset/little-cycles-hang.md
@@ -1,6 +0,0 @@
---
-"blitz": patch
---
-
- Removes language selection step from `blitz new` menu
- Make `formik` the default/recommended form library
--- a/.changeset/lucky-teachers-sleep.md
+++ b/.changeset/lucky-teachers-sleep.md
@@ -1,10 +0,0 @@
---
-"@blitzjs/auth": patch
-"@blitzjs/next": major
-"@blitzjs/rpc": patch
-"blitz": patch
---
-⚠️ Breaking Change:
-Next.js version 13.5 or above is now required to use `@blitzjs/next`
-
-Fix `Error: Cannot find module 'next/dist/shared/lib/router/utils/resolve-href'` by updating the location of next.js internal function.
--- a/.changeset/modern-insects-raise.md
+++ b/.changeset/modern-insects-raise.md
@@ -1,13 +0,0 @@
---
-"@blitzjs/auth": patch
-"blitz": patch
---
-
-Remove unintended dependency on next-auth by removing it from the core build of @blitzjs/auth
-
-⚠️ Breaking Change for current users of `withNextAuthAdapter`
-
-Update your import in `next.config.js` in the following way
-```diff
-const { withNextAuthAdapter } = require("@blitzjs/auth")
-+const { withNextAuthAdapter } = require("@blitzjs/auth/next-auth")
--- 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/moody-pandas-do.md
+++ b/.changeset/moody-pandas-do.md
@@ -1,9 +0,0 @@
---
-"@blitzjs/auth": patch
-"@blitzjs/rpc": patch
-"blitz": patch
---
-
- Introduce Blitz RPC's logging system to the `invoke` function which is the recommended way to call resolvers in nextjs `app` directory's react server components.
-
- This refactor also removes the re-introduced dependency between `blitz-auth` and `blitz-rpc`, allowing independent usage of `blitz-rpc`
--- a/.changeset/neat-gorillas-switch.md
+++ b/.changeset/neat-gorillas-switch.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/recipe-tailwind": patch
---
-
-Change tailwind recipe to install dependencies as devDependencies
--- a/.changeset/nervous-shrimps-serve.md
+++ b/.changeset/nervous-shrimps-serve.md
@@ -1,6 +0,0 @@
---
-"@blitzjs/rpc": patch
-"blitz": patch
---
-
-Fix for tslog error `TypeError: Cannot read properties of undefined (reading 'map')` while using custom errors.
--- a/.changeset/nice-cats-lay.md
+++ b/.changeset/nice-cats-lay.md
@@ -1,6 +0,0 @@
---
-"@blitzjs/rpc": patch
-"blitz": patch
---
-
-Allow `.tsx` & `.jsx` file extensions to be used for resolvers
--- 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
@@ -53,10 +53,8 @@
  "changesets": [
    "afraid-dancers-juggle",
    "afraid-ears-repair",
-    "afraid-ligers-build",
    "big-boats-lay",
    "big-phones-bow",
-    "big-turtles-tease",
    "blue-flowers-peel",
    "blue-pigs-tan",
    "brave-zebras-deny",
@@ -73,15 +71,12 @@
    "calm-tomatoes-drive",
    "chatty-fireants-leave",
    "chatty-gifts-whisper",
-    "chatty-scissors-jump",
    "chilled-carrots-own",
    "chilly-candles-care",
-    "chilly-jeans-fix",
    "chilly-nails-nail",
    "clean-hats-pump",
    "clean-hounds-laugh",
    "clean-walls-wink",
-    "clever-hornets-talk",
    "clever-radios-lie",
    "cool-doors-invent",
    "cool-horses-check",
@@ -90,7 +85,6 @@
    "curly-rules-speak",
    "curly-seas-serve",
    "curvy-days-attend",
-    "curvy-drinks-perform",
    "cyan-bulldogs-heal",
    "cyan-cars-greet",
    "dirty-monkeys-greet",
@@ -115,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",
@@ -128,7 +120,6 @@
    "four-meals-fry",
    "four-radios-tickle",
    "four-sheep-judge",
-    "fresh-camels-return",
    "fresh-crews-chew",
    "funny-cups-pay",
    "fuzzy-bees-warn",
@@ -142,7 +133,6 @@
    "gold-horses-punch",
    "good-apes-drum",
    "good-insects-wink",
-    "good-oranges-pretend",
    "gorgeous-birds-warn",
    "gorgeous-buses-scream",
    "gorgeous-games-obey",
@@ -151,7 +141,6 @@
    "great-terms-rescue",
    "green-papayas-do",
    "green-pillows-hammer",
-    "green-years-behave",
    "happy-bees-lick",
    "happy-hotels-visit",
    "happy-paws-join",
@@ -173,7 +162,6 @@
    "khaki-ducks-cheer",
    "khaki-pens-rest",
    "kind-walls-suffer",
-    "large-hairs-battle",
    "late-steaks-give",
    "lazy-maps-sort",
    "lemon-games-press",
@@ -182,7 +170,6 @@
    "lemon-teachers-jam",
    "light-donkeys-double",
    "light-squids-draw",
-    "little-cycles-hang",
    "little-pears-ring",
    "long-bees-hope",
    "long-dancers-jog",
@@ -192,29 +179,22 @@
    "lovely-colts-share",
    "lucky-cows-try",
    "lucky-months-guess",
-    "lucky-teachers-sleep",
    "lucky-years-turn",
    "many-fans-fetch",
    "mean-ears-speak",
    "mean-gorillas-reply",
    "modern-cameras-pull",
    "modern-games-dream",
-    "modern-insects-raise",
    "modern-ligers-behave",
    "moody-bags-walk",
-    "moody-crews-travel",
-    "moody-pandas-do",
    "moody-spoons-rhyme",
    "moody-squids-cheer",
    "nasty-suns-wash",
-    "neat-gorillas-switch",
    "nervous-beds-travel",
    "nervous-dolls-rule",
-    "nervous-shrimps-serve",
    "new-coats-turn",
    "new-olives-protect",
    "nice-boxes-travel",
-    "nice-cats-lay",
    "nice-deers-dream",
    "nice-starfishes-live",
    "nine-bags-rhyme",
@@ -239,18 +219,15 @@
    "plenty-gifts-provide",
    "plenty-kiwis-greet",
    "polite-lizards-love",
-    "poor-crabs-drum",
    "poor-peas-lick",
    "poor-penguins-look",
    "poor-shrimps-think",
    "poor-walls-relax",
    "popular-teachers-pay",
    "pretty-games-march",
-    "pretty-snakes-search",
    "purple-donkeys-smash",
    "purple-jars-begin",
    "purple-singers-greet",
-    "quick-crews-occur",
    "quick-cycles-confess",
    "quick-dots-fetch",
    "quiet-feet-travel",
@@ -265,7 +242,6 @@
    "rotten-rocks-remember",
    "rude-trainers-visit",
    "serious-mugs-leave",
-    "shaggy-boxes-exercise",
    "shaggy-carpets-brake",
    "sharp-falcons-begin",
    "sharp-olives-sip",
@@ -278,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",
@@ -314,7 +288,6 @@
    "tall-radios-clean",
    "tame-keys-reply",
    "tame-pumpkins-nail",
-    "tame-rocks-unite",
    "tasty-maps-fetch",
    "tasty-news-collect",
    "tasty-squids-sin",
@@ -354,7 +327,6 @@
    "wise-frogs-give",
    "wise-lies-relate",
    "wise-rabbits-complain",
-    "yellow-numbers-serve",
    "young-birds-talk"
  ]
 }
--- a/.changeset/pretty-snakes-search.md
+++ b/.changeset/pretty-snakes-search.md
@@ -1,5 +0,0 @@
---
-"@blitzjs/recipe-next-ui": patch
---
-
-Add `framer-motion` as a dependency of `next-ui`
--- a/.changeset/quick-crews-occur.md
+++ b/.changeset/quick-crews-occur.md
@@ -1,5 +0,0 @@
---
-"blitz": patch
---
-
-Remove rouge `console.log` during start
--- a/.changeset/shaggy-boxes-exercise.md
+++ b/.changeset/shaggy-boxes-exercise.md
@@ -1,9 +0,0 @@
---
-"@blitzjs/next": patch
-"blitz": patch
-"@blitzjs/generator": patch
---
-
- Updates `ts-log` peer dependency to `4.9.0`
- Removes `javascript` from `blitz new` menu
- Hot Fix the `Update Schema` when using blitz generator
--- 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,13 +17,13 @@ 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: 8.6.0
      - name: Setup node
        uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 16
          cache: "pnpm"
      - name: Install dependencies
        run: pnpm install  --frozen-lockfile
@@ -38,13 +38,13 @@ 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: 8.6.0
      - name: Setup node
        uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 16
          cache: "pnpm"
      - run: pnpm install --frozen-lockfile
      - name: Build
@@ -62,20 +62,20 @@ jobs:
          - windows-latest
      fail-fast: false
    env:
-      NODE_VERSION: 18
+      NODE_VERSION: 16
    steps:
      - name: Checkout
        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: 8.6.0

      - name: Setup node@16
        uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 16
          cache: "pnpm"

      - name: Install dependencies
@@ -111,7 +111,7 @@ jobs:
          echo "folders=$folders" >> $GITHUB_OUTPUT

  Integration-Tests:
-    name: "Integration Test: ${{matrix.folder}} @ ${{ matrix.os }}"
+    name: "Integration Test: ${{matrix.folder}} @ ${{ matrix.os }} "
    needs: [find-integration-tests]
    strategy:
      matrix:
@@ -124,39 +124,32 @@ jobs:
    steps:
      - run: echo ${{matrix.folder}}
      - name: Checkout
-        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
        uses: actions/checkout@v3

      - name: Setup PNPM
-        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
        with:
-          version: 8.6.5
+          version: 8.6.0

-      - name: Setup node@18
-        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
+      - name: Setup node@${{ matrix.NODE_VERSION }}
        uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: ${{ matrix.NODE_VERSION }}
          cache: "pnpm"

      - name: Install dependencies
-        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
        run: pnpm install --frozen-lockfile
        shell: bash

      - name: Install playwright
-        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
        run: |
-          pnpx playwright@1.28.0 install --with-deps
+            pnpx playwright@1.28.0 install --with-deps
        shell: bash

      - name: Build
-        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
        run: pnpm build
        shell: bash

      - name: Test Packages
-        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
        run: pnpm test -- --filter=./integration-tests/${{matrix.folder}}
        shell: bash
--- 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-422-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">
@@ -94,11 +94,6 @@ Your financial contributions help ensure Blitz continues to be developed and mai
 <td><a aria-label="Boostry" href="https://boostry.co.jp/?utm_source=BlitzJS&utm_medium=sponsorship&utm_campaign=BlitzJS_Sponsorship_2021">
 <img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/boostry.svg" width="200px">
 </a></td>
-<td>
-<a aria-label="Byteflow" href="https://byteflow.app/?ref=blitzjs">
-<img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/byteflow.png" width="70px">
-</a>
-</td>
  </tr>
 </table>

@@ -126,11 +121,9 @@ Your financial contributions help ensure Blitz continues to be developed and mai

 <table>
  <tr>
-    <td>
    <a aria-label="Flightcontrol" href="https://www.flightcontrol.dev?ref=blitzjs">
    <img alt="" src="https://raw.githubusercontent.com/blitz-js/blitz/main/assets/flightcontrol.png" width="400px">
    </a>
-    </td>
  </tr>
 </table>

@@ -738,14 +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>
-    <td align="center"><a href="https://github.com/maciej-ka"><img src="https://avatars.githubusercontent.com/u/5403694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maciej Kasprzyk</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=maciej-ka" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=maciej-ka" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/justinsmid"><img src="https://avatars.githubusercontent.com/u/34271675?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Justin Smid</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=justinsmid" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=justinsmid" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/rodobre"><img src="https://avatars.githubusercontent.com/u/52138375?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rodobre</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=rodobre" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=rodobre" title="Code">💻</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://github.com/Zamfi99"><img src="https://avatars.githubusercontent.com/u/19189337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zamfira Costin-Andrei</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=Zamfi99" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=Zamfi99" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/potikhanovsergey"><img src="https://avatars.githubusercontent.com/u/71494201?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=potikhanovsergey" title="Documentation">📖</a></td>
  </tr>
 </table>

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

-## 0.1.1-beta.11
-
-### Patch Changes
-
- Updated dependencies [cee2dec17]
- Updated dependencies [aec1bb076]
- Updated dependencies [b97366c42]
- Updated dependencies [3bcbad1a9]
-  - @blitzjs/auth@2.0.0-beta.35
-  - blitz@2.0.0-beta.35
-  - @blitzjs/next@2.0.0-beta.35
-  - @blitzjs/rpc@2.0.0-beta.35
-  - @blitzjs/config@2.0.0-beta.35
-
-## 0.1.1-beta.10
-
-### Patch Changes
-
- Updated dependencies [30fd61316]
- Updated dependencies [3ddb57072]
- Updated dependencies [fe8c937d2]
-  - blitz@2.0.0-beta.34
-  - @blitzjs/auth@2.0.0-beta.34
-  - @blitzjs/next@2.0.0-beta.34
-  - @blitzjs/rpc@2.0.0-beta.34
-  - @blitzjs/config@2.0.0-beta.34
-
-## 0.1.1-beta.9
-
-### Patch Changes
-
- Updated dependencies [19898a488]
- Updated dependencies [6811eab1a]
- Updated dependencies [022392c12]
-  - @blitzjs/rpc@2.0.0-beta.33
-  - blitz@2.0.0-beta.33
-  - @blitzjs/next@2.0.0-beta.33
-  - @blitzjs/auth@2.0.0-beta.33
-  - @blitzjs/config@2.0.0-beta.33
-
-## 0.1.1-beta.8
-
-### Patch Changes
-
- Updated dependencies [82649f341]
- Updated dependencies [8b01175b4]
-  - blitz@2.0.0-beta.32
-  - @blitzjs/next@2.0.0-beta.32
-  - @blitzjs/auth@2.0.0-beta.32
-  - @blitzjs/rpc@2.0.0-beta.32
-  - @blitzjs/config@2.0.0-beta.32
-
-## 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/app/auth/layout.tsx
+++ b/apps/next13/app/auth/layout.tsx
@@ -1,4 +1,4 @@
-import {useAuthenticatedBlitzContext} from "../../src/blitz-server"
+import {useAuthenticatedBlitzContext} from "@blitzjs/auth"

 export default async function RootLayout({children}: {children: React.ReactNode}) {
  await useAuthenticatedBlitzContext({
--- a/apps/next13/app/page.tsx
+++ b/apps/next13/app/page.tsx
@@ -9,6 +9,7 @@ export default async function Home() {
    redirectTo: "/auth/login",
  })
  const user = await invoke(getCurrentUser, null)
+  console.log("user", user)
  return (
    <div
      style={{
--- a/apps/next13/package.json
+++ b/apps/next13/package.json
@@ -1,6 +1,6 @@
 {
  "name": "next-blitz-auth",
-  "version": "0.1.1-beta.11",
+  "version": "0.1.1-beta.3",
  "private": true,
  "scripts": {
    "blitz:dev": "next dev",
@@ -9,17 +9,17 @@
    "lint": "next lint"
  },
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/config": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
+    "@blitzjs/auth": "workspace:*",
+    "@blitzjs/config": "workspace:*",
+    "@blitzjs/next": "workspace:*",
+    "@blitzjs/rpc": "workspace:*",
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
    "@prisma/client": "^4.5.0",
    "@tanstack/react-query": "4.0.10",
-    "blitz": "2.0.0-beta.35",
+    "blitz": "workspace:*",
    "flatted": "3.2.7",
-    "next": "13.5.2",
+    "next": "13.3.0",
    "prisma": "^4.5.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
--- a/apps/next13/src/blitz-server.ts
+++ b/apps/next13/src/blitz-server.ts
@@ -13,14 +13,7 @@ const {api, getBlitzContext, useAuthenticatedBlitzContext, invoke} = setupBlitzS
      storage: PrismaStorage(db),
      isAuthorized: simpleRolesIsAuthorized,
    }),
-    RpcServerPlugin({
-      logging: {
-        disablelevel: "debug",
-      },
-      onInvokeError(error) {
-        console.log("onInvokeError", error)
-      },
-    }),
+    RpcServerPlugin({}),
  ],
  logger: BlitzLogger({}),
 })
--- a/apps/toolkit-app-passportjs/package.json
+++ b/apps/toolkit-app-passportjs/package.json
@@ -23,15 +23,15 @@
    ]
  },
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/config": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
+    "@blitzjs/auth": "workspace:*",
+    "@blitzjs/config": "workspace:*",
+    "@blitzjs/next": "workspace:*",
+    "@blitzjs/rpc": "workspace:*",
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
    "@prisma/client": "4.6.1",
-    "blitz": "2.0.0-beta.35",
-    "next": "13.5.2",
+    "blitz": "workspace:2.0.0-beta.27",
+    "next": "13.3.0",
    "openid-client": "5.2.1",
    "prisma": "4.6.1",
    "react": "18.2.0",
--- a/apps/toolkit-app/next.config.js
+++ b/apps/toolkit-app/next.config.js
@@ -2,7 +2,7 @@ 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,
--- a/apps/toolkit-app/package.json
+++ b/apps/toolkit-app/package.json
@@ -24,15 +24,15 @@
    ]
  },
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/config": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
+    "@blitzjs/auth": "workspace:*",
+    "@blitzjs/config": "workspace:*",
+    "@blitzjs/next": "workspace:*",
+    "@blitzjs/rpc": "workspace:*",
    "@hookform/error-message": "2.0.0",
    "@hookform/resolvers": "2.9.10",
    "@prisma/client": "4.6.1",
-    "blitz": "2.0.0-beta.35",
-    "next": "13.5.2",
+    "blitz": "workspace:2.0.0-beta.27",
+    "next": "13.3.0",
    "next-auth": "4.18.7",
    "prisma": "4.6.1",
    "react": "18.2.0",
--- a/apps/toolkit-app/src/pages/api/auth/[...nextauth].ts
+++ b/apps/toolkit-app/src/pages/api/auth/[...nextauth].ts
@@ -1,6 +1,6 @@
 import { api } from "src/blitz-server"
 import GithubProvider from "next-auth/providers/github"
-import { NextAuthAdapter } from "@blitzjs/auth/next-auth"
+import { NextAuthAdapter, BlitzNextAuthOptions } from "@blitzjs/auth/next-auth"
 import db, { User } from "db"
 import { Role } from "types"

--- 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>
@@ -99,7 +99,7 @@ const Home: BlitzPage = () => {
                  <div className={styles.code}>
                    <span>1</span>
                    <pre>
-                      <code>blitz generate all project name:string</code>
+                      <code>blitz generate all project</code>
                    </pre>
                  </div>

--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -16,17 +16,17 @@
    "schema": "./db/schema.prisma"
  },
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/config": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
+    "@blitzjs/auth": "workspace:*",
+    "@blitzjs/config": "workspace:*",
+    "@blitzjs/next": "workspace:*",
+    "@blitzjs/rpc": "workspace:*",
    "@prisma/client": "4.6.1",
    "@types/jest": "29.2.2",
    "@types/passport-twitter": "1.0.37",
-    "blitz": "2.0.0-beta.35",
+    "blitz": "workspace:*",
    "jest": "29.3.0",
    "jest-environment-jsdom": "29.3.0",
-    "next": "13.5.2",
+    "next": "13.3.0",
    "passport-mock-strategy": "2.0.0",
    "passport-twitter": "1.0.4",
    "prisma": "4.6.1",
--- a/assets/byteflow.png
+++ b/assets/byteflow.png
--- a/assets/flightcontrol.png
+++ b/assets/flightcontrol.png
--- 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,16 +17,16 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/config": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
+    "@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": "2.0.0-beta.35",
+    "blitz": "workspace:2.0.0-beta.27",
    "delay": "5.0.0",
-    "next": "13.5.2",
+    "next": "13.3.0",
    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0",
--- a/integration-tests/auth-with-rpc/src/mutations/login.ts
+++ b/integration-tests/auth-with-rpc/src/mutations/login.ts
@@ -1,10 +1,6 @@
 import {Ctx} from "blitz"
-import db from "../../db"
-
-const getRand = () => Math.random().toString(36).substring(7)

 export default async function login(_: any, ctx: Ctx) {
-  const user = await db.user.create({data: {email: `${getRand()}@example.com`}})
-  await ctx.session.$create({userId: user.id, role: "USER"})
+  await ctx.session.$create({userId: 1, role: "USER"})
  return true
 }
--- a/integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role-redirect-stay.tsx
+++ b/integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role-redirect-stay.tsx
@@ -1,37 +0,0 @@
-import {useMutation, useQuery} from "@blitzjs/rpc"
-import {BlitzPage} from "@blitzjs/next"
-import logout from "../mutations/logout"
-import getAuthenticatedBasic from "../queries/getAuthenticatedBasic"
-import {Suspense} from "react"
-
-function Content() {
-  const [result] = useQuery(getAuthenticatedBasic, undefined)
-  const [logoutMutation] = useMutation(logout)
-  return (
-    <div>
-      <div id="content">{result}</div>
-      <button
-        id="logout"
-        onClick={async () => {
-          await logoutMutation()
-        }}
-      >
-        logout
-      </button>
-    </div>
-  )
-}
-
-const Authenticate: BlitzPage = () => {
-  return (
-    <div id="page">
-      <Suspense fallback={"Loading..."}>
-        <Content />
-      </Suspense>
-    </div>
-  )
-}
-
-Authenticate.authenticate = {role: "USER", redirectTo: "/noauth-query"}
-
-export default Authenticate
--- a/integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role-redirect.tsx
+++ b/integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role-redirect.tsx
@@ -1,37 +0,0 @@
-import {useMutation, useQuery} from "@blitzjs/rpc"
-import {BlitzPage} from "@blitzjs/next"
-import logout from "../mutations/logout"
-import getAuthenticatedBasic from "../queries/getAuthenticatedBasic"
-import {Suspense} from "react"
-
-function Content() {
-  const [result] = useQuery(getAuthenticatedBasic, undefined)
-  const [logoutMutation] = useMutation(logout)
-  return (
-    <div>
-      <div id="content">{result}</div>
-      <button
-        id="logout"
-        onClick={async () => {
-          await logoutMutation()
-        }}
-      >
-        logout
-      </button>
-    </div>
-  )
-}
-
-const Authenticate: BlitzPage = () => {
-  return (
-    <div id="page">
-      <Suspense fallback={"Loading..."}>
-        <Content />
-      </Suspense>
-    </div>
-  )
-}
-
-Authenticate.authenticate = {role: "ADMIN", redirectTo: "/noauth-query"}
-
-export default Authenticate
--- a/integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role-working.tsx
+++ b/integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role-working.tsx
@@ -1,37 +0,0 @@
-import {useMutation, useQuery} from "@blitzjs/rpc"
-import {BlitzPage} from "@blitzjs/next"
-import logout from "../mutations/logout"
-import getAuthenticatedBasic from "../queries/getAuthenticatedBasic"
-import {Suspense} from "react"
-
-function Content() {
-  const [result] = useQuery(getAuthenticatedBasic, undefined)
-  const [logoutMutation] = useMutation(logout)
-  return (
-    <div>
-      <div id="content">{result}</div>
-      <button
-        id="logout"
-        onClick={async () => {
-          await logoutMutation()
-        }}
-      >
-        logout
-      </button>
-    </div>
-  )
-}
-
-const Authenticate: BlitzPage = () => {
-  return (
-    <div id="page">
-      <Suspense fallback={"Loading..."}>
-        <Content />
-      </Suspense>
-    </div>
-  )
-}
-
-Authenticate.authenticate = {role: "USER"}
-
-export default Authenticate
--- a/integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role.tsx
+++ b/integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role.tsx
@@ -1,37 +0,0 @@
-import {useMutation, useQuery} from "@blitzjs/rpc"
-import {BlitzPage} from "@blitzjs/next"
-import logout from "../mutations/logout"
-import getAuthenticatedBasic from "../queries/getAuthenticatedBasic"
-import {Suspense} from "react"
-
-function Content() {
-  const [result] = useQuery(getAuthenticatedBasic, undefined)
-  const [logoutMutation] = useMutation(logout)
-  return (
-    <div>
-      <div id="content">{result}</div>
-      <button
-        id="logout"
-        onClick={async () => {
-          await logoutMutation()
-        }}
-      >
-        logout
-      </button>
-    </div>
-  )
-}
-
-const Authenticate: BlitzPage = () => {
-  return (
-    <div id="page">
-      <Suspense fallback={"Loading..."}>
-        <Content />
-      </Suspense>
-    </div>
-  )
-}
-
-Authenticate.authenticate = {role: "ADMIN"}
-
-export default Authenticate
--- a/integration-tests/auth-with-rpc/test/index.test.ts
+++ b/integration-tests/auth-with-rpc/test/index.test.ts
@@ -13,10 +13,37 @@ import webdriver from "../../utils/next-webdriver"
 let app: any
 let appPort: number

-let mode: "dev" | "server" = "dev"
-
 const runTests = () => {
  describe("Auth", () => {
+    /* TODO - Add a non flaky Integration Test for custom plugin
+   describe("custom plugin", () => {
+      it("custom plugin - events", async () => {
+        const browser = await webdriver(appPort, "/custom-plugin")
+        let text = await browser.elementByCss("#page").text()
+        await waitFor(250)
+        text = await browser.elementByCss("#page").text()
+        expect(text).toBe("Custom plugin Session Created")
+        await waitFor(3000)
+        text = await browser.elementByCss("#page").text()
+        expect(text).toBe("Custom plugin RPC Error")
+        if (browser) {
+          await browser.close()
+        }
+      })
+      it("custom plugin - middleware", async () => {
+        const browser = await webdriver(appPort, "/custom-plugin")
+        await waitFor(100)
+        let text = await browser.elementByCss("#before-req").text()
+        expect(text).toBe("customHeaderValue")
+        await waitFor(2000)
+        text = await browser.elementByCss("#before-res").text()
+        expect(text).toBe("55")
+        if (browser) {
+          await browser.close()
+        }
+      })
+    })
+    */
    describe("unauthenticated", () => {
      it("should render result for open query", async () => {
        const browser = await webdriver(appPort, "/noauth-query")
@@ -31,11 +58,7 @@ const runTests = () => {
        const browser = await webdriver(appPort, "/authenticated-query")
        await browser.waitForElementByCss("#error")
        let text = await browser.elementByCss("#error").text()
-        if (mode === "server") {
-          expect(text).toMatch(/AuthenticationError/)
-        } else {
-          expect(text).toContain("Error")
-        }
+        expect(text).toMatch(/AuthenticationError/)
        if (browser) await browser.close()
      })

@@ -47,14 +70,6 @@ const runTests = () => {
        if (browser) await browser.close()
      })

-      it("Page.authenticate = {role} should work ", async () => {
-        const browser = await webdriver(appPort, "/page-dot-authenticate-role")
-        await browser.waitForElementByCss("#error")
-        let text = await browser.elementByCss("#error").text()
-        expect(text).toMatch(/AuthenticationError/)
-        if (browser) await browser.close()
-      })
-
      it("should render error for protected layout", async () => {
        const browser = await webdriver(appPort, "/layout-authenticate")
        await browser.waitForElementByCss("#error")
@@ -105,36 +120,18 @@ const runTests = () => {
        await waitFor(200)
        await browser.waitForElementByCss("#error")
        text = await browser.elementByCss("#error").text()
-        if (mode === "server") {
-          expect(text).toMatch(/AuthenticationError/)
-        } else {
-          expect(text).toContain("Error")
-        }
-        if (browser) await browser.close()
-      })
-
-      it("Page.authenticate = {role} should throw authentication error ", async () => {
-        let browser = await webdriver(appPort, "/login")
-        await waitFor(200)
-        await browser.elementByCss("#login").click()
-        await waitFor(200)
-        await browser.eval(`window.location = "/page-dot-authenticate-role"`)
-        await browser.waitForElementByCss("#error")
-        let text = await browser.elementByCss("#error").text()
        expect(text).toMatch(/AuthenticationError/)
        if (browser) await browser.close()
      })

-      it("Page.authenticate = {role: 'custom'} should work ", async () => {
-        let browser = await webdriver(appPort, "/page-dot-authenticate-role-working")
-        await browser.waitForElementByCss("#content")
-        let text = await browser.elementByCss("#content").text()
-        expect(text).toMatch(/authenticated-basic-result/)
-        if (browser) await browser.close()
-      })
-
      it("Page.authenticate = {redirect} should work ", async () => {
-        let browser = await webdriver(appPort, "/page-dot-authenticate-redirect")
+        // Login
+        let browser = await webdriver(appPort, "/login")
+        await waitFor(200)
+        await browser.elementByCss("#login").click()
+        await waitFor(200)
+
+        await browser.eval(`window.location = "/page-dot-authenticate-redirect"`)
        await browser.waitForElementByCss("#content")
        let text = await browser.elementByCss("#content").text()
        expect(text).toMatch(/authenticated-basic-result/)
@@ -145,26 +142,14 @@ const runTests = () => {
        if (browser) await browser.close()
      })

-      it("Page.authenticate = {role: 'custom', redirect: 'url'} should work ", async () => {
+      it("Layout.authenticate = {redirect} should work ", async () => {
+        // Login
        let browser = await webdriver(appPort, "/login")
        await waitFor(200)
        await browser.elementByCss("#login").click()
        await waitFor(200)
-        await browser.eval(`window.location = "/page-dot-authenticate-role-redirect"`)
-        await browser.waitForElementByCss("#content")
-        expect(await browser.url()).toMatch(/\/noauth-query/)
-        if (browser) await browser.close()
-      })

-      it("Page.authenticate = {role: 'custom', redirect: 'url'} should stay ", async () => {
-        let browser = await webdriver(appPort, "/page-dot-authenticate-role-redirect-stay")
-        await browser.waitForElementByCss("#content")
-        expect(await browser.url()).toMatch(/\/page-dot-authenticate-role-redirect-stay/)
-        if (browser) await browser.close()
-      })
-
-      it("Layout.authenticate = {redirect} should work ", async () => {
-        let browser = await webdriver(appPort, "/layout-authenticate-redirect")
+        await browser.eval(`window.location = "/layout-authenticate-redirect"`)
        await browser.waitForElementByCss("#content")
        let text = await browser.elementByCss("#content").text()
        expect(text).toMatch(/authenticated-basic-result/)
@@ -277,7 +262,6 @@ const runTests = () => {
 describe("Auth Tests", () => {
  describe("dev mode", () => {
    beforeAll(async () => {
-      mode = "dev"
      try {
        await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
        appPort = await findPort()
@@ -292,7 +276,6 @@ describe("Auth Tests", () => {

  describe("server mode", () => {
    beforeAll(async () => {
-      mode = "server"
      try {
        await runBlitzCommand(["prisma", "generate"])
        await runBlitzCommand(["prisma", "migrate", "deploy"])
--- a/integration-tests/auth/package.json
+++ b/integration-tests/auth/package.json
@@ -17,13 +17,13 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/config": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
+    "@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": "2.0.0-beta.35",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
-    "next": "13.5.2",
+    "next": "13.3.0",
    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0",
--- a/integration-tests/auth/test/index.test.ts
+++ b/integration-tests/auth/test/index.test.ts
@@ -43,7 +43,7 @@ const runTests = (mode?: string) => {
          const browser = await webdriver(appPort, "/authenticated-page")
          let errorMsg = await browser.elementById(`error`).text()
          expect(errorMsg).toMatch(/Error: You are not authenticated/)
-          if (browser) void browser.close()
+          if (browser) browser.close()
        },
        5000 * 60 * 2,
      )
--- a/integration-tests/get-initial-props/package.json
+++ b/integration-tests/get-initial-props/package.json
@@ -16,19 +16,19 @@
    "schema": "db/schema.prisma"
  },
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
+    "@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": "2.0.0-beta.35",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
-    "next": "13.5.2",
+    "next": "13.3.0",
    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.35",
+    "@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/next-env.d.ts
+++ b/integration-tests/middleware/next-env.d.ts
@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-/// <reference types="next/navigation-types/compat/navigation" />

 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.
--- a/integration-tests/middleware/package.json
+++ b/integration-tests/middleware/package.json
@@ -11,11 +11,11 @@
    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
  },
  "dependencies": {
-    "@blitzjs/config": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
-    "blitz": "2.0.0-beta.35",
-    "next": "13.5.2",
+    "@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/middleware/tsconfig.json
+++ b/integration-tests/middleware/tsconfig.json
@@ -1,16 +1,10 @@
 {
  "extends": "@blitzjs/config/tsconfig.nextjs.json",
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types", ".next/types/**/*.ts"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
  "compilerOptions": {
    "paths": {
      "react": ["./node_modules/@types/react"]
-    },
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
-    "strictNullChecks": true
+    }
  },
  "exclude": ["node_modules"],
  "baseUrl": "."
--- a/integration-tests/next-13-app-dir/package.json
+++ b/integration-tests/next-13-app-dir/package.json
@@ -17,14 +17,14 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/config": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
+    "@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": "2.0.0-beta.35",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
-    "next": "13.5.2",
+    "next": "13.3.0",
    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0",
--- a/integration-tests/no-suspense/package.json
+++ b/integration-tests/no-suspense/package.json
@@ -16,19 +16,19 @@
    "prisma:studio": "prisma studio"
  },
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
+    "@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": "2.0.0-beta.35",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
-    "next": "13.5.2",
+    "next": "13.3.0",
    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.35",
+    "@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,14 +8,14 @@
    "clean": "rm -rf .turbo && rm -rf node_modules"
  },
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/config": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
+    "@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": "2.0.0-beta.35",
-    "next": "13.5.2",
+    "blitz": "workspace:2.0.0-beta.27",
+    "next": "13.3.0",
    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0"
--- a/integration-tests/qm/test/use-query.test.tsx
+++ b/integration-tests/qm/test/use-query.test.tsx
@@ -4,7 +4,7 @@ import {useQuery, useInfiniteQuery, BlitzRpcPlugin, QueryClientProvider} from "@
 import React from "react"
 import delay from "delay"
 import {buildMutationRpc, buildQueryRpc, mockRouter, render} from "../../utils/blitz-test-utils"
-import {RouterContext} from "@blitzjs/next"
+import {RouterContext} from "next/dist/shared/lib/router-context"

 beforeAll(() => {
  globalThis.__BLITZ_SESSION_COOKIE_PREFIX = "qm-test-cookie-prefix"
--- a/integration-tests/react-query-utils/next-env.d.ts
+++ b/integration-tests/react-query-utils/next-env.d.ts
@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-/// <reference types="next/navigation-types/compat/navigation" />

 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.
--- a/integration-tests/react-query-utils/package.json
+++ b/integration-tests/react-query-utils/package.json
@@ -16,18 +16,18 @@
    "schema": "db/schema.prisma"
  },
  "dependencies": {
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
+    "@blitzjs/next": "workspace:2.0.0-beta.27",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.27",
    "@prisma/client": "4.6.1",
-    "blitz": "2.0.0-beta.35",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
-    "next": "13.5.2",
+    "next": "13.3.0",
    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.35",
+    "@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/react-query-utils/tsconfig.json
+++ b/integration-tests/react-query-utils/tsconfig.json
@@ -1,16 +1,10 @@
 {
  "extends": "@blitzjs/config/tsconfig.nextjs.json",
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types", ".next/types/**/*.ts"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
  "compilerOptions": {
    "paths": {
      "react": ["./node_modules/@types/react"]
-    },
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
-    "strictNullChecks": true
+    }
  },
  "exclude": ["node_modules"],
  "baseUrl": "."
--- a/integration-tests/rpc-path-root/package.json
+++ b/integration-tests/rpc-path-root/package.json
@@ -7,11 +7,11 @@
    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
  },
  "dependencies": {
-    "@blitzjs/config": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
-    "blitz": "2.0.0-beta.35",
-    "next": "13.5.2",
+    "@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,11 +7,11 @@
    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
  },
  "dependencies": {
-    "@blitzjs/config": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
-    "blitz": "2.0.0-beta.35",
-    "next": "13.5.2",
+    "@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,19 +16,19 @@
    "schema": "db/schema.prisma"
  },
  "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/next": "2.0.0-beta.35",
-    "@blitzjs/rpc": "2.0.0-beta.35",
+    "@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": "2.0.0-beta.35",
+    "blitz": "workspace:2.0.0-beta.27",
    "lowdb": "3.0.0",
-    "next": "13.5.2",
+    "next": "13.3.0",
    "prisma": "4.6.1",
    "react": "18.2.0",
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.35",
+    "@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/utils/blitz-test-utils.tsx
+++ b/integration-tests/utils/blitz-test-utils.tsx
@@ -3,7 +3,7 @@ import {vi} from "vitest"
 import {QueryClient} from "@tanstack/react-query"
 import {BlitzRpcPlugin, QueryClientProvider} from "@blitzjs/rpc"
 import {NextRouter} from "next/router"
-import {RouterContext} from "@blitzjs/next"
+import {RouterContext} from "next/dist/shared/lib/router-context"
 import {render as defaultRender} from "@testing-library/react"

 export const mockRouter: NextRouter = {
@@ -27,7 +27,6 @@ export const mockRouter: NextRouter = {
    emit: vi.fn(),
  },
  isFallback: false,
-  forward: vi.fn(),
 }

 type DefaultParams = Parameters<typeof defaultRender>
@@ -75,10 +74,7 @@ const BlitzWrapper = ({plugins, children}) => {
  )
 }

-export function render(
-  ui: RenderUI,
-  {wrapper, router, ...options}: RenderOptions = {},
-): ReturnType<typeof defaultRender> {
+export function render(ui: RenderUI, {wrapper, router, ...options}: RenderOptions = {}) {
  if (!wrapper) {
    wrapper = ({children}) => {
      return <BlitzWrapper plugins={[BlitzRpcPlugin({})]}>{children}</BlitzWrapper>
--- a/integration-tests/utils/next-test-utils.ts
+++ b/integration-tests/utils/next-test-utils.ts
@@ -242,8 +242,8 @@ export function runBlitzCommandDev(argv, stdOut, opts: RunNextCommandDevOptions
    function handleStdout(data) {
      const message = data.toString()
      const bootupMarkers = {
-        dev: /Ready/i,
-        start: /Ready/i,
+        dev: /compiled .*successfully/i,
+        start: /started server/i,
      }
      if (
        (opts.bootupMarker && opts.bootupMarker.test(message)) ||
@@ -417,10 +417,9 @@ export function runNextCommandDev(argv, stdOut, opts: RunNextCommandDevOptions =

    function handleStdout(data) {
      const message = data.toString()
-      console.log(message)
      const bootupMarkers = {
-        dev: /Next.js/i,
-        start: /Next.js/i,
+        dev: /compiled .*successfully/i,
+        start: /started server/i,
      }
      if (
        (opts.bootupMarker && opts.bootupMarker.test(message)) ||
@@ -437,7 +436,7 @@ export function runNextCommandDev(argv, stdOut, opts: RunNextCommandDevOptions =
      }

      if (opts.stdout !== false) {
-      	process.stdout.write(message)
+        process.stdout.write(message)
      }
    }

--- a/integration-tests/utils/package.json
+++ b/integration-tests/utils/package.json
@@ -3,9 +3,8 @@
  "version": "0.0.0",
  "private": true,
  "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.35",
-    "@blitzjs/next": "workspace:2.0.0-beta.35",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.35",
+    "@blitzjs/config": "workspace: *",
+    "@blitzjs/rpc": "workspace: *",
    "@tanstack/react-query": "4.13.0",
    "@testing-library/react": "13.4.0",
    "@types/express": "4.17.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",
@@ -29,25 +29,20 @@
    "husky": "8.0.2",
    "jsdom": "^19.0.0",
    "lint-staged": "13.0.3",
-    "next": "13.5.2",
+    "next": "13.3.0",
    "only-allow": "1.1.0",
    "prettier": "^2.7.1",
    "prettier-plugin-prisma": "4.4.0",
    "pretty-quick": "3.1.3",
-    "turbo": "1.10.9",
+    "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"
    ]
-  },
-  "pnpm": {
-    "patchedDependencies": {
-      "next-auth@4.18.7": "patches/next-auth@4.18.7.patch"
-    }
  }
 }
--- a/packages/blitz-auth/CHANGELOG.md
+++ b/packages/blitz-auth/CHANGELOG.md
@@ -1,104 +1,5 @@
 # @blitzjs/auth

-## 2.0.0-beta.35
-
-### Patch Changes
-
- cee2dec17: Fix bug that did not allow `Page.authenicate = {role: "" }` to correctly work
- b97366c42: Remove unintended dependency on next-auth by removing it from the core build of @blitzjs/auth
-
-  ⚠️ Breaking Change for current users of `withNextAuthAdapter`
-
-  Update your import in `next.config.js` in the following way
-
-  ```diff
-  -const { withNextAuthAdapter } = require("@blitzjs/auth")
-  +const { withNextAuthAdapter } = require("@blitzjs/auth/next-auth")
-  ```
-
- 3bcbad1a9: - Introduce Blitz RPC's logging system to the `invoke` function which is the recommended way to call resolvers in nextjs `app` directory's react server components.
-
-  - This refactor also removes the re-introduced dependency between `blitz-auth` and `blitz-rpc`, allowing independent usage of `blitz-rpc`
-
- Updated dependencies [cee2dec17]
- Updated dependencies [aec1bb076]
- Updated dependencies [b97366c42]
- Updated dependencies [3bcbad1a9]
-  - blitz@2.0.0-beta.35
-
-## 2.0.0-beta.34
-
-### Patch Changes
-
- 3ddb57072: ⚠️ Breaking Change:
-  Next.js version 13.5 or above is now required to use `@blitzjs/next`
-
-  Fix `Error: Cannot find module 'next/dist/shared/lib/router/utils/resolve-href'` by updating the location of next.js internal function.
-
- Updated dependencies [30fd61316]
- Updated dependencies [3ddb57072]
- Updated dependencies [fe8c937d2]
-  - blitz@2.0.0-beta.34
-
-## 2.0.0-beta.33
-
-### Patch Changes
-
- Updated dependencies [19898a488]
- Updated dependencies [6811eab1a]
- Updated dependencies [022392c12]
-  - blitz@2.0.0-beta.33
-
-## 2.0.0-beta.32
-
-### Patch Changes
-
- 8b01175b4: Updated `useAuthenticatedBlitzContext` to now return `AuthenticatedCtx`
- Updated dependencies [82649f341]
-  - blitz@2.0.0-beta.32
-
-## 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.35",
+  "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.35",
+    "blitz": "2.0.0-beta.27",
    "next": "*",
    "next-auth": "*",
    "secure-password": "4.0.0"
@@ -67,7 +65,7 @@
    }
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.35",
+    "@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,8 +73,8 @@
    "@types/jsonwebtoken": "8.5.8",
    "@types/react": "18.0.25",
    "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.35",
-    "next": "13.5.2",
+    "blitz": "2.0.0-beta.27",
+    "next": "13.3.0",
    "next-auth": "4.18.7",
    "react": "18.2.0",
    "react-dom": "18.2.0",
--- a/packages/blitz-auth/src/client/index.tsx
+++ b/packages/blitz-auth/src/client/index.tsx
@@ -310,12 +310,12 @@ function withBlitzAuthPlugin<TProps = any>(Page: ComponentType<TProps> | BlitzPa
    }, [])

    let {authenticate, redirectAuthenticatedTo} = getAuthValues(Page, props)
+
    useAuthorizeIf(
-      !!authenticate &&
-        ((typeof authenticate === "object" && authenticate.redirectTo === undefined) ||
-          authenticate === true),
+      authenticate === true,
      !authenticate ? undefined : typeof authenticate === "object" ? authenticate.role : undefined,
    )
+
    if (typeof window !== "undefined") {
      const publicData = getPublicDataStore().getData()

--- a/packages/blitz-auth/src/global.ts
+++ b/packages/blitz-auth/src/global.ts
@@ -1,10 +1,8 @@
-import type {Ctx} from "blitz"
-import type {AuthPluginOptions} from "./server"
-import type {SessionConfigMethods} from "./shared"
+import {AuthPluginOptions} from "./server"
+import {SessionConfigMethods} from "./shared"

 declare global {
  var sessionConfig: AuthPluginOptions & SessionConfigMethods
  var __BLITZ_SESSION_COOKIE_PREFIX: string | undefined
  var __BLITZ_SUSPENSE_ENABLED: boolean
-  var __BLITZ_GET_RSC_CONTEXT: () => Promise<Ctx>
 }
--- 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
@@ -13,8 +13,6 @@ import {
 } from "blitz"
 import {isLocalhost, SessionContext} from "../../../index-server"

-export {withNextAuthAdapter} from "./webpack"
-
 // next-auth internals
 import {toInternalRequest, toResponse} from "./internals/utils/web"
 import {getBody, getURL, setHeaders} from "./internals/utils/node"
@@ -29,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"

@@ -106,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(
@@ -161,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
@@ -191,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
@@ -1,4 +1,4 @@
-import {RequestMiddleware, Ctx, createServerPlugin} from "blitz"
+import {BlitzServerPlugin, RequestMiddleware, Ctx, createServerPlugin} from "blitz"
 import {assert} from "blitz"
 import {IncomingMessage, ServerResponse} from "http"
 import {PublicData, SessionModel, SessionConfigMethods} from "../shared/types"
@@ -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>
  }
@@ -125,7 +125,6 @@ export const AuthServerPlugin = createServerPlugin((options: AuthPluginOptions)
    }
    return blitzSessionMiddleware
  }
-  globalThis.__BLITZ_GET_RSC_CONTEXT = getBlitzContext
  return {
    requestMiddlewares: [authPluginSessionMiddleware()],
    exports: () => ({
--- a/packages/blitz-auth/src/server/auth-sessions.ts
+++ b/packages/blitz-auth/src/server/auth-sessions.ts
@@ -15,7 +15,6 @@ import {
  log,
  baseLogger,
  chalk,
-  AuthenticatedCtx,
 } from "blitz"
 import {
  EmptyPublicData,
@@ -220,7 +219,7 @@ export async function useAuthenticatedBlitzContext({
  redirectTo?: string | RouteUrlObject
  redirectAuthenticatedTo?: string | RouteUrlObject | ((ctx: Ctx) => string | RouteUrlObject)
  role?: string | string[]
-}): Promise<AuthenticatedCtx> {
+}): Promise<void> {
  const log = baseLogger().getSubLogger({name: "useAuthenticatedBlitzContext"})
  const customChalk = new chalk.Instance({
    level: log.settings.type === "json" ? 0 : chalk.level,
@@ -269,7 +268,6 @@ export async function useAuthenticatedBlitzContext({
      redirect(redirectTo)
    }
  }
-  return ctx as AuthenticatedCtx
 }

 const makeProxyToPublicData = <T extends SessionContextClass>(ctxClass: T): T => {
--- 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/src/shared/types.ts
+++ b/packages/blitz-auth/src/shared/types.ts
@@ -82,7 +82,7 @@ declare module "blitz" {
  export interface Ctx {
    session: SessionContext
  }
-  export interface AuthenticatedCtx extends Omit<Ctx, "session"> {
+  export interface AuthenticatedMiddlewareCtx extends Omit<Ctx, "session"> {
    session: AuthenticatedSessionContext
  }
 }
--- 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,97 +1,5 @@
 # @blitzjs/next

-## 2.0.0-beta.35
-
-### Patch Changes
-
- aec1bb076: blitz-next: Fix `next/head` used in app directory warning
- Updated dependencies [cee2dec17]
- Updated dependencies [aec1bb076]
- Updated dependencies [b97366c42]
- Updated dependencies [3bcbad1a9]
-  - blitz@2.0.0-beta.35
-  - @blitzjs/rpc@2.0.0-beta.35
-
-## 2.0.0-beta.34
-
-### Major Changes
-
- 3ddb57072: ⚠️ Breaking Change:
-  Next.js version 13.5 or above is now required to use `@blitzjs/next`
-
-  Fix `Error: Cannot find module 'next/dist/shared/lib/router/utils/resolve-href'` by updating the location of next.js internal function.
-
-### Patch Changes
-
- Updated dependencies [30fd61316]
- Updated dependencies [3ddb57072]
- Updated dependencies [fe8c937d2]
-  - blitz@2.0.0-beta.34
-  - @blitzjs/rpc@2.0.0-beta.34
-
-## 2.0.0-beta.33
-
-### Patch Changes
-
- 022392c12: - Updates `ts-log` peer dependency to `4.9.0`
-  - Removes `javascript` from `blitz new` menu
-  - Hot Fix the `Update Schema` when using blitz generator
- Updated dependencies [19898a488]
- Updated dependencies [6811eab1a]
- Updated dependencies [022392c12]
-  - @blitzjs/rpc@2.0.0-beta.33
-  - blitz@2.0.0-beta.33
-
-## 2.0.0-beta.32
-
-### Patch Changes
-
- 82649f341: Upgrade tslog to `4.9.0`.
-
-  This due a [tslog issue](https://github.com/fullstack-build/tslog/issues/227) that causes tslog to crash when attempting to log an error whose constructor expects more than one argument.
-
- Updated dependencies [82649f341]
-  - blitz@2.0.0-beta.32
-  - @blitzjs/rpc@2.0.0-beta.32
-
-## 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.35",
+  "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.35",
+    "@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,33 +38,30 @@
    "supports-color": "8.1.1"
  },
  "peerDependencies": {
-    "blitz": "2.0.0-beta.35",
+    "blitz": "2.0.0-beta.27",
    "next": "*",
-    "react": "*",
-    "tslog": "4.9.0"
+    "react": "*"
  },
  "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.35",
+    "@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.35",
+    "blitz": "2.0.0-beta.27",
    "cross-spawn": "7.0.3",
    "find-up": "4.1.0",
-    "next": "13.5.2",
+    "next": "13.3.0",
    "next-router-mock": "0.9.1",
    "react": "18.2.0",
    "react-dom": "18.2.0",
    "resolve-from": "5.0.0",
    "ts-jest": "27.1.4",
-    "tslog": "4.9.0",
    "typescript": "^4.8.4",
    "unbuild": "0.7.6",
    "watch": "1.0.2"
--- a/packages/blitz-next/src/error-component.tsx
+++ b/packages/blitz-next/src/error-component.tsx
@@ -1,10 +1,6 @@
 import React from "react"
+import Head from "next/head"
 import {NextPageContext} from "next"
-import dynamic from "next/dynamic"
-const Head = dynamic(() => import("next/head").then((mod) => mod.default), {
-  ssr: false,
-  loading: () => null,
-})

 const statusCodes: {[code: number]: string} = {
  400: "Bad Request",
@@ -35,6 +31,7 @@ export class ErrorComponent<P = {}> extends React.Component<P & ErrorProps> {
  render() {
    const {statusCode} = this.props
    const title = this.props.title || statusCodes[statusCode] || "An unexpected error has occurred"
+
    return (
      <div style={styles.error}>
        <Head>
--- a/packages/blitz-next/src/index-browser.tsx
+++ b/packages/blitz-next/src/index-browser.tsx
@@ -1,18 +1,14 @@
 import "./global"
 import type {ClientPlugin, BlitzPluginWithProvider} from "blitz"
 import {reduceBlitzClientPlugins, Ctx} from "blitz"
+import Head from "next/head"
 import React, {ReactNode} from "react"
 import {withSuperJSONPage} from "./superjson"
 import {UrlObject} from "url"
 import {AppPropsType} from "next/dist/shared/lib/utils"
 import type {Router} from "next/router"
 import {BlitzProvider} from "./provider"
-import dynamic from "next/dynamic"
 export {Routes} from ".blitz"
-const Head = dynamic(() => import("next/head").then((mod) => mod.default), {
-  ssr: false,
-  loading: () => null,
-})

 export {BlitzProvider} from "./provider"

--- a/packages/blitz-next/src/index-server.ts
+++ b/packages/blitz-next/src/index-server.ts
@@ -37,7 +37,7 @@ import {IncomingMessage, ServerResponse} from "http"
 import {withSuperJsonProps} from "./superjson"
 import {ParsedUrlQuery} from "querystring"
 import {PreviewData} from "next/types"
-import {resolveHref} from "next/dist/client/resolve-href"
+import {resolveHref} from "next/dist/shared/lib/router/utils/resolve-href"

 export * from "./index-browser"

--- 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,173 +1,5 @@
 # @blitzjs/rpc

-## 2.0.0-beta.35
-
-### Patch Changes
-
- 3bcbad1a9: - Introduce Blitz RPC's logging system to the `invoke` function which is the recommended way to call resolvers in nextjs `app` directory's react server components.
-
-  - This refactor also removes the re-introduced dependency between `blitz-auth` and `blitz-rpc`, allowing independent usage of `blitz-rpc`
-
- Updated dependencies [cee2dec17]
- Updated dependencies [aec1bb076]
- Updated dependencies [b97366c42]
- Updated dependencies [3bcbad1a9]
-  - blitz@2.0.0-beta.35
-
-## 2.0.0-beta.34
-
-### Patch Changes
-
- 3ddb57072: ⚠️ Breaking Change:
-  Next.js version 13.5 or above is now required to use `@blitzjs/next`
-
-  Fix `Error: Cannot find module 'next/dist/shared/lib/router/utils/resolve-href'` by updating the location of next.js internal function.
-
- Updated dependencies [30fd61316]
- Updated dependencies [3ddb57072]
- Updated dependencies [fe8c937d2]
-  - blitz@2.0.0-beta.34
-
-## 2.0.0-beta.33
-
-### Patch Changes
-
- 19898a488: Fix for tslog error `TypeError: Cannot read properties of undefined (reading 'map')` while using custom errors.
- 6811eab1a: Allow `.tsx` & `.jsx` file extensions to be used for resolvers
- Updated dependencies [19898a488]
- Updated dependencies [6811eab1a]
- Updated dependencies [022392c12]
-  - blitz@2.0.0-beta.33
-
-## 2.0.0-beta.32
-
-### Patch Changes
-
- Updated dependencies [82649f341]
-  - blitz@2.0.0-beta.32
-
-## 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.35",
+  "version": "2.0.0-beta.27",
  "homepage": "https://blitzjs.com/",
  "repository": {
    "type": "git",
@@ -37,19 +37,19 @@
  },
  "peerDependencies": {
    "@tanstack/query-core": "4.24.4",
-    "blitz": "2.0.0-beta.35",
+    "blitz": "2.0.0-beta.27",
    "next": "*",
    "react": "*"
  },
  "devDependencies": {
-    "@blitzjs/auth": "2.0.0-beta.35",
-    "@blitzjs/config": "2.0.0-beta.35",
+    "@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.35",
-    "next": "13.5.2",
+    "blitz": "2.0.0-beta.27",
+    "next": "13.3.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
    "typescript": "^4.8.4",
--- a/packages/blitz-rpc/src/client/invoke.ts
+++ b/packages/blitz-rpc/src/client/invoke.ts
@@ -1,15 +1,36 @@
-import {type FirstParam, type PromiseReturnType, type Ctx, isClient} from "blitz"
+import {FirstParam, PromiseReturnType, isClient, Ctx} from "blitz"
 import {RpcClient} from "./rpc"

 export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>(
  queryFn: T,
  params: TInput,
+): Promise<PromiseReturnType<T>>
+export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>(
+  queryFn: T,
+  params: TInput,
+  isServer: boolean,
+): Promise<PromiseReturnType<T>>
+export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>(
+  queryFn: T,
+  params: TInput,
+  isServer = typeof window === "undefined" ? true : false,
 ): Promise<PromiseReturnType<T>> {
  if (typeof queryFn === "undefined") {
    throw new Error(
      "invoke is missing the first argument - it must be a query or mutation function",
    )
  }
+
+  if (isServer) {
+    const {getBlitzContext} = await import("@blitzjs/auth").catch((e) => {
+      throw new Error(
+        `invoke with isServer parameter can only be used in a Blitz powered Nextjs app directory. Make sure you have installed the @blitzjs/auth package.`,
+      )
+    })
+    const ctx = await getBlitzContext()
+    return queryFn(params, ctx) as PromiseReturnType<T>
+  }
+
  if (isClient) {
    const fn = queryFn as unknown as RpcClient
    return fn(params, {fromInvoke: true}) as PromiseReturnType<T>
--- a/packages/blitz-rpc/src/global.ts
+++ b/packages/blitz-rpc/src/global.ts
@@ -1,10 +1,6 @@
-import type {QueryClient} from "@tanstack/react-query"
-import type {RpcLoggerOptions} from "./server/plugin"
-import type {Ctx} from "blitz"
+import {QueryClient} from "@tanstack/react-query"

 declare global {
  var queryClient: QueryClient
  var __BLITZ_SUSPENSE_ENABLED: boolean
-  var blitzRpcRpcLoggerOptions: RpcLoggerOptions | undefined
-  var __BLITZ_GET_RSC_CONTEXT: () => Promise<Ctx>
 }
--- a/packages/blitz-rpc/src/index-server.ts
+++ b/packages/blitz-rpc/src/index-server.ts
@@ -1,10 +1,9 @@
-import {assert, ResolverConfig} from "blitz"
+import {assert, baseLogger, Ctx, newLine, prettyMs, ResolverConfig} from "blitz"
 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"
-import {RpcLogger} from "./rpc-logger"
-import {RpcLoggerOptions} from "./server/plugin"

 // TODO - optimize end user server bundles by not exporting all client stuff here
 export * from "./index-browser"
@@ -147,11 +146,10 @@ async function getResolverMap(): Promise<ResolverFiles | null | undefined> {
 interface RpcConfig {
  onError?: (error: Error) => void
  formatError?: (error: Error) => Error
-  logging?: RpcLoggerOptions
 }

 export function rpcHandler(config: RpcConfig) {
-  return async function handleRpcRequest(req: NextApiRequest, res: NextApiResponse) {
+  return async function handleRpcRequest(req: NextApiRequest, res: NextApiResponse, ctx: Ctx) {
    const resolverMap = await getResolverMap()
    assert(resolverMap, "No query or mutation resolvers found")
    assert(
@@ -161,8 +159,14 @@ export function rpcHandler(config: RpcConfig) {

    const relativeRoutePath = (req.query.blitz as string[])?.join("/")
    const routePath = "/" + relativeRoutePath
-    const resolverName = routePath.replace(/(\/api\/rpc)?\//, "")
-    const rpcLogger = new RpcLogger(resolverName, config.logging)
+
+    const log = baseLogger().getSubLogger({
+      name: "blitz-rpc",
+      prefix: [routePath.replace(/(\/api\/rpc)?\//, "") + "()"],
+    })
+    const customChalk = new chalk.Instance({
+      level: log.settings.type === "json" ? 0 : chalk.level,
+    })

    const loadableResolver = resolverMap?.[routePath]
    if (!loadableResolver) {
@@ -187,7 +191,7 @@ export function rpcHandler(config: RpcConfig) {
    ) {
      if (req.method === "POST" && typeof req.body.params === "undefined") {
        const error = {message: "Request body is missing the `params` key"}
-        rpcLogger.error(error.message)
+        log.error(error.message)
        res.status(400).json({
          result: null,
          error,
@@ -209,17 +213,16 @@ export function rpcHandler(config: RpcConfig) {
              ? parse(`${req.query.meta}`)
              : undefined,
        })
-        rpcLogger.timer.initResolver()
-        rpcLogger.preResolver(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)
-        rpcLogger.timer.resolverDuration()
-        rpcLogger.postResolver(result)
+        const resolverDuration = Date.now() - startTime
+        log.info(customChalk.dim("Result:"), result ? result : JSON.stringify(result))

-        rpcLogger.timer.initSerialization()
+        const serializerStartTime = Date.now()
        const serializedResult = superjsonSerialize(result)

-        rpcLogger.timer.initNextJsSerialization()
+        const nextSerializerStartTime = Date.now()
        ;(res as any).blitzResult = result
        res.json({
          result: serializedResult.json,
@@ -228,11 +231,22 @@ export function rpcHandler(config: RpcConfig) {
            result: serializedResult.meta,
          },
        })
-        rpcLogger.timer.nextJsSerializationDuration()
-        rpcLogger.nextJsSerialization()
+        log.debug(
+          customChalk.dim(
+            `Next.js serialization:${prettyMs(Date.now() - nextSerializerStartTime)}`,
+          ),
+        )
+        const serializerDuration = Date.now() - serializerStartTime
+        const duration = Date.now() - startTime

-        rpcLogger.timer.serializerDuration().totalDuration()
-        rpcLogger.postResponse()
+        log.debug(
+          customChalk.dim(
+            `Finished: resolver:${prettyMs(resolverDuration)} serializer:${prettyMs(
+              serializerDuration,
+            )} total:${prettyMs(duration)}`,
+          ),
+        )
+        newLine()

        return
      } catch (error: any) {
@@ -241,7 +255,9 @@ export function rpcHandler(config: RpcConfig) {
        }

        config.onError?.(error)
-        rpcLogger.error(error)
+
+        log.error(error)
+        newLine()

        if (!error.statusCode) {
          error.statusCode = 500
@@ -261,7 +277,7 @@ export function rpcHandler(config: RpcConfig) {
      }
    } else {
      // Everything else is error
-      rpcLogger.warn(`${req.method} method not supported`)
+      log.warn(`${req.method} method not supported`)
      res.status(404).end()
      return
    }
--- a/packages/blitz-rpc/src/query/react-query/react-query.ts
+++ b/packages/blitz-rpc/src/query/react-query/react-query.ts
@@ -44,7 +44,7 @@ class NextError extends Error {
 // -------------------------
 // useQuery
 // -------------------------
-export type RestQueryResult<TResult, TError> = Omit<UseQueryResult<TResult, TError>, "data"> &
+type RestQueryResult<TResult, TError> = Omit<UseQueryResult<TResult, TError>, "data"> &
  QueryCacheFunctions<TResult>

 export function useQuery<
@@ -131,7 +131,7 @@ export function useQuery<
 // -------------------------
 // usePaginatedQuery
 // -------------------------
-export type RestPaginatedResult<TResult, TError> = Omit<UseQueryResult<TResult, TError>, "data"> &
+type RestPaginatedResult<TResult, TError> = Omit<UseQueryResult<TResult, TError>, "data"> &
  QueryCacheFunctions<TResult>

 export function usePaginatedQuery<
@@ -219,7 +219,7 @@ export function usePaginatedQuery<
 // -------------------------
 // useInfiniteQuery
 // -------------------------
-export interface RestInfiniteResult<TResult, TError>
+interface RestInfiniteResult<TResult, TError>
  extends Omit<UseInfiniteQueryResult<TResult, TError>, "data">,
    QueryCacheFunctions<TResult> {
  pageParams: any
--- a/packages/blitz-rpc/src/rpc-logger.ts
+++ b/packages/blitz-rpc/src/rpc-logger.ts
@@ -1,176 +0,0 @@
-import {baseLogger, newLine, prettyMs} from "blitz"
-import chalk, {type Chalk} from "chalk"
-import type {RpcLoggerOptions} from "./server/plugin"
-
-type Logger = ReturnType<typeof baseLogger>
-type RpcLoggerState = {
-  startTime: {
-    [key: string]: number | undefined
-  }
-  duration: {
-    resolver: number
-    serializer: number
-    total: number
-  }
-  verbosityInfo: boolean
-  verbosityDebug: boolean
-}
-
-export function isBlitzRPCVerbose(
-  resolverName: string,
-  level: string,
-  loggingOptions?: RpcLoggerOptions,
-) {
-  // blitz rpc is by default verbose - to keep current behavior
-  if (!loggingOptions) {
-    if (globalThis.blitzRpcRpcLoggerOptions) {
-      loggingOptions = globalThis.blitzRpcRpcLoggerOptions
-    } else {
-      return true
-    }
-  }
-  //if logging exists and verbose is not defined then default to true
-  if (loggingOptions && !("verbose" in loggingOptions)) {
-    loggingOptions.verbose = true
-  }
-  const isLevelDisabled = loggingOptions?.disablelevel === level
-  if (loggingOptions?.verbose) {
-    // If allowList array is defined then allow only those routes in allowList
-    if (loggingOptions?.allowList) {
-      if (loggingOptions?.allowList?.includes(resolverName) && !isLevelDisabled) {
-        return true
-      }
-    }
-    // If blockList array is defined then allow all routes except those in blockList
-    if (loggingOptions?.blockList) {
-      if (!loggingOptions?.blockList?.includes(resolverName) && !isLevelDisabled) {
-        return true
-      }
-    }
-    // if both allowList and blockList are not defined, then allow all routes
-    if (!loggingOptions?.allowList && !loggingOptions?.blockList && !isLevelDisabled) {
-      return true
-    }
-    return false
-  }
-  return false
-}
-
-export class RpcLogger {
-  #logger: Logger
-  #customChalk: Chalk
-  #state: RpcLoggerState
-  constructor(resolverName: string, loggingOptions?: RpcLoggerOptions, loggerName?: string) {
-    const logger = baseLogger().getSubLogger({
-      name: loggerName ? loggerName : "blitz-rpc",
-      prefix: [resolverName + "()"],
-    })
-    this.#logger = logger
-    this.#customChalk = new chalk.Instance({
-      level: logger.settings.type === "json" ? 0 : chalk.level,
-    })
-    const verbosityInfo = isBlitzRPCVerbose(resolverName, "info", loggingOptions)
-    const verbosityDebug = isBlitzRPCVerbose(resolverName, "debug", loggingOptions)
-    this.#state = {
-      startTime: {
-        total: Date.now(),
-      },
-      duration: {
-        resolver: 0,
-        serializer: 0,
-        total: 0,
-      },
-      verbosityInfo,
-      verbosityDebug,
-    }
-  }
-  public timer = {
-    reset: () => {
-      this.#state.startTime = {}
-      return this.timer
-    },
-    initResolver: () => {
-      this.#state.startTime["resolver"] = Date.now()
-      return this.timer
-    },
-    resolverDuration: () => {
-      if (!this.#state.startTime["resolver"]) {
-        throw new Error("resolverDuration called before initResolver")
-      }
-      this.#state.duration.resolver = Date.now() - this.#state.startTime["resolver"]
-      return this.timer
-    },
-    initSerialization: () => {
-      this.#state.startTime["serializer"] = Date.now()
-      return this.timer
-    },
-    initNextJsSerialization: () => {
-      this.#state.startTime["nextJsSerialization"] = Date.now()
-      return this.timer
-    },
-    nextJsSerializationDuration: () => {
-      if (!this.#state.startTime["nextJsSerialization"]) {
-        throw new Error("nextJsSerializationDuration called before initNextJsSerialization")
-      }
-      this.#state.duration.serializer = Date.now() - this.#state.startTime["nextJsSerialization"]
-      return this.timer
-    },
-    serializerDuration: () => {
-      if (!this.#state.startTime["serializer"]) {
-        throw new Error("serializerDuration called before initSerializer")
-      }
-      this.#state.duration.serializer = Date.now() - this.#state.startTime["serializer"]
-      return this.timer
-    },
-    totalDuration: () => {
-      if (!this.#state.startTime["total"]) {
-        throw new Error("totalDuration called before initResolver")
-      }
-      this.#state.duration.total = Date.now() - this.#state.startTime["total"]
-      return this.timer
-    },
-  }
-  public preResolver(data: any) {
-    if (this.#state.verbosityInfo) {
-      this.#logger.info(
-        this.#customChalk.dim("Starting with input:"),
-        data ? data : JSON.stringify(data),
-      )
-    }
-  }
-  public postResolver(result: any) {
-    if (this.#state.verbosityDebug) {
-      this.#logger.debug(this.#customChalk.dim("Result:"), result ? result : JSON.stringify(result))
-    }
-  }
-  public nextJsSerialization() {
-    if (this.#state.verbosityDebug) {
-      this.#logger.debug(
-        this.#customChalk.dim(`Next.js serialization:${prettyMs(this.#state.duration.serializer)}`),
-      )
-    }
-  }
-  public postResponse() {
-    if (this.#state.verbosityInfo) {
-      this.#logger.info(
-        this.#customChalk.dim(
-          `Finished: resolver:${prettyMs(this.#state.duration.resolver)} serializer:${prettyMs(
-            this.#state.duration.serializer,
-          )} total:${prettyMs(this.#state.duration.total)}`,
-        ),
-      )
-    }
-    newLine()
-  }
-  public error(e: any) {
-    if (typeof e === "string") {
-      this.#logger.error(e)
-    }
-    this.#logger.error(new Error(e))
-    newLine()
-  }
-  public warn(e: string) {
-    this.#logger.warn(e)
-    newLine()
-  }
-}
--- a/packages/blitz-rpc/src/server/invoke.ts
+++ b/packages/blitz-rpc/src/server/invoke.ts
@@ -1,26 +0,0 @@
-import type {Ctx, FirstParam, PromiseReturnType} from "blitz"
-import {RpcLogger} from "../rpc-logger"
-import {RpcLoggerOptions} from "./plugin"
-
-export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>(
-  queryFn: T,
-  params: TInput,
-  ctx?: Ctx,
-  loggingOptions?: RpcLoggerOptions,
-): Promise<PromiseReturnType<T>> {
-  if (typeof queryFn === "undefined") {
-    throw new Error(
-      "invoke is missing the first argument - it must be a query or mutation function",
-    )
-  }
-  const rpcLogger = new RpcLogger((queryFn as any)._resolverName, loggingOptions, "blitz-invoke")
-  rpcLogger.timer.initResolver()
-  rpcLogger.preResolver(params)
-
-  const result = await queryFn(params, ctx)
-  rpcLogger.postResolver(result)
-
-  rpcLogger.timer.resolverDuration().totalDuration()
-  rpcLogger.postResponse()
-  return result
-}
--- a/packages/blitz-rpc/src/server/loader/server/loader-server.ts
+++ b/packages/blitz-rpc/src/server/loader/server/loader-server.ts
@@ -23,7 +23,7 @@ export async function loader(this: Loader, input: string): Promise<string> {
  if (isSSR) {
    this.cacheable(false)

-    const resolvers = await collectResolvers(root, rpcFolders, ["ts", "js", "tsx", "jsx"])
+    const resolvers = await collectResolvers(root, rpcFolders, ["ts", "js"])
    return await transformBlitzRpcServer(
      input,
      toPosixPath(id),
--- a/packages/blitz-rpc/src/server/loader/utils/loader-utils.ts
+++ b/packages/blitz-rpc/src/server/loader/utils/loader-utils.ts
@@ -3,7 +3,7 @@ import {posix, sep, win32, join, normalize} from "path"
 import {ResolverPathOptions} from "../../../index-server"

 export interface LoaderOptions {
-  resolverPath?: ResolverPathOptions
+  resolverPath: ResolverPathOptions
  includeRPCFolders?: string[]
  resolversDynamicImport?: boolean
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brandon Bayer	e08e9a348a	fixes	2023-06-09 12:38:56 -04:00
Siddharth Suresh	f0f66c6214	make code cleaner	2023-06-09 21:16:45 +05:30
Siddharth Suresh	37e7614f0c	Update .changeset/good-oranges-pretend.md	2023-06-09 19:33:32 +05:30
Siddharth Suresh	617f20fb21	imporve the changelog	2023-06-09 19:08:27 +05:30
Siddharth Suresh	a5bbfe2187	make vercel default to true	2023-06-09 19:03:03 +05:30
Siddharth Suresh	d89c3ac8cf	add resolversDynamicImport configuration	2023-06-08 20:38:59 +05:30
Siddharth Suresh	d0e4308d81	Merge branch 'main' into jayu-fix-dev-server-memory	2023-06-06 19:07:38 +05:30
Siddharth Suresh	5203e7e6ff	Merge branch 'main' into jayu-fix-dev-server-memory	2023-06-05 19:34:29 +05:30
Siddharth Suresh	860d21bea3	Merge branch 'main' into jayu-fix-dev-server-memory	2023-06-05 19:30:15 +05:30
Jakub Mazurek (@jayu)	f3c64ffbaf	chore: add changeset file	2023-05-22 20:44:01 +02:00
Jakub Mazurek	44169979ef	fix: enormous dev server memory consumption	2023-05-22 20:24:59 +02:00