Version Packages (beta) (#4197)

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

.all-contributorsrc

@@ -3866,6 +3866,115 @@
         "doc",
         "code"
       ]
+    },
+    {
+      "login": "maotora",
+      "name": "Maotora ᕙ(⇀‸↼‶)ᕗ",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5174884?v=4",
+      "profile": "https://maotoramm.com",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "vitaliemiron",
+      "name": "Vitalie",
+      "avatar_url": "https://avatars.githubusercontent.com/u/45145592?v=4",
+      "profile": "https://github.com/vitaliemiron",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "nelsonmestevao",
+      "name": "Nelson Estevão",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19409687?v=4",
+      "profile": "https://estevao.org",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "dbrxnds",
+      "name": "David",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32268383?v=4",
+      "profile": "https://github.com/dbrxnds",
+      "contributions": [
+        "doc",
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "gjmoed",
+      "name": "G.J. Moed",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4458993?v=4",
+      "profile": "https://github.com/gjmoed",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "GHKEN",
+      "name": "Tetsuya Fukuda",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5304351?v=4",
+      "profile": "https://ghken.com",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "nerixim",
+      "name": "Nikita Kamaev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26106502?v=4",
+      "profile": "https://github.com/nerixim",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "nikola-wd",
+      "name": "Nikola Ivanov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11588823?v=4",
+      "profile": "https://webredone.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "jayu",
+      "name": "Jakub Mazurek",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11561585?v=4",
+      "profile": "jayu.dev",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "maciej-ka",
+      "name": "Maciej Kasprzyk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5403694?v=4",
+      "profile": "https://github.com/maciej-ka",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "justinsmid",
+      "name": "Justin Smid",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34271675?v=4",
+      "profile": "https://github.com/justinsmid",
+      "contributions": [
+        "doc",
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.changeset/big-turtles-tease.md

@@ -0,0 +1,9 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+(feat) upgrade tslog to v4.8.2

.changeset/chatty-gifts-whisper.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": minor
+"@blitzjs/rpc": minor
+---
+
+Add ability to format the error on the server before returning it to the client.

.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/few-elephants-approve.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Fix return type of `requestMiddlewares` in `RpcServerPlugin`

.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/fresh-crews-chew.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": minor
+---
+
+Fix the DYNAMIC_SERVER_USAGE error for Next.js 13.3.1+

.changeset/good-oranges-pretend.md

@@ -0,0 +1,26 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Fixes enormous memory consumption of the dev server by changing the default import strategy to "require" instead of "import" which in webpack causes multiple chunks to be created for each import.
+
+## Blitz Configuration
+
+To configure this behaviour, you can add the following to your next.config.js:
+
+```js
+/**
+ * @type {import('@blitzjs/next').BlitzConfig}
+ **/
+const config = {
+  blitz: {
+    resolversDynamicImport: true,
+  },
+}
+```
+
+When `resolversDynamicImport` is set to `true`, the import strategy will be "import" instead of "require".
+
+### On Vercel
+
+If you are using Vercel, `resolversDynamicImport` will be set to `true` by default, since it is better for the separate chunks to be create for serverless lambdas.

.changeset/large-hairs-battle.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Make Next.js version stick to 13.4.5 when generating a new app

.changeset/many-fans-fetch.md

@@ -0,0 +1,7 @@
+---
+"@blitzjs/recipe-chakra-ui": patch
+"@blitzjs/recipe-next-ui": patch
+"@blitzjs/recipe-tailwind": patch
+---
+
+This change reflects the directory change from app/pages to src/pages for the receipts chakra-ui, next-ui, tailwind. It checks for which directories exists and is compatible with either versions.

.changeset/moody-crews-travel.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": minor
+---
+
+Stop exporting `useAuthenticatedBlitzContext` from `@blitzjs/auth` this must be imported from `app/blitz-server.ts` file in order to work correctly

.changeset/nice-boxes-travel.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Fix return type of the `invoke` method from returning type function to return the type of resolved data

.changeset/nine-bags-rhyme.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+fix: add missing key prop to LabelSelectField

.changeset/ninety-pots-learn.md

@@ -0,0 +1,9 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Update the version of next in the new template from 13.2 to 13.3.0

.changeset/plenty-gifts-provide.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+The issue is that the version provided, "13.2", is not a valid SemVer version. A valid SemVer version must have three components: major, minor, and patch (e.g., "13.2.0").

.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

@@ -55,6 +55,7 @@
     "afraid-ears-repair",
     "big-boats-lay",
     "big-phones-bow",
+    "big-turtles-tease",
     "blue-flowers-peel",
     "blue-pigs-tan",
     "brave-zebras-deny",
@@ -70,12 +71,15 @@
     "calm-papayas-protect",
     "calm-tomatoes-drive",
     "chatty-fireants-leave",
+    "chatty-gifts-whisper",
     "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",
@@ -84,6 +88,7 @@
     "curly-rules-speak",
     "curly-seas-serve",
     "curvy-days-attend",
+    "curvy-drinks-perform",
     "cyan-bulldogs-heal",
     "cyan-cars-greet",
     "dirty-monkeys-greet",
@@ -108,8 +113,10 @@
     "fast-toys-wash",
     "fast-trainers-kneel",
     "few-dogs-fetch",
+    "few-elephants-approve",
     "few-hounds-worry",
     "few-shrimps-leave",
+    "fifty-drinks-cry",
     "flat-bees-approve",
     "fluffy-coats-flow",
     "fluffy-mangos-begin",
@@ -119,6 +126,8 @@
     "four-meals-fry",
     "four-radios-tickle",
     "four-sheep-judge",
+    "fresh-camels-return",
+    "fresh-crews-chew",
     "funny-cups-pay",
     "fuzzy-bees-warn",
     "fuzzy-dots-cross",
@@ -131,6 +140,7 @@
     "gold-horses-punch",
     "good-apes-drum",
     "good-insects-wink",
+    "good-oranges-pretend",
     "gorgeous-birds-warn",
     "gorgeous-buses-scream",
     "gorgeous-games-obey",
@@ -160,6 +170,7 @@
     "khaki-ducks-cheer",
     "khaki-pens-rest",
     "kind-walls-suffer",
+    "large-hairs-battle",
     "late-steaks-give",
     "lazy-maps-sort",
     "lemon-games-press",
@@ -178,12 +189,14 @@
     "lucky-cows-try",
     "lucky-months-guess",
     "lucky-years-turn",
+    "many-fans-fetch",
     "mean-ears-speak",
     "mean-gorillas-reply",
     "modern-cameras-pull",
     "modern-games-dream",
     "modern-ligers-behave",
     "moody-bags-walk",
+    "moody-crews-travel",
     "moody-spoons-rhyme",
     "moody-squids-cheer",
     "nasty-suns-wash",
@@ -191,12 +204,15 @@
     "nervous-dolls-rule",
     "new-coats-turn",
     "new-olives-protect",
+    "nice-boxes-travel",
     "nice-deers-dream",
     "nice-starfishes-live",
+    "nine-bags-rhyme",
     "nine-birds-confess",
     "nine-onions-admire",
     "ninety-lies-press",
     "ninety-pets-heal",
+    "ninety-pots-learn",
     "ninety-rice-tickle",
     "odd-bears-run",
     "olive-bees-buy",
@@ -210,8 +226,10 @@
     "perfect-eyes-repeat",
     "perfect-trains-double",
     "plenty-bottles-swim",
+    "plenty-gifts-provide",
     "plenty-kiwis-greet",
     "polite-lizards-love",
+    "poor-crabs-drum",
     "poor-peas-lick",
     "poor-penguins-look",
     "poor-shrimps-think",
@@ -247,11 +265,13 @@
     "silly-peas-work",
     "silly-shoes-agree",
     "six-apricots-kick",
+    "sixty-rockets-count",
     "slimy-humans-impress",
     "slimy-needles-taste",
     "slow-impalas-tap",
     "slow-walls-camp",
     "slow-walls-poke",
+    "small-monkeys-battle",
     "small-socks-confess",
     "smooth-planets-admire",
     "smooth-rice-clap",
@@ -281,6 +301,7 @@
     "tall-radios-clean",
     "tame-keys-reply",
     "tame-pumpkins-nail",
+    "tame-rocks-unite",
     "tasty-maps-fetch",
     "tasty-news-collect",
     "tasty-squids-sin",
@@ -318,7 +339,9 @@
     "wicked-rings-walk",
     "wise-eels-visit",
     "wise-frogs-give",
+    "wise-lies-relate",
     "wise-rabbits-complain",
+    "yellow-numbers-serve",
     "young-birds-talk"
   ]
 }

.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`
+

.changeset/small-monkeys-battle.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/auth": patch
+"blitz": patch
+---
+
+Fix Next-Auth integration: `Unable to use next-auth with provider: Error [ERR_PACKAGE_PATH_NOT_EXPORTED]`

.changeset/tame-rocks-unite.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix log formatting to not show the path of blitz rpc

.changeset/wise-lies-relate.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/auth": patch
+---
+
+Fix: Add missing entry to expose next-auth adapter in Blitz Auth

.changeset/yellow-numbers-serve.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/recipe-tailwind": minor
+---
+
+support both directory style in tailwind recipe

.github/workflows/main.yml

@@ -7,8 +7,8 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
-  
-env: 
+
+env:
   PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
 
 jobs:
@@ -17,9 +17,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
+      - uses: pnpm/action-setup@v2.2.4
         with:
-          version: 7.11.0
+          version: 8.6.5
       - name: Setup node
         uses: actions/setup-node@v2
         with:
@@ -38,9 +38,9 @@ jobs:
     name: Build
     steps:
       - uses: actions/checkout@v2
-      - uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
+      - uses: pnpm/action-setup@v2.2.4
         with:
-          version: 7.11.0
+          version: 8.6.5
       - name: Setup node
         uses: actions/setup-node@v2
         with:
@@ -68,9 +68,9 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
+        uses: pnpm/action-setup@v2.2.4
         with:
-          version: 7.11.0
+          version: 8.6.5
 
       - name: Setup node@16
         uses: actions/setup-node@v2
@@ -127,14 +127,14 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
+        uses: pnpm/action-setup@v2.2.4
         with:
-          version: 7.11.0
+          version: 8.6.5
 
-      - name: Setup node@${{ matrix.NODE_VERSION }}
+      - name: Setup node@18
         uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.NODE_VERSION }}
+          node-version: 18
           cache: "pnpm"
 
       - name: Install dependencies
@@ -143,7 +143,7 @@ jobs:
 
       - name: Install playwright
         run: |
-            pnpx playwright@1.28.0 install --with-deps
+          pnpx playwright@1.28.0 install --with-deps
         shell: bash
 
       - name: Build

.husky/pre-commit

@@ -2,5 +2,5 @@
 . "$(dirname "$0")/_/husky.sh"
 
 pnpm manypkg check
-pnpm lint
+# pnpm lint
 pnpm pretty-quick --staged

.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-408-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-419-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>
 
@@ -721,6 +726,19 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
   <tr>
     <td align="center"><a href="https://github.com/jeliasson"><img src="https://avatars.githubusercontent.com/u/865493?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Johan Eliasson</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jeliasson" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/jafarlihi"><img src="https://avatars.githubusercontent.com/u/43515211?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hikmat Jafarli</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jafarlihi" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=jafarlihi" title="Code">💻</a></td>
+    <td align="center"><a href="https://maotoramm.com"><img src="https://avatars.githubusercontent.com/u/5174884?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maotora ᕙ(⇀‸↼‶)ᕗ</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=maotora" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=maotora" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/vitaliemiron"><img src="https://avatars.githubusercontent.com/u/45145592?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitalie</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=vitaliemiron" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=vitaliemiron" title="Code">💻</a></td>
+    <td align="center"><a href="https://estevao.org"><img src="https://avatars.githubusercontent.com/u/19409687?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nelson Estevão</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nelsonmestevao" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=nelsonmestevao" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/dbrxnds"><img src="https://avatars.githubusercontent.com/u/32268383?v=4?s=100" width="100px;" alt=""/><br /><sub><b>David</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=dbrxnds" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/gjmoed"><img src="https://avatars.githubusercontent.com/u/4458993?v=4?s=100" width="100px;" alt=""/><br /><sub><b>G.J. Moed</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=gjmoed" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=gjmoed" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://ghken.com"><img src="https://avatars.githubusercontent.com/u/5304351?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tetsuya Fukuda</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=GHKEN" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=GHKEN" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/nerixim"><img src="https://avatars.githubusercontent.com/u/26106502?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikita Kamaev</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nerixim" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://webredone.com/"><img src="https://avatars.githubusercontent.com/u/11588823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikola Ivanov</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nikola-wd" title="Documentation">📖</a></td>
+    <td align="center"><a href="jayu.dev"><img src="https://avatars.githubusercontent.com/u/11561585?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jakub Mazurek</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=jayu" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=jayu" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/maciej-ka"><img src="https://avatars.githubusercontent.com/u/5403694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maciej Kasprzyk</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=maciej-ka" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=maciej-ka" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/justinsmid"><img src="https://avatars.githubusercontent.com/u/34271675?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Justin Smid</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=justinsmid" title="Documentation">📖</a> <a href="https://github.com/blitz-js/blitz/commits?author=justinsmid" title="Code">💻</a></td>
   </tr>
 </table>
 

apps/next13/CHANGELOG.md

@@ -1,5 +1,103 @@
 # next-blitz-auth
 
+## 0.1.1-beta.8
+
+### Patch Changes
+
+- Updated dependencies [82649f341]
+- Updated dependencies [8b01175b4]
+  - blitz@2.0.0-beta.32
+  - @blitzjs/next@2.0.0-beta.32
+  - @blitzjs/auth@2.0.0-beta.32
+  - @blitzjs/rpc@2.0.0-beta.32
+  - @blitzjs/config@2.0.0-beta.32
+
+## 0.1.1-beta.7
+
+### Patch Changes
+
+- Updated dependencies [90f1741da]
+- Updated dependencies [df3265b85]
+  - @blitzjs/auth@2.0.0-beta.31
+  - blitz@2.0.0-beta.31
+  - @blitzjs/rpc@2.0.0-beta.31
+  - @blitzjs/next@2.0.0-beta.31
+  - @blitzjs/config@2.0.0-beta.31
+
+## 0.1.1-beta.6
+
+### Patch Changes
+
+- Updated dependencies [c5572bec6]
+- Updated dependencies [727734955]
+  - @blitzjs/auth@2.0.0-beta.30
+  - blitz@2.0.0-beta.30
+  - @blitzjs/rpc@2.0.0-beta.30
+  - @blitzjs/next@2.0.0-beta.30
+  - @blitzjs/config@2.0.0-beta.30
+
+## 0.1.1-beta.5
+
+### Patch Changes
+
+- Updated dependencies [b6b9a1c5a]
+- Updated dependencies [61888d1a3]
+  - @blitzjs/auth@2.0.0-beta.29
+  - blitz@2.0.0-beta.29
+  - @blitzjs/rpc@2.0.0-beta.29
+  - @blitzjs/next@2.0.0-beta.29
+  - @blitzjs/config@2.0.0-beta.29
+
+## 0.1.1-beta.4
+
+### Patch Changes
+
+- Updated dependencies [5166e5e03]
+- Updated dependencies [2533caf48]
+- Updated dependencies [c7ac86b85]
+- Updated dependencies [1bb3a6556]
+  - @blitzjs/auth@2.0.0-beta.28
+  - @blitzjs/next@2.0.0-beta.28
+  - @blitzjs/rpc@2.0.0-beta.28
+  - blitz@2.0.0-beta.28
+  - @blitzjs/config@2.0.0-beta.28
+
+## 0.1.1-beta.3
+
+### Patch Changes
+
+- Updated dependencies [eda14fa8a]
+- Updated dependencies [3d004dc41]
+- Updated dependencies [29c2b029a]
+  - @blitzjs/next@2.0.0-beta.27
+  - @blitzjs/rpc@2.0.0-beta.27
+  - @blitzjs/auth@2.0.0-beta.27
+  - blitz@2.0.0-beta.27
+  - @blitzjs/config@2.0.0-beta.27
+
+## 0.1.1-beta.2
+
+### Patch Changes
+
+- Updated dependencies [e82a79be5]
+- Updated dependencies [38d945a3f]
+  - @blitzjs/auth@2.0.0-beta.26
+  - @blitzjs/next@2.0.0-beta.26
+  - @blitzjs/rpc@2.0.0-beta.26
+  - blitz@2.0.0-beta.26
+  - @blitzjs/config@2.0.0-beta.26
+
+## 0.1.1-beta.1
+
+### Patch Changes
+
+- Updated dependencies [f84d77a42]
+  - @blitzjs/rpc@2.0.0-beta.25
+  - @blitzjs/next@2.0.0-beta.25
+  - @blitzjs/auth@2.0.0-beta.25
+  - @blitzjs/config@2.0.0-beta.25
+  - blitz@2.0.0-beta.25
+
 ## 0.1.1-beta.0
 
 ### Patch Changes

apps/next13/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-blitz-auth",
-  "version": "0.1.1-beta.0",
+  "version": "0.1.1-beta.8",
   "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.32",
+    "@blitzjs/config": "2.0.0-beta.32",
+    "@blitzjs/next": "2.0.0-beta.32",
+    "@blitzjs/rpc": "2.0.0-beta.32",
     "@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.32",
     "flatted": "3.2.7",
-    "next": "13.2.4",
+    "next": "13.3.0",
     "prisma": "^4.5.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",

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.32",
+    "@blitzjs/config": "2.0.0-beta.32",
+    "@blitzjs/next": "2.0.0-beta.32",
+    "@blitzjs/rpc": "2.0.0-beta.32",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.24",
-    "next": "13.2.4",
+    "blitz": "2.0.0-beta.32",
+    "next": "13.3.0",
     "openid-client": "5.2.1",
     "prisma": "4.6.1",
     "react": "18.2.0",

apps/toolkit-app/next.config.js

@@ -1,11 +1,14 @@
-const { withNextAuthAdapter } = require("@blitzjs/auth/next-auth")
+const { withNextAuthAdapter } = require("@blitzjs/auth")
 const { withBlitz } = require("@blitzjs/next")
 
 /**
- * @type {import('@blitzjs/next').BlitzConfig}
+ * @type {import('next').NextConfig}
  **/
 const config = {
   reactStrictMode: true,
+  blitz: {
+    resolversDynamicImport: true,
+  },
 }
 
 module.exports = withBlitz(withNextAuthAdapter(config))

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.32",
+    "@blitzjs/config": "2.0.0-beta.32",
+    "@blitzjs/next": "2.0.0-beta.32",
+    "@blitzjs/rpc": "2.0.0-beta.32",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.24",
-    "next": "13.2.4",
+    "blitz": "2.0.0-beta.32",
+    "next": "13.3.0",
     "next-auth": "4.18.7",
     "prisma": "4.6.1",
     "react": "18.2.0",

apps/toolkit-app/src/auth/components/SignupForm.tsx

@@ -10,6 +10,7 @@ type SignupFormProps = {
 
 export const SignupForm = (props: SignupFormProps) => {
   const [signupMutation] = useMutation(signup)
+
   return (
     <div>
       <h1>Create an Account</h1>

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

@@ -1,5 +1,4 @@
 import db from "db"
-import { SecurePassword } from "@blitzjs/auth/secure-password"
 import { Role } from "types"
 
 export default async function signup(input, ctx) {

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

@@ -1,9 +1,8 @@
 import type { BlitzCliConfig } from "blitz"
-import { setupBlitzServer } from "@blitzjs/next"
-import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
-import db from "db"
-import { simpleRolesIsAuthorized } from "@blitzjs/auth"
 import { BlitzLogger } from "blitz"
+import { setupBlitzServer } from "@blitzjs/next"
+import { AuthServerPlugin, PrismaStorage, simpleRolesIsAuthorized } from "@blitzjs/auth"
+import db from "db"
 
 export const cliConfig: BlitzCliConfig = {
   customTemplates: "src/templates",
@@ -27,6 +26,9 @@ const { gSSP, gSP, api } = setupBlitzServer({
       isAuthorized: simpleRolesIsAuthorized,
     }),
   ],
+  formatError: (error) => {
+    return new Error("Formatted error" + error.message)
+  },
   logger: BlitzLogger({}),
 })
 

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

@@ -1,4 +1,16 @@
 import { rpcHandler } from "@blitzjs/rpc"
 import { api } from "src/blitz-server"
 
-export default api(rpcHandler({ onError: console.log }))
+export default api(
+  rpcHandler({
+    onError: console.log,
+    formatError: (error) => {
+      error.message = `FormatError handler: ${error.message}`
+      return error
+    },
+    // logging: {
+    //   verbose: true,
+    //   blockList: ["/getCurrentUser"],
+    // },
+  })
+)

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

@@ -38,13 +38,13 @@ const UserInfo = () => {
   } else {
     return (
       <>
-        <Link href={Routes.SignupPage()} className={styles.button}>
+        <Link href={"/signup"} className={styles.button}>
           <strong>Sign Up</strong>
         </Link>
-        <Link href={Routes.LoginPage()} className={styles.loginButton}>
+        <Link href={"/login"} className={styles.loginButton}>
           <strong>Login</strong>
         </Link>
-        <Link href="/api/auth/github/login" passHref>
+        <Link href="/api/auth/github/login" passHref legacyBehavior>
           <a className="button small">
             <strong>Sign in with GitHub</strong>
           </a>
@@ -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.32",
+    "@blitzjs/config": "2.0.0-beta.32",
+    "@blitzjs/next": "2.0.0-beta.32",
+    "@blitzjs/rpc": "2.0.0-beta.32",
     "@prisma/client": "4.6.1",
     "@types/jest": "29.2.2",
     "@types/passport-twitter": "1.0.37",
-    "blitz": "workspace:*",
+    "blitz": "2.0.0-beta.32",
     "jest": "29.3.0",
     "jest-environment-jsdom": "29.3.0",
-    "next": "13.2.4",
+    "next": "13.3.0",
     "passport-mock-strategy": "2.0.0",
     "passport-twitter": "1.0.4",
     "prisma": "4.6.1",

apps/web/src/blitz-server.ts

@@ -13,7 +13,6 @@ const {gSSP, gSP, api} = setupBlitzServer({
     }),
   ],
   logger: BlitzLogger({
-    colorizePrettyLogs: true,
     prefix: ["[blitz]>>>>>"],
   }),
 })

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.24",
-    "@blitzjs/config": "workspace:2.0.0-beta.24",
-    "@blitzjs/next": "workspace:2.0.0-beta.24",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.24",
+    "@blitzjs/auth": "2.0.0-beta.32",
+    "@blitzjs/config": "2.0.0-beta.32",
+    "@blitzjs/next": "2.0.0-beta.32",
+    "@blitzjs/rpc": "2.0.0-beta.32",
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.24",
+    "blitz": "2.0.0-beta.32",
     "delay": "5.0.0",
-    "next": "13.2.4",
+    "next": "13.3.0",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",

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

@@ -1,11 +1,11 @@
-import {describe, it, expect, beforeAll, afterAll} from "vitest"
+import {afterAll, beforeAll, describe, expect, it} from "vitest"
 import {
-  killApp,
-  findPort,
-  runBlitzCommand,
-  blitzLaunchApp,
   blitzBuild,
+  blitzLaunchApp,
   blitzStart,
+  findPort,
+  killApp,
+  runBlitzCommand,
   waitFor,
 } from "../../utils/next-test-utils"
 import webdriver from "../../utils/next-webdriver"
@@ -15,7 +15,8 @@ let appPort: number
 
 const runTests = () => {
   describe("Auth", () => {
-    describe("custom plugin", () => {
+    /* 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()
@@ -34,7 +35,7 @@ const runTests = () => {
         await waitFor(100)
         let text = await browser.elementByCss("#before-req").text()
         expect(text).toBe("customHeaderValue")
-        await waitFor(1000)
+        await waitFor(2000)
         text = await browser.elementByCss("#before-res").text()
         expect(text).toBe("55")
         if (browser) {
@@ -42,6 +43,7 @@ const runTests = () => {
         }
       })
     })
+    */
     describe("unauthenticated", () => {
       it("should render result for open query", async () => {
         const browser = await webdriver(appPort, "/noauth-query")

integration-tests/auth/package.json

@@ -17,13 +17,13 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.24",
-    "@blitzjs/config": "workspace:2.0.0-beta.24",
-    "@blitzjs/next": "workspace:2.0.0-beta.24",
+    "@blitzjs/auth": "2.0.0-beta.32",
+    "@blitzjs/config": "2.0.0-beta.32",
+    "@blitzjs/next": "2.0.0-beta.32",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.24",
+    "blitz": "2.0.0-beta.32",
     "lowdb": "3.0.0",
-    "next": "13.2.4",
+    "next": "13.3.0",
     "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.24",
-    "@blitzjs/next": "workspace:2.0.0-beta.24",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.24",
+    "@blitzjs/auth": "2.0.0-beta.32",
+    "@blitzjs/next": "2.0.0-beta.32",
+    "@blitzjs/rpc": "2.0.0-beta.32",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.24",
+    "blitz": "2.0.0-beta.32",
     "lowdb": "3.0.0",
-    "next": "13.2.4",
+    "next": "13.3.0",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.24",
+    "@blitzjs/config": "2.0.0-beta.32",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",

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

integration-tests/next-13-app-dir/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/next-13-app-dir/package.json

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

integration-tests/next-13-app-dir/test/index.test.ts

@@ -1,13 +1,6 @@
-import {describe, it, expect, beforeAll, afterAll} from "vitest"
+import {afterAll, beforeAll, describe, expect, it} from "vitest"
 import waitPort from "wait-port"
-import {
-  killApp,
-  findPort,
-  runBlitzCommand,
-  blitzLaunchApp,
-  blitzBuild,
-  blitzStart,
-} from "../../utils/next-test-utils"
+import {blitzLaunchApp, findPort, killApp, runBlitzCommand} from "../../utils/next-test-utils"
 import webdriver from "../../utils/next-webdriver"
 
 import fetch from "node-fetch"
@@ -43,7 +36,7 @@ const runTests = (mode?: string) => {
           const browser = await webdriver(appPort, "/authenticated-client")
           let errorMsg = await browser.elementById(`error`).text()
           expect(errorMsg).toMatch(/Error: You are not authenticated/)
-          if (browser) browser.close()
+          if (browser) await browser.close()
         },
         5000 * 60 * 2,
       )
@@ -55,7 +48,7 @@ const runTests = (mode?: string) => {
           const browser = await webdriver(appPort, "/authenticated-server")
           let errorMsg = await browser.elementById(`error`).text()
           expect(errorMsg).toMatch(/Error: You are not authenticated/)
-          if (browser) browser.close()
+          if (browser) await browser.close()
         },
         5000 * 60 * 2,
       )

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

@@ -9,7 +9,8 @@
       {
         "name": "next"
       }
-    ]
+    ],
+    "strictNullChecks": true
   },
   "exclude": ["node_modules"],
   "baseUrl": "."

integration-tests/no-suspense/package.json

@@ -16,19 +16,19 @@
     "prisma:studio": "prisma studio"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.24",
-    "@blitzjs/next": "workspace:2.0.0-beta.24",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.24",
+    "@blitzjs/auth": "2.0.0-beta.32",
+    "@blitzjs/next": "2.0.0-beta.32",
+    "@blitzjs/rpc": "2.0.0-beta.32",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.24",
+    "blitz": "2.0.0-beta.32",
     "lowdb": "3.0.0",
-    "next": "13.2.4",
+    "next": "13.3.0",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.24",
+    "@blitzjs/config": "2.0.0-beta.32",
     "@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.24",
-    "@blitzjs/config": "workspace:2.0.0-beta.24",
-    "@blitzjs/next": "workspace:2.0.0-beta.24",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.24",
+    "@blitzjs/auth": "2.0.0-beta.32",
+    "@blitzjs/config": "2.0.0-beta.32",
+    "@blitzjs/next": "2.0.0-beta.32",
+    "@blitzjs/rpc": "2.0.0-beta.32",
     "@prisma/client": "4.6.1",
     "@tanstack/react-query": "4.0.10",
-    "blitz": "workspace:2.0.0-beta.24",
-    "next": "13.2.4",
+    "blitz": "2.0.0-beta.32",
+    "next": "13.3.0",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"

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

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

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

integration-tests/rpc/app/queries/getCustomStatusCodeFailure.js

@@ -0,0 +1,12 @@
+class ErrorWithStatusCode extends Error {
+  statusCode
+
+  constructor(message, statusCode) {
+    super(message)
+    this.statusCode = statusCode
+  }
+}
+
+export default async function getCustomStatusCodeFailure() {
+  throw new ErrorWithStatusCode("Error with custom status code for test", 418)
+}

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

integration-tests/rpc/test/index.test.js

@@ -1,14 +1,13 @@
-import {describe, it, expect, beforeAll, afterAll} from "vitest"
-import fs from "fs-extra"
+import {afterAll, beforeAll, describe, expect, it} from "vitest"
 import {join} from "path"
 import {
-  killApp,
-  findPort,
-  launchApp,
   fetchViaHTTP,
+  findPort,
+  killApp,
+  launchApp,
   nextBuild,
-  nextStart,
   nextExport,
+  nextStart,
 } from "../../utils/next-test-utils"
 
 // jest.setTimeout(1000 * 60 * 2)

integration-tests/trailing-slash/package.json

@@ -16,19 +16,19 @@
     "schema": "db/schema.prisma"
   },
   "dependencies": {
-    "@blitzjs/auth": "workspace:2.0.0-beta.24",
-    "@blitzjs/next": "workspace:2.0.0-beta.24",
-    "@blitzjs/rpc": "workspace:2.0.0-beta.24",
+    "@blitzjs/auth": "2.0.0-beta.32",
+    "@blitzjs/next": "2.0.0-beta.32",
+    "@blitzjs/rpc": "2.0.0-beta.32",
     "@prisma/client": "4.6.1",
-    "blitz": "workspace:2.0.0-beta.24",
+    "blitz": "2.0.0-beta.32",
     "lowdb": "3.0.0",
-    "next": "13.2.4",
+    "next": "13.3.0",
     "prisma": "4.6.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.24",
+    "@blitzjs/config": "2.0.0-beta.32",
     "@next/bundle-analyzer": "12.0.8",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.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,17 +29,17 @@
     "husky": "8.0.2",
     "jsdom": "^19.0.0",
     "lint-staged": "13.0.3",
-    "next": "13.2.4",
+    "next": "13.3.0",
     "only-allow": "1.1.0",
     "prettier": "^2.7.1",
     "prettier-plugin-prisma": "4.4.0",
     "pretty-quick": "3.1.3",
-    "turbo": "1.4.2",
+    "turbo": "1.10.7",
     "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"

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,77 @@
 # @blitzjs/auth
 
+## 2.0.0-beta.32
+
+### Patch Changes
+
+- 8b01175b4: Updated `useAuthenticatedBlitzContext` to now return `AuthenticatedCtx`
+- Updated dependencies [82649f341]
+  - blitz@2.0.0-beta.32
+
+## 2.0.0-beta.31
+
+### Patch Changes
+
+- 90f1741da: blitz-auth: Support for Prisma v5
+
+  Internal: Make `handle` a required paramter while updating the `session` modal.
+
+- Updated dependencies [90f1741da]
+- Updated dependencies [df3265b85]
+  - blitz@2.0.0-beta.31
+
+## 2.0.0-beta.30
+
+### Patch Changes
+
+- c5572bec6: blitz-auth: Fix webpack from following next-auth
+- Updated dependencies [c5572bec6]
+- Updated dependencies [727734955]
+  - blitz@2.0.0-beta.30
+
+## 2.0.0-beta.29
+
+### Patch Changes
+
+- b6b9a1c5a: Fix Next-Auth integration: `Unable to use next-auth with provider: Error [ERR_PACKAGE_PATH_NOT_EXPORTED]`
+- Updated dependencies [b6b9a1c5a]
+- Updated dependencies [61888d1a3]
+  - blitz@2.0.0-beta.29
+
+## 2.0.0-beta.28
+
+### Minor Changes
+
+- 1bb3a6556: Stop exporting `useAuthenticatedBlitzContext` from `@blitzjs/auth` this must be imported from `app/blitz-server.ts` file in order to work correctly
+
+### Patch Changes
+
+- 5166e5e03: (feat) upgrade tslog to v4.8.2
+- Updated dependencies [5166e5e03]
+  - blitz@2.0.0-beta.28
+
+## 2.0.0-beta.27
+
+### Patch Changes
+
+- 29c2b029a: Fix: Add missing entry to expose next-auth adapter in Blitz Auth
+  - blitz@2.0.0-beta.27
+
+## 2.0.0-beta.26
+
+### Patch Changes
+
+- e82a79be5: Update the version of next in the new template from 13.2 to 13.3.0
+- Updated dependencies [e82a79be5]
+- Updated dependencies [38d945a3f]
+  - blitz@2.0.0-beta.26
+
+## 2.0.0-beta.25
+
+### Patch Changes
+
+- blitz@2.0.0-beta.25
+
 ## 2.0.0-beta.24
 
 ### Major Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-beta.24",
+  "version": "2.0.0-beta.32",
   "homepage": "https://blitzjs.com/",
   "repository": {
     "type": "git",
@@ -23,7 +23,8 @@
   "license": "MIT",
   "files": [
     "dist/**",
-    "secure-password.*"
+    "secure-password.*",
+    "next-auth.*"
   ],
   "dependencies": {
     "@types/b64-lite": "1.3.0",
@@ -36,6 +37,7 @@
     "cookie": "0.4.1",
     "cookie-session": "2.0.0",
     "debug": "4.3.3",
+    "find-up": "4.1.0",
     "http": "0.0.1-security",
     "jsonwebtoken": "9.0.0",
     "nanoid": "3.2.0",
@@ -43,11 +45,12 @@
     "openid-client": "5.2.1",
     "passport": "0.6.0",
     "path": "0.12.7",
+    "resolve-from": "5.0.0",
     "supports-color": "8.1.1",
     "url": "0.11.0"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-beta.24",
+    "blitz": "2.0.0-beta.32",
     "next": "*",
     "next-auth": "*",
     "secure-password": "4.0.0"
@@ -64,7 +67,7 @@
     }
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.24",
+    "@blitzjs/config": "2.0.0-beta.32",
     "@testing-library/react": "13.4.0",
     "@testing-library/react-hooks": "8.0.1",
     "@types/cookie": "0.4.1",
@@ -72,8 +75,8 @@
     "@types/jsonwebtoken": "8.5.8",
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.24",
-    "next": "13.2.4",
+    "blitz": "2.0.0-beta.32",
+    "next": "13.3.0",
     "next-auth": "4.18.7",
     "react": "18.2.0",
     "react-dom": "18.2.0",

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

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

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

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

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

@@ -27,7 +27,9 @@ import type {
 } from "./types"
 import {Provider} from "next-auth/providers"
 
-export {withNextAuthAdapter} from "./webpack"
+import {init} from "next-auth/core/init"
+import getAuthorizationUrl from "next-auth/core/lib/oauth/authorization-url"
+import oAuthCallback from "next-auth/core/lib/oauth/callback"
 
 const INTERNAL_REDIRECT_URL_KEY = "_redirectUrl"
 
@@ -102,7 +104,6 @@ export function NextAuthAdapter<P extends Provider[]>(
     if (providerId?.includes("?")) {
       providerId = providerId.split("?")[0]
     }
-    const {init} = await import("next-auth/core/init").then((m) => m)
     const {options, cookies} = await init({
       // @ts-ignore
       url: new URL(
@@ -158,9 +159,6 @@ async function AuthHandler<P extends Provider[]>(
   if (action === "login") {
     middleware.push(async (req, res, next) => {
       try {
-        const getAuthorizationUrl = await import("next-auth/core/lib/oauth/authorization-url").then(
-          (m) => m.default,
-        )
         const _signin = await getAuthorizationUrl({options: options, query: req.query})
         if (_signin.cookies) cookies.push(..._signin.cookies)
         const session = res.blitzCtx.session as SessionContext
@@ -191,9 +189,6 @@ async function AuthHandler<P extends Provider[]>(
     middleware.push(
       // eslint-disable-next-line no-shadow
       connectMiddleware(async (req, res, next) => {
-        const oAuthCallback = await import("next-auth/core/lib/oauth/callback").then(
-          (m) => m.default,
-        )
         try {
           const {profile, account, OAuthProfile} = await oAuthCallback({
             query: internalRequest.query,

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

@@ -1,15 +1,30 @@
 //@ts-nocheck
+import path from "path"
+
 export function withNextAuthAdapter(nextConfig) {
   const config = Object.assign({}, nextConfig)
-  config.webpack = (config) => {
-    //add a required resolve alias
-    config.resolve.alias["next-auth/core/lib/oauth/callback"] =
-      process.cwd() + "/node_modules/next-auth/core/lib/oauth/callback.js"
-    config.resolve.alias["next-auth/core/lib/oauth/authorization-url"] =
-      process.cwd() + "/node_modules/next-auth/core/lib/oauth/authorization-url.js"
-    config.resolve.alias["next-auth/core/init"] =
-      process.cwd() + "/node_modules/next-auth/core/init.js"
+  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
   }
-  return config
 }

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

@@ -31,7 +31,7 @@ interface PrismaClientWithSession {
     }): Promise<SessionModel>
     update(args: {
       data: Partial<SessionModel>
-      where: {handle?: SessionModel["handle"]}
+      where: {handle: SessionModel["handle"]}
     }): Promise<SessionModel>
     delete(args: {where: {handle?: SessionModel["handle"]}}): Promise<SessionModel>
   }

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

@@ -15,6 +15,7 @@ import {
   log,
   baseLogger,
   chalk,
+  AuthenticatedCtx,
 } from "blitz"
 import {
   EmptyPublicData,
@@ -219,8 +220,8 @@ export async function useAuthenticatedBlitzContext({
   redirectTo?: string | RouteUrlObject
   redirectAuthenticatedTo?: string | RouteUrlObject | ((ctx: Ctx) => string | RouteUrlObject)
   role?: string | string[]
-}): Promise<void> {
-  const log = baseLogger().getChildLogger()
+}): Promise<AuthenticatedCtx> {
+  const log = baseLogger().getSubLogger({name: "useAuthenticatedBlitzContext"})
   const customChalk = new chalk.Instance({
     level: log.settings.type === "json" ? 0 : chalk.level,
   })
@@ -268,6 +269,7 @@ export async function useAuthenticatedBlitzContext({
       redirect(redirectTo)
     }
   }
+  return ctx as AuthenticatedCtx
 }
 
 const makeProxyToPublicData = <T extends SessionContextClass>(ctxClass: T): T => {

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

@@ -1,4 +1,16 @@
-export * from "./auth-sessions"
 export * from "./auth-utils"
 export * from "./auth-plugin"
 export * from "./adapters"
+
+export {
+  SessionContextClass,
+  getAllSessionHandlesForUser,
+  getCookieParser,
+  getSession,
+  isLocalhost,
+  setPublicDataForUser,
+  setCookie,
+  simpleRolesIsAuthorized,
+  getBlitzContext,
+} from "./auth-sessions"
+export type {AnonymousSessionPayload, SimpleRolesIsAuthorized} from "./auth-sessions"

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,86 @@
 # @blitzjs/next
 
+## 2.0.0-beta.32
+
+### Patch Changes
+
+- 82649f341: Upgrade tslog to `4.9.0`.
+
+  This due a [tslog issue](https://github.com/fullstack-build/tslog/issues/227) that causes tslog to crash when attempting to log an error whose constructor expects more than one argument.
+
+- Updated dependencies [82649f341]
+  - blitz@2.0.0-beta.32
+  - @blitzjs/rpc@2.0.0-beta.32
+
+## 2.0.0-beta.31
+
+### Patch Changes
+
+- Updated dependencies [90f1741da]
+- Updated dependencies [df3265b85]
+  - blitz@2.0.0-beta.31
+  - @blitzjs/rpc@2.0.0-beta.31
+
+## 2.0.0-beta.30
+
+### Patch Changes
+
+- Updated dependencies [c5572bec6]
+- Updated dependencies [727734955]
+  - blitz@2.0.0-beta.30
+  - @blitzjs/rpc@2.0.0-beta.30
+
+## 2.0.0-beta.29
+
+### Patch Changes
+
+- Updated dependencies [b6b9a1c5a]
+- Updated dependencies [61888d1a3]
+  - blitz@2.0.0-beta.29
+  - @blitzjs/rpc@2.0.0-beta.29
+
+## 2.0.0-beta.28
+
+### Patch Changes
+
+- 5166e5e03: (feat) upgrade tslog to v4.8.2
+- Updated dependencies [5166e5e03]
+- Updated dependencies [2533caf48]
+- Updated dependencies [c7ac86b85]
+  - @blitzjs/rpc@2.0.0-beta.28
+  - blitz@2.0.0-beta.28
+
+## 2.0.0-beta.27
+
+### Minor Changes
+
+- eda14fa8a: Add ability to format the error on the server before returning it to the client.
+- 3d004dc41: Fix the DYNAMIC_SERVER_USAGE error for Next.js 13.3.1+
+
+### Patch Changes
+
+- Updated dependencies [eda14fa8a]
+  - @blitzjs/rpc@2.0.0-beta.27
+  - blitz@2.0.0-beta.27
+
+## 2.0.0-beta.26
+
+### Patch Changes
+
+- e82a79be5: Update the version of next in the new template from 13.2 to 13.3.0
+- Updated dependencies [e82a79be5]
+- Updated dependencies [38d945a3f]
+  - @blitzjs/rpc@2.0.0-beta.26
+  - blitz@2.0.0-beta.26
+
+## 2.0.0-beta.25
+
+### Patch Changes
+
+- Updated dependencies [f84d77a42]
+  - @blitzjs/rpc@2.0.0-beta.25
+  - blitz@2.0.0-beta.25
+
 ## 2.0.0-beta.24
 
 ### Minor Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-beta.24",
+  "version": "2.0.0-beta.32",
   "homepage": "https://blitzjs.com/",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-beta.24",
+    "@blitzjs/rpc": "2.0.0-beta.32",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
@@ -38,30 +38,33 @@
     "supports-color": "8.1.1"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-beta.24",
+    "blitz": "2.0.0-beta.32",
     "next": "*",
-    "react": "*"
+    "react": "*",
+    "tslog": "*"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.24",
+    "@blitzjs/config": "2.0.0-beta.32",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.4.0",
     "@testing-library/react-hooks": "8.0.1",
     "@testing-library/user-event": "13.5.0",
+    "@types/debug": "4.1.7",
     "@types/node": "18.11.9",
     "@types/react": "18.0.25",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-beta.24",
+    "blitz": "2.0.0-beta.32",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
-    "next": "13.2.4",
+    "next": "13.3.0",
     "next-router-mock": "0.9.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "resolve-from": "5.0.0",
     "ts-jest": "27.1.4",
+    "tslog": "4.9.0",
     "typescript": "^4.8.4",
     "unbuild": "0.7.6",
     "watch": "1.0.2"

packages/blitz-next/src/error-boundary.test.tsx

@@ -211,8 +211,9 @@ test("withErrorBoundary HOC", () => {
   expect(cleanStack(onErrorComponentStack)).toMatchInlineSnapshot(`
     {
       "componentStack": "
-        at ErrorBoundaryRoot
-        at withRouter
+        at __vite_ssr_import_4__.withErrorBoundary.FallbackComponent 
+        at ErrorBoundaryRoot 
+        at WithRouterWrapper 
         at withErrorBoundary",
     }
   `)

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

@@ -3,6 +3,7 @@ import {NextRouter, withRouter} from "next/router"
 import * as React from "react"
 import {RouterContext} from "./router-context"
 import _debug from "debug"
+import {ExcludeRouterProps} from "next/dist/client/with-router"
 
 const debug = _debug("blitz:errorboundary")
 
@@ -72,7 +73,9 @@ type ErrorBoundaryState = {error: Error | null}
 
 const initialState: ErrorBoundaryState = {error: null}
 
-const ErrorBoundary = withRouter(
+const ErrorBoundary: React.ComponentType<
+  ExcludeRouterProps<React.PropsWithChildren<ErrorBoundaryProps>>
+> = withRouter(
   class ErrorBoundaryRoot extends React.Component<
     React.PropsWithRef<React.PropsWithChildren<ErrorBoundaryProps>>,
     ErrorBoundaryState

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

@@ -1,41 +1,43 @@
 import type {
-  NextConfig,
   GetServerSideProps,
   GetServerSidePropsResult,
   GetStaticProps,
   GetStaticPropsResult,
   NextApiRequest,
   NextApiResponse,
+  NextConfig,
 } from "next"
 import {
   AddParameters,
   AsyncFunc,
+  BlitzLogger,
   BlitzServerPlugin,
   Ctx as BlitzCtx,
   FirstParam,
-  RequestMiddleware,
-  MiddlewareResponse,
-  BlitzLogger,
+  handleRequestWithMiddleware,
   initializeLogger,
-  Simplify,
-  UnionToIntersection,
+  isRouteUrlObject,
+  MiddlewareResponse,
   reduceBlitzServerPlugins,
+  RouteUrlObject,
+  startWatcher,
+  stopWatcher,
 } from "blitz"
-import {handleRequestWithMiddleware, startWatcher, stopWatcher} from "blitz"
-import {installWebpackConfig, InstallWebpackConfigOptions, ResolverPathOptions} from "@blitzjs/rpc"
 import {
   DefaultOptions,
-  QueryClient,
-  getQueryKey,
-  getInfiniteQueryKey,
   dehydrate,
+  getInfiniteQueryKey,
+  getQueryKey,
+  installWebpackConfig,
+  InstallWebpackConfigOptions,
+  QueryClient,
+  ResolverPathOptions,
 } from "@blitzjs/rpc"
 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 {RouteUrlObject, isRouteUrlObject} from "blitz"
 
 export * from "./index-browser"
 
@@ -130,10 +132,12 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
   plugins,
   onError,
   logger,
+  formatError,
 }: {
   plugins: TPlugins
   onError?: (err: Error) => void
   logger?: ReturnType<typeof BlitzLogger>
+  formatError?: (err: Error) => Error
 }) => {
   initializeLogger(logger ?? BlitzLogger())
 
@@ -168,9 +172,9 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
             getClient(),
           ),
         )
-      } catch (err: any) {
-        onError?.(err)
-        throw err
+      } catch (error: any) {
+        onError?.(error)
+        throw formatError?.(error) ?? error
       }
     }
 
@@ -197,9 +201,9 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
             getClient(),
           ),
         )
-      } catch (err: any) {
-        onError?.(err)
-        throw err
+      } catch (error: any) {
+        onError?.(error)
+        throw formatError?.(error) ?? error
       }
     }
 
@@ -215,7 +219,8 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
         ])
       } catch (error: any) {
         onError?.(error)
-        return res.status(400).send(error)
+        const formattedError = formatError?.(error) ?? error
+        return res.status(400).send(formattedError)
       }
     }
 
@@ -225,6 +230,7 @@ export const setupBlitzServer = <TPlugins extends readonly BlitzServerPlugin<obj
 export interface BlitzConfig extends NextConfig {
   blitz?: {
     resolverPath?: ResolverPathOptions
+    resolversDynamicImport?: boolean
     includeRPCFolders?: string[]
     customServer?: {
       hotReload?: boolean
@@ -256,6 +262,8 @@ export function withBlitz(nextConfig: BlitzConfig = {}): NextConfig {
         webpackConfig: config,
         webpackRuleOptions: {
           resolverPath: nextConfig.blitz?.resolverPath,
+          resolversDynamicImport:
+            nextConfig.blitz?.resolversDynamicImport ?? Boolean(process.env.VERCEL),
           includeRPCFolders: nextConfig.blitz?.includeRPCFolders,
         },
       })

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

packages/blitz-rpc/package.json

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

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

@@ -4,17 +4,17 @@ import {RpcClient} from "./rpc"
 export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>(
   queryFn: T,
   params: TInput,
-): Promise<T>
+): Promise<PromiseReturnType<T>>
 export async function invoke<T extends (...args: any) => any, TInput = FirstParam<T>>(
   queryFn: T,
   params: TInput,
   isServer: boolean,
-): Promise<T>
+): 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<T> {
+): Promise<PromiseReturnType<T>> {
   if (typeof queryFn === "undefined") {
     throw new Error(
       "invoke is missing the first argument - it must be a query or mutation function",
@@ -28,15 +28,15 @@ export async function invoke<T extends (...args: any) => any, TInput = FirstPara
       )
     })
     const ctx = await getBlitzContext()
-    return queryFn(params, ctx)
+    return queryFn(params, ctx) as PromiseReturnType<T>
   }
 
   if (isClient) {
     const fn = queryFn as unknown as RpcClient
-    return fn(params, {fromInvoke: true}) as ReturnType<T>
+    return fn(params, {fromInvoke: true}) as PromiseReturnType<T>
   } else {
     const fn = queryFn as unknown as RpcClient
-    return fn(params) as ReturnType<T>
+    return fn(params) as PromiseReturnType<T>
   }
 }
 

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

@@ -1,8 +1,9 @@
 import {assert, baseLogger, Ctx, newLine, prettyMs, ResolverConfig} from "blitz"
 import {NextApiRequest, NextApiResponse} from "next"
-import {deserialize, serialize as superjsonSerialize, parse} from "superjson"
+import {deserialize, parse, serialize as superjsonSerialize} from "superjson"
 import {resolve} from "path"
 import chalk from "chalk"
+import {LoaderOptions} from "./server/loader/utils/loader-utils"
 
 // TODO - optimize end user server bundles by not exporting all client stuff here
 export * from "./index-browser"
@@ -60,16 +61,11 @@ const loaderClient = resolve(dir, "./loader-client.cjs")
 const loaderServer = resolve(dir, "./loader-server.cjs")
 const loaderServerResolvers = resolve(dir, "./loader-server-resolvers.cjs")
 
-interface WebpackRuleOptions {
-  resolverPath: ResolverPathOptions | undefined
-  includeRPCFolders: string[] | undefined
-}
-
 interface WebpackRule {
   test: RegExp
   use: Array<{
     loader: string
-    options: WebpackRuleOptions
+    options: LoaderOptions
   }>
 }
 
@@ -84,7 +80,7 @@ export interface InstallWebpackConfigOptions {
       rules: WebpackRule[]
     }
   }
-  webpackRuleOptions: WebpackRuleOptions
+  webpackRuleOptions: LoaderOptions
 }
 
 export function installWebpackConfig({
@@ -149,6 +145,60 @@ async function getResolverMap(): Promise<ResolverFiles | null | undefined> {
 
 interface RpcConfig {
   onError?: (error: Error) => void
+  formatError?: (error: Error) => Error
+  logging?: {
+    /**
+     * allowList Represents the list of routes for which logging should be enabled
+     * If allowList is defined then only those routes will be logged
+     */
+    allowList?: string[]
+    /**
+     * blockList Represents the list of routes for which logging should be disabled
+     * If blockList is defined then all routes except those will be logged
+     */
+    blockList?: string[]
+    /**
+     * verbose Represents the flag to enable/disable logging
+     * If verbose is true then Blitz RPC will log the input and output of each resolver
+     */
+    verbose?: boolean
+    /**
+     * disablelevel Represents the flag to enable/disable logging for a particular level
+     */
+    disablelevel?: "debug" | "info"
+  }
+}
+
+function isBlitzRPCVerbose(resolverName: string, config: RpcConfig, level: string) {
+  // blitz rpc is by default verbose - to keep current behaviour
+  if (!config.logging) {
+    return true
+  }
+  //if logging exists and verbose is not defined then default to true
+  if (config.logging && !("verbose" in config.logging)) {
+    return true
+  }
+  const isLevelDisabled = config.logging?.disablelevel === level
+  if (config.logging?.verbose) {
+    // If allowList array is defined then allow only those routes in allowList
+    if (config.logging?.allowList) {
+      if (config.logging?.allowList?.includes(resolverName) && !isLevelDisabled) {
+        return true
+      }
+    }
+    // If blockList array is defined then allow all routes except those in blockList
+    if (config.logging?.blockList) {
+      if (!config.logging?.blockList?.includes(resolverName) && !isLevelDisabled) {
+        return true
+      }
+    }
+    // if both allowList and blockList are not defined, then allow all routes
+    if (!config.logging?.allowList && !config.logging?.blockList && !isLevelDisabled) {
+      return true
+    }
+    return false
+  }
+  return false
 }
 
 export function rpcHandler(config: RpcConfig) {
@@ -162,9 +212,11 @@ export function rpcHandler(config: RpcConfig) {
 
     const relativeRoutePath = (req.query.blitz as string[])?.join("/")
     const routePath = "/" + relativeRoutePath
+    const resolverName = routePath.replace(/(\/api\/rpc)?\//, "")
 
-    const log = baseLogger().getChildLogger({
-      prefix: [routePath.replace(/(\/api\/rpc)?\//, "") + "()"],
+    const log = baseLogger().getSubLogger({
+      name: "blitz-rpc",
+      prefix: [resolverName + "()"],
     })
     const customChalk = new chalk.Instance({
       level: log.settings.type === "json" ? 0 : chalk.level,
@@ -215,11 +267,16 @@ export function rpcHandler(config: RpcConfig) {
               ? parse(`${req.query.meta}`)
               : undefined,
         })
-        log.info(customChalk.dim("Starting with input:"), data ? data : JSON.stringify(data))
+        if (isBlitzRPCVerbose(resolverName, config, "info")) {
+          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.debug(customChalk.dim("Result:"), result ? result : JSON.stringify(result))
+
+        if (isBlitzRPCVerbose(resolverName, config, "debug")) {
+          log.debug(customChalk.dim("Result:"), result ? result : JSON.stringify(result))
+        }
 
         const serializerStartTime = Date.now()
         const serializedResult = superjsonSerialize(result)
@@ -233,21 +290,26 @@ export function rpcHandler(config: RpcConfig) {
             result: serializedResult.meta,
           },
         })
-        log.debug(
-          customChalk.dim(
-            `Next.js serialization:${prettyMs(Date.now() - nextSerializerStartTime)}`,
-          ),
-        )
+
+        if (isBlitzRPCVerbose(resolverName, config, "debug")) {
+          log.debug(
+            customChalk.dim(
+              `Next.js serialization:${prettyMs(Date.now() - nextSerializerStartTime)}`,
+            ),
+          )
+        }
+
         const serializerDuration = Date.now() - serializerStartTime
         const duration = Date.now() - startTime
-
-        log.info(
-          customChalk.dim(
-            `Finished: resolver:${prettyMs(resolverDuration)} serializer:${prettyMs(
-              serializerDuration,
-            )} total:${prettyMs(duration)}`,
-          ),
-        )
+        if (isBlitzRPCVerbose(resolverName, config, "info")) {
+          log.info(
+            customChalk.dim(
+              `Finished: resolver:${prettyMs(resolverDuration)} serializer:${prettyMs(
+                serializerDuration,
+              )} total:${prettyMs(duration)}`,
+            ),
+          )
+        }
         newLine()
 
         return
@@ -265,7 +327,8 @@ export function rpcHandler(config: RpcConfig) {
           error.statusCode = 500
         }
 
-        const serializedError = superjsonSerialize(error)
+        const formattedError = config.formatError?.(error) ?? error
+        const serializedError = superjsonSerialize(formattedError)
 
         res.json({
           result: null,

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

@@ -64,12 +64,14 @@ export async function transformBlitzRpcServer(
       extraRpcBasePaths: options?.includeRPCFolders,
     })
 
-    code += `__internal_addBlitzRpcResolver('${routePath}',() => import('${slash(
+    const importStrategy = options?.resolversDynamicImport ? "import" : "require"
+
+    code += `__internal_addBlitzRpcResolver('${routePath}',() => ${importStrategy}('${slash(
       resolverFilePath,
     )}'));`
     code += "\n"
   }
-  // console.log("NEW CODE", code)
+
   return code
 }
 

packages/blitz-rpc/src/server/loader/utils/loader-utils.ts

@@ -3,8 +3,9 @@ import {posix, sep, win32, join, normalize} from "path"
 import {ResolverPathOptions} from "../../../index-server"
 
 export interface LoaderOptions {
-  resolverPath: ResolverPathOptions
+  resolverPath?: ResolverPathOptions
   includeRPCFolders?: string[]
+  resolversDynamicImport?: boolean
 }
 
 export interface Loader {

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

@@ -1,9 +1,9 @@
-import {createServerPlugin} from "blitz"
+import {RequestMiddleware, createServerPlugin} from "blitz"
 import {invoke} from "../client/invoke"
 
 export const RpcServerPlugin = createServerPlugin(() => {
   return {
-    requestMiddlewares: [],
+    requestMiddlewares: [] as RequestMiddleware<any, any, void | Promise<void>>[],
     exports: () => ({
       invoke,
     }),

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,140 @@
 # blitz
 
+## 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
+
+- b6b9a1c5a: Fix Next-Auth integration: `Unable to use next-auth with provider: Error [ERR_PACKAGE_PATH_NOT_EXPORTED]`
+- 61888d1a3: Fix log formatting to not show the path of blitz rpc
+- Updated dependencies [7aef610d8]
+  - @blitzjs/generator@2.0.0-beta.29
+
+## 2.0.0-beta.28
+
+### Patch Changes
+
+- 5166e5e03: (feat) upgrade tslog to v4.8.2
+- Updated dependencies [5166e5e03]
+  - @blitzjs/generator@2.0.0-beta.28
+
+## 2.0.0-beta.27
+
+### Patch Changes
+
+- Updated dependencies [d814c2d2d]
+  - @blitzjs/generator@2.0.0-beta.27
+
+## 2.0.0-beta.26
+
+### Patch Changes
+
+- e82a79be5: Update the version of next in the new template from 13.2 to 13.3.0
+- 38d945a3f: The issue is that the version provided, "13.2", is not a valid SemVer version. A valid SemVer version must have three components: major, minor, and patch (e.g., "13.2.0").
+- Updated dependencies [e82a79be5]
+  - @blitzjs/generator@2.0.0-beta.26
+
+## 2.0.0-beta.25
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-beta.25
+
 ## 2.0.0-beta.24
 
 ### Minor Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-beta.24",
+  "version": "2.0.0-beta.32",
   "homepage": "https://blitzjs.com/",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-beta.24",
+    "@blitzjs/generator": "2.0.0-beta.32",
     "@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": "3.3.4",
+    "tslog": "4.9.0",
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.24",
+    "@blitzjs/config": "2.0.0-beta.32",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

packages/blitz/src/cli/commands/install.ts

@@ -45,7 +45,7 @@ const pipeline = promisify(Stream.pipeline)
 const got = async (url: string) => {
   return require("got")(url).catch((e: any) => {
     if (e.response.statusCode === 403) {
-      baseLogger({displayDateTime: false}).error(e.response.body)
+      baseLogger().error(e.response.body)
     } else {
       return e
     }
@@ -264,7 +264,7 @@ const install: CliCommand = async () => {
 
       if (!(await isUrlValid(packageJsonPath))) {
         debug("Url is invalid for ", packageJsonPath)
-        baseLogger({displayDateTime: false}).error(`Could not find recipe "${args._[1]}"\n`)
+        baseLogger().error(`Could not find recipe "${args._[1]}"\n`)
         console.log(`${chalk.bold("Please provide one of the following:")}
 
 1. The name of a recipe to install (e.g. "tailwind")

packages/blitz/src/cli/utils/codegen-tasks.ts

@@ -16,9 +16,11 @@ export const codegenTasks = async () => {
     */
     const nextDir = await resolveCwd("next")
     const nextClientIndex = join(nextDir, "../..", "client", "index.js")
+    console.log(nextClientIndex)
     const readFile = await fs.readFile(nextClientIndex)
     const packageJson = await getPackageJson()
-    const nextVersion = packageJson.dependencies.next
+    const version = packageJson.dependencies.next
+    const nextVersion = semver.clean(version, {loose: true}) || semver.valid(semver.coerce(version))
 
     if (nextVersion && /^([~^])?12/.test(nextVersion)) {
       const updatedFile = readFile
@@ -38,15 +40,24 @@ export const codegenTasks = async () => {
         )
       await fs.writeFile(nextClientIndex, updatedFile)
       log.success("Next.js was successfully patched with a React Suspense fix")
-    } else if (nextVersion && semver.satisfies(nextVersion, ">=13.2")) {
+    } else if (nextVersion && semver.satisfies(nextVersion, "13.1 - 13.3.0")) {
       const updatedFile = readFile
         .toString()
         .replace(
-          /_onRecoverableError\.default/,
+          /_onRecoverableError\.default$/gm,
           `(err) => (err.toString().includes("DYNAMIC_SERVER_USAGE") || err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : _onRecoverableError.default(err)`,
         )
       await fs.writeFile(nextClientIndex, updatedFile)
       log.success("Next.js was successfully patched with a React Suspense fix")
+    } else if (nextVersion && semver.satisfies(nextVersion, ">=13.3.1")) {
+      const updatedFile = readFile
+        .toString()
+        .replace(
+          /_onrecoverableerror\.default$/gm,
+          `(err) => (err.toString().includes("DYNAMIC_SERVER_USAGE") || err.toString().includes("could not finish this Suspense boundary") || err.toString().includes("Minified React error #419")) ? null : _onrecoverableerror.default(err)`,
+        )
+      await fs.writeFile(nextClientIndex, updatedFile)
+      log.success("Next.js was successfully patched with a React Suspense fix")
     }
   } catch (err) {
     log.error(JSON.stringify(err, null, 2))

packages/blitz/src/cli/utils/routes-manifest.ts

@@ -1,13 +1,11 @@
-import {join, dirname} from "path"
+import {join} from "path"
 import os from "os"
 import {promises} from "fs"
-const readFile = promises.readFile
-import {outputFile, readdir} from "fs-extra"
-import findUp from "find-up"
-import resolveFrom from "resolve-from"
+import {outputFile, readdir, readFile} from "fs-extra"
 import Watchpack from "watchpack"
-import {isInternalBlitzMonorepoDevelopment} from "./helpers"
 import {findNodeModulesRoot} from "./find-node-modules"
+
+const debug = require("debug")("blitz")
 export const CONFIG_FILE = ".blitz.config.compiled.js"
 export const NEXT_CONFIG_FILE = "next.config.js"
 export const PHASE_PRODUCTION_SERVER = "phase-production-server"
@@ -160,7 +158,7 @@ export const loadConfig = (pagesDir: string) => {
     // eslint-disable-next-line no-eval -- block webpack from following this module path
     userConfigModule = eval("require")(path)
   } catch {
-    console.log("Did not find custom config file")
+    debug("Did not find custom config file")
     // In case user does not have custom config
     userConfigModule = {}
   }

packages/blitz/src/global.ts

@@ -5,4 +5,5 @@ declare global {
     beforeHttpRequest: BeforeHttpRequest
     beforeHttpResponse: BeforeHttpResponse
   }
+  var __BLITZ_CLEAN_UP_LISTENERS: () => void
 }

packages/blitz/src/installer/recipe-executor.tsx

@@ -41,11 +41,9 @@ export class RecipeExecutor<Options extends RecipeMeta> {
         {exitOnCtrlC: false},
       )
       await waitUntilExit()
-      baseLogger({displayDateTime: false, displayLogLevel: false}).info(
-        `\n🎉 The ${this.options.name} recipe has been installed!\n`,
-      )
+      baseLogger().info(`\n🎉 The ${this.options.name} recipe has been installed!\n`)
     } catch (e) {
-      baseLogger({displayDateTime: false}).error(e as any)
+      baseLogger().error(e as any)
       return
     }
   }

packages/blitz/src/installer/utils/paths.ts

@@ -18,14 +18,28 @@ function getBlitzPath(type: string) {
   }
 }
 
+function getAppSourceDir() {
+  const srcPath = "src/pages"
+  const srcDir = fs.existsSync(path.resolve(srcPath))
+
+  if (srcDir) {
+    return "src"
+  } else {
+    return "app"
+  }
+}
+
 function findPageDir() {
   const srcPagePath = `src/pages`
-  const srcPage = fs.existsSync(path.resolve(srcPagePath))
+  const srcPage = getAppSourceDir()
 
-  if (srcPage) {
-    return srcPagePath
-  } else {
-    return `pages`
+  switch (srcPage) {
+    case "src": {
+      return srcPagePath
+    }
+    default: {
+      return `pages`
+    }
   }
 }
 
@@ -36,6 +50,9 @@ export const paths = {
   app() {
     return `${findPageDir()}/_app${ext(true)}`
   },
+  appSrcDirectory() {
+    return getAppSourceDir()
+  },
   blitzServer() {
     return getBlitzPath("server")
   },

packages/blitz/src/logging.ts

@@ -1,18 +1,18 @@
-import {ISettingsParam, Logger, TLogLevelName} from "tslog"
+import {ILogObj, ISettingsParam, Logger} from "tslog"
 import c from "chalk"
 import {Table} from "console-table-printer"
 import ora from "ora"
 import readline from "readline"
 
-export type BlitzLoggerSettings = ISettingsParam
-export type BlitzLogLevel = TLogLevelName
+export type BlitzLoggerSettings = ISettingsParam<ILogObj>
+export type BlitzLogLevel = "trace" | "debug" | "info" | "warn" | "error" | "fatal"
 
 declare namespace globalThis {
-  let _blitz_baseLogger: Logger
+  let _blitz_baseLogger: Logger<ILogObj>
   let _blitz_logLevel: BlitzLogLevel
 }
 
-export const baseLogger = (options: BlitzLoggerSettings = {}): Logger => {
+export const baseLogger = (options: BlitzLoggerSettings = {}): Logger<ILogObj> => {
   if (globalThis._blitz_baseLogger) return globalThis._blitz_baseLogger
 
   globalThis._blitz_baseLogger = BlitzLogger(options)
@@ -22,34 +22,18 @@ export const baseLogger = (options: BlitzLoggerSettings = {}): Logger => {
 
 export const BlitzLogger = (settings: BlitzLoggerSettings = {}) => {
   const baseLogger = new Logger({
-    minLevel: "info",
-    type: "pretty",
-    dateTimePattern:
-      process.env.NODE_ENV === "production"
-        ? "year-month-day hour:minute:second.millisecond"
-        : "hour:minute:second.millisecond",
-    displayFunctionName: false,
-    displayFilePath: "hidden",
-    displayRequestId: false,
-    dateTimeTimezone:
-      process.env.NODE_ENV === "production"
-        ? "utc"
-        : Intl.DateTimeFormat().resolvedOptions().timeZone,
-    prettyInspectHighlightStyles: {
-      name: "yellow",
-      number: "blue",
-      bigint: "blue",
-      boolean: "blue",
-    },
+    prettyLogTimeZone: process.env.NODE_ENV === "production" ? "UTC" : "local",
     maskValuesOfKeys: ["password", "passwordConfirmation", "currentPassword"],
-    exposeErrorCodeFrame: process.env.NODE_ENV !== "production",
+    type: process.env.NODE_ENV === "production" ? "json" : "pretty",
+    prettyLogTemplate:
+      "{{yyyy}}.{{mm}}.{{dd}} {{hh}}:{{MM}}:{{ss}}:{{ms}}\t{{logLevelName}}\t[{{name}}]\t",
     ...settings,
   })
 
   return baseLogger
 }
 
-export const initializeLogger = (logger: Logger) => {
+export const initializeLogger = (logger: Logger<ILogObj>) => {
   globalThis._blitz_baseLogger = logger
 }
 

packages/blitz/src/middleware.ts

@@ -1,5 +1,5 @@
 import {IncomingMessage, ServerResponse} from "http"
-import {compose, Ctx, RequestMiddleware, MiddlewareNext, MiddlewareResponse} from "./index-server"
+import {compose, Ctx, MiddlewareNext, MiddlewareResponse, RequestMiddleware} from "./index-server"
 
 export async function handleRequestWithMiddleware<
   Req extends IncomingMessage = IncomingMessage,

packages/blitz/src/plugin.ts

@@ -89,13 +89,23 @@ export function reduceBlitzClientPlugins<TPlugins extends readonly ClientPlugin<
   globalThis.__BLITZ_MIDDLEWARE_HOOKS = middleware
 
   if (isClient) {
-    document.addEventListener("blitz:session-created", async () => {
+    if (globalThis.__BLITZ_CLEAN_UP_LISTENERS) {
+      globalThis.__BLITZ_CLEAN_UP_LISTENERS()
+    }
+    const onSessionCreated = async () => {
       await Promise.all(events.onSessionCreated())
-    })
-    document.addEventListener("blitz:rpc-error", async (e) => {
+    }
+    const onRpcError = async (e: Event): Promise<void> => {
       const customEvent = e as CustomEvent<Error>
       await Promise.all(events.onRpcError(customEvent.detail))
-    })
+    }
+    document.addEventListener("blitz:session-created", onSessionCreated)
+    document.addEventListener("blitz:rpc-error", onRpcError)
+
+    globalThis.__BLITZ_CLEAN_UP_LISTENERS = () => {
+      document.removeEventListener("blitz:session-created", onSessionCreated)
+      document.removeEventListener("blitz:rpc-error", onRpcError)
+    }
   }
 
   const withPlugins = compose(...providers)