@xingwangzhe/stalux 1.21.11 → 1.22.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xingwangzhe/stalux",
-    "version": "1.21.11",
+    "version": "1.22.1",
     "description": "A powerful, modern Astro blog theme — use as template or install as plugin",
     "keywords": [
         "astro",
@@ -75,6 +75,7 @@
         "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",

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

@@ -4,31 +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)});`
+    : "";
 ---
 
-<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>
+        </>
+    )
+}

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

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