Update package-lock

* added db seed cli command

* Update .changeset/poor-penguins-look.md

* Add tsconfig-paths to blitz deps

Co-authored-by: Aleksandra <alexsandra.sikora@gmail.com>

.changeset/big-phones-bow.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+add mounted check inside withBlitz

.changeset/config.json

@@ -7,5 +7,5 @@
   "access": "restricted",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": ["web", "test-*"]
+  "ignore": ["web", "test-*", "toolkit-app"]
 }

.changeset/hot-drinks-approve.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+Upgrade @types/react, fix typings inside @blitzjs/next

.changeset/modern-cameras-pull.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Support `prefetchBlitzQuery` in gSSP and gSP

.changeset/moody-squids-cheer.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+test automated publish

.changeset/plenty-bottles-swim.md

@@ -0,0 +1,11 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+- Add mounted check to withBlitz
+- Upgrade @types/react, fix typings inside @blitzjs/next
+- Support prefetchBlitzQuery in gSP and gSSP
+- Add db seed cli command
+- Add try/catch to changePassword mutation

.changeset/poor-penguins-look.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+add `db seed` cli command

.changeset/pre.json

@@ -13,19 +13,26 @@
     "@blitzjs/config": "0.0.0",
     "@blitzjs/generator": "2.0.0-alpha.0",
     "template": "0.0.0",
-    "toolkit-app": "1.0.0"
+    "toolkit-app": "1.0.0",
+    "test-qm": "0.0.0"
   },
   "changesets": [
+    "big-phones-bow",
     "breezy-cameras-double",
     "dirty-monkeys-greet",
     "empty-berries-rule",
     "fair-wombats-sneeze",
     "flat-bees-approve",
     "great-months-train",
+    "hot-drinks-approve",
     "lovely-colts-share",
+    "modern-cameras-pull",
+    "nice-starfishes-live",
     "nine-onions-admire",
     "ninety-pets-heal",
+    "plenty-bottles-swim",
     "poor-peas-lick",
+    "poor-penguins-look",
     "poor-shrimps-think",
     "quiet-feet-travel",
     "sharp-falcons-begin",
@@ -33,6 +40,7 @@
     "stupid-walls-sell",
     "swift-drinks-dress",
     "ten-rivers-burn",
+    "tender-pianos-check",
     "thirty-countries-build",
     "twenty-beans-pump",
     "two-kiwis-help",

.changeset/tender-pianos-check.md

@@ -0,0 +1,7 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+various improvements and fixes

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`.
@@ -7,9 +7,15 @@
  * to easily generate realistic data.
  */
 const seed = async () => {
-  // for (let i = 0; i < 5; i++) {
-  //   await db.project.create({ data: { name: "Project " + i } })
-  // }
+  await db.$reset()
+
+  for (let i = 0; i < 1; i++) {
+    await db.user.create({
+      data: {
+        email: "test@test.com",
+      },
+    })
+  }
 }
 
 export default 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.21",
+    "blitz": "workspace:2.0.0-alpha.23",
     "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",
@@ -45,7 +45,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
     "@types/preview-email": "2.0.1",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "eslint": "7.32.0",
     "husky": "7.0.4",
     "jest": "27.5.1",

apps/toolkit-app/pages/_app.tsx

@@ -1,7 +1,7 @@
 import { ErrorFallbackProps, ErrorComponent, ErrorBoundary } from "@blitzjs/next"
 import { AuthenticationError, AuthorizationError } from "blitz"
 import type { AppProps } from "next/app"
-import React, { Suspense } from "react"
+import React from "react"
 import { withBlitz } from "app/blitz-client"
 
 function RootErrorFallback({ error }: ErrorFallbackProps) {
@@ -27,9 +27,7 @@ function RootErrorFallback({ error }: ErrorFallbackProps) {
 function MyApp({ Component, pageProps }: AppProps) {
   return (
     <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      <Suspense fallback="Loading...">
-        <Component {...pageProps} />
-      </Suspense>
+      <Component {...pageProps} />
     </ErrorBoundary>
   )
 }

apps/web/package.json

@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@next/bundle-analyzer": "12.0.8",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "eslint": "7.32.0",
     "typescript": "^4.5.3"
   }

apps/web/pages/_app.tsx

@@ -1,7 +1,7 @@
 import {ErrorFallbackProps, ErrorComponent, ErrorBoundary} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
 import type {AppProps} from "next/app"
-import React, {Suspense} from "react"
+import React from "react"
 import {withBlitz} from "app/blitz-client"
 
 function RootErrorFallback({error}: ErrorFallbackProps) {
@@ -27,9 +27,7 @@ function RootErrorFallback({error}: ErrorFallbackProps) {
 function MyApp({Component, pageProps}: AppProps) {
   return (
     <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      <Suspense fallback="Loading...">
-        <Component {...pageProps} />
-      </Suspense>
+      <Component {...pageProps} />
     </ErrorBoundary>
   )
 }

apps/web/pages/page-with-prefetch.tsx

@@ -0,0 +1,28 @@
+import {useQuery} from "@blitzjs/rpc"
+import {gSSP} from "app/blitz-server"
+import getUsers from "app/queries/getUsers"
+
+export const getServerSideProps = gSSP(async ({ctx}) => {
+  const {prefetchBlitzQuery} = ctx
+
+  await prefetchBlitzQuery(getUsers, {})
+  return {props: {}}
+})
+
+function PageWithGssp(props) {
+  const [users] = useQuery(getUsers, {})
+  return (
+    <div>
+      {users.map((u) => (
+        <div key={u.createdAt.toDateString()}>
+          <p>name: {u.name}</p>
+          <p>role: {u.role}</p>
+          <p>email: {u.email}</p>
+          <hr />
+        </div>
+      ))}
+    </div>
+  )
+}
+
+export default PageWithGssp

integration-tests/auth/package.json

@@ -29,7 +29,7 @@
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/node-fetch": "2.6.1",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "b64-lite": "1.4.0",
     "eslint": "7.32.0",
     "fs-extra": "10.0.1",

integration-tests/qm/package.json

@@ -18,11 +18,11 @@
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
-    "react-query": "3.21.1"
+    "react-query": "3.39.0"
   },
   "devDependencies": {
     "@testing-library/react": "13.0.0",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "@vitejs/plugin-react": "1.3.0",
     "delay": "5.0.0",
     "eslint": "7.32.0",

integration-tests/rpc/package.json

@@ -20,7 +20,7 @@
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/node-fetch": "2.6.1",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "b64-lite": "1.4.0",
     "eslint": "7.32.0",
     "fs-extra": "10.0.1",

integration-tests/utils/package.json

@@ -9,7 +9,7 @@
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/node-fetch": "2.6.1",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "@types/rimraf": "3.0.2",
     "@types/selenium-webdriver": "4.0.18",
     "chromedriver": "100.0.0",
@@ -21,7 +21,7 @@
     "node-fetch": "3.2.3",
     "react": "18.0.0",
     "react-dom": "18.0.0",
-    "react-query": "3.21.1",
+    "react-query": "3.39.0",
     "rimraf": "3.0.2",
     "selenium-webdriver": "4.1.1",
     "tree-kill": "1.2.2",

package.json

@@ -17,7 +17,7 @@
     "test": "turbo run test",
     "clean": "turbo run clean && rm -rf node_modules",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
-    "pre-publish": "pnpm i && changeset add && changeset version && pnpm build && git add . && git commit -v",
+    "pre-publish": "changeset add && changeset version && pnpm build && git add . && git commit -v",
     "publish-release": "changeset publish && git push --follow-tags"
   },
   "dependencies": {

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @blitzjs/auth
 
+## 2.0.0-alpha.23
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.23
+
+## 2.0.0-alpha.22
+
+### Patch Changes
+
+- Updated dependencies
+- Updated dependencies [89bf993a]
+  - blitz@2.0.0-alpha.22
+
 ## 2.0.0-alpha.21
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.0-alpha.23",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -24,7 +24,7 @@
     "@types/secure-password": "3.1.1",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
-    "blitz": "2.0.0-alpha.21",
+    "blitz": "2.0.0-alpha.23",
     "cookie": "0.4.1",
     "debug": "4.3.3",
     "http": "0.0.1-security",
@@ -35,13 +35,13 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.21",
+    "@blitzjs/config": "workspace:2.0.0-alpha.23",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/cookie": "0.4.1",
     "@types/debug": "4.1.7",
     "@types/jsonwebtoken": "8.5.8",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "react": "18.0.0",
     "react-dom": "18.0.0",

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @blitzjs/next
 
+## 2.0.0-alpha.23
+
+### Patch Changes
+
+- various improvements and fixes
+  - @blitzjs/rpc@2.0.0-alpha.23
+
+## 2.0.0-alpha.22
+
+### Patch Changes
+
+- c5c727cb: add mounted check inside withBlitz
+- 6ff9ec0d: Upgrade @types/react, fix typings inside @blitzjs/next
+- da17cc8a: Support `prefetchBlitzQuery` in gSSP and gSP
+- - Add mounted check to withBlitz
+  - Upgrade @types/react, fix typings inside @blitzjs/next
+  - Support prefetchBlitzQuery in gSP and gSSP
+  - Add db seed cli command
+  - Add try/catch to changePassword mutation
+  - @blitzjs/rpc@2.0.0-alpha.22
+
 ## 2.0.0-alpha.21
 
 ### Patch Changes

packages/blitz-next/package.json

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

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

@@ -31,8 +31,12 @@ const buildWithBlitz = <TPlugins extends readonly ClientPlugin<object>[]>(plugin
     const BlitzOuterRoot = (props: AppProps) => {
       const component = React.useMemo(() => withPlugins(props.Component), [props.Component])
 
-      // supress first render flicker
+      const [mounted, setMounted] = React.useState(false)
+
       React.useEffect(() => {
+        // Current workaround to fix react 18 suspense error issue
+        setMounted(true)
+        // supress first render flicker
         setTimeout(() => {
           document.documentElement.classList.add("blitz-first-render-complete")
         })
@@ -43,7 +47,11 @@ const buildWithBlitz = <TPlugins extends readonly ClientPlugin<object>[]>(plugin
           <>
             {/* @ts-ignore todo */}
             {props.Component.suppressFirstRenderFlicker && <NoPageFlicker />}
-            <UserAppRoot {...props} Component={component} />
+            {mounted && (
+              <React.Suspense fallback="Loading...">
+                <UserAppRoot {...props} Component={component} />
+              </React.Suspense>
+            )}
           </>
         </BlitzProvider>
       )
@@ -53,6 +61,7 @@ const buildWithBlitz = <TPlugins extends readonly ClientPlugin<object>[]>(plugin
 }
 
 export type BlitzProviderProps = {
+  children: JSX.Element
   client?: QueryClient
   contextSharing?: boolean
   dehydratedState?: unknown
@@ -65,7 +74,7 @@ const BlitzProvider = ({
   dehydratedState,
   hydrateOptions,
   children,
-}: BlitzProviderProps & {children: JSX.Element}) => {
+}: BlitzProviderProps) => {
   if (globalThis.queryClient) {
     return (
       <QueryClientProvider

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

@@ -1,7 +1,21 @@
-import {GetServerSideProps, GetStaticProps, NextApiRequest, NextApiResponse} from "next"
-import type {Ctx as BlitzCtx, BlitzServerPlugin, Middleware, MiddlewareResponse} from "blitz"
+import {
+  GetServerSideProps,
+  GetServerSidePropsResult,
+  GetStaticProps,
+  GetStaticPropsResult,
+  NextApiRequest,
+  NextApiResponse,
+} from "next"
+import type {
+  Ctx as BlitzCtx,
+  BlitzServerPlugin,
+  Middleware,
+  MiddlewareResponse,
+  AsyncFunc,
+  FirstParam,
+} from "blitz"
 import {handleRequestWithMiddleware} from "blitz"
-import {withSuperJSONPropsGsp, withSuperJSONPropsGssp} from "./superjson"
+import {withSuperJsonProps} from "./superjson"
 
 export * from "./index-browser"
 
@@ -43,21 +57,43 @@ export const setupBlitzServer = ({plugins}: SetupBlitzOptions) => {
   const middlewares = plugins.flatMap((p) => p.middlewares)
   const contextMiddleware = plugins.flatMap((p) => p.contextMiddleware).filter(Boolean)
 
-  const gSSP = <TProps>(handler: BlitzGSSPHandler<TProps>): GetServerSideProps<TProps> =>
-    withSuperJSONPropsGssp<TProps>(async ({req, res, ...rest}) => {
+  const gSSP =
+    <TProps>(handler: BlitzGSSPHandler<TProps>): GetServerSideProps<TProps> =>
+    async ({req, res, ...rest}) => {
       await handleRequestWithMiddleware(req, res, middlewares)
       const ctx = contextMiddleware.reduceRight(
         (y, f) => (f ? f(y) : y),
         (res as MiddlewareResponse).blitzCtx,
       )
-      return handler({req, res, ctx, ...rest})
-    })
+      let queryClient: null | QueryClient = null
 
-  const gSP = <TProps>(handler: BlitzGSPHandler<TProps>): GetStaticProps<TProps> =>
-    withSuperJSONPropsGsp<TProps>(async (context) => {
+      ctx.prefetchBlitzQuery = async (fn, input, defaultOptions = {}) => {
+        queryClient = new QueryClient({defaultOptions})
+
+        const queryKey = getQueryKey(fn, input)
+        await queryClient.prefetchQuery(queryKey, () => fn(input, ctx))
+      }
+
+      const result = await handler({req, res, ctx, ...rest})
+      return withSuperJsonProps(withDehydratedState(result, queryClient))
+    }
+
+  const gSP =
+    <TProps>(handler: BlitzGSPHandler<TProps>): GetStaticProps<TProps> =>
+    async (context) => {
       const ctx = contextMiddleware.reduceRight((y, f) => (f ? f(y) : y), {} as Ctx)
-      return handler({...context, ctx: ctx})
-    })
+      let queryClient: null | QueryClient = null
+
+      ctx.prefetchBlitzQuery = async (fn, input, defaultOptions = {}) => {
+        queryClient = new QueryClient({defaultOptions})
+
+        const queryKey = getQueryKey(fn, input)
+        await queryClient.prefetchQuery(queryKey, () => fn(input, ctx))
+      }
+
+      const result = await handler({...context, ctx: ctx})
+      return withSuperJsonProps(withDehydratedState(result, queryClient))
+    }
 
   const api =
     (handler: BlitzAPIHandler): NextApiHandler =>
@@ -74,7 +110,9 @@ export const setupBlitzServer = ({plugins}: SetupBlitzOptions) => {
 }
 
 import type {NextConfig} from "next"
-import {installWebpackConfig} from "@blitzjs/rpc"
+import {getQueryKey, installWebpackConfig} from "@blitzjs/rpc"
+import {dehydrate} from "@blitzjs/rpc"
+import {DefaultOptions, QueryClient} from "react-query"
 
 export function withBlitz(nextConfig: NextConfig = {}) {
   return Object.assign({}, nextConfig, {
@@ -87,3 +125,25 @@ export function withBlitz(nextConfig: NextConfig = {}) {
     },
   } as NextConfig)
 }
+
+type PrefetchQueryFn = <T extends AsyncFunc, TInput = FirstParam<T>>(
+  resolver: T,
+  params: TInput,
+  options?: DefaultOptions,
+) => Promise<void>
+
+type Result = Partial<GetServerSidePropsResult<any> & GetStaticPropsResult<any>>
+
+function withDehydratedState<T extends Result>(result: T, queryClient: QueryClient | null) {
+  if (!queryClient) {
+    return result
+  }
+  const dehydratedProps = dehydrate(queryClient)
+  return {...result, props: {...("props" in result ? result.props : undefined), dehydratedProps}}
+}
+
+declare module "blitz" {
+  export interface Ctx {
+    prefetchBlitzQuery: PrefetchQueryFn
+  }
+}

packages/blitz-next/src/superjson.tsx

@@ -1,10 +1,5 @@
 import hoistNonReactStatics from "hoist-non-react-statics"
-import type {
-  GetServerSideProps,
-  GetServerSidePropsResult,
-  GetStaticProps,
-  GetStaticPropsResult,
-} from "next"
+import type {GetServerSidePropsResult, GetStaticPropsResult} from "next"
 import * as React from "react"
 import SuperJSON from "superjson"
 
@@ -12,10 +7,9 @@ export type SuperJSONProps<P = any> = P & {
   _superjson?: any
 }
 
-function excludeProps<P>(
-  result: GetServerSidePropsResult<P> | GetStaticPropsResult<P>,
-  exclude: string[] = [],
-) {
+type Result = Partial<GetServerSidePropsResult<any> & GetStaticPropsResult<any>>
+
+export function withSuperJsonProps<T extends Result>(result: T, exclude: string[] = []) {
   if (!("props" in result)) {
     return result
   }
@@ -50,27 +44,6 @@ function excludeProps<P>(
   }
 }
 
-export function withSuperJSONPropsGssp<P>(
-  handler: GetServerSideProps<P>,
-  exclude: string[] = [],
-): GetServerSideProps<SuperJSONProps<P>> {
-  return async function withSuperJSON(...args) {
-    const result = await handler(...args)
-    return excludeProps(result, exclude)
-  }
-}
-
-export function withSuperJSONPropsGsp<P>(
-  handler: GetStaticProps<P>,
-  exclude: string[] = [],
-): GetStaticProps<P> {
-  return async function withSuperJSON(...args) {
-    const result = await handler(...args)
-
-    return excludeProps<any>(result, exclude)
-  }
-}
-
 export function deserializeProps<P>(serializedProps: SuperJSONProps<P>): P {
   const {_superjson, ...props} = serializedProps
   return SuperJSON.deserialize({json: props as any, meta: _superjson})

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @blitzjs/rpc
 
+## 2.0.0-alpha.23
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.23
+  - @blitzjs/auth@2.0.0-alpha.23
+
+## 2.0.0-alpha.22
+
+### Patch Changes
+
+- Updated dependencies
+- Updated dependencies [89bf993a]
+  - blitz@2.0.0-alpha.22
+  - @blitzjs/auth@2.0.0-alpha.22
+
 ## 2.0.0-alpha.21
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.0-alpha.23",
   "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,21 +20,21 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/auth": "2.0.0-alpha.21",
+    "@blitzjs/auth": "2.0.0-alpha.23",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
     "chalk": "^4.1.0",
     "debug": "4.3.3",
-    "react-query": "3.21.1",
+    "react-query": "3.39.0",
     "superjson": "1.8.0",
     "zod": "3.10.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.21",
+    "@blitzjs/config": "workspace:2.0.0-alpha.23",
     "@types/debug": "4.1.7",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.21",
+    "blitz": "2.0.0-alpha.23",
     "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.21",
+    "blitz": "2.0.0-alpha.23",
     "next": "*"
   },
   "publishConfig": {

packages/blitz/CHANGELOG.md

@@ -1,5 +1,29 @@
 # blitz
 
+## 2.0.0-alpha.23
+
+### Patch Changes
+
+- various improvements and fixes
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.23
+
+## 2.0.0-alpha.22
+
+### Patch Changes
+
+- - Add mounted check to withBlitz
+  - Upgrade @types/react, fix typings inside @blitzjs/next
+  - Support prefetchBlitzQuery in gSP and gSSP
+  - Add db seed cli command
+  - Add try/catch to changePassword mutation
+- 89bf993a: add `db seed` cli command
+- Updated dependencies [c5c727cb]
+- Updated dependencies [6ff9ec0d]
+- Updated dependencies [81b4b41a]
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.22
+
 ## 2.0.0-alpha.21
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.0-alpha.23",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.21",
+    "@blitzjs/generator": "2.0.0-alpha.23",
     "arg": "5.0.1",
     "chalk": "^4.1.0",
     "console-table-printer": "2.10.0",
@@ -44,10 +44,12 @@
     "resolve-cwd": "3.0.0",
     "resolve-from": "5.0.0",
     "superjson": "1.8.0",
+    "ts-node": "10.7.0",
+    "tsconfig-paths": "4.0.0",
     "tslog": "3.3.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.21",
+    "@blitzjs/config": "workspace:2.0.0-alpha.23",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",
@@ -58,7 +60,7 @@
     "@types/node-fetch": "2.6.1",
     "@types/npm-which": "3.0.1",
     "@types/prompts": "2.0.14",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "@types/test-listen": "1.1.0",
     "express": "4.17.3",

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

@@ -0,0 +1,90 @@
+import {CliCommand} from "../index"
+import arg from "arg"
+import {join} from "path"
+import {REGISTER_INSTANCE} from "ts-node"
+import chalk from "chalk"
+
+const args = arg(
+  {
+    // Types
+    "--help": Boolean,
+    "--env": String,
+    "--file": String,
+
+    // Aliases
+    "-h": "--help",
+    "-e": "--env",
+    "-f": "--file",
+  },
+  {
+    permissive: true,
+  },
+)
+
+const runSeed = async (seedBasePath: string) => {
+  if (!process[REGISTER_INSTANCE]) {
+    // During blitz interal dev, oclif automaticaly sets up ts-node so we have to check
+    require("ts-node").register({compilerOptions: {module: "commonjs"}})
+  }
+  require("tsconfig-paths/register")
+
+  const seedPath = join(process.cwd(), seedBasePath)
+  const dbPath = join(process.cwd(), "db/index")
+  console.log(chalk.magenta("Seeding database"))
+
+  let seeds: Function | undefined
+  try {
+    seeds = require(seedPath).default
+    if (seeds === undefined) {
+      throw new Error(`Couldn't find default export from ${seedBasePath}`)
+    }
+  } catch (err) {
+    console.log(chalk.red(`Couldn't import default from ${seedBasePath}`))
+    throw err
+  }
+
+  try {
+    console.log("\n" + "Seeding...")
+    seeds && (await seeds())
+  } catch (err) {
+    console.log(err)
+    throw err
+  }
+
+  const db = require(dbPath).db
+  await db.$disconnect()
+  console.log("Done Seeding")
+}
+
+const db: CliCommand = async () => {
+  let filePath = "db/seeds"
+
+  if (args["--file"]) {
+    filePath = args["--file"]
+  }
+
+  if (args["--help"]) {
+    console.log(`Run database commands
+    ${chalk.bold("seed")} Generated seeded data in database via Prisma.
+    `)
+  }
+
+  if (args["_"].slice(1)[0] && args["_"].slice(1)[0] === "seed") {
+    try {
+      return await runSeed(filePath)
+    } catch (err) {
+      console.log(chalk.red("Could not seed database:"))
+      console.log(err)
+      process.exit(1)
+    }
+  } else {
+    if (!args["--help"]) {
+      console.log("\nThat command is no longer available..")
+      console.log("For any prisma related commands, use the `blitz prisma` command instead:")
+      console.log("\n  `blitz prisma COMMAND`\n")
+    }
+    return
+  }
+}
+
+export {db}

packages/blitz/src/cli/index.ts

@@ -27,6 +27,7 @@ const commands: {[command: string]: () => Promise<CliCommand>} = {
   new: () => import("./commands/new").then((i) => i.newApp),
   generate: () => import("./commands/generate").then((i) => i.generate),
   codegen: () => import("./commands/codegen").then((i) => i.codegen),
+  db: () => import("./commands/db").then((i) => i.db),
 }
 
 const args = arg(commonArgs, {

packages/blitz/src/cli/utils/next-commands.ts

@@ -7,6 +7,7 @@ import {
   startCustomServer,
   buildCustomServer,
 } from "./next-utils"
+import {readBlitzConfig} from "../../server-utils"
 
 export async function build(config: ServerConfig) {
   const {rootFolder, nextBin, watch} = await normalize(config)
@@ -21,11 +22,8 @@ export async function dev(config: ServerConfig) {
   if (customServerExists()) {
     console.log("Using your custom server")
 
-    // todo
-    // const {loadConfigProduction} = await import("next/dist/server/config-shared")
-    // const blitzConfig = loadConfigProduction(config.rootFolder)
-    // const watch = blitzConfig.customServer?.hotReload ?? true
-    const watch = true
+    const blitzConfig = readBlitzConfig(rootFolder)
+    const watch = blitzConfig.customServer?.hotReload ?? true
 
     await startCustomServer(rootFolder, config, {watch})
   } else {

packages/blitz/src/server-utils.ts

@@ -0,0 +1,12 @@
+import * as fs from "fs"
+import * as path from "path"
+
+export function readBlitzConfig(rootFolder: string = process.cwd()) {
+  const packageJsonFile = fs.readFileSync(path.join(rootFolder, "package.json"), {
+    encoding: "utf8",
+    flag: "r",
+  })
+  const packageJson = JSON.parse(packageJsonFile)
+
+  return packageJson.blitz || {}
+}

packages/blitz/src/utils.ts

@@ -1,4 +1,6 @@
 import {Middleware} from "./index-server"
+import * as path from "path"
+import * as fs from "fs"
 
 export function assert(condition: any, message: string): asserts condition {
   if (!condition) throw new Error(message)

packages/config/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.23
+
+## 2.0.0-alpha.22
+
 ## 2.0.0-alpha.21
 
 ## 2.0.0-alpha.20

packages/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blitzjs/config",
   "private": true,
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.0-alpha.23",
   "license": "MIT",
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "5.9.1",

packages/generator/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.23
+
+### Patch Changes
+
+- various improvements and fixes
+
+## 2.0.0-alpha.22
+
+### Patch Changes
+
+- c5c727cb: add mounted check inside withBlitz
+- 6ff9ec0d: Upgrade @types/react, fix typings inside @blitzjs/next
+- 81b4b41a: add mounted check to app generator template
+- - Add mounted check to withBlitz
+  - Upgrade @types/react, fix typings inside @blitzjs/next
+  - Support prefetchBlitzQuery in gSP and gSSP
+  - Add db seed cli command
+  - Add try/catch to changePassword mutation
+
 ## 2.0.0-alpha.21
 
 ### Patch Changes

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.0-alpha.23",
   "scripts": {
     "dev": "watch unbuild src --wait=0.2",
     "build": "unbuild && pnpm build:templates",
@@ -45,7 +45,7 @@
     "vinyl": "2.2.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.21",
+    "@blitzjs/config": "2.0.0-alpha.23",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",
@@ -55,7 +55,7 @@
     "@types/mem-fs-editor": "7.0.1",
     "@types/pluralize": "0.0.29",
     "@types/prettier": "2.4.4",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "@types/vinyl": "2.0.6",
     "@typescript-eslint/eslint-plugin": "5.9.1",

packages/generator/templates/app/app/auth/mutations/changePassword.ts

@@ -1,4 +1,4 @@
-import { NotFoundError } from "blitz"
+import { NotFoundError, AuthenticationError } from "blitz"
 import { db } from "db"
 import { authenticateUser } from "./login"
 import { ChangePassword } from "../validations"
@@ -12,7 +12,14 @@ export default resolver.pipe(
     const user = await db.user.findFirst({ where: { id: ctx.session.userId as number } })
     if (!user) throw new NotFoundError()
 
-    await authenticateUser(user.email, currentPassword)
+   try {
+      await authenticateUser(user.email, currentPassword)
+    } catch (error: any) {
+      if (error instanceof AuthenticationError) {
+        throw new Error("Invalid Password")
+      }
+      throw error
+    }
 
     const hashedPassword = await SecurePassword.hash(newPassword.trim())
     await db.user.update({

packages/generator/templates/app/package.js.json

@@ -38,7 +38,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
     "@types/preview-email": "2.0.1",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "eslint": "7.32.0",
     "husky": "7.0.4",
     "jest": "27.5.1",

packages/generator/templates/app/package.ts.json

@@ -38,7 +38,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
     "@types/preview-email": "2.0.1",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "eslint": "7.32.0",
     "husky": "7.0.4",
     "jest": "27.5.1",

packages/generator/templates/app/pages/_app.tsx

@@ -1,7 +1,7 @@
 import {ErrorFallbackProps, ErrorComponent, ErrorBoundary} from "@blitzjs/next"
 import {AuthenticationError, AuthorizationError} from "blitz"
 import type {AppProps} from "next/app"
-import React, {Suspense} from "react"
+import React from "react"
 import {withBlitz} from "app/blitz-client"
 
 function RootErrorFallback({error}: ErrorFallbackProps) {
@@ -25,15 +25,9 @@ function RootErrorFallback({error}: ErrorFallbackProps) {
 }
 
 function MyApp({Component, pageProps}: AppProps) {
-  const [mounted, setMounted] = React.useState(false)
-  React.useEffect(() => {
-    setMounted(true)
-  }, [])
   return (
     <ErrorBoundary FallbackComponent={RootErrorFallback}>
-      {mounted && <Suspense fallback="Loading...">
-        <Component {...pageProps} />
-      </Suspense> }
+      <Component {...pageProps} />
     </ErrorBoundary>
   )
 }

packages/generator/templates/minimalapp/package.js.json

@@ -29,7 +29,7 @@
     "@next/bundle-analyzer": "12.0.8",
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "eslint": "7.32.0",
     "husky": "7.0.4",
     "jest": "27.5.1",

packages/generator/templates/minimalapp/package.ts.json

@@ -31,7 +31,7 @@
     "@next/bundle-analyzer": "12.0.8",
     "@types/jest": "27.4.1",
     "@types/node": "17.0.16",
-    "@types/react": "17.0.43",
+    "@types/react": "18.0.1",
     "eslint": "7.32.0",
     "husky": "7.0.4",
     "jest": "27.5.1",

packages/pkg-template/package.json

@@ -25,8 +25,8 @@
     "@typescript-eslint/parser": "5.9.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.21",
-    "@types/react": "17.0.43",
+    "@blitzjs/config": "2.0.0-alpha.23",
+    "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "react": "18.0.0",
     "typescript": "^4.5.3",

pnpm-lock.yaml

@@ -49,8 +49,8 @@ importers:
       "@types/jest": 27.4.1
       "@types/node": 17.0.16
       "@types/preview-email": 2.0.1
-      "@types/react": 17.0.43
-      blitz: workspace:2.0.0-alpha.21
+      "@types/react": 18.0.1
+      blitz: workspace:2.0.0-alpha.23
       eslint: 7.32.0
       husky: 7.0.4
       jest: 27.5.1
@@ -89,7 +89,7 @@ importers:
       "@types/jest": 27.4.1
       "@types/node": 17.0.16
       "@types/preview-email": 2.0.1
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       eslint: 7.32.0
       husky: 7.0.4
       jest: 27.5.1_ts-node@10.7.0
@@ -109,7 +109,7 @@ importers:
       "@next/bundle-analyzer": 12.0.8
       "@prisma/client": 3.9.0
       "@types/jest": 27.4.1
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       blitz: workspace:*
       eslint: 7.32.0
       jest: 27.5.1
@@ -135,7 +135,7 @@ importers:
       ts-node: 10.7.0_typescript@4.6.3
     devDependencies:
       "@next/bundle-analyzer": 12.0.8
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       eslint: 7.32.0
       typescript: 4.6.3
 
@@ -149,7 +149,7 @@ importers:
       "@types/express": 4.17.13
       "@types/fs-extra": 9.0.13
       "@types/node-fetch": 2.6.1
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       b64-lite: 1.4.0
       blitz: workspace:*
       eslint: 7.32.0
@@ -178,7 +178,7 @@ importers:
       "@types/express": 4.17.13
       "@types/fs-extra": 9.0.13
       "@types/node-fetch": 2.6.1
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       b64-lite: 1.4.0
       eslint: 7.32.0
       fs-extra: 10.0.1
@@ -194,7 +194,7 @@ importers:
       "@blitzjs/rpc": workspace:*
       "@prisma/client": 3.9.0
       "@testing-library/react": 13.0.0
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@vitejs/plugin-react": 1.3.0
       blitz: workspace:*
       delay: 5.0.0
@@ -206,7 +206,7 @@ importers:
       prisma: 3.9.0
       react: 18.0.0
       react-dom: 18.0.0
-      react-query: 3.21.1
+      react-query: 3.39.0
       typescript: ^4.5.3
     dependencies:
       "@blitzjs/auth": link:../../packages/blitz-auth
@@ -219,10 +219,10 @@ importers:
       prisma: 3.9.0
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
-      react-query: 3.21.1_react-dom@18.0.0+react@18.0.0
+      react-query: 3.39.0_react-dom@18.0.0+react@18.0.0
     devDependencies:
       "@testing-library/react": 13.0.0_react-dom@18.0.0+react@18.0.0
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@vitejs/plugin-react": 1.3.0
       delay: 5.0.0
       eslint: 7.32.0
@@ -240,7 +240,7 @@ importers:
       "@types/express": 4.17.13
       "@types/fs-extra": 9.0.13
       "@types/node-fetch": 2.6.1
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       b64-lite: 1.4.0
       blitz: workspace:*
       eslint: 7.32.0
@@ -262,7 +262,7 @@ importers:
       "@types/express": 4.17.13
       "@types/fs-extra": 9.0.13
       "@types/node-fetch": 2.6.1
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       b64-lite: 1.4.0
       eslint: 7.32.0
       fs-extra: 10.0.1
@@ -276,7 +276,7 @@ importers:
       "@types/express": 4.17.13
       "@types/fs-extra": 9.0.13
       "@types/node-fetch": 2.6.1
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/rimraf": 3.0.2
       "@types/selenium-webdriver": 4.0.18
       chromedriver: 100.0.0
@@ -288,7 +288,7 @@ importers:
       node-fetch: 3.2.3
       react: 18.0.0
       react-dom: 18.0.0
-      react-query: 3.21.1
+      react-query: 3.39.0
       rimraf: 3.0.2
       selenium-webdriver: 4.1.1
       tree-kill: 1.2.2
@@ -300,7 +300,7 @@ importers:
       "@types/express": 4.17.13
       "@types/fs-extra": 9.0.13
       "@types/node-fetch": 2.6.1
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/rimraf": 3.0.2
       "@types/selenium-webdriver": 4.0.18
       chromedriver: 100.0.0
@@ -312,7 +312,7 @@ importers:
       node-fetch: 3.2.3
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
-      react-query: 3.21.1_react-dom@18.0.0+react@18.0.0
+      react-query: 3.39.0_react-dom@18.0.0+react@18.0.0
       rimraf: 3.0.2
       selenium-webdriver: 4.1.1
       tree-kill: 1.2.2
@@ -320,8 +320,8 @@ importers:
 
   packages/blitz:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.21
-      "@blitzjs/generator": 2.0.0-alpha.21
+      "@blitzjs/config": workspace:2.0.0-alpha.23
+      "@blitzjs/generator": 2.0.0-alpha.23
       "@types/cookie": 0.4.1
       "@types/cross-spawn": 6.0.2
       "@types/debug": 4.1.7
@@ -332,7 +332,7 @@ importers:
       "@types/node-fetch": 2.6.1
       "@types/npm-which": 3.0.1
       "@types/prompts": 2.0.14
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@types/test-listen": 1.1.0
       arg: 5.0.1
@@ -359,6 +359,8 @@ importers:
       resolve-from: 5.0.0
       superjson: 1.8.0
       test-listen: 1.1.0
+      ts-node: 10.7.0
+      tsconfig-paths: 4.0.0
       tslog: 3.3.1
       typescript: ^4.5.3
       unbuild: 0.6.9
@@ -386,6 +388,8 @@ importers:
       resolve-cwd: 3.0.0
       resolve-from: 5.0.0
       superjson: 1.8.0
+      ts-node: 10.7.0_typescript@4.6.3
+      tsconfig-paths: 4.0.0
       tslog: 3.3.1
     devDependencies:
       "@blitzjs/config": link:../config
@@ -399,7 +403,7 @@ importers:
       "@types/node-fetch": 2.6.1
       "@types/npm-which": 3.0.1
       "@types/prompts": 2.0.14
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@types/test-listen": 1.1.0
       express: 4.17.3
@@ -413,19 +417,19 @@ importers:
 
   packages/blitz-auth:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.21
+      "@blitzjs/config": workspace:2.0.0-alpha.23
       "@testing-library/react": 13.0.0
       "@testing-library/react-hooks": 7.0.2
       "@types/b64-lite": 1.3.0
       "@types/cookie": 0.4.1
       "@types/debug": 4.1.7
       "@types/jsonwebtoken": 8.5.8
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@types/secure-password": 3.1.1
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.21
+      blitz: 2.0.0-alpha.23
       cookie: 0.4.1
       debug: 4.3.3
       http: 0.0.1-security
@@ -460,7 +464,7 @@ importers:
       "@types/cookie": 0.4.1
       "@types/debug": 4.1.7
       "@types/jsonwebtoken": 8.5.8
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
@@ -470,8 +474,8 @@ importers:
 
   packages/blitz-next:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.21
-      "@blitzjs/rpc": 2.0.0-alpha.21
+      "@blitzjs/config": workspace:2.0.0-alpha.23
+      "@blitzjs/rpc": 2.0.0-alpha.23
       "@testing-library/dom": 8.13.0
       "@testing-library/jest-dom": 5.16.3
       "@testing-library/react": 13.0.0
@@ -480,10 +484,10 @@ importers:
       "@types/hoist-non-react-statics": 3.3.1
       "@types/lodash.frompairs": 4.0.6
       "@types/node": 17.0.16
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@types/testing-library__react-hooks": 4.0.0
-      blitz: 2.0.0-alpha.21
+      blitz: 2.0.0-alpha.23
       cross-spawn: 7.0.3
       debug: 4.3.3
       find-up: 4.1.0
@@ -493,7 +497,7 @@ importers:
       next: 12.1.6-canary.17
       react: 18.0.0
       react-dom: 18.0.0
-      react-query: 3.21.1
+      react-query: 3.39.0
       resolve-from: 5.0.0
       superjson: 1.8.0
       ts-jest: 27.1.4
@@ -506,7 +510,7 @@ importers:
       debug: 4.3.3
       fs-extra: 10.0.1
       hoist-non-react-statics: 3.3.2
-      react-query: 3.21.1_react-dom@18.0.0+react@18.0.0
+      react-query: 3.39.0_react-dom@18.0.0+react@18.0.0
       superjson: 1.8.0
     devDependencies:
       "@blitzjs/config": link:../config
@@ -517,7 +521,7 @@ importers:
       "@testing-library/user-event": 13.5.0_@testing-library+dom@8.13.0
       "@types/lodash.frompairs": 4.0.6
       "@types/node": 17.0.16
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@types/testing-library__react-hooks": 4.0.0_react-dom@18.0.0+react@18.0.0
       blitz: link:../blitz
@@ -535,20 +539,20 @@ importers:
 
   packages/blitz-rpc:
     specifiers:
-      "@blitzjs/auth": 2.0.0-alpha.21
-      "@blitzjs/config": workspace:2.0.0-alpha.21
+      "@blitzjs/auth": 2.0.0-alpha.23
+      "@blitzjs/config": workspace:2.0.0-alpha.23
       "@types/debug": 4.1.7
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.21
+      blitz: 2.0.0-alpha.23
       chalk: ^4.1.0
       debug: 4.3.3
       next: 12.1.6-canary.17
       react: 18.0.0
       react-dom: 18.0.0
-      react-query: 3.21.1
+      react-query: 3.39.0
       superjson: 1.8.0
       typescript: ^4.5.3
       unbuild: 0.6.9
@@ -560,13 +564,13 @@ importers:
       bad-behavior: 1.0.1
       chalk: 4.1.2
       debug: 4.3.3
-      react-query: 3.21.1_react-dom@18.0.0+react@18.0.0
+      react-query: 3.39.0_react-dom@18.0.0+react@18.0.0
       superjson: 1.8.0
       zod: 3.10.1
     devDependencies:
       "@blitzjs/config": link:../config
       "@types/debug": 4.1.7
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       blitz: link:../blitz
       next: 12.1.6-canary.17_react-dom@18.0.0+react@18.0.0
@@ -597,7 +601,7 @@ importers:
       "@babel/plugin-transform-typescript": 7.12.1
       "@babel/preset-env": 7.12.10
       "@babel/types": 7.12.10
-      "@blitzjs/config": 2.0.0-alpha.21
+      "@blitzjs/config": 2.0.0-alpha.23
       "@juanm04/cpx": 2.0.1
       "@mrleebo/prisma-ast": 0.2.6
       "@types/babel__core": 7.1.19
@@ -608,7 +612,7 @@ importers:
       "@types/mem-fs-editor": 7.0.1
       "@types/pluralize": 0.0.29
       "@types/prettier": 2.4.4
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@types/vinyl": 2.0.6
       "@typescript-eslint/eslint-plugin": 5.9.1
@@ -673,7 +677,7 @@ importers:
       "@types/mem-fs-editor": 7.0.1
       "@types/pluralize": 0.0.29
       "@types/prettier": 2.4.4
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@types/vinyl": 2.0.6
       "@typescript-eslint/eslint-plugin": 5.9.1_8d4b52c6a654d64d1d8b695e9b6b2fe5
@@ -688,8 +692,8 @@ importers:
 
   packages/pkg-template:
     specifiers:
-      "@blitzjs/config": 2.0.0-alpha.21
-      "@types/react": 17.0.43
+      "@blitzjs/config": 2.0.0-alpha.23
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@typescript-eslint/eslint-plugin": 5.9.1
       "@typescript-eslint/parser": 5.9.1
@@ -702,7 +706,7 @@ importers:
       "@typescript-eslint/parser": 5.9.1_eslint@7.32.0+typescript@4.6.3
     devDependencies:
       "@blitzjs/config": link:../config
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       react: 18.0.0
       typescript: 4.6.3
@@ -718,7 +722,7 @@ packages:
     engines: {node: ">=6.0.0"}
     dependencies:
       "@jridgewell/gen-mapping": 0.1.1
-      "@jridgewell/trace-mapping": 0.3.9
+      "@jridgewell/trace-mapping": 0.3.10
 
   /@babel/code-frame/7.12.11:
     resolution:
@@ -2795,7 +2799,7 @@ packages:
       ajv: 6.12.6
       debug: 4.3.4
       espree: 7.3.1
-      globals: 13.13.0
+      globals: 13.14.0
       ignore: 4.0.6
       import-fresh: 3.3.0
       js-yaml: 3.14.1
@@ -3090,37 +3094,37 @@ packages:
       }
     engines: {node: ">=6.0.0"}
     dependencies:
-      "@jridgewell/set-array": 1.1.0
-      "@jridgewell/sourcemap-codec": 1.4.12
+      "@jridgewell/set-array": 1.1.1
+      "@jridgewell/sourcemap-codec": 1.4.13
 
-  /@jridgewell/resolve-uri/3.0.6:
+  /@jridgewell/resolve-uri/3.0.7:
     resolution:
       {
-        integrity: sha512-R7xHtBSNm+9SyvpJkdQl+qrM3Hm2fea3Ef197M3mUug+v+yR+Rhfbs7PBtcBUVnIWJ4JcAdjvij+c8hXS9p5aw==,
+        integrity: sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==,
       }
     engines: {node: ">=6.0.0"}
 
-  /@jridgewell/set-array/1.1.0:
+  /@jridgewell/set-array/1.1.1:
     resolution:
       {
-        integrity: sha512-SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg==,
+        integrity: sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==,
       }
     engines: {node: ">=6.0.0"}
 
-  /@jridgewell/sourcemap-codec/1.4.12:
+  /@jridgewell/sourcemap-codec/1.4.13:
     resolution:
       {
-        integrity: sha512-az/NhpIwP3K33ILr0T2bso+k2E/SLf8Yidd8mHl0n6sCQ4YdyC8qDhZA6kOPDNDBA56ZnIjngVl0U3jREA0BUA==,
+        integrity: sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==,
       }
 
-  /@jridgewell/trace-mapping/0.3.9:
+  /@jridgewell/trace-mapping/0.3.10:
     resolution:
       {
-        integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==,
+        integrity: sha512-Q0YbBd6OTsXm8Y21+YUSDXupHnodNC2M4O18jtd3iwJ3+vMZNdKGols0a9G6JOK0dcJ3IdUUHoh908ZI6qhk8Q==,
       }
     dependencies:
-      "@jridgewell/resolve-uri": 3.0.6
-      "@jridgewell/sourcemap-codec": 1.4.12
+      "@jridgewell/resolve-uri": 3.0.7
+      "@jridgewell/sourcemap-codec": 1.4.13
 
   /@juanm04/cpx/2.0.1:
     resolution:
@@ -3692,7 +3696,7 @@ packages:
         optional: true
     dependencies:
       "@babel/runtime": 7.17.9
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@types/react-test-renderer": 18.0.0
       react: 18.0.0
@@ -3999,7 +4003,7 @@ packages:
         integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==,
       }
     dependencies:
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
       hoist-non-react-statics: 3.3.2
     dev: false
 
@@ -4050,6 +4054,16 @@ packages:
       jest-matcher-utils: 27.5.1
       pretty-format: 27.5.1
 
+  /@types/jest/27.5.0:
+    resolution:
+      {
+        integrity: sha512-9RBFx7r4k+msyj/arpfaa0WOOEcaAZNmN+j80KFbFCoSqCJGHTz7YMAMGQW9Xmqm5w6l5c25vbSjMwlikJi5+g==,
+      }
+    dependencies:
+      jest-matcher-utils: 27.5.1
+      pretty-format: 27.5.1
+    dev: true
+
   /@types/jscodeshift/0.11.2:
     resolution:
       {
@@ -4280,7 +4294,7 @@ packages:
         integrity: sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ==,
       }
     dependencies:
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
     dev: true
 
   /@types/react-test-renderer/18.0.0:
@@ -4289,13 +4303,13 @@ packages:
         integrity: sha512-C7/5FBJ3g3sqUahguGi03O79b8afNeSD6T8/GU50oQrJCU0bVCCGQHaGKUbg2Ce8VQEEqTw8/HiS6lXHHdgkdQ==,
       }
     dependencies:
-      "@types/react": 17.0.43
+      "@types/react": 18.0.1
     dev: true
 
-  /@types/react/17.0.43:
+  /@types/react/18.0.1:
     resolution:
       {
-        integrity: sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A==,
+        integrity: sha512-VnWlrVgG0dYt+NqlfMI0yUYb8Rdl4XUROyH+c6gq/iFCiZ805Vi//26UW38DHnxQkbDhnrIWTBiy6oKZqL11cw==,
       }
     dependencies:
       "@types/prop-types": 15.7.5
@@ -4390,7 +4404,7 @@ packages:
         integrity: sha512-oKZe+Mf4ioWlMuzVBaXQ9WDnEm1+umLx0InILg+yvZVBBDmzV5KfZyLrCvadtWcx8+916jLmHafcmqqffl+iIw==,
       }
     dependencies:
-      "@types/jest": 27.4.1
+      "@types/jest": 27.5.0
     dev: true
 
   /@types/testing-library__react-hooks/4.0.0_react-dom@18.0.0+react@18.0.0:
@@ -4471,6 +4485,22 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@typescript-eslint/experimental-utils/5.23.0_eslint@7.32.0+typescript@4.6.3:
+    resolution:
+      {
+        integrity: sha512-I+3YGQztH1DM9kgWzjslpZzJCBMRz0KhYG2WP62IwpooeZ1L6Qt0mNK8zs+uP+R2HOsr+TeDW35Pitc3PfVv8Q==,
+      }
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      "@typescript-eslint/utils": 5.23.0_eslint@7.32.0+typescript@4.6.3
+      eslint: 7.32.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
   /@typescript-eslint/experimental-utils/5.9.1_eslint@7.32.0+typescript@4.6.3:
     resolution:
       {
@@ -4491,10 +4521,10 @@ packages:
       - supports-color
       - typescript
 
-  /@typescript-eslint/parser/5.22.0_eslint@7.32.0+typescript@4.6.3:
+  /@typescript-eslint/parser/5.23.0_eslint@7.32.0+typescript@4.6.3:
     resolution:
       {
-        integrity: sha512-piwC4krUpRDqPaPbFaycN70KCP87+PC5WZmrWs+DlVOxxmF+zI6b6hETv7Quy4s9wbkV16ikMeZgXsvzwI3icQ==,
+        integrity: sha512-V06cYUkqcGqpFjb8ttVgzNF53tgbB/KoQT/iB++DOIExKmzI9vBJKjZKt/6FuV9c+zrDsvJKbJ2DOCYwX91cbw==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -4504,9 +4534,9 @@ packages:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/scope-manager": 5.22.0
-      "@typescript-eslint/types": 5.22.0
-      "@typescript-eslint/typescript-estree": 5.22.0_typescript@4.6.3
+      "@typescript-eslint/scope-manager": 5.23.0
+      "@typescript-eslint/types": 5.23.0
+      "@typescript-eslint/typescript-estree": 5.23.0_typescript@4.6.3
       debug: 4.3.4
       eslint: 7.32.0
       typescript: 4.6.3
@@ -4536,15 +4566,15 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@typescript-eslint/scope-manager/5.22.0:
+  /@typescript-eslint/scope-manager/5.23.0:
     resolution:
       {
-        integrity: sha512-yA9G5NJgV5esANJCO0oF15MkBO20mIskbZ8ijfmlKIvQKg0ynVKfHZ15/nhAJN5m8Jn3X5qkwriQCiUntC9AbA==,
+        integrity: sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      "@typescript-eslint/types": 5.22.0
-      "@typescript-eslint/visitor-keys": 5.22.0
+      "@typescript-eslint/types": 5.23.0
+      "@typescript-eslint/visitor-keys": 5.23.0
     dev: true
 
   /@typescript-eslint/scope-manager/5.9.1:
@@ -4578,10 +4608,10 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@typescript-eslint/types/5.22.0:
+  /@typescript-eslint/types/5.23.0:
     resolution:
       {
-        integrity: sha512-T7owcXW4l0v7NTijmjGWwWf/1JqdlWiBzPqzAWhobxft0SiEvMJB56QXmeCQjrPuM8zEfGUKyPQr/L8+cFUBLw==,
+        integrity: sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
@@ -4593,10 +4623,10 @@ packages:
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  /@typescript-eslint/typescript-estree/5.22.0_typescript@4.6.3:
+  /@typescript-eslint/typescript-estree/5.23.0_typescript@4.6.3:
     resolution:
       {
-        integrity: sha512-EyBEQxvNjg80yinGE2xdhpDYm41so/1kOItl0qrjIiJ1kX/L/L8WWGmJg8ni6eG3DwqmOzDqOhe6763bF92nOw==,
+        integrity: sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -4605,8 +4635,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/types": 5.22.0
-      "@typescript-eslint/visitor-keys": 5.22.0
+      "@typescript-eslint/types": 5.23.0
+      "@typescript-eslint/visitor-keys": 5.23.0
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
@@ -4640,14 +4670,35 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@typescript-eslint/visitor-keys/5.22.0:
+  /@typescript-eslint/utils/5.23.0_eslint@7.32.0+typescript@4.6.3:
     resolution:
       {
-        integrity: sha512-DbgTqn2Dv5RFWluG88tn0pP6Ex0ROF+dpDO1TNNZdRtLjUr6bdznjA6f/qNqJLjd2PgguAES2Zgxh/JzwzETDg==,
+        integrity: sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==,
+      }
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      "@types/json-schema": 7.0.11
+      "@typescript-eslint/scope-manager": 5.23.0
+      "@typescript-eslint/types": 5.23.0
+      "@typescript-eslint/typescript-estree": 5.23.0_typescript@4.6.3
+      eslint: 7.32.0
+      eslint-scope: 5.1.1
+      eslint-utils: 3.0.0_eslint@7.32.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/visitor-keys/5.23.0:
+    resolution:
+      {
+        integrity: sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      "@typescript-eslint/types": 5.22.0
+      "@typescript-eslint/types": 5.23.0
       eslint-visitor-keys: 3.3.0
     dev: true
 
@@ -4963,7 +5014,7 @@ packages:
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
-      es-abstract: 1.19.5
+      es-abstract: 1.20.0
       get-intrinsic: 1.1.1
       is-string: 1.0.7
 
@@ -5000,7 +5051,7 @@ packages:
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
-      es-abstract: 1.19.5
+      es-abstract: 1.20.0
       es-shim-unscopables: 1.0.0
 
   /array.prototype.flatmap/1.3.0:
@@ -5012,7 +5063,7 @@ packages:
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
-      es-abstract: 1.19.5
+      es-abstract: 1.20.0
       es-shim-unscopables: 1.0.0
 
   /arrify/1.0.1:
@@ -5451,8 +5502,8 @@ packages:
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
     dependencies:
-      caniuse-lite: 1.0.30001334
-      electron-to-chromium: 1.4.132
+      caniuse-lite: 1.0.30001338
+      electron-to-chromium: 1.4.137
       escalade: 3.1.1
       node-releases: 2.0.4
       picocolors: 1.0.0
@@ -5623,10 +5674,10 @@ packages:
       }
     engines: {node: ">=10"}
 
-  /caniuse-lite/1.0.30001334:
+  /caniuse-lite/1.0.30001338:
     resolution:
       {
-        integrity: sha512-kbaCEBRRVSoeNs74sCuq92MJyGrMtjWVfhltoHUCW4t4pXFvGjUBrfo47weBRViHkiV3eBYyIsfl956NtHGazw==,
+        integrity: sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ==,
       }
 
   /chai/4.3.6:
@@ -5991,10 +6042,10 @@ packages:
       }
     dev: false
 
-  /compress-brotli/1.3.6:
+  /compress-brotli/1.3.8:
     resolution:
       {
-        integrity: sha512-au99/GqZtUtiCBliqLFbWlhnCxn+XSYjwZ77q6mKN4La4qOXDoLVPZ50iXr0WmAyMxl8yqoq3Yq4OeQNPPkyeQ==,
+        integrity: sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==,
       }
     engines: {node: ">= 12"}
     dependencies:
@@ -6263,10 +6314,10 @@ packages:
       whatwg-mimetype: 3.0.0
       whatwg-url: 11.0.0
 
-  /dayjs/1.11.1:
+  /dayjs/1.11.2:
     resolution:
       {
-        integrity: sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==,
+        integrity: sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw==,
       }
     dev: true
 
@@ -6748,10 +6799,10 @@ packages:
       jake: 10.8.5
     dev: false
 
-  /electron-to-chromium/1.4.132:
+  /electron-to-chromium/1.4.137:
     resolution:
       {
-        integrity: sha512-JYdZUw/1068NWN+SwXQ7w6Ue0bWYGihvSUNNQwurvcDV/SM7vSiGZ3NuFvFgoEiCs4kB8xs3cX2an3wB7d4TBw==,
+        integrity: sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==,
       }
 
   /emittery/0.8.1:
@@ -6818,19 +6869,21 @@ packages:
     dependencies:
       is-arrayish: 0.2.1
 
-  /es-abstract/1.19.5:
+  /es-abstract/1.20.0:
     resolution:
       {
-        integrity: sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==,
+        integrity: sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==,
       }
     engines: {node: ">= 0.4"}
     dependencies:
       call-bind: 1.0.2
       es-to-primitive: 1.2.1
       function-bind: 1.1.1
+      function.prototype.name: 1.1.5
       get-intrinsic: 1.1.1
       get-symbol-description: 1.0.0
       has: 1.0.3
+      has-property-descriptors: 1.0.0
       has-symbols: 1.0.3
       internal-slot: 1.0.3
       is-callable: 1.2.4
@@ -6842,6 +6895,7 @@ packages:
       object-inspect: 1.12.0
       object-keys: 1.1.1
       object.assign: 4.1.2
+      regexp.prototype.flags: 1.4.3
       string.prototype.trimend: 1.0.5
       string.prototype.trimstart: 1.0.5
       unbox-primitive: 1.0.2
@@ -7695,7 +7749,7 @@ packages:
     dependencies:
       "@next/eslint-plugin-next": 12.1.6
       "@rushstack/eslint-patch": 1.1.3
-      "@typescript-eslint/parser": 5.22.0_eslint@7.32.0+typescript@4.6.3
+      "@typescript-eslint/parser": 5.23.0_eslint@7.32.0+typescript@4.6.3
       eslint: 7.32.0
       eslint-import-resolver-node: 0.3.6
       eslint-import-resolver-typescript: 2.7.1_3bd94fa9be989baab6ef2e6b5dec3766
@@ -7836,7 +7890,7 @@ packages:
       minimatch: 3.1.2
       object.entries: 1.1.5
       object.fromentries: 2.0.5
-      object.hasown: 1.1.0
+      object.hasown: 1.1.1
       object.values: 1.1.5
       prop-types: 15.8.1
       resolve: 2.0.0-next.3
@@ -7852,7 +7906,7 @@ packages:
     peerDependencies:
       eslint: ^7.5.0 || ^8.0.0
     dependencies:
-      "@typescript-eslint/experimental-utils": 5.9.1_eslint@7.32.0+typescript@4.6.3
+      "@typescript-eslint/experimental-utils": 5.23.0_eslint@7.32.0+typescript@4.6.3
       eslint: 7.32.0
     transitivePeerDependencies:
       - supports-color
@@ -7939,7 +7993,7 @@ packages:
       file-entry-cache: 6.0.1
       functional-red-black-tree: 1.0.1
       glob-parent: 5.1.2
-      globals: 13.13.0
+      globals: 13.14.0
       ignore: 4.0.6
       import-fresh: 3.3.0
       imurmurhash: 0.1.4
@@ -8602,6 +8656,18 @@ packages:
         integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==,
       }
 
+  /function.prototype.name/1.1.5:
+    resolution:
+      {
+        integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==,
+      }
+    engines: {node: ">= 0.4"}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+      functions-have-names: 1.2.3
+
   /functional-red-black-tree/1.0.1:
     resolution: {integrity: sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=}
 
@@ -8767,10 +8833,10 @@ packages:
       }
     engines: {node: ">=4"}
 
-  /globals/13.13.0:
+  /globals/13.14.0:
     resolution:
       {
-        integrity: sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==,
+        integrity: sha512-ERO68sOYwm5UuLvSJTY7w7NP2c8S4UcXs3X1GBX8cwOr+ShOcDBbCY5mH4zxz0jsYCdJ8ve8Mv9n2YGJMB1aeg==,
       }
     engines: {node: ">=8"}
     dependencies:
@@ -10593,7 +10659,7 @@ packages:
       lodash.isplainobject: 4.0.6
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
-      ms: 2.1.2
+      ms: 2.1.3
       semver: 5.7.1
     dev: false
 
@@ -10662,7 +10728,7 @@ packages:
         integrity: sha512-uYS0vKTlBIjNCAUqrjlxmruxOEiZxZIHXyp32sdcGmP+ukFrmWUnE//RcPXJH3Vxrni1H2gsQbjHE0bH7MtMQQ==,
       }
     dependencies:
-      compress-brotli: 1.3.6
+      compress-brotli: 1.3.8
       json-buffer: 3.0.1
     dev: false
 
@@ -11549,10 +11615,10 @@ packages:
     hasBin: true
     dev: false
 
-  /nanoid/3.3.3:
+  /nanoid/3.3.4:
     resolution:
       {
-        integrity: sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==,
+        integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==,
       }
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
@@ -11630,7 +11696,7 @@ packages:
         optional: true
     dependencies:
       "@next/env": 12.1.6-canary.17
-      caniuse-lite: 1.0.30001334
+      caniuse-lite: 1.0.30001338
       postcss: 8.4.5
       styled-jsx: 5.0.2
     optionalDependencies:
@@ -11673,7 +11739,7 @@ packages:
         optional: true
     dependencies:
       "@next/env": 12.1.6-canary.17
-      caniuse-lite: 1.0.30001334
+      caniuse-lite: 1.0.30001338
       postcss: 8.4.5
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
@@ -11894,7 +11960,7 @@ packages:
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
-      es-abstract: 1.19.5
+      es-abstract: 1.20.0
 
   /object.fromentries/2.0.5:
     resolution:
@@ -11905,16 +11971,16 @@ packages:
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
-      es-abstract: 1.19.5
+      es-abstract: 1.20.0
 
-  /object.hasown/1.1.0:
+  /object.hasown/1.1.1:
     resolution:
       {
-        integrity: sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==,
+        integrity: sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==,
       }
     dependencies:
       define-properties: 1.1.4
-      es-abstract: 1.19.5
+      es-abstract: 1.20.0
 
   /object.pick/1.3.0:
     resolution: {integrity: sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=}
@@ -11932,7 +11998,7 @@ packages:
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
-      es-abstract: 1.19.5
+      es-abstract: 1.20.0
 
   /oblivious-set/1.0.0:
     resolution:
@@ -12485,7 +12551,7 @@ packages:
       }
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
-      nanoid: 3.3.3
+      nanoid: 3.3.4
       picocolors: 1.0.0
       source-map-js: 1.0.2
     dev: false
@@ -12497,7 +12563,7 @@ packages:
       }
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
-      nanoid: 3.3.3
+      nanoid: 3.3.4
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
@@ -12603,7 +12669,7 @@ packages:
       }
     engines: {node: ">=10"}
     dependencies:
-      dayjs: 1.11.1
+      dayjs: 1.11.2
       debug: 4.3.4
       mailparser: 3.5.0
       nodemailer: 6.7.5
@@ -12982,13 +13048,13 @@ packages:
         integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==,
       }
 
-  /react-query/3.21.1_react-dom@18.0.0+react@18.0.0:
+  /react-query/3.39.0_react-dom@18.0.0+react@18.0.0:
     resolution:
       {
-        integrity: sha512-aKFLfNJc/m21JBXJk7sR9tDUYPjotWA4EHAKvbZ++GgxaY+eI0tqBxXmGBuJo0Pisis1W4pZWlZgoRv9yE8yjA==,
+        integrity: sha512-Od0IkSuS79WJOhzWBx/ys0x13+7wFqgnn64vBqqAAnZ9whocVhl/y1padD5uuZ6EIkXbFbInax0qvY7zGM0thA==,
       }
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: "*"
       react-native: "*"
     peerDependenciesMeta:
@@ -14076,7 +14142,7 @@ packages:
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
-      es-abstract: 1.19.5
+      es-abstract: 1.20.0
       get-intrinsic: 1.1.1
       has-symbols: 1.0.3
       internal-slot: 1.0.3
@@ -14091,7 +14157,7 @@ packages:
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
-      es-abstract: 1.19.5
+      es-abstract: 1.20.0
 
   /string.prototype.trimstart/1.0.5:
     resolution:
@@ -14101,7 +14167,7 @@ packages:
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
-      es-abstract: 1.19.5
+      es-abstract: 1.20.0
 
   /string_decoder/1.1.1:
     resolution:
@@ -14694,6 +14760,17 @@ packages:
       minimist: 1.2.6
       strip-bom: 3.0.0
 
+  /tsconfig-paths/4.0.0:
+    resolution:
+      {
+        integrity: sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==,
+      }
+    dependencies:
+      json5: 2.2.1
+      minimist: 1.2.6
+      strip-bom: 3.0.0
+    dev: false
+
   /tslib/1.14.1:
     resolution:
       {
@@ -15275,10 +15352,10 @@ packages:
       replace-ext: 1.0.1
     dev: false
 
-  /vite/2.9.7:
+  /vite/2.9.8:
     resolution:
       {
-        integrity: sha512-5hH7aNQe8rJiTTqCtPNX/6mIKlGw+1wg8UXwAxDIIN8XaSR+Zx3GT2zSu7QKa1vIaBqfUODGh3vpwY8r0AW/jw==,
+        integrity: sha512-zsBGwn5UT3YS0NLSJ7hnR54+vUKfgzMUh/Z9CxF1YKEBVIe213+63jrFLmZphgGI5zXwQCSmqIdbPuE8NJywPw==,
       }
     engines: {node: ">=12.2.0"}
     hasBin: true
@@ -15331,7 +15408,7 @@ packages:
       local-pkg: 0.4.1
       tinypool: 0.1.3
       tinyspy: 0.3.2
-      vite: 2.9.7
+      vite: 2.9.8
     transitivePeerDependencies:
       - less
       - sass