pnpmlock

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

.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/good-insects-wink.md

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

.changeset/nervous-beds-travel.md

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

.changeset/pre.json

@@ -27,12 +27,16 @@
     "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",
@@ -41,6 +45,7 @@
     "lucky-cows-try",
     "modern-cameras-pull",
     "moody-squids-cheer",
+    "nervous-beds-travel",
     "nice-starfishes-live",
     "nine-onions-admire",
     "ninety-pets-heal",
@@ -50,7 +55,9 @@
     "poor-peas-lick",
     "poor-penguins-look",
     "poor-shrimps-think",
+    "purple-singers-greet",
     "quiet-feet-travel",
+    "quiet-pans-hunt",
     "rich-chairs-invent",
     "sharp-falcons-begin",
     "shy-olives-hang",
@@ -58,6 +65,7 @@
     "small-socks-confess",
     "stupid-walls-sell",
     "swift-drinks-dress",
+    "tame-keys-reply",
     "tasty-news-collect",
     "ten-rivers-burn",
     "tender-pianos-check",
@@ -65,6 +73,7 @@
     "thirty-countries-build",
     "twenty-beans-pump",
     "two-kiwis-help",
+    "two-tigers-type",
     "unlucky-papayas-sleep",
     "violet-bags-leave",
     "violet-lions-help",

.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/tame-keys-reply.md

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

.changeset/two-tigers-type.md

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

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

@@ -2,7 +2,7 @@ import { AuthClientPlugin } from "@blitzjs/auth"
 import { setupBlitzClient } from "@blitzjs/next"
 import { BlitzRpcPlugin } from "@blitzjs/rpc"
 
-export const { withBlitz, queryClient } = setupBlitzClient({
+export const { withBlitz } = setupBlitzClient({
   plugins: [
     AuthClientPlugin({
       cookiePrefix: "web-cookie-prefix",

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.37",
+    "blitz": "workspace:2.0.0-alpha.45",
     "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",

apps/web/app/blitz-client.ts

@@ -2,7 +2,7 @@ import {AuthClientPlugin} from "@blitzjs/auth"
 import {setupBlitzClient} from "@blitzjs/next"
 import {BlitzRpcPlugin} from "@blitzjs/rpc"
 
-const {withBlitz, queryClient} = setupBlitzClient({
+const {withBlitz} = setupBlitzClient({
   plugins: [
     AuthClientPlugin({
       cookiePrefix: "webapp-cookie-prefix",
@@ -17,4 +17,4 @@ const {withBlitz, queryClient} = setupBlitzClient({
   ],
 })
 
-export {withBlitz, queryClient}
+export {withBlitz}

packages/blitz-auth/CHANGELOG.md

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

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.37",
+  "version": "2.0.0-alpha.45",
   "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.37",
+    "blitz": "2.0.0-alpha.45",
     "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.37",
+    "@blitzjs/config": "workspace:2.0.0-alpha.45",
     "@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-next/CHANGELOG.md

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

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.37",
+  "version": "2.0.0-alpha.45",
   "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.37",
+    "@blitzjs/rpc": "2.0.0-alpha.45",
     "@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.37",
+    "@blitzjs/config": "workspace:2.0.0-alpha.45",
     "@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.37",
+    "blitz": "2.0.0-alpha.45",
     "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

@@ -22,6 +22,7 @@ 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"
 
 export * from "./index-browser"
 
@@ -41,12 +42,14 @@ type SetupBlitzOptions = {
   plugins: BlitzServerPlugin<RequestMiddleware, Ctx>[]
 }
 
-export type BlitzGSSPHandler<TProps> = ({
+export type BlitzGSSPHandler<TProps, Query extends ParsedUrlQuery = ParsedUrlQuery> = ({
   ctx,
   req,
   res,
   ...args
-}: Parameters<GetServerSideProps<TProps>>[0] & {ctx: Ctx}) => ReturnType<GetServerSideProps<TProps>>
+}: Parameters<GetServerSideProps<TProps>>[0] & {ctx: Ctx}) => ReturnType<
+  GetServerSideProps<TProps, Query>
+>
 
 export type BlitzGSPHandler<TProps> = ({
   ctx,
@@ -64,7 +67,9 @@ export const setupBlitzServer = ({plugins}: SetupBlitzOptions) => {
   const contextMiddleware = plugins.flatMap((p) => p.contextMiddleware).filter(Boolean)
 
   const gSSP =
-    <TProps>(handler: BlitzGSSPHandler<TProps>): GetServerSideProps<TProps> =>
+    <TProps, Query extends ParsedUrlQuery = ParsedUrlQuery>(
+      handler: BlitzGSSPHandler<TProps, Query>,
+    ): GetServerSideProps<TProps> =>
     async ({req, res, ...rest}) => {
       await handleRequestWithMiddleware<IncomingMessage, ServerResponse>(req, res, middlewares)
       const ctx = contextMiddleware.reduceRight(

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,65 @@
 # @blitzjs/rpc
 
+## 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

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.37",
+  "version": "2.0.0-alpha.45",
   "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.37",
+    "@blitzjs/auth": "2.0.0-alpha.45",
     "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.37",
+    "@blitzjs/config": "workspace:2.0.0-alpha.45",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.37",
+    "blitz": "2.0.0-alpha.45",
     "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.37",
+    "blitz": "2.0.0-alpha.45",
     "next": "*"
   },
   "publishConfig": {

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

@@ -6,7 +6,7 @@ export {
   getInfiniteQueryKey,
   invalidateQuery,
   setQueryData,
-  queryClient,
+  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

@@ -3,7 +3,7 @@ import {addBasePath} from "next/dist/shared/lib/router/router"
 import {deserialize, serialize} from "superjson"
 import {SuperJSONResult} from "superjson/dist/types"
 import {CSRFTokenMismatchError, isServer} from "blitz"
-import {getQueryKeyFromUrlAndParams, queryClient} from "./react-query-utils"
+import {getQueryKeyFromUrlAndParams, getQueryClient} from "./react-query-utils"
 import {
   getAntiCSRFToken,
   getPublicDataStore,
@@ -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/test/unit/react-query-utils.unit.test.ts

@@ -3,13 +3,14 @@
  */
 import {assert, expect, test, beforeEach, describe, spyOn, it} from "vitest"
 
-import {queryClient, invalidateQuery, setQueryData} from "../../src/data-client"
+import {getQueryClient, invalidateQuery, setQueryData} from "../../src/data-client"
 
 import {
   getQueryCacheFunctions,
   initializeQueryClient,
 } from "../../src/data-client/react-query-utils"
 import {buildQueryRpc} from "../blitz-test-utils"
+globalThis.queryClient = initializeQueryClient()
 
 // eslint-disable-next-line require-await
 const isEmpty = async (arg: string): Promise<boolean> => {
@@ -17,7 +18,7 @@ const isEmpty = async (arg: string): Promise<boolean> => {
 }
 
 describe("getQueryCacheFunctions", () => {
-  const spyRefetchQueries = spyOn(queryClient, "invalidateQueries")
+  const spyRefetchQueries = spyOn(getQueryClient(), "invalidateQueries")
 
   beforeEach(() => {
     spyRefetchQueries.mockReset()
@@ -50,7 +51,7 @@ describe("getQueryCacheFunctions", () => {
 })
 
 describe("invalidateQuery", () => {
-  const spyRefetchQueries = spyOn(queryClient, "invalidateQueries")
+  const spyRefetchQueries = spyOn(getQueryClient(), "invalidateQueries")
 
   beforeEach(() => {
     spyRefetchQueries.mockReset()
@@ -59,15 +60,15 @@ describe("invalidateQuery", () => {
   it("invalidates a query given resolver and params", async () => {
     await invalidateQuery(buildQueryRpc(isEmpty), "a")
     expect(spyRefetchQueries).toBeCalledTimes(1)
-    const calledWith = spyRefetchQueries.mock.calls[0][0] as any
+    const calledWith = spyRefetchQueries.mock.calls[0]![0] as any
     // json of the queryKey is "a"
     expect(calledWith[1].json).toEqual("a")
   })
 })
 
 describe("setQueryData", () => {
-  const spyRefetchQueries = spyOn(queryClient, "invalidateQueries")
-  const spySetQueryData = spyOn(queryClient, "setQueryData")
+  const spyRefetchQueries = spyOn(getQueryClient(), "invalidateQueries")
+  const spySetQueryData = spyOn(getQueryClient(), "setQueryData")
 
   beforeEach(() => {
     spyRefetchQueries.mockReset()
@@ -91,7 +92,7 @@ describe("setQueryData", () => {
     expect(spyRefetchQueries).toBeCalledTimes(1)
     expect(spySetQueryData).toBeCalledTimes(1)
 
-    const invalidateCalledWith = spyRefetchQueries.mock.calls[0][0] as any
+    const invalidateCalledWith = spyRefetchQueries.mock.calls[0]![0] as any
     expect(invalidateCalledWith[1].json).toEqual("params")
 
     const calledWith = spySetQueryData.mock.calls[0] as Array<any>

packages/blitz/CHANGELOG.md

@@ -1,5 +1,56 @@
 # blitz
 
+## 2.0.0-alpha.45
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.45
+
+## 2.0.0-alpha.44
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.44
+
+## 2.0.0-alpha.43
+
+### Patch Changes
+
+- 527e48ac: Fix running bin commands with Blitz CLI
+  - @blitzjs/generator@2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
+### Patch Changes
+
+- b918055b: Add aliases for Blitz CLI commands
+  - @blitzjs/generator@2.0.0-alpha.39
+
+## 2.0.0-alpha.38
+
+### Patch Changes
+
+- Updated dependencies [8aee25c5]
+  - @blitzjs/generator@2.0.0-alpha.38
+
 ## 2.0.0-alpha.37
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-alpha.37",
+  "version": "2.0.0-alpha.45",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.37",
+    "@blitzjs/generator": "2.0.0-alpha.45",
     "arg": "5.0.1",
     "chalk": "^4.1.0",
     "console-table-printer": "2.10.0",
@@ -52,7 +52,7 @@
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.37",
+    "@blitzjs/config": "workspace:2.0.0-alpha.45",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

packages/blitz/src/cli/index.ts

@@ -1,6 +1,5 @@
 import {NON_STANDARD_NODE_ENV} from "./utils/constants"
 import arg from "arg"
-import packageJson from "../../package.json"
 import {loadEnvConfig} from "../env-utils"
 import {getCommandBin} from "./utils/config"
 import spawn from "cross-spawn"
@@ -10,7 +9,7 @@ import pkgDir from "pkg-dir"
 import {join} from "path"
 
 const commonArgs = {
-  // Types
+  // Flags
   "--version": Boolean,
   "--help": Boolean,
   "--inspect": Boolean,
@@ -25,9 +24,9 @@ const args = arg(commonArgs, {
   permissive: true,
 })
 
-const defaultCommand = "dev"
 export type CliCommand = (argv?: string[]) => void
-const commands: {[command: string]: () => Promise<CliCommand>} = {
+
+const commands = {
   dev: () => import("./commands/next/dev").then((i) => i.dev),
   build: () => import("./commands/next/build").then((i) => i.build),
   start: () => import("./commands/next/start").then((i) => i.start),
@@ -36,28 +35,39 @@ const commands: {[command: string]: () => Promise<CliCommand>} = {
   codegen: () => import("./commands/codegen").then((i) => i.codegen),
   db: () => import("./commands/db").then((i) => i.db),
 }
-const foundCommand = Boolean(commands[args._[0] as string])
-const command = foundCommand ? (args._[0] as string) : defaultCommand
-const forwardedArgs = foundCommand ? args._.slice(1) : args._
+
+const aliases: Record<string, keyof typeof commands> = {
+  d: "dev",
+  b: "build",
+  s: "start",
+  n: "new",
+  g: "generate",
+}
+
+type Command = keyof typeof commands
+type Alias = keyof typeof aliases
+
+let blitzCommand: Command | undefined
+if (commands[args._[0] as Command]) {
+  blitzCommand = args._[0] as Command
+}
+if (aliases[args._[0] as Alias]) {
+  blitzCommand = aliases[args._[0] as Alias]
+}
+
+const forwardedArgs = blitzCommand ? args._.slice(1) : args._
 
 const globalBlitzPath = resolveFrom(__dirname, "blitz")
 const localBlitzPath = resolveFrom.silent(process.cwd(), "blitz")
 
-const isInDevelopmentAsGloballyLinked = __dirname.includes("packages/blitz/dist")
-
-let blitzPkgPath
-if (isInDevelopmentAsGloballyLinked) {
-  blitzPkgPath = globalBlitzPath
-} else {
-  // localBlitzPath won't exist if used outside a blitz app directory
-  blitzPkgPath = localBlitzPath || globalBlitzPath
-}
-
 async function runCommandFromBin() {
-  const command = args._[0] as string
+  if (!args._[0]) {
+    console.log("No command specified")
+    process.exit(1)
+  }
   let commandBin: string | null = null
   try {
-    commandBin = await getCommandBin(command)
+    commandBin = await getCommandBin(args._[0])
   } catch (e: any) {
     console.error(`Error: ${e.message}`)
   }
@@ -96,10 +106,10 @@ async function printEnvInfo() {
     {showNotFound: true},
   )
 
-  const globalBlitzPkgJsonPath = pkgDir.sync(globalBlitzPath) as string
+  const globalBlitzPkgJsonPath = pkgDir.sync(globalBlitzPath)
   const localBlitzPkgJsonPath = pkgDir.sync(localBlitzPath)
 
-  if (globalBlitzPkgJsonPath !== localBlitzPkgJsonPath) {
+  if (globalBlitzPkgJsonPath && globalBlitzPkgJsonPath !== localBlitzPkgJsonPath) {
     // This branch won't run if user does `npx blitz` or `yarn blitz`
     const globalVersion = require(join(globalBlitzPkgJsonPath, "package.json")).version
     console.log(`Blitz version: ${globalVersion} (global)`)
@@ -135,23 +145,26 @@ async function main() {
   }
 
   // env variable should default to dev unless the command is build or start
-  const defaultEnv = command === "build" || command === "start" ? "production" : "development"
+  const defaultEnv =
+    blitzCommand === "build" || blitzCommand === "start" ? "production" : "development"
 
   const standardEnv = ["production", "development", "test"]
   if (process.env.NODE_ENV && !standardEnv.includes(process.env.NODE_ENV)) {
     console.warn(NON_STANDARD_NODE_ENV)
   }
-  ;(process.env as any).NODE_ENV = process.env.NODE_ENV || defaultEnv
+
+  process.env.NODE_ENV = process.env.NODE_ENV || defaultEnv
 
   // Make sure commands gracefully respect termination signals (e.g. from Docker)
   process.on("SIGTERM", () => process.exit(0))
   process.on("SIGINT", () => process.exit(0))
 
-  if (foundCommand) {
-    commands[command]?.()
+  if (blitzCommand) {
+    const commandFn = commands[blitzCommand]
+    commandFn?.()
       .then((exec: any) => exec(forwardedArgs))
       .then(() => {
-        if (command === "build") {
+        if (blitzCommand === "build") {
           // ensure process exits after build completes so open handles/connections
           // don't cause process to hang
           process.exit(0)
@@ -162,13 +175,21 @@ async function main() {
       })
   } else {
     if (args["--help"] && args._.length === 0) {
+      // TODO: add back the generate command description once it's working
+      // generate, g     Generate new files for your Blitz project 🤠
+
       console.log(`
       Usage
         $ blitz <command>
   
       Available commands
-        ${Object.keys(commands).join(", ")}
-  
+        dev, d          Start a development server 🪄
+        build, b        Create a production build 🏗️
+        start, s        Start the production server 🐎
+        new, n          Create a new Blitz project ✨
+        codegen         Run the blitz codegen 🤖
+        db              Run database commands 🗄️
+        
       Options
         --env, -e       App environment name
         --version, -v   Version number

packages/codemod/CHANGELOG.md

@@ -1,5 +1,66 @@
 # @blitzjs/codemod
 
+## 2.0.0-alpha.45
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.45
+- blitz@2.0.0-alpha.45
+
+## 2.0.0-alpha.44
+
+### Patch Changes
+
+- @blitzjs/generator@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/generator@2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.42
+- blitz@2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+### Patch Changes
+
+- bbac7906: fix codemod for wrapping \_app arrow function & fix codemod for nested pages directory
+  - @blitzjs/generator@2.0.0-alpha.41
+  - blitz@2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+### Patch Changes
+
+- @blitzjs/generator@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/generator@2.0.0-alpha.39
+
+## 2.0.0-alpha.38
+
+### Patch Changes
+
+- 8aee25c5: getQueryClient function & queryClient codemod updates & shared plugin config
+- Updated dependencies [8aee25c5]
+  - @blitzjs/generator@2.0.0-alpha.38
+  - blitz@2.0.0-alpha.38
+
 ## 2.0.0-alpha.37
 
 ### Patch Changes

packages/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/codemod",
-  "version": "2.0.0-alpha.37",
+  "version": "2.0.0-alpha.45",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -25,9 +25,9 @@
     "@babel/plugin-proposal-class-properties": "7.17.12",
     "@babel/plugin-syntax-jsx": "7.17.12",
     "@babel/plugin-syntax-typescript": "7.17.12",
-    "@blitzjs/generator": "2.0.0-alpha.37",
+    "@blitzjs/generator": "2.0.0-alpha.45",
     "arg": "5.0.1",
-    "blitz": "2.0.0-alpha.37",
+    "blitz": "2.0.0-alpha.45",
     "chalk": "^4.1.0",
     "cross-spawn": "7.0.3",
     "debug": "4.3.3",

packages/codemod/src/upgrade-legacy.ts

@@ -145,7 +145,7 @@ const upgradeLegacy = async () => {
         usePaginatedQuery: "@blitzjs/rpc",
         useInfiniteQuery: "@blitzjs/rpc",
         useMutation: "@blitzjs/rpc",
-        queryClient: "app/blitz-client",
+        queryClient: "@blitzjs/rpc",
         getQueryKey: "@blitzjs/rpc",
         getInfiniteQueryKey: "@blitzjs/rpc",
         invalidateQuery: "@blitzjs/rpc",
@@ -266,6 +266,33 @@ const upgradeLegacy = async () => {
     },
   })
 
+  steps.push({
+    name: "change queryClient to getQueryClient()",
+    action: async () => {
+      getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
+        const filepath = path.resolve(appDir, file)
+        const program = getCollectionFromSource(filepath)
+
+        const findQueryClient = () => {
+          return program.find(j.Identifier, (node) => node.name === "queryClient")
+        }
+
+        findQueryClient().forEach((q) => {
+          switch (q.name) {
+            case "imported":
+              q.value.name = "getQueryClient"
+              break
+            case "object":
+              j(q).replaceWith(j.callExpression(j.identifier("getQueryClient"), []))
+              break
+          }
+        })
+
+        fs.writeFileSync(path.resolve(appDir, file), program.toSource())
+      })
+    },
+  })
+
   steps.push({
     name: "change BlitzApiRequest to NextApiRequest",
     action: async () => {
@@ -347,6 +374,35 @@ const upgradeLegacy = async () => {
     },
   })
 
+  steps.push({
+    name: "Add cookiePrefix to blitz server",
+    action: async () => {
+      const blitzConfigProgram = getCollectionFromSource(blitzConfigFile)
+      const cookieIdentifier = blitzConfigProgram.find(
+        j.Identifier,
+        (node) => node.name === "cookiePrefix",
+      )
+      if (cookieIdentifier.length) {
+        const cookiePrefix = cookieIdentifier.get().parentPath.value.value.value
+        const blitzClientProgram = getCollectionFromSource(
+          path.join(appDir, `blitz-client.${isTypescript ? "ts" : "js"}`),
+        )
+        const cookieIdentifierBlitzClient = blitzClientProgram.find(
+          j.Identifier,
+          (node) => node.name === "cookiePrefix",
+        )
+        cookieIdentifierBlitzClient.get().parentPath.value.value.value = cookiePrefix
+
+        fs.writeFileSync(
+          `${appDir}/blitz-client.${isTypescript ? "ts" : "js"}`,
+          blitzClientProgram.toSource(),
+        )
+      } else {
+        log.error("Cookie Prefix not found in blitz config file")
+      }
+    },
+  })
+
   steps.push({
     name: "create pages/api/rpc directory and add [[...blitz]].ts wildecard API route",
     action: async () => {
@@ -452,22 +508,41 @@ const upgradeLegacy = async () => {
         return pageDir
       }
 
-      getAllPagesDirs(appDir).forEach((pages, index) => {
+      getAllPagesDirs(appDir).forEach((pages) => {
         if (pages.subModel) {
-          fs.moveSync(pages.path, path.join(path.resolve("pages"), pages.model, pages.subModel))
+          // If the directory exists with a sub model (sub page directory), loop through the directory manually move each file/directory
+          if (fs.existsSync(path.join(path.resolve("pages"), pages.model))) {
+            let subs = fs.readdirSync(pages.path)
+            subs.forEach((sub) => {
+              fs.moveSync(
+                path.join(pages.path, sub),
+                path.join(path.resolve("pages"), pages.model, pages.subModel!, sub),
+              )
+            })
+          } else {
+            fs.moveSync(pages.path, path.join(path.resolve("pages"), pages.model, pages.subModel))
+          }
         } else {
-          fs.moveSync(pages.path, path.join(path.resolve("pages"), pages.model))
+          // If the directory exists without a sub model (sub page directory), loop through the directory manually move each file/directory
+          if (fs.existsSync(path.join(path.resolve("pages"), pages.model))) {
+            let subs = fs.readdirSync(pages.path)
+            subs.forEach((sub) => {
+              fs.moveSync(
+                path.join(pages.path, sub),
+                path.join(path.resolve("pages"), pages.model, sub),
+              )
+            })
+          } else {
+            fs.moveSync(pages.path, path.join(path.resolve("pages"), pages.model))
+          }
         }
+      })
 
-        // Delete left over pages directory
-        let subs = fs.readdirSync(path.join(appDir, pages.model))
-        // We can only delete a directory once 😅
-        if (
-          getAllPagesDirs(appDir)[index - 1]?.model !== getAllPagesDirs(appDir)[index]?.model &&
-          index === getAllPagesDirs(appDir).length &&
-          subs.includes("pages")
-        ) {
-          fs.removeSync(path.join(appDir, pages.model, "pages"))
+      //Clean up
+      getAllPagesDirs(appDir).forEach((page) => {
+        let subs = fs.readdirSync(path.join(appDir, page.model))
+        if (subs.includes("pages")) {
+          fs.removeSync(path.join(appDir, page.model, "pages"))
         }
       })
     },
@@ -683,19 +758,38 @@ const upgradeLegacy = async () => {
       const program = getCollectionFromSource(
         path.join(pagesDir, `_app.${isTypescript ? "tsx" : "jsx"}`),
       )
-
       const appFunction = program.find(j.FunctionDeclaration, (node) => {
         return node.id.name === "App"
       })
 
-      // Store the App function
-      const storeFunction = {...appFunction.get().value}
+      const appIdentifier = program.find(j.Identifier, (node) => {
+        return node.name === "App"
+      })
 
-      // Create a new withBlitz call expresion with an empty argument
-      const withBlitzFunction = (appFunction.get().parentPath.value.declaration =
-        j.expressionStatement(j.callExpression(j.identifier("withBlitz"), []))) as any
-      // Push stored function above into the argument
-      withBlitzFunction.expression.arguments.push(storeFunction)
+      if (appFunction.length) {
+        // Store the App function
+        const storeFunction = {...appFunction.get().value}
+        // Create a new withBlitz call expresion with an empty argument
+        const withBlitzFunction = (appFunction.get().parentPath.value.declaration =
+          j.expressionStatement(j.callExpression(j.identifier("withBlitz"), []))) as any
+        // Push stored function above into the argument
+        withBlitzFunction.expression.arguments.push(storeFunction)
+      } else if (appIdentifier.length) {
+        appIdentifier.forEach((a) => {
+          switch (a.name) {
+            case "declaration":
+              const storeFunction = {...a.get().value}
+              // Create a new withBlitz call expresion with an empty argument
+              const withBlitzFunction = (a.get().parentPath.value.declaration =
+                j.expressionStatement(j.callExpression(j.identifier("withBlitz"), []))) as any
+              // Push stored function above into the argument
+              withBlitzFunction.expression.arguments.push(storeFunction)
+              break
+          }
+        })
+      } else {
+        log.error("App function not found")
+      }
 
       addNamedImport(program, "withBlitz", "app/blitz-client")
 

packages/config/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.45
+
+## 2.0.0-alpha.44
+
+## 2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
+## 2.0.0-alpha.38
+
 ## 2.0.0-alpha.37
 
 ## 2.0.0-alpha.36

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.45
+
+## 2.0.0-alpha.44
+
+## 2.0.0-alpha.43
+
+## 2.0.0-alpha.42
+
+## 2.0.0-alpha.41
+
+## 2.0.0-alpha.40
+
+## 2.0.0-alpha.39
+
+## 2.0.0-alpha.38
+
+### Patch Changes
+
+- 8aee25c5: getQueryClient function & queryClient codemod updates & shared plugin config
+
 ## 2.0.0-alpha.37
 
 ## 2.0.0-alpha.36

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.37",
+  "version": "2.0.0-alpha.45",
   "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.37",
+    "@blitzjs/config": "2.0.0-alpha.45",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",

packages/generator/templates/app/app/blitz-client.ts

@@ -2,11 +2,13 @@ import { AuthClientPlugin } from "@blitzjs/auth"
 import { setupBlitzClient } from "@blitzjs/next"
 import { BlitzRpcPlugin } from "@blitzjs/rpc"
 
-export const { withBlitz, queryClient } = setupBlitzClient({
+export const authConfig = {
+  cookiePrefix: "__safeNameSlug__-cookie-prefix"
+}
+
+export const { withBlitz } = setupBlitzClient({
   plugins: [
-    AuthClientPlugin({
-      cookiePrefix: "__safeNameSlug__-cookie-prefix",
-    }),
+    AuthClientPlugin(authConfig),
     BlitzRpcPlugin({}),
   ],
 })

packages/generator/templates/app/app/blitz-server.ts

@@ -2,11 +2,12 @@ import { setupBlitzServer } from "@blitzjs/next"
 import { AuthServerPlugin, PrismaStorage } from "@blitzjs/auth"
 import db from "db"
 import { simpleRolesIsAuthorized } from "@blitzjs/auth"
+import { authConfig } from "./blitz-client"
 
 export const { gSSP, gSP, api } = setupBlitzServer({
   plugins: [
     AuthServerPlugin({
-      cookiePrefix: "__safeNameSlug__-cookie-prefix",
+      ...authConfig,
       storage: PrismaStorage(db as any),
       isAuthorized: simpleRolesIsAuthorized,
     }),

packages/pkg-template/package.json

@@ -25,7 +25,7 @@
     "@typescript-eslint/parser": "5.9.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.37",
+    "@blitzjs/config": "2.0.0-alpha.45",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "react": "18.0.0",

pnpm-lock.yaml

@@ -50,7 +50,7 @@ importers:
       "@types/node": 17.0.16
       "@types/preview-email": 2.0.1
       "@types/react": 18.0.1
-      blitz: workspace:2.0.0-alpha.37
+      blitz: workspace:2.0.0-alpha.45
       eslint: 7.32.0
       husky: 7.0.4
       jest: 27.5.1
@@ -432,8 +432,8 @@ importers:
 
   packages/blitz:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.37
-      "@blitzjs/generator": 2.0.0-alpha.37
+      "@blitzjs/config": workspace:2.0.0-alpha.45
+      "@blitzjs/generator": 2.0.0-alpha.45
       "@types/cookie": 0.4.1
       "@types/cross-spawn": 6.0.2
       "@types/debug": 4.1.7
@@ -539,7 +539,7 @@ importers:
 
   packages/blitz-auth:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.37
+      "@blitzjs/config": workspace:2.0.0-alpha.45
       "@testing-library/react": 13.0.0
       "@testing-library/react-hooks": 7.0.2
       "@types/b64-lite": 1.3.0
@@ -553,7 +553,7 @@ importers:
       "@types/secure-password": 3.1.1
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.37
+      blitz: 2.0.0-alpha.45
       cookie: 0.4.1
       cookie-session: 2.0.0
       debug: 4.3.3
@@ -604,26 +604,24 @@ importers:
 
   packages/blitz-next:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.37
-      "@blitzjs/rpc": 2.0.0-alpha.37
+      "@blitzjs/config": workspace:2.0.0-alpha.45
+      "@blitzjs/rpc": 2.0.0-alpha.45
       "@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/hoist-non-react-statics": 3.3.1
-      "@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.37
+      blitz: 2.0.0-alpha.45
       cross-spawn: 7.0.3
       debug: 4.3.3
       find-up: 4.1.0
       fs-extra: 10.0.1
       hoist-non-react-statics: 3.3.2
-      lodash.frompairs: 4.0.1
       next: 12.1.6-canary.17
       react: 18.0.0
       react-dom: 18.0.0
@@ -649,7 +647,6 @@ importers:
       "@testing-library/react": 13.0.0_zpnidt7m3osuk7shl3s4oenomq
       "@testing-library/react-hooks": 7.0.2_zpnidt7m3osuk7shl3s4oenomq
       "@testing-library/user-event": 13.5.0_tlwynutqiyp5mns3woioasuxnq
-      "@types/lodash.frompairs": 4.0.6
       "@types/node": 17.0.16
       "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
@@ -657,7 +654,6 @@ importers:
       blitz: link:../blitz
       cross-spawn: 7.0.3
       find-up: 4.1.0
-      lodash.frompairs: 4.0.1
       next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
@@ -669,14 +665,14 @@ importers:
 
   packages/blitz-rpc:
     specifiers:
-      "@blitzjs/auth": 2.0.0-alpha.37
-      "@blitzjs/config": workspace:2.0.0-alpha.37
+      "@blitzjs/auth": 2.0.0-alpha.45
+      "@blitzjs/config": workspace:2.0.0-alpha.45
       "@types/debug": 4.1.7
       "@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.37
+      blitz: 2.0.0-alpha.45
       chalk: ^4.1.0
       debug: 4.3.3
       next: 12.1.6-canary.17
@@ -718,12 +714,12 @@ importers:
       "@babel/plugin-syntax-typescript": 7.17.12
       "@babel/preset-env": 7.12.10
       "@blitzjs/config": workspace:*
-      "@blitzjs/generator": 2.0.0-alpha.37
+      "@blitzjs/generator": 2.0.0-alpha.45
       "@types/jscodeshift": 0.11.2
       "@types/node": 17.0.16
       arg: 5.0.1
       ast-types: 0.14.2
-      blitz: 2.0.0-alpha.37
+      blitz: 2.0.0-alpha.45
       chalk: ^4.1.0
       cross-spawn: 7.0.3
       debug: 4.3.3
@@ -778,7 +774,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.37
+      "@blitzjs/config": 2.0.0-alpha.45
       "@juanm04/cpx": 2.0.1
       "@mrleebo/prisma-ast": 0.2.6
       "@types/babel__core": 7.1.19
@@ -869,7 +865,7 @@ importers:
 
   packages/pkg-template:
     specifiers:
-      "@blitzjs/config": 2.0.0-alpha.37
+      "@blitzjs/config": 2.0.0-alpha.45
       "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@typescript-eslint/eslint-plugin": 5.9.1
@@ -2589,7 +2585,7 @@ packages:
       }
     engines: {node: ">=6.9.0"}
     dependencies:
-      core-js-pure: 3.22.8
+      core-js-pure: 3.23.0
       regenerator-runtime: 0.13.9
 
   /@babel/runtime/7.18.3:
@@ -2716,10 +2712,10 @@ packages:
       semver: 5.7.1
     dev: false
 
-  /@changesets/assemble-release-plan/5.1.2:
+  /@changesets/assemble-release-plan/5.1.3:
     resolution:
       {
-        integrity: sha512-nOFyDw4APSkY/vh5WNwGEtThPgEjVShp03PKVdId6wZTJALVcAALCSLmDRfeqjE2z9EsGJb7hZdDlziKlnqZgw==,
+        integrity: sha512-I+TTkUoqvxBEuDLoJfJYKDXIJ+nyiTbVJ8KGhpXEsLq4N/ms/AStSbouJwF2d/p3cB+RCPr5+gXh31GSN4kA7w==,
       }
     dependencies:
       "@babel/runtime": 7.18.3
@@ -2748,12 +2744,12 @@ packages:
     dependencies:
       "@babel/runtime": 7.18.3
       "@changesets/apply-release-plan": 6.0.0
-      "@changesets/assemble-release-plan": 5.1.2
+      "@changesets/assemble-release-plan": 5.1.3
       "@changesets/changelog-git": 0.1.11
       "@changesets/config": 2.0.0
       "@changesets/errors": 0.1.4
       "@changesets/get-dependents-graph": 1.3.2
-      "@changesets/get-release-plan": 3.0.8
+      "@changesets/get-release-plan": 3.0.9
       "@changesets/git": 1.3.2
       "@changesets/logger": 0.0.5
       "@changesets/pre": 1.0.11
@@ -2817,14 +2813,14 @@ packages:
       semver: 5.7.1
     dev: false
 
-  /@changesets/get-release-plan/3.0.8:
+  /@changesets/get-release-plan/3.0.9:
     resolution:
       {
-        integrity: sha512-TJYiWNuP0Lzu2dL/KHuk75w7TkiE5HqoYirrXF7SJIxkhlgH9toQf2C7IapiFTObtuF1qDN8HJAX1CuIOwXldg==,
+        integrity: sha512-5C1r4DcOjVxcCvPmXpymeyT6mdSTLCNiB2L+5uf19BRkDKndJdIQorH5Fe2XBR2nHUcZQFT+2TXDzCepat969w==,
       }
     dependencies:
       "@babel/runtime": 7.18.3
-      "@changesets/assemble-release-plan": 5.1.2
+      "@changesets/assemble-release-plan": 5.1.3
       "@changesets/config": 2.0.0
       "@changesets/pre": 1.0.11
       "@changesets/read": 0.5.5
@@ -3935,28 +3931,28 @@ packages:
       }
     engines: {node: ">= 10"}
 
-  /@tsconfig/node10/1.0.8:
+  /@tsconfig/node10/1.0.9:
     resolution:
       {
-        integrity: sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==,
+        integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==,
       }
 
-  /@tsconfig/node12/1.0.9:
+  /@tsconfig/node12/1.0.10:
     resolution:
       {
-        integrity: sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==,
+        integrity: sha512-N+srakvPaYMGkwjNDx3ASx65Zl3QG8dJgVtIB+YMOkucU+zctlv/hdP5250VKdDHSDoW9PFZoCqbqNcAPjCjXA==,
       }
 
-  /@tsconfig/node14/1.0.1:
+  /@tsconfig/node14/1.0.2:
     resolution:
       {
-        integrity: sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==,
+        integrity: sha512-YwrUA5ysDXHFYfL0Xed9x3sNS4P+aKlCOnnbqUa2E5HdQshHFleCJVrj1PlGTb4GgFUCDyte1v3JWLy2sz8Oqg==,
       }
 
-  /@tsconfig/node16/1.0.2:
+  /@tsconfig/node16/1.0.3:
     resolution:
       {
-        integrity: sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==,
+        integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==,
       }
 
   /@types/aria-query/4.2.2:
@@ -4324,22 +4320,6 @@ packages:
       "@types/node": 17.0.24
     dev: false
 
-  /@types/lodash.frompairs/4.0.6:
-    resolution:
-      {
-        integrity: sha512-rwCUf4NMKhXpiVjL/RXP8YOk+rd02/J4tACADEgaMXRVnzDbSSlBMKFZoX/ARmHVLg3Qc98Um4PErGv8FbxU7w==,
-      }
-    dependencies:
-      "@types/lodash": 4.14.182
-    dev: true
-
-  /@types/lodash/4.14.182:
-    resolution:
-      {
-        integrity: sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==,
-      }
-    dev: true
-
   /@types/mem-fs-editor/7.0.1:
     resolution:
       {
@@ -4774,16 +4754,16 @@ packages:
       - supports-color
     dev: false
 
-  /@typescript-eslint/experimental-utils/5.27.1_hrkuebk64jiu2ut2d2sm4oylnu:
+  /@typescript-eslint/experimental-utils/5.28.0_hrkuebk64jiu2ut2d2sm4oylnu:
     resolution:
       {
-        integrity: sha512-Vd8uewIixGP93sEnmTRIH6jHZYRQRkGPDPpapACMvitJKX8335VHNyqKTE+mZ+m3E2c5VznTZfSsSsS5IF7vUA==,
+        integrity: sha512-pPQ1Ng4qezQijXBBfYlogcOPnMs1q14l8C4fWJJ4PnFla4MA2b2oBfdkf02r1lNak2tpBVNJxvey9oWlPQWc4w==,
       }
     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.27.1_hrkuebk64jiu2ut2d2sm4oylnu
+      "@typescript-eslint/utils": 5.28.0_hrkuebk64jiu2ut2d2sm4oylnu
       eslint: 7.32.0
     transitivePeerDependencies:
       - supports-color
@@ -4831,10 +4811,10 @@ packages:
       - typescript
     dev: false
 
-  /@typescript-eslint/parser/5.27.1_hrkuebk64jiu2ut2d2sm4oylnu:
+  /@typescript-eslint/parser/5.28.0_hrkuebk64jiu2ut2d2sm4oylnu:
     resolution:
       {
-        integrity: sha512-7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ==,
+        integrity: sha512-ekqoNRNK1lAcKhZESN/PdpVsWbP9jtiNqzFWkp/yAUdZvJalw2heCYuqRmM5eUJSIYEkgq5sGOjq+ZqsLMjtRA==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -4844,9 +4824,9 @@ packages:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/scope-manager": 5.27.1
-      "@typescript-eslint/types": 5.27.1
-      "@typescript-eslint/typescript-estree": 5.27.1_typescript@4.6.3
+      "@typescript-eslint/scope-manager": 5.28.0
+      "@typescript-eslint/types": 5.28.0
+      "@typescript-eslint/typescript-estree": 5.28.0_typescript@4.6.3
       debug: 4.3.4
       eslint: 7.32.0
       typescript: 4.6.3
@@ -4899,15 +4879,15 @@ packages:
       - supports-color
     dev: false
 
-  /@typescript-eslint/scope-manager/5.27.1:
+  /@typescript-eslint/scope-manager/5.28.0:
     resolution:
       {
-        integrity: sha512-fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg==,
+        integrity: sha512-LeBLTqF/he1Z+boRhSqnso6YrzcKMTQ8bO/YKEe+6+O/JGof9M0g3IJlIsqfrK/6K03MlFIlycbf1uQR1IjE+w==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      "@typescript-eslint/types": 5.27.1
-      "@typescript-eslint/visitor-keys": 5.27.1
+      "@typescript-eslint/types": 5.28.0
+      "@typescript-eslint/visitor-keys": 5.28.0
     dev: true
 
   /@typescript-eslint/scope-manager/5.9.1:
@@ -4963,10 +4943,10 @@ packages:
       - supports-color
     dev: false
 
-  /@typescript-eslint/types/5.27.1:
+  /@typescript-eslint/types/5.28.0:
     resolution:
       {
-        integrity: sha512-LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg==,
+        integrity: sha512-2OOm8ZTOQxqkPbf+DAo8oc16sDlVR5owgJfKheBkxBKg1vAfw2JsSofH9+16VPlN9PWtv8Wzhklkqw3k/zCVxA==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
@@ -4978,10 +4958,10 @@ packages:
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  /@typescript-eslint/typescript-estree/5.27.1_typescript@4.6.3:
+  /@typescript-eslint/typescript-estree/5.28.0_typescript@4.6.3:
     resolution:
       {
-        integrity: sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw==,
+        integrity: sha512-9GX+GfpV+F4hdTtYc6OV9ZkyYilGXPmQpm6AThInpBmKJEyRSIjORJd1G9+bknb7OTFYL+Vd4FBJAO6T78OVqA==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -4990,8 +4970,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/types": 5.27.1
-      "@typescript-eslint/visitor-keys": 5.27.1
+      "@typescript-eslint/types": 5.28.0
+      "@typescript-eslint/visitor-keys": 5.28.0
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
@@ -5025,19 +5005,19 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@typescript-eslint/utils/5.27.1_hrkuebk64jiu2ut2d2sm4oylnu:
+  /@typescript-eslint/utils/5.28.0_hrkuebk64jiu2ut2d2sm4oylnu:
     resolution:
       {
-        integrity: sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w==,
+        integrity: sha512-E60N5L0fjv7iPJV3UGc4EC+A3Lcj4jle9zzR0gW7vXhflO7/J29kwiTGITA2RlrmPokKiZbBy2DgaclCaEUs6g==,
       }
     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.27.1
-      "@typescript-eslint/types": 5.27.1
-      "@typescript-eslint/typescript-estree": 5.27.1_typescript@4.6.3
+      "@typescript-eslint/scope-manager": 5.28.0
+      "@typescript-eslint/types": 5.28.0
+      "@typescript-eslint/typescript-estree": 5.28.0_typescript@4.6.3
       eslint: 7.32.0
       eslint-scope: 5.1.1
       eslint-utils: 3.0.0_eslint@7.32.0
@@ -5046,14 +5026,14 @@ packages:
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.27.1:
+  /@typescript-eslint/visitor-keys/5.28.0:
     resolution:
       {
-        integrity: sha512-xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ==,
+        integrity: sha512-BtfP1vCor8cWacovzzPFOoeW4kBQxzmhxGoOpt0v1SFvG+nJ0cWaVdJk7cky1ArTcFHHKNIxyo2LLr3oNkSuXA==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      "@typescript-eslint/types": 5.27.1
+      "@typescript-eslint/types": 5.28.0
       eslint-visitor-keys: 3.3.0
     dev: true
 
@@ -6632,10 +6612,10 @@ packages:
       browserslist: 4.20.3
       semver: 7.0.0
 
-  /core-js-pure/3.22.8:
+  /core-js-pure/3.23.0:
     resolution:
       {
-        integrity: sha512-bOxbZIy9S5n4OVH63XaLVXZ49QKicjowDx/UELyJ68vxfCRpYsbyh/WNZNfEfAk+ekA8vSjt+gCDpvh672bc3w==,
+        integrity: sha512-ksjJc/xVTQzT2q6trPja2qWynMEaGO36rDui2SiqLPYab9TmPgT8nIVcre/yscviPCSweUdCDGKe4MsQA9w1zQ==,
       }
     requiresBuild: true
 
@@ -8325,11 +8305,11 @@ packages:
     dependencies:
       "@next/eslint-plugin-next": 12.1.6
       "@rushstack/eslint-patch": 1.1.3
-      "@typescript-eslint/parser": 5.27.1_hrkuebk64jiu2ut2d2sm4oylnu
+      "@typescript-eslint/parser": 5.28.0_hrkuebk64jiu2ut2d2sm4oylnu
       eslint: 7.32.0
       eslint-import-resolver-node: 0.3.6
       eslint-import-resolver-typescript: 2.7.1_hpmu7kn6tcn2vnxpfzvv33bxmy
-      eslint-plugin-import: 2.26.0_wpehoe7sv7ux6tdegk3fwlchdi
+      eslint-plugin-import: 2.26.0_zhtk6rij7obli3ams3sxis7j7e
       eslint-plugin-jsx-a11y: 6.5.1_eslint@7.32.0
       eslint-plugin-react: 7.30.0_eslint@7.32.0
       eslint-plugin-react-hooks: 4.5.0_eslint@7.32.0
@@ -8393,7 +8373,7 @@ packages:
     dependencies:
       debug: 4.3.4
       eslint: 7.32.0
-      eslint-plugin-import: 2.26.0_wpehoe7sv7ux6tdegk3fwlchdi
+      eslint-plugin-import: 2.26.0_zhtk6rij7obli3ams3sxis7j7e
       glob: 7.2.0
       is-glob: 4.0.3
       resolve: 1.22.0
@@ -8402,36 +8382,6 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils/2.7.3_4wf6ctbofaywkfx7kzk32kp7ge:
-    resolution:
-      {
-        integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==,
-      }
-    engines: {node: ">=4"}
-    peerDependencies:
-      "@typescript-eslint/parser": "*"
-      eslint-import-resolver-node: "*"
-      eslint-import-resolver-typescript: "*"
-      eslint-import-resolver-webpack: "*"
-    peerDependenciesMeta:
-      "@typescript-eslint/parser":
-        optional: true
-      eslint-import-resolver-node:
-        optional: true
-      eslint-import-resolver-typescript:
-        optional: true
-      eslint-import-resolver-webpack:
-        optional: true
-    dependencies:
-      "@typescript-eslint/parser": 5.27.1_hrkuebk64jiu2ut2d2sm4oylnu
-      debug: 3.2.7
-      eslint-import-resolver-node: 0.3.6
-      eslint-import-resolver-typescript: 2.7.1_hpmu7kn6tcn2vnxpfzvv33bxmy
-      find-up: 2.1.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /eslint-module-utils/2.7.3_dbnyosdljuntx5ukba4qoruhni:
     resolution:
       {
@@ -8462,6 +8412,36 @@ packages:
       - supports-color
     dev: false
 
+  /eslint-module-utils/2.7.3_pbmiczca3qpqvnkfcriol7sq7u:
+    resolution:
+      {
+        integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==,
+      }
+    engines: {node: ">=4"}
+    peerDependencies:
+      "@typescript-eslint/parser": "*"
+      eslint-import-resolver-node: "*"
+      eslint-import-resolver-typescript: "*"
+      eslint-import-resolver-webpack: "*"
+    peerDependenciesMeta:
+      "@typescript-eslint/parser":
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+    dependencies:
+      "@typescript-eslint/parser": 5.28.0_hrkuebk64jiu2ut2d2sm4oylnu
+      debug: 3.2.7
+      eslint-import-resolver-node: 0.3.6
+      eslint-import-resolver-typescript: 2.7.1_hpmu7kn6tcn2vnxpfzvv33bxmy
+      find-up: 2.1.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /eslint-plugin-import/2.26.0_oisyptfcq77gha3jnxd6iiraai:
     resolution:
       {
@@ -8495,7 +8475,7 @@ packages:
       - supports-color
     dev: false
 
-  /eslint-plugin-import/2.26.0_wpehoe7sv7ux6tdegk3fwlchdi:
+  /eslint-plugin-import/2.26.0_zhtk6rij7obli3ams3sxis7j7e:
     resolution:
       {
         integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==,
@@ -8508,14 +8488,14 @@ packages:
       "@typescript-eslint/parser":
         optional: true
     dependencies:
-      "@typescript-eslint/parser": 5.27.1_hrkuebk64jiu2ut2d2sm4oylnu
+      "@typescript-eslint/parser": 5.28.0_hrkuebk64jiu2ut2d2sm4oylnu
       array-includes: 3.1.5
       array.prototype.flat: 1.3.0
       debug: 2.6.9
       doctrine: 2.1.0
       eslint: 7.32.0
       eslint-import-resolver-node: 0.3.6
-      eslint-module-utils: 2.7.3_4wf6ctbofaywkfx7kzk32kp7ge
+      eslint-module-utils: 2.7.3_pbmiczca3qpqvnkfcriol7sq7u
       has: 1.0.3
       is-core-module: 2.8.1
       is-glob: 4.0.3
@@ -8658,7 +8638,7 @@ packages:
     peerDependencies:
       eslint: ^7.5.0 || ^8.0.0
     dependencies:
-      "@typescript-eslint/experimental-utils": 5.27.1_hrkuebk64jiu2ut2d2sm4oylnu
+      "@typescript-eslint/experimental-utils": 5.28.0_hrkuebk64jiu2ut2d2sm4oylnu
       eslint: 7.32.0
     transitivePeerDependencies:
       - supports-color
@@ -11951,10 +11931,6 @@ packages:
       }
     dev: false
 
-  /lodash.frompairs/4.0.1:
-    resolution: {integrity: sha1-vE5SB/onV8E25XNhTpZkUGsrG9I=}
-    dev: true
-
   /lodash.includes/4.3.0:
     resolution:
       {
@@ -15848,10 +15824,10 @@ packages:
     engines: {node: ">=14.0.0"}
     dev: false
 
-  /tinyspy/0.3.2:
+  /tinyspy/0.3.3:
     resolution:
       {
-        integrity: sha512-2+40EP4D3sFYy42UkgkFFB+kiX2Tg3URG/lVvAZFfLxgGpnWl5qQJuBw1gaLttq8UOS+2p3C0WrhJnQigLTT2Q==,
+        integrity: sha512-gRiUR8fuhUf0W9lzojPf1N1euJYA30ISebSfgca8z76FOvXtVXqd5ojEIaKLWbDQhAaC3ibxZIjqbyi4ybjcTw==,
       }
     engines: {node: ">=14.0.0"}
     dev: false
@@ -16066,10 +16042,10 @@ packages:
         optional: true
     dependencies:
       "@cspotcode/source-map-support": 0.7.0
-      "@tsconfig/node10": 1.0.8
-      "@tsconfig/node12": 1.0.9
-      "@tsconfig/node14": 1.0.1
-      "@tsconfig/node16": 1.0.2
+      "@tsconfig/node10": 1.0.9
+      "@tsconfig/node12": 1.0.10
+      "@tsconfig/node14": 1.0.2
+      "@tsconfig/node16": 1.0.3
       "@types/node": 17.0.16
       acorn: 8.7.1
       acorn-walk: 8.2.0
@@ -16099,10 +16075,10 @@ packages:
         optional: true
     dependencies:
       "@cspotcode/source-map-support": 0.7.0
-      "@tsconfig/node10": 1.0.8
-      "@tsconfig/node12": 1.0.9
-      "@tsconfig/node14": 1.0.1
-      "@tsconfig/node16": 1.0.2
+      "@tsconfig/node10": 1.0.9
+      "@tsconfig/node12": 1.0.10
+      "@tsconfig/node14": 1.0.2
+      "@tsconfig/node16": 1.0.3
       acorn: 8.7.1
       acorn-walk: 8.2.0
       arg: 4.1.3
@@ -16349,7 +16325,10 @@ packages:
     dev: false
 
   /type-check/0.3.2:
-    resolution: {integrity: sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=}
+    resolution:
+      {
+        integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==,
+      }
     engines: {node: ">= 0.8.0"}
     dependencies:
       prelude-ls: 1.1.2
@@ -16559,12 +16538,18 @@ packages:
       detect-node: 2.1.0
 
   /unpipe/1.0.0:
-    resolution: {integrity: sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=}
+    resolution:
+      {
+        integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==,
+      }
     engines: {node: ">= 0.8"}
     dev: true
 
   /unset-value/1.0.0:
-    resolution: {integrity: sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=}
+    resolution:
+      {
+        integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==,
+      }
     engines: {node: ">=0.10.0"}
     dependencies:
       has-value: 0.3.1
@@ -16587,12 +16572,18 @@ packages:
       punycode: 2.1.1
 
   /urix/0.1.0:
-    resolution: {integrity: sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=}
+    resolution:
+      {
+        integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==,
+      }
     deprecated: Please see https://github.com/lydell/urix#deprecated
     dev: false
 
   /url-parse-lax/3.0.0:
-    resolution: {integrity: sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=}
+    resolution:
+      {
+        integrity: sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==,
+      }
     engines: {node: ">=4"}
     dependencies:
       prepend-http: 2.0.0
@@ -16625,7 +16616,10 @@ packages:
     dev: false
 
   /util-deprecate/1.0.2:
-    resolution: {integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=}
+    resolution:
+      {
+        integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==,
+      }
 
   /util/0.10.4:
     resolution:
@@ -16637,7 +16631,10 @@ packages:
     dev: false
 
   /utils-merge/1.0.1:
-    resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=}
+    resolution:
+      {
+        integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==,
+      }
     engines: {node: ">= 0.4.0"}
 
   /uuid/8.3.2:
@@ -16682,18 +16679,27 @@ packages:
     dev: false
 
   /validate-npm-package-name/3.0.0:
-    resolution: {integrity: sha1-X6kS2B630MdK/BQN5zF/DKffQ34=}
+    resolution:
+      {
+        integrity: sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==,
+      }
     dependencies:
       builtins: 1.0.3
     dev: false
 
   /vary/1.1.2:
-    resolution: {integrity: sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=}
+    resolution:
+      {
+        integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==,
+      }
     engines: {node: ">= 0.8"}
     dev: true
 
   /vinyl-file/3.0.0:
-    resolution: {integrity: sha1-sQTZ5ECf+jJfqt1SBkLQo7SIs2U=}
+    resolution:
+      {
+        integrity: sha512-BoJDj+ca3D9xOuPEM6RWVtWQtvEPQiQYn82LvdxhLWplfQsBzBqtgK0yhCP0s1BNTi6dH9BO+dzybvyQIacifg==,
+      }
     engines: {node: ">=4"}
     dependencies:
       graceful-fs: 4.2.10
@@ -16773,7 +16779,7 @@ packages:
       jsdom: 19.0.0
       local-pkg: 0.4.1
       tinypool: 0.1.3
-      tinyspy: 0.3.2
+      tinyspy: 0.3.3
       vite: 2.9.12
     transitivePeerDependencies:
       - less
@@ -16782,7 +16788,10 @@ packages:
     dev: false
 
   /void-elements/3.1.0:
-    resolution: {integrity: sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=}
+    resolution:
+      {
+        integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==,
+      }
     engines: {node: ">=0.10.0"}
     dev: true
 
@@ -16858,7 +16867,10 @@ packages:
     dev: false
 
   /wcwidth/1.0.1:
-    resolution: {integrity: sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=}
+    resolution:
+      {
+        integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==,
+      }
     dependencies:
       defaults: 1.0.3
     dev: false
@@ -16988,7 +17000,10 @@ packages:
       is-symbol: 1.0.4
 
   /which-module/2.0.0:
-    resolution: {integrity: sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=}
+    resolution:
+      {
+        integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==,
+      }
     dev: false
 
   /which-pm-runs/1.1.0:
@@ -17093,7 +17108,10 @@ packages:
       strip-ansi: 6.0.1
 
   /wrappy/1.0.2:
-    resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
+    resolution:
+      {
+        integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==,
+      }
 
   /write-file-atomic/2.4.3:
     resolution:
@@ -17176,7 +17194,10 @@ packages:
     dev: false
 
   /xtraverse/0.1.0:
-    resolution: {integrity: sha1-t0G60BjveNip0ug63gB7P3lZxzI=}
+    resolution:
+      {
+        integrity: sha512-MANQdlG2hl1nQobxz1Rv8hsS1RuBS0C1N6qTOupv+9vmfrReePdxhmB2ecYjvsp4stJ80HD7erjkoF1Hd/FK9A==,
+      }
     engines: {node: ">= 0.4.0"}
     dependencies:
       xmldom: 0.1.31
@@ -17197,7 +17218,10 @@ packages:
     engines: {node: ">=10"}
 
   /yallist/2.1.2:
-    resolution: {integrity: sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=}
+    resolution:
+      {
+        integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==,
+      }
     dev: false
 
   /yallist/4.0.0:
@@ -17267,7 +17291,10 @@ packages:
       yargs-parser: 20.2.9
 
   /yauzl/2.10.0:
-    resolution: {integrity: sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=}
+    resolution:
+      {
+        integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==,
+      }
     dependencies:
       buffer-crc32: 0.2.13
       fd-slicer: 1.1.0