@xingwangzhe/stalux 1.22.2 → 1.22.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xingwangzhe/stalux",
-    "version": "1.22.2",
+    "version": "1.22.3",
     "description": "A powerful, modern Astro blog theme — use as template or install as plugin",
     "keywords": [
         "astro",

package/src/components/stalux/analytics/clarity.astro

@@ -6,20 +6,11 @@ const headConfig = getHeadData(configEntries);
 const id = headConfig?.bingClarityId;
 ---
 
-<script is:inline data-astro-rerun define:vars={{ id }}>
-    // 防止重复初始化
-    const load = () => {
-        if (!id || document.getElementById("stalux-clarity-script") || window.clarity) return;
-        (function (c, l, a, r, i, t, y) {
-            c[a] = c[a] || function () { (c[a].q = c[a].q || []).push(arguments); };
-            t = l.createElement(r);
-            t.id = "stalux-clarity-script";
-            t.async = 1;
-            t.src = "https://www.clarity.ms/tag/" + i;
-            y = l.getElementsByTagName(r)[0];
-            y.parentNode.insertBefore(t, y);
-        })(window, document, "clarity", "script", id);
-    };
-    if ("requestIdleCallback" in window) requestIdleCallback(load, { timeout: 4000 });
-    else window.addEventListener("load", () => setTimeout(load, 0), { once: true });
-</script>
+{
+    id && (
+        <>
+            <script type="text/partytown" set:html={`window.clarity = window.clarity || function(){ (window.clarity.q = window.clarity.q || []).push(arguments); };`}></script>
+            <script type="text/partytown" src={`https://www.clarity.ms/tag/${id}`}></script>
+        </>
+    )
+}

package/src/components/stalux/analytics/google.astro

@@ -4,31 +4,29 @@ import { getHeadData } from "@utils/config-utils";
 const configEntries = await getCollection("config");
 const headConfig = getHeadData(configEntries);
 const gaID = headConfig?.googleAnalyticsId;
+const gaBootstrap = gaID
+    ? `window.dataLayer = window.dataLayer || [];
+window.gtag = function gtag() { dataLayer.push(arguments); };
+gtag("js", new Date());
+gtag("config", ${JSON.stringify(gaID)}, { allow_google_signals: false });`
+    : "";
 ---
 
-<script is:inline define:vars={{ gaID }}>
-    (() => {
-        const load = () => {
-            if (window.__staluxAnalyticsLoaded) return;
-            window.__staluxAnalyticsLoaded = true;
-            const script = document.createElement("script");
-            script.async = true;
-            script.src = `https://www.googletagmanager.com/gtag/js?id=${gaID}`;
-            document.head.appendChild(script);
-            window.dataLayer = window.dataLayer || [];
-            window.gtag = window.gtag || function () {
-                window.dataLayer.push(arguments);
-            };
-            window.gtag("js", new Date());
-            window.gtag("config", gaID);
-            if (!window.__gtagListenerAdded) {
+{
+    gaID && (
+        <>
+            <script
+                type="text/partytown"
+                src={`https://www.googletagmanager.com/gtag/js?id=${gaID}`}></script>
+            <script type="text/partytown" set:html={gaBootstrap}></script>
+            <script is:inline>
                 document.addEventListener("astro:page-load", () => {
-                    window.gtag("event", "page_view", { page_path: window.location.pathname });
+                    window.dataLayer?.push({
+                        event: "page_view",
+                        page_path: window.location.pathname,
+                    });
                 });
-                window.__gtagListenerAdded = true;
-            }
-        };
-        if ("requestIdleCallback" in window) requestIdleCallback(load, { timeout: 3000 });
-        else window.addEventListener("load", () => setTimeout(load, 0), { once: true });
-    })();
-</script>
+            </script>
+        </>
+    )
+}