Merge remote-tracking branch 'origin/master' into darkyzhou-blog

src/components/Analytics.svelte

@@ -2,6 +2,7 @@
   import { onMount } from 'svelte';
   import basicConfiguration from '../../config/basic-configuration.yml';
   import { browser } from '$app/environment';
+  import { afterNavigate } from '$app/navigation';
 
   export let gaMeasurementId;
   export let baiduId;
@@ -21,12 +22,22 @@
     const userAgent = navigator.userAgent.toLocaleLowerCase();
     return basicConfiguration.analytics.blockedUAs?.some((ua) => userAgent.includes(ua));
   }
+
+  afterNavigate(() => {
+    if (!enabled) {
+      return;
+    }
+
+    if (window.umami) {
+      window.umami.track();
+    }
+  });
 </script>
 
 <svelte:head>
   {#if enabled}
     {#if gaMeasurementId}
-      <script src="https://www.googletagmanager.com/gtag/js?id=${gaMeasurementId}" async></script>
+      <script src="https://www.googletagmanager.com/gtag/js?id={gaMeasurementId}" async></script>
       <script>
         window.dataLayer = window.dataLayer || [];
         function gtag() {
@@ -37,12 +48,12 @@
       </script>
     {/if}
     {#if baiduId}
-      <script src="https://hm.baidu.com/hm.js?${baiduId}" async></script>
+      <script src="https://hm.baidu.com/hm.js?{baiduId}" async></script>
     {/if}
     {#if umamiId}
       <script
         src="https://analytics.us.umami.is/script.js"
-        data-website-id="${umamiId}"
+        data-website-id={umamiId}
         async
       ></script>
     {/if}