From 4854604e8e6c6acfd76e193987858e1dc1c40c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Fri, 9 Dec 2022 17:10:19 +0100
Subject: [PATCH 01/13] Remove unnecesary file

---
 .../with-google-analytics/pages/_document.js  | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 examples/with-google-analytics/pages/_document.js
diff --git a/examples/with-google-analytics/pages/_document.js b/examples/with-google-analytics/pages/_document.js
deleted file mode 100644
index db3c34b900d5..000000000000
--- a/examples/with-google-analytics/pages/_document.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Html, Head, Main, NextScript } from 'next/document'
-
-export default function Document() {
-  return (
-    <Html>
-      <Head />
-      <body>
-        <Main />
-        <NextScript />
-
-        {/* Global Site Tag (gtag.js) - Google Analytics */}
-        <script
-          dangerouslySetInnerHTML={{
-            __html: `
-            window.dataLayer = window.dataLayer || [];
-            function gtag(){dataLayer.push(arguments);}
-            gtag('js', new Date());
-
-          `,
-          }}
-        />
-      </body>
-    </Html>
-  )
-}

From bc4f914ac99c3c4e23197a23ecac012b723429f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Fri, 9 Dec 2022 17:39:30 +0100
Subject: [PATCH 02/13] Remove unnecesary code for the example

---
 examples/with-google-analytics/lib/gtag.js   | 9 ---------
 examples/with-google-analytics/pages/_app.js | 9 ++++-----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/examples/with-google-analytics/lib/gtag.js b/examples/with-google-analytics/lib/gtag.js
index 49507f8b959f..56a0c542f9ef 100644
--- a/examples/with-google-analytics/lib/gtag.js
+++ b/examples/with-google-analytics/lib/gtag.js
@@ -6,12 +6,3 @@ export const pageview = (url) => {
     page_path: url,
   })
 }
-
-// https://developers.google.com/analytics/devguides/collection/gtagjs/events
-export const event = ({ action, category, label, value }) => {
-  window.gtag('event', action, {
-    event_category: category,
-    event_label: label,
-    value: value,
-  })
-}
diff --git a/examples/with-google-analytics/pages/_app.js b/examples/with-google-analytics/pages/_app.js
index 7c37a3b61de2..ee5b88ed20de 100644
--- a/examples/with-google-analytics/pages/_app.js
+++ b/examples/with-google-analytics/pages/_app.js
@@ -1,7 +1,7 @@
-import { useEffect } from 'react'
-import Script from 'next/script'
-import { useRouter } from 'next/router'
-import * as gtag from '../lib/gtag'
+import { useRouter } from 'next/router';
+import Script from 'next/script';
+import { useEffect } from 'react';
+import * as gtag from '../lib/gtag';
 
 const App = ({ Component, pageProps }) => {
   const router = useRouter()
@@ -25,7 +25,6 @@ const App = ({ Component, pageProps }) => {
         src={`https://www.googletagmanager.com/gtag/js?id=${gtag.GA_TRACKING_ID}`}
       />
       <Script
-        id="gtag-init"
         strategy="afterInteractive"
         dangerouslySetInnerHTML={{
           __html: `

From 6dbcf1aba0ef3a2200b171b92d875554c3d8041f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Fri, 9 Dec 2022 17:46:26 +0100
Subject: [PATCH 03/13] Move back event since is necessary

---
 examples/with-google-analytics/lib/gtag.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/examples/with-google-analytics/lib/gtag.js b/examples/with-google-analytics/lib/gtag.js
index 56a0c542f9ef..49507f8b959f 100644
--- a/examples/with-google-analytics/lib/gtag.js
+++ b/examples/with-google-analytics/lib/gtag.js
@@ -6,3 +6,12 @@ export const pageview = (url) => {
     page_path: url,
   })
 }
+
+// https://developers.google.com/analytics/devguides/collection/gtagjs/events
+export const event = ({ action, category, label, value }) => {
+  window.gtag('event', action, {
+    event_category: category,
+    event_label: label,
+    value: value,
+  })
+}

From 0e504e355db31bf1bd04128d2c0ec06e53d7a8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Fri, 9 Dec 2022 18:03:18 +0100
Subject: [PATCH 04/13] Remove hashChangeComplete event

---
 examples/with-google-analytics/pages/_app.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/examples/with-google-analytics/pages/_app.js b/examples/with-google-analytics/pages/_app.js
index ee5b88ed20de..14009529f523 100644
--- a/examples/with-google-analytics/pages/_app.js
+++ b/examples/with-google-analytics/pages/_app.js
@@ -10,10 +10,8 @@ const App = ({ Component, pageProps }) => {
       gtag.pageview(url)
     }
     router.events.on('routeChangeComplete', handleRouteChange)
-    router.events.on('hashChangeComplete', handleRouteChange)
     return () => {
       router.events.off('routeChangeComplete', handleRouteChange)
-      router.events.off('hashChangeComplete', handleRouteChange)
     }
   }, [router.events])
 

From a324e704d6a42cacb03acd46b81499535093d7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Fri, 9 Dec 2022 18:21:33 +0100
Subject: [PATCH 05/13] Reorder imports

---
 examples/with-google-analytics/pages/_app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/with-google-analytics/pages/_app.js b/examples/with-google-analytics/pages/_app.js
index 14009529f523..6ffcd4874626 100644
--- a/examples/with-google-analytics/pages/_app.js
+++ b/examples/with-google-analytics/pages/_app.js
@@ -1,6 +1,6 @@
-import { useRouter } from 'next/router';
-import Script from 'next/script';
 import { useEffect } from 'react';
+import Script from 'next/script';
+import { useRouter } from 'next/router';
 import * as gtag from '../lib/gtag';
 
 const App = ({ Component, pageProps }) => {

From 9e1769f3d9668592f4529cf95b457f93b17a93e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Fri, 9 Dec 2022 18:22:17 +0100
Subject: [PATCH 06/13] Move back code style

---
 examples/with-google-analytics/pages/_app.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/with-google-analytics/pages/_app.js b/examples/with-google-analytics/pages/_app.js
index 6ffcd4874626..d8334f3754d3 100644
--- a/examples/with-google-analytics/pages/_app.js
+++ b/examples/with-google-analytics/pages/_app.js
@@ -1,7 +1,7 @@
-import { useEffect } from 'react';
-import Script from 'next/script';
-import { useRouter } from 'next/router';
-import * as gtag from '../lib/gtag';
+import { useEffect } from 'react'
+import Script from 'next/script'
+import { useRouter } from 'next/router'
+import * as gtag from '../lib/gtag'
 
 const App = ({ Component, pageProps }) => {
   const router = useRouter()

From d7138c07fcab520d3fcf743ad27ef5d1f1208f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Mon, 12 Dec 2022 16:33:17 +0100
Subject: [PATCH 07/13] Solve webVitals issue with no _document.js

---
 examples/with-google-analytics/pages/_app.js | 29 ++++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/examples/with-google-analytics/pages/_app.js b/examples/with-google-analytics/pages/_app.js
index d8334f3754d3..4fa2f22d1d17 100644
--- a/examples/with-google-analytics/pages/_app.js
+++ b/examples/with-google-analytics/pages/_app.js
@@ -1,7 +1,8 @@
-import { useEffect } from 'react'
-import Script from 'next/script'
-import { useRouter } from 'next/router'
-import * as gtag from '../lib/gtag'
+import { useEffect } from 'react';
+import Script from 'next/script';
+import Head from 'next/head';
+import { useRouter } from 'next/router';
+import * as gtag from '../lib/gtag';
 
 const App = ({ Component, pageProps }) => {
   const router = useRouter()
@@ -17,27 +18,31 @@ const App = ({ Component, pageProps }) => {
 
   return (
     <>
+    <Head>
       {/* Global Site Tag (gtag.js) - Google Analytics */}
-      <Script
-        strategy="afterInteractive"
-        src={`https://www.googletagmanager.com/gtag/js?id=${gtag.GA_TRACKING_ID}`}
-      />
-      <Script
-        strategy="afterInteractive"
+      <script
         dangerouslySetInnerHTML={{
           __html: `
             window.dataLayer = window.dataLayer || [];
             function gtag(){dataLayer.push(arguments);}
             gtag('js', new Date());
 
+            // Disable any default-enabled advertising features (turn them on later when we get consent)
+            gtag('set', 'allow_google_signals', false);
+
             gtag('config', '${gtag.GA_TRACKING_ID}', {
               page_path: window.location.pathname,
             });
           `,
         }}
       />
-      <Component {...pageProps} />
-    </>
+    </Head>
+    <Script
+      strategy="afterInteractive"
+      src={`https://www.googletagmanager.com/gtag/js?id=${gtag.GA_TRACKING_ID}`}
+    />
+    <Component {...pageProps} />;
+  </>
   )
 }
 

From 026832464217be355bdc8c64dca5c4022cdba88a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Mon, 12 Dec 2022 16:39:28 +0100
Subject: [PATCH 08/13] Move the comment to the right place

---
 examples/with-google-analytics/pages/_app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/with-google-analytics/pages/_app.js b/examples/with-google-analytics/pages/_app.js
index 4fa2f22d1d17..f3aff0af689a 100644
--- a/examples/with-google-analytics/pages/_app.js
+++ b/examples/with-google-analytics/pages/_app.js
@@ -19,7 +19,6 @@ const App = ({ Component, pageProps }) => {
   return (
     <>
     <Head>
-      {/* Global Site Tag (gtag.js) - Google Analytics */}
       <script
         dangerouslySetInnerHTML={{
           __html: `
@@ -37,6 +36,7 @@ const App = ({ Component, pageProps }) => {
         }}
       />
     </Head>
+    {/* Global Site Tag (gtag.js) - Google Analytics */}
     <Script
       strategy="afterInteractive"
       src={`https://www.googletagmanager.com/gtag/js?id=${gtag.GA_TRACKING_ID}`}

From 581c0af2ae06c1200ec055a7196394e9ea89d65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Mon, 12 Dec 2022 16:55:19 +0100
Subject: [PATCH 09/13] Remove configuration that was not in example

---
 examples/with-google-analytics/pages/_app.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/examples/with-google-analytics/pages/_app.js b/examples/with-google-analytics/pages/_app.js
index f3aff0af689a..feea9dabf5cd 100644
--- a/examples/with-google-analytics/pages/_app.js
+++ b/examples/with-google-analytics/pages/_app.js
@@ -26,9 +26,6 @@ const App = ({ Component, pageProps }) => {
             function gtag(){dataLayer.push(arguments);}
             gtag('js', new Date());
 
-            // Disable any default-enabled advertising features (turn them on later when we get consent)
-            gtag('set', 'allow_google_signals', false);
-
             gtag('config', '${gtag.GA_TRACKING_ID}', {
               page_path: window.location.pathname,
             });

From cab512e6afdb85e1405913a868eff22ea9d0c7e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Mon, 12 Dec 2022 17:12:48 +0100
Subject: [PATCH 10/13] Move back code styles

---
 examples/with-google-analytics/pages/_app.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/with-google-analytics/pages/_app.js b/examples/with-google-analytics/pages/_app.js
index feea9dabf5cd..6423f520869d 100644
--- a/examples/with-google-analytics/pages/_app.js
+++ b/examples/with-google-analytics/pages/_app.js
@@ -1,8 +1,8 @@
-import { useEffect } from 'react';
-import Script from 'next/script';
-import Head from 'next/head';
-import { useRouter } from 'next/router';
-import * as gtag from '../lib/gtag';
+import { useEffect } from 'react'
+import Script from 'next/script'
+import Head from 'next/head'
+import { useRouter } from 'next/router'
+import * as gtag from '../lib/gtag'
 
 const App = ({ Component, pageProps }) => {
   const router = useRouter()

From 4ce3056c7cc11f79100201acc0ab298cfe5631f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Mon, 12 Dec 2022 17:33:35 +0100
Subject: [PATCH 11/13] Run prettier

---
 examples/with-google-analytics/pages/_app.js | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/examples/with-google-analytics/pages/_app.js b/examples/with-google-analytics/pages/_app.js
index 6423f520869d..abf0fa36b1b5 100644
--- a/examples/with-google-analytics/pages/_app.js
+++ b/examples/with-google-analytics/pages/_app.js
@@ -1,7 +1,7 @@
-import { useEffect } from 'react'
-import Script from 'next/script'
 import Head from 'next/head'
 import { useRouter } from 'next/router'
+import Script from 'next/script'
+import { useEffect } from 'react'
 import * as gtag from '../lib/gtag'
 
 const App = ({ Component, pageProps }) => {
@@ -18,10 +18,10 @@ const App = ({ Component, pageProps }) => {
 
   return (
     <>
-    <Head>
-      <script
-        dangerouslySetInnerHTML={{
-          __html: `
+      <Head>
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `
             window.dataLayer = window.dataLayer || [];
             function gtag(){dataLayer.push(arguments);}
             gtag('js', new Date());
@@ -30,16 +30,16 @@ const App = ({ Component, pageProps }) => {
               page_path: window.location.pathname,
             });
           `,
-        }}
+          }}
+        />
+      </Head>
+      {/* Global Site Tag (gtag.js) - Google Analytics */}
+      <Script
+        strategy="afterInteractive"
+        src={`https://www.googletagmanager.com/gtag/js?id=${gtag.GA_TRACKING_ID}`}
       />
-    </Head>
-    {/* Global Site Tag (gtag.js) - Google Analytics */}
-    <Script
-      strategy="afterInteractive"
-      src={`https://www.googletagmanager.com/gtag/js?id=${gtag.GA_TRACKING_ID}`}
-    />
-    <Component {...pageProps} />;
-  </>
+      <Component {...pageProps} />;
+    </>
   )
 }
 

From eef2106656c57e0a843c7224e9fee991e3594e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Fri, 16 Dec 2022 14:39:47 +0100
Subject: [PATCH 12/13] Remove semicolon

---
 examples/with-google-analytics/pages/_app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/with-google-analytics/pages/_app.js b/examples/with-google-analytics/pages/_app.js
index abf0fa36b1b5..5e21145499f5 100644
--- a/examples/with-google-analytics/pages/_app.js
+++ b/examples/with-google-analytics/pages/_app.js
@@ -38,7 +38,7 @@ const App = ({ Component, pageProps }) => {
         strategy="afterInteractive"
         src={`https://www.googletagmanager.com/gtag/js?id=${gtag.GA_TRACKING_ID}`}
       />
-      <Component {...pageProps} />;
+      <Component {...pageProps} />
     </>
   )
 }

From 347db2012a5c0dfe6fc4c1a044ad6b491b01dd60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fernando=20H=C3=B6wer=20Barbosa?=
 <josehowerupn@gmail.com>
Date: Fri, 16 Dec 2022 14:42:10 +0100
Subject: [PATCH 13/13] Fix indentation

---
 examples/with-google-analytics/pages/_app.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/with-google-analytics/pages/_app.js b/examples/with-google-analytics/pages/_app.js
index 5e21145499f5..3444e0dd42ea 100644
--- a/examples/with-google-analytics/pages/_app.js
+++ b/examples/with-google-analytics/pages/_app.js
@@ -22,14 +22,14 @@ const App = ({ Component, pageProps }) => {
         <script
           dangerouslySetInnerHTML={{
             __html: `
-            window.dataLayer = window.dataLayer || [];
-            function gtag(){dataLayer.push(arguments);}
-            gtag('js', new Date());
+              window.dataLayer = window.dataLayer || [];
+              function gtag(){dataLayer.push(arguments);}
+              gtag('js', new Date());
 
-            gtag('config', '${gtag.GA_TRACKING_ID}', {
-              page_path: window.location.pathname,
-            });
-          `,
+              gtag('config', '${gtag.GA_TRACKING_ID}', {
+                page_path: window.location.pathname,
+              });
+            `,
           }}
         />
       </Head>
