ga: rework

mimecuvalo · Nov 4, 2023 · 44c264c · 44c264c · vercel · Nov 4, 2023
1 parent 07c974e
commit 44c264c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/components/content/ContentHead.tsx b/components/content/ContentHead.tsx
@@ -3,6 +3,7 @@ import { buildUrl, contentUrl, profileUrl } from 'util/url-factory';
 
 import Head from 'next/head';
 import { useTheme } from 'components';
+import Script from 'next/script';
 
 export default function ContentHead(props: {
   content?: Content;
@@ -121,21 +122,18 @@ export default function ContentHead(props: {
         <link rel="replies" type="application/atom+xml" href={repliesUrl} {...repliesAttribs} />
       ) : null}
       {contentOwner ? (
-        <script async src={`https://www.googletagmanager.com/gtag/js?id=${contentOwner.googleAnalytics}`} />
+        <Script async src={`https://www.googletagmanager.com/gtag/js?id=${contentOwner.googleAnalytics}`} />
       ) : null}
       {contentOwner ? (
-        <script
-          async
-          dangerouslySetInnerHTML={{
-            __html: `
+        <Script id="google-analytics-script" async>
+          {`
           window.dataLayer = window.dataLayer || [];
           function gtag(){dataLayer.push(arguments);}
           gtag('js', new Date());
 
           gtag('config', '${contentOwner.googleAnalytics}');
-          `,
-          }}
-        />
+        `}
+        </Script>
       ) : null}
     </Head>
   );

diff --git a/components/content/ContentQuery.tsx b/components/content/ContentQuery.tsx
@@ -60,6 +60,7 @@ export default gql`
       theme
       viewport
       license
+      googleAnalytics
     }
 
     fetchSiteMap(username: $username) {

diff --git a/pages/_document.tsx b/pages/_document.tsx
@@ -34,6 +34,8 @@ const generateCsp = (nonce: string) => {
       'https://cdn.auth0.com',
       'https://cdn.vercel-insights.com',
       'https://va.vercel-scripts.com',
+      'https://www.googletagmanager.com',
+      'https://www.google-analytics.com',
     ].concat(isDevelopment ? ["'unsafe-inline'", "'unsafe-eval'"] : [`'nonce-${nonce}'`]),
 
     // XXX(mime): we have inline styles around - can we pass nonce around the app properly?
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,6 +60,7 @@ export default gql` @@
           theme
           viewport
           license
+          googleAnalytics
         }
         fetchSiteMap(username: $username) {
@@ Expand Down @@