From 90d3448af8e8edbac0167d4d1659f77713999fea Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Sun, 3 Mar 2024 12:11:48 -0800 Subject: [PATCH] Fixups --- app/(public)/layout.tsx | 8 +- app/(public)/page.tsx | 2 + app/sitemap.tsx | 64 ++--- package.json | 17 +- src/components/patterns/elements/oembed.tsx | 6 +- src/components/utils/google-analytics.tsx | 8 - src/lib/gql/fetcher.tsx | 10 +- yarn.lock | 284 ++++++++------------ 8 files changed, 167 insertions(+), 232 deletions(-) delete mode 100644 src/components/utils/google-analytics.tsx diff --git a/app/(public)/layout.tsx b/app/(public)/layout.tsx index 7ae5b128..fa55cb3f 100644 --- a/app/(public)/layout.tsx +++ b/app/(public)/layout.tsx @@ -3,9 +3,13 @@ import GlobalFooter from "@/components/layout/global-footer"; import Header from "@/components/layout/header"; import {ReactNode} from "react"; import Script from "next/script"; -import GoogleAnalytics from "@/components/utils/google-analytics"; +import {GoogleAnalytics} from "@next/third-parties/google"; import {isDraftMode} from "@/lib/drupal/is-draft-mode"; +// https://nextjs.org/docs/app/api-reference/file-conventions/route-segment-config +export const revalidate = false; +export const dynamic = 'force-static'; + const Layout = ({children}: { children: ReactNode }) => { const draftMode = isDraftMode() return ( @@ -13,7 +17,7 @@ const Layout = ({children}: { children: ReactNode }) => { {(!draftMode && process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID) && <>