pnpmlock

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

.changeset/olive-bees-buy.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Fix templates source in RPC codemod step

.changeset/pre.json

@@ -39,6 +39,7 @@
     "nice-starfishes-live",
     "nine-onions-admire",
     "ninety-pets-heal",
+    "olive-bees-buy",
     "olive-feet-rhyme",
     "plenty-bottles-swim",
     "poor-peas-lick",
@@ -47,6 +48,7 @@
     "quiet-feet-travel",
     "rich-chairs-invent",
     "sharp-falcons-begin",
+    "shy-olives-hang",
     "silent-colts-reply",
     "small-socks-confess",
     "stupid-walls-sell",
@@ -54,10 +56,12 @@
     "tasty-news-collect",
     "ten-rivers-burn",
     "tender-pianos-check",
+    "thick-parrots-float",
     "thirty-countries-build",
     "twenty-beans-pump",
     "two-kiwis-help",
     "unlucky-papayas-sleep",
+    "violet-bags-leave",
     "weak-suns-shave",
     "wicked-ghosts-cough",
     "wise-frogs-give"

.changeset/shy-olives-hang.md

@@ -0,0 +1,6 @@
+---
+"@blitzjs/rpc": patch
+"@blitzjs/generator": patch
+---
+
+Update RPC plugin setup in templates

.changeset/thick-parrots-float.md

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

.changeset/violet-bags-leave.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Update templates directory for codemod

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

@@ -7,12 +7,6 @@ export const { withBlitz } = setupBlitzClient({
     AuthClientPlugin({
       cookiePrefix: "web-cookie-prefix",
     }),
-    BlitzRpcPlugin({
-      reactQueryOptions: {
-        queries: {
-          staleTime: 7000,
-        },
-      },
-    }),
+    BlitzRpcPlugin({}),
   ],
 })

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

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

@@ -7,13 +7,7 @@ const {withBlitz} = setupBlitzClient({
     AuthClientPlugin({
       cookiePrefix: "no-suspense-tests-cookie-prefix",
     }),
-    BlitzRpcPlugin({
-      reactQueryOptions: {
-        queries: {
-          staleTime: 7000,
-        },
-      },
-    }),
+    BlitzRpcPlugin({}),
   ],
 })
 

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

@@ -7,13 +7,7 @@ const {withBlitz} = setupBlitzClient({
     AuthClientPlugin({
       cookiePrefix: "trailing-slash-tests-cookie-prefix",
     }),
-    BlitzRpcPlugin({
-      reactQueryOptions: {
-        queries: {
-          staleTime: 7000,
-        },
-      },
-    }),
+    BlitzRpcPlugin({}),
   ],
 })
 

integration-tests/utils/blitz-test-utils.tsx

@@ -80,21 +80,7 @@ const BlitzWrapper = ({plugins, children}) => {
 export function render(ui: RenderUI, {wrapper, router, ...options}: RenderOptions = {}) {
   if (!wrapper) {
     wrapper = ({children}) => {
-      return (
-        <BlitzWrapper
-          plugins={[
-            BlitzRpcPlugin({
-              reactQueryOptions: {
-                queries: {
-                  staleTime: 7000,
-                },
-              },
-            }),
-          ]}
-        >
-          {children}
-        </BlitzWrapper>
-      )
+      return <BlitzWrapper plugins={[BlitzRpcPlugin({})]}>{children}</BlitzWrapper>
     }
   }
 

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @blitzjs/auth
 
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.32
+
+## 2.0.0-alpha.31
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.31
+
 ## 2.0.0-alpha.30
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.33",
   "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.30",
+    "blitz": "2.0.0-alpha.33",
     "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.30",
+    "@blitzjs/config": "workspace:2.0.0-alpha.33",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/cookie": "0.4.1",

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @blitzjs/next
 
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.32
+
+## 2.0.0-alpha.31
+
+### Patch Changes
+
+- Updated dependencies [17ce29e5]
+  - @blitzjs/rpc@2.0.0-alpha.31
+
 ## 2.0.0-alpha.30
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.33",
   "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.30",
+    "@blitzjs/rpc": "2.0.0-alpha.33",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
@@ -32,7 +32,7 @@
     "superjson": "1.8.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.30",
+    "@blitzjs/config": "workspace:2.0.0-alpha.33",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -43,7 +43,7 @@
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.30",
+    "blitz": "2.0.0-alpha.33",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "lodash.frompairs": "4.0.1",

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @blitzjs/rpc
 
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.33
+- blitz@2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.32
+- blitz@2.0.0-alpha.32
+
+## 2.0.0-alpha.31
+
+### Patch Changes
+
+- 17ce29e5: Update RPC plugin setup in templates
+  - blitz@2.0.0-alpha.31
+  - @blitzjs/auth@2.0.0-alpha.31
+
 ## 2.0.0-alpha.30
 
 ### Patch Changes

packages/blitz-rpc/package.json

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

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

@@ -10,8 +10,9 @@ interface BlitzRpcOptions {
   reactQueryOptions?: DefaultOptions
 }
 export const BlitzRpcPlugin = createClientPlugin<BlitzRpcOptions, any>(
-  ({reactQueryOptions}: BlitzRpcOptions) => {
+  (options?: BlitzRpcOptions) => {
     const initializeQueryClient = () => {
+      const {reactQueryOptions} = options || {}
       let suspenseEnabled = reactQueryOptions?.queries?.suspense ?? true
       if (!process.env.CLI_COMMAND_CONSOLE && !process.env.CLI_COMMAND_DB) {
         globalThis.__BLITZ_SUSPENSE_ENABLED = suspenseEnabled

packages/blitz/CHANGELOG.md

@@ -1,5 +1,24 @@
 # blitz
 
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.32
+
+## 2.0.0-alpha.31
+
+### Patch Changes
+
+- Updated dependencies [17ce29e5]
+  - @blitzjs/generator@2.0.0-alpha.31
+
 ## 2.0.0-alpha.30
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.33",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.30",
+    "@blitzjs/generator": "2.0.0-alpha.33",
     "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.30",
+    "@blitzjs/config": "workspace:2.0.0-alpha.33",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

packages/codemod/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @blitzjs/codemod
 
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- 9e05d6e1: allow extension catch in getAllFiles codemod util
+  - @blitzjs/generator@2.0.0-alpha.33
+  - blitz@2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+### Patch Changes
+
+- e6fb09d4: Fix templates source in RPC codemod step
+  - @blitzjs/generator@2.0.0-alpha.32
+  - blitz@2.0.0-alpha.32
+
+## 2.0.0-alpha.31
+
+### Patch Changes
+
+- 46d9f81a: Update templates directory for codemod
+- Updated dependencies [17ce29e5]
+  - @blitzjs/generator@2.0.0-alpha.31
+  - blitz@2.0.0-alpha.31
+
 ## 2.0.0-alpha.30
 
 ### Patch Changes

packages/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/codemod",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.33",
   "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.30",
+    "@blitzjs/generator": "2.0.0-alpha.33",
     "arg": "5.0.1",
-    "blitz": "2.0.0-alpha.30",
+    "blitz": "2.0.0-alpha.33",
     "chalk": "^4.1.0",
     "cross-spawn": "7.0.3",
     "debug": "4.3.3",

packages/codemod/src/upgrade-legacy.ts

@@ -7,7 +7,6 @@ import {
   findDefaultExportPath,
   findFunction,
   findImport,
-  findImportSpecifier,
   findVariable,
   getAllFiles,
   getCollectionFromSource,
@@ -15,6 +14,8 @@ import {
 } from "./utils"
 import {log} from "blitz"
 
+const isInternalBlitzMonorepoDevelopment = fs.existsSync(path.join(__dirname, "../../blitz-next"))
+
 const upgradeLegacy = async () => {
   let isTypescript = fs.existsSync(path.resolve("tsconfig.json"))
   let blitzConfigFile = `blitz.config.${isTypescript ? "ts" : "js"}`
@@ -169,7 +170,7 @@ const upgradeLegacy = async () => {
         BlitzLayout: "@blitzjs/next",
       }
 
-      getAllFiles(appDir, [], [], [".css"]).forEach((filename) => {
+      getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((filename) => {
         const program = getCollectionFromSource(path.resolve(appDir, filename))
         const parsedProgram = program.get()
 
@@ -212,7 +213,7 @@ const upgradeLegacy = async () => {
   steps.push({
     name: "update NextJS' default imports",
     action: async () => {
-      getAllFiles(appDir, [], [], [".css"]).forEach((file) => {
+      getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const program = getCollectionFromSource(file)
 
         const nextImage = findImport(program, "next/image")
@@ -270,7 +271,7 @@ const upgradeLegacy = async () => {
           require.resolve("@blitzjs/generator"),
           "..",
           "..",
-          "templates",
+          isInternalBlitzMonorepoDevelopment ? "templates" : "dist/templates",
         )
         const blitzServer = fs
           .readFileSync(path.join(templatePath, "app", "app", "blitz-server.ts"))
@@ -307,7 +308,12 @@ const upgradeLegacy = async () => {
     name: "create pages/api/rpc directory and add [[...blitz]].ts wildecard API route",
     action: async () => {
       const pagesDir = path.resolve("pages/api/rpc")
-      const templatePath = path.join(require.resolve("@blitzjs/generator"), "..", "..", "templates")
+      const templatePath = path.join(
+        require.resolve("@blitzjs/generator"),
+        "..",
+        "..",
+        isInternalBlitzMonorepoDevelopment ? "templates" : "dist/templates",
+      )
       const rpcRoute = fs
         .readFileSync(path.join(templatePath, "app", "pages", "api", "rpc", "blitzrpcroute.ts"))
         .toString()
@@ -471,7 +477,7 @@ const upgradeLegacy = async () => {
     action: async () => {
       //First check ./pages
       const pagesDir = path.resolve("pages")
-      getAllFiles(pagesDir, [], [], [".css"]).forEach((file) => {
+      getAllFiles(pagesDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const filepath = path.resolve(pagesDir, file)
         const program = getCollectionFromSource(filepath)
 
@@ -514,7 +520,7 @@ const upgradeLegacy = async () => {
         fs.writeFileSync(filepath, program.toSource())
       })
 
-      getAllFiles(appDir, [], [], [".css"]).forEach((file) => {
+      getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const filepath = path.resolve(appDir, file)
         const program = getCollectionFromSource(filepath)
 
@@ -644,7 +650,7 @@ const upgradeLegacy = async () => {
     name: "wrap getServerSideProps, getStaticProps and API handlers with gSSP, gSP, and api",
     action: async () => {
       const pagesDir = path.resolve("pages")
-      getAllFiles(pagesDir, [], ["api"]).forEach((file) => {
+      getAllFiles(pagesDir, [], ["api"], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const program = getCollectionFromSource(file)
 
         // 1. getServerSideProps
@@ -668,7 +674,12 @@ const upgradeLegacy = async () => {
 
       // 3. api
       if (fs.existsSync(path.join(pagesDir, "api"))) {
-        getAllFiles(path.join(pagesDir, "api"), [], ["rpc"]).forEach((file) => {
+        getAllFiles(
+          path.join(pagesDir, "api"),
+          [],
+          ["rpc"],
+          [".ts", ".tsx", ".js", ".jsx"],
+        ).forEach((file) => {
           const program = getCollectionFromSource(file)
 
           const defaultExportPath = findDefaultExportPath(program)
@@ -691,7 +702,7 @@ const upgradeLegacy = async () => {
     action: async () => {
       let errors = 0
 
-      getAllFiles(appDir, [], ["components"], [".css"]).forEach((file) => {
+      getAllFiles(appDir, [], ["components"], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const program = getCollectionFromSource(file)
         const middlewarePath = findVariable(program, "middleware")
         if (middlewarePath?.length) {
@@ -711,7 +722,7 @@ const upgradeLegacy = async () => {
     action: async () => {
       let errors = 0
 
-      getAllFiles(appDir, [], [], [".css"]).forEach((file) => {
+      getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const program = getCollectionFromSource(file)
         const invokeWithMiddlewarePath = findCallExpression(program, "invokeWithMiddleware")
         if (invokeWithMiddlewarePath?.length) {
@@ -720,7 +731,7 @@ const upgradeLegacy = async () => {
         }
       })
 
-      getAllFiles(path.resolve("pages"), [], [], [".css"]).forEach((file) => {
+      getAllFiles(path.resolve("pages"), [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const program = getCollectionFromSource(file)
         const invokeWithMiddlewarePath = findCallExpression(program, "invokeWithMiddleware")
         if (invokeWithMiddlewarePath?.length) {

packages/codemod/src/utils.ts

@@ -192,17 +192,21 @@ export function getAllFiles(
   dirPath: string,
   accFiles: string[] = [],
   skipDirs?: string[],
-  skipExt?: string[],
+  allowedExt?: string[],
 ) {
   let currentFiles = fs.readdirSync(dirPath)
 
   currentFiles.forEach((file) => {
     if (fs.statSync(dirPath + "/" + file).isDirectory()) {
       if (!skipDirs?.includes(file)) {
-        accFiles = getAllFiles(dirPath + "/" + file, accFiles, skipDirs, skipExt)
+        accFiles = getAllFiles(dirPath + "/" + file, accFiles, skipDirs, allowedExt)
       }
     } else {
-      if (!skipExt?.includes(path.extname(file))) {
+      if (allowedExt?.length) {
+        if (allowedExt?.includes(path.extname(file))) {
+          accFiles.push(path.join(dirPath, "/", file))
+        }
+      } else {
         accFiles.push(path.join(dirPath, "/", file))
       }
     }

packages/config/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+## 2.0.0-alpha.31
+
 ## 2.0.0-alpha.30
 
 ## 2.0.0-alpha.29

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+## 2.0.0-alpha.31
+
+### Patch Changes
+
+- 17ce29e5: Update RPC plugin setup in templates
+
 ## 2.0.0-alpha.30
 
 ## 2.0.0-alpha.29

packages/generator/package.json

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

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

@@ -7,12 +7,6 @@ export const { withBlitz } = setupBlitzClient({
     AuthClientPlugin({
       cookiePrefix: "__safeNameSlug__-cookie-prefix",
     }),
-    BlitzRpcPlugin({
-      reactQueryOptions: {
-        queries: {
-          staleTime: 7000,
-        },
-      },
-    }),
+    BlitzRpcPlugin({}),
   ],
 })

packages/pkg-template/package.json

@@ -25,7 +25,7 @@
     "@typescript-eslint/parser": "5.9.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.30",
+    "@blitzjs/config": "2.0.0-alpha.33",
     "@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.30
+      blitz: workspace:2.0.0-alpha.33
       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.30
-      "@blitzjs/generator": 2.0.0-alpha.30
+      "@blitzjs/config": workspace:2.0.0-alpha.33
+      "@blitzjs/generator": 2.0.0-alpha.33
       "@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.30
+      "@blitzjs/config": workspace:2.0.0-alpha.33
       "@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.30
+      blitz: 2.0.0-alpha.33
       cookie: 0.4.1
       cookie-session: 2.0.0
       debug: 4.3.3
@@ -604,8 +604,8 @@ importers:
 
   packages/blitz-next:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.30
-      "@blitzjs/rpc": 2.0.0-alpha.30
+      "@blitzjs/config": workspace:2.0.0-alpha.33
+      "@blitzjs/rpc": 2.0.0-alpha.33
       "@testing-library/dom": 8.13.0
       "@testing-library/jest-dom": 5.16.3
       "@testing-library/react": 13.0.0
@@ -617,7 +617,7 @@ importers:
       "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@types/testing-library__react-hooks": 4.0.0
-      blitz: 2.0.0-alpha.30
+      blitz: 2.0.0-alpha.33
       cross-spawn: 7.0.3
       debug: 4.3.3
       find-up: 4.1.0
@@ -669,14 +669,14 @@ importers:
 
   packages/blitz-rpc:
     specifiers:
-      "@blitzjs/auth": 2.0.0-alpha.30
-      "@blitzjs/config": workspace:2.0.0-alpha.30
+      "@blitzjs/auth": 2.0.0-alpha.33
+      "@blitzjs/config": workspace:2.0.0-alpha.33
       "@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.30
+      blitz: 2.0.0-alpha.33
       chalk: ^4.1.0
       debug: 4.3.3
       next: 12.1.6-canary.17
@@ -718,12 +718,12 @@ importers:
       "@babel/plugin-syntax-typescript": 7.17.12
       "@babel/preset-env": 7.12.10
       "@blitzjs/config": workspace:*
-      "@blitzjs/generator": 2.0.0-alpha.30
+      "@blitzjs/generator": 2.0.0-alpha.33
       "@types/jscodeshift": 0.11.2
       "@types/node": 17.0.16
       arg: 5.0.1
       ast-types: 0.14.2
-      blitz: 2.0.0-alpha.30
+      blitz: 2.0.0-alpha.33
       chalk: ^4.1.0
       cross-spawn: 7.0.3
       debug: 4.3.3
@@ -778,7 +778,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.30
+      "@blitzjs/config": 2.0.0-alpha.33
       "@juanm04/cpx": 2.0.1
       "@mrleebo/prisma-ast": 0.2.6
       "@types/babel__core": 7.1.19
@@ -869,7 +869,7 @@ importers:
 
   packages/pkg-template:
     specifiers:
-      "@blitzjs/config": 2.0.0-alpha.30
+      "@blitzjs/config": 2.0.0-alpha.33
       "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@typescript-eslint/eslint-plugin": 5.9.1
@@ -940,7 +940,7 @@ packages:
       "@babel/parser": 7.18.4
       "@babel/template": 7.16.7
       "@babel/traverse": 7.18.2
-      "@babel/types": 7.17.12
+      "@babel/types": 7.18.4
       convert-source-map: 1.8.0
       debug: 4.3.4
       gensync: 1.0.0-beta.2
@@ -2293,7 +2293,7 @@ packages:
       "@babel/helper-module-imports": 7.16.7
       "@babel/helper-plugin-utils": 7.17.12
       "@babel/plugin-syntax-jsx": 7.17.12_@babel+core@7.18.2
-      "@babel/types": 7.17.12
+      "@babel/types": 7.18.4
     dev: true
 
   /@babel/plugin-transform-regenerator/7.18.0_@babel+core@7.12.10:
@@ -2589,7 +2589,7 @@ packages:
       }
     engines: {node: ">=6.9.0"}
     dependencies:
-      core-js-pure: 3.22.7
+      core-js-pure: 3.22.8
       regenerator-runtime: 0.13.9
 
   /@babel/runtime/7.18.3:
@@ -3344,7 +3344,7 @@ packages:
       }
     dependencies:
       "@babel/runtime": 7.18.3
-      "@types/node": 12.20.52
+      "@types/node": 12.20.55
       find-up: 4.1.0
       fs-extra: 8.1.0
     dev: false
@@ -3980,7 +3980,7 @@ packages:
       }
     dependencies:
       "@babel/parser": 7.18.4
-      "@babel/types": 7.17.12
+      "@babel/types": 7.18.4
       "@types/babel__generator": 7.6.4
       "@types/babel__template": 7.4.1
       "@types/babel__traverse": 7.17.1
@@ -3991,7 +3991,7 @@ packages:
         integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==,
       }
     dependencies:
-      "@babel/types": 7.17.12
+      "@babel/types": 7.18.4
 
   /@types/babel__template/7.4.1:
     resolution:
@@ -4000,7 +4000,7 @@ packages:
       }
     dependencies:
       "@babel/parser": 7.18.4
-      "@babel/types": 7.17.12
+      "@babel/types": 7.18.4
 
   /@types/babel__traverse/7.17.1:
     resolution:
@@ -4008,7 +4008,7 @@ packages:
         integrity: sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==,
       }
     dependencies:
-      "@babel/types": 7.17.12
+      "@babel/types": 7.18.4
 
   /@types/body-parser/1.19.2:
     resolution:
@@ -4260,10 +4260,10 @@ packages:
       jest-matcher-utils: 27.5.1
       pretty-format: 27.5.1
 
-  /@types/jest/27.5.1:
+  /@types/jest/28.1.1:
     resolution:
       {
-        integrity: sha512-fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ==,
+        integrity: sha512-C2p7yqleUKtCkVjlOur9BWVA4HgUQmEj/HWCt5WzZ5mLXrWnyIfl0wGuArc+kBXsy0ZZfLp+7dywB4HtSVYGVA==,
       }
     dependencies:
       jest-matcher-utils: 27.5.1
@@ -4400,10 +4400,10 @@ packages:
       form-data: 3.0.1
     dev: true
 
-  /@types/node/12.20.52:
+  /@types/node/12.20.55:
     resolution:
       {
-        integrity: sha512-cfkwWw72849SNYp3Zx0IcIs25vABmFh73xicxhCkTcvtZQeIez15PpwQN8fY3RD7gv1Wrxlc9MEtfMORZDEsGw==,
+        integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==,
       }
     dev: false
 
@@ -4486,10 +4486,10 @@ packages:
       }
     dev: true
 
-  /@types/prettier/2.6.1:
+  /@types/prettier/2.6.3:
     resolution:
       {
-        integrity: sha512-XFjFHmaLVifrAKaZ+EKghFHtHSUonyw8P2Qmy2/+osBnrKbH9UYtlK10zg8/kCt47MFilll/DEDKy3DHfJ0URw==,
+        integrity: sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==,
       }
 
   /@types/preview-email/2.0.1:
@@ -4652,7 +4652,7 @@ packages:
         integrity: sha512-oKZe+Mf4ioWlMuzVBaXQ9WDnEm1+umLx0InILg+yvZVBBDmzV5KfZyLrCvadtWcx8+916jLmHafcmqqffl+iIw==,
       }
     dependencies:
-      "@types/jest": 27.5.1
+      "@types/jest": 28.1.1
     dev: true
 
   /@types/testing-library__react-hooks/4.0.0_zpnidt7m3osuk7shl3s4oenomq:
@@ -4774,16 +4774,16 @@ packages:
       - supports-color
     dev: false
 
-  /@typescript-eslint/experimental-utils/5.26.0_hrkuebk64jiu2ut2d2sm4oylnu:
+  /@typescript-eslint/experimental-utils/5.27.1_hrkuebk64jiu2ut2d2sm4oylnu:
     resolution:
       {
-        integrity: sha512-OgUGXC/teXD8PYOkn33RSwBJPVwL0I2ipm5OHr9g9cfAhVrPC2DxQiWqaq88MNO5mbr/ZWnav3EVBpuwDreS5Q==,
+        integrity: sha512-Vd8uewIixGP93sEnmTRIH6jHZYRQRkGPDPpapACMvitJKX8335VHNyqKTE+mZ+m3E2c5VznTZfSsSsS5IF7vUA==,
       }
     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.26.0_hrkuebk64jiu2ut2d2sm4oylnu
+      "@typescript-eslint/utils": 5.27.1_hrkuebk64jiu2ut2d2sm4oylnu
       eslint: 7.32.0
     transitivePeerDependencies:
       - supports-color
@@ -4831,10 +4831,10 @@ packages:
       - typescript
     dev: false
 
-  /@typescript-eslint/parser/5.26.0_hrkuebk64jiu2ut2d2sm4oylnu:
+  /@typescript-eslint/parser/5.27.1_hrkuebk64jiu2ut2d2sm4oylnu:
     resolution:
       {
-        integrity: sha512-n/IzU87ttzIdnAH5vQ4BBDnLPly7rC5VnjN3m0xBG82HK6rhRxnCb3w/GyWbNDghPd+NktJqB/wl6+YkzZ5T5Q==,
+        integrity: sha512-7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -4844,9 +4844,9 @@ packages:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/scope-manager": 5.26.0
-      "@typescript-eslint/types": 5.26.0
-      "@typescript-eslint/typescript-estree": 5.26.0_typescript@4.6.3
+      "@typescript-eslint/scope-manager": 5.27.1
+      "@typescript-eslint/types": 5.27.1
+      "@typescript-eslint/typescript-estree": 5.27.1_typescript@4.6.3
       debug: 4.3.4
       eslint: 7.32.0
       typescript: 4.6.3
@@ -4899,15 +4899,15 @@ packages:
       - supports-color
     dev: false
 
-  /@typescript-eslint/scope-manager/5.26.0:
+  /@typescript-eslint/scope-manager/5.27.1:
     resolution:
       {
-        integrity: sha512-gVzTJUESuTwiju/7NiTb4c5oqod8xt5GhMbExKsCTp6adU3mya6AGJ4Pl9xC7x2DX9UYFsjImC0mA62BCY22Iw==,
+        integrity: sha512-fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      "@typescript-eslint/types": 5.26.0
-      "@typescript-eslint/visitor-keys": 5.26.0
+      "@typescript-eslint/types": 5.27.1
+      "@typescript-eslint/visitor-keys": 5.27.1
     dev: true
 
   /@typescript-eslint/scope-manager/5.9.1:
@@ -4963,10 +4963,10 @@ packages:
       - supports-color
     dev: false
 
-  /@typescript-eslint/types/5.26.0:
+  /@typescript-eslint/types/5.27.1:
     resolution:
       {
-        integrity: sha512-8794JZFE1RN4XaExLWLI2oSXsVImNkl79PzTOOWt9h0UHROwJedNOD2IJyfL0NbddFllcktGIO2aOu10avQQyA==,
+        integrity: sha512-LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
@@ -4978,10 +4978,10 @@ packages:
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  /@typescript-eslint/typescript-estree/5.26.0_typescript@4.6.3:
+  /@typescript-eslint/typescript-estree/5.27.1_typescript@4.6.3:
     resolution:
       {
-        integrity: sha512-EyGpw6eQDsfD6jIqmXP3rU5oHScZ51tL/cZgFbFBvWuCwrIptl+oueUZzSmLtxFuSOQ9vDcJIs+279gnJkfd1w==,
+        integrity: sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -4990,8 +4990,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/types": 5.26.0
-      "@typescript-eslint/visitor-keys": 5.26.0
+      "@typescript-eslint/types": 5.27.1
+      "@typescript-eslint/visitor-keys": 5.27.1
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
@@ -5025,19 +5025,19 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@typescript-eslint/utils/5.26.0_hrkuebk64jiu2ut2d2sm4oylnu:
+  /@typescript-eslint/utils/5.27.1_hrkuebk64jiu2ut2d2sm4oylnu:
     resolution:
       {
-        integrity: sha512-PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg==,
+        integrity: sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w==,
       }
     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.26.0
-      "@typescript-eslint/types": 5.26.0
-      "@typescript-eslint/typescript-estree": 5.26.0_typescript@4.6.3
+      "@typescript-eslint/scope-manager": 5.27.1
+      "@typescript-eslint/types": 5.27.1
+      "@typescript-eslint/typescript-estree": 5.27.1_typescript@4.6.3
       eslint: 7.32.0
       eslint-scope: 5.1.1
       eslint-utils: 3.0.0_eslint@7.32.0
@@ -5046,14 +5046,14 @@ packages:
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.26.0:
+  /@typescript-eslint/visitor-keys/5.27.1:
     resolution:
       {
-        integrity: sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q==,
+        integrity: sha512-xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ==,
       }
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      "@typescript-eslint/types": 5.26.0
+      "@typescript-eslint/types": 5.27.1
       eslint-visitor-keys: 3.3.0
     dev: true
 
@@ -5508,10 +5508,10 @@ packages:
       }
     dev: false
 
-  /async/3.2.3:
+  /async/3.2.4:
     resolution:
       {
-        integrity: sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==,
+        integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==,
       }
     dev: false
 
@@ -5643,7 +5643,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       "@babel/template": 7.16.7
-      "@babel/types": 7.17.12
+      "@babel/types": 7.18.4
       "@types/babel__core": 7.1.19
       "@types/babel__traverse": 7.17.1
 
@@ -5689,7 +5689,7 @@ packages:
       }
     engines: {node: ">= 10.0.0"}
     dependencies:
-      "@babel/types": 7.17.12
+      "@babel/types": 7.18.4
     dev: true
 
   /babylon/6.18.0:
@@ -6540,7 +6540,7 @@ packages:
       }
     dependencies:
       "@babel/parser": 7.18.4
-      "@babel/types": 7.17.12
+      "@babel/types": 7.18.4
     dev: true
 
   /content-disposition/0.5.4:
@@ -6632,10 +6632,10 @@ packages:
       browserslist: 4.20.3
       semver: 7.0.0
 
-  /core-js-pure/3.22.7:
+  /core-js-pure/3.22.8:
     resolution:
       {
-        integrity: sha512-wTriFxiZI+C8msGeh7fJcbC/a0V8fdInN1oS2eK79DMBGs8iIJiXhtFJCiT3rBa8w6zroHWW3p8ArlujZ/Mz+w==,
+        integrity: sha512-bOxbZIy9S5n4OVH63XaLVXZ49QKicjowDx/UELyJ68vxfCRpYsbyh/WNZNfEfAk+ekA8vSjt+gCDpvh672bc3w==,
       }
     requiresBuild: true
 
@@ -7456,7 +7456,7 @@ packages:
       is-shared-array-buffer: 1.0.2
       is-string: 1.0.7
       is-weakref: 1.0.2
-      object-inspect: 1.12.1
+      object-inspect: 1.12.2
       object-keys: 1.1.1
       object.assign: 4.1.2
       regexp.prototype.flags: 1.4.3
@@ -8325,11 +8325,11 @@ packages:
     dependencies:
       "@next/eslint-plugin-next": 12.1.6
       "@rushstack/eslint-patch": 1.1.3
-      "@typescript-eslint/parser": 5.26.0_hrkuebk64jiu2ut2d2sm4oylnu
+      "@typescript-eslint/parser": 5.27.1_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_y6whhoimfujgclng5bly5nyove
+      eslint-plugin-import: 2.26.0_wpehoe7sv7ux6tdegk3fwlchdi
       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 +8393,7 @@ packages:
     dependencies:
       debug: 4.3.4
       eslint: 7.32.0
-      eslint-plugin-import: 2.26.0_y6whhoimfujgclng5bly5nyove
+      eslint-plugin-import: 2.26.0_wpehoe7sv7ux6tdegk3fwlchdi
       glob: 7.2.0
       is-glob: 4.0.3
       resolve: 1.22.0
@@ -8402,6 +8402,36 @@ 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:
       {
@@ -8432,36 +8462,6 @@ packages:
       - supports-color
     dev: false
 
-  /eslint-module-utils/2.7.3_yxrttxwxgn5axzfjkhhzgts2eq:
-    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.26.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 +8495,7 @@ packages:
       - supports-color
     dev: false
 
-  /eslint-plugin-import/2.26.0_y6whhoimfujgclng5bly5nyove:
+  /eslint-plugin-import/2.26.0_wpehoe7sv7ux6tdegk3fwlchdi:
     resolution:
       {
         integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==,
@@ -8508,14 +8508,14 @@ packages:
       "@typescript-eslint/parser":
         optional: true
     dependencies:
-      "@typescript-eslint/parser": 5.26.0_hrkuebk64jiu2ut2d2sm4oylnu
+      "@typescript-eslint/parser": 5.27.1_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_yxrttxwxgn5axzfjkhhzgts2eq
+      eslint-module-utils: 2.7.3_4wf6ctbofaywkfx7kzk32kp7ge
       has: 1.0.3
       is-core-module: 2.8.1
       is-glob: 4.0.3
@@ -8658,7 +8658,7 @@ packages:
     peerDependencies:
       eslint: ^7.5.0 || ^8.0.0
     dependencies:
-      "@typescript-eslint/experimental-utils": 5.26.0_hrkuebk64jiu2ut2d2sm4oylnu
+      "@typescript-eslint/experimental-utils": 5.27.1_hrkuebk64jiu2ut2d2sm4oylnu
       eslint: 7.32.0
     transitivePeerDependencies:
       - supports-color
@@ -10781,7 +10781,7 @@ packages:
     engines: {node: ">=10"}
     hasBin: true
     dependencies:
-      async: 3.2.3
+      async: 3.2.4
       chalk: 4.1.2
       filelist: 1.0.4
       minimatch: 3.1.2
@@ -11214,11 +11214,11 @@ packages:
       "@babel/generator": 7.18.2
       "@babel/plugin-syntax-typescript": 7.17.12_@babel+core@7.18.2
       "@babel/traverse": 7.18.2
-      "@babel/types": 7.17.12
+      "@babel/types": 7.18.4
       "@jest/transform": 27.5.1
       "@jest/types": 27.5.1
       "@types/babel__traverse": 7.17.1
-      "@types/prettier": 2.6.1
+      "@types/prettier": 2.6.3
       babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.2
       chalk: 4.1.2
       expect: 27.5.1
@@ -11341,10 +11341,10 @@ packages:
     engines: {node: ">=10"}
     dev: true
 
-  /jpeg-js/0.4.3:
+  /jpeg-js/0.4.4:
     resolution:
       {
-        integrity: sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==,
+        integrity: sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==,
       }
     dev: true
 
@@ -11856,7 +11856,7 @@ packages:
       listr2: 3.14.0
       micromatch: 4.0.5
       normalize-path: 3.0.0
-      object-inspect: 1.12.1
+      object-inspect: 1.12.2
       string-argv: 0.3.1
       supports-color: 9.2.2
       yaml: 1.10.2
@@ -12130,10 +12130,10 @@ packages:
     hasBin: true
     dev: true
 
-  /macos-release/3.0.1:
+  /macos-release/3.1.0:
     resolution:
       {
-        integrity: sha512-3l6OrhdDg2H2SigtuN3jBh+5dRJRWxNKuJTPBbGeNJTsmt/pj9PO25wYaNb05NuNmAsl435j4rDP6rgNXz7s7g==,
+        integrity: sha512-/M/R0gCDgM+Cv1IuBG1XGdfTFnMEG6PZeT+KGWHO/OG+imqmaD9CH5vHBTycEM3+Kc4uG2Il+tFAuUWLqQOeUA==,
       }
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: false
@@ -12996,10 +12996,10 @@ packages:
       kind-of: 3.2.2
     dev: false
 
-  /object-inspect/1.12.1:
+  /object-inspect/1.12.2:
     resolution:
       {
-        integrity: sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==,
+        integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==,
       }
 
   /object-keys/1.1.1:
@@ -13205,7 +13205,7 @@ packages:
       }
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
-      macos-release: 3.0.1
+      macos-release: 3.1.0
       windows-release: 5.0.1
     dev: false
 
@@ -13755,7 +13755,7 @@ packages:
       debug: 4.3.4
       extract-zip: 2.0.1
       https-proxy-agent: 5.0.1
-      jpeg-js: 0.4.3
+      jpeg-js: 0.4.4
       mime: 2.6.0
       pngjs: 5.0.0
       progress: 2.0.3
@@ -14598,7 +14598,10 @@ packages:
     dev: false
 
   /repeat-string/1.6.1:
-    resolution: {integrity: sha1-jcrkcOHIirwtYA//Sndihtp15jc=}
+    resolution:
+      {
+        integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==,
+      }
     engines: {node: ">=0.10"}
     dev: false
 
@@ -14611,7 +14614,10 @@ packages:
     dev: false
 
   /require-directory/2.1.1:
-    resolution: {integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=}
+    resolution:
+      {
+        integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==,
+      }
     engines: {node: ">=0.10.0"}
 
   /require-from-string/2.0.2:
@@ -14659,7 +14665,10 @@ packages:
     engines: {node: ">=8"}
 
   /resolve-url/0.2.1:
-    resolution: {integrity: sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=}
+    resolution:
+      {
+        integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==,
+      }
     deprecated: https://github.com/lydell/resolve-url#deprecated
     dev: false
 
@@ -14691,7 +14700,10 @@ packages:
       path-parse: 1.0.7
 
   /responselike/1.0.2:
-    resolution: {integrity: sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=}
+    resolution:
+      {
+        integrity: sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==,
+      }
     dependencies:
       lowercase-keys: 1.0.1
     dev: false
@@ -14723,7 +14735,10 @@ packages:
     engines: {node: ">=0.12"}
 
   /retry/0.12.0:
-    resolution: {integrity: sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=}
+    resolution:
+      {
+        integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==,
+      }
     engines: {node: ">= 4"}
     dev: true
 
@@ -14836,7 +14851,10 @@ packages:
       }
 
   /safe-regex/1.1.0:
-    resolution: {integrity: sha1-QKNmnzsHfR6UPURinhV91IAjvy4=}
+    resolution:
+      {
+        integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==,
+      }
     dependencies:
       ret: 0.1.15
     dev: false
@@ -15066,7 +15084,7 @@ packages:
     dependencies:
       call-bind: 1.0.2
       get-intrinsic: 1.1.1
-      object-inspect: 1.12.1
+      object-inspect: 1.12.2
 
   /signal-exit/3.0.7:
     resolution:
@@ -16640,10 +16658,10 @@ packages:
       replace-ext: 1.0.1
     dev: false
 
-  /vite/2.9.9:
+  /vite/2.9.10:
     resolution:
       {
-        integrity: sha512-ffaam+NgHfbEmfw/Vuh6BHKKlI/XIAhxE5QSS7gFLIngxg171mg1P3a4LSRME0z2ZU1ScxoKzphkipcYwSD5Ew==,
+        integrity: sha512-TwZRuSMYjpTurLqXspct+HZE7ONiW9d+wSWgvADGxhDPPyoIcNywY+RX4ng+QpK30DCa1l/oZgi2PLZDibhzbQ==,
       }
     engines: {node: ">=12.2.0"}
     hasBin: true
@@ -16696,7 +16714,7 @@ packages:
       local-pkg: 0.4.1
       tinypool: 0.1.3
       tinyspy: 0.3.2
-      vite: 2.9.9
+      vite: 2.9.10
     transitivePeerDependencies:
       - less
       - sass
@@ -16980,7 +16998,7 @@ packages:
     engines: {node: ">= 10.0.0"}
     dependencies:
       "@babel/parser": 7.18.4
-      "@babel/types": 7.17.12
+      "@babel/types": 7.18.4
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
     dev: true