@xingwangzhe/stalux 1.22.5 → 1.22.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xingwangzhe/stalux",
-    "version": "1.22.5",
+    "version": "1.22.7",
     "description": "A powerful, modern Astro blog theme — use as template or install as plugin",
     "keywords": [
         "astro",
@@ -75,7 +75,6 @@
         "prepare": "git config core.hooksPath scripts/git-hooks"
     },
     "dependencies": {
-        "@astrojs/partytown": "^2.1.7",
         "@astrojs/rss": "^4.0.19",
         "@astrojs/sitemap": "^3.7.3",
         "@expressive-code/plugin-line-numbers": "^0.44.1",
@@ -91,7 +90,7 @@
         "astro-seo": "^1.1.0",
         "astro-typewriter": "^1.2.0",
         "badge-maker": "^6.0.0",
-        "js-yaml": "^5.2.3",
+        "js-yaml": "^5.3.0",
         "pagefind": "^1.5.2",
         "photoswipe": "^5.4.4",
         "satteri": "^0.9.5",
@@ -100,7 +99,7 @@
         "temml": "^0.13.4"
     },
     "devDependencies": {
-        "astro": "^7.2.1",
+        "astro": "^7.2.2",
         "knip": "^6.32.2",
         "license-checker-rseidelsohn": "5.0.1",
         "oxfmt": "^0.63.0",
@@ -108,6 +107,6 @@
         "typescript": "^7.0.2"
     },
     "peerDependencies": {
-        "astro": "7.2.0"
+        "astro": "7.2.1"
     }
 }

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

@@ -6,11 +6,20 @@ const headConfig = getHeadData(configEntries);
 const id = headConfig?.bingClarityId;
 ---
 
-{
-    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>
-        </>
-    )
-}
+<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>

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

@@ -4,32 +4,31 @@ 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)}, { send_page_view: false });
-gtag("event", "page_view", { page_title: document.title, page_location: location.href });`
-    : "";
 ---
 
-{
-    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>
-                let lastPath = window.location.pathname;
+<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) {
                 document.addEventListener("astro:page-load", () => {
-                    const path = window.location.pathname;
-                    if (path !== lastPath) {
-                        lastPath = path;
-                        window.gtag?.("event", "page_view", { page_path: path });
-                    }
+                    window.gtag("event", "page_view", { page_path: window.location.pathname });
                 });
-            </script>
-        </>
-    )
-}
+                window.__gtagListenerAdded = true;
+            }
+        };
+        if ("requestIdleCallback" in window) requestIdleCallback(load, { timeout: 3000 });
+        else window.addEventListener("load", () => setTimeout(load, 0), { once: true });
+    })();
+</script>

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

@@ -9,6 +9,8 @@ const umamiURL = umamiConfig?.url;
 ---
 
 <script
-    type="text/partytown"
+    defer
     src={umamiURL}
-    data-website-id={umamiID}></script>
+    data-website-id={umamiID}
+    type="text/javascript"
+    data-astro-rerun></script>