Merge pull request #159 from luk27official/main

Fix Google Analytics

Author: luk27official

frontend/build/webpack.common.js

@@ -124,16 +124,7 @@ function generateGoogleAnalytics() {
   if (devMode || ga === undefined || ga === "") {
     return "''";
   }
-  return `'
-<script async src=\\"https://www.googletagmanager.com/gtag/js?id=${ga}\\"></script>
-<script>
-window.dataLayer = window.dataLayer || [];
-function gtag() {
-  window.dataLayer.push(arguments);
-}
-gtag(\\"js\\", new Date());
-gtag(\\"config\\", \\"${ga}\\", {\\"anonymize_ip\\": true});
-</script>
-'`.replaceAll("\n", " ");
-  // Result must be a one-liner else we get compilation error.
+
+  // we return only the GA env variable, the rest is handled in the template file
+  return `'{ga}'`;
 }

frontend/client/partials/ga.html

@@ -1,6 +1,11 @@
 <script type="module" src="./assets/scripts/cookieconsent-config.js"></script>
-<script
-  type="text/plain"
-  data-category="analytics">
-  @googleAnalytics()
-</script>
+<script type="text/plain" data-category="analytics">
+  window.dataLayer = window.dataLayer || [];
+  function gtag() {
+    window.dataLayer.push(arguments);
+  }
+  gtag("js", new Date());
+  gtag("config", "@googleAnalytics()", {"anonymize_ip": true});
+</script>
+<script type="text/plain" data-category="analytics" async
+  src="https://www.googletagmanager.com/gtag/js?id=@googleAnalytics()"></script>