@xingwangzhe/stalux 1.21.11 → 1.22.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +2 -1
  2. package/src/components/stalux/analytics/google.astro +30 -26
  3. package/src/components/stalux/analytics/umami.astro +2 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@xingwangzhe/stalux",
3
- "version": "1.21.11",
3
+ "version": "1.22.0",
4
4
  "description": "A powerful, modern Astro blog theme — use as template or install as plugin",
5
5
  "keywords": [
6
6
  "astro",
@@ -75,6 +75,7 @@
75
75
  "prepare": "git config core.hooksPath scripts/git-hooks"
76
76
  },
77
77
  "dependencies": {
78
+ "@astrojs/partytown": "^2.1.7",
78
79
  "@astrojs/rss": "^4.0.19",
79
80
  "@astrojs/sitemap": "^3.7.3",
80
81
  "@expressive-code/plugin-line-numbers": "^0.44.1",
package/src/components/stalux/analytics/google.astro CHANGED
@@ -6,29 +6,33 @@ const headConfig = getHeadData(configEntries);
6
6
  const gaID = headConfig?.googleAnalyticsId;
7
7
  ---
8
8
 
9
- <script is:inline define:vars={{ gaID }}>
10
- (() => {
11
- const load = () => {
12
- if (window.__staluxAnalyticsLoaded) return;
13
- window.__staluxAnalyticsLoaded = true;
14
- const script = document.createElement("script");
15
- script.async = true;
16
- script.src = `https://www.googletagmanager.com/gtag/js?id=${gaID}`;
17
- document.head.appendChild(script);
18
- window.dataLayer = window.dataLayer || [];
19
- window.gtag = window.gtag || function () {
20
- window.dataLayer.push(arguments);
21
- };
22
- window.gtag("js", new Date());
23
- window.gtag("config", gaID);
24
- if (!window.__gtagListenerAdded) {
25
- document.addEventListener("astro:page-load", () => {
26
- window.gtag("event", "page_view", { page_path: window.location.pathname });
27
- });
28
- window.__gtagListenerAdded = true;
29
- }
30
- };
31
- if ("requestIdleCallback" in window) requestIdleCallback(load, { timeout: 3000 });
32
- else window.addEventListener("load", () => setTimeout(load, 0), { once: true });
33
- })();
34
- </script>
9
+ {
10
+ gaID && (
11
+ <>
12
+ <script
13
+ type="text/partytown"
14
+ src={`https://www.googletagmanager.com/gtag/js?id=${gaID}`}></script>
15
+ <script is:inline define:vars={{ gaID }}>
16
+ window.dataLayer = window.dataLayer || [];
17
+ window.gtag =
18
+ window.gtag ||
19
+ function () {
20
+ dataLayer.push(arguments);
21
+ };
22
+ if (!window.__staluxGAConfigured) {
23
+ window.__staluxGAConfigured = true;
24
+ gtag("js", new Date());
25
+ gtag("config", gaID);
26
+ }
27
+ if (!window.__staluxGAListenerAdded) {
28
+ window.__staluxGAListenerAdded = true;
29
+ document.addEventListener("astro:page-load", () => {
30
+ gtag("event", "page_view", {
31
+ page_path: window.location.pathname,
32
+ });
33
+ });
34
+ }
35
+ </script>
36
+ </>
37
+ )
38
+ }
package/src/components/stalux/analytics/umami.astro CHANGED
@@ -9,8 +9,6 @@ const umamiURL = umamiConfig?.url;
9
9
  ---
10
10
 
11
11
  <script
12
- defer
12
+ type="text/partytown"
13
13
  src={umamiURL}
14
- data-website-id={umamiID}
15
- type="text/javascript"
16
- data-astro-rerun></script>
14
+ data-website-id={umamiID}></script>