From 89698d73a8e38c79719bed3fb69b57232f216f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Feij=C3=B3?= Date: Mon, 13 May 2024 18:51:38 -0300 Subject: [PATCH 1/5] chore: Remove `babelrc` file in favor of `next/font` usage --- packages/core/.babelrc.js | 12 ------------ packages/core/README.md | 1 - 2 files changed, 13 deletions(-) delete mode 100644 packages/core/.babelrc.js diff --git a/packages/core/.babelrc.js b/packages/core/.babelrc.js deleted file mode 100644 index e371e2bac4..0000000000 --- a/packages/core/.babelrc.js +++ /dev/null @@ -1,12 +0,0 @@ -const { babelOptimizerPlugin } = require('@graphql-codegen/client-preset') - -module.exports = { - presets: ['next/babel'], - /** Replaces gql function calls for imports to the document data */ - plugins: [ - [ - babelOptimizerPlugin, - { artifactDirectory: './@generated', gqlTagName: 'gql' }, - ], - ], -} diff --git a/packages/core/README.md b/packages/core/README.md index a668a80226..888ef4f029 100644 --- a/packages/core/README.md +++ b/packages/core/README.md @@ -43,7 +43,6 @@ A quick look at the top-level files and directories you'll see in a this NextJS ├── public ├── src ├── test - ├── .babelrc.js ├── .editorconfig ├── .prettierignore ├── .prettierrrc From e71da3ddaff1c3b3678cbd9d5e2f91ba0dd52034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Feij=C3=B3?= Date: Mon, 13 May 2024 18:53:56 -0300 Subject: [PATCH 2/5] feat: Using Inter font from `next/font` --- packages/core/app/layout.tsx | 16 ++++++++++------ packages/core/app/styles/fonts/index.tsx | 10 ++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 packages/core/app/styles/fonts/index.tsx diff --git a/packages/core/app/layout.tsx b/packages/core/app/layout.tsx index b6fd364a32..32b11294d8 100644 --- a/packages/core/app/layout.tsx +++ b/packages/core/app/layout.tsx @@ -9,7 +9,9 @@ import ThirdPartyScripts from 'app/components/ThirdPartyScripts' import AnalyticsHandler from 'app/sdk/analytics' import ErrorBoundary from 'app/sdk/error/ErrorBoundary' import UIProvider from 'app/sdk/ui/UIProvider' -import { WebFonts } from 'src/customizations/src/GlobalOverrides' + +// The path will probably change when overriding fonts in the future +import DefaultFont from 'app/styles/fonts' // import GlobalSections from './components/cms/GlobalSections' @@ -78,11 +80,13 @@ export default async function RootLayout({ - - {!process.env.DISABLE_3P_SCRIPTS && } - - - + {!process.env.DISABLE_3P_SCRIPTS && } + {/** + * Later when overriding fonts we should use the font variable in CSS files + * https://nextjs.org/docs/app/api-reference/components/font#css-variables + */} + + FS Next Update page using Inter font. <> {/* {children}*/} diff --git a/packages/core/app/styles/fonts/index.tsx b/packages/core/app/styles/fonts/index.tsx new file mode 100644 index 0000000000..76f45d0c3d --- /dev/null +++ b/packages/core/app/styles/fonts/index.tsx @@ -0,0 +1,10 @@ +import { Inter } from 'next/font/google' + +const customFont = Inter({ + display: 'swap', + variable: '--fs-font-inter', + weight: ['400', '500', '600', '700', '900'], + subsets: ['latin'], // Either define subsets or set preload to false https://nextjs.org/docs/messages/google-fonts-missing-subsets +}) + +export default customFont From e08dfcda14058804bdf50185c0b23e80ccf9417b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Feij=C3=B3?= Date: Tue, 14 May 2024 21:59:33 -0300 Subject: [PATCH 3/5] fix: Add `theme` classname back --- packages/core/app/layout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/app/layout.tsx b/packages/core/app/layout.tsx index 32b11294d8..a45e1eca93 100644 --- a/packages/core/app/layout.tsx +++ b/packages/core/app/layout.tsx @@ -85,7 +85,7 @@ export default async function RootLayout({ * Later when overriding fonts we should use the font variable in CSS files * https://nextjs.org/docs/app/api-reference/components/font#css-variables */} - + FS Next Update page using Inter font. <> From 8236529e9f7353c5294bcb3f460acf56847280e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Feij=C3=B3?= Date: Tue, 14 May 2024 22:29:14 -0300 Subject: [PATCH 4/5] chore: Add TODOs --- packages/core/app/layout.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/app/layout.tsx b/packages/core/app/layout.tsx index a45e1eca93..902b1b7f73 100644 --- a/packages/core/app/layout.tsx +++ b/packages/core/app/layout.tsx @@ -10,7 +10,7 @@ import AnalyticsHandler from 'app/sdk/analytics' import ErrorBoundary from 'app/sdk/error/ErrorBoundary' import UIProvider from 'app/sdk/ui/UIProvider' -// The path will probably change when overriding fonts in the future +// TODO: The path will probably change when overriding fonts in the future import DefaultFont from 'app/styles/fonts' // import GlobalSections from './components/cms/GlobalSections' @@ -82,7 +82,7 @@ export default async function RootLayout({ {!process.env.DISABLE_3P_SCRIPTS && } {/** - * Later when overriding fonts we should use the font variable in CSS files + * TODO: Later when overriding fonts we should use the font variable in CSS files * https://nextjs.org/docs/app/api-reference/components/font#css-variables */} From 10ab809cfa855d0994dfc020bde7bff7d6d86fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Feij=C3=B3?= Date: Wed, 15 May 2024 18:09:15 -0300 Subject: [PATCH 5/5] fix: Remove sample text to avoid hydration errors --- packages/core/app/layout.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/core/app/layout.tsx b/packages/core/app/layout.tsx index 902b1b7f73..0354787116 100644 --- a/packages/core/app/layout.tsx +++ b/packages/core/app/layout.tsx @@ -86,7 +86,6 @@ export default async function RootLayout({ * https://nextjs.org/docs/app/api-reference/components/font#css-variables */} - FS Next Update page using Inter font. <> {/* {children}*/}