diff --git a/.changeset/violet-lions-help.md b/.changeset/violet-lions-help.md new file mode 100644 index 000000000..0c32710c0 --- /dev/null +++ b/.changeset/violet-lions-help.md @@ -0,0 +1,5 @@ +--- +"@blitzjs/rpc": patch +--- + +Add resolverBasePath to Blitz config to change the way rpc routes are generated diff --git a/.npmrc b/.npmrc index 769480fc0..da6e0e169 100644 --- a/.npmrc +++ b/.npmrc @@ -6,3 +6,4 @@ public-hoist-pattern[]=*types* public-hoist-pattern[]=*eslint* public-hoist-pattern[]=@prettier/plugin-* public-hoist-pattern[]=*prettier-plugin-* +strict-peer-dependencies=false diff --git a/apps/web/next.config.js b/apps/web/next.config.js index 05eae5452..64049a51f 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -10,6 +10,7 @@ module.exports = withBlitz( customServer: { hotReload: false, }, + resolverBasePath: "root", }, }), ) diff --git a/packages/blitz-next/src/index-server.ts b/packages/blitz-next/src/index-server.ts index d0f90bf99..e6636d006 100644 --- a/packages/blitz-next/src/index-server.ts +++ b/packages/blitz-next/src/index-server.ts @@ -1,3 +1,4 @@ +import type {NextConfig} from "next" import { GetServerSideProps, GetServerSidePropsResult, @@ -7,21 +8,20 @@ import { NextApiResponse, } from "next" import type { - Ctx as BlitzCtx, + AddParameters, + AsyncFunc, BlitzServerPlugin, + Ctx as BlitzCtx, + FirstParam, Middleware, MiddlewareResponse, - AsyncFunc, - FirstParam, - AddParameters, } from "blitz" import {handleRequestWithMiddleware, startWatcher, stopWatcher} from "blitz" -import type {NextConfig} from "next" -import {getQueryKey, getInfiniteQueryKey, installWebpackConfig} from "@blitzjs/rpc" -import {dehydrate} from "@blitzjs/rpc" +import {dehydrate, getQueryKey, getInfiniteQueryKey, loaderClient, loaderServer} from "@blitzjs/rpc" import {DefaultOptions, QueryClient} from "react-query" import {IncomingMessage, ServerResponse} from "http" import {withSuperJsonProps} from "./superjson" +import {ResolverBasePath} from "@blitzjs/rpc/src/index-server" export * from "./index-browser" @@ -133,12 +133,59 @@ export const setupBlitzServer = ({plugins}: SetupBlitzOptions) => { export interface BlitzConfig extends NextConfig { blitz?: { + resolverBasePath?: ResolverBasePath customServer?: { hotReload?: boolean } } } +interface WebpackRuleOptions { + resolverBasePath?: ResolverBasePath +} + +interface WebpackRule { + test: RegExp + use: Array<{ + loader: string + options: WebpackRuleOptions + }> +} + +interface InstallWebpackConfigOptions { + webpackConfig: { + module: { + rules: WebpackRule[] + } + } + nextConfig: BlitzConfig +} + +export function installWebpackConfig({webpackConfig, nextConfig}: InstallWebpackConfigOptions) { + const options: WebpackRuleOptions = { + resolverBasePath: nextConfig.blitz?.resolverBasePath, + } + + webpackConfig.module.rules.push({ + test: /\/\[\[\.\.\.blitz]]\.[jt]s$/, + use: [ + { + loader: loaderServer, + options, + }, + ], + }) + webpackConfig.module.rules.push({ + test: /[\\/](queries|mutations)[\\/]/, + use: [ + { + loader: loaderClient, + options, + }, + ], + }) +} + export function withBlitz(nextConfig: BlitzConfig = {}) { if ( process.env.NODE_ENV !== "production" && @@ -158,8 +205,8 @@ export function withBlitz(nextConfig: BlitzConfig = {}) { } const config = Object.assign({}, nextConfig, { - webpack: (config: any, options: any) => { - installWebpackConfig(config) + webpack: (config: InstallWebpackConfigOptions["webpackConfig"], options: any) => { + installWebpackConfig({webpackConfig: config, nextConfig}) if (typeof nextConfig.webpack === "function") { return nextConfig.webpack(config, options) } diff --git a/packages/blitz-rpc/src/data-client/rpc.ts b/packages/blitz-rpc/src/data-client/rpc.ts index fc5b39631..1754b66cc 100644 --- a/packages/blitz-rpc/src/data-client/rpc.ts +++ b/packages/blitz-rpc/src/data-client/rpc.ts @@ -2,7 +2,7 @@ import {normalizePathTrailingSlash} from "next/dist/client/normalize-trailing-sl import {addBasePath} from "next/dist/shared/lib/router/router" import {deserialize, serialize} from "superjson" import {SuperJSONResult} from "superjson/dist/types" -import {isServer, CSRFTokenMismatchError} from "blitz" +import {CSRFTokenMismatchError, isServer} from "blitz" import {getQueryKeyFromUrlAndParams, queryClient} from "./react-query-utils" import { getAntiCSRFToken, @@ -55,7 +55,7 @@ export function __internal_buildRpcClient({ resolverType, routePath, }: BuildRpcClientParams): RpcClient { - const fullRoutePath = normalizeApiRoute("/api/rpc/" + routePath) + const fullRoutePath = normalizeApiRoute("/api/rpc" + routePath) const httpClient: RpcClientBase = async (params, opts = {}) => { const debug = (await import("debug")).default("blitz:rpc") diff --git a/packages/blitz-rpc/src/index-server.ts b/packages/blitz-rpc/src/index-server.ts index e4087f991..507eb2402 100644 --- a/packages/blitz-rpc/src/index-server.ts +++ b/packages/blitz-rpc/src/index-server.ts @@ -1,7 +1,8 @@ -import {assert, Ctx, baseLogger, prettyMs, newLine} from "blitz" +import {assert, baseLogger, Ctx, newLine, prettyMs} from "blitz" import {NextApiRequest, NextApiResponse} from "next" import {deserialize, serialize as superjsonSerialize} from "superjson" import chalk from "chalk" +import {resolve} from "path" // TODO - optimize end user server bundles by not exporting all client stuff here export * from "./index-browser" @@ -24,6 +25,7 @@ function getGlobalObject>(key: string, default type Resolver = (...args: unknown[]) => Promise type ResolverFiles = Record Promise<{default?: Resolver}>> +export type ResolverBasePath = "queries|mutations" | "root" | undefined // We define `global.__internal_blitzRpcResolverFiles` to ensure we use the same global object. // Needed for Next.js. I'm guessing that Next.js is including the `node_modules/` files in a seperate bundle than user files. @@ -47,21 +49,9 @@ export function __internal_addBlitzRpcResolver( return resolver } -import {resolve} from "path" const dir = __dirname + (() => "")() // trick to avoid `@vercel/ncc` to glob import -const loaderServer = resolve(dir, "./loader-server.cjs") -const loaderClient = resolve(dir, "./loader-client.cjs") - -export function installWebpackConfig(config: {module?: {rules?: T}}) { - config.module!.rules!.push({ - test: /\/\[\[\.\.\.blitz]]\.[jt]s$/, - use: [{loader: loaderServer}], - }) - config.module!.rules!.push({ - test: /[\\/](queries|mutations)[\\/]/, - use: [{loader: loaderClient}], - }) -} +export const loaderServer = resolve(dir, "./loader-server.cjs") +export const loaderClient = resolve(dir, "./loader-client.cjs") // ---------- // END LOADER diff --git a/packages/blitz-rpc/src/loader-client.ts b/packages/blitz-rpc/src/loader-client.ts index b3247771f..20f4e853c 100644 --- a/packages/blitz-rpc/src/loader-client.ts +++ b/packages/blitz-rpc/src/loader-client.ts @@ -3,20 +3,13 @@ import { convertFilePathToResolverName, convertFilePathToResolverType, convertPageFilePathToRoutePath, + Loader, + LoaderOptions, toPosixPath, } from "./loader-utils" -import {assert} from "blitz" import {posix} from "path" // Subset of `import type { LoaderDefinitionFunction } from 'webpack'` -type Loader = { - _compiler?: { - name: string - context: string - } - resource: string - cacheable: (enabled: boolean) => void -} export async function loader(this: Loader, input: string): Promise { const compiler = this._compiler! @@ -25,8 +18,12 @@ export async function loader(this: Loader, input: string): Promise { const isSSR = compiler.name === "server" if (!isSSR) { - const code = await transformBlitzRpcResolverClient(input, toPosixPath(id), toPosixPath(root)) - return code + return await transformBlitzRpcResolverClient( + input, + toPosixPath(id), + toPosixPath(root), + this.query, + ) } return input @@ -34,13 +31,18 @@ export async function loader(this: Loader, input: string): Promise { module.exports = loader -export async function transformBlitzRpcResolverClient(_src: string, id: string, root: string) { +export async function transformBlitzRpcResolverClient( + _src: string, + id: string, + root: string, + options?: LoaderOptions, +) { assertPosixPath(id) assertPosixPath(root) const resolverFilePath = "/" + posix.relative(root, id) assertPosixPath(resolverFilePath) - const routePath = convertPageFilePathToRoutePath(resolverFilePath) + const routePath = convertPageFilePathToRoutePath(resolverFilePath, options?.resolverBasePath) const resolverName = convertFilePathToResolverName(resolverFilePath) const resolverType = convertFilePathToResolverType(resolverFilePath) diff --git a/packages/blitz-rpc/src/loader-server.ts b/packages/blitz-rpc/src/loader-server.ts index 624355517..3b6e3ea01 100644 --- a/packages/blitz-rpc/src/loader-server.ts +++ b/packages/blitz-rpc/src/loader-server.ts @@ -1,23 +1,17 @@ -import {posix, join, dirname} from "path" +import {dirname, join, posix} from "path" import {promises} from "fs" import { assertPosixPath, - toPosixPath, buildPageExtensionRegex, - getIsRpcFile, - topLevelFoldersThatMayContainResolvers, convertPageFilePathToRoutePath, + getIsRpcFile, + Loader, + LoaderOptions, + topLevelFoldersThatMayContainResolvers, + toPosixPath, } from "./loader-utils" // Subset of `import type { LoaderDefinitionFunction } from 'webpack'` -type Loader = { - _compiler?: { - name: string - context: string - } - resource: string - cacheable: (enabled: boolean) => void -} export async function loader(this: Loader, input: string): Promise { const compiler = this._compiler! @@ -29,8 +23,13 @@ export async function loader(this: Loader, input: string): Promise { this.cacheable(false) const resolvers = await collectResolvers(root, ["ts", "js"]) - const code = await transformBlitzRpcServer(input, toPosixPath(id), toPosixPath(root), resolvers) - return code + return await transformBlitzRpcServer( + input, + toPosixPath(id), + toPosixPath(root), + resolvers, + this.query, + ) } return input @@ -43,6 +42,7 @@ export async function transformBlitzRpcServer( id: string, root: string, resolvers: string[], + options?: LoaderOptions, ) { assertPosixPath(id) assertPosixPath(root) @@ -55,7 +55,7 @@ export async function transformBlitzRpcServer( for (let resolverFilePath of resolvers) { const relativeResolverPath = posix.relative(dirname(id), join(root, resolverFilePath)) - const routePath = convertPageFilePathToRoutePath(resolverFilePath) + const routePath = convertPageFilePathToRoutePath(resolverFilePath, options?.resolverBasePath) code += `__internal_addBlitzRpcResolver('${routePath}', () => import('${relativeResolverPath}'));` code += "\n" } diff --git a/packages/blitz-rpc/src/loader-utils.test.ts b/packages/blitz-rpc/src/loader-utils.test.ts new file mode 100644 index 000000000..dd222e034 --- /dev/null +++ b/packages/blitz-rpc/src/loader-utils.test.ts @@ -0,0 +1,24 @@ +import {describe, expect, it} from "vitest" +import {convertPageFilePathToRoutePath} from "./loader-utils" + +const FILE_PATH = "app/queries/getData.ts" + +describe("convertPageFilePathToRoutePath", () => { + it("should return the full path when resolverBasePath is set to root", () => { + const res = convertPageFilePathToRoutePath(FILE_PATH, "root") + + expect(res).toEqual("app/queries/getData") + }) + + it("should return the relative path when resolverBasePath is set to queries|mutations", () => { + const res = convertPageFilePathToRoutePath(FILE_PATH, "queries|mutations") + + expect(res).toEqual("/getData") + }) + + it("should return the relative path when resolverBasePath is set to undefined", () => { + const res = convertPageFilePathToRoutePath(FILE_PATH, undefined) + + expect(res).toEqual("/getData") + }) +}) diff --git a/packages/blitz-rpc/src/loader-utils.ts b/packages/blitz-rpc/src/loader-utils.ts index 9c27fd93d..c660dd7f9 100644 --- a/packages/blitz-rpc/src/loader-utils.ts +++ b/packages/blitz-rpc/src/loader-utils.ts @@ -1,5 +1,20 @@ import {assert} from "blitz" -import {win32, posix, sep} from "path" +import {posix, sep, win32} from "path" +import {ResolverBasePath} from "./index-server" + +export interface LoaderOptions { + resolverBasePath?: ResolverBasePath +} + +export interface Loader { + _compiler?: { + name: string + context: string + } + resource: string + cacheable: (enabled: boolean) => void + query: LoaderOptions +} export function assertPosixPath(path: string) { const errMsg = `Wrongly formatted path: ${path}` @@ -34,7 +49,14 @@ export function buildPageExtensionRegex(pageExtensions: string[]) { const fileExtensionRegex = /\.([a-z]+)$/ -export function convertPageFilePathToRoutePath(filePath: string) { +export function convertPageFilePathToRoutePath( + filePath: string, + resolverBasePath: ResolverBasePath, +) { + if (resolverBasePath === "root") { + return filePath.replace(fileExtensionRegex, "") + } + return filePath .replace(/^.*?[\\/]queries[\\/]/, "/") .replace(/^.*?[\\/]mutations[\\/]/, "/") diff --git a/packages/blitz-rpc/src/resolver.test.ts b/packages/blitz-rpc/src/resolver.test.ts index 3a2858cab..5eaac05a1 100644 --- a/packages/blitz-rpc/src/resolver.test.ts +++ b/packages/blitz-rpc/src/resolver.test.ts @@ -1,5 +1,5 @@ import {Ctx} from "blitz" -import {describe, it, expect} from "vitest" +import {describe, expect, it} from "vitest" import {z} from "zod" import {ParserType, resolver} from "./resolver" @@ -44,10 +44,9 @@ const asyncResolver = resolver.pipe( const resolverTest = async ({type}: {type?: ParserType}) => { const resolver1 = type === "sync" ? syncResolver : asyncResolver - const result1 = await resolver1( - {email: "test@example.com"}, - {session: {$authorize: () => undefined} as Ctx}, - ) + const result1 = await resolver1({email: "test@example.com"}, { + session: {$authorize: () => undefined}, + } as Ctx) expect(result1).toBe("test@example.com") const resolver2 = resolver.pipe( @@ -55,9 +54,8 @@ const resolverTest = async ({type}: {type?: ParserType}) => { return input.email }, ) - const result2 = await resolver2( - {email: "test@example.com"}, - {session: {$authorize: () => undefined} as Ctx}, - ) + const result2 = await resolver2({email: "test@example.com"}, { + session: {$authorize: () => undefined}, + } as Ctx) expect(result2).toBe("test@example.com") } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 741bc2446..984c83742 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: 5.4 +lockfileVersion: 5.3 importers: .: @@ -75,17 +75,17 @@ 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.6-canary.17_zpnidt7m3osuk7shl3s4oenomq + next: 12.1.6-canary.17_react-dom@18.0.0+react@18.0.0 prisma: 3.9.0 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 react-hook-form: 7.29.0_react@18.0.0 - ts-node: 10.7.0_fxg3r7oju3tntkxsvleuiot4fa + ts-node: 10.7.0_2dcdb8fdc9a6e6d9aaf2aac9443a7c28 zod: 3.10.1 devDependencies: "@next/bundle-analyzer": 12.0.8 - "@testing-library/react": 13.0.0_zpnidt7m3osuk7shl3s4oenomq - "@testing-library/react-hooks": 7.0.2_zpnidt7m3osuk7shl3s4oenomq + "@testing-library/react": 13.0.0_react-dom@18.0.0+react@18.0.0 + "@testing-library/react-hooks": 7.0.2_react-dom@18.0.0+react@18.0.0 "@types/jest": 27.4.1 "@types/node": 17.0.16 "@types/preview-email": 2.0.1 @@ -132,7 +132,7 @@ importers: "@types/passport-twitter": 1.0.37 blitz: link:../../packages/blitz jest: 27.5.1_ts-node@10.7.0 - next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq + next: 12.1.6-canary.17_react-dom@18.0.0+react@18.0.0 passport-mock-strategy: 2.0.0 passport-twitter: 1.0.4 prisma: 3.9.0 @@ -175,7 +175,7 @@ importers: "@prisma/client": 3.9.0_prisma@3.9.0 blitz: link:../../packages/blitz lowdb: 3.0.0 - next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq + next: 12.1.6-canary.17_react-dom@18.0.0+react@18.0.0 prisma: 3.9.0 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 @@ -223,7 +223,7 @@ importers: "@prisma/client": 3.9.0_prisma@3.9.0 blitz: link:../../packages/blitz lowdb: 3.0.0 - next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq + next: 12.1.6-canary.17_react-dom@18.0.0+react@18.0.0 prisma: 3.9.0 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 @@ -270,19 +270,19 @@ importers: "@blitzjs/rpc": link:../../packages/blitz-rpc "@prisma/client": 3.9.0_prisma@3.9.0 blitz: link:../../packages/blitz - next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq + next: 12.1.6-canary.17_react-dom@18.0.0+react@18.0.0 prisma: 3.9.0 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 - react-query: 3.39.0_zpnidt7m3osuk7shl3s4oenomq + react-query: 3.39.0_react-dom@18.0.0+react@18.0.0 devDependencies: - "@testing-library/react": 13.0.0_zpnidt7m3osuk7shl3s4oenomq + "@testing-library/react": 13.0.0_react-dom@18.0.0+react@18.0.0 "@types/react": 18.0.1 "@vitejs/plugin-react": 1.3.0 delay: 5.0.0 eslint: 7.32.0 - eslint-config-next: 12.1.6_axdrgrznzvogetqifwjbb2u7qy - eslint-plugin-testing-library: 5.0.1_hrkuebk64jiu2ut2d2sm4oylnu + eslint-config-next: 12.1.6_05c713472dcd5c624e082d9210ea9f86 + eslint-plugin-testing-library: 5.0.1_eslint@7.32.0+typescript@4.6.3 jsdom: 19.0.0 typescript: 4.6.3 @@ -310,7 +310,7 @@ importers: "@blitzjs/next": link:../../packages/blitz-next "@blitzjs/rpc": link:../../packages/blitz-rpc blitz: link:../../packages/blitz - next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq + next: 12.1.6-canary.17_react-dom@18.0.0+react@18.0.0 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 devDependencies: @@ -354,7 +354,7 @@ importers: "@prisma/client": 3.9.0_prisma@3.9.0 blitz: link:../../packages/blitz lowdb: 3.0.0 - next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq + next: 12.1.6-canary.17_react-dom@18.0.0+react@18.0.0 prisma: 3.9.0 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 @@ -404,7 +404,7 @@ importers: devDependencies: "@blitzjs/config": link:../../packages/config "@blitzjs/rpc": link:../../packages/blitz-rpc - "@testing-library/react": 13.0.0_zpnidt7m3osuk7shl3s4oenomq + "@testing-library/react": 13.0.0_react-dom@18.0.0+react@18.0.0 "@types/express": 4.17.13 "@types/fs-extra": 9.0.13 "@types/node-fetch": 2.6.1 @@ -422,7 +422,7 @@ importers: playwright-chromium: 1.14.1 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 - react-query: 3.39.0_zpnidt7m3osuk7shl3s4oenomq + react-query: 3.39.0_react-dom@18.0.0+react@18.0.0 resolve-cwd: 3.0.0 resolve-from: 5.0.0 rimraf: 3.0.2 @@ -589,8 +589,8 @@ importers: url: 0.11.0 devDependencies: "@blitzjs/config": link:../config - "@testing-library/react": 13.0.0_zpnidt7m3osuk7shl3s4oenomq - "@testing-library/react-hooks": 7.0.2_zpnidt7m3osuk7shl3s4oenomq + "@testing-library/react": 13.0.0_react-dom@18.0.0+react@18.0.0 + "@testing-library/react-hooks": 7.0.2_react-dom@18.0.0+react@18.0.0 "@types/cookie": 0.4.1 "@types/debug": 4.1.7 "@types/jsonwebtoken": 8.5.8 @@ -640,25 +640,25 @@ importers: debug: 4.3.3 fs-extra: 10.0.1 hoist-non-react-statics: 3.3.2 - react-query: 3.39.0_zpnidt7m3osuk7shl3s4oenomq + react-query: 3.39.0_react-dom@18.0.0+react@18.0.0 superjson: 1.8.0 devDependencies: "@blitzjs/config": link:../config "@testing-library/dom": 8.13.0 "@testing-library/jest-dom": 5.16.3 - "@testing-library/react": 13.0.0_zpnidt7m3osuk7shl3s4oenomq - "@testing-library/react-hooks": 7.0.2_zpnidt7m3osuk7shl3s4oenomq - "@testing-library/user-event": 13.5.0_tlwynutqiyp5mns3woioasuxnq + "@testing-library/react": 13.0.0_react-dom@18.0.0+react@18.0.0 + "@testing-library/react-hooks": 7.0.2_react-dom@18.0.0+react@18.0.0 + "@testing-library/user-event": 13.5.0_@testing-library+dom@8.13.0 "@types/lodash.frompairs": 4.0.6 "@types/node": 17.0.16 "@types/react": 18.0.1 "@types/react-dom": 17.0.14 - "@types/testing-library__react-hooks": 4.0.0_zpnidt7m3osuk7shl3s4oenomq + "@types/testing-library__react-hooks": 4.0.0_react-dom@18.0.0+react@18.0.0 blitz: link:../blitz cross-spawn: 7.0.3 find-up: 4.1.0 lodash.frompairs: 4.0.1 - next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq + next: 12.1.6-canary.17_react-dom@18.0.0+react@18.0.0 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 resolve-from: 5.0.0 @@ -694,7 +694,7 @@ importers: bad-behavior: 1.0.1 chalk: 4.1.2 debug: 4.3.3 - react-query: 3.39.0_zpnidt7m3osuk7shl3s4oenomq + react-query: 3.39.0_react-dom@18.0.0+react@18.0.0 superjson: 1.8.0 zod: 3.10.1 devDependencies: @@ -703,7 +703,7 @@ importers: "@types/react": 18.0.1 "@types/react-dom": 17.0.14 blitz: link:../blitz - next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq + next: 12.1.6-canary.17_react-dom@18.0.0+react@18.0.0 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 typescript: 4.6.3 @@ -765,10 +765,10 @@ importers: eslint-config-prettier: 8.3.0 typescript: ^4.5.3 dependencies: - "@typescript-eslint/eslint-plugin": 5.9.1_z2xqbpkx26iu62rx2zdto5f5qy - "@typescript-eslint/parser": 5.9.1_typescript@4.6.3 - eslint-config-next: 12.0.7_typescript@4.6.3 - eslint-config-prettier: 8.3.0 + "@typescript-eslint/eslint-plugin": 5.9.1_8d4b52c6a654d64d1d8b695e9b6b2fe5 + "@typescript-eslint/parser": 5.9.1_eslint@7.32.0+typescript@4.6.3 + eslint-config-next: 12.0.7_05c713472dcd5c624e082d9210ea9f86 + eslint-config-prettier: 8.3.0_eslint@7.32.0 devDependencies: typescript: 4.6.3 @@ -857,8 +857,8 @@ importers: "@types/react": 18.0.1 "@types/react-dom": 17.0.14 "@types/vinyl": 2.0.6 - "@typescript-eslint/eslint-plugin": 5.9.1_rvfvfrvgktle2hmlnfpjw2zp4u - "@typescript-eslint/parser": 5.9.1_hrkuebk64jiu2ut2d2sm4oylnu + "@typescript-eslint/eslint-plugin": 5.9.1_8d4b52c6a654d64d1d8b695e9b6b2fe5 + "@typescript-eslint/parser": 5.9.1_eslint@7.32.0+typescript@4.6.3 babylon: 6.18.0 debug: 4.3.3 eslint: 7.32.0 @@ -879,8 +879,8 @@ importers: unbuild: 0.6.9 watch: 1.0.2 dependencies: - "@typescript-eslint/eslint-plugin": 5.9.1_z2xqbpkx26iu62rx2zdto5f5qy - "@typescript-eslint/parser": 5.9.1_typescript@4.6.3 + "@typescript-eslint/eslint-plugin": 5.9.1_8d4b52c6a654d64d1d8b695e9b6b2fe5 + "@typescript-eslint/parser": 5.9.1_eslint@7.32.0+typescript@4.6.3 devDependencies: "@blitzjs/config": link:../config "@types/react": 18.0.1 @@ -940,7 +940,7 @@ packages: "@babel/parser": 7.18.4 "@babel/template": 7.16.7 "@babel/traverse": 7.18.2 - "@babel/types": 7.18.4 + "@babel/types": 7.17.12 convert-source-map: 1.8.0 debug: 4.3.4 gensync: 1.0.0-beta.2 @@ -950,6 +950,7 @@ packages: source-map: 0.5.7 transitivePeerDependencies: - supports-color + dev: false /@babel/core/7.18.2: resolution: @@ -2293,7 +2294,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.18.4 + "@babel/types": 7.17.12 dev: true /@babel/plugin-transform-regenerator/7.18.0_@babel+core@7.12.10: @@ -2589,7 +2590,7 @@ packages: } engines: {node: ">=6.9.0"} dependencies: - core-js-pure: 3.22.8 + core-js-pure: 3.22.7 regenerator-runtime: 0.13.9 /@babel/runtime/7.18.3: @@ -2691,8 +2692,6 @@ packages: semver: 6.3.0 spawndamnit: 2.0.0 validate-npm-package-name: 3.0.0 - transitivePeerDependencies: - - supports-color dev: false /@changesets/apply-release-plan/6.0.0: @@ -2955,6 +2954,7 @@ packages: integrity: sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==, } engines: {node: ">= 12"} + dev: false /@cspotcode/source-map-support/0.7.0: resolution: @@ -2964,6 +2964,7 @@ packages: engines: {node: ">=12"} dependencies: "@cspotcode/source-map-consumer": 0.8.0 + dev: false /@eslint/eslintrc/0.4.3: resolution: @@ -3344,7 +3345,7 @@ packages: } dependencies: "@babel/runtime": 7.18.3 - "@types/node": 12.20.55 + "@types/node": 12.20.52 find-up: 4.1.0 fs-extra: 8.1.0 dev: false @@ -3866,7 +3867,7 @@ packages: redent: 3.0.0 dev: true - /@testing-library/react-hooks/7.0.2_zpnidt7m3osuk7shl3s4oenomq: + /@testing-library/react-hooks/7.0.2_react-dom@18.0.0+react@18.0.0: resolution: { integrity: sha512-dYxpz8u9m4q1TuzfcUApqi8iFfR6R0FaMbr2hjZJy1uC8z+bO/K4v8Gs9eogGKYQop7QsrBTFkv/BCF7MzD2Cg==, @@ -3891,7 +3892,7 @@ packages: react-error-boundary: 3.1.4_react@18.0.0 dev: true - /@testing-library/react/13.0.0_zpnidt7m3osuk7shl3s4oenomq: + /@testing-library/react/13.0.0_react-dom@18.0.0+react@18.0.0: resolution: { integrity: sha512-p0lYA1M7uoEmk2LnCbZLGmHJHyH59sAaZVXChTXlyhV/PRW9LoIh4mdf7tiXsO8BoNG+vN8UnFJff1hbZeXv+w==, @@ -3908,7 +3909,7 @@ packages: react-dom: 18.0.0_react@18.0.0 dev: true - /@testing-library/user-event/13.5.0_tlwynutqiyp5mns3woioasuxnq: + /@testing-library/user-event/13.5.0_@testing-library+dom@8.13.0: resolution: { integrity: sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==, @@ -3940,24 +3941,28 @@ packages: { integrity: sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==, } + dev: false /@tsconfig/node12/1.0.9: resolution: { integrity: sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==, } + dev: false /@tsconfig/node14/1.0.1: resolution: { integrity: sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==, } + dev: false /@tsconfig/node16/1.0.2: resolution: { integrity: sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==, } + dev: false /@types/aria-query/4.2.2: resolution: @@ -3980,7 +3985,7 @@ packages: } dependencies: "@babel/parser": 7.18.4 - "@babel/types": 7.18.4 + "@babel/types": 7.17.12 "@types/babel__generator": 7.6.4 "@types/babel__template": 7.4.1 "@types/babel__traverse": 7.17.1 @@ -3991,7 +3996,7 @@ packages: integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==, } dependencies: - "@babel/types": 7.18.4 + "@babel/types": 7.17.12 /@types/babel__template/7.4.1: resolution: @@ -4000,7 +4005,7 @@ packages: } dependencies: "@babel/parser": 7.18.4 - "@babel/types": 7.18.4 + "@babel/types": 7.17.12 /@types/babel__traverse/7.17.1: resolution: @@ -4008,7 +4013,7 @@ packages: integrity: sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==, } dependencies: - "@babel/types": 7.18.4 + "@babel/types": 7.17.12 /@types/body-parser/1.19.2: resolution: @@ -4260,10 +4265,10 @@ packages: jest-matcher-utils: 27.5.1 pretty-format: 27.5.1 - /@types/jest/28.1.1: + /@types/jest/27.5.1: resolution: { - integrity: sha512-C2p7yqleUKtCkVjlOur9BWVA4HgUQmEj/HWCt5WzZ5mLXrWnyIfl0wGuArc+kBXsy0ZZfLp+7dywB4HtSVYGVA==, + integrity: sha512-fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ==, } dependencies: jest-matcher-utils: 27.5.1 @@ -4400,10 +4405,10 @@ packages: form-data: 3.0.1 dev: true - /@types/node/12.20.55: + /@types/node/12.20.52: resolution: { - integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==, + integrity: sha512-cfkwWw72849SNYp3Zx0IcIs25vABmFh73xicxhCkTcvtZQeIez15PpwQN8fY3RD7gv1Wrxlc9MEtfMORZDEsGw==, } dev: false @@ -4412,6 +4417,7 @@ packages: { integrity: sha512-ydLaGVfQOQ6hI1xK2A5nVh8bl0OGoIfYMxPWHqqYe9bTkWCfqiVvZoh2I/QF2sNSkZzZyROBoTefIEI+PB6iIA==, } + dev: true /@types/node/17.0.24: resolution: @@ -4486,10 +4492,10 @@ packages: } dev: true - /@types/prettier/2.6.3: + /@types/prettier/2.6.1: resolution: { - integrity: sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==, + integrity: sha512-XFjFHmaLVifrAKaZ+EKghFHtHSUonyw8P2Qmy2/+osBnrKbH9UYtlK10zg8/kCt47MFilll/DEDKy3DHfJ0URw==, } /@types/preview-email/2.0.1: @@ -4652,17 +4658,17 @@ packages: integrity: sha512-oKZe+Mf4ioWlMuzVBaXQ9WDnEm1+umLx0InILg+yvZVBBDmzV5KfZyLrCvadtWcx8+916jLmHafcmqqffl+iIw==, } dependencies: - "@types/jest": 28.1.1 + "@types/jest": 27.5.1 dev: true - /@types/testing-library__react-hooks/4.0.0_zpnidt7m3osuk7shl3s4oenomq: + /@types/testing-library__react-hooks/4.0.0_react-dom@18.0.0+react@18.0.0: resolution: { integrity: sha512-UzZUXthQtVjDruR2YA+hqg9ux5AfmZ8Kaw+QDungax+T7wb/5NC4x7YOpIqRx7oY3KksGQ69bzNE/xwzb5NslQ==, } deprecated: This is a stub types definition. @testing-library/react-hooks provides its own type definitions, so you do not need this installed. dependencies: - "@testing-library/react-hooks": 7.0.2_zpnidt7m3osuk7shl3s4oenomq + "@testing-library/react-hooks": 7.0.2_react-dom@18.0.0+react@18.0.0 transitivePeerDependencies: - react - react-dom @@ -4715,7 +4721,7 @@ packages: dev: true optional: true - /@typescript-eslint/eslint-plugin/5.9.1_rvfvfrvgktle2hmlnfpjw2zp4u: + /@typescript-eslint/eslint-plugin/5.9.1_8d4b52c6a654d64d1d8b695e9b6b2fe5: resolution: { integrity: sha512-Xv9tkFlyD4MQGpJgTo6wqDqGvHIRmRgah/2Sjz1PUnJTawjHWIwBivUE9x0QtU2WVii9baYgavo/bHjrZJkqTw==, @@ -4729,10 +4735,10 @@ packages: typescript: optional: true dependencies: - "@typescript-eslint/experimental-utils": 5.9.1_hrkuebk64jiu2ut2d2sm4oylnu - "@typescript-eslint/parser": 5.9.1_hrkuebk64jiu2ut2d2sm4oylnu + "@typescript-eslint/experimental-utils": 5.9.1_eslint@7.32.0+typescript@4.6.3 + "@typescript-eslint/parser": 5.9.1_eslint@7.32.0+typescript@4.6.3 "@typescript-eslint/scope-manager": 5.9.1 - "@typescript-eslint/type-utils": 5.9.1_hrkuebk64jiu2ut2d2sm4oylnu + "@typescript-eslint/type-utils": 5.9.1_eslint@7.32.0+typescript@4.6.3 debug: 4.3.4 eslint: 7.32.0 functional-red-black-tree: 1.0.1 @@ -4743,54 +4749,24 @@ packages: typescript: 4.6.3 transitivePeerDependencies: - supports-color - dev: true - /@typescript-eslint/eslint-plugin/5.9.1_z2xqbpkx26iu62rx2zdto5f5qy: + /@typescript-eslint/experimental-utils/5.26.0_eslint@7.32.0+typescript@4.6.3: resolution: { - integrity: sha512-Xv9tkFlyD4MQGpJgTo6wqDqGvHIRmRgah/2Sjz1PUnJTawjHWIwBivUE9x0QtU2WVii9baYgavo/bHjrZJkqTw==, - } - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - "@typescript-eslint/parser": ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - typescript: "*" - peerDependenciesMeta: - typescript: - optional: true - dependencies: - "@typescript-eslint/experimental-utils": 5.9.1_typescript@4.6.3 - "@typescript-eslint/parser": 5.9.1_typescript@4.6.3 - "@typescript-eslint/scope-manager": 5.9.1 - "@typescript-eslint/type-utils": 5.9.1_typescript@4.6.3 - debug: 4.3.4 - functional-red-black-tree: 1.0.1 - ignore: 5.2.0 - regexpp: 3.2.0 - semver: 7.3.7 - tsutils: 3.21.0_typescript@4.6.3 - typescript: 4.6.3 - transitivePeerDependencies: - - supports-color - dev: false - - /@typescript-eslint/experimental-utils/5.27.1_hrkuebk64jiu2ut2d2sm4oylnu: - resolution: - { - integrity: sha512-Vd8uewIixGP93sEnmTRIH6jHZYRQRkGPDPpapACMvitJKX8335VHNyqKTE+mZ+m3E2c5VznTZfSsSsS5IF7vUA==, + integrity: sha512-OgUGXC/teXD8PYOkn33RSwBJPVwL0I2ipm5OHr9g9cfAhVrPC2DxQiWqaq88MNO5mbr/ZWnav3EVBpuwDreS5Q==, } engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - "@typescript-eslint/utils": 5.27.1_hrkuebk64jiu2ut2d2sm4oylnu + "@typescript-eslint/utils": 5.26.0_eslint@7.32.0+typescript@4.6.3 eslint: 7.32.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/experimental-utils/5.9.1_hrkuebk64jiu2ut2d2sm4oylnu: + /@typescript-eslint/experimental-utils/5.9.1_eslint@7.32.0+typescript@4.6.3: resolution: { integrity: sha512-cb1Njyss0mLL9kLXgS/eEY53SZQ9sT519wpX3i+U457l2UXRDuo87hgKfgRazmu9/tQb0x2sr3Y0yrU+Zz0y+w==, @@ -4809,32 +4785,11 @@ packages: transitivePeerDependencies: - supports-color - typescript - dev: true - /@typescript-eslint/experimental-utils/5.9.1_typescript@4.6.3: + /@typescript-eslint/parser/5.26.0_eslint@7.32.0+typescript@4.6.3: resolution: { - integrity: sha512-cb1Njyss0mLL9kLXgS/eEY53SZQ9sT519wpX3i+U457l2UXRDuo87hgKfgRazmu9/tQb0x2sr3Y0yrU+Zz0y+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.9.1 - "@typescript-eslint/types": 5.9.1 - "@typescript-eslint/typescript-estree": 5.9.1_typescript@4.6.3 - eslint-scope: 5.1.1 - eslint-utils: 3.0.0 - transitivePeerDependencies: - - supports-color - - typescript - dev: false - - /@typescript-eslint/parser/5.27.1_hrkuebk64jiu2ut2d2sm4oylnu: - resolution: - { - integrity: sha512-7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ==, + integrity: sha512-n/IzU87ttzIdnAH5vQ4BBDnLPly7rC5VnjN3m0xBG82HK6rhRxnCb3w/GyWbNDghPd+NktJqB/wl6+YkzZ5T5Q==, } engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4844,9 +4799,9 @@ packages: typescript: optional: true dependencies: - "@typescript-eslint/scope-manager": 5.27.1 - "@typescript-eslint/types": 5.27.1 - "@typescript-eslint/typescript-estree": 5.27.1_typescript@4.6.3 + "@typescript-eslint/scope-manager": 5.26.0 + "@typescript-eslint/types": 5.26.0 + "@typescript-eslint/typescript-estree": 5.26.0_typescript@4.6.3 debug: 4.3.4 eslint: 7.32.0 typescript: 4.6.3 @@ -4854,7 +4809,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.9.1_hrkuebk64jiu2ut2d2sm4oylnu: + /@typescript-eslint/parser/5.9.1_eslint@7.32.0+typescript@4.6.3: resolution: { integrity: sha512-PLYO0AmwD6s6n0ZQB5kqPgfvh73p0+VqopQQLuNfi7Lm0EpfKyDalchpVwkE+81k5HeiRrTV/9w1aNHzjD7C4g==, @@ -4875,39 +4830,16 @@ packages: typescript: 4.6.3 transitivePeerDependencies: - supports-color - dev: true - /@typescript-eslint/parser/5.9.1_typescript@4.6.3: + /@typescript-eslint/scope-manager/5.26.0: resolution: { - integrity: sha512-PLYO0AmwD6s6n0ZQB5kqPgfvh73p0+VqopQQLuNfi7Lm0EpfKyDalchpVwkE+81k5HeiRrTV/9w1aNHzjD7C4g==, - } - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - typescript: "*" - peerDependenciesMeta: - typescript: - optional: true - dependencies: - "@typescript-eslint/scope-manager": 5.9.1 - "@typescript-eslint/types": 5.9.1 - "@typescript-eslint/typescript-estree": 5.9.1_typescript@4.6.3 - debug: 4.3.4 - typescript: 4.6.3 - transitivePeerDependencies: - - supports-color - dev: false - - /@typescript-eslint/scope-manager/5.27.1: - resolution: - { - integrity: sha512-fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg==, + integrity: sha512-gVzTJUESuTwiju/7NiTb4c5oqod8xt5GhMbExKsCTp6adU3mya6AGJ4Pl9xC7x2DX9UYFsjImC0mA62BCY22Iw==, } engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - "@typescript-eslint/types": 5.27.1 - "@typescript-eslint/visitor-keys": 5.27.1 + "@typescript-eslint/types": 5.26.0 + "@typescript-eslint/visitor-keys": 5.26.0 dev: true /@typescript-eslint/scope-manager/5.9.1: @@ -4920,7 +4852,7 @@ packages: "@typescript-eslint/types": 5.9.1 "@typescript-eslint/visitor-keys": 5.9.1 - /@typescript-eslint/type-utils/5.9.1_hrkuebk64jiu2ut2d2sm4oylnu: + /@typescript-eslint/type-utils/5.9.1_eslint@7.32.0+typescript@4.6.3: resolution: { integrity: sha512-tRSpdBnPRssjlUh35rE9ug5HrUvaB9ntREy7gPXXKwmIx61TNN7+l5YKgi1hMKxo5NvqZCfYhA5FvyuJG6X6vg==, @@ -4933,40 +4865,18 @@ packages: typescript: optional: true dependencies: - "@typescript-eslint/experimental-utils": 5.9.1_hrkuebk64jiu2ut2d2sm4oylnu + "@typescript-eslint/experimental-utils": 5.9.1_eslint@7.32.0+typescript@4.6.3 debug: 4.3.4 eslint: 7.32.0 tsutils: 3.21.0_typescript@4.6.3 typescript: 4.6.3 transitivePeerDependencies: - supports-color - dev: true - /@typescript-eslint/type-utils/5.9.1_typescript@4.6.3: + /@typescript-eslint/types/5.26.0: resolution: { - integrity: sha512-tRSpdBnPRssjlUh35rE9ug5HrUvaB9ntREy7gPXXKwmIx61TNN7+l5YKgi1hMKxo5NvqZCfYhA5FvyuJG6X6vg==, - } - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - eslint: "*" - typescript: "*" - peerDependenciesMeta: - typescript: - optional: true - dependencies: - "@typescript-eslint/experimental-utils": 5.9.1_typescript@4.6.3 - debug: 4.3.4 - tsutils: 3.21.0_typescript@4.6.3 - typescript: 4.6.3 - transitivePeerDependencies: - - supports-color - dev: false - - /@typescript-eslint/types/5.27.1: - resolution: - { - integrity: sha512-LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg==, + integrity: sha512-8794JZFE1RN4XaExLWLI2oSXsVImNkl79PzTOOWt9h0UHROwJedNOD2IJyfL0NbddFllcktGIO2aOu10avQQyA==, } engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true @@ -4978,10 +4888,10 @@ packages: } engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - /@typescript-eslint/typescript-estree/5.27.1_typescript@4.6.3: + /@typescript-eslint/typescript-estree/5.26.0_typescript@4.6.3: resolution: { - integrity: sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw==, + integrity: sha512-EyGpw6eQDsfD6jIqmXP3rU5oHScZ51tL/cZgFbFBvWuCwrIptl+oueUZzSmLtxFuSOQ9vDcJIs+279gnJkfd1w==, } engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4990,8 +4900,8 @@ packages: typescript: optional: true dependencies: - "@typescript-eslint/types": 5.27.1 - "@typescript-eslint/visitor-keys": 5.27.1 + "@typescript-eslint/types": 5.26.0 + "@typescript-eslint/visitor-keys": 5.26.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -5025,19 +4935,19 @@ packages: transitivePeerDependencies: - supports-color - /@typescript-eslint/utils/5.27.1_hrkuebk64jiu2ut2d2sm4oylnu: + /@typescript-eslint/utils/5.26.0_eslint@7.32.0+typescript@4.6.3: resolution: { - integrity: sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w==, + integrity: sha512-PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg==, } engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: "@types/json-schema": 7.0.11 - "@typescript-eslint/scope-manager": 5.27.1 - "@typescript-eslint/types": 5.27.1 - "@typescript-eslint/typescript-estree": 5.27.1_typescript@4.6.3 + "@typescript-eslint/scope-manager": 5.26.0 + "@typescript-eslint/types": 5.26.0 + "@typescript-eslint/typescript-estree": 5.26.0_typescript@4.6.3 eslint: 7.32.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@7.32.0 @@ -5046,14 +4956,14 @@ packages: - typescript dev: true - /@typescript-eslint/visitor-keys/5.27.1: + /@typescript-eslint/visitor-keys/5.26.0: resolution: { - integrity: sha512-xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ==, + integrity: sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q==, } engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - "@typescript-eslint/types": 5.27.1 + "@typescript-eslint/types": 5.26.0 eslint-visitor-keys: 3.3.0 dev: true @@ -5296,6 +5206,7 @@ packages: { integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==, } + dev: false /arg/5.0.1: resolution: @@ -5508,10 +5419,10 @@ packages: } dev: false - /async/3.2.4: + /async/3.2.3: resolution: { - integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==, + integrity: sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==, } dev: false @@ -5643,7 +5554,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.18.4 + "@babel/types": 7.17.12 "@types/babel__core": 7.1.19 "@types/babel__traverse": 7.17.1 @@ -5689,7 +5600,7 @@ packages: } engines: {node: ">= 10.0.0"} dependencies: - "@babel/types": 7.18.4 + "@babel/types": 7.17.12 dev: true /babylon/6.18.0: @@ -5796,8 +5707,6 @@ packages: qs: 6.9.7 raw-body: 2.4.3 type-is: 1.6.18 - transitivePeerDependencies: - - supports-color dev: true /boxen/4.2.0: @@ -5852,8 +5761,6 @@ packages: snapdragon-node: 2.1.1 split-string: 3.1.0 to-regex: 3.0.2 - transitivePeerDependencies: - - supports-color dev: false /braces/3.0.2: @@ -6540,7 +6447,7 @@ packages: } dependencies: "@babel/parser": 7.18.4 - "@babel/types": 7.18.4 + "@babel/types": 7.17.12 dev: true /content-disposition/0.5.4: @@ -6580,8 +6487,6 @@ packages: debug: 3.2.7 on-headers: 1.0.2 safe-buffer: 5.2.1 - transitivePeerDependencies: - - supports-color dev: false /cookie-signature/1.0.6: @@ -6632,10 +6537,10 @@ packages: browserslist: 4.20.3 semver: 7.0.0 - /core-js-pure/3.22.8: + /core-js-pure/3.22.7: resolution: { - integrity: sha512-bOxbZIy9S5n4OVH63XaLVXZ49QKicjowDx/UELyJ68vxfCRpYsbyh/WNZNfEfAk+ekA8vSjt+gCDpvh672bc3w==, + integrity: sha512-wTriFxiZI+C8msGeh7fJcbC/a0V8fdInN1oS2eK79DMBGs8iIJiXhtFJCiT3rBa8w6zroHWW3p8ArlujZ/Mz+w==, } requiresBuild: true @@ -6650,6 +6555,7 @@ packages: { integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==, } + dev: false /cross-spawn/5.1.0: resolution: @@ -6827,11 +6733,6 @@ packages: { integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==, } - peerDependencies: - supports-color: "*" - peerDependenciesMeta: - supports-color: - optional: true dependencies: ms: 2.0.0 @@ -6840,11 +6741,6 @@ packages: { integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==, } - peerDependencies: - supports-color: "*" - peerDependenciesMeta: - supports-color: - optional: true dependencies: ms: 2.1.3 @@ -7153,8 +7049,6 @@ packages: dependencies: address: 1.2.0 debug: 2.6.9 - transitivePeerDependencies: - - supports-color dev: false /diff-sequences/27.5.1: @@ -7170,6 +7064,7 @@ packages: integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==, } engines: {node: ">=0.3.1"} + dev: false /diff/5.0.0: resolution: @@ -7456,7 +7351,7 @@ packages: is-shared-array-buffer: 1.0.2 is-string: 1.0.7 is-weakref: 1.0.2 - object-inspect: 1.12.2 + object-inspect: 1.12.1 object-keys: 1.1.1 object.assign: 4.1.2 regexp.prototype.flags: 1.4.3 @@ -8282,7 +8177,7 @@ packages: optionalDependencies: source-map: 0.6.1 - /eslint-config-next/12.0.7_typescript@4.6.3: + /eslint-config-next/12.0.7_05c713472dcd5c624e082d9210ea9f86: resolution: { integrity: sha512-kWOaym5qjyzR190zFKkZMaHetmiRORmzJiKML7Kr9CL213S6SwkrHHCEL58TRdpx0NA+HzrsFR9zgcV2pvV2Yg==, @@ -8297,20 +8192,21 @@ packages: dependencies: "@next/eslint-plugin-next": 12.0.7 "@rushstack/eslint-patch": 1.1.3 - "@typescript-eslint/parser": 5.9.1_typescript@4.6.3 + "@typescript-eslint/parser": 5.9.1_eslint@7.32.0+typescript@4.6.3 + eslint: 7.32.0 eslint-import-resolver-node: 0.3.6 - eslint-import-resolver-typescript: 2.7.1_fkfqfehjtk7sk2efaqbgxsuasa - eslint-plugin-import: 2.26.0_oisyptfcq77gha3jnxd6iiraai - eslint-plugin-jsx-a11y: 6.5.1 - eslint-plugin-react: 7.30.0 - eslint-plugin-react-hooks: 4.5.0 + eslint-import-resolver-typescript: 2.7.1_3bd94fa9be989baab6ef2e6b5dec3766 + eslint-plugin-import: 2.26.0_eslint@7.32.0 + 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 + next: 12.1.6-canary.17 typescript: 4.6.3 transitivePeerDependencies: - - eslint-import-resolver-webpack - supports-color dev: false - /eslint-config-next/12.1.6_axdrgrznzvogetqifwjbb2u7qy: + /eslint-config-next/12.1.6_05c713472dcd5c624e082d9210ea9f86: resolution: { integrity: sha512-qoiS3g/EPzfCTkGkaPBSX9W0NGE/B1wNO3oWrd76QszVGrdpLggNqcO8+LR6MB0CNqtp9Q8NoeVrxNVbzM9hqA==, @@ -8325,22 +8221,21 @@ packages: dependencies: "@next/eslint-plugin-next": 12.1.6 "@rushstack/eslint-patch": 1.1.3 - "@typescript-eslint/parser": 5.27.1_hrkuebk64jiu2ut2d2sm4oylnu + "@typescript-eslint/parser": 5.26.0_eslint@7.32.0+typescript@4.6.3 eslint: 7.32.0 eslint-import-resolver-node: 0.3.6 - eslint-import-resolver-typescript: 2.7.1_hpmu7kn6tcn2vnxpfzvv33bxmy - eslint-plugin-import: 2.26.0_wpehoe7sv7ux6tdegk3fwlchdi + eslint-import-resolver-typescript: 2.7.1_3bd94fa9be989baab6ef2e6b5dec3766 + eslint-plugin-import: 2.26.0_eslint@7.32.0 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 - next: 12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq + next: 12.1.6-canary.17_react-dom@18.0.0+react@18.0.0 typescript: 4.6.3 transitivePeerDependencies: - - eslint-import-resolver-webpack - supports-color dev: true - /eslint-config-prettier/8.3.0: + /eslint-config-prettier/8.3.0_eslint@7.32.0: resolution: { integrity: sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==, @@ -8348,6 +8243,8 @@ packages: hasBin: true peerDependencies: eslint: ">=7.0.0" + dependencies: + eslint: 7.32.0 dev: false /eslint-import-resolver-node/0.3.6: @@ -8358,30 +8255,8 @@ packages: dependencies: debug: 3.2.7 resolve: 1.22.0 - transitivePeerDependencies: - - supports-color - /eslint-import-resolver-typescript/2.7.1_fkfqfehjtk7sk2efaqbgxsuasa: - resolution: - { - integrity: sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==, - } - engines: {node: ">=4"} - peerDependencies: - eslint: "*" - eslint-plugin-import: "*" - dependencies: - debug: 4.3.4 - eslint-plugin-import: 2.26.0_oisyptfcq77gha3jnxd6iiraai - glob: 7.2.0 - is-glob: 4.0.3 - resolve: 1.22.0 - tsconfig-paths: 3.14.1 - transitivePeerDependencies: - - supports-color - dev: false - - /eslint-import-resolver-typescript/2.7.1_hpmu7kn6tcn2vnxpfzvv33bxmy: + /eslint-import-resolver-typescript/2.7.1_3bd94fa9be989baab6ef2e6b5dec3766: resolution: { integrity: sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==, @@ -8393,129 +8268,40 @@ packages: dependencies: debug: 4.3.4 eslint: 7.32.0 - eslint-plugin-import: 2.26.0_wpehoe7sv7ux6tdegk3fwlchdi + eslint-plugin-import: 2.26.0_eslint@7.32.0 glob: 7.2.0 is-glob: 4.0.3 resolve: 1.22.0 tsconfig-paths: 3.14.1 transitivePeerDependencies: - supports-color - dev: true - /eslint-module-utils/2.7.3_4wf6ctbofaywkfx7kzk32kp7ge: + /eslint-module-utils/2.7.3: 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: - { - 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.9.1_typescript@4.6.3 - debug: 3.2.7 - eslint-import-resolver-node: 0.3.6 - eslint-import-resolver-typescript: 2.7.1_fkfqfehjtk7sk2efaqbgxsuasa - find-up: 2.1.0 - transitivePeerDependencies: - - supports-color - dev: false - - /eslint-plugin-import/2.26.0_oisyptfcq77gha3jnxd6iiraai: + /eslint-plugin-import/2.26.0_eslint@7.32.0: resolution: { integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==, } engines: {node: ">=4"} peerDependencies: - "@typescript-eslint/parser": "*" eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - peerDependenciesMeta: - "@typescript-eslint/parser": - optional: true dependencies: - "@typescript-eslint/parser": 5.9.1_typescript@4.6.3 - array-includes: 3.1.5 - array.prototype.flat: 1.3.0 - debug: 2.6.9 - doctrine: 2.1.0 - eslint-import-resolver-node: 0.3.6 - eslint-module-utils: 2.7.3_dbnyosdljuntx5ukba4qoruhni - has: 1.0.3 - is-core-module: 2.8.1 - is-glob: 4.0.3 - minimatch: 3.1.2 - object.values: 1.1.5 - resolve: 1.22.0 - tsconfig-paths: 3.14.1 - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - dev: false - - /eslint-plugin-import/2.26.0_wpehoe7sv7ux6tdegk3fwlchdi: - resolution: - { - integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==, - } - engines: {node: ">=4"} - peerDependencies: - "@typescript-eslint/parser": "*" - eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - peerDependenciesMeta: - "@typescript-eslint/parser": - optional: true - dependencies: - "@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_4wf6ctbofaywkfx7kzk32kp7ge + eslint-module-utils: 2.7.3 has: 1.0.3 is-core-module: 2.8.1 is-glob: 4.0.3 @@ -8523,34 +8309,6 @@ packages: object.values: 1.1.5 resolve: 1.22.0 tsconfig-paths: 3.14.1 - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - dev: true - - /eslint-plugin-jsx-a11y/6.5.1: - resolution: - { - integrity: sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==, - } - engines: {node: ">=4.0"} - peerDependencies: - eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - dependencies: - "@babel/runtime": 7.18.3 - aria-query: 4.2.2 - array-includes: 3.1.5 - ast-types-flow: 0.0.7 - axe-core: 4.4.2 - axobject-query: 2.2.0 - damerau-levenshtein: 1.0.8 - emoji-regex: 9.2.2 - has: 1.0.3 - jsx-ast-utils: 3.3.0 - language-tags: 1.0.5 - minimatch: 3.1.2 - dev: false /eslint-plugin-jsx-a11y/6.5.1_eslint@7.32.0: resolution: @@ -8574,17 +8332,6 @@ packages: jsx-ast-utils: 3.3.0 language-tags: 1.0.5 minimatch: 3.1.2 - dev: true - - /eslint-plugin-react-hooks/4.5.0: - resolution: - { - integrity: sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==, - } - engines: {node: ">=10"} - peerDependencies: - eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 - dev: false /eslint-plugin-react-hooks/4.5.0_eslint@7.32.0: resolution: @@ -8596,32 +8343,6 @@ packages: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 dependencies: eslint: 7.32.0 - dev: true - - /eslint-plugin-react/7.30.0: - resolution: - { - integrity: sha512-RgwH7hjW48BleKsYyHK5vUAvxtE9SMPDKmcPRQgtRCYaZA0XQPt5FSkrU3nhz5ifzMZcA8opwmRJ2cmOO8tr5A==, - } - engines: {node: ">=4"} - peerDependencies: - eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - dependencies: - array-includes: 3.1.5 - array.prototype.flatmap: 1.3.0 - doctrine: 2.1.0 - estraverse: 5.3.0 - jsx-ast-utils: 3.3.0 - minimatch: 3.1.2 - object.entries: 1.1.5 - object.fromentries: 2.0.5 - object.hasown: 1.1.1 - object.values: 1.1.5 - prop-types: 15.8.1 - resolve: 2.0.0-next.3 - semver: 6.3.0 - string.prototype.matchall: 4.0.7 - dev: false /eslint-plugin-react/7.30.0_eslint@7.32.0: resolution: @@ -8647,9 +8368,8 @@ packages: resolve: 2.0.0-next.3 semver: 6.3.0 string.prototype.matchall: 4.0.7 - dev: true - /eslint-plugin-testing-library/5.0.1_hrkuebk64jiu2ut2d2sm4oylnu: + /eslint-plugin-testing-library/5.0.1_eslint@7.32.0+typescript@4.6.3: resolution: { integrity: sha512-8ZV4HbbacvOwu+adNnGpYd8E64NRcil2a11aFAbc/TZDUB/xxK2c8Z+LoeoHUbxNBGbTUdpAE4YUugxK85pcwQ==, @@ -8658,7 +8378,7 @@ packages: peerDependencies: eslint: ^7.5.0 || ^8.0.0 dependencies: - "@typescript-eslint/experimental-utils": 5.27.1_hrkuebk64jiu2ut2d2sm4oylnu + "@typescript-eslint/experimental-utils": 5.26.0_eslint@7.32.0+typescript@4.6.3 eslint: 7.32.0 transitivePeerDependencies: - supports-color @@ -8684,18 +8404,6 @@ packages: dependencies: eslint-visitor-keys: 1.3.0 - /eslint-utils/3.0.0: - resolution: - { - integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==, - } - engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} - peerDependencies: - eslint: ">=5" - dependencies: - eslint-visitor-keys: 2.1.0 - dev: false - /eslint-utils/3.0.0_eslint@7.32.0: resolution: { @@ -8707,7 +8415,6 @@ packages: dependencies: eslint: 7.32.0 eslint-visitor-keys: 2.1.0 - dev: true /eslint-visitor-keys/1.3.0: resolution: @@ -8941,8 +8648,6 @@ packages: regex-not: 1.0.2 snapdragon: 0.8.2 to-regex: 3.0.2 - transitivePeerDependencies: - - supports-color dev: false /expect/27.5.1: @@ -8994,8 +8699,6 @@ packages: type-is: 1.6.18 utils-merge: 1.0.1 vary: 1.1.2 - transitivePeerDependencies: - - supports-color dev: true /extend-shallow/2.0.1: @@ -9053,8 +8756,6 @@ packages: regex-not: 1.0.2 snapdragon: 0.8.2 to-regex: 3.0.2 - transitivePeerDependencies: - - supports-color dev: false /extract-zip/2.0.1: @@ -9093,8 +8794,6 @@ packages: is-glob: 4.0.3 merge2: 1.4.1 micromatch: 3.1.10 - transitivePeerDependencies: - - supports-color dev: false /fast-glob/3.2.11: @@ -9212,8 +8911,6 @@ packages: parseurl: 1.3.3 statuses: 1.5.0 unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color dev: true /find-cache-dir/2.1.0: @@ -9596,8 +9293,6 @@ packages: fs-extra: 7.0.1 globby: 9.2.0 read-yaml-file: 1.1.0 - transitivePeerDependencies: - - supports-color dev: false /glob-parent/3.1.0: @@ -9711,8 +9406,6 @@ packages: ignore: 4.0.6 pify: 4.0.1 slash: 2.0.0 - transitivePeerDependencies: - - supports-color dev: false /got/11.8.5: @@ -10781,7 +10474,7 @@ packages: engines: {node: ">=10"} hasBin: true dependencies: - async: 3.2.4 + async: 3.2.3 chalk: 4.1.2 filelist: 1.0.4 minimatch: 3.1.2 @@ -10895,7 +10588,7 @@ packages: pretty-format: 27.5.1 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.7.0_fxg3r7oju3tntkxsvleuiot4fa + ts-node: 10.7.0_2dcdb8fdc9a6e6d9aaf2aac9443a7c28 transitivePeerDependencies: - bufferutil - canvas @@ -11214,11 +10907,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.18.4 + "@babel/types": 7.17.12 "@jest/transform": 27.5.1 "@jest/types": 27.5.1 "@types/babel__traverse": 7.17.1 - "@types/prettier": 2.6.3 + "@types/prettier": 2.6.1 babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.2 chalk: 4.1.2 expect: 27.5.1 @@ -11341,10 +11034,10 @@ packages: engines: {node: ">=10"} dev: true - /jpeg-js/0.4.4: + /jpeg-js/0.4.3: resolution: { - integrity: sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==, + integrity: sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==, } dev: true @@ -11856,7 +11549,7 @@ packages: listr2: 3.14.0 micromatch: 4.0.5 normalize-path: 3.0.0 - object-inspect: 1.12.2 + object-inspect: 1.12.1 string-argv: 0.3.1 supports-color: 9.2.2 yaml: 1.10.2 @@ -12130,10 +11823,10 @@ packages: hasBin: true dev: true - /macos-release/3.1.0: + /macos-release/3.0.1: resolution: { - integrity: sha512-/M/R0gCDgM+Cv1IuBG1XGdfTFnMEG6PZeT+KGWHO/OG+imqmaD9CH5vHBTycEM3+Kc4uG2Il+tFAuUWLqQOeUA==, + integrity: sha512-3l6OrhdDg2H2SigtuN3jBh+5dRJRWxNKuJTPBbGeNJTsmt/pj9PO25wYaNb05NuNmAsl435j4rDP6rgNXz7s7g==, } engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: false @@ -12390,8 +12083,6 @@ packages: regex-not: 1.0.2 snapdragon: 0.8.2 to-regex: 3.0.2 - transitivePeerDependencies: - - supports-color dev: false /micromatch/4.0.5: @@ -12688,8 +12379,6 @@ packages: regex-not: 1.0.2 snapdragon: 0.8.2 to-regex: 3.0.2 - transitivePeerDependencies: - - supports-color dev: false /natural-compare/1.4.0: @@ -12769,7 +12458,7 @@ packages: - babel-plugin-macros dev: false - /next/12.1.6-canary.17_zpnidt7m3osuk7shl3s4oenomq: + /next/12.1.6-canary.17_react-dom@18.0.0+react@18.0.0: resolution: { integrity: sha512-Aw2snJwacpeHiT9bOIH2hmu1UM5PigklTRnZfKOsozJ4ZrapxG2bk/DMc1t/nkn+DH6kSYwWJXMIKfysP/vymg==, @@ -12996,10 +12685,10 @@ packages: kind-of: 3.2.2 dev: false - /object-inspect/1.12.2: + /object-inspect/1.12.1: resolution: { - integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==, + integrity: sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==, } /object-keys/1.1.1: @@ -13205,7 +12894,7 @@ packages: } engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: - macos-release: 3.1.0 + macos-release: 3.0.1 windows-release: 5.0.1 dev: false @@ -13755,7 +13444,7 @@ packages: debug: 4.3.4 extract-zip: 2.0.1 https-proxy-agent: 5.0.1 - jpeg-js: 0.4.4 + jpeg-js: 0.4.3 mime: 2.6.0 pngjs: 5.0.0 progress: 2.0.3 @@ -14331,7 +14020,7 @@ packages: integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==, } - /react-query/3.39.0_zpnidt7m3osuk7shl3s4oenomq: + /react-query/3.39.0_react-dom@18.0.0+react@18.0.0: resolution: { integrity: sha512-Od0IkSuS79WJOhzWBx/ys0x13+7wFqgnn64vBqqAAnZ9whocVhl/y1padD5uuZ6EIkXbFbInax0qvY7zGM0thA==, @@ -14598,10 +14287,7 @@ packages: dev: false /repeat-string/1.6.1: - resolution: - { - integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==, - } + resolution: {integrity: sha1-jcrkcOHIirwtYA//Sndihtp15jc=} engines: {node: ">=0.10"} dev: false @@ -14614,10 +14300,7 @@ packages: dev: false /require-directory/2.1.1: - resolution: - { - integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==, - } + resolution: {integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=} engines: {node: ">=0.10.0"} /require-from-string/2.0.2: @@ -14665,10 +14348,7 @@ packages: engines: {node: ">=8"} /resolve-url/0.2.1: - resolution: - { - integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==, - } + resolution: {integrity: sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=} deprecated: https://github.com/lydell/resolve-url#deprecated dev: false @@ -14700,10 +14380,7 @@ packages: path-parse: 1.0.7 /responselike/1.0.2: - resolution: - { - integrity: sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==, - } + resolution: {integrity: sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=} dependencies: lowercase-keys: 1.0.1 dev: false @@ -14735,10 +14412,7 @@ packages: engines: {node: ">=0.12"} /retry/0.12.0: - resolution: - { - integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==, - } + resolution: {integrity: sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=} engines: {node: ">= 4"} dev: true @@ -14774,7 +14448,7 @@ packages: dependencies: glob: 7.2.0 - /rollup-plugin-dts/4.2.1_nmerszcjz2rfjina4mudxa4qka: + /rollup-plugin-dts/4.2.1_rollup@2.70.2+typescript@4.6.3: resolution: { integrity: sha512-eaxQZNUJ5iQcxNGlpJ1CUgG4OSVqWjDZ3nNSWBIoGrpcote2aNphSe1RJOaSYkb8dwn3o+rYm1vvld/5z3EGSQ==, @@ -14791,7 +14465,7 @@ packages: "@babel/code-frame": 7.16.7 dev: true - /rollup-plugin-esbuild/4.9.1_spogcnvgx2zlfpppdv5errowom: + /rollup-plugin-esbuild/4.9.1_esbuild@0.14.36+rollup@2.70.2: resolution: { integrity: sha512-qn/x7Wz9p3Xnva99qcb+nopH0d2VJwVnsxJTGEg+Sh2Z3tqQl33MhOwzekVo1YTKgv+yAmosjcBRJygMfGrtLw==, @@ -14851,10 +14525,7 @@ packages: } /safe-regex/1.1.0: - resolution: - { - integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==, - } + resolution: {integrity: sha1-QKNmnzsHfR6UPURinhV91IAjvy4=} dependencies: ret: 0.1.15 dev: false @@ -14984,8 +14655,6 @@ packages: on-finished: 2.3.0 range-parser: 1.2.1 statuses: 1.5.0 - transitivePeerDependencies: - - supports-color dev: true /serve-static/1.14.2: @@ -14999,8 +14668,6 @@ packages: escape-html: 1.0.3 parseurl: 1.3.3 send: 0.17.2 - transitivePeerDependencies: - - supports-color dev: true /set-blocking/2.0.0: @@ -15084,7 +14751,7 @@ packages: dependencies: call-bind: 1.0.2 get-intrinsic: 1.1.1 - object-inspect: 1.12.2 + object-inspect: 1.12.1 /signal-exit/3.0.7: resolution: @@ -15216,8 +14883,6 @@ packages: source-map: 0.5.7 source-map-resolve: 0.5.3 use: 3.1.1 - transitivePeerDependencies: - - supports-color dev: false /sodium-native/3.3.0: @@ -15282,6 +14947,7 @@ packages: /source-map/0.5.7: resolution: {integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=} engines: {node: ">=0.10.0"} + dev: false /source-map/0.6.1: resolution: @@ -15988,7 +15654,7 @@ packages: yargs-parser: 20.2.9 dev: true - /ts-node/10.7.0_fxg3r7oju3tntkxsvleuiot4fa: + /ts-node/10.7.0_2dcdb8fdc9a6e6d9aaf2aac9443a7c28: resolution: { integrity: sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==, @@ -16020,6 +15686,7 @@ packages: typescript: 4.6.3 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + dev: false /ts-node/10.7.0_typescript@4.6.3: resolution: @@ -16374,6 +16041,7 @@ packages: } engines: {node: ">=4.2.0"} hasBin: true + dev: true /uc.micro/1.0.6: resolution: @@ -16422,8 +16090,8 @@ packages: pretty-bytes: 5.6.0 rimraf: 3.0.2 rollup: 2.70.2 - rollup-plugin-dts: 4.2.1_nmerszcjz2rfjina4mudxa4qka - rollup-plugin-esbuild: 4.9.1_spogcnvgx2zlfpppdv5errowom + rollup-plugin-dts: 4.2.1_rollup@2.70.2+typescript@4.6.3 + rollup-plugin-esbuild: 4.9.1_esbuild@0.14.36+rollup@2.70.2 scule: 0.2.1 typescript: 4.6.3 untyped: 0.3.0 @@ -16593,6 +16261,7 @@ packages: { integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==, } + dev: false /v8-compile-cache/2.3.0: resolution: @@ -16658,10 +16327,10 @@ packages: replace-ext: 1.0.1 dev: false - /vite/2.9.10: + /vite/2.9.9: resolution: { - integrity: sha512-TwZRuSMYjpTurLqXspct+HZE7ONiW9d+wSWgvADGxhDPPyoIcNywY+RX4ng+QpK30DCa1l/oZgi2PLZDibhzbQ==, + integrity: sha512-ffaam+NgHfbEmfw/Vuh6BHKKlI/XIAhxE5QSS7gFLIngxg171mg1P3a4LSRME0z2ZU1ScxoKzphkipcYwSD5Ew==, } engines: {node: ">=12.2.0"} hasBin: true @@ -16714,7 +16383,7 @@ packages: local-pkg: 0.4.1 tinypool: 0.1.3 tinyspy: 0.3.2 - vite: 2.9.10 + vite: 2.9.9 transitivePeerDependencies: - less - sass @@ -16998,7 +16667,7 @@ packages: engines: {node: ">= 10.0.0"} dependencies: "@babel/parser": 7.18.4 - "@babel/types": 7.18.4 + "@babel/types": 7.17.12 assert-never: 1.2.1 babel-walk: 3.0.0-canary-5 dev: true @@ -17228,6 +16897,7 @@ packages: integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==, } engines: {node: ">=6"} + dev: false /yocto-queue/0.1.0: resolution: