Version Packages (beta) (#4258)

* Version Packages (beta)

* pnpm lock fix

---------

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

.all-contributorsrc

@@ -3955,6 +3955,55 @@
         "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,

.changeset/afraid-ligers-build.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/auth": patch
+"blitz": patch
+---
+
+Fix bug that did not allow `Page.authenicate = {role: "" }` to correctly work

.changeset/chatty-scissors-jump.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"blitz": patch
+---
+
+blitz-next: Fix `next/head` used in app directory warning

.changeset/chilly-jeans-fix.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Update examples of generate all in docs to include one column in model.

.changeset/clever-hornets-talk.md

@@ -0,0 +1,9 @@
+---
+"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.

.changeset/curvy-drinks-perform.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/auth": patch
+"blitz": patch
+---
+
+blitz-auth: Fix webpack from following next-auth

.changeset/fifty-drinks-cry.md

@@ -0,0 +1,8 @@
+---
+"@blitzjs/auth": patch
+"blitz": patch
+---
+
+blitz-auth: Support for Prisma v5
+
+Internal: Make `handle` a required paramter while updating the `session` modal.

.changeset/fresh-camels-return.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": patch
+---
+
+Updated `useAuthenticatedBlitzContext` to now return `AuthenticatedCtx`

.changeset/green-years-behave.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Upgrade next, prisma and zod to latest versions in a newly created app

.changeset/hot-knives-vanish.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/auth": patch
+"blitz": patch
+---
+
+Automatically authorize role with usage of `redirectAuthenticatedTo` in `useAuthenticatedBlitzContext` utility

.changeset/little-cycles-hang.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+---
+
+- Removes language selection step from `blitz new` menu
+- Make `formik` the default/recommended form library

.changeset/lucky-teachers-sleep.md

@@ -0,0 +1,10 @@
+---
+"@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.

.changeset/modern-insects-raise.md

@@ -0,0 +1,13 @@
+---
+"@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")

.changeset/moody-pandas-do.md

@@ -0,0 +1,9 @@
+---
+"@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`

.changeset/neat-gorillas-switch.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/recipe-tailwind": patch
+---
+
+Change tailwind recipe to install dependencies as devDependencies

.changeset/nervous-shrimps-serve.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+
+Fix for tslog error `TypeError: Cannot read properties of undefined (reading 'map')` while using custom errors.

.changeset/nice-cats-lay.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+
+Allow `.tsx` & `.jsx` file extensions to be used for resolvers

.changeset/poor-crabs-drum.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+blitz-rpc: Cleanup Event Listeners - Fix potential memory leak by cleaning up any residual event listeners set by blitz.

.changeset/pre.json

@@ -53,6 +53,7 @@
   "changesets": [
     "afraid-dancers-juggle",
     "afraid-ears-repair",
+    "afraid-ligers-build",
     "big-boats-lay",
     "big-phones-bow",
     "big-turtles-tease",
@@ -72,12 +73,15 @@
     "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",
@@ -86,6 +90,7 @@
     "curly-rules-speak",
     "curly-seas-serve",
     "curvy-days-attend",
+    "curvy-drinks-perform",
     "cyan-bulldogs-heal",
     "cyan-cars-greet",
     "dirty-monkeys-greet",
@@ -113,6 +118,7 @@
     "few-elephants-approve",
     "few-hounds-worry",
     "few-shrimps-leave",
+    "fifty-drinks-cry",
     "flat-bees-approve",
     "fluffy-coats-flow",
     "fluffy-mangos-begin",
@@ -122,6 +128,7 @@
     "four-meals-fry",
     "four-radios-tickle",
     "four-sheep-judge",
+    "fresh-camels-return",
     "fresh-crews-chew",
     "funny-cups-pay",
     "fuzzy-bees-warn",
@@ -144,6 +151,7 @@
     "great-terms-rescue",
     "green-papayas-do",
     "green-pillows-hammer",
+    "green-years-behave",
     "happy-bees-lick",
     "happy-hotels-visit",
     "happy-paws-join",
@@ -157,6 +165,7 @@
     "honest-comics-vanish",
     "hot-cups-rhyme",
     "hot-drinks-approve",
+    "hot-knives-vanish",
     "hungry-baboons-swim",
     "hungry-pens-collect",
     "itchy-cups-double",
@@ -174,6 +183,7 @@
     "lemon-teachers-jam",
     "light-donkeys-double",
     "light-squids-draw",
+    "little-cycles-hang",
     "little-pears-ring",
     "long-bees-hope",
     "long-dancers-jog",
@@ -183,23 +193,29 @@
     "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",
@@ -224,15 +240,18 @@
     "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",
@@ -247,6 +266,7 @@
     "rotten-rocks-remember",
     "rude-trainers-visit",
     "serious-mugs-leave",
+    "shaggy-boxes-exercise",
     "shaggy-carpets-brake",
     "sharp-falcons-begin",
     "sharp-olives-sip",
@@ -259,6 +279,7 @@
     "silly-peas-work",
     "silly-shoes-agree",
     "six-apricots-kick",
+    "sixty-rockets-count",
     "slimy-humans-impress",
     "slimy-needles-taste",
     "slow-impalas-tap",

.changeset/pretty-snakes-search.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/recipe-next-ui": patch
+---
+
+Add `framer-motion` as a dependency of `next-ui`

.changeset/quick-crews-occur.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Remove rouge `console.log` during start

.changeset/shaggy-boxes-exercise.md

@@ -0,0 +1,9 @@
+---
+"@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

.changeset/sixty-rockets-count.md

@@ -0,0 +1,68 @@
+---
+"@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`
+

.github/workflows/main.yml

@@ -19,11 +19,11 @@ jobs:
       - uses: actions/checkout@v2
       - uses: pnpm/action-setup@v2.2.4
         with:
-          version: 7.33.0
+          version: 8.6.5
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 18
           cache: "pnpm"
       - name: Install dependencies
         run: pnpm install  --frozen-lockfile
@@ -40,11 +40,11 @@ jobs:
       - uses: actions/checkout@v2
       - uses: pnpm/action-setup@v2.2.4
         with:
-          version: 7.33.0
+          version: 8.6.5
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 18
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
       - name: Build
@@ -62,7 +62,7 @@ jobs:
           - windows-latest
       fail-fast: false
     env:
-      NODE_VERSION: 16
+      NODE_VERSION: 18
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -70,12 +70,12 @@ jobs:
       - name: Setup PNPM
         uses: pnpm/action-setup@v2.2.4
         with:
-          version: 7.33.0
+          version: 8.6.5
 
       - name: Setup node@16
         uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 18
           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,32 +124,39 @@ 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
         with:
-          version: 7.33.0
+          version: 8.6.5
 
-      - name: Setup node@${{ matrix.NODE_VERSION }}
+      - name: Setup node@18
+        if: matrix.folder != 'next-13-app-dir' || matrix.os != 'windows-latest'
         uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.NODE_VERSION }}
+          node-version: 18
           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
         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

.npmrc

@@ -1,4 +1,5 @@
 save-exact=true
+dedupe-peer-dependents=true
 strict-peer-dependencies=false
 
 public-hoist-pattern[]=secure-password

README.md

@@ -6,7 +6,7 @@
     <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
   </a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-417-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
+<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-422-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,6 +94,11 @@ 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>
 
@@ -121,9 +126,11 @@ 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>
 
@@ -732,6 +739,13 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <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>
 

apps/next13/CHANGELOG.md

@@ -1,5 +1,92 @@
 # next-blitz-auth
 
+## 0.1.1-beta.12
+
+### Patch Changes
+
+- Updated dependencies [09e0c68db]
+  - @blitzjs/auth@2.0.0-beta.36
+  - blitz@2.0.0-beta.36
+  - @blitzjs/rpc@2.0.0-beta.36
+  - @blitzjs/next@2.0.0-beta.36
+  - @blitzjs/config@2.0.0-beta.36
+
+## 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

apps/next13/app/auth/layout.tsx

@@ -1,4 +1,4 @@
-import {useAuthenticatedBlitzContext} from "@blitzjs/auth"
+import {useAuthenticatedBlitzContext} from "../../src/blitz-server"
 
 export default async function RootLayout({children}: {children: React.ReactNode}) {
   await useAuthenticatedBlitzContext({

apps/next13/app/page.tsx

@@ -9,7 +9,6 @@ export default async function Home() {
     redirectTo: "/auth/login",
   })
   const user = await invoke(getCurrentUser, null)
-  console.log("user", user)
   return (
     <div
       style={{

apps/next13/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-blitz-auth",
-  "version": "0.1.1-beta.5",
+  "version": "0.1.1-beta.12",
   "private": true,
   "scripts": {
     "blitz:dev": "next dev",
@@ -9,17 +9,17 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:*",
-    "@blitzjs/config": "workspace:*",
-    "@blitzjs/next": "workspace:*",
-    "@blitzjs/rpc": "workspace:*",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/config": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "^4.5.0",
     "@tanstack/react-query": "4.0.10",
-    "blitz": "workspace:*",
+    "blitz": "2.0.0-beta.36",
     "flatted": "3.2.7",
-    "next": "13.3.0",
+    "next": "13.5.2",
     "prisma": "^4.5.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",

apps/next13/src/blitz-server.ts

@@ -13,7 +13,14 @@ const {api, getBlitzContext, useAuthenticatedBlitzContext, invoke} = setupBlitzS
       storage: PrismaStorage(db),
       isAuthorized: simpleRolesIsAuthorized,
     }),
-    RpcServerPlugin({}),
+    RpcServerPlugin({
+      logging: {
+        disablelevel: "debug",
+      },
+      onInvokeError(error) {
+        console.log("onInvokeError", error)
+      },
+    }),
   ],
   logger: BlitzLogger({}),
 })

apps/toolkit-app-passportjs/package.json

@@ -23,15 +23,15 @@
     ]
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:*",
-    "@blitzjs/config": "workspace:*",
-    "@blitzjs/next": "workspace:*",
-    "@blitzjs/rpc": "workspace:*",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/config": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.29",
-    "next": "13.3.0",
+    "blitz": "2.0.0-beta.36",
+    "next": "13.5.2",
     "openid-client": "5.2.1",
     "prisma": "4.6.1",
     "react": "18.2.0",

apps/toolkit-app/next.config.js

@@ -1,4 +1,4 @@
-const { withNextAuthAdapter } = require("@blitzjs/auth")
+const { withNextAuthAdapter } = require("@blitzjs/auth/next-auth")
 const { withBlitz } = require("@blitzjs/next")
 
 /**

apps/toolkit-app/package.json

@@ -24,15 +24,15 @@
     ]
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:*",
-    "@blitzjs/config": "workspace:*",
-    "@blitzjs/next": "workspace:*",
-    "@blitzjs/rpc": "workspace:*",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/config": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.29",
-    "next": "13.3.0",
+    "blitz": "2.0.0-beta.36",
+    "next": "13.5.2",
     "next-auth": "4.18.7",
     "prisma": "4.6.1",
     "react": "18.2.0",

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, BlitzNextAuthOptions } from "@blitzjs/auth/next-auth"
+import { NextAuthAdapter } from "@blitzjs/auth/next-auth"
 import db, { User } from "db"
 import { Role } from "types"
 

apps/toolkit-app/src/pages/api/rpc/[[...blitz]].ts

@@ -8,5 +8,9 @@ export default api(
       error.message = `FormatError handler: ${error.message}`
       return error
     },
+    // logging: {
+    //   verbose: true,
+    //   blockList: ["/getCurrentUser"],
+    // },
   })
 )

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

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

apps/web/package.json

@@ -16,17 +16,17 @@
     "schema": "./db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:*",
-    "@blitzjs/config": "workspace:*",
-    "@blitzjs/next": "workspace:*",
-    "@blitzjs/rpc": "workspace:*",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/config": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@prisma/client": "4.6.1",
     "@types/jest": "29.2.2",
     "@types/passport-twitter": "1.0.37",
-    "blitz": "workspace:*",
+    "blitz": "2.0.0-beta.36",
     "jest": "29.3.0",
     "jest-environment-jsdom": "29.3.0",
-    "next": "13.3.0",
+    "next": "13.5.2",
     "passport-mock-strategy": "2.0.0",
     "passport-twitter": "1.0.4",
     "prisma": "4.6.1",

flake.lock

@@ -0,0 +1,61 @@
+{
+  "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
+}

flake.nix

@@ -0,0 +1,39 @@
+{
+  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"
+          '';
+        };
+      };
+    });
+}

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

@@ -17,16 +17,16 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.29",
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
-    "@blitzjs/next": "workspace:2.0.0-beta.29",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.29",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/config": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.29",
+    "blitz": "2.0.0-beta.36",
     "delay": "5.0.0",
-    "next": "13.3.0",
+    "next": "13.5.2",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",

integration-tests/auth-with-rpc/src/mutations/login.ts

@@ -1,6 +1,10 @@
 import {Ctx} from "blitz"
+import db from "../../db"
+
+const getRand = () => Math.random().toString(36).substring(7)
 
 export default async function login(_: any, ctx: Ctx) {
-  await ctx.session.$create({userId: 1, role: "USER"})
+  const user = await db.user.create({data: {email: `${getRand()}@example.com`}})
+  await ctx.session.$create({userId: user.id, role: "USER"})
   return true
 }

integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role-redirect-stay.tsx

@@ -0,0 +1,37 @@
+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

integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role-redirect.tsx

@@ -0,0 +1,37 @@
+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

integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role-working.tsx

@@ -0,0 +1,37 @@
+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

integration-tests/auth-with-rpc/src/pages/page-dot-authenticate-role.tsx

@@ -0,0 +1,37 @@
+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

integration-tests/auth-with-rpc/test/index.test.ts

@@ -13,37 +13,10 @@ 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")
@@ -58,7 +31,11 @@ const runTests = () => {
         const browser = await webdriver(appPort, "/authenticated-query")
         await browser.waitForElementByCss("#error")
         let text = await browser.elementByCss("#error").text()
-        expect(text).toMatch(/AuthenticationError/)
+        if (mode === "server") {
+          expect(text).toMatch(/AuthenticationError/)
+        } else {
+          expect(text).toContain("Error")
+        }
         if (browser) await browser.close()
       })
 
@@ -70,6 +47,14 @@ 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")
@@ -120,18 +105,36 @@ const runTests = () => {
         await waitFor(200)
         await browser.waitForElementByCss("#error")
         text = await browser.elementByCss("#error").text()
-        expect(text).toMatch(/AuthenticationError/)
+        if (mode === "server") {
+          expect(text).toMatch(/AuthenticationError/)
+        } else {
+          expect(text).toContain("Error")
+        }
         if (browser) await browser.close()
       })
 
-      it("Page.authenticate = {redirect} should work ", async () => {
-        // Login
+      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()
+      })
 
-        await browser.eval(`window.location = "/page-dot-authenticate-redirect"`)
+      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")
         await browser.waitForElementByCss("#content")
         let text = await browser.elementByCss("#content").text()
         expect(text).toMatch(/authenticated-basic-result/)
@@ -142,14 +145,26 @@ const runTests = () => {
         if (browser) await browser.close()
       })
 
-      it("Layout.authenticate = {redirect} should work ", async () => {
-        // Login
+      it("Page.authenticate = {role: 'custom', redirect: 'url'} should work ", 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-redirect"`)
+        await browser.waitForElementByCss("#content")
+        expect(await browser.url()).toMatch(/\/noauth-query/)
+        if (browser) await browser.close()
+      })
 
-        await browser.eval(`window.location = "/layout-authenticate-redirect"`)
+      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.waitForElementByCss("#content")
         let text = await browser.elementByCss("#content").text()
         expect(text).toMatch(/authenticated-basic-result/)
@@ -262,6 +277,7 @@ const runTests = () => {
 describe("Auth Tests", () => {
   describe("dev mode", () => {
     beforeAll(async () => {
+      mode = "dev"
       try {
         await runBlitzCommand(["prisma", "migrate", "reset", "--force"])
         appPort = await findPort()
@@ -276,6 +292,7 @@ describe("Auth Tests", () => {
 
   describe("server mode", () => {
     beforeAll(async () => {
+      mode = "server"
       try {
         await runBlitzCommand(["prisma", "generate"])
         await runBlitzCommand(["prisma", "migrate", "deploy"])

integration-tests/auth/package.json

@@ -17,13 +17,13 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.29",
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
-    "@blitzjs/next": "workspace:2.0.0-beta.29",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/config": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.29",
+    "blitz": "2.0.0-beta.36",
     "lowdb": "3.0.0",
-    "next": "13.3.0",
+    "next": "13.5.2",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",

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) browser.close()
+          if (browser) void browser.close()
         },
         5000 * 60 * 2,
       )

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

@@ -16,19 +16,19 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.29",
-    "@blitzjs/next": "workspace:2.0.0-beta.29",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.29",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.29",
+    "blitz": "2.0.0-beta.36",
     "lowdb": "3.0.0",
-    "next": "13.3.0",
+    "next": "13.5.2",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
+    "@blitzjs/config": "2.0.0-beta.36",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

integration-tests/middleware/next-env.d.ts

@@ -1,5 +1,6 @@
 /// <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.

integration-tests/middleware/package.json

@@ -11,11 +11,11 @@
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
   },
   "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
-    "@blitzjs/next": "workspace:2.0.0-beta.29",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.29",
-    "blitz": "workspace:2.0.0-beta.29",
-    "next": "13.3.0",
+    "@blitzjs/config": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
+    "blitz": "2.0.0-beta.36",
+    "next": "13.5.2",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

integration-tests/middleware/tsconfig.json

@@ -1,10 +1,16 @@
 {
   "extends": "@blitzjs/config/tsconfig.nextjs.json",
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types", ".next/types/**/*.ts"],
   "compilerOptions": {
     "paths": {
       "react": ["./node_modules/@types/react"]
-    }
+    },
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "strictNullChecks": true
   },
   "exclude": ["node_modules"],
   "baseUrl": "."

integration-tests/next-13-app-dir/package.json

@@ -17,14 +17,14 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.29",
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
-    "@blitzjs/next": "workspace:2.0.0-beta.29",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.29",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/config": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.29",
+    "blitz": "2.0.0-beta.36",
     "lowdb": "3.0.0",
-    "next": "13.3.0",
+    "next": "13.5.2",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",

integration-tests/no-suspense/package.json

@@ -16,19 +16,19 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.29",
-    "@blitzjs/next": "workspace:2.0.0-beta.29",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.29",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.29",
+    "blitz": "2.0.0-beta.36",
     "lowdb": "3.0.0",
-    "next": "13.3.0",
+    "next": "13.5.2",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
+    "@blitzjs/config": "2.0.0-beta.36",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

integration-tests/qm/package.json

@@ -8,14 +8,14 @@
     "clean": "rm -rf .turbo && rm -rf node_modules"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.29",
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
-    "@blitzjs/next": "workspace:2.0.0-beta.29",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.29",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/config": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@prisma/client": "4.6.1",
     "@tanstack/react-query": "4.0.10",
-    "blitz": "workspace:2.0.0-beta.29",
-    "next": "13.3.0",
+    "blitz": "2.0.0-beta.36",
+    "next": "13.5.2",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"

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 "next/dist/shared/lib/router-context"
+import {RouterContext} from "@blitzjs/next"
 
 beforeAll(() => {
   globalThis.__BLITZ_SESSION_COOKIE_PREFIX = "qm-test-cookie-prefix"

integration-tests/react-query-utils/next-env.d.ts

@@ -1,5 +1,6 @@
 /// <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.

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

@@ -16,18 +16,18 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/next": "workspace:2.0.0-beta.29",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.29",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.29",
+    "blitz": "2.0.0-beta.36",
     "lowdb": "3.0.0",
-    "next": "13.3.0",
+    "next": "13.5.2",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
+    "@blitzjs/config": "2.0.0-beta.36",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

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

@@ -1,10 +1,16 @@
 {
   "extends": "@blitzjs/config/tsconfig.nextjs.json",
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types", ".next/types/**/*.ts"],
   "compilerOptions": {
     "paths": {
       "react": ["./node_modules/@types/react"]
-    }
+    },
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "strictNullChecks": true
   },
   "exclude": ["node_modules"],
   "baseUrl": "."

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": "workspace:2.0.0-beta.29",
-    "@blitzjs/next": "workspace:2.0.0-beta.29",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.29",
-    "blitz": "workspace:2.0.0-beta.29",
-    "next": "13.3.0",
+    "@blitzjs/config": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
+    "blitz": "2.0.0-beta.36",
+    "next": "13.5.2",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

integration-tests/rpc/package.json

@@ -7,11 +7,11 @@
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
   },
   "dependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
-    "@blitzjs/next": "workspace:2.0.0-beta.29",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.29",
-    "blitz": "workspace:2.0.0-beta.29",
-    "next": "13.3.0",
+    "@blitzjs/config": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
+    "blitz": "2.0.0-beta.36",
+    "next": "13.5.2",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

integration-tests/trailing-slash/package.json

@@ -16,19 +16,19 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.29",
-    "@blitzjs/next": "workspace:2.0.0-beta.29",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.29",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/next": "2.0.0-beta.36",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.29",
+    "blitz": "2.0.0-beta.36",
     "lowdb": "3.0.0",
-    "next": "13.3.0",
+    "next": "13.5.2",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
+    "@blitzjs/config": "2.0.0-beta.36",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

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 "next/dist/shared/lib/router-context"
+import {RouterContext} from "@blitzjs/next"
 import {render as defaultRender} from "@testing-library/react"
 
 export const mockRouter: NextRouter = {
@@ -27,6 +27,7 @@ export const mockRouter: NextRouter = {
     emit: vi.fn(),
   },
   isFallback: false,
+  forward: vi.fn(),
 }
 
 type DefaultParams = Parameters<typeof defaultRender>
@@ -74,7 +75,10 @@ const BlitzWrapper = ({plugins, children}) => {
   )
 }
 
-export function render(ui: RenderUI, {wrapper, router, ...options}: RenderOptions = {}) {
+export function render(
+  ui: RenderUI,
+  {wrapper, router, ...options}: RenderOptions = {},
+): ReturnType<typeof defaultRender> {
   if (!wrapper) {
     wrapper = ({children}) => {
       return <BlitzWrapper plugins={[BlitzRpcPlugin({})]}>{children}</BlitzWrapper>

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: /compiled .*successfully/i,
-        start: /started server/i,
+        dev: /Ready/i,
+        start: /Ready/i,
       }
       if (
         (opts.bootupMarker && opts.bootupMarker.test(message)) ||
@@ -417,9 +417,10 @@ export function runNextCommandDev(argv, stdOut, opts: RunNextCommandDevOptions =
 
     function handleStdout(data) {
       const message = data.toString()
+      console.log(message)
       const bootupMarkers = {
-        dev: /compiled .*successfully/i,
-        start: /started server/i,
+        dev: /Next.js/i,
+        start: /Next.js/i,
       }
       if (
         (opts.bootupMarker && opts.bootupMarker.test(message)) ||
@@ -436,7 +437,7 @@ export function runNextCommandDev(argv, stdOut, opts: RunNextCommandDevOptions =
       }
 
       if (opts.stdout !== false) {
-        process.stdout.write(message)
+      	process.stdout.write(message)
       }
     }
 

integration-tests/utils/package.json

@@ -3,8 +3,9 @@
   "version": "0.0.0",
   "private": true,
   "devDependencies": {
-    "@blitzjs/config": "workspace: *",
-    "@blitzjs/rpc": "workspace: *",
+    "@blitzjs/config": "workspace:2.0.0-beta.36",
+    "@blitzjs/next": "workspace:2.0.0-beta.36",
+    "@blitzjs/rpc": "workspace:2.0.0-beta.36",
     "@tanstack/react-query": "4.13.0",
     "@testing-library/react": "13.4.0",
     "@types/express": "4.17.13",

package.json

@@ -13,7 +13,7 @@
     "prepare": "husky install",
     "build": "turbo run build",
     "build:apps": "turbo run buildapp --concurrency=1",
-    "dev": "turbo run dev --no-cache --parallel",
+    "dev": "turbo run dev --filter='./packages/*'",
     "lint": "turbo run lint",
     "test": "turbo run test",
     "clean": "turbo run clean && rm -rf node_modules",
@@ -29,20 +29,25 @@
     "husky": "8.0.2",
     "jsdom": "^19.0.0",
     "lint-staged": "13.0.3",
-    "next": "13.3.0",
+    "next": "13.5.2",
     "only-allow": "1.1.0",
     "prettier": "^2.7.1",
     "prettier-plugin-prisma": "4.4.0",
     "pretty-quick": "3.1.3",
-    "turbo": "1.4.2",
+    "turbo": "1.10.9",
     "vitest": "0.25.3",
     "wait-on": "6.0.1"
   },
   "npmClient": "pnpm",
-  "packageManager": "pnpm@7.11.0",
+  "packageManager": "pnpm@8.6.6",
   "manypkg": {
     "ignoredRules": [
       "EXTERNAL_MISMATCH"
     ]
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "next-auth@4.18.7": "patches/next-auth@4.18.7.patch"
+    }
   }
 }

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,91 @@
 # @blitzjs/auth
 
+## 2.0.0-beta.36
+
+### Patch Changes
+
+- 09e0c68db: Automatically authorize role with usage of `redirectAuthenticatedTo` in `useAuthenticatedBlitzContext` utility
+- Updated dependencies [09e0c68db]
+  - blitz@2.0.0-beta.36
+
+## 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

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-beta.29",
+  "version": "2.0.0-beta.36",
   "homepage": "https://blitzjs.com/",
   "repository": {
     "type": "git",
@@ -50,7 +50,7 @@
     "url": "0.11.0"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-beta.29",
+    "blitz": "2.0.0-beta.36",
     "next": "*",
     "next-auth": "*",
     "secure-password": "4.0.0"
@@ -67,7 +67,7 @@
     }
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
+    "@blitzjs/config": "2.0.0-beta.36",
     "@testing-library/react": "13.4.0",
     "@testing-library/react-hooks": "8.0.1",
     "@types/cookie": "0.4.1",
@@ -75,8 +75,8 @@
     "@types/jsonwebtoken": "8.5.8",
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.29",
-    "next": "13.3.0",
+    "blitz": "2.0.0-beta.36",
+    "next": "13.5.2",
     "next-auth": "4.18.7",
     "react": "18.2.0",
     "react-dom": "18.2.0",

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 === true,
+      !!authenticate &&
+        ((typeof authenticate === "object" && authenticate.redirectTo === undefined) ||
+          authenticate === true),
       !authenticate ? undefined : typeof authenticate === "object" ? authenticate.role : undefined,
     )
-
     if (typeof window !== "undefined") {
       const publicData = getPublicDataStore().getData()
 

packages/blitz-auth/src/global.ts

@@ -1,8 +1,10 @@
-import {AuthPluginOptions} from "./server"
-import {SessionConfigMethods} from "./shared"
+import type {Ctx} from "blitz"
+import type {AuthPluginOptions} from "./server"
+import type {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>
 }

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

@@ -1,2 +1 @@
 export * from "./passport/adapter"
-export * from "./next-auth/webpack"

packages/blitz-auth/src/server/adapters/next-auth/adapter.ts

@@ -13,6 +13,8 @@ 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"

packages/blitz-auth/src/server/adapters/next-auth/webpack.ts

@@ -1,27 +1,30 @@
 //@ts-nocheck
-import fs from "fs-extra"
 import path from "path"
 
 export function withNextAuthAdapter(nextConfig) {
   const config = Object.assign({}, nextConfig)
-  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"),
+  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) {
     return config
   }
-  if (typeof nextConfig.webpack === "function") {
-    config.webpack = (config, options) => {
-      return nextConfig.webpack(webpack(config), options)
-    }
-  }
-  config.webpack = webpack
-  return config
 }

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

@@ -1,4 +1,4 @@
-import {BlitzServerPlugin, RequestMiddleware, Ctx, createServerPlugin} from "blitz"
+import {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,6 +125,9 @@ export const AuthServerPlugin = createServerPlugin((options: AuthPluginOptions)
     }
     return blitzSessionMiddleware
   }
+  if (!globalThis.__BLITZ_GET_RSC_CONTEXT) {
+    globalThis.__BLITZ_GET_RSC_CONTEXT = getBlitzContext
+  }
   return {
     requestMiddlewares: [authPluginSessionMiddleware()],
     exports: () => ({

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

@@ -15,6 +15,7 @@ import {
   log,
   baseLogger,
   chalk,
+  AuthenticatedCtx,
 } from "blitz"
 import {
   EmptyPublicData,
@@ -219,7 +220,7 @@ export async function useAuthenticatedBlitzContext({
   redirectTo?: string | RouteUrlObject
   redirectAuthenticatedTo?: string | RouteUrlObject | ((ctx: Ctx) => string | RouteUrlObject)
   role?: string | string[]
-}): Promise<void> {
+}): Promise<AuthenticatedCtx> {
   const log = baseLogger().getSubLogger({name: "useAuthenticatedBlitzContext"})
   const customChalk = new chalk.Instance({
     level: log.settings.type === "json" ? 0 : chalk.level,
@@ -242,8 +243,17 @@ export async function useAuthenticatedBlitzContext({
           ? redirectAuthenticatedTo
           : formatWithValidation(redirectAuthenticatedTo)
       debug("[useAuthenticatedBlitzContext] Redirecting to", redirectUrl)
-      log.info("Authentication Redirect: " + customChalk.dim("(Authenticated)"), redirectUrl)
-      redirect(redirectUrl)
+      if (role) {
+        try {
+          ctx.session.$authorize(role)
+        } catch (e) {
+          log.info("Authentication Redirect: " + customChalk.dim(`Role ${role}`), redirectTo)
+          redirect(redirectUrl)
+        }
+      } else {
+        log.info("Authentication Redirect: " + customChalk.dim("(Authenticated)"), redirectUrl)
+        redirect(redirectUrl)
+      }
     }
     if (redirectTo && role) {
       debug("[useAuthenticatedBlitzContext] redirectTo and role are both defined.")
@@ -268,6 +278,7 @@ export async function useAuthenticatedBlitzContext({
       redirect(redirectTo)
     }
   }
+  return ctx as AuthenticatedCtx
 }
 
 const makeProxyToPublicData = <T extends SessionContextClass>(ctxClass: T): T => {

packages/blitz-auth/src/shared/types.ts

@@ -82,7 +82,7 @@ declare module "blitz" {
   export interface Ctx {
     session: SessionContext
   }
-  export interface AuthenticatedMiddlewareCtx extends Omit<Ctx, "session"> {
+  export interface AuthenticatedCtx extends Omit<Ctx, "session"> {
     session: AuthenticatedSessionContext
   }
 }

packages/blitz-auth/turbo.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "extends": ["//"],
+  "pipeline": {
+    "dev": {
+      "dependsOn": ["blitz#build"],
+      "persistent": true,
+      "cache": false
+    }
+  }
+}

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,85 @@
 # @blitzjs/next
 
+## 2.0.0-beta.36
+
+### Patch Changes
+
+- Updated dependencies [09e0c68db]
+  - blitz@2.0.0-beta.36
+  - @blitzjs/rpc@2.0.0-beta.36
+
+## 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

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-beta.29",
+  "version": "2.0.0-beta.36",
   "homepage": "https://blitzjs.com/",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-beta.29",
+    "@blitzjs/rpc": "2.0.0-beta.36",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
@@ -38,13 +38,13 @@
     "supports-color": "8.1.1"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-beta.29",
+    "blitz": "2.0.0-beta.36",
     "next": "*",
     "react": "*",
-    "tslog": "*"
+    "tslog": "4.9.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
+    "@blitzjs/config": "2.0.0-beta.36",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.4.0",
@@ -55,16 +55,16 @@
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-beta.29",
+    "blitz": "2.0.0-beta.36",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
-    "next": "13.3.0",
+    "next": "13.5.2",
     "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.8.2",
+    "tslog": "4.9.0",
     "typescript": "^4.8.4",
     "unbuild": "0.7.6",
     "watch": "1.0.2"

packages/blitz-next/src/error-component.tsx

@@ -1,6 +1,10 @@
 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",
@@ -31,7 +35,6 @@ 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>

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

@@ -1,14 +1,18 @@
 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"
 

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/shared/lib/router/utils/resolve-href"
+import {resolveHref} from "next/dist/client/resolve-href"
 
 export * from "./index-browser"
 

packages/blitz-next/turbo.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "extends": ["//"],
+  "pipeline": {
+    "dev": {
+      "dependsOn": ["@blitzjs/rpc#build", "blitz#build"],
+      "persistent": true,
+      "cache": false
+    }
+  }
+}

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,140 @@
 # @blitzjs/rpc
 
+## 2.0.0-beta.36
+
+### Patch Changes
+
+- Updated dependencies [09e0c68db]
+  - blitz@2.0.0-beta.36
+
+## 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

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-beta.29",
+  "version": "2.0.0-beta.36",
   "homepage": "https://blitzjs.com/",
   "repository": {
     "type": "git",
@@ -37,19 +37,19 @@
   },
   "peerDependencies": {
     "@tanstack/query-core": "4.24.4",
-    "blitz": "2.0.0-beta.29",
+    "blitz": "2.0.0-beta.36",
     "next": "*",
     "react": "*"
   },
   "devDependencies": {
-    "@blitzjs/auth": "2.0.0-beta.29",
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
+    "@blitzjs/auth": "2.0.0-beta.36",
+    "@blitzjs/config": "2.0.0-beta.36",
     "@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.29",
-    "next": "13.3.0",
+    "blitz": "2.0.0-beta.36",
+    "next": "13.5.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "^4.8.4",

packages/blitz-rpc/src/client/invoke.ts

@@ -1,36 +1,15 @@
-import {FirstParam, PromiseReturnType, isClient, Ctx} from "blitz"
+import {type FirstParam, type PromiseReturnType, type Ctx, isClient} 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>

packages/blitz-rpc/src/global.ts

@@ -1,6 +1,10 @@
-import {QueryClient} from "@tanstack/react-query"
+import type {QueryClient} from "@tanstack/react-query"
+import type {RpcLoggerOptions} from "./server/plugin"
+import type {Ctx} from "blitz"
 
 declare global {
   var queryClient: QueryClient
   var __BLITZ_SUSPENSE_ENABLED: boolean
+  var blitzRpcRpcLoggerOptions: RpcLoggerOptions | undefined
+  var __BLITZ_GET_RSC_CONTEXT: () => Promise<Ctx>
 }

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

@@ -1,9 +1,10 @@
-import {assert, baseLogger, Ctx, newLine, prettyMs, ResolverConfig} from "blitz"
+import {assert, 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"
@@ -146,10 +147,11 @@ 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, ctx: Ctx) {
+  return async function handleRpcRequest(req: NextApiRequest, res: NextApiResponse) {
     const resolverMap = await getResolverMap()
     assert(resolverMap, "No query or mutation resolvers found")
     assert(
@@ -159,14 +161,8 @@ export function rpcHandler(config: RpcConfig) {
 
     const relativeRoutePath = (req.query.blitz as string[])?.join("/")
     const routePath = "/" + relativeRoutePath
-
-    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 resolverName = routePath.replace(/(\/api\/rpc)?\//, "")
+    const rpcLogger = new RpcLogger(resolverName, config.logging)
 
     const loadableResolver = resolverMap?.[routePath]
     if (!loadableResolver) {
@@ -191,7 +187,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"}
-        log.error(error.message)
+        rpcLogger.error(error.message)
         res.status(400).json({
           result: null,
           error,
@@ -213,16 +209,17 @@ export function rpcHandler(config: RpcConfig) {
               ? parse(`${req.query.meta}`)
               : undefined,
         })
-        log.info(customChalk.dim("Starting with input:"), data ? data : JSON.stringify(data))
-        const startTime = Date.now()
-        const result = await resolver(data, (res as any).blitzCtx)
-        const resolverDuration = Date.now() - startTime
-        log.info(customChalk.dim("Result:"), result ? result : JSON.stringify(result))
+        rpcLogger.timer.initResolver()
+        rpcLogger.preResolver(data)
 
-        const serializerStartTime = Date.now()
+        const result = await resolver(data, (res as any).blitzCtx)
+        rpcLogger.timer.resolverDuration()
+        rpcLogger.postResolver(result)
+
+        rpcLogger.timer.initSerialization()
         const serializedResult = superjsonSerialize(result)
 
-        const nextSerializerStartTime = Date.now()
+        rpcLogger.timer.initNextJsSerialization()
         ;(res as any).blitzResult = result
         res.json({
           result: serializedResult.json,
@@ -231,22 +228,11 @@ export function rpcHandler(config: RpcConfig) {
             result: serializedResult.meta,
           },
         })
-        log.debug(
-          customChalk.dim(
-            `Next.js serialization:${prettyMs(Date.now() - nextSerializerStartTime)}`,
-          ),
-        )
-        const serializerDuration = Date.now() - serializerStartTime
-        const duration = Date.now() - startTime
+        rpcLogger.timer.nextJsSerializationDuration()
+        rpcLogger.nextJsSerialization()
 
-        log.debug(
-          customChalk.dim(
-            `Finished: resolver:${prettyMs(resolverDuration)} serializer:${prettyMs(
-              serializerDuration,
-            )} total:${prettyMs(duration)}`,
-          ),
-        )
-        newLine()
+        rpcLogger.timer.serializerDuration().totalDuration()
+        rpcLogger.postResponse()
 
         return
       } catch (error: any) {
@@ -255,9 +241,7 @@ export function rpcHandler(config: RpcConfig) {
         }
 
         config.onError?.(error)
-
-        log.error(error)
-        newLine()
+        rpcLogger.error(error)
 
         if (!error.statusCode) {
           error.statusCode = 500
@@ -277,7 +261,7 @@ export function rpcHandler(config: RpcConfig) {
       }
     } else {
       // Everything else is error
-      log.warn(`${req.method} method not supported`)
+      rpcLogger.warn(`${req.method} method not supported`)
       res.status(404).end()
       return
     }

packages/blitz-rpc/src/query/react-query/react-query.ts

@@ -44,7 +44,7 @@ class NextError extends Error {
 // -------------------------
 // useQuery
 // -------------------------
-type RestQueryResult<TResult, TError> = Omit<UseQueryResult<TResult, TError>, "data"> &
+export type RestQueryResult<TResult, TError> = Omit<UseQueryResult<TResult, TError>, "data"> &
   QueryCacheFunctions<TResult>
 
 export function useQuery<
@@ -131,7 +131,7 @@ export function useQuery<
 // -------------------------
 // usePaginatedQuery
 // -------------------------
-type RestPaginatedResult<TResult, TError> = Omit<UseQueryResult<TResult, TError>, "data"> &
+export type RestPaginatedResult<TResult, TError> = Omit<UseQueryResult<TResult, TError>, "data"> &
   QueryCacheFunctions<TResult>
 
 export function usePaginatedQuery<
@@ -219,7 +219,7 @@ export function usePaginatedQuery<
 // -------------------------
 // useInfiniteQuery
 // -------------------------
-interface RestInfiniteResult<TResult, TError>
+export interface RestInfiniteResult<TResult, TError>
   extends Omit<UseInfiniteQueryResult<TResult, TError>, "data">,
     QueryCacheFunctions<TResult> {
   pageParams: any

packages/blitz-rpc/src/rpc-logger.ts

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

packages/blitz-rpc/src/server/invoke.ts

@@ -0,0 +1,26 @@
+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
+}

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"])
+    const resolvers = await collectResolvers(root, rpcFolders, ["ts", "js", "tsx", "jsx"])
     return await transformBlitzRpcServer(
       input,
       toPosixPath(id),

packages/blitz-rpc/src/server/plugin.ts

@@ -1,11 +1,60 @@
-import {RequestMiddleware, createServerPlugin} from "blitz"
-import {invoke} from "../client/invoke"
+import {
+  type FirstParam,
+  type PromiseReturnType,
+  type RequestMiddleware,
+  createServerPlugin,
+} from "blitz"
+import {invoke} from "./invoke"
 
-export const RpcServerPlugin = createServerPlugin(() => {
+export type RpcLoggerOptions = {
+  /**
+   * allowList Represents the list of routes for which logging should be enabled
+   * If allowList is defined then only those routes will be logged
+   */
+  allowList?: string[]
+  /**
+   * blockList Represents the list of routes for which logging should be disabled
+   * If blockList is defined then all routes except those will be logged
+   */
+  blockList?: string[]
+  /**
+   * verbose Represents the flag to enable/disable logging
+   * If verbose is true then Blitz RPC will log the input and output of each resolver
+   */
+  verbose?: boolean
+  /**
+   * disablelevel Represents the flag to enable/disable logging for a particular level
+   */
+  disablelevel?: "debug" | "info"
+}
+
+type RpcPluginOptions = {
+  logging?: RpcLoggerOptions
+  onInvokeError?: (error: unknown) => void
+}
+
+export const RpcServerPlugin = createServerPlugin((options: RpcPluginOptions) => {
+  if (options.logging) {
+    globalThis.blitzRpcRpcLoggerOptions = options.logging
+  }
+  async function invokeWithCtx<T extends (...args: any) => any, TInput = FirstParam<T>>(
+    queryFn: T,
+    params: TInput,
+  ): Promise<PromiseReturnType<T>> {
+    const ctx = await globalThis.__BLITZ_GET_RSC_CONTEXT()
+    try {
+      return await invoke(queryFn, params, ctx, options.logging)
+    } catch (error) {
+      if (options.onInvokeError) {
+        options.onInvokeError(error)
+      }
+      throw error
+    }
+  }
   return {
     requestMiddlewares: [] as RequestMiddleware<any, any, void | Promise<void>>[],
     exports: () => ({
-      invoke,
+      invoke: invokeWithCtx,
     }),
   }
 })

packages/blitz-rpc/src/server/resolvers/resolver.ts

@@ -1,5 +1,5 @@
 import type {SessionContext, SessionContextBase} from "@blitzjs/auth"
-import {Await, Ctx, EnsurePromise, AuthenticatedMiddlewareCtx} from "blitz"
+import {Await, Ctx, EnsurePromise, AuthenticatedCtx} from "blitz"
 import type {input as zInput, output as zOutput, ZodTypeAny} from "zod"
 
 export type ParserType = "sync" | "async"
@@ -271,7 +271,7 @@ interface ResolverAuthorize {
   <T, C = Ctx>(...args: Parameters<SessionContextBase["$authorize"]>): (
     input: T,
     ctx: C,
-  ) => ResultWithContext<T, AuthenticatedMiddlewareCtx>
+  ) => ResultWithContext<T, AuthenticatedCtx>
 }
 
 const authorize: ResolverAuthorize = (...args) => {

packages/blitz-rpc/turbo.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "extends": ["//"],
+  "pipeline": {
+    "dev": {
+      "dependsOn": ["@blitzjs/auth#build", "blitz#build"],
+      "persistent": true,
+      "cache": false
+    }
+  }
+}

packages/blitz/CHANGELOG.md

@@ -1,5 +1,158 @@
 # blitz
 
+## 2.0.0-beta.36
+
+### Patch Changes
+
+- 09e0c68db: Automatically authorize role with usage of `redirectAuthenticatedTo` in `useAuthenticatedBlitzContext` utility
+  - @blitzjs/generator@2.0.0-beta.36
+
+## 2.0.0-beta.35
+
+### Patch Changes
+
+- cee2dec17: Fix bug that did not allow `Page.authenicate = {role: "" }` to correctly work
+- aec1bb076: blitz-next: Fix `next/head` used in app directory warning
+- 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 [c89cb943b]
+  - @blitzjs/generator@2.0.0-beta.35
+
+## 2.0.0-beta.34
+
+### Patch Changes
+
+- 30fd61316: - Removes language selection step from `blitz new` menu
+  - Make `formik` the default/recommended form library
+- 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.
+
+- fe8c937d2: Remove rouge `console.log` during start
+  - @blitzjs/generator@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
+- 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 [022392c12]
+  - @blitzjs/generator@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 [47c6b62dc]
+- Updated dependencies [82649f341]
+  - @blitzjs/generator@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.
+
+- df3265b85: blitz-rpc: Cleanup Event Listeners - Fix potential memory leak by cleaning up any residual event listeners set by blitz.
+  - @blitzjs/generator@2.0.0-beta.31
+
+## 2.0.0-beta.30
+
+### Patch Changes
+
+- c5572bec6: blitz-auth: Fix webpack from following next-auth
+- 727734955: ### Now we can configure Blitz RPC in the following way,
+
+  In your `[[...blitz]].ts` api file you can see the following settings
+
+  ```ts
+  logging?: {
+    /**
+     * allowList Represents the list of routes for which logging should be enabled
+     * If whiteList is defined then only those routes will be logged
+     */
+    allowList?: string[]
+    /**
+     * blockList Represents the list of routes for which logging should be disabled
+     * If blockList is defined then all routes except those will be logged
+     */
+    blockList?: string[]
+    /**
+     * verbose Represents the flag to enable/disable logging
+     * If verbose is true then Blitz RPC will log the input and output of each resolver
+     */
+    verbose?: boolean
+    /**
+     * disablelevel Represents the flag to enable/disable logging for a particular level
+     */
+    disablelevel?: "debug" | "info"
+  }
+  ```
+
+  ```ts
+  import { rpcHandler } from "@blitzjs/rpc"
+  import { api } from "src/blitz-server"
+
+  export default api(
+    rpcHandler({
+      onError: console.log,
+      formatError: (error) => {
+        error.message = `FormatError handler: ${error.message}`
+        return error
+      },
+     logging: {
+  ...
+  }
+    })
+  )
+  ```
+
+  Example:
+
+  ```ts
+  export default api(
+    rpcHandler({
+      onError: console.log,
+      formatError: (error) => {
+        error.message = `FormatError handler: ${error.message}`
+        return error
+      },
+      logging: {
+        verbose: true,
+        blockList: ["getCurrentUser", ...], //just write the resolver name [which is the resolver file name]
+      },
+    })
+  )
+  ```
+
+  This is enable verbose blitz rpc logging for all resolvers except the resolvers `getCurrentUser` and others mentioned in the `blockList`
+
+  - @blitzjs/generator@2.0.0-beta.30
+
 ## 2.0.0-beta.29
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-beta.29",
+  "version": "2.0.0-beta.36",
   "homepage": "https://blitzjs.com/",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-beta.29",
+    "@blitzjs/generator": "2.0.0-beta.36",
     "@mrleebo/prisma-ast": "0.2.6",
     "@types/global-agent": "2.1.1",
     "arg": "5.0.1",
@@ -76,11 +76,11 @@
     "tar": "6.1.11",
     "ts-node": "10.9.1",
     "tsconfig-paths": "4.0.0",
-    "tslog": "4.8.2",
+    "tslog": "4.9.0",
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.29",
+    "@blitzjs/config": "2.0.0-beta.36",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",