testing explicity setting dist-tag for changesets

* wip

* cleanup

* upgrade next@canary

.changeset/empty-berries-rule.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+fix app generator for pnpm unmet dependency

.changeset/fair-wombats-sneeze.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+added superjson

.changeset/poor-shrimps-think.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Setup SuperJson for GSSP and GSP

.changeset/pre.json

@@ -18,17 +18,25 @@
   "changesets": [
     "breezy-cameras-double",
     "dirty-monkeys-greet",
+    "empty-berries-rule",
+    "fair-wombats-sneeze",
     "flat-bees-approve",
     "great-months-train",
     "lovely-colts-share",
     "nine-onions-admire",
     "ninety-pets-heal",
     "poor-peas-lick",
+    "poor-shrimps-think",
     "quiet-feet-travel",
+    "sharp-falcons-begin",
     "silent-colts-reply",
+    "stupid-walls-sell",
     "swift-drinks-dress",
     "ten-rivers-burn",
     "thirty-countries-build",
-    "twenty-beans-pump"
+    "twenty-beans-pump",
+    "two-kiwis-help",
+    "unlucky-papayas-sleep",
+    "wicked-ghosts-cough"
   ]
 }

.changeset/sharp-falcons-begin.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+Use routes manifest in template app

.changeset/stupid-walls-sell.md

@@ -0,0 +1,8 @@
+---
+"blitz": patch
+"@blitzjs/auth": patch
+"@blitzjs/next": patch
+"@blitzjs/rpc": patch
+---
+
+testing set dist-tag

.changeset/two-kiwis-help.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+fix generate cli command

.changeset/unlucky-papayas-sleep.md

@@ -0,0 +1,5 @@
+---
+"blitz": patch
+---
+
+remove console logs inside onPostInstall in the new cli command

.changeset/wicked-ghosts-cough.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/generator": patch
+---
+
+fix template sourcepath because of new env variable

apps/toolkit-app/CHANGELOG.md

@@ -1,5 +1,70 @@
 # toolkit-app
 
+## 1.0.1-alpha.15
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.20
+  - @blitzjs/auth@2.0.0-alpha.20
+  - @blitzjs/next@2.0.0-alpha.20
+  - @blitzjs/rpc@2.0.0-alpha.20
+  - @blitzjs/config@2.0.0-alpha.20
+
+## 1.0.1-alpha.14
+
+### Patch Changes
+
+- Updated dependencies
+- Updated dependencies [2150dcc3]
+  - @blitzjs/next@2.0.0-alpha.19
+  - blitz@2.0.0-alpha.19
+  - @blitzjs/auth@2.0.0-alpha.19
+  - @blitzjs/rpc@2.0.0-alpha.19
+  - @blitzjs/config@2.0.0-alpha.19
+
+## 1.0.1-alpha.13
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.18
+  - @blitzjs/auth@2.0.0-alpha.18
+  - @blitzjs/next@2.0.0-alpha.18
+  - @blitzjs/rpc@2.0.0-alpha.18
+  - @blitzjs/config@2.0.0-alpha.18
+
+## 1.0.1-alpha.12
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.17
+- @blitzjs/auth@2.0.0-alpha.17
+- @blitzjs/next@2.0.0-alpha.17
+- @blitzjs/rpc@2.0.0-alpha.17
+- @blitzjs/config@2.0.0-alpha.17
+
+## 1.0.1-alpha.11
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.16
+  - @blitzjs/auth@2.0.0-alpha.16
+  - @blitzjs/next@2.0.0-alpha.16
+  - @blitzjs/rpc@2.0.0-alpha.16
+  - @blitzjs/config@2.0.0-alpha.16
+
+## 1.0.1-alpha.10
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.15
+- @blitzjs/auth@2.0.0-alpha.15
+- @blitzjs/next@2.0.0-alpha.15
+- @blitzjs/rpc@2.0.0-alpha.15
+- @blitzjs/config@2.0.0-alpha.15
+
 ## 1.0.1-alpha.9
 
 ### Patch Changes

apps/toolkit-app/app/auth/components/LoginForm.tsx

@@ -5,6 +5,7 @@ import { Form, FORM_ERROR } from "app/core/components/Form"
 import login from "app/auth/mutations/login"
 import { Login } from "app/auth/validations"
 import { useMutation } from "@blitzjs/rpc"
+import { Routes } from "@blitzjs/next"
 
 type LoginFormProps = {
   onSuccess?: (user: PromiseReturnType<typeof login>) => void
@@ -39,7 +40,7 @@ export const LoginForm = (props: LoginFormProps) => {
         <LabeledTextField name="email" label="Email" placeholder="Email" />
         <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
         <div>
-          <Link href="/auth/forgot-password" passHref>
+          <Link href={Routes.ForgotPasswordPage()} passHref>
             <a>Forgot your password?</a>
           </Link>
         </div>
@@ -47,7 +48,7 @@ export const LoginForm = (props: LoginFormProps) => {
 
       <div style={{ marginTop: "1rem" }}>
         Or{" "}
-        <Link href="/auth/signup" passHref>
+        <Link href={Routes.SignupPage()} passHref>
           <a>Sign Up</a>
         </Link>
       </div>

apps/toolkit-app/db/migrations/20220427214932_/migration.sql

@@ -0,0 +1,47 @@
+-- CreateTable
+CREATE TABLE "User" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "name" TEXT,
+    "email" TEXT NOT NULL,
+    "hashedPassword" TEXT,
+    "role" TEXT NOT NULL DEFAULT 'USER'
+);
+
+-- CreateTable
+CREATE TABLE "Session" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "expiresAt" DATETIME,
+    "handle" TEXT NOT NULL,
+    "hashedSessionToken" TEXT,
+    "antiCSRFToken" TEXT,
+    "publicData" TEXT,
+    "privateData" TEXT,
+    "userId" INTEGER,
+    CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "Token" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "hashedToken" TEXT NOT NULL,
+    "type" TEXT NOT NULL,
+    "expiresAt" DATETIME NOT NULL,
+    "sentTo" TEXT NOT NULL,
+    "userId" INTEGER NOT NULL,
+    CONSTRAINT "Token_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Session_handle_key" ON "Session"("handle");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Token_hashedToken_type_key" ON "Token"("hashedToken", "type");

apps/toolkit-app/package.json

@@ -1,9 +1,9 @@
 {
   "name": "toolkit-app",
-  "version": "1.0.1-alpha.9",
+  "version": "1.0.1-alpha.15",
   "scripts": {
     "start:dev": "pnpm run prisma:start && next dev",
-    "buildapp": "prisma generate && next build",
+    "buildapp": "pnpm i && pnpm prisma generate && next build",
     "start": "next start",
     "lint": "next lint",
     "prisma:start": "prisma generate && prisma migrate deploy",
@@ -29,8 +29,8 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.14",
-    "next": "12.1.1",
+    "blitz": "workspace:2.0.0-alpha.20",
+    "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",

apps/toolkit-app/pages/auth/signup.tsx

@@ -1,13 +1,14 @@
 import { useRouter } from "next/router"
 import Layout from "app/core/layouts/Layout"
 import { SignupForm } from "app/auth/components/SignupForm"
+import { Routes } from "@blitzjs/next"
 
 const SignupPage = () => {
   const router = useRouter()
 
   return (
     <Layout title="Sign Up">
-      <SignupForm onSuccess={() => router.push("/")} />
+      <SignupForm onSuccess={() => router.push(Routes.Home())} />
     </Layout>
   )
 }

apps/toolkit-app/pages/index.tsx

@@ -6,6 +6,7 @@ import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 import logout from "app/auth/mutations/logout"
 import logo from "public/logo.png"
 import { useMutation } from "@blitzjs/rpc"
+import { Routes } from "@blitzjs/next"
 
 /*
  * This file is just for a pleasant getting started page for your new app.
@@ -37,12 +38,12 @@ const UserInfo = () => {
   } else {
     return (
       <>
-        <Link href="/auth/signup" passHref>
+        <Link href={Routes.SignupPage()} passHref>
           <a className="button small">
             <strong>Sign Up</strong>
           </a>
         </Link>
-        <Link href="/auth/login" passHref>
+        <Link href={Routes.LoginPage()} passHref>
           <a className="button small">
             <strong>Login</strong>
           </a>

apps/toolkit-app/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "baseUrl": "./",
+    "baseUrl": ".",
     "allowJs": true,
     "skipLibCheck": true,
     "strict": false,

apps/web/package.json

@@ -21,7 +21,7 @@
     "@types/jest": "27.4.1",
     "blitz": "workspace:*",
     "jest": "27.5.1",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",

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

@@ -1,14 +1,11 @@
 import {gSP} from "app/blitz-server"
 
-export const getStaticProps = gSP(async ({ctx}) => {
+export const getStaticProps = gSP<{data: {test: string}}>(async ({ctx}) => {
   return {
     props: {
       data: {
-        // userId: ctx?.session.userId,
-        // session: {
-        //   id: session.userId,
-        //   publicData: session.$publicData,
-        // },
+        test: "hello",
+        date: new Date(),
       },
     },
   }

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

@@ -12,6 +12,7 @@ export const getServerSideProps = gSSP<Props>(async ({ctx}) => {
     props: {
       userId: session.userId,
       publicData: session.$publicData,
+      publishedAt: new Date(0)
     },
   }
 })

integration-tests/auth/package.json

@@ -19,7 +19,7 @@
     "@prisma/client": "3.9.0",
     "blitz": "workspace:*",
     "lowdb": "3.0.0",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"

integration-tests/rpc/package.json

@@ -12,7 +12,7 @@
     "@blitzjs/next": "workspace:*",
     "@blitzjs/rpc": "workspace:*",
     "blitz": "workspace:*",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
     "react": "18.0.0",
     "react-dom": "18.0.0"
   },

package.json

@@ -27,7 +27,7 @@
     "husky": "7.0.4",
     "jsdom": "19.0.0",
     "lint-staged": "12.1.7",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
     "only-allow": "1.1.0",
     "patch-package": "6.4.7",
     "prettier": "^2.5.1",

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @blitzjs/auth
 
+## 2.0.0-alpha.20
+
+### Patch Changes
+
+- testing set dist-tag
+- Updated dependencies
+  - blitz@2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.19
+
+## 2.0.0-alpha.18
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.17
+
+## 2.0.0-alpha.16
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.16
+
+## 2.0.0-alpha.15
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.15
+
 ## 2.0.0-alpha.14
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.14",
+  "version": "2.0.0-alpha.20",
   "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.14",
+    "blitz": "2.0.0-alpha.20",
     "cookie": "0.4.1",
     "debug": "4.3.3",
     "http": "0.0.1-security",
@@ -35,7 +35,7 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.14",
+    "@blitzjs/config": "workspace:2.0.0-alpha.20",
     "@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

@@ -138,7 +138,10 @@ export const useSession = (options: UseSessionOptions = {}): ClientSession => {
     initialState = {...options.initialPublicData, isLoading: false}
   } else if (suspense) {
     if (isServer) {
-      throw new Promise((_) => {})
+      const e = new Error()
+      e.name = "Rendering Suspense fallback..."
+      delete e.stack
+      throw e
     } else {
       initialState = {...getPublicDataStore().getData(), isLoading: false}
     }

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @blitzjs/next
 
+## 2.0.0-alpha.20
+
+### Patch Changes
+
+- testing set dist-tag
+- Updated dependencies
+  - @blitzjs/rpc@2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+### Patch Changes
+
+- added superjson
+- 2150dcc3: Setup SuperJson for GSSP and GSP
+  - @blitzjs/rpc@2.0.0-alpha.19
+
+## 2.0.0-alpha.18
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.17
+
+## 2.0.0-alpha.16
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.16
+
+## 2.0.0-alpha.15
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.15
+
 ## 2.0.0-alpha.14
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.14",
+  "version": "2.0.0-alpha.20",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -23,13 +23,16 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.14",
+    "@blitzjs/rpc": "2.0.0-alpha.20",
+    "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
-    "react-query": "3.21.1"
+    "hoist-non-react-statics": "3.3.2",
+    "react-query": "3.21.1",
+    "superjson": "1.8.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.14",
+    "@blitzjs/config": "workspace:2.0.0-alpha.20",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -40,11 +43,11 @@
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.14",
+    "blitz": "2.0.0-alpha.20",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "lodash.frompairs": "4.0.1",
-    "next": "12.1.1",
+    "next": "12.1.6-canary.17",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "resolve-from": "5.0.0",

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

@@ -10,6 +10,7 @@ import Head from "next/head"
 import React from "react"
 import {QueryClient, QueryClientProvider} from "react-query"
 import {Hydrate, HydrateOptions} from "react-query/hydration"
+import {withSuperJSONPage} from './superjson'
 
 export * from "./error-boundary"
 export * from "./error-component"
@@ -47,7 +48,7 @@ const buildWithBlitz = <TPlugins extends readonly ClientPlugin<object>[]>(plugin
         </BlitzProvider>
       )
     }
-    return BlitzOuterRoot
+    return withSuperJSONPage(BlitzOuterRoot)
   }
 }
 

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

@@ -1,6 +1,7 @@
 import {GetServerSideProps, GetStaticProps, NextApiRequest, NextApiResponse} from "next"
 import type {Ctx as BlitzCtx, BlitzServerPlugin, Middleware, MiddlewareResponse} from "blitz"
 import {handleRequestWithMiddleware} from "blitz"
+import {withSuperJSONPropsGsp, withSuperJSONPropsGssp} from "./superjson"
 
 export * from "./index-browser"
 
@@ -27,10 +28,10 @@ export type BlitzGSSPHandler<TProps> = ({
   ...args
 }: Parameters<GetServerSideProps<TProps>>[0] & {ctx: Ctx}) => ReturnType<GetServerSideProps<TProps>>
 
-export type BlitzGSPHandler = ({
+export type BlitzGSPHandler<TProps> = ({
   ctx,
   ...args
-}: Parameters<GetStaticProps>[0] & {ctx: Ctx}) => ReturnType<GetServerSideProps>
+}: Parameters<GetStaticProps<TProps>>[0] & {ctx: Ctx}) => ReturnType<GetStaticProps<TProps>>
 
 export type BlitzAPIHandler = (
   req: Parameters<NextApiHandler>[0],
@@ -42,23 +43,21 @@ 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> =>
-    async ({req, res, ...rest}) => {
+  const gSSP = <TProps>(handler: BlitzGSSPHandler<TProps>): GetServerSideProps<TProps> =>
+    withSuperJSONPropsGssp<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})
-    }
+    })
 
-  const gSP =
-    (handler: BlitzGSPHandler): GetStaticProps =>
-    async (context) => {
+  const gSP = <TProps>(handler: BlitzGSPHandler<TProps>): GetStaticProps<TProps> =>
+    withSuperJSONPropsGsp<TProps>(async (context) => {
       const ctx = contextMiddleware.reduceRight((y, f) => (f ? f(y) : y), {} as Ctx)
       return handler({...context, ctx: ctx})
-    }
+    })
 
   const api =
     (handler: BlitzAPIHandler): NextApiHandler =>

packages/blitz-next/src/superjson.tsx

@@ -0,0 +1,89 @@
+import hoistNonReactStatics from "hoist-non-react-statics"
+import type {
+  GetServerSideProps,
+  GetServerSidePropsResult,
+  GetStaticProps,
+  GetStaticPropsResult,
+} from "next"
+import * as React from "react"
+import SuperJSON from "superjson"
+
+export type SuperJSONProps<P = any> = P & {
+  _superjson?: any
+}
+
+function excludeProps<P>(
+  result: GetServerSidePropsResult<P> | GetStaticPropsResult<P>,
+  exclude: string[] = [],
+) {
+  if (!("props" in result)) {
+    return result
+  }
+
+  if (!result.props) {
+    return result
+  }
+
+  const excludedPropValues = exclude.map((propKey) => {
+    const value = (result.props as any)[propKey]
+    delete (result.props as any)[propKey]
+    return value
+  })
+
+  const {json, meta} = SuperJSON.serialize(result.props)
+  const props = json as any
+
+  if (meta) {
+    props._superjson = meta
+  }
+
+  exclude.forEach((key, index) => {
+    const excludedPropValue = excludedPropValues[index]
+    if (typeof excludedPropValue !== "undefined") {
+      props[key] = excludedPropValue
+    }
+  })
+
+  return {
+    ...result,
+    props,
+  }
+}
+
+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})
+}
+
+export function withSuperJSONPage<P>(
+  Page: React.ComponentType<P>,
+): React.ComponentType<SuperJSONProps<P>> {
+  function WithSuperJSON(serializedProps: SuperJSONProps<P>) {
+    return <Page {...deserializeProps<P>(serializedProps)} />
+  }
+
+  hoistNonReactStatics(WithSuperJSON, Page)
+
+  return WithSuperJSON
+}

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @blitzjs/rpc
 
+## 2.0.0-alpha.20
+
+### Patch Changes
+
+- testing set dist-tag
+- Updated dependencies
+  - blitz@2.0.0-alpha.20
+  - @blitzjs/auth@2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.19
+- @blitzjs/auth@2.0.0-alpha.19
+
+## 2.0.0-alpha.18
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.18
+  - @blitzjs/auth@2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.17
+- @blitzjs/auth@2.0.0-alpha.17
+
+## 2.0.0-alpha.16
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.16
+  - @blitzjs/auth@2.0.0-alpha.16
+
+## 2.0.0-alpha.15
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.15
+- @blitzjs/auth@2.0.0-alpha.15
+
 ## 2.0.0-alpha.14
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.14",
+  "version": "2.0.0-alpha.20",
   "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.14",
+    "@blitzjs/auth": "2.0.0-alpha.20",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
     "chalk": "^4.1.0",
@@ -30,12 +30,12 @@
     "zod": "3.10.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.14",
+    "@blitzjs/config": "workspace:2.0.0-alpha.20",
     "@types/debug": "4.1.7",
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.14",
-    "next": "12.1.1",
+    "blitz": "2.0.0-alpha.20",
+    "next": "12.1.6-canary.17",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "typescript": "^4.5.3",
@@ -43,7 +43,7 @@
     "watch": "1.0.2"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-alpha.14",
+    "blitz": "2.0.0-alpha.20",
     "next": "*"
   },
   "publishConfig": {

packages/blitz-rpc/src/data-client/react-query.tsx

@@ -99,7 +99,10 @@ export function useQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    throw new Promise(() => {})
+    const e = new Error()
+    e.name = "Rendering Suspense fallback..."
+    delete e.stack
+    throw e
   }
 
   const rest = {
@@ -182,7 +185,10 @@ export function usePaginatedQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    throw new Promise(() => {})
+    const e = new Error()
+    e.name = "Rendering Suspense fallback..."
+    delete e.stack
+    throw e
   }
 
   const rest = {
@@ -278,7 +284,10 @@ export function useInfiniteQuery<
     (!options || !("suspense" in options) || options.suspense) &&
     (!options || !("enabled" in options) || options.enabled)
   ) {
-    throw new Promise(() => {})
+    const e = new Error()
+    e.name = "Rendering Suspense fallback..."
+    delete e.stack
+    throw e
   }
 
   const rest = {

packages/blitz/CHANGELOG.md

@@ -1,5 +1,47 @@
 # blitz
 
+## 2.0.0-alpha.20
+
+### Patch Changes
+
+- testing set dist-tag
+  - @blitzjs/generator@2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+### Patch Changes
+
+- Updated dependencies [63605961]
+  - @blitzjs/generator@2.0.0-alpha.19
+
+## 2.0.0-alpha.18
+
+### Patch Changes
+
+- fix generate cli command
+  - @blitzjs/generator@2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.17
+
+## 2.0.0-alpha.16
+
+### Patch Changes
+
+- remove console logs inside onPostInstall in the new cli command
+  - @blitzjs/generator@2.0.0-alpha.16
+
+## 2.0.0-alpha.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.15
+
 ## 2.0.0-alpha.14
 
 ### Patch Changes

packages/blitz/package.json

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

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

@@ -133,8 +133,9 @@ const validateModelName = (modelName: string): void => {
 
 const determineType = async () => {
   if (
-    !args["--type"] ||
-    (args["--type"] && !Object.keys(generatorMap).includes(args["--type"].toLowerCase()))
+    !args["_"].slice(1)[0] ||
+    (args["_"].slice(1)[0] &&
+      !Object.keys(generatorMap).includes(args["_"].slice(1)[0]?.toLowerCase() as string))
   ) {
     const res = await prompts({
       type: "select",
@@ -148,12 +149,12 @@ const determineType = async () => {
 
     selectedType = res.type
   } else {
-    selectedType = args["--type"]
+    selectedType = args["_"].slice(1)[0]?.toLowerCase() as string
   }
 }
 
 const determineName = async () => {
-  if (!args["--name"]) {
+  if (!args["_"].slice(1)[1]) {
     const res = await prompts({
       type: "text",
       name: "model",
@@ -164,7 +165,7 @@ const determineName = async () => {
     selectedModelName = model
     selectedContext = context
   } else {
-    const {model, context} = getModelNameAndContext(args["--name"])
+    const {model, context} = getModelNameAndContext(args["_"].slice(1)[1]!)
     selectedModelName = model
     selectedContext = context
   }
@@ -249,7 +250,7 @@ const generate: CliCommand = async (argv) => {
       const generator = new GeneratorClass({
         destinationRoot: require("path").resolve(),
         // templateDir: blitzConfig.codegen?.templateDir,
-        extraArgs: args["_"].slice(1) as string[],
+        extraArgs: args["_"].slice(3) as string[],
         modelName: singularRootContext,
         modelNames: modelNames(singularRootContext),
         ModelName: ModelName(singularRootContext),

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

@@ -264,7 +264,6 @@ const newApp: CliCommand = async (argv) => {
             {ignoreCache: true},
           )
           const result = await runPrisma(["migrate", "dev", "--name", "Initial migration"], true)
-          console.log("primsa result", result)
           if (!result.success) throw new Error()
         } catch (error) {
           postInstallSteps.push(

packages/config/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+## 2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
+## 2.0.0-alpha.16
+
+## 2.0.0-alpha.15
+
 ## 2.0.0-alpha.14
 
 ## 2.0.0-alpha.13

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.20
+
+## 2.0.0-alpha.19
+
+### Patch Changes
+
+- 63605961: Use routes manifest in template app
+
+## 2.0.0-alpha.18
+
+## 2.0.0-alpha.17
+
+### Patch Changes
+
+- fix app generator for pnpm unmet dependency
+
+## 2.0.0-alpha.16
+
+## 2.0.0-alpha.15
+
+### Patch Changes
+
+- fix template sourcepath because of new env variable
+
 ## 2.0.0-alpha.14
 
 ## 2.0.0-alpha.13

packages/generator/package.json

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

packages/generator/src/generator.ts

@@ -302,9 +302,7 @@ export abstract class Generator<
       return path.join(
         __dirname,
         "..",
-        process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development"
-          ? "./templates"
-          : "./dist/templates",
+        process.env.NODE_ENV === "test" ? "./templates" : "./dist/templates",
         this.sourceRoot.path,
         ...paths,
       )

packages/generator/src/generators/app-generator.ts

@@ -155,6 +155,12 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
         cp.stdout?.setEncoding("utf8")
         cp.stderr?.setEncoding("utf8")
         cp.stdout?.on("data", (data) => {
+          if (pkgManager === "pnpm") {
+            if (data.includes("ERR_PNPM_PEER_DEP_ISSUES  Unmet peer dependencies")) {
+              spinners[spinners.length - 1]?.succeed()
+            }
+          }
+
           if (pkgManager === "yarn") {
             let json = getJSON(data)
             if (json && json.type === "step") {

packages/generator/templates/app/app/auth/components/LoginForm.tsx

@@ -5,6 +5,7 @@ import { Form, FORM_ERROR } from "app/core/components/Form"
 import login from "app/auth/mutations/login"
 import { Login } from "app/auth/validations"
 import { useMutation } from "@blitzjs/rpc"
+import { Routes } from "@blitzjs/next"
 
 type LoginFormProps = {
   onSuccess?: (user: PromiseReturnType<typeof login>) => void
@@ -39,7 +40,7 @@ export const LoginForm = (props: LoginFormProps) => {
         <LabeledTextField name="email" label="Email" placeholder="Email" />
         <LabeledTextField name="password" label="Password" placeholder="Password" type="password" />
         <div>
-          <Link href="/auth/forgot-password">
+          <Link href={Routes.ForgotPasswordPage()}>
             <a>Forgot your password?</a>
           </Link>
         </div>
@@ -47,7 +48,7 @@ export const LoginForm = (props: LoginFormProps) => {
 
       <div style={{ marginTop: "1rem" }}>
         Or{" "}
-        <Link href="/auth/signup">
+        <Link href={Routes.SignupPage()}>
           <a>Sign Up</a>
         </Link>
       </div>

packages/generator/templates/app/pages/auth/signup.tsx

@@ -1,13 +1,14 @@
 import { useRouter } from "next/router"
 import Layout from "app/core/layouts/Layout"
 import { SignupForm } from "app/auth/components/SignupForm"
+import { Routes } from "@blitzjs/next"
 
 const SignupPage = () => {
   const router = useRouter()
 
   return (
     <Layout title="Sign Up">
-      <SignupForm onSuccess={() => router.push("/")} />
+      <SignupForm onSuccess={() => router.push(Routes.Home())} />
     </Layout>
   )
 }

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

@@ -6,6 +6,7 @@ import { useCurrentUser } from "app/core/hooks/useCurrentUser"
 import logout from "app/auth/mutations/logout"
 import logo from "public/logo.png"
 import { useMutation } from "@blitzjs/rpc"
+import { Routes } from "@blitzjs/next"
 
 /*
  * This file is just for a pleasant getting started page for your new app.
@@ -37,12 +38,12 @@ const UserInfo = () => {
   } else {
     return (
       <>
-        <Link href="/auth/signup">
+        <Link href={Routes.SignupPage()}>
           <a className="button small">
             <strong>Sign Up</strong>
           </a>
         </Link>
-        <Link href="/auth/login">
+        <Link href={Routes.LoginPage()}>
           <a className="button small">
             <strong>Login</strong>
           </a>

packages/generator/templates/app/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "baseUrl": "./",
+    "baseUrl": ".",
     "allowJs": true,
     "skipLibCheck": true,
     "strict": false,
@@ -17,7 +17,7 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "incremental": true,
-    "tsBuildInfoFile": ".tsbuildinfo"
+    "tsBuildInfoFile": ".tsbuildinfo",
   },
   "exclude": ["node_modules", "**/*.e2e.ts", "cypress"],
   "include": ["blitz-env.d.ts", "**/*.ts", "**/*.tsx", "types"]

packages/generator/templates/minimalapp/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "baseUrl": "./",
+    "baseUrl": ".",
     "allowJs": true,
     "skipLibCheck": true,
     "strict": false,

packages/pkg-template/package.json

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

pnpm-lock.yaml

@@ -9,7 +9,7 @@ importers:
       husky: 7.0.4
       jsdom: 19.0.0
       lint-staged: 12.1.7
-      next: 12.1.1
+      next: 12.1.6-canary.17
       only-allow: 1.1.0
       patch-package: 6.4.7
       prettier: ^2.5.1
@@ -25,7 +25,7 @@ importers:
       husky: 7.0.4
       jsdom: 19.0.0
       lint-staged: 12.1.7
-      next: 12.1.1
+      next: 12.1.6-canary.17
       only-allow: 1.1.0
       patch-package: 6.4.7
       prettier: 2.6.2
@@ -50,12 +50,12 @@ importers:
       "@types/node": 17.0.16
       "@types/preview-email": 2.0.1
       "@types/react": 17.0.43
-      blitz: workspace:2.0.0-alpha.13
+      blitz: workspace:2.0.0-alpha.19
       eslint: 7.32.0
       husky: 7.0.4
       jest: 27.5.1
       lint-staged: 12.1.7
-      next: 12.1.1
+      next: 12.1.6-canary.17
       prettier: ^2.5.1
       prettier-plugin-prisma: 3.8.0
       pretty-quick: 3.1.3
@@ -75,7 +75,7 @@ importers:
       "@hookform/resolvers": 2.8.8_react-hook-form@7.29.0
       "@prisma/client": 3.9.0_prisma@3.9.0
       blitz: link:../../packages/blitz
-      next: 12.1.1_zpnidt7m3osuk7shl3s4oenomq
+      next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq
       prisma: 3.9.0
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
@@ -113,7 +113,7 @@ importers:
       blitz: workspace:*
       eslint: 7.32.0
       jest: 27.5.1
-      next: 12.1.1
+      next: 12.1.6-canary.17
       prisma: 3.9.0
       react: 18.0.0
       react-dom: 18.0.0
@@ -128,7 +128,7 @@ importers:
       "@types/jest": 27.4.1
       blitz: link:../../packages/blitz
       jest: 27.5.1_ts-node@10.7.0
-      next: 12.1.1_zpnidt7m3osuk7shl3s4oenomq
+      next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq
       prisma: 3.9.0
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
@@ -156,7 +156,7 @@ importers:
       fs-extra: 10.0.1
       get-port: 6.1.2
       lowdb: 3.0.0
-      next: 12.1.1
+      next: 12.1.6-canary.17
       node-fetch: 3.2.3
       prisma: 3.9.0
       react: 18.0.0
@@ -169,7 +169,7 @@ importers:
       "@prisma/client": 3.9.0_prisma@3.9.0
       blitz: link:../../packages/blitz
       lowdb: 3.0.0
-      next: 12.1.1_zpnidt7m3osuk7shl3s4oenomq
+      next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq
       prisma: 3.9.0
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
@@ -200,7 +200,7 @@ importers:
       blitz: workspace:*
       eslint: 7.32.0
       fs-extra: 10.0.1
-      next: 12.1.1
+      next: 12.1.6-canary.17
       react: 18.0.0
       react-dom: 18.0.0
       typescript: ^4.5.3
@@ -210,7 +210,7 @@ importers:
       "@blitzjs/next": link:../../packages/blitz-next
       "@blitzjs/rpc": link:../../packages/blitz-rpc
       blitz: link:../../packages/blitz
-      next: 12.1.1_zpnidt7m3osuk7shl3s4oenomq
+      next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
     devDependencies:
@@ -263,8 +263,8 @@ importers:
 
   packages/blitz:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.13
-      "@blitzjs/generator": 2.0.0-alpha.13
+      "@blitzjs/config": workspace:2.0.0-alpha.19
+      "@blitzjs/generator": 2.0.0-alpha.19
       "@types/cookie": 0.4.1
       "@types/cross-spawn": 6.0.2
       "@types/debug": 4.1.7
@@ -356,7 +356,7 @@ importers:
 
   packages/blitz-auth:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.13
+      "@blitzjs/config": workspace:2.0.0-alpha.19
       "@testing-library/react": 13.0.0
       "@testing-library/react-hooks": 7.0.2
       "@types/b64-lite": 1.3.0
@@ -368,7 +368,7 @@ importers:
       "@types/secure-password": 3.1.1
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.13
+      blitz: 2.0.0-alpha.19
       cookie: 0.4.1
       debug: 4.3.3
       http: 0.0.1-security
@@ -413,38 +413,44 @@ importers:
 
   packages/blitz-next:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.13
-      "@blitzjs/rpc": 2.0.0-alpha.13
+      "@blitzjs/config": workspace:2.0.0-alpha.19
+      "@blitzjs/rpc": 2.0.0-alpha.19
       "@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": 17.0.43
       "@types/react-dom": 17.0.14
       "@types/testing-library__react-hooks": 4.0.0
-      blitz: 2.0.0-alpha.13
+      blitz: 2.0.0-alpha.19
       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.1
+      next: 12.1.6-canary.17
       react: 18.0.0
       react-dom: 18.0.0
       react-query: 3.21.1
       resolve-from: 5.0.0
+      superjson: 1.8.0
       ts-jest: 27.1.4
       typescript: ^4.5.3
       unbuild: 0.6.9
       watch: 1.0.2
     dependencies:
       "@blitzjs/rpc": link:../blitz-rpc
+      "@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_zpnidt7m3osuk7shl3s4oenomq
+      superjson: 1.8.0
     devDependencies:
       "@blitzjs/config": link:../config
       "@testing-library/dom": 8.13.0
@@ -461,7 +467,7 @@ importers:
       cross-spawn: 7.0.3
       find-up: 4.1.0
       lodash.frompairs: 4.0.1
-      next: 12.1.1_zpnidt7m3osuk7shl3s4oenomq
+      next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
       resolve-from: 5.0.0
@@ -472,17 +478,17 @@ importers:
 
   packages/blitz-rpc:
     specifiers:
-      "@blitzjs/auth": 2.0.0-alpha.13
-      "@blitzjs/config": workspace:2.0.0-alpha.13
+      "@blitzjs/auth": 2.0.0-alpha.19
+      "@blitzjs/config": workspace:2.0.0-alpha.19
       "@types/debug": 4.1.7
       "@types/react": 17.0.43
       "@types/react-dom": 17.0.14
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.13
+      blitz: 2.0.0-alpha.19
       chalk: ^4.1.0
       debug: 4.3.3
-      next: 12.1.1
+      next: 12.1.6-canary.17
       react: 18.0.0
       react-dom: 18.0.0
       react-query: 3.21.1
@@ -506,7 +512,7 @@ importers:
       "@types/react": 17.0.43
       "@types/react-dom": 17.0.14
       blitz: link:../blitz
-      next: 12.1.1_zpnidt7m3osuk7shl3s4oenomq
+      next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
       typescript: 4.6.3
@@ -534,7 +540,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.13
+      "@blitzjs/config": 2.0.0-alpha.19
       "@juanm04/cpx": 2.0.1
       "@mrleebo/prisma-ast": 0.2.6
       "@types/babel__core": 7.1.19
@@ -625,7 +631,7 @@ importers:
 
   packages/pkg-template:
     specifiers:
-      "@blitzjs/config": 2.0.0-alpha.13
+      "@blitzjs/config": 2.0.0-alpha.19
       "@types/react": 17.0.43
       "@types/react-dom": 17.0.14
       "@typescript-eslint/eslint-plugin": 5.9.1
@@ -2211,7 +2217,7 @@ packages:
       "@babel/plugin-transform-unicode-regex": 7.16.7_@babel+core@7.12.10
       "@babel/preset-modules": 0.1.5_@babel+core@7.12.10
       "@babel/types": 7.12.10
-      core-js-compat: 3.22.3
+      core-js-compat: 3.22.4
       semver: 5.7.1
     transitivePeerDependencies:
       - supports-color
@@ -2289,7 +2295,7 @@ packages:
       }
     engines: {node: ">=6.9.0"}
     dependencies:
-      core-js-pure: 3.22.3
+      core-js-pure: 3.22.4
       regenerator-runtime: 0.13.9
     dev: false
 
@@ -2674,10 +2680,10 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@hapi/hoek/9.2.1:
+  /@hapi/hoek/9.3.0:
     resolution:
       {
-        integrity: sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw==,
+        integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==,
       }
     dev: false
 
@@ -2687,7 +2693,7 @@ packages:
         integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==,
       }
     dependencies:
-      "@hapi/hoek": 9.2.1
+      "@hapi/hoek": 9.3.0
     dev: false
 
   /@hookform/resolvers/2.8.8_react-hook-form@7.29.0:
@@ -2961,7 +2967,7 @@ packages:
     engines: {node: ">=6.0.0"}
     dependencies:
       "@jridgewell/set-array": 1.1.0
-      "@jridgewell/sourcemap-codec": 1.4.11
+      "@jridgewell/sourcemap-codec": 1.4.12
 
   /@jridgewell/resolve-uri/3.0.6:
     resolution:
@@ -2977,10 +2983,10 @@ packages:
       }
     engines: {node: ">=6.0.0"}
 
-  /@jridgewell/sourcemap-codec/1.4.11:
+  /@jridgewell/sourcemap-codec/1.4.12:
     resolution:
       {
-        integrity: sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==,
+        integrity: sha512-az/NhpIwP3K33ILr0T2bso+k2E/SLf8Yidd8mHl0n6sCQ4YdyC8qDhZA6kOPDNDBA56ZnIjngVl0U3jREA0BUA==,
       }
 
   /@jridgewell/trace-mapping/0.3.9:
@@ -2990,7 +2996,7 @@ packages:
       }
     dependencies:
       "@jridgewell/resolve-uri": 3.0.6
-      "@jridgewell/sourcemap-codec": 1.4.11
+      "@jridgewell/sourcemap-codec": 1.4.12
 
   /@juanm04/cpx/2.0.1:
     resolution:
@@ -3075,10 +3081,10 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@next/env/12.1.1:
+  /@next/env/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-VmTRkfo/IXOQCATndjW3OjKb8zmAuB07eDdzO9XvuXZP87SyvnCYw3jrhUuFhOe/FVsKiloafa5LJfToUpvjUQ==,
+        integrity: sha512-/uCSXyxMDO37Rw1ngfI17/KH1iUWUIndRjYpRsfQDoJcL8yuCv8iB4CTw1cAdknZ/A48p0ukzJ/zktYvsa6tgg==,
       }
 
   /@next/eslint-plugin-next/12.0.7:
@@ -3090,10 +3096,10 @@ packages:
       glob: 7.1.7
     dev: false
 
-  /@next/swc-android-arm-eabi/12.1.1:
+  /@next/swc-android-arm-eabi/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-phV9H6d1eK1oVC7nmKKcCXvgOWT4K7aLC/beyO6yvbFC4XtBLE21vPwVl7B4ybz5xjSa6TXoR3TMR6vkW6Mv+A==,
+        integrity: sha512-1L3HKWM+M0ruo2EbKFMYGEHDmLx6XrYAf/5gMAW0xw0vIoKIpPNupZgfl8D+fHjp07tL8lg6i8MYCooMH14ybQ==,
       }
     engines: {node: ">= 10"}
     cpu: [arm]
@@ -3101,10 +3107,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@next/swc-android-arm64/12.1.1:
+  /@next/swc-android-arm64/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-X5qEz0YeeYT0Gz2wXPAEtRKEuAsLUIEgC/DDfS98t/5Idjv0S4aqIX+TQdzoXP5bwQkIr+mSg+MBIdLtbtnCsA==,
+        integrity: sha512-ZM+0ttYxOFeLOHDPifcBZViaa3i0Kro17U8ilLxAVdqPH9GUQkSJOcBumHsWWI4KDjEaB2brTz1d3Tf8IoZDUw==,
       }
     engines: {node: ">= 10"}
     cpu: [arm64]
@@ -3112,10 +3118,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@next/swc-darwin-arm64/12.1.1:
+  /@next/swc-darwin-arm64/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-bKKSNaTdnO3XPnfaR4NSpPcbs80fdbtOYC2lgtqLzA0bOMioupixMP5GrA/gfJHwh7GRH+A+sbgKQWsqSsYAqQ==,
+        integrity: sha512-UzuX8mIXwFDkG7nfVLE53Nw1grtgk42tep+1qpVvYteG++7+ARqYboJ2H5bQA9+WaB2iZmW3PU2yMo4B+543Aw==,
       }
     engines: {node: ">= 10"}
     cpu: [arm64]
@@ -3123,10 +3129,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@next/swc-darwin-x64/12.1.1:
+  /@next/swc-darwin-x64/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-2VOsA6WLDuDBA6935djohWGGeUIKeQhXwDwu1CKx1b8+6YMMIvFr/y2dpPWoct+5/IjFz84a2MnbABwpoNB9YA==,
+        integrity: sha512-mLt3rxUYgjavAaoyN234SmWJ1tv6hpZ1zn1ioUyV9g6qNR1TcuLDZeA+bx7wrdQsBuKrG31ssOF7W2gWYJZxCw==,
       }
     engines: {node: ">= 10"}
     cpu: [x64]
@@ -3134,10 +3140,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@next/swc-linux-arm-gnueabihf/12.1.1:
+  /@next/swc-linux-arm-gnueabihf/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-1urXtWwqjqbbpJBWeJYz5ATgelKacVNdKIdhfahbsmW+DZGoK5TYovgieyHFYUCyHdTuKeLTVR62ahIRUBv1YA==,
+        integrity: sha512-7jkGI7nPGBrnCQfOhoe2spn/PNqMZbspdkX2kcbnIsUzor4Bm03ZFL76NTK7XO9q1H5wnsEeAftPCx8GExiaDA==,
       }
     engines: {node: ">= 10"}
     cpu: [arm]
@@ -3145,10 +3151,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@next/swc-linux-arm64-gnu/12.1.1:
+  /@next/swc-linux-arm64-gnu/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-CDD9yFuknDvTOzzDnvfmb58USI5Vu6FUyzw96udKj7KA/n1YrNQ4K8X7KsDCRZoqfRWYceAyj1EpwHkfdiB7bg==,
+        integrity: sha512-bxiZpiEuKfS0Oh7GdQJQUqY/z7vndBygQFkqtji62xnUmoI64LGxAwG3Wix+MfZqRu3OYv482fUKKBYsZ7zopQ==,
       }
     engines: {node: ">= 10"}
     cpu: [arm64]
@@ -3156,10 +3162,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@next/swc-linux-arm64-musl/12.1.1:
+  /@next/swc-linux-arm64-musl/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-nxyjgmbOpZm7gGPj9EV5Cqosoujt+ih/8SO2XG+BetgfAk0+c15793DHVAljNuc8GF9wpzqQnjMMUZ211VmQsg==,
+        integrity: sha512-IloJSboqPXy7Z6glS6M9l0J/rqSNe3Kv38651YZyvJ04oUEgCM+zZpO5bqwH2U5zvzbcuvIsnx01X8KuyT7pYQ==,
       }
     engines: {node: ">= 10"}
     cpu: [arm64]
@@ -3167,10 +3173,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@next/swc-linux-x64-gnu/12.1.1:
+  /@next/swc-linux-x64-gnu/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-L8Cu8kH3Vn2dnRpvcvGGA1TlmDP2WXJ+qDwvjb/ikDXLdRdmFvJwHh45JUGiW2FHed3lGseOgNsuYiDvnT8Cdw==,
+        integrity: sha512-Vj3Eo49sNxov3Uqp/F3M2Ae0fc0MEN/5OMQ7RdD0BDKRDtg6BZuie1u7XB6/dSUJ5/Yr/CYXpmFPxUaxptgL5g==,
       }
     engines: {node: ">= 10"}
     cpu: [x64]
@@ -3178,10 +3184,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@next/swc-linux-x64-musl/12.1.1:
+  /@next/swc-linux-x64-musl/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-4RAb7L69MoRSggBqUfF3OrtBCUN2zPDi7asfL7bfxEhH10LGzyfil8dT0GVjPOPFz/SyLx3ORd6avGij2IlJUA==,
+        integrity: sha512-tOaVOurrFWyPezjuYgEHjuo1rRNdDDRe1X+Ypl7jjGk39uPnnAJRYOhItEUmuIJI9gQKsx+Ls1FvBT4N2yeLXA==,
       }
     engines: {node: ">= 10"}
     cpu: [x64]
@@ -3189,10 +3195,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@next/swc-win32-arm64-msvc/12.1.1:
+  /@next/swc-win32-arm64-msvc/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-zvkuNIgOxkAU3RbzWRGCcFasDxWJdhONt2YeRGe39dJERHhEFA1u4HgaZw/SFE/kfrNRUZbXjJNAg3OU/EpPZw==,
+        integrity: sha512-oOIirLj/xhq1pQz6anbRBowleRR+AGd1ZFP3BS8e2ypdjgzaphY/U7WonffDA0JSAcs4Pzt0vYmkXmf52VSBaA==,
       }
     engines: {node: ">= 10"}
     cpu: [arm64]
@@ -3200,10 +3206,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@next/swc-win32-ia32-msvc/12.1.1:
+  /@next/swc-win32-ia32-msvc/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-GsNDtZ//uKWNVjiwv3YKQYsDXuRWTz8jTmxopf5Ws3dK+zA77hn4o46LBQg0JPCNqTUO6eIOlUBjqSL6ejxmSQ==,
+        integrity: sha512-Zld1RyPjY+e8E1DKCmmkj1qRf61dmg8o6efp3vtzg0qfUaG8mIBsVrghLGSRMla9x+/iKKGqjvw/teJWAiqttw==,
       }
     engines: {node: ">= 10"}
     cpu: [ia32]
@@ -3211,10 +3217,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@next/swc-win32-x64-msvc/12.1.1:
+  /@next/swc-win32-x64-msvc/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-nH5osn/uK9wsjT8Jh1YxMtRrkN5hoCNLQjsEdvfUfb+loQXeYiBd3n/0DUJkf6Scjfv6/htfUTPP3AEa7AbBxQ==,
+        integrity: sha512-gAj3x6WqHPAhQY0Gq5F4LakkHIe61KkkwN4DnMf/tgHM9G1H+babeYYUjSKZvWl1X7CJsdZq/LGzXhmG4PQDyw==,
       }
     engines: {node: ">= 10"}
     cpu: [x64]
@@ -3426,7 +3432,7 @@ packages:
         integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==,
       }
     dependencies:
-      "@hapi/hoek": 9.2.1
+      "@hapi/hoek": 9.3.0
     dev: false
 
   /@sideway/formula/3.0.0:
@@ -3856,6 +3862,16 @@ packages:
       }
     dev: true
 
+  /@types/hoist-non-react-statics/3.3.1:
+    resolution:
+      {
+        integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==,
+      }
+    dependencies:
+      "@types/react": 17.0.43
+      hoist-non-react-statics: 3.3.2
+    dev: false
+
   /@types/http-cache-semantics/4.0.1:
     resolution:
       {
@@ -4113,7 +4129,6 @@ packages:
       {
         integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==,
       }
-    dev: true
 
   /@types/qs/6.9.7:
     resolution:
@@ -4156,7 +4171,6 @@ packages:
       "@types/prop-types": 15.7.5
       "@types/scheduler": 0.16.2
       csstype: 3.0.11
-    dev: true
 
   /@types/resolve/1.17.1:
     resolution:
@@ -4191,7 +4205,6 @@ packages:
       {
         integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==,
       }
-    dev: true
 
   /@types/secure-password/3.1.1:
     resolution:
@@ -4610,12 +4623,12 @@ packages:
     engines: {node: ">=0.4.0"}
     hasBin: true
 
-  /address/1.1.2:
+  /address/1.2.0:
     resolution:
       {
-        integrity: sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==,
+        integrity: sha512-tNEZYz5G/zYunxFm7sfhAxkXEuLj3K6BKwv6ZURlsF6yiUQ65z0Q2wZW9L5cPUl9ocofGvXOdFYbFHp0+6MOig==,
       }
-    engines: {node: ">= 0.12.0"}
+    engines: {node: ">= 10.0.0"}
     dev: false
 
   /agent-base/6.0.2:
@@ -4812,10 +4825,10 @@ packages:
     resolution: {integrity: sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=}
     dev: true
 
-  /array-includes/3.1.4:
+  /array-includes/3.1.5:
     resolution:
       {
-        integrity: sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==,
+        integrity: sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==,
       }
     engines: {node: ">= 0.4"}
     dependencies:
@@ -4975,7 +4988,7 @@ packages:
         integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==,
       }
     dependencies:
-      follow-redirects: 1.14.9
+      follow-redirects: 1.15.0
     transitivePeerDependencies:
       - debug
     dev: true
@@ -4986,7 +4999,7 @@ packages:
         integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==,
       }
     dependencies:
-      follow-redirects: 1.14.9
+      follow-redirects: 1.15.0
     transitivePeerDependencies:
       - debug
     dev: false
@@ -5318,7 +5331,7 @@ packages:
     hasBin: true
     dependencies:
       caniuse-lite: 1.0.30001334
-      electron-to-chromium: 1.4.128
+      electron-to-chromium: 1.4.132
       escalade: 3.1.1
       node-releases: 2.0.4
       picocolors: 1.0.0
@@ -5948,20 +5961,20 @@ packages:
     engines: {node: ">=0.10.0"}
     dev: false
 
-  /core-js-compat/3.22.3:
+  /core-js-compat/3.22.4:
     resolution:
       {
-        integrity: sha512-wliMbvPI2idgFWpFe7UEyHMvu6HWgW8WA+HnDRtgzoSDYvXFMpoGX1H3tPDDXrcfUSyXafCLDd7hOeMQHEZxGw==,
+        integrity: sha512-dIWcsszDezkFZrfm1cnB4f/J85gyhiCpxbgBdohWCDtSVuAaChTSpPV7ldOQf/Xds2U5xCIJZOK82G4ZPAIswA==,
       }
     dependencies:
       browserslist: 4.20.3
       semver: 7.0.0
     dev: false
 
-  /core-js-pure/3.22.3:
+  /core-js-pure/3.22.4:
     resolution:
       {
-        integrity: sha512-oN88zz7nmKROMy8GOjs+LN+0LedIvbMdnB5XsTlhcOg1WGARt9l0LFg0zohdoFmCsEZ1h2ZbSQ6azj3M+vhzwQ==,
+        integrity: sha512-4iF+QZkpzIz0prAFuepmxwJ2h5t4agvE8WPYqs2mjLJMNNwJOnpch76w2Q7bUfCPEv/V7wpvOfog0w273M+ZSw==,
       }
     requiresBuild: true
     dev: false
@@ -6060,7 +6073,6 @@ packages:
       {
         integrity: sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==,
       }
-    dev: true
 
   /csv-generate/3.4.3:
     resolution:
@@ -6421,7 +6433,7 @@ packages:
     engines: {node: ">= 4.2.1"}
     hasBin: true
     dependencies:
-      address: 1.1.2
+      address: 1.2.0
       debug: 2.6.9
     dev: false
 
@@ -6616,10 +6628,10 @@ packages:
       jake: 10.8.5
     dev: false
 
-  /electron-to-chromium/1.4.128:
+  /electron-to-chromium/1.4.132:
     resolution:
       {
-        integrity: sha512-DT8G+2drgywCWN+74jbYJ7yXbdec9wefs+K8C0Tu2Hbhj7K0nod17Iq8hoS21MpuYYrL6oXu2Kd636KmzXVugQ==,
+        integrity: sha512-JYdZUw/1068NWN+SwXQ7w6Ue0bWYGihvSUNNQwurvcDV/SM7vSiGZ3NuFvFgoEiCs4kB8xs3cX2an3wB7d4TBw==,
       }
 
   /emittery/0.8.1:
@@ -6710,8 +6722,8 @@ packages:
       object-inspect: 1.12.0
       object-keys: 1.1.1
       object.assign: 4.1.2
-      string.prototype.trimend: 1.0.4
-      string.prototype.trimstart: 1.0.4
+      string.prototype.trimend: 1.0.5
+      string.prototype.trimstart: 1.0.5
       unbox-primitive: 1.0.2
     dev: false
 
@@ -7609,7 +7621,7 @@ packages:
     peerDependencies:
       eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
     dependencies:
-      array-includes: 3.1.4
+      array-includes: 3.1.5
       array.prototype.flat: 1.3.0
       debug: 2.6.9
       doctrine: 2.1.0
@@ -7635,14 +7647,14 @@ packages:
     dependencies:
       "@babel/runtime": 7.17.9
       aria-query: 4.2.2
-      array-includes: 3.1.4
+      array-includes: 3.1.5
       ast-types-flow: 0.0.7
       axe-core: 4.4.1
       axobject-query: 2.2.0
       damerau-levenshtein: 1.0.8
       emoji-regex: 9.2.2
       has: 1.0.3
-      jsx-ast-utils: 3.2.2
+      jsx-ast-utils: 3.3.0
       language-tags: 1.0.5
       minimatch: 3.1.2
     dev: false
@@ -7666,11 +7678,11 @@ packages:
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
     dependencies:
-      array-includes: 3.1.4
+      array-includes: 3.1.5
       array.prototype.flatmap: 1.3.0
       doctrine: 2.1.0
       estraverse: 5.3.0
-      jsx-ast-utils: 3.2.2
+      jsx-ast-utils: 3.3.0
       minimatch: 3.1.2
       object.entries: 1.1.5
       object.fromentries: 2.0.5
@@ -8295,18 +8307,18 @@ packages:
         integrity: sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==,
       }
 
-  /flow-parser/0.176.3:
+  /flow-parser/0.177.0:
     resolution:
       {
-        integrity: sha512-KDzHEoEtc/kbW7NzujhfFkcTCdNi6VK91UpcdT3tc3yEAQdh4JXAEY/0TVJKipjRuVm8E2FxX/3B5Xpm3EFWXA==,
+        integrity: sha512-Ac1OwHjSoUALrcnHTTD6oaEPITaxYmP34iiEEcuCxeeD+tOKR7/Toaw4RpJKcDmYxLX79ZP9E7z+Q8ze9pESbQ==,
       }
     engines: {node: ">=0.4.0"}
     dev: false
 
-  /follow-redirects/1.14.9:
+  /follow-redirects/1.15.0:
     resolution:
       {
-        integrity: sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==,
+        integrity: sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==,
       }
     engines: {node: ">=4.0"}
     peerDependencies:
@@ -8817,6 +8829,15 @@ packages:
     hasBin: true
     dev: true
 
+  /hoist-non-react-statics/3.3.2:
+    resolution:
+      {
+        integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==,
+      }
+    dependencies:
+      react-is: 16.13.1
+    dev: false
+
   /hookable/5.1.1:
     resolution:
       {
@@ -10178,7 +10199,7 @@ packages:
         integrity: sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw==,
       }
     dependencies:
-      "@hapi/hoek": 9.2.1
+      "@hapi/hoek": 9.3.0
       "@hapi/topo": 5.1.0
       "@sideway/address": 4.1.4
       "@sideway/formula": 3.0.0
@@ -10241,7 +10262,7 @@ packages:
       "@babel/register": 7.17.7_@babel+core@7.17.10
       babel-core: 7.0.0-bridge.0_@babel+core@7.17.10
       colors: 1.4.0
-      flow-parser: 0.176.3
+      flow-parser: 0.177.0
       graceful-fs: 4.2.10
       micromatch: 3.1.10
       neo-async: 2.6.2
@@ -10334,7 +10355,7 @@ packages:
       whatwg-encoding: 2.0.0
       whatwg-mimetype: 3.0.0
       whatwg-url: 10.0.0
-      ws: 8.5.0
+      ws: 8.6.0
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -10443,7 +10464,7 @@ packages:
       lodash.isplainobject: 4.0.6
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
-      ms: 2.1.3
+      ms: 2.1.2
       semver: 5.7.1
     dev: false
 
@@ -10454,14 +10475,14 @@ packages:
       promise: 7.3.1
     dev: true
 
-  /jsx-ast-utils/3.2.2:
+  /jsx-ast-utils/3.3.0:
     resolution:
       {
-        integrity: sha512-HDAyJ4MNQBboGpUnHAVUNJs6X0lh058s6FuixsFGP7MgJYpD6Vasd6nzSG5iIfXu1zAYlHJ/zsOKNlrenTUBnw==,
+        integrity: sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==,
       }
     engines: {node: ">=4.0"}
     dependencies:
-      array-includes: 3.1.4
+      array-includes: 3.1.5
       object.assign: 4.1.2
     dev: false
 
@@ -11465,10 +11486,10 @@ packages:
       }
     dev: false
 
-  /next/12.1.1:
+  /next/12.1.6-canary.17:
     resolution:
       {
-        integrity: sha512-IOfEIAgroMtsoYz6HXpDS+b5WB9WZ+MH266COXGlcpIiYSgUyJf9xV6vF+zY2RPvBJFT4fUW0EVdVnoOmTloDw==,
+        integrity: sha512-Aw2snJwacpeHiT9bOIH2hmu1UM5PigklTRnZfKOsozJ4ZrapxG2bk/DMc1t/nkn+DH6kSYwWJXMIKfysP/vymg==,
       }
     engines: {node: ">=12.22.0"}
     hasBin: true
@@ -11486,33 +11507,32 @@ packages:
       sass:
         optional: true
     dependencies:
-      "@next/env": 12.1.1
+      "@next/env": 12.1.6-canary.17
       caniuse-lite: 1.0.30001334
       postcss: 8.4.5
-      styled-jsx: 5.0.1
-      use-subscription: 1.5.1
+      styled-jsx: 5.0.2
     optionalDependencies:
-      "@next/swc-android-arm-eabi": 12.1.1
-      "@next/swc-android-arm64": 12.1.1
-      "@next/swc-darwin-arm64": 12.1.1
-      "@next/swc-darwin-x64": 12.1.1
-      "@next/swc-linux-arm-gnueabihf": 12.1.1
-      "@next/swc-linux-arm64-gnu": 12.1.1
-      "@next/swc-linux-arm64-musl": 12.1.1
-      "@next/swc-linux-x64-gnu": 12.1.1
-      "@next/swc-linux-x64-musl": 12.1.1
-      "@next/swc-win32-arm64-msvc": 12.1.1
-      "@next/swc-win32-ia32-msvc": 12.1.1
-      "@next/swc-win32-x64-msvc": 12.1.1
+      "@next/swc-android-arm-eabi": 12.1.6-canary.17
+      "@next/swc-android-arm64": 12.1.6-canary.17
+      "@next/swc-darwin-arm64": 12.1.6-canary.17
+      "@next/swc-darwin-x64": 12.1.6-canary.17
+      "@next/swc-linux-arm-gnueabihf": 12.1.6-canary.17
+      "@next/swc-linux-arm64-gnu": 12.1.6-canary.17
+      "@next/swc-linux-arm64-musl": 12.1.6-canary.17
+      "@next/swc-linux-x64-gnu": 12.1.6-canary.17
+      "@next/swc-linux-x64-musl": 12.1.6-canary.17
+      "@next/swc-win32-arm64-msvc": 12.1.6-canary.17
+      "@next/swc-win32-ia32-msvc": 12.1.6-canary.17
+      "@next/swc-win32-x64-msvc": 12.1.6-canary.17
     transitivePeerDependencies:
       - "@babel/core"
       - babel-plugin-macros
     dev: false
 
-  /next/12.1.1_zpnidt7m3osuk7shl3s4oenomq:
+  /next/12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq:
     resolution:
       {
-        integrity: sha512-IOfEIAgroMtsoYz6HXpDS+b5WB9WZ+MH266COXGlcpIiYSgUyJf9xV6vF+zY2RPvBJFT4fUW0EVdVnoOmTloDw==,
+        integrity: sha512-Aw2snJwacpeHiT9bOIH2hmu1UM5PigklTRnZfKOsozJ4ZrapxG2bk/DMc1t/nkn+DH6kSYwWJXMIKfysP/vymg==,
       }
     engines: {node: ">=12.22.0"}
     hasBin: true
@@ -11530,26 +11550,25 @@ packages:
       sass:
         optional: true
     dependencies:
-      "@next/env": 12.1.1
+      "@next/env": 12.1.6-canary.17
       caniuse-lite: 1.0.30001334
       postcss: 8.4.5
       react: 18.0.0
       react-dom: 18.0.0_react@18.0.0
-      styled-jsx: 5.0.1_react@18.0.0
-      use-subscription: 1.5.1_react@18.0.0
+      styled-jsx: 5.0.2_react@18.0.0
     optionalDependencies:
-      "@next/swc-android-arm-eabi": 12.1.1
-      "@next/swc-android-arm64": 12.1.1
-      "@next/swc-darwin-arm64": 12.1.1
-      "@next/swc-darwin-x64": 12.1.1
-      "@next/swc-linux-arm-gnueabihf": 12.1.1
-      "@next/swc-linux-arm64-gnu": 12.1.1
-      "@next/swc-linux-arm64-musl": 12.1.1
-      "@next/swc-linux-x64-gnu": 12.1.1
-      "@next/swc-linux-x64-musl": 12.1.1
-      "@next/swc-win32-arm64-msvc": 12.1.1
-      "@next/swc-win32-ia32-msvc": 12.1.1
-      "@next/swc-win32-x64-msvc": 12.1.1
+      "@next/swc-android-arm-eabi": 12.1.6-canary.17
+      "@next/swc-android-arm64": 12.1.6-canary.17
+      "@next/swc-darwin-arm64": 12.1.6-canary.17
+      "@next/swc-darwin-x64": 12.1.6-canary.17
+      "@next/swc-linux-arm-gnueabihf": 12.1.6-canary.17
+      "@next/swc-linux-arm64-gnu": 12.1.6-canary.17
+      "@next/swc-linux-arm64-musl": 12.1.6-canary.17
+      "@next/swc-linux-x64-gnu": 12.1.6-canary.17
+      "@next/swc-linux-x64-musl": 12.1.6-canary.17
+      "@next/swc-win32-arm64-msvc": 12.1.6-canary.17
+      "@next/swc-win32-ia32-msvc": 12.1.6-canary.17
+      "@next/swc-win32-x64-msvc": 12.1.6-canary.17
     transitivePeerDependencies:
       - "@babel/core"
       - babel-plugin-macros
@@ -11613,10 +11632,10 @@ packages:
     engines: {node: ">=6.0.0"}
     dev: true
 
-  /nodemailer/6.7.4:
+  /nodemailer/6.7.5:
     resolution:
       {
-        integrity: sha512-TBSS3qS8WG45ycUwEvEA/3UM1o3sLz9jUl4TPUKPz4ImWWM6UgRCb5pLO+HOouDKEj57yNLOrzQlO8+9IjWZoA==,
+        integrity: sha512-6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg==,
       }
     engines: {node: ">=6.0.0"}
     dev: true
@@ -12348,10 +12367,10 @@ packages:
     engines: {node: ">=0.10.0"}
     dev: false
 
-  /postcss/8.4.12:
+  /postcss/8.4.13:
     resolution:
       {
-        integrity: sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==,
+        integrity: sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==,
       }
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
@@ -12476,7 +12495,7 @@ packages:
       dayjs: 1.11.1
       debug: 4.3.4
       mailparser: 3.5.0
-      nodemailer: 6.7.4
+      nodemailer: 6.7.5
       open: 7.4.2
       pug: 3.0.2
       uuid: 8.3.2
@@ -13416,7 +13435,7 @@ packages:
     dependencies:
       jszip: 3.9.1
       tmp: 0.2.1
-      ws: 8.5.0
+      ws: 8.6.0
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -13953,24 +13972,26 @@ packages:
       side-channel: 1.0.4
     dev: false
 
-  /string.prototype.trimend/1.0.4:
+  /string.prototype.trimend/1.0.5:
     resolution:
       {
-        integrity: sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==,
+        integrity: sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==,
       }
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
+      es-abstract: 1.19.5
     dev: false
 
-  /string.prototype.trimstart/1.0.4:
+  /string.prototype.trimstart/1.0.5:
     resolution:
       {
-        integrity: sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==,
+        integrity: sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==,
       }
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
+      es-abstract: 1.19.5
     dev: false
 
   /string_decoder/1.1.1:
@@ -14075,10 +14096,10 @@ packages:
       }
     engines: {node: ">=8"}
 
-  /styled-jsx/5.0.1:
+  /styled-jsx/5.0.2:
     resolution:
       {
-        integrity: sha512-+PIZ/6Uk40mphiQJJI1202b+/dYeTVd9ZnMPR80pgiWbjIwvN2zIp4r9et0BgqBuShh48I0gttPlAXA7WVvBxw==,
+        integrity: sha512-LqPQrbBh3egD57NBcHET4qcgshPks+yblyhPlH2GY8oaDgKs8SK4C3dBh3oSJjgzJ3G5t1SYEZGHkP+QEpX9EQ==,
       }
     engines: {node: ">= 12.0.0"}
     peerDependencies:
@@ -14092,10 +14113,10 @@ packages:
         optional: true
     dev: false
 
-  /styled-jsx/5.0.1_react@18.0.0:
+  /styled-jsx/5.0.2_react@18.0.0:
     resolution:
       {
-        integrity: sha512-+PIZ/6Uk40mphiQJJI1202b+/dYeTVd9ZnMPR80pgiWbjIwvN2zIp4r9et0BgqBuShh48I0gttPlAXA7WVvBxw==,
+        integrity: sha512-LqPQrbBh3egD57NBcHET4qcgshPks+yblyhPlH2GY8oaDgKs8SK4C3dBh3oSJjgzJ3G5t1SYEZGHkP+QEpX9EQ==,
       }
     engines: {node: ">= 12.0.0"}
     peerDependencies:
@@ -14123,7 +14144,7 @@ packages:
       }
     engines: {node: ">=10"}
     dependencies:
-      debug: 4.3.3
+      debug: 4.3.4
       lodash.clonedeep: 4.5.0
     transitivePeerDependencies:
       - supports-color
@@ -15035,28 +15056,6 @@ packages:
       querystring: 0.2.0
     dev: false
 
-  /use-subscription/1.5.1:
-    resolution:
-      {
-        integrity: sha512-Xv2a1P/yReAjAbhylMfFplFKj9GssgTwN7RlcTxBujFQcloStWNDQdc4g4NRWH9xS4i/FDk04vQBptAXoF3VcA==,
-      }
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0
-    dependencies:
-      object-assign: 4.1.1
-    dev: false
-
-  /use-subscription/1.5.1_react@18.0.0:
-    resolution:
-      {
-        integrity: sha512-Xv2a1P/yReAjAbhylMfFplFKj9GssgTwN7RlcTxBujFQcloStWNDQdc4g4NRWH9xS4i/FDk04vQBptAXoF3VcA==,
-      }
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0
-    dependencies:
-      object-assign: 4.1.1
-      react: 18.0.0
-
   /use/3.1.1:
     resolution:
       {
@@ -15172,10 +15171,10 @@ packages:
       replace-ext: 1.0.1
     dev: false
 
-  /vite/2.9.6:
+  /vite/2.9.7:
     resolution:
       {
-        integrity: sha512-3IffdrByHW95Yjv0a13TQOQfJs7L5dVlSPuTt432XLbRMriWbThqJN2k/IS6kXn5WY4xBLhK9XoaWay1B8VzUw==,
+        integrity: sha512-5hH7aNQe8rJiTTqCtPNX/6mIKlGw+1wg8UXwAxDIIN8XaSR+Zx3GT2zSu7QKa1vIaBqfUODGh3vpwY8r0AW/jw==,
       }
     engines: {node: ">=12.2.0"}
     hasBin: true
@@ -15192,7 +15191,7 @@ packages:
         optional: true
     dependencies:
       esbuild: 0.14.36
-      postcss: 8.4.12
+      postcss: 8.4.13
       resolve: 1.22.0
       rollup: 2.70.2
     optionalDependencies:
@@ -15228,7 +15227,7 @@ packages:
       local-pkg: 0.4.1
       tinypool: 0.1.3
       tinyspy: 0.3.2
-      vite: 2.9.6
+      vite: 2.9.7
     transitivePeerDependencies:
       - less
       - sass
@@ -15572,10 +15571,10 @@ packages:
       utf-8-validate:
         optional: true
 
-  /ws/8.5.0:
+  /ws/8.6.0:
     resolution:
       {
-        integrity: sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==,
+        integrity: sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==,
       }
     engines: {node: ">=10.0.0"}
     peerDependencies: