Connect, collaborate, and grow with a community of TypeScript developers
Add new og-image app (#375)
Sean Boult2103083e33c1
diff --git a/apps/admin/src/app/page.tsx b/apps/admin/src/app/page.tsxindex 35ac236d..59d0437d 100644--- a/apps/admin/src/app/page.tsx+++ b/apps/admin/src/app/page.tsx@@ -86,9 +86,7 @@ export default function Home() {-></span></h2>- <p className="m-0 max-w-[30ch] text-sm opacity-50">- Explore the Next.js 13 playground.- </p>+ <p className="m-0 max-w-[30ch] text-sm opacity-50">Explore the Next.js 13 playground.</p></a><adiff --git a/apps/og-image/.eslintrc.cjs b/apps/og-image/.eslintrc.cjsnew file mode 100644index 00000000..c059ad64--- /dev/null+++ b/apps/og-image/.eslintrc.cjs@@ -0,0 +1,9 @@+/** @type {import("eslint").Linter.Config} */+module.exports = {+ root: true,+ extends: [require.resolve('@repo/lint/next')],+ ignorePatterns: ['monaco-editor.d.ts'],+ parserOptions: {+ project: `${__dirname}/tsconfig.json`,+ },+};diff --git a/apps/og-image/.gitignore b/apps/og-image/.gitignorenew file mode 100644index 00000000..79315375--- /dev/null+++ b/apps/og-image/.gitignore@@ -0,0 +1,44 @@+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.++# Dependencies+/node_modules+/.pnp+.pnp.js++# Testing+/coverage++# Next.js+/.next/+/out/++# Production+build+dist++# Misc+.DS_Store+*.pem++# Debug+npm-debug.log*+yarn-debug.log*+yarn-error.log*++# Local ENV files+.env.local+.env.development.local+.env.test.local+.env.production.local++# Vercel+.vercel++# Turborepo+.turbo++# typescript+*.tsbuildinfo++# env+.env.localdiff --git a/apps/og-image/README.md b/apps/og-image/README.mdnew file mode 100644index 00000000..1e951266--- /dev/null+++ b/apps/og-image/README.md@@ -0,0 +1,3 @@+# og-image++This is a simple next app to deploy the opengraph rendering to the edgediff --git a/apps/og-image/app/api/challenge/route.tsx b/apps/og-image/app/api/challenge/route.tsxnew file mode 100644index 00000000..370dcad6--- /dev/null+++ b/apps/og-image/app/api/challenge/route.tsx@@ -0,0 +1,35 @@+import { ImageResponse } from '@vercel/og';+import { challengeParam } from 'utils/zodParams';+import { Logo } from 'app/components/logo';++export const runtime = 'edge';++export async function GET(req: Request) {+ const parsed = challengeParam.decodeRequest(req);++ if (!parsed.success) {+ return new Response(parsed.error.toString(), { status: 400 });+ }++ const props = parsed.data.input;++ return new ImageResponse(+ (+ <div tw="bg-zinc-900 h-full w-full text-white bg-cover flex flex-col p-14">+ <div tw="flex flex-col justify-center items-center w-full h-full">+ <Logo />+ <h1 tw="text-6xl pt-3">{props.title}</h1>+ <p tw="text-center text-3xl text-zinc-300">{props.description}</p>+ <p tw="text-3xl">+ <span tw="mr-2">created by</span>+ <span tw="text-blue-500">{props.username}</span>+ </p>+ </div>+ </div>+ ),+ {+ width: 1200,+ height: 600,+ },+ );+}diff --git a/apps/og-image/app/api/default/route.tsx b/apps/og-image/app/api/default/route.tsxnew file mode 100644index 00000000..8f57e818--- /dev/null+++ b/apps/og-image/app/api/default/route.tsx@@ -0,0 +1,22 @@+import { ImageResponse } from '@vercel/og';+import { Logo } from 'app/components/logo';++export const runtime = 'edge';++export async function GET() {+ return new ImageResponse(+ (+ <div tw="bg-zinc-900 h-full w-full text-white flex flex-col p-14">+ <div tw="flex flex-col justify-center items-center w-full h-full">+ <Logo />+ <h1 tw="text-6xl pt-3">Typehero</h1>+ <p tw="text-center text-3xl text-zinc-300">Level up your typescript skills with interactive exercises</p>+ </div>+ </div>+ ),+ {+ width: 1200,+ height: 600,+ },+ );+}diff --git a/apps/og-image/app/api/user/route.tsx b/apps/og-image/app/api/user/route.tsxnew file mode 100644index 00000000..83881c37--- /dev/null+++ b/apps/og-image/app/api/user/route.tsx@@ -0,0 +1,33 @@+import { ImageResponse } from '@vercel/og';+import { Logo } from 'app/components/logo';+import { userParam } from 'utils/zodParams';++export const runtime = 'edge';++export async function GET(req: Request) {+ const parsed = userParam.decodeRequest(req);++ if (!parsed.success) {+ return new Response(parsed.error.toString(), { status: 400 });+ }++ const props = parsed.data.input;++ return new ImageResponse(+ (+ <div tw="bg-zinc-900 h-full w-full text-white flex flex-col p-14">+ <div tw="flex flex-col justify-center items-center w-full h-full">+ <Logo />+ <h1 tw="text-6xl pt-3">{props.username}</h1>+ <p tw="text-center text-3xl text-zinc-300">+ A user that we can prolly pull data from the db or at least their avatar maybe?+ </p>+ </div>+ </div>+ ),+ {+ width: 1200,+ height: 600,+ },+ );+}diff --git a/apps/og-image/app/app.css b/apps/og-image/app/app.cssnew file mode 100644index 00000000..9cf960e5--- /dev/null+++ b/apps/og-image/app/app.css@@ -0,0 +1,10 @@+body,+html {+ color: #fff;+ background: #000;+}++img {+ max-width: 100%;+ width: 600px;+}diff --git a/apps/og-image/app/components/logo.tsx b/apps/og-image/app/components/logo.tsxnew file mode 100644index 00000000..aec7448b--- /dev/null+++ b/apps/og-image/app/components/logo.tsx@@ -0,0 +1,33 @@+export function Logo() {+ return (+ <svg+ height="128"+ width="128"+ viewBox="0 0 512 512"+ fill="none"+ xmlns="http://www.w3.org/2000/svg"+ >+ <g clipPath="url(#clip0_1_2)">+ <path+ d="M462 0H50C22.3858 0 0 22.3858 0 50V462C0 489.614 22.3858 512 50 512H462C489.614 512 512 489.614 512 462V50C512 22.3858 489.614 0 462 0Z"+ fill="#3178C6"+ />+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M239.78 284.082H304V243H125V284.082H188.906V467H239.78V284.082Z"+ fill="white"+ />+ <path+ d="M303.13 466.986V242.986H349.72V335.818H418.427V242.986H465.13V466.986H418.427V373.827H349.72V466.986H303.13Z"+ fill="white"+ />+ </g>+ <defs>+ <clipPath id="clip0_1_2">+ <rect width="512" height="512" fill="white" />+ </clipPath>+ </defs>+ </svg>+ );+}diff --git a/apps/og-image/app/layout.tsx b/apps/og-image/app/layout.tsxnew file mode 100644index 00000000..a14e64fc--- /dev/null+++ b/apps/og-image/app/layout.tsx@@ -0,0 +1,16 @@+export const metadata = {+ title: 'Next.js',+ description: 'Generated by Next.js',+}++export default function RootLayout({+ children,+}: {+ children: React.ReactNode+}) {+ return (+ <html lang="en">+ <body>{children}</body>+ </html>+ )+}diff --git a/apps/og-image/app/page.tsx b/apps/og-image/app/page.tsxnew file mode 100644index 00000000..126dd465--- /dev/null+++ b/apps/og-image/app/page.tsx@@ -0,0 +1,60 @@+'use client';++import Head from 'next/head';+import { useEffect, useState } from 'react';+import { challengeParam, userParam } from 'utils/zodParams';+import './app.css';++const ogImageUrl = process.env.VERCEL_URL ? `https://${process.env.VERCEL_URL}/api/landing` : '';++export default function Page() {+ const [nonce, setNonce] = useState(Math.random());++ useEffect(() => {+ // randomize nonce on window focus+ const handleFocus = () => setNonce(Math.random());+ window.addEventListener('focus', handleFocus);+ return () => window.removeEventListener('focus', handleFocus);+ }, []);++ return (+ <div>+ <Head>+ <meta name="og:title" content="typehero OG Image Playground" />+ <meta+ name="og:description"+ content="Playground for OG Image Generation using @vercel/og-image"+ />+ <meta name="og:image" content={ogImageUrl} />+ <meta data-rh="true" name="twitter:image" content={ogImageUrl} />+ </Head>+ <main className="grid grid-flow-row grid-cols-2">+ <div>+ <h2>Challenge Card</h2>+ <img+ alt="ayo"+ src={`/api/challenge?${challengeParam.toSearchString({+ description: 'This is a test card that has a has a nice description',+ title: 'Inferring types is fun',+ username: 'Hacksore',+ })}&random=${nonce}`}+ />+ </div>++ <div>+ <h2>User</h2>+ <img+ alt="ayo"+ src={`/api/user?${userParam.toSearchString({+ username: 'Hacksore',+ })}&random=${nonce}`}+ />+ </div>+ <div>+ <h2>Default</h2>+ <img alt="default metadata" src="/api/default" />+ </div>+ </main>+ </div>+ );+}diff --git a/apps/og-image/next.config.js b/apps/og-image/next.config.jsnew file mode 100644index 00000000..4d81e444--- /dev/null+++ b/apps/og-image/next.config.js@@ -0,0 +1,14 @@+/** @type {import("next").NextConfig} */+const config = {+ reactStrictMode: true,+ typescript: {+ ignoreBuildErrors: false,+ },++ eslint: {+ ignoreDuringBuilds: true,+ },+ swcMinify: true,+};+export default config;+diff --git a/apps/og-image/package.json b/apps/og-image/package.jsonnew file mode 100644index 00000000..64716196--- /dev/null+++ b/apps/og-image/package.json@@ -0,0 +1,37 @@+{+ "name": "@repo/og-image",+ "private": true,+ "type": "module",+ "exports": {+ ".": "./utils/zodParams.ts"+ },+ "typesVersions": {+ "*": {+ "*": [+ "./utils/zodParams.ts"+ ],+ "types": [+ "./utils/zodParams.ts"+ ]+ }+ },+ "scripts": {+ "build": "next build",+ "dev": "next dev -p 4200",+ "start": "next start"+ },+ "dependencies": {+ "@vercel/og": "^1.0.0",+ "next": "^13.4.8",+ "react": "latest",+ "react-dom": "latest",+ "zod": "^3.0.0"+ },+ "devDependencies": {+ "@repo/lint": "workspace:*",+ "@repo/tsconfig": "workspace:*",+ "@types/node": "^18.16.16",+ "@types/react": "^18.2.8",+ "typescript": "^5.1.3"+ }+}diff --git a/apps/og-image/tsconfig.json b/apps/og-image/tsconfig.jsonnew file mode 100644index 00000000..923d88f1--- /dev/null+++ b/apps/og-image/tsconfig.json@@ -0,0 +1,27 @@+{+ "extends": "@repo/tsconfig/nextjs.json",+ "compilerOptions": {+ "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json",+ "baseUrl": ".",+ "paths": {+ "~/*": ["src/*"]+ },+ "plugins": [+ {+ "name": "next"+ }+ ]+ },+ "include": [+ "next-env.d.ts",+ "**/*.js",+ "**/*.ts",+ "**/*.tsx",+ ".next/types/**/*.ts",+ "next.config.js",+ "next.config.mjs",+ "postcss.config.cjs"+ ],+ "exclude": ["node_modules", ".next", "public"]+}+diff --git a/apps/og-image/utils/fetchFont.ts b/apps/og-image/utils/fetchFont.tsnew file mode 100644index 00000000..fe82eccb--- /dev/null+++ b/apps/og-image/utils/fetchFont.ts@@ -0,0 +1,14 @@+import { fontParams } from './zodParams';++const baseUrl = process.env.VERCEL+ ? 'https://' + process.env.VERCEL_URL+ : 'http://localhost:3001';++export const fetchFont = (family: string, weight?: number, text?: string) =>+ fetch(+ `${baseUrl}/api/font?${fontParams.toSearchString({+ family,+ weight,+ text,+ })}`,+ ).then((res) => res.arrayBuffer());diff --git a/apps/og-image/utils/zodParams.ts b/apps/og-image/utils/zodParams.tsnew file mode 100644index 00000000..56264415--- /dev/null+++ b/apps/og-image/utils/zodParams.ts@@ -0,0 +1,66 @@+import { z } from 'zod';++type Primitives = string | number | boolean | null;+type JsonValue = Primitives | JsonValue[] | { [key: string]: JsonValue };++const jsonStr = z.string().transform((str, ctx) => {+ try {+ return JSON.parse(str) as JsonValue;+ } catch (error) {+ ctx.addIssue({ code: 'custom', message: 'Needs to be JSON' });+ }+});++export function zodParams<TType>(schema: z.ZodType<TType>) {+ const querySchema = z.object({+ input: jsonStr.pipe(schema),+ });+ return {+ decodeRequest: (req: Request) => {+ const url = new URL(req.url);+ const obj = Object.fromEntries(url.searchParams.entries());++ return querySchema.safeParse(obj);+ },+ toSearchString: (obj: (typeof schema)['_input']) => {+ schema.parse(obj);+ return `input=${encodeURIComponent(JSON.stringify(obj))}`;+ },+ };+}++function truncateWordsFn(str: string, maxCharacters: number) {+ if (str.length <= maxCharacters) {+ return str;+ }+ // break at closest word+ const truncated = str.slice(0, maxCharacters);+ const lastSpace = truncated.lastIndexOf(' ');+ return truncated.slice(0, lastSpace) + ' …';+}+function truncatedWordSchema(opts: { maxCharacters: number }) {+ return z.string().transform((str) => truncateWordsFn(str, opts.maxCharacters));+}++export const fontParams = zodParams(+ z.object({+ family: z.string(),+ weight: z.number().default(400),+ text: z.string().optional(),+ }),+);++export const challengeParam = zodParams(+ z.object({+ title: truncatedWordSchema({ maxCharacters: 70 }),+ description: truncatedWordSchema({ maxCharacters: 145 }),+ username: z.string(),+ }),+);++export const userParam = zodParams(+ z.object({+ username: truncatedWordSchema({ maxCharacters: 70 }),+ }),+);+diff --git a/apps/web/package.json b/apps/web/package.jsonindex 5112c88f..90cc3c02 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -23,13 +23,13 @@"@repo/emails": "workspace:*","@repo/lint": "workspace:*","@repo/ui": "workspace:*",+ "@repo/og-image": "workspace:*","@t3-oss/env-nextjs": "^0.6.0","@tanstack/react-query": "^4.29.25","@tanstack/react-table": "^8.9.3","@types/lodash": "^4.14.195","@uiw/react-md-editor": "^3.23.3","@uploadthing/react": "^5.2.0",- "@vercel/og": "^0.5.11","clsx": "^2.0.0","cmdk": "^0.2.0","date-fns": "^2.30.0",diff --git a/apps/web/src/app/api/og/route.tsx b/apps/web/src/app/api/og/route.tsxdeleted file mode 100644index de51d301..00000000--- a/apps/web/src/app/api/og/route.tsx+++ /dev/null@@ -1,66 +0,0 @@-import { ImageResponse } from '@vercel/og';--export const runtime = 'edge';-export async function GET(request: Request) {- const { searchParams } = new URL(request.url);- const hasTitle = searchParams.has('title');- const title = hasTitle- ? searchParams.get('title')?.slice(0, 100)- : 'A fun typescript challenge site';-- return new ImageResponse(- (- <div- style={{- fontWeight: 'bold',- background: 'white',- width: '100%',- height: '100%',- display: 'flex',- alignItems: 'center',- flexDirection: 'column',- backgroundColor: '#000',- color: '#fff',- }}- >- {/* TODO: move this to an import when it works */}- <svg- style={{ marginTop: 60 }}- height="128"- width="128"- viewBox="0 0 512 512"- fill="none"- xmlns="http://www.w3.org/2000/svg"- >- <g clipPath="url(#clip0_1_2)">- <path- d="M462 0H50C22.3858 0 0 22.3858 0 50V462C0 489.614 22.3858 512 50 512H462C489.614 512 512 489.614 512 462V50C512 22.3858 489.614 0 462 0Z"- fill="#3178C6"- />- <path- fill-rule="evenodd"- clip-rule="evenodd"- d="M239.78 284.082H304V243H125V284.082H188.906V467H239.78V284.082Z"- fill="white"- />- <path- d="M303.13 466.986V242.986H349.72V335.818H418.427V242.986H465.13V466.986H418.427V373.827H349.72V466.986H303.13Z"- fill="white"- />- </g>- <defs>- <clipPath id="clip0_1_2">- <rect width="512" height="512" fill="white" />- </clipPath>- </defs>- </svg>- <p style={{ marginTop: 20, fontSize: 120 }}>Typehero</p>- <p style={{ marginTop: 60, fontSize: 70 }}>{title}</p>- </div>- ),- {- width: 1200,- height: 600,- },- );-}diff --git a/apps/web/src/app/challenge/[id]/page.tsx b/apps/web/src/app/challenge/[id]/page.tsxindex c930225f..4476669a 100644--- a/apps/web/src/app/challenge/[id]/page.tsx+++ b/apps/web/src/app/challenge/[id]/page.tsx@@ -2,7 +2,7 @@ import { getServerAuthSession } from '@repo/auth/server';import { Description } from '../_components/description';import { Comments } from '../_components/comments';import { getChallengeRouteData } from './getChallengeRouteData';-import { buildMeta } from '~/app/metadata';+import { buildMetaForChallenge } from '~/app/metadata';interface Props {params: {@@ -12,9 +12,10 @@ interface Props {export async function generateMetadata({ params: { id } }: Props) {const challenge = await getChallengeRouteData(id, null);- return buildMeta({+ return buildMetaForChallenge({title: challenge.name,description: challenge.shortDescription,+ username: challenge.user.name,});}export default async function Challenges({ params: { id } }: Props) {diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsxindex 15e4126b..a4b16024 100644--- a/apps/web/src/app/layout.tsx+++ b/apps/web/src/app/layout.tsx@@ -4,16 +4,13 @@ import { Inter } from 'next/font/google';import type { Metadata } from 'next';import { Toaster } from '@repo/ui';import { Providers } from './providers';-import { buildMeta } from './metadata';+import { buildMetaForDefault } from './metadata';import { Navigation } from '~/components/ui/navigation';const inter = Inter({ subsets: ['latin'] });export async function generateMetadata(): Promise<Metadata> {- return buildMeta({- title: 'Typehero',- description: 'This is the home page',- });+ return buildMetaForDefault();}export default function RootLayout({ children }: { children: React.ReactNode }) {diff --git a/apps/web/src/app/metadata.ts b/apps/web/src/app/metadata.tsindex 14dde046..d0d15e31 100644--- a/apps/web/src/app/metadata.ts+++ b/apps/web/src/app/metadata.ts@@ -1,11 +1,12 @@import type { Metadata } from 'next';-import { headers } from 'next/headers';+import { challengeParam } from '@repo/og-image';++const OG_URL =+ process.env.NODE_ENV !== 'production' ? 'http://localhost:4200' : 'https://og.typehero.dev';const tagline = 'Level up your typescript skills with interactive exercises';const baseMetadata: Metadata = {- metadataBase: process.env.VERCEL_URL- ? new URL(`https://${process.env.VERCEL_URL}`)- : new URL(`http://localhost:${process.env.PORT ?? 3000}`),+ metadataBase: new URL(OG_URL),title: {default: 'Typehero',template: '%s | TypeHero',@@ -21,7 +22,7 @@ const baseMetadata: Metadata = {siteName: 'Typehero',images: [{- url: encodeURI(`https://${process.env.VERCEL_URL}/api/og?desc=Testing`),+ url: `${OG_URL}/api/default`,width: 1920,height: 1080,},@@ -34,7 +35,7 @@ const baseMetadata: Metadata = {card: 'summary_large_image',images: [{- url: encodeURI(`https://${process.env.VERCEL_URL}/api/og?desc=Testing`),+ url: `${OG_URL}/api/default`,width: 1920,height: 1080,},@@ -45,19 +46,50 @@ const baseMetadata: Metadata = {},};-interface BuildMetaParams {+interface MetaParamsForChallenge {title: string;- description?: string;- ogImage?: NonNullable<NonNullable<Metadata['openGraph']>['images']>;+ description: string;+ username: string;}-/** Helper to build opengraph metadata with defaults, you can override the defaults by passing in the params */-export const buildMeta = async ({ title, description }: BuildMetaParams): Promise<Metadata> => {- const headersList = headers();- const host = headersList.get('host');- const appUrl = process.env.VERCEL_URL ?? host;- const ogImageUrl = `https://${appUrl}/api/og?title=${title}`;+/** Helper to build opengraph metadata for a challenge, you should call this in generateMetadata() next function */+export const buildMetaForChallenge = async ({+ title,+ description,+ username,+}: MetaParamsForChallenge): Promise<Metadata> => {+ const params = `${challengeParam.toSearchString({+ description,+ title,+ username,+ })}`;++ const ogImageUrl = `${OG_URL}/api/challenge?${params}`;++ return buildMeta({+ ogImageUrl,+ title,+ description,+ });+};++/** Helper to build opengraph metadata with defaults, you should call this in generateMetadata() next function */+export const buildMetaForDefault = async (): Promise<Metadata> => {+ return buildMeta({+ ogImageUrl: `${OG_URL}/api/default`,+ });+};+/** update the metadata for og */+const buildMeta = async ({+ ogImageUrl,+ description,+ title,+}: {+ ogImageUrl: string;+ description?: string;+ title?: string;+}): Promise<Metadata> => {baseMetadata.openGraph!.images = ogImageUrl;baseMetadata.twitter!.images = ogImageUrl;diff --git a/docker-compose.yaml b/docker-compose.yamlindex e906d565..a36fb91d 100644--- a/docker-compose.yaml+++ b/docker-compose.yaml@@ -10,13 +10,12 @@ services:MYSQL_ROOT_USER: devMYSQL_ROOT_PASSWORD: devMYSQL_DATABASE: typehero-# create a volume for the docker container_namevolumes:- - data:/bitnami/mysql/data+ - typehero-data:/bitnami/mysql/dataplatform: linux/amd64ports:- 3306:3306volumes:- data:+ typehero-data:driver: localdiff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex a56724a9..1eefae69 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -126,6 +126,40 @@ importers:specifier: 1.9.3version: 1.9.3+ apps/og-image:+ dependencies:+ '@vercel/og':+ specifier: ^1.0.0+ version: 1.0.0+ next:+ specifier: ^13.4.8+ version: 13.4.19([email protected])([email protected])+ react:+ specifier: latest+ version: 18.2.0+ react-dom:+ specifier: latest+ version: 18.2.0([email protected])+ zod:+ specifier: ^3.0.0+ version: 3.21.4+ devDependencies:+ '@repo/lint':+ specifier: workspace:*+ version: link:../../tooling/config-eslint+ '@repo/tsconfig':+ specifier: workspace:*+ version: link:../../tooling/config-typescript+ '@types/node':+ specifier: ^18.16.16+ version: 18.16.16+ '@types/react':+ specifier: ^18.2.8+ version: 18.2.20+ typescript:+ specifier: ^5.1.3+ version: 5.1.6+apps/web:dependencies:'@hookform/error-message':@@ -155,6 +189,9 @@ importers:'@repo/lint':specifier: workspace:*version: link:../../tooling/config-eslint+ '@repo/og-image':+ specifier: workspace:*+ version: link:../og-image'@repo/ui':specifier: workspace:*version: link:../../packages/ui@@ -176,9 +213,6 @@ importers:'@uploadthing/react':specifier: ^5.2.0- '@vercel/og':- specifier: ^0.5.11- version: 0.5.11clsx:specifier: ^2.0.0version: 2.0.0@@ -506,7 +540,7 @@ importers:dependencies:'@next/eslint-plugin-next':specifier: canary- version: 13.4.20-canary.0+ version: 13.4.13-canary.13'@repo/tsconfig':specifier: workspace:*version: link:../config-typescript@@ -518,7 +552,7 @@ importers:version: 5.62.0([email protected])([email protected])'@vercel/style-guide':specifier: ^4.0.2eslint:specifier: ^8.40.0version: 8.45.0@@ -1570,8 +1604,8 @@ packages:glob: 7.1.7dev: true- /@next/[email protected]:- resolution: {integrity: sha512-vFC1meiw/awh2xJZMWaoECsfZbgkt2fF3HIg8f2fSM/w41Z86L1SS7SjKmpbbD87yq3tiqgqHmFv0JCych4g4g==}+ /@next/[email protected]:+ resolution: {integrity: sha512-lEXi0QLWUuXlMQRLSk/6JUUoOcjACOKbJYPKe0R1XyF5Kf7/Czdm072UJb3betXqiWw5v54GoOOmyDaUDCn5Rw==}dependencies:glob: 7.1.7dev: false@@ -3355,8 +3389,8 @@ packages:react: 18.2.0dev: false- /@resvg/[email protected]:- resolution: {integrity: sha512-yi6R0HyHtsoWTRA06Col4WoDs7SvlXU3DLMNP2bdAgs7HK18dTEVl1weXgxRzi8gwLteGUbIg29zulxIB3GSdg==}+ /@resvg/[email protected]:+ resolution: {integrity: sha512-pWIG9a/x1ky8gXKRhPH1OPKpHFoMN1ISLbJ+O+gPXQHIAKhNd5I28RlWf7q576hAOQA9JZTlo3p/M2uyLzJmmw==}engines: {node: '>= 10'}dev: false@@ -3512,7 +3546,7 @@ packages:/@types/[email protected]:resolution: {integrity: sha512-drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q==}dependencies:- '@types/node': 20.5.1+ '@types/node': 18.17.6dev: true/@types/[email protected]:@@ -3532,7 +3566,7 @@ packages:/@types/[email protected]:resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}dependencies:- '@types/node': 20.5.1+ '@types/node': 18.17.6form-data: 3.0.1dev: true@@ -3548,13 +3582,17 @@ packages:resolution: {integrity: sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==}dev: true- /@types/[email protected]:- resolution: {integrity: sha512-Dd0BYtWgnWJKwO1jkmTrzofjK2QXXcai0dmtzvIBhcA+RsG5h8R3xlyta0kGOZRNfL9GuRtb1knmPEhQrePCEw==}+ /@types/[email protected]:+ resolution: {integrity: sha512-NpaM49IGQQAUlBhHMF82QH80J08os4ZmyF9MkpCzWAGuOHqE4gTEbhzd7L3l5LmWuZ6E0OiC1FweQ4tsiW35+g==}+ dev: true- /@types/[email protected]:- resolution: {integrity: sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==}+ /@types/[email protected]:+ resolution: {integrity: sha512-fGmT/P7z7ecA6bv/ia5DlaWCH4YeZvAQMNpUhrJjtAhOhZfoxS1VLUgU2pdk63efSjQaOJWdXMuAJsws+8I6dg==}dev: true+ /@types/[email protected]:+ resolution: {integrity: sha512-Dd0BYtWgnWJKwO1jkmTrzofjK2QXXcai0dmtzvIBhcA+RsG5h8R3xlyta0kGOZRNfL9GuRtb1knmPEhQrePCEw==}+/@types/[email protected]:resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}dev: false@@ -3858,16 +3896,16 @@ packages:zod: 3.21.4dev: false- /@vercel/[email protected]:- resolution: {integrity: sha512-07SDyClsPXod1dReV9wuwk5uEHvJH42V12Ovy005Zp+Hwq3CZEyWa2gRi12HlXCqoIupOG0//LAFBp1Tt2EwjQ==}+ /@vercel/[email protected]:+ resolution: {integrity: sha512-/uj/sVvxE4SFYUmc4VnMHGkVx/m+jkWzsqAawAghK8BFm5KXP8WAJ475osnO0xhqhptlZLWJDXcxGDht/sVm+g==}engines: {node: '>=16'}dependencies:- '@resvg/resvg-wasm': 2.4.1- satori: 0.10.3- yoga-wasm-web: 0.3.3+ '@resvg/resvg-wasm': 2.0.0-alpha.4+ satori: 0.0.46+ yoga-wasm-web: 0.3.0dev: false- /@vercel/[email protected](@next/[email protected])([email protected])([email protected])([email protected]):+ /@vercel/[email protected](@next/[email protected])([email protected])([email protected])([email protected]):resolution: {integrity: sha512-FroL+oOePzhw7n/I+f7zr4WNroGHT/+2TlW6WH9+CVSjMNsEyu7Qstj2mI5gWIBjT1Y2ZImKPppCzI2cIYmNZw==}engines: {node: '>=16'}peerDependencies:@@ -3887,7 +3925,7 @@ packages:dependencies:'@babel/core': 7.22.10'@babel/eslint-parser': 7.22.10(@babel/[email protected])([email protected])- '@next/eslint-plugin-next': 13.4.20-canary.0+ '@next/eslint-plugin-next': 13.4.13-canary.13'@rushstack/eslint-patch': 1.3.2'@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/[email protected])([email protected])([email protected])'@typescript-eslint/parser': 5.62.0([email protected])([email protected])@@ -4271,11 +4309,6 @@ packages:resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}- resolution: {integrity: sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==}- engines: {node: '>= 0.4'}- dev: false-resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}dev: false@@ -5362,10 +5395,6 @@ packages:resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}engines: {node: '>=6'}- resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}- dev: false-resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}engines: {node: '>=0.8.0'}@@ -6453,11 +6482,6 @@ packages:space-separated-tokens: 2.0.2dev: false- resolution: {integrity: sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw==}- engines: {node: '>=6'}- dev: false-resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}dev: false@@ -6841,7 +6865,7 @@ packages:resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}engines: {node: '>= 10.13.0'}dependencies:- '@types/node': 20.5.1+ '@types/node': 18.17.6merge-stream: 2.0.0supports-color: 8.1.1dev: true@@ -7008,13 +7032,6 @@ packages:resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}engines: {node: '>=10'}- resolution: {integrity: sha512-MHp03UImeVhB7XZtjd0E4n6+3xr5Dq/9xI/5FptGk5FrbDR3zagPa2DS6U8ks/3HjbKWG9Q1M2ufOzxV2qLYSQ==}- dependencies:- base64-js: 0.0.8- unicode-trie: 2.0.0- dev: false-resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}@@ -7995,23 +8012,12 @@ packages:engines: {node: '>=6'}dev: false- resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}- dev: false-resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}engines: {node: '>=6'}dependencies:callsites: 3.1.0- resolution: {integrity: sha512-bwS/GGIFV3b6KS4uwpzCFj4w297Yl3uqnSgIPsoQkx7GMLROXfMnWvxfNkL0oh8HVhZA4hvJoEoEIqonfJ3BWg==}- dependencies:- color-name: 1.1.4- hex-rgb: 4.3.0- dev: false-resolution: {integrity: sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==}dependencies:@@ -9087,8 +9093,8 @@ packages:regexp-tree: 0.1.27dev: false- resolution: {integrity: sha512-8tZPu7AGiRWimbOyja1s2HK0hEC4DacZ8cAKDITxlVI5tKQZbOuMiVgSB50CABwc0I4Imgtkq7o9Egj1WOJTKg==}+ resolution: {integrity: sha512-7RfTz38MB0n8tzmRHtUh1y0K7609CLBHpYuyZuh9rpf9FyhOd2in+6EHuqu6ul/Jebn1qD1HdYKtAMjb7uiNAQ==}engines: {node: '>=16'}dependencies:'@shuding/opentype.js': 1.4.0-beta.0@@ -9096,9 +9102,6 @@ packages:css-box-shadow: 1.0.0-3css-to-react-native: 3.2.0emoji-regex: 10.2.1- escape-html: 1.0.3- linebreak: 1.1.0- parse-css-color: 0.2.1postcss-value-parser: 4.2.0yoga-wasm-web: 0.3.3dev: false@@ -9582,10 +9585,6 @@ packages:dependencies:any-promise: 1.3.0- resolution: {integrity: sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==}- dev: false-resolution: {integrity: sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==}engines: {node: '>=12'}@@ -9842,13 +9841,6 @@ packages:has-symbols: 1.0.3which-boxed-primitive: 1.0.2- resolution: {integrity: sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==}- dependencies:- pako: 0.2.9- tiny-inflate: 1.0.3- dev: false-resolution: {integrity: sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==}dependencies:@@ -10230,6 +10222,10 @@ packages:resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}engines: {node: '>=10'}+ resolution: {integrity: sha512-rD3L4jyMlO1m+RWU60lNwZQK5zmzglCV5fI1gTRikmpv3YzmNIZQbjyfE6cMNb9Xaly/C1SwemYGbsiOekMvnQ==}+ dev: false+resolution: {integrity: sha512-N+d4UJSJbt/R3wqY7Coqs5pcV0aUj2j9IaQ3rNj9bVCLld8tTGKRa2USARjnvZJWVx1NDmQev8EknoczaOQDOA==}dev: false