From 979f4e04d91f2f4aec03da8ef5a1f74c2faaa3dc Mon Sep 17 00:00:00 2001 From: Jonathan Irvin Date: Mon, 9 Sep 2024 09:52:20 -0500 Subject: [PATCH 1/2] fix: font reload issues with next/font Signed-off-by: Jonathan Irvin --- apps/frontend/src/app/layout.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/frontend/src/app/layout.tsx b/apps/frontend/src/app/layout.tsx index 6a77d17e..3ed9e2d0 100644 --- a/apps/frontend/src/app/layout.tsx +++ b/apps/frontend/src/app/layout.tsx @@ -12,7 +12,8 @@ import { isGeneral } from '@gitroom/react/helpers/is.general'; import PlausibleProvider from 'next-plausible'; import clsx from 'clsx'; -const chakra = Chakra_Petch({ weight: '400', subsets: ['latin'] }); +// See: https://stackoverflow.com/a/76484168 +const chakra = Chakra_Petch({ weight: '400', subsets: ['latin'], display: 'swap', adjustFontFallback: false }); export default async function AppLayout({ children }: { children: ReactNode }) { return ( From 5f8e1380360706ecc2cae3f4b51fd0a9014e4d4b Mon Sep 17 00:00:00 2001 From: Jonathan Irvin Date: Mon, 9 Sep 2024 10:57:51 -0500 Subject: [PATCH 2/2] fix: load chakra-petch from fontsource instead of nextjs --- apps/frontend/src/app/layout.tsx | 9 ++------- package-lock.json | 7 +++++++ package.json | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/frontend/src/app/layout.tsx b/apps/frontend/src/app/layout.tsx index 3ed9e2d0..7b4912c4 100644 --- a/apps/frontend/src/app/layout.tsx +++ b/apps/frontend/src/app/layout.tsx @@ -1,19 +1,14 @@ import interClass from '@gitroom/react/helpers/inter.font'; - export const dynamic = 'force-dynamic'; import './global.scss'; import 'react-tooltip/dist/react-tooltip.css'; import '@copilotkit/react-ui/styles.css'; - import LayoutContext from '@gitroom/frontend/components/layout/layout.context'; import { ReactNode } from 'react'; -import { Chakra_Petch } from 'next/font/google'; import { isGeneral } from '@gitroom/react/helpers/is.general'; import PlausibleProvider from 'next-plausible'; import clsx from 'clsx'; - -// See: https://stackoverflow.com/a/76484168 -const chakra = Chakra_Petch({ weight: '400', subsets: ['latin'], display: 'swap', adjustFontFallback: false }); +import "@fontsource/chakra-petch"; export default async function AppLayout({ children }: { children: ReactNode }) { return ( @@ -25,7 +20,7 @@ export default async function AppLayout({ children }: { children: ReactNode }) { sizes="any" /> - + {children} diff --git a/package-lock.json b/package-lock.json index 37a0b0c6..398ea7b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,7 @@ "@copilotkit/react-textarea": "1.1.0", "@copilotkit/react-ui": "1.1.0", "@copilotkit/runtime": "1.1.0", + "@fontsource/chakra-petch": "^5.0.22", "@hookform/resolvers": "^3.3.4", "@mantine/core": "^5.10.5", "@mantine/dates": "^5.10.5", @@ -6242,6 +6243,12 @@ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.4.tgz", "integrity": "sha512-dWO2pw8hhi+WrXq1YJy2yCuWoL20PddgGaqTgVe4cOS9Q6qklXCiA1tJEqX6BEwRNSCP84/afac9hd4MS+zEUA==" }, + "node_modules/@fontsource/chakra-petch": { + "version": "5.0.22", + "resolved": "https://registry.npmjs.org/@fontsource/chakra-petch/-/chakra-petch-5.0.22.tgz", + "integrity": "sha512-dYhrz0As8T7H7NGeMbcwAf84xzlxzdfcXBqcgO5lWAGezud8zrrJKGHB/9To5fNQ1ZoqDVplXy3Hu+Ye7tFbvw==", + "license": "OFL-1.1" + }, "node_modules/@google/generative-ai": { "version": "0.11.5", "resolved": "https://registry.npmjs.org/@google/generative-ai/-/generative-ai-0.11.5.tgz", diff --git a/package.json b/package.json index 9a5c2dc6..5f92d796 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "@copilotkit/react-textarea": "1.1.0", "@copilotkit/react-ui": "1.1.0", "@copilotkit/runtime": "1.1.0", + "@fontsource/chakra-petch": "^5.0.22", "@hookform/resolvers": "^3.3.4", "@mantine/core": "^5.10.5", "@mantine/dates": "^5.10.5",