Version Packages (alpha) (#3487)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.changeset/bright-mangos-run.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Add queryClient to RPC Plugin exports

.changeset/eleven-humans-sort.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/codemod": patch
+"@blitzjs/generator": patch
+---
+
+codemod fixes

.changeset/empty-turkeys-wave.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Use `useRouter` from next/router in useParams function

.changeset/four-brooms-juggle.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+---
+
+Add missing RouteUrlObject on Page.authenticate.redirectTo

.changeset/fuzzy-jars-admire.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+fix codemod for wrapping \_app arrow function & fix codemod for nested pages directory

.changeset/gentle-dogs-reply.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Update queryClient import in codemod

.changeset/good-insects-wink.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Allow passing optional type argument for ParamsType in GSSP

.changeset/green-papayas-do.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Update codemod and template with a new queryClient import location

.changeset/late-steaks-give.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+Support RPC error middleware

.changeset/lucky-cows-try.md

@@ -0,0 +1,7 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+---
+
+rename middleware type for blitz server plugin

.changeset/nervous-beds-travel.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+useParam & useParams functions now accessible from @blitzjs/next

.changeset/nervous-dolls-rule.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Move middlewares from blitz config to blitz server with codemod

.changeset/new-coats-turn.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/codemod": patch
+---
+
+Handle duplicate imports with Blitz upgrade-legacy codemod

.changeset/pre.json

@@ -17,25 +17,39 @@
     "toolkit-app": "1.0.0",
     "test-qm": "0.0.0",
     "test-no-suspense": "0.0.0",
-    "test-trailing-slash": "0.0.0"
+    "test-trailing-slash": "0.0.0",
+    "test-middleware": "0.0.0"
   },
   "changesets": [
     "big-phones-bow",
     "breezy-cameras-double",
+    "bright-mangos-run",
     "cool-doors-invent",
     "dirty-monkeys-greet",
+    "eleven-humans-sort",
     "empty-berries-rule",
+    "empty-turkeys-wave",
     "fair-wombats-sneeze",
     "famous-kings-explain",
     "fast-trainers-kneel",
     "flat-bees-approve",
+    "four-brooms-juggle",
     "four-meals-fry",
+    "fuzzy-jars-admire",
+    "gentle-dogs-reply",
+    "good-insects-wink",
     "great-months-train",
+    "green-papayas-do",
     "healthy-rice-shout",
     "hot-drinks-approve",
+    "late-steaks-give",
     "lovely-colts-share",
+    "lucky-cows-try",
     "modern-cameras-pull",
     "moody-squids-cheer",
+    "nervous-beds-travel",
+    "nervous-dolls-rule",
+    "new-coats-turn",
     "nice-starfishes-live",
     "nine-onions-admire",
     "ninety-pets-heal",
@@ -45,22 +59,32 @@
     "poor-peas-lick",
     "poor-penguins-look",
     "poor-shrimps-think",
+    "purple-singers-greet",
     "quiet-feet-travel",
+    "quiet-pans-hunt",
     "rich-chairs-invent",
+    "rich-queens-travel",
     "sharp-falcons-begin",
     "shy-olives-hang",
     "silent-colts-reply",
     "small-socks-confess",
+    "smooth-planets-admire",
+    "strong-apes-reply",
     "stupid-walls-sell",
     "swift-drinks-dress",
+    "tame-keys-reply",
     "tasty-news-collect",
+    "ten-hairs-listen",
     "ten-rivers-burn",
     "tender-pianos-check",
+    "thick-parrots-float",
     "thirty-countries-build",
     "twenty-beans-pump",
     "two-kiwis-help",
+    "two-tigers-type",
     "unlucky-papayas-sleep",
     "violet-bags-leave",
+    "violet-lions-help",
     "weak-suns-shave",
     "wicked-ghosts-cough",
     "wise-frogs-give"

.changeset/purple-singers-greet.md

@@ -0,0 +1,7 @@
+---
+"@blitzjs/rpc": patch
+"@blitzjs/codemod": patch
+"@blitzjs/generator": patch
+---
+
+getQueryClient function & queryClient codemod updates & shared plugin config

.changeset/quiet-pans-hunt.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Removes the suspense wrapper from withBlitz since it's not needed

.changeset/rich-queens-travel.md

@@ -0,0 +1,8 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+Remove references to the logging package

.changeset/smooth-planets-admire.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Add missing \_document.tsx and 404.tsx pages to the new app templates

.changeset/strong-apes-reply.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Remove as any assertion for the PrismaStorage argument

.changeset/tame-keys-reply.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Add aliases for Blitz CLI commands

.changeset/ten-hairs-listen.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Allow customizing PreviewData in gSSP

.changeset/thick-parrots-float.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+allow extension catch in getAllFiles codemod util

.changeset/two-tigers-type.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+Fix running bin commands with Blitz CLI

.changeset/violet-lions-help.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+---
+
+Add resolverBasePath to Blitz config to change the way rpc routes are generated

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
-* @flybayer @beerose
+* @flybayer @beerose @dillonraphael
 
 packages/generator/templates**/* @flybayer

.github/release-drafter.yml

@@ -0,0 +1,43 @@
+name-template: "v$RESOLVED_VERSION"
+tag-template: "v$RESOLVED_VERSION"
+# categories:
+#   - title: 'Blitz'
+#     label: 'blitz'
+#   - title: '@blitzjs/next'
+#     label: 'blitz-next'
+#   - title: '@blitzjs/rpc'
+#     label: 'blitz-rpc'
+#   - title: '@blitzjs/auth'
+#     label: 'blitz-auth'
+version-resolver:
+  major:
+    labels:
+      - "major"
+  minor:
+    labels:
+      - "minor"
+  patch:
+    labels:
+      - "patch"
+  default: patch
+# autolabeler:
+#   - label: 'blitz'
+#     title:
+#      - '/blitz/i'
+#   - label: 'blitz-next'
+#     title:
+#       - '/@blitzjs\/next/i'
+#   - label: 'blitz-rpc'
+#     title:
+#       - '/@blitzjs\/rpc/i'
+#   - label: 'blitz-auth'
+#     title:
+#       - '/@blitzjs\/auth/i'
+template: |
+  ## What’s Changed
+
+  $CHANGES
+
+  ## Contributors
+
+  $CONTRIBUTORS

.github/workflows/release.yml

@@ -7,9 +7,15 @@ on:
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
+permissions:
+  contents: read
+
 jobs:
   release:
     name: Release
+    permissions:
+      contents: write
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
@@ -32,13 +38,21 @@ jobs:
         uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
         with:
           version: 6.32.6
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install --no-frozen-lockfile
       - run: pnpm build
 
       - name: Create Release Pull Request
         uses: changesets/action@v1
         with:
           publish: pnpm release
+          createGithubReleases: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      # - name: Github Release
+      #   uses: release-drafter/release-drafter@v5.19.0
+      #   with:
+      #     config-name: release-drafter.yml
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.npmrc

@@ -6,3 +6,4 @@ public-hoist-pattern[]=*types*
 public-hoist-pattern[]=*eslint*
 public-hoist-pattern[]=@prettier/plugin-*
 public-hoist-pattern[]=*prettier-plugin-*
+strict-peer-dependencies=false

apps/toolkit-app/app/auth/mutations/changePassword.ts

@@ -1,5 +1,5 @@
 import { NotFoundError } from "blitz"
-import { db } from "db"
+import db from "db"
 import { authenticateUser } from "./login"
 import { ChangePassword } from "../validations"
 import { resolver } from "@blitzjs/rpc"

apps/toolkit-app/app/auth/mutations/forgotPassword.ts

@@ -1,6 +1,6 @@
 import { generateToken, hash256 } from "@blitzjs/auth"
 import { resolver } from "@blitzjs/rpc"
-import { db } from "db"
+import db from "db"
 import { forgotPasswordMailer } from "mailers/forgotPasswordMailer"
 import { ForgotPassword } from "../validations"
 

apps/toolkit-app/app/auth/mutations/login.ts

@@ -1,7 +1,7 @@
 import { SecurePassword } from "@blitzjs/auth"
 import { resolver } from "@blitzjs/rpc"
 import { AuthenticationError } from "blitz"
-import { db } from "db"
+import db from "db"
 import { Role } from "types"
 import { Login } from "../validations"
 

apps/toolkit-app/app/auth/mutations/resetPassword.ts

@@ -1,5 +1,5 @@
 import { SecurePassword, hash256 } from "@blitzjs/auth"
-import { db } from "db"
+import db from "db"
 import { ResetPassword } from "../validations"
 import login from "./login"
 

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

@@ -1,5 +1,6 @@
-import { db } from "db"
+import db from "db"
 import { SecurePassword } from "@blitzjs/auth"
+import { Role } from "types"
 
 export default async function signup(input, ctx) {
   const blitzContext = ctx
@@ -13,6 +14,7 @@ export default async function signup(input, ctx) {
 
   await blitzContext.session.$create({
     userId: user.id,
+    role: user.role as Role,
   })
 
   return { userId: blitzContext.session.userId, ...user, email: input.email }

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

@@ -1,14 +1,13 @@
 import { setupBlitzServer } from "@blitzjs/next"
 import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
-import { db } from "db"
+import db from "db"
 import { simpleRolesIsAuthorized } from "@blitzjs/auth"
 
 const { gSSP, gSP, api } = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "web-cookie-prefix",
-      // TODO fix type
-      storage: PrismaStorage(db as any),
+      storage: PrismaStorage(db),
       isAuthorized: simpleRolesIsAuthorized,
     }),
   ],

apps/toolkit-app/app/users/queries/getCurrentUser.ts

@@ -1,5 +1,5 @@
 import { Ctx } from "blitz"
-import { db } from "db"
+import db from "db"
 
 export default async function getCurrentUser(_ = null, { session }: Ctx) {
   if (!session.userId) return null

apps/toolkit-app/db/index.ts

@@ -5,4 +5,4 @@ const EnhancedPrisma = enhancePrisma(PrismaClient)
 
 export * from "@prisma/client"
 const db = new EnhancedPrisma()
-export { db }
+export default db

apps/toolkit-app/db/seeds.ts

@@ -1,4 +1,4 @@
-import { db } from "./index"
+import db from "./index"
 
 /*
  * This seed function is executed when you run `blitz db seed`.

apps/toolkit-app/package.json

@@ -29,7 +29,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.32",
+    "blitz": "workspace:2.0.0-alpha.48",
     "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",

apps/toolkit-app/pages/404.tsx

@@ -0,0 +1,20 @@
+import Head from "next/head"
+import { ErrorComponent } from "@blitzjs/next"
+
+// ------------------------------------------------------
+// This page is rendered if a route match is not found
+// ------------------------------------------------------
+export default function Page404() {
+  const statusCode = 404
+  const title = "This page could not be found"
+  return (
+    <>
+      <Head>
+        <title>
+          {statusCode}: {title}
+        </title>
+      </Head>
+      <ErrorComponent statusCode={statusCode} title={title} />
+    </>
+  )
+}

apps/toolkit-app/pages/_document.tsx

@@ -0,0 +1,22 @@
+import Document, { Html, Main, NextScript, Head } from "next/document"
+
+class MyDocument extends Document {
+  // Only uncomment if you need to customize this behaviour
+  // static async getInitialProps(ctx: DocumentContext) {
+  //   const initialProps = await Document.getInitialProps(ctx)
+  //   return {...initialProps}
+  // }
+  render() {
+    return (
+      <Html lang="en">
+        <Head />
+        <body>
+          <Main />
+          <NextScript />
+        </body>
+      </Html>
+    )
+  }
+}
+
+export default MyDocument

apps/web/app/blitz-server.ts

@@ -7,8 +7,7 @@ const {gSSP, gSP, api} = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "webapp-cookie-prefix",
-      // TODO fix type
-      storage: PrismaStorage(db as any),
+      storage: PrismaStorage(db),
       isAuthorized: simpleRolesIsAuthorized,
     }),
   ],

apps/web/next.config.js

@@ -10,6 +10,7 @@ module.exports = withBlitz(
       customServer: {
         hotReload: false,
       },
+      resolverBasePath: "root",
     },
   }),
 )

integration-tests/auth/app/blitz-server.ts

@@ -1,13 +1,13 @@
 import {setupBlitzServer} from "@blitzjs/next"
 import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
 import {simpleRolesIsAuthorized} from "@blitzjs/auth"
-import {prisma as db} from "../prisma/index"
+import db from "../prisma/index"
 
 const {gSSP, gSP, api} = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "auth-tests-cookie-prefix",
-      storage: PrismaStorage(db as any),
+      storage: PrismaStorage(db),
       isAuthorized: simpleRolesIsAuthorized,
     }),
   ],

integration-tests/auth/pages/api/signin.ts

@@ -1,6 +1,7 @@
 import {api} from "../../app/blitz-server"
-import {prisma} from "../../prisma/index"
+import prisma from "../../prisma/index"
 import {SecurePassword} from "@blitzjs/auth"
+import {Role} from "../../types"
 
 export const authenticateUser = async (email: string, password: string) => {
   const user = await prisma.user.findFirst({where: {email}})
@@ -26,6 +27,7 @@ export default api(async (req, res, ctx) => {
 
   await blitzContext.session.$create({
     userId: user.id,
+    role: user.role as Role,
   })
 
   res.status(200).json({email: req.query.email, userId: blitzContext.session.userId})

integration-tests/auth/prisma/index.ts

@@ -5,4 +5,4 @@ const EnhancedPrisma = enhancePrisma(PrismaClient)
 
 export * from "@prisma/client"
 const prisma = new EnhancedPrisma()
-export {prisma}
+export default prisma

integration-tests/auth/prisma/seed.ts

@@ -1,4 +1,4 @@
-import {prisma} from "./index"
+import prisma from "./index"
 import {SecurePassword} from "@blitzjs/auth"
 
 const seed = async () => {

integration-tests/auth/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "@blitzjs/config/tsconfig.nextjs.json",
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
   "compilerOptions": {
     "paths": {
       "react": ["./node_modules/@types/react"]

integration-tests/auth/types.ts

@@ -0,0 +1,15 @@
+import {SimpleRolesIsAuthorized} from "@blitzjs/auth"
+import {User} from "./prisma"
+
+export type Role = "ADMIN" | "USER"
+
+declare module "@blitzjs/auth" {
+  export interface Session {
+    isAuthorized: SimpleRolesIsAuthorized<Role>
+    PublicData: {
+      userId: User["id"]
+      role: Role
+      views?: number
+    }
+  }
+}

integration-tests/middleware/.env

@@ -0,0 +1,2 @@
+SESSION_SECRET_KEY=hsdenhJfpLHrGjgdgg3jdF8g2bYD2PaQ
+HEADLESS=true

integration-tests/middleware/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = require("@blitzjs/config/eslint")

integration-tests/middleware/.gitignore

@@ -0,0 +1,3 @@
+node_modules
+# Keep environment variables out of version control
+*.sqlite

integration-tests/middleware/app/blitz-client.ts

@@ -0,0 +1,5 @@
+import {setupBlitzClient} from "@blitzjs/next"
+
+const {withBlitz} = setupBlitzClient({plugins: []})
+
+export {withBlitz}

integration-tests/middleware/app/blitz-server.ts

@@ -0,0 +1,7 @@
+import {setupBlitzServer} from "@blitzjs/next"
+
+const {gSSP, gSP, api} = setupBlitzServer({
+  plugins: [],
+})
+
+export {gSSP, gSP, api}

integration-tests/middleware/app/queries/getBasic.ts

@@ -0,0 +1,3 @@
+export default async function getBasic() {
+  return {success: true}
+}

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

@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.

integration-tests/middleware/next.config.js

@@ -0,0 +1,4 @@
+const {withBlitz} = require("@blitzjs/next")
+module.exports = withBlitz({
+  // update me
+})

integration-tests/middleware/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "test-middleware",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "start:dev": "next dev",
+    "test": "vitest run",
+    "test-watch": "vitest",
+    "start": "next start",
+    "lint": "next lint",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next"
+  },
+  "dependencies": {
+    "@blitzjs/config": "workspace:*",
+    "@blitzjs/next": "workspace:*",
+    "@blitzjs/rpc": "workspace:*",
+    "blitz": "workspace:*",
+    "next": "12.1.6-canary.17",
+    "react": "18.0.0",
+    "react-dom": "18.0.0"
+  },
+  "devDependencies": {
+    "@next/bundle-analyzer": "12.0.8",
+    "@types/express": "4.17.13",
+    "@types/fs-extra": "9.0.13",
+    "@types/node-fetch": "2.6.1",
+    "@types/react": "18.0.1",
+    "eslint": "7.32.0",
+    "fs-extra": "10.0.1",
+    "get-port": "6.1.2",
+    "node-fetch": "3.2.3",
+    "typescript": "^4.5.3"
+  }
+}

integration-tests/middleware/pages/_app.tsx

@@ -0,0 +1,34 @@
+import {ErrorFallbackProps, ErrorComponent, ErrorBoundary, AppProps} from "@blitzjs/next"
+import {AuthenticationError, AuthorizationError} from "blitz"
+import React from "react"
+import {withBlitz} from "../app/blitz-client"
+
+function RootErrorFallback({error}: ErrorFallbackProps) {
+  if (error instanceof AuthenticationError) {
+    return <div id="error">Error: You are not authenticated</div>
+  } else if (error instanceof AuthorizationError) {
+    return (
+      <ErrorComponent
+        statusCode={error.statusCode}
+        title="Sorry, you are not authorized to access this"
+      />
+    )
+  } else {
+    return (
+      <ErrorComponent
+        statusCode={(error as any)?.statusCode || 400}
+        title={error.message || error.name}
+      />
+    )
+  }
+}
+
+function MyApp({Component, pageProps}: AppProps) {
+  return (
+    <ErrorBoundary FallbackComponent={RootErrorFallback}>
+      <Component {...pageProps} />
+    </ErrorBoundary>
+  )
+}
+
+export default withBlitz(MyApp)

integration-tests/middleware/pages/_middleware.ts

@@ -0,0 +1,7 @@
+import {NextResponse} from "next/server"
+
+export function middleware() {
+  const response = NextResponse.next()
+  response.headers.set("global-middleware", "true")
+  return response
+}

integration-tests/middleware/pages/api/rpc/[[...blitz]].ts

@@ -0,0 +1,3 @@
+import {rpcHandler} from "@blitzjs/rpc"
+
+export default rpcHandler({onError: console.log})

integration-tests/middleware/pages/api/test.ts

@@ -0,0 +1,5 @@
+import {api} from "../../app/blitz-server"
+
+export default api((_req, res) => {
+  res.status(200).json({success: true})
+})

integration-tests/middleware/pages/index.tsx

@@ -0,0 +1,11 @@
+export const getServerSideProps = () => {
+  return {props: {}}
+}
+
+export default function Web() {
+  return (
+    <div>
+      <h1>Web</h1>
+    </div>
+  )
+}

integration-tests/middleware/test/index.test.ts

@@ -0,0 +1,72 @@
+import {describe, it, expect, beforeAll, afterAll} from "vitest"
+import {
+  killApp,
+  findPort,
+  launchApp,
+  nextBuild,
+  nextStart,
+  fetchViaHTTP,
+} from "../../utils/next-test-utils"
+import {join} from "path"
+
+let app: any
+let appPort: number
+const appDir = join(__dirname, "../")
+
+const runTests = () => {
+  describe("Middleware", () => {
+    describe("global middleware", () => {
+      it(
+        "should call global middleware on api calls",
+        async () => {
+          const res = await fetchViaHTTP(appPort, "/api/test", null, {
+            method: "GET",
+          })
+          expect(res.headers.get("global-middleware")).toBe("true")
+        },
+        5000 * 60 * 2,
+      )
+
+      it(
+        "should call global middleware on rpc calls",
+        async () => {
+          const res = await fetchViaHTTP(appPort, "/api/rpc/getBasic", null, {
+            method: "GET",
+          })
+          expect(res.headers.get("global-middleware")).toBe("true")
+        },
+        5000 * 60 * 2,
+      )
+    })
+  })
+}
+
+describe("Middleware Tests", () => {
+  describe("dev mode", () => {
+    beforeAll(async () => {
+      try {
+        appPort = await findPort()
+        app = await launchApp(appDir, appPort, {cwd: process.cwd()})
+      } catch (error) {
+        console.log(error)
+      }
+    }, 5000 * 60 * 2)
+    afterAll(async () => await killApp(app))
+    runTests()
+  })
+
+  describe("server mode", () => {
+    beforeAll(async () => {
+      try {
+        await nextBuild(appDir)
+        appPort = await findPort()
+        app = await nextStart(appDir, appPort, {cwd: process.cwd()})
+      } catch (err) {
+        console.log(err)
+      }
+    }, 5000 * 60 * 2)
+    afterAll(async () => await killApp(app))
+
+    runTests()
+  })
+})

integration-tests/middleware/tsconfig.json

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

integration-tests/no-suspense/app/blitz-server.ts

@@ -1,13 +1,13 @@
 import {setupBlitzServer} from "@blitzjs/next"
 import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
 import {simpleRolesIsAuthorized} from "@blitzjs/auth"
-import {prisma as db} from "../prisma/index"
+import db from "../prisma/index"
 
 const {gSSP, gSP, api} = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "no-suspense-tests-cookie-prefix",
-      storage: PrismaStorage(db as any),
+      storage: PrismaStorage(db),
       isAuthorized: simpleRolesIsAuthorized,
     }),
   ],

integration-tests/no-suspense/prisma/index.ts

@@ -5,4 +5,4 @@ const EnhancedPrisma = enhancePrisma(PrismaClient)
 
 export * from "@prisma/client"
 const prisma = new EnhancedPrisma()
-export {prisma}
+export default prisma

integration-tests/no-suspense/prisma/seed.ts

@@ -1,4 +1,4 @@
-import {prisma} from "./index"
+import prisma from "./index"
 
 const seed = async () => {
   await prisma.$reset()

integration-tests/no-suspense/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "@blitzjs/config/tsconfig.nextjs.json",
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
   "compilerOptions": {
     "paths": {
       "react": ["./node_modules/@types/react"]

integration-tests/no-suspense/types.ts

@@ -0,0 +1,15 @@
+import {SimpleRolesIsAuthorized} from "@blitzjs/auth"
+import {User} from "./prisma"
+
+export type Role = "ADMIN" | "USER"
+
+declare module "@blitzjs/auth" {
+  export interface Session {
+    isAuthorized: SimpleRolesIsAuthorized<Role>
+    PublicData: {
+      userId: User["id"]
+      role: Role
+      views?: number
+    }
+  }
+}

integration-tests/rpc/tsconfig.json

@@ -15,6 +15,6 @@
     "isolatedModules": true,
     "jsx": "preserve"
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
   "exclude": ["node_modules"]
 }

integration-tests/trailing-slash/app/blitz-server.ts

@@ -1,13 +1,13 @@
 import {setupBlitzServer} from "@blitzjs/next"
 import {AuthServerPlugin, PrismaStorage} from "@blitzjs/auth"
 import {simpleRolesIsAuthorized} from "@blitzjs/auth"
-import {prisma as db} from "../prisma/index"
+import db from "../db"
 
 const {gSSP, gSP, api} = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
       cookiePrefix: "trailing-slash-tests-cookie-prefix",
-      storage: PrismaStorage(db as any),
+      storage: PrismaStorage(db),
       isAuthorized: simpleRolesIsAuthorized,
     }),
   ],

integration-tests/trailing-slash/db/index.ts

@@ -5,4 +5,4 @@ const EnhancedPrisma = enhancePrisma(PrismaClient)
 
 export * from "@prisma/client"
 const prisma = new EnhancedPrisma()
-export {prisma}
+export default prisma

integration-tests/trailing-slash/db/seed.ts

@@ -1,4 +1,4 @@
-import {prisma} from "./index"
+import prisma from "./index"
 
 const seed = async () => {
   await prisma.$reset()

integration-tests/trailing-slash/package.json

@@ -12,6 +12,9 @@
     "prisma:start": "prisma generate && prisma migrate deploy",
     "prisma:studio": "prisma studio"
   },
+  "prisma": {
+    "schema": "db/schema.prisma"
+  },
   "dependencies": {
     "@blitzjs/auth": "workspace:*",
     "@blitzjs/next": "workspace:*",

integration-tests/trailing-slash/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "@blitzjs/config/tsconfig.nextjs.json",
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "types"],
   "compilerOptions": {
     "paths": {
       "react": ["./node_modules/@types/react"]

integration-tests/trailing-slash/types.ts

@@ -0,0 +1,15 @@
+import {SimpleRolesIsAuthorized} from "@blitzjs/auth"
+import {User} from "./db"
+
+export type Role = "ADMIN" | "USER"
+
+declare module "@blitzjs/auth" {
+  export interface Session {
+    isAuthorized: SimpleRolesIsAuthorized<Role>
+    PublicData: {
+      userId: User["id"]
+      role: Role
+      views?: number
+    }
+  }
+}

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,109 @@
 # @blitzjs/auth
 
+## 2.0.0-alpha.48
+
+### Patch Changes
+
+- Updated dependencies [93851d90]
+  - blitz@2.0.0-alpha.48
+
+## 2.0.0-alpha.47
+
+### Patch Changes
+
+- 1d9804a6: Remove references to the logging package
+- Updated dependencies [1d9804a6]
+  - blitz@2.0.0-alpha.47
+
+## 2.0.0-alpha.46
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.46
+
+## 2.0.0-alpha.45
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.45
+
+## 2.0.0-alpha.44
+
+### Patch Changes
+
+- 7817fe3a: Add missing RouteUrlObject on Page.authenticate.redirectTo
+  - blitz@2.0.0-alpha.44
+
+## 2.0.0-alpha.43
+
+### Patch Changes
+
+- Updated dependencies [527e48ac]
+  - blitz@2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
+### Patch Changes
+
+- Updated dependencies [b918055b]
+  - blitz@2.0.0-alpha.39
+
+## 2.0.0-alpha.38
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.38
+
+## 2.0.0-alpha.37
+
+### Patch Changes
+
+- a80d2a8f: rename middleware type for blitz server plugin
+- Updated dependencies [a80d2a8f]
+  - blitz@2.0.0-alpha.37
+
+## 2.0.0-alpha.36
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.36
+
+## 2.0.0-alpha.35
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.35
+
+## 2.0.0-alpha.34
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.34
+
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.33
+
 ## 2.0.0-alpha.32
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.32",
+  "version": "2.0.0-alpha.48",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -26,7 +26,7 @@
     "@types/secure-password": "3.1.1",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
-    "blitz": "2.0.0-alpha.32",
+    "blitz": "2.0.0-alpha.48",
     "cookie": "0.4.1",
     "cookie-session": "2.0.0",
     "debug": "4.3.3",
@@ -39,7 +39,7 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.32",
+    "@blitzjs/config": "workspace:2.0.0-alpha.48",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/cookie": "0.4.1",

packages/blitz-auth/src/client/index.tsx

@@ -205,7 +205,7 @@ export type RedirectAuthenticatedToFn = (
 
 export type BlitzPage<P = {}> = React.ComponentType<P> & {
   getLayout?: (component: JSX.Element) => JSX.Element
-  authenticate?: boolean | {redirectTo?: string}
+  authenticate?: boolean | {redirectTo?: string | RouteUrlObject}
   suppressFirstRenderFlicker?: boolean
   redirectAuthenticatedTo?: RedirectAuthenticatedTo | RedirectAuthenticatedToFn
 }

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

@@ -1,4 +1,4 @@
-import type {BlitzServerPlugin, Middleware, Ctx} from "blitz"
+import type {BlitzServerPlugin, RequestMiddleware, Ctx} from "blitz"
 import {assert} from "blitz"
 import {IncomingMessage, ServerResponse} from "http"
 import {PublicData, SessionModel, SessionConfigMethods} from "../shared/types"
@@ -101,7 +101,7 @@ export function AuthServerPlugin(options: AuthPluginOptions): BlitzServerPlugin<
       `The cookie prefix used has invalid characters. Only alphanumeric characters, "-"  and "_" character are supported`,
     )
 
-    const blitzSessionMiddleware: Middleware<
+    const blitzSessionMiddleware: RequestMiddleware<
       IncomingMessage,
       ServerResponse & {blitzCtx: Ctx}
     > = async (req, res, next) => {
@@ -119,6 +119,6 @@ export function AuthServerPlugin(options: AuthPluginOptions): BlitzServerPlugin<
     return blitzSessionMiddleware
   }
   return {
-    middlewares: [authPluginSessionMiddleware()],
+    requestMiddlewares: [authPluginSessionMiddleware()],
   }
 }

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

@@ -62,9 +62,6 @@ export function getCookieParser(headers: {[key: string]: undefined | string | st
   }
 }
 
-// todo
-declare const baseLogger: any
-
 const debug = require("debug")("blitz:session")
 
 export interface SimpleRolesIsAuthorized<RoleType = string> {
@@ -555,7 +552,7 @@ async function getSessionKernel(
     }
     if (enableCsrfProtection && persistedSession.antiCSRFToken !== antiCSRFToken) {
       if (!antiCSRFToken) {
-        baseLogger({displayDateTime: false}).warn(
+        console.warn(
           `This request is missing the ${HEADER_CSRF} header. You can learn about adding this here: https://blitzjs.com/docs/session-management#manual-api-requests`,
         )
       }
@@ -631,7 +628,7 @@ async function getSessionKernel(
 
     if (enableCsrfProtection && payload.antiCSRFToken !== antiCSRFToken) {
       if (!antiCSRFToken) {
-        baseLogger({displayDateTime: false}).warn(
+        console.warn(
           `This request is missing the ${HEADER_CSRF} header. You can learn about adding this here: https://blitzjs.com/docs/session-management#manual-api-requests`,
         )
       }

packages/blitz-auth/src/server/passport-adapter.ts

@@ -8,7 +8,7 @@ import {
   connectMiddleware,
   Ctx,
   handleRequestWithMiddleware,
-  Middleware,
+  RequestMiddleware,
   MiddlewareResponse,
   secureProxyMiddleware,
 } from "blitz"
@@ -79,9 +79,9 @@ export function passportAuth(config: BlitzPassportConfig): ApiHandler {
 
     const passportMiddleware = passport.initialize()
 
-    const middleware: Middleware<ApiHandlerIncomingMessage, MiddlewareResponse<Ctx>>[] = [
-      connectMiddleware(cookieSessionMiddleware as Middleware),
-      connectMiddleware(passportMiddleware as Middleware),
+    const middleware: RequestMiddleware<ApiHandlerIncomingMessage, MiddlewareResponse<Ctx>>[] = [
+      connectMiddleware(cookieSessionMiddleware as RequestMiddleware),
+      connectMiddleware(passportMiddleware as RequestMiddleware),
       connectMiddleware(passport.session()),
     ]
 

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,115 @@
 # @blitzjs/next
 
+## 2.0.0-alpha.48
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.48
+
+## 2.0.0-alpha.47
+
+### Patch Changes
+
+- 1d9804a6: Remove references to the logging package
+- Updated dependencies [1d9804a6]
+  - @blitzjs/rpc@2.0.0-alpha.47
+
+## 2.0.0-alpha.46
+
+### Patch Changes
+
+- bee19a25: Support RPC error middleware
+- 9ada0f66: Allow customizing PreviewData in gSSP
+- Updated dependencies [bee19a25]
+  - @blitzjs/rpc@2.0.0-alpha.46
+
+## 2.0.0-alpha.45
+
+### Patch Changes
+
+- 5c5decbc: Removes the suspense wrapper from withBlitz since it's not needed
+  - @blitzjs/rpc@2.0.0-alpha.45
+
+## 2.0.0-alpha.44
+
+### Patch Changes
+
+- 7817fe3a: Add missing RouteUrlObject on Page.authenticate.redirectTo
+- ae0b714f: Allow passing optional type argument for ParamsType in GSSP
+  - @blitzjs/rpc@2.0.0-alpha.44
+
+## 2.0.0-alpha.43
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+### Patch Changes
+
+- 9c2e7d37: Use `useRouter` from next/router in useParams function
+  - @blitzjs/rpc@2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+### Patch Changes
+
+- 9ded8dac: useParam & useParams functions now accessible from @blitzjs/next
+  - @blitzjs/rpc@2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.39
+
+## 2.0.0-alpha.38
+
+### Patch Changes
+
+- Updated dependencies [8aee25c5]
+  - @blitzjs/rpc@2.0.0-alpha.38
+
+## 2.0.0-alpha.37
+
+### Patch Changes
+
+- a80d2a8f: rename middleware type for blitz server plugin
+  - @blitzjs/rpc@2.0.0-alpha.37
+
+## 2.0.0-alpha.36
+
+### Patch Changes
+
+- Updated dependencies [4cad9cca]
+  - @blitzjs/rpc@2.0.0-alpha.36
+
+## 2.0.0-alpha.35
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.35
+
+## 2.0.0-alpha.34
+
+### Patch Changes
+
+- Updated dependencies [dfd2408e]
+  - @blitzjs/rpc@2.0.0-alpha.34
+
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.33
+
 ## 2.0.0-alpha.32
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.32",
+  "version": "2.0.0-alpha.48",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.32",
+    "@blitzjs/rpc": "2.0.0-alpha.48",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
@@ -32,21 +32,19 @@
     "superjson": "1.8.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.32",
+    "@blitzjs/config": "workspace:2.0.0-alpha.48",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@testing-library/user-event": "13.5.0",
-    "@types/lodash.frompairs": "4.0.6",
     "@types/node": "17.0.16",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.32",
+    "blitz": "2.0.0-alpha.48",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
-    "lodash.frompairs": "4.0.1",
     "next": "12.1.6-canary.17",
     "react": "18.0.0",
     "react-dom": "18.0.0",

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

@@ -17,6 +17,7 @@ import {Router} from "next/router"
 
 export * from "./error-boundary"
 export * from "./error-component"
+export * from "./use-params"
 export {Routes} from ".blitz"
 
 const compose =
@@ -50,11 +51,7 @@ const buildWithBlitz = <TPlugins extends readonly ClientPlugin<object>[]>(plugin
           <>
             {/* @ts-ignore todo */}
             {props.Component.suppressFirstRenderFlicker && <NoPageFlicker />}
-            {mounted && (
-              <React.Suspense fallback="Loading...">
-                <UserAppRoot {...props} Component={component} />
-              </React.Suspense>
-            )}
+            {mounted && <UserAppRoot {...props} Component={component} />}
           </>
         </BlitzProvider>
       )
@@ -81,7 +78,7 @@ type RedirectAuthenticatedToFnCtx = {
 type RedirectAuthenticatedToFn = (args: RedirectAuthenticatedToFnCtx) => RedirectAuthenticatedTo
 export type BlitzPage<P = {}> = React.ComponentType<P> & {
   getLayout?: (component: JSX.Element) => JSX.Element
-  authenticate?: boolean | {redirectTo?: string}
+  authenticate?: boolean | {redirectTo?: string | RouteUrlObject}
   suppressFirstRenderFlicker?: boolean
   redirectAuthenticatedTo?: RedirectAuthenticatedTo | RedirectAuthenticatedToFn
 }

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

@@ -1,3 +1,4 @@
+import type {NextConfig} from "next"
 import {
   GetServerSideProps,
   GetServerSidePropsResult,
@@ -7,21 +8,22 @@ import {
   NextApiResponse,
 } from "next"
 import type {
-  Ctx as BlitzCtx,
-  BlitzServerPlugin,
-  Middleware,
-  MiddlewareResponse,
-  AsyncFunc,
-  FirstParam,
   AddParameters,
+  AsyncFunc,
+  BlitzServerPlugin,
+  Ctx as BlitzCtx,
+  FirstParam,
+  RequestMiddleware,
+  MiddlewareResponse,
 } from "blitz"
 import {handleRequestWithMiddleware, startWatcher, stopWatcher} from "blitz"
-import type {NextConfig} from "next"
-import {getQueryKey, getInfiniteQueryKey, installWebpackConfig} from "@blitzjs/rpc"
-import {dehydrate} from "@blitzjs/rpc"
+import {dehydrate, getQueryKey, getInfiniteQueryKey, loaderClient, loaderServer} from "@blitzjs/rpc"
 import {DefaultOptions, QueryClient} from "react-query"
 import {IncomingMessage, ServerResponse} from "http"
 import {withSuperJsonProps} from "./superjson"
+import {ResolverBasePath} from "@blitzjs/rpc/src/index-server"
+import {ParsedUrlQuery} from "querystring"
+import {PreviewData} from "next/types"
 
 export * from "./index-browser"
 
@@ -38,20 +40,33 @@ export type NextApiHandler = (
 ) => void | Promise<void>
 
 type SetupBlitzOptions = {
-  plugins: BlitzServerPlugin<Middleware, Ctx>[]
+  plugins: BlitzServerPlugin<RequestMiddleware, Ctx>[]
+  onError?: (err: Error) => void
 }
 
-export type BlitzGSSPHandler<TProps> = ({
+export type BlitzGSSPHandler<
+  TProps,
+  Query extends ParsedUrlQuery = ParsedUrlQuery,
+  PD extends PreviewData = PreviewData,
+> = ({
   ctx,
   req,
   res,
   ...args
-}: Parameters<GetServerSideProps<TProps>>[0] & {ctx: Ctx}) => ReturnType<GetServerSideProps<TProps>>
+}: Parameters<GetServerSideProps<TProps, Query, PD>>[0] & {ctx: Ctx}) => ReturnType<
+  GetServerSideProps<TProps, Query, PD>
+>
 
-export type BlitzGSPHandler<TProps> = ({
+export type BlitzGSPHandler<
+  TProps,
+  Query extends ParsedUrlQuery = ParsedUrlQuery,
+  PD extends PreviewData = PreviewData,
+> = ({
   ctx,
   ...args
-}: Parameters<GetStaticProps<TProps>>[0] & {ctx: Ctx}) => ReturnType<GetStaticProps<TProps>>
+}: Parameters<GetStaticProps<TProps, Query, PD>>[0] & {ctx: Ctx}) => ReturnType<
+  GetStaticProps<TProps, Query, PD>
+>
 
 export type BlitzAPIHandler = (
   req: Parameters<NextApiHandler>[0],
@@ -59,12 +74,14 @@ export type BlitzAPIHandler = (
   ctx: Ctx,
 ) => ReturnType<NextApiHandler>
 
-export const setupBlitzServer = ({plugins}: SetupBlitzOptions) => {
-  const middlewares = plugins.flatMap((p) => p.middlewares)
+export const setupBlitzServer = ({plugins, onError}: SetupBlitzOptions) => {
+  const middlewares = plugins.flatMap((p) => p.requestMiddlewares)
   const contextMiddleware = plugins.flatMap((p) => p.contextMiddleware).filter(Boolean)
 
   const gSSP =
-    <TProps>(handler: BlitzGSSPHandler<TProps>): GetServerSideProps<TProps> =>
+    <TProps, Query extends ParsedUrlQuery = ParsedUrlQuery, PD extends PreviewData = PreviewData>(
+      handler: BlitzGSSPHandler<TProps, Query, PD>,
+    ): GetServerSideProps<TProps, Query, PD> =>
     async ({req, res, ...rest}) => {
       await handleRequestWithMiddleware<IncomingMessage, ServerResponse>(req, res, middlewares)
       const ctx = contextMiddleware.reduceRight(
@@ -88,12 +105,19 @@ export const setupBlitzServer = ({plugins}: SetupBlitzOptions) => {
       ctx.prefetchQuery = prefetchQuery
       ctx.prefetchInfiniteQuery = (...args) => prefetchQuery(...args, true)
 
-      const result = await handler({req, res, ctx, ...rest})
-      return withSuperJsonProps(withDehydratedState(result, queryClient))
+      try {
+        const result = await handler({req, res, ctx, ...rest})
+        return withSuperJsonProps(withDehydratedState(result, queryClient))
+      } catch (err: any) {
+        onError?.(err)
+        throw err
+      }
     }
 
   const gSP =
-    <TProps>(handler: BlitzGSPHandler<TProps>): GetStaticProps<TProps> =>
+    <TProps, Query extends ParsedUrlQuery = ParsedUrlQuery, PD extends PreviewData = PreviewData>(
+      handler: BlitzGSPHandler<TProps, Query, PD>,
+    ): GetStaticProps<TProps, Query, PD> =>
     async (context) => {
       const ctx = contextMiddleware.reduceRight((y, f) => (f ? f(y) : y), {} as Ctx)
       let queryClient: null | QueryClient = null
@@ -113,8 +137,13 @@ export const setupBlitzServer = ({plugins}: SetupBlitzOptions) => {
       ctx.prefetchQuery = prefetchQuery
       ctx.prefetchInfiniteQuery = (...args) => prefetchQuery(...args, true)
 
-      const result = await handler({...context, ctx: ctx})
-      return withSuperJsonProps(withDehydratedState(result, queryClient))
+      try {
+        const result = await handler({...context, ctx: ctx})
+        return withSuperJsonProps(withDehydratedState(result, queryClient))
+      } catch (err: any) {
+        onError?.(err)
+        throw err
+      }
     }
 
   const api =
@@ -123,7 +152,8 @@ export const setupBlitzServer = ({plugins}: SetupBlitzOptions) => {
       try {
         await handleRequestWithMiddleware(req, res, middlewares)
         return handler(req, res, res.blitzCtx)
-      } catch (error) {
+      } catch (error: any) {
+        onError?.(error)
         return res.status(400).send(error)
       }
     }
@@ -133,12 +163,59 @@ export const setupBlitzServer = ({plugins}: SetupBlitzOptions) => {
 
 export interface BlitzConfig extends NextConfig {
   blitz?: {
+    resolverBasePath?: ResolverBasePath
     customServer?: {
       hotReload?: boolean
     }
   }
 }
 
+interface WebpackRuleOptions {
+  resolverBasePath?: ResolverBasePath
+}
+
+interface WebpackRule {
+  test: RegExp
+  use: Array<{
+    loader: string
+    options: WebpackRuleOptions
+  }>
+}
+
+interface InstallWebpackConfigOptions {
+  webpackConfig: {
+    module: {
+      rules: WebpackRule[]
+    }
+  }
+  nextConfig: BlitzConfig
+}
+
+export function installWebpackConfig({webpackConfig, nextConfig}: InstallWebpackConfigOptions) {
+  const options: WebpackRuleOptions = {
+    resolverBasePath: nextConfig.blitz?.resolverBasePath,
+  }
+
+  webpackConfig.module.rules.push({
+    test: /\/\[\[\.\.\.blitz]]\.[jt]s$/,
+    use: [
+      {
+        loader: loaderServer,
+        options,
+      },
+    ],
+  })
+  webpackConfig.module.rules.push({
+    test: /[\\/](queries|mutations)[\\/]/,
+    use: [
+      {
+        loader: loaderClient,
+        options,
+      },
+    ],
+  })
+}
+
 export function withBlitz(nextConfig: BlitzConfig = {}) {
   if (
     process.env.NODE_ENV !== "production" &&
@@ -158,8 +235,8 @@ export function withBlitz(nextConfig: BlitzConfig = {}) {
   }
 
   const config = Object.assign({}, nextConfig, {
-    webpack: (config: any, options: any) => {
-      installWebpackConfig(config)
+    webpack: (config: InstallWebpackConfigOptions["webpackConfig"], options: any) => {
+      installWebpackConfig({webpackConfig: config, nextConfig})
       if (typeof nextConfig.webpack === "function") {
         return nextConfig.webpack(config, options)
       }

packages/blitz-next/src/use-params.test.tsx

@@ -1,9 +1,8 @@
 /**
  * @vitest-environment jsdom
  */
-
 import React from "react"
-import {describe, it, expect, vi} from "vitest"
+import {describe, it, expect, vi, afterEach} from "vitest"
 import {extractRouterParams, useParam, useParams} from "./use-params"
 import {renderHook as defaultRenderHook} from "@testing-library/react-hooks"
 import {NextRouter} from "next/router"
@@ -16,6 +15,14 @@ type RenderHookOptions = DefaultHookParams[1] & {
   dehydratedState?: unknown
 }
 
+// This is the router query object which includes route params
+const query = {
+  id: "1",
+  cat: "category",
+  slug: ["example", "multiple", "slugs"],
+  empty: "",
+}
+
 const mockRouter: NextRouter = {
   basePath: "",
   pathname: "/",
@@ -54,6 +61,10 @@ export function renderHook(
 }
 
 describe("extractRouterParams", () => {
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
   it("returns proper params", () => {
     const routerQuery = {
       id: "1",
@@ -81,92 +92,99 @@ describe("extractRouterParams", () => {
 })
 
 describe("useParams", () => {
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
   it("works without parameter", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
-
-    const {result} = renderHook(() => useParams(), {router: {query}})
-    expect(result.current).toEqual({
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
+    vi.mock("next/router", () => {
+      return {
+        useRouter: vi.fn(() => ({...mockRouter, query})),
+      }
     })
-  })
 
-  it("works with string", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
+    it("works with string", () => {
+      vi.mock("next/router", () => {
+        return {
+          useRouter: vi.fn(() => ({...mockRouter, query})),
+        }
+      })
 
-    const {result} = renderHook(() => useParams("string"), {
-      router: {query},
+      const {result} = renderHook(() => useParams("string"), {
+        router: {query},
+      })
+      expect(result.current).toEqual({
+        id: "1",
+        cat: "category",
+        empty: "",
+      })
     })
-    expect(result.current).toEqual({
-      id: "1",
-      cat: "category",
-      empty: "",
-    })
-  })
 
-  it("works with number", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
+    it("works with string", () => {
+      vi.mock("next/router", () => {
+        return {
+          useRouter: vi.fn(() => ({...mockRouter, query})),
+        }
+      })
 
-    const {result} = renderHook(() => useParams("number"), {
-      router: {query},
+      const {result} = renderHook(() => useParams("string"), {
+        router: {query},
+      })
+      expect(result.current).toEqual({
+        id: "1",
+        cat: "category",
+        empty: "",
+      })
     })
-    expect(result.current).toEqual({
-      id: 1,
-      cat: undefined,
-      slug: undefined,
-    })
-  })
 
-  it("works with array", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
+    it("works with number", () => {
+      vi.mock("next/router", () => {
+        return {
+          useRouter: vi.fn(() => ({...mockRouter, query})),
+        }
+      })
 
-    const {result} = renderHook(() => useParams("array"), {
-      router: {query},
+      const {result} = renderHook(() => useParams("number"), {
+        router: {query},
+      })
+      expect(result.current).toEqual({
+        id: 1,
+        cat: undefined,
+        slug: undefined,
+      })
     })
-    expect(result.current).toEqual({
-      id: ["1"],
-      cat: ["category"],
-      slug: ["example", "multiple", "slugs"],
-      empty: [""],
+
+    it("works with array", () => {
+      vi.mock("next/router", () => {
+        return {
+          useRouter: vi.fn(() => ({...mockRouter, query})),
+        }
+      })
+
+      const {result} = renderHook(() => useParams("array"), {
+        router: {query},
+      })
+      expect(result.current).toEqual({
+        id: ["1"],
+        cat: ["category"],
+        slug: ["example", "multiple", "slugs"],
+        empty: [""],
+      })
     })
   })
 })
 
 describe("useParam", () => {
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
   it("works without parameter", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
+    vi.mock("next/router", () => {
+      return {
+        useRouter: vi.fn(() => ({...mockRouter, query})),
+      }
+    })
 
     let {result} = renderHook(() => useParam("id"), {router: {query}})
     expect(result.current).toEqual("1")
@@ -183,13 +201,11 @@ describe("useParam", () => {
   })
 
   it("works with string", () => {
-    // This is the router query object which includes route params
-    const query = {
-      id: "1",
-      cat: "category",
-      slug: ["example", "multiple", "slugs"],
-      empty: "",
-    }
+    vi.mock("next/router", () => {
+      return {
+        useRouter: vi.fn(() => ({...mockRouter, query})),
+      }
+    })
 
     let {result} = renderHook(() => useParam("id", "string"), {
       router: {query},

packages/blitz-next/src/use-params.tsx

@@ -1,22 +1,10 @@
-import fromPairs from "lodash.frompairs"
-import {NextRouter} from "next/router"
+import {useRouter} from "next/router"
 import {ParsedUrlQuery} from "querystring"
 import React from "react"
-import {RouterContext} from "./router-context"
 
 type Dict<T> = Record<string, T | undefined>
 type ReturnTypes = "string" | "number" | "array"
 
-/**
- * `useRouter` is a React hook used to access `router` object within components
- *
- * @returns `router` object
- * @see Docs {@link https://blitzjs.com/docs/router#router-object | router}
- */
-export function useRouter(): NextRouter {
-  return React.useContext(RouterContext)
-}
-
 /*
  * Based on the code of https://github.com/lukeed/qss
  */
@@ -81,7 +69,7 @@ function areQueryValuesEqual(value1: ParsedUrlQueryValue, value2: ParsedUrlQuery
 }
 
 export function extractRouterParams(routerQuery: ParsedUrlQuery, asPathQuery: ParsedUrlQuery) {
-  return fromPairs(
+  return Object.fromEntries(
     Object.entries(routerQuery).filter(
       ([key, value]) =>
         typeof asPathQuery[key] === "undefined" || !areQueryValuesEqual(value, asPathQuery[key]),

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,128 @@
 # @blitzjs/rpc
 
+## 2.0.0-alpha.48
+
+### Patch Changes
+
+- Updated dependencies [93851d90]
+  - blitz@2.0.0-alpha.48
+  - @blitzjs/auth@2.0.0-alpha.48
+
+## 2.0.0-alpha.47
+
+### Patch Changes
+
+- 1d9804a6: Remove references to the logging package
+- Updated dependencies [1d9804a6]
+  - blitz@2.0.0-alpha.47
+  - @blitzjs/auth@2.0.0-alpha.47
+
+## 2.0.0-alpha.46
+
+### Patch Changes
+
+- bee19a25: Support RPC error middleware
+  - @blitzjs/auth@2.0.0-alpha.46
+  - blitz@2.0.0-alpha.46
+
+## 2.0.0-alpha.45
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.45
+- blitz@2.0.0-alpha.45
+
+## 2.0.0-alpha.44
+
+### Patch Changes
+
+- Updated dependencies [7817fe3a]
+  - @blitzjs/auth@2.0.0-alpha.44
+  - blitz@2.0.0-alpha.44
+
+## 2.0.0-alpha.43
+
+### Patch Changes
+
+- Updated dependencies [527e48ac]
+  - blitz@2.0.0-alpha.43
+  - @blitzjs/auth@2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.42
+- blitz@2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.41
+- blitz@2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.40
+- blitz@2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
+### Patch Changes
+
+- Updated dependencies [b918055b]
+  - blitz@2.0.0-alpha.39
+  - @blitzjs/auth@2.0.0-alpha.39
+
+## 2.0.0-alpha.38
+
+### Patch Changes
+
+- 8aee25c5: getQueryClient function & queryClient codemod updates & shared plugin config
+  - blitz@2.0.0-alpha.38
+  - @blitzjs/auth@2.0.0-alpha.38
+
+## 2.0.0-alpha.37
+
+### Patch Changes
+
+- Updated dependencies [a80d2a8f]
+  - blitz@2.0.0-alpha.37
+  - @blitzjs/auth@2.0.0-alpha.37
+
+## 2.0.0-alpha.36
+
+### Patch Changes
+
+- 4cad9cca: Add queryClient to RPC Plugin exports
+  - blitz@2.0.0-alpha.36
+  - @blitzjs/auth@2.0.0-alpha.36
+
+## 2.0.0-alpha.35
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.35
+- @blitzjs/auth@2.0.0-alpha.35
+
+## 2.0.0-alpha.34
+
+### Patch Changes
+
+- dfd2408e: Add resolverBasePath to Blitz config to change the way rpc routes are generated
+  - @blitzjs/auth@2.0.0-alpha.34
+  - blitz@2.0.0-alpha.34
+
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.33
+- blitz@2.0.0-alpha.33
+
 ## 2.0.0-alpha.32
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.32",
+  "version": "2.0.0-alpha.48",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts && wait-on -d 250 ../blitz-auth/dist/index-browser.d.ts",
@@ -20,7 +20,7 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/auth": "2.0.0-alpha.32",
+    "@blitzjs/auth": "2.0.0-alpha.48",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
     "chalk": "^4.1.0",
@@ -30,11 +30,11 @@
     "zod": "3.10.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.32",
+    "@blitzjs/config": "workspace:2.0.0-alpha.48",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.32",
+    "blitz": "2.0.0-alpha.48",
     "next": "12.1.6-canary.17",
     "react": "18.0.0",
     "react-dom": "18.0.0",
@@ -43,7 +43,7 @@
     "watch": "1.0.2"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-alpha.32",
+    "blitz": "2.0.0-alpha.48",
     "next": "*"
   },
   "publishConfig": {

packages/blitz-rpc/src/data-client/index.ts

@@ -2,11 +2,11 @@ export * from "./rpc"
 export {useQuery, usePaginatedQuery, useInfiniteQuery, useMutation} from "./react-query"
 export type {MutateFunction} from "./react-query"
 export {
-  queryClient,
   getQueryKey,
   getInfiniteQueryKey,
   invalidateQuery,
   setQueryData,
+  getQueryClient,
 } from "./react-query-utils"
 export {useQueryErrorResetBoundary, QueryClient} from "react-query"
 export {dehydrate} from "react-query/hydration"

packages/blitz-rpc/src/data-client/react-query-utils.ts

@@ -54,8 +54,8 @@ export const initializeQueryClient = () => {
   })
 }
 
-// Create internal QueryClient instance
-export const queryClient = initializeQueryClient()
+// Query client is initialised in `BlitzRpcPlugin`, and can only be used with BlitzRpcPlugin right now
+export const getQueryClient = () => globalThis.queryClient
 
 function isRpcClient(f: any): f is RpcClient<any, any> {
   return !!f._isRpcClient
@@ -176,7 +176,7 @@ export function invalidateQuery<TInput, TResult, T extends AsyncFunc>(
     // Params not provided, only use first query key item (url)
     queryKey = fullQueryKey[0]
   }
-  return queryClient.invalidateQueries(queryKey)
+  return getQueryClient().invalidateQueries(queryKey)
 }
 
 export function setQueryData<TInput, TResult, T extends AsyncFunc>(
@@ -184,15 +184,15 @@ export function setQueryData<TInput, TResult, T extends AsyncFunc>(
   params: TInput,
   newData: TResult | ((oldData: TResult | undefined) => TResult),
   opts: MutateOptions = {refetch: true},
-): Promise<void | ReturnType<typeof queryClient.invalidateQueries>> {
+): Promise<void | ReturnType<ReturnType<typeof getQueryClient>["invalidateQueries"]>> {
   if (typeof resolver === "undefined") {
     throw new Error("setQueryData is missing the first argument - it must be a resolver function")
   }
   const queryKey = getQueryKey(resolver, params)
 
   return new Promise((res) => {
-    queryClient.setQueryData(queryKey, newData)
-    let result: void | ReturnType<typeof queryClient.invalidateQueries>
+    getQueryClient().setQueryData(queryKey, newData)
+    let result: void | ReturnType<ReturnType<typeof getQueryClient>["invalidateQueries"]>
     if (opts.refetch) {
       result = invalidateQuery(resolver, params)
     }

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

@@ -2,8 +2,8 @@ import {normalizePathTrailingSlash} from "next/dist/client/normalize-trailing-sl
 import {addBasePath} from "next/dist/shared/lib/router/router"
 import {deserialize, serialize} from "superjson"
 import {SuperJSONResult} from "superjson/dist/types"
-import {isServer, CSRFTokenMismatchError} from "blitz"
-import {getQueryKeyFromUrlAndParams, queryClient} from "./react-query-utils"
+import {CSRFTokenMismatchError, isServer} from "blitz"
+import {getQueryKeyFromUrlAndParams, getQueryClient} from "./react-query-utils"
 import {
   getAntiCSRFToken,
   getPublicDataStore,
@@ -55,7 +55,7 @@ export function __internal_buildRpcClient({
   resolverType,
   routePath,
 }: BuildRpcClientParams): RpcClient {
-  const fullRoutePath = normalizeApiRoute("/api/rpc/" + routePath)
+  const fullRoutePath = normalizeApiRoute("/api/rpc" + routePath)
 
   const httpClient: RpcClientBase = async (params, opts = {}) => {
     const debug = (await import("debug")).default("blitz:rpc")
@@ -123,9 +123,9 @@ export function __internal_buildRpcClient({
             setTimeout(async () => {
               // Do these in the next tick to prevent various bugs like https://github.com/blitz-js/blitz/issues/2207
               debug("Invalidating react-query cache...")
-              await queryClient.cancelQueries()
-              await queryClient.resetQueries()
-              queryClient.getMutationCache().clear()
+              await getQueryClient().cancelQueries()
+              await getQueryClient().resetQueries()
+              getQueryClient().getMutationCache().clear()
               // We have a 100ms delay here to prevent unnecessary stale queries from running
               // This prevents the case where you logout on a page with
               // Page.authenticate = {redirectTo: '/login'}
@@ -184,7 +184,7 @@ export function __internal_buildRpcClient({
 
             if (!opts.fromQueryHook) {
               const queryKey = getQueryKeyFromUrlAndParams(routePath, params)
-              queryClient.setQueryData(queryKey, data)
+              getQueryClient().setQueryData(queryKey, data)
             }
             return data
           }

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

@@ -4,12 +4,10 @@ import {DefaultOptions, QueryClient} from "react-query"
 
 export * from "./data-client/index"
 
-export const queryClient = globalThis.queryClient
-
 interface BlitzRpcOptions {
   reactQueryOptions?: DefaultOptions
 }
-export const BlitzRpcPlugin = createClientPlugin<BlitzRpcOptions, any>(
+export const BlitzRpcPlugin = createClientPlugin<BlitzRpcOptions, {queryClient: QueryClient}>(
   (options?: BlitzRpcOptions) => {
     const initializeQueryClient = () => {
       const {reactQueryOptions} = options || {}
@@ -37,12 +35,14 @@ export const BlitzRpcPlugin = createClientPlugin<BlitzRpcOptions, any>(
         },
       })
     }
-
-    globalThis.queryClient = initializeQueryClient()
+    const queryClient = initializeQueryClient()
+    globalThis.queryClient = queryClient
     return {
       events: {},
       middleware: {},
-      exports: () => {},
+      exports: () => ({
+        queryClient,
+      }),
     }
   },
 )

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

@@ -1,7 +1,8 @@
-import {assert, Ctx, baseLogger, prettyMs, newLine} from "blitz"
+import {assert, Ctx, prettyMs} from "blitz"
 import {NextApiRequest, NextApiResponse} from "next"
 import {deserialize, serialize as superjsonSerialize} from "superjson"
 import chalk from "chalk"
+import {resolve} from "path"
 
 // TODO - optimize end user server bundles by not exporting all client stuff here
 export * from "./index-browser"
@@ -12,6 +13,7 @@ export * from "./resolver"
 function isObject(value: unknown): value is Record<string | symbol, unknown> {
   return typeof value === "object" && value !== null
 }
+
 function getGlobalObject<T extends Record<string, unknown>>(key: string, defaultValue: T): T {
   assert(key.startsWith("__internal_blitz"), "unsupported key")
   if (typeof global === "undefined") {
@@ -24,6 +26,7 @@ function getGlobalObject<T extends Record<string, unknown>>(key: string, default
 
 type Resolver = (...args: unknown[]) => Promise<unknown>
 type ResolverFiles = Record<string, () => Promise<{default?: Resolver}>>
+export type ResolverBasePath = "queries|mutations" | "root" | undefined
 
 // We define `global.__internal_blitzRpcResolverFiles` to ensure we use the same global object.
 // Needed for Next.js. I'm guessing that Next.js is including the `node_modules/` files in a seperate bundle than user files.
@@ -47,21 +50,9 @@ export function __internal_addBlitzRpcResolver(
   return resolver
 }
 
-import {resolve} from "path"
 const dir = __dirname + (() => "")() // trick to avoid `@vercel/ncc` to glob import
-const loaderServer = resolve(dir, "./loader-server.cjs")
-const loaderClient = resolve(dir, "./loader-client.cjs")
-
-export function installWebpackConfig<T extends any[]>(config: {module?: {rules?: T}}) {
-  config.module!.rules!.push({
-    test: /\/\[\[\.\.\.blitz]]\.[jt]s$/,
-    use: [{loader: loaderServer}],
-  })
-  config.module!.rules!.push({
-    test: /[\\/](queries|mutations)[\\/]/,
-    use: [{loader: loaderClient}],
-  })
-}
+export const loaderServer = resolve(dir, "./loader-server.cjs")
+export const loaderClient = resolve(dir, "./loader-client.cjs")
 
 // ----------
 // END LOADER
@@ -119,14 +110,6 @@ export function rpcHandler(config: RpcConfig) {
       throw new Error("No default export for resolver path: " + routePath)
     }
 
-    const log = baseLogger().getChildLogger({
-      prefix: [relativeRoutePath + "()"],
-    })
-
-    const customChalk = new chalk.Instance({
-      level: log.settings.type === "json" ? 0 : chalk.level,
-    })
-
     if (req.method === "HEAD") {
       // We used to initiate database connection here
       res.status(200).end()
@@ -136,7 +119,7 @@ export function rpcHandler(config: RpcConfig) {
 
       if (typeof req.body.params === "undefined") {
         const error = {message: "Request body is missing the `params` key"}
-        log.error(error.message)
+        console.error(error.message)
         res.status(400).json({
           result: null,
           error,
@@ -150,11 +133,11 @@ export function rpcHandler(config: RpcConfig) {
           meta: req.body.meta?.params,
         })
 
-        log.info(customChalk.dim("Starting with input:"), data ? data : JSON.stringify(data))
+        console.info("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))
+        console.debug("Result:", result ? result : JSON.stringify(result))
 
         const serializerStartTime = Date.now()
         const serializedResult = superjsonSerialize(result)
@@ -168,30 +151,27 @@ export function rpcHandler(config: RpcConfig) {
             result: serializedResult.meta,
           },
         })
-        log.debug(
-          customChalk.dim(
-            `Next.js serialization:${prettyMs(Date.now() - nextSerializerStartTime)}`,
-          ),
-        )
+        console.debug(`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)}`,
-          ),
+        console.info(
+          `Finished: resolver:${prettyMs(resolverDuration)} serializer:${prettyMs(
+            serializerDuration,
+          )} total:${prettyMs(duration)}`,
         )
-        newLine()
+        console.log("\n")
 
         return
       } catch (error: any) {
         if (error._clearStack) {
           delete error.stack
         }
-        log.error(error)
-        newLine()
+
+        config.onError?.(error)
+
+        console.error(error)
+        console.log("\n")
 
         if (!error.statusCode) {
           error.statusCode = 500
@@ -210,7 +190,7 @@ export function rpcHandler(config: RpcConfig) {
       }
     } else {
       // Everything else is error
-      log.warn(`${req.method} method not supported`)
+      console.warn(`${req.method} method not supported`)
       res.status(404).end()
       return
     }

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

@@ -3,20 +3,13 @@ import {
   convertFilePathToResolverName,
   convertFilePathToResolverType,
   convertPageFilePathToRoutePath,
+  Loader,
+  LoaderOptions,
   toPosixPath,
 } from "./loader-utils"
-import {assert} from "blitz"
 import {posix} from "path"
 
 // Subset of `import type { LoaderDefinitionFunction } from 'webpack'`
-type Loader = {
-  _compiler?: {
-    name: string
-    context: string
-  }
-  resource: string
-  cacheable: (enabled: boolean) => void
-}
 
 export async function loader(this: Loader, input: string): Promise<string> {
   const compiler = this._compiler!
@@ -25,8 +18,12 @@ export async function loader(this: Loader, input: string): Promise<string> {
 
   const isSSR = compiler.name === "server"
   if (!isSSR) {
-    const code = await transformBlitzRpcResolverClient(input, toPosixPath(id), toPosixPath(root))
-    return code
+    return await transformBlitzRpcResolverClient(
+      input,
+      toPosixPath(id),
+      toPosixPath(root),
+      this.query,
+    )
   }
 
   return input
@@ -34,13 +31,18 @@ export async function loader(this: Loader, input: string): Promise<string> {
 
 module.exports = loader
 
-export async function transformBlitzRpcResolverClient(_src: string, id: string, root: string) {
+export async function transformBlitzRpcResolverClient(
+  _src: string,
+  id: string,
+  root: string,
+  options?: LoaderOptions,
+) {
   assertPosixPath(id)
   assertPosixPath(root)
 
   const resolverFilePath = "/" + posix.relative(root, id)
   assertPosixPath(resolverFilePath)
-  const routePath = convertPageFilePathToRoutePath(resolverFilePath)
+  const routePath = convertPageFilePathToRoutePath(resolverFilePath, options?.resolverBasePath)
   const resolverName = convertFilePathToResolverName(resolverFilePath)
   const resolverType = convertFilePathToResolverType(resolverFilePath)
 

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

@@ -1,23 +1,17 @@
-import {posix, join, dirname} from "path"
+import {dirname, join, posix} from "path"
 import {promises} from "fs"
 import {
   assertPosixPath,
-  toPosixPath,
   buildPageExtensionRegex,
-  getIsRpcFile,
-  topLevelFoldersThatMayContainResolvers,
   convertPageFilePathToRoutePath,
+  getIsRpcFile,
+  Loader,
+  LoaderOptions,
+  topLevelFoldersThatMayContainResolvers,
+  toPosixPath,
 } from "./loader-utils"
 
 // Subset of `import type { LoaderDefinitionFunction } from 'webpack'`
-type Loader = {
-  _compiler?: {
-    name: string
-    context: string
-  }
-  resource: string
-  cacheable: (enabled: boolean) => void
-}
 
 export async function loader(this: Loader, input: string): Promise<string> {
   const compiler = this._compiler!
@@ -29,8 +23,13 @@ export async function loader(this: Loader, input: string): Promise<string> {
     this.cacheable(false)
 
     const resolvers = await collectResolvers(root, ["ts", "js"])
-    const code = await transformBlitzRpcServer(input, toPosixPath(id), toPosixPath(root), resolvers)
-    return code
+    return await transformBlitzRpcServer(
+      input,
+      toPosixPath(id),
+      toPosixPath(root),
+      resolvers,
+      this.query,
+    )
   }
 
   return input
@@ -43,6 +42,7 @@ export async function transformBlitzRpcServer(
   id: string,
   root: string,
   resolvers: string[],
+  options?: LoaderOptions,
 ) {
   assertPosixPath(id)
   assertPosixPath(root)
@@ -55,7 +55,7 @@ export async function transformBlitzRpcServer(
 
   for (let resolverFilePath of resolvers) {
     const relativeResolverPath = posix.relative(dirname(id), join(root, resolverFilePath))
-    const routePath = convertPageFilePathToRoutePath(resolverFilePath)
+    const routePath = convertPageFilePathToRoutePath(resolverFilePath, options?.resolverBasePath)
     code += `__internal_addBlitzRpcResolver('${routePath}', () => import('${relativeResolverPath}'));`
     code += "\n"
   }