Merge pull request #4571 from luke-h1/dev

merge dev into main
luke-h1 · Nov 17, 2024 · 81ac6e6 · 81ac6e6
2 parents a1a0d06 + 14f2256
commit 81ac6e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -5,8 +5,8 @@ import SkipLink from '@frontend/components/SkipLink';
 import siteConfig from '@frontend/config/site';
 import getPolicies from '@frontend/utils/getPolicies';
 // import newrelic from 'newrelic';
+import { GoogleAnalytics } from '@next/third-parties/google';
 import { Metadata } from 'next';
-import Script from 'next/script';
 import { ReactNode } from 'react';
 import '@frontend/styles/prism.css';
 
@@ -72,6 +72,7 @@ const RootLayout = async ({ children }: Props) => {
   //   hasToRemoveScriptWrapper: true,
   //   allowTransactionlessInjection: true,
   // });
+
   return (
     <html lang="en">
       <head>
@@ -96,23 +97,7 @@ const RootLayout = async ({ children }: Props) => {
         <meta property="og:image:width" content="1200" />
         <meta property="og:image:height" content="630" />
         {process.env.NEXT_PUBLIC_URL === 'https://lhowsam.com' && (
-          <>
-            {/* <GoogleAnalytics gaId={process.env.NEXT_PUBLIC_GA_TRACKING_ID} /> */}
-            <Script
-              async
-              src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GA_TRACKING_ID}`}
-            />
-
-            <Script id="google-analytics">
-              {`
-        window.dataLayer = window.dataLayer || [];
-        function gtag(){dataLayer.push(arguments);}
-        gtag('js', new Date());
-
-        gtag('config', '${process.env.NEXT_PUBLIC_GA_TRACKING_ID}');
-      `}
-            </Script>
-          </>
+          <GoogleAnalytics gaId={process.env.NEXT_PUBLIC_GA_TRACKING_ID} />
         )}
         {/* <Script
           id="nr-browser-agent"

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -6,12 +6,14 @@ import Page from '@frontend/components/Page';
 import PostItem from '@frontend/components/PostItem';
 import Spacer from '@frontend/components/Spacer';
 import Text from '@frontend/components/Text';
-import WorkItem from '@frontend/components/WorkItem';
 import siteConfig from '@frontend/config/site';
 import postService from '@frontend/services/postService';
 import workService from '@frontend/services/workService';
 import { nrLogger } from '@frontend/utils/nrLogger';
 import { Metadata } from 'next';
+import dynamic from 'next/dynamic';
+
+const WorkItem = dynamic(() => import('@frontend/components/WorkItem'));
 
 export const revalidate = siteConfig.defaultRevalidate;