Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Tracker: Use fetch with keepalive over beacon for pageleaves (#5020)
Karl-Aksel Puulmanna3720964159b
diff --git a/tracker/src/plausible.js b/tracker/src/plausible.jsindex f688c41b77..7db08cb9fb 100644--- a/tracker/src/plausible.js+++ b/tracker/src/plausible.js@@ -114,10 +114,7 @@payload.h = 1{{/if}}- if (navigator.sendBeacon) {- var blob = new Blob([JSON.stringify(payload)], { type: 'text/plain' });- navigator.sendBeacon(endpoint, blob)- }+ sendRequest(endpoint, payload)}function registerPageLeaveListener() {diff --git a/tracker/test/fixtures/pageleave-hash-exclusions.html b/tracker/test/fixtures/pageleave-hash-exclusions.htmlindex aecca154e9..267ee43b68 100644--- a/tracker/test/fixtures/pageleave-hash-exclusions.html+++ b/tracker/test/fixtures/pageleave-hash-exclusions.html@@ -6,7 +6,7 @@<meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Plausible Playwright tests</title>- <script defer data-exclude='/*#*/hash/**/ignored' src="/tracker/js/plausible.exclusions.hash.local.pageleave.js"></script>+ <script defer data-exclude='/*#*/hash/**/ignored' src="/tracker/js/plausible.exclusions.hash.local.pageleave.js" data-allow-fetch></script></head><body>diff --git a/tracker/test/fixtures/pageleave-hash-pageview-props.html b/tracker/test/fixtures/pageleave-hash-pageview-props.htmlindex 651acdb034..1d4da17ed8 100644--- a/tracker/test/fixtures/pageleave-hash-pageview-props.html+++ b/tracker/test/fixtures/pageleave-hash-pageview-props.html@@ -6,7 +6,7 @@<meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Plausible Playwright tests</title>- <script id="plausible-script" defer src="/tracker/js/plausible.hash.local.pageleave.pageview-props.js"></script>+ <script id="plausible-script" defer src="/tracker/js/plausible.hash.local.pageleave.pageview-props.js" data-allow-fetch></script></head><body>diff --git a/tracker/test/fixtures/pageleave-hash.html b/tracker/test/fixtures/pageleave-hash.htmlindex e164362ccf..a0a5965898 100644--- a/tracker/test/fixtures/pageleave-hash.html+++ b/tracker/test/fixtures/pageleave-hash.html@@ -6,7 +6,7 @@<meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Plausible Playwright tests</title>- <script defer src="/tracker/js/plausible.hash.local.pageleave.js"></script>+ <script defer src="/tracker/js/plausible.hash.local.pageleave.js" data-allow-fetch></script><script></script>diff --git a/tracker/test/fixtures/pageleave-manual.html b/tracker/test/fixtures/pageleave-manual.htmlindex f87f00b322..e730c6d0e6 100644--- a/tracker/test/fixtures/pageleave-manual.html+++ b/tracker/test/fixtures/pageleave-manual.html@@ -6,7 +6,7 @@<meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Plausible Playwright tests</title>- <script defer src="/tracker/js/plausible.local.manual.pageleave.js"></script>+ <script defer src="/tracker/js/plausible.local.manual.pageleave.js" data-allow-fetch></script><script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script></head>diff --git a/tracker/test/fixtures/pageleave-pageview-props.html b/tracker/test/fixtures/pageleave-pageview-props.htmlindex c2c9cd11e3..256f7e8e13 100644--- a/tracker/test/fixtures/pageleave-pageview-props.html+++ b/tracker/test/fixtures/pageleave-pageview-props.html@@ -6,7 +6,7 @@<meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Plausible Playwright tests</title>- <script defer event-author="John" src="/tracker/js/plausible.local.pageleave.pageview-props.js"></script>+ <script defer event-author="John" src="/tracker/js/plausible.local.pageleave.pageview-props.js" data-allow-fetch></script></head><body>diff --git a/tracker/test/fixtures/pageleave.html b/tracker/test/fixtures/pageleave.htmlindex a8d415e62f..d7abc10369 100644--- a/tracker/test/fixtures/pageleave.html+++ b/tracker/test/fixtures/pageleave.html@@ -6,7 +6,7 @@<meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Plausible Playwright tests</title>- <script defer src="/tracker/js/plausible.local.pageleave.js"></script>+ <script defer src="/tracker/js/plausible.local.pageleave.js" data-allow-fetch></script></head><body>diff --git a/tracker/test/fixtures/scroll-depth-content-onscroll.html b/tracker/test/fixtures/scroll-depth-content-onscroll.htmlindex 3faacda850..2849ed23dc 100644--- a/tracker/test/fixtures/scroll-depth-content-onscroll.html+++ b/tracker/test/fixtures/scroll-depth-content-onscroll.html@@ -6,7 +6,7 @@<meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Plausible Playwright tests</title>- <script defer src="/tracker/js/plausible.local.pageleave.js"></script>+ <script defer src="/tracker/js/plausible.local.pageleave.js" data-allow-fetch></script></head><body>@@ -22,7 +22,7 @@window.addEventListener("scroll", () => {if (!loadedMore && window.innerHeight + window.scrollY >= document.body.offsetHeight) {loadedMore = true-+const newDiv = document.createElement("div")newDiv.setAttribute("id", "more-content")newDiv.setAttribute("style", "height: 2000px; background-color: lightcoral;")diff --git a/tracker/test/fixtures/scroll-depth-dynamic-content-load.html b/tracker/test/fixtures/scroll-depth-dynamic-content-load.htmlindex 8e85a6fc5a..5edeeea9df 100644--- a/tracker/test/fixtures/scroll-depth-dynamic-content-load.html+++ b/tracker/test/fixtures/scroll-depth-dynamic-content-load.html@@ -4,7 +4,7 @@<meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Document</title>- <script defer src="/tracker/js/plausible.local.pageleave.js"></script>+ <script defer src="/tracker/js/plausible.local.pageleave.js" data-allow-fetch></script></head><body><br>@@ -22,4 +22,4 @@}, 500)</script></body>-</html>\ No newline at end of file+</html>diff --git a/tracker/test/fixtures/scroll-depth-hash.html b/tracker/test/fixtures/scroll-depth-hash.htmlindex 359ba5548c..62f62d401b 100644--- a/tracker/test/fixtures/scroll-depth-hash.html+++ b/tracker/test/fixtures/scroll-depth-hash.html@@ -6,7 +6,7 @@<meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Plausible Playwright tests</title>- <script defer src="/tracker/js/plausible.hash.local.pageleave.js"></script>+ <script defer src="/tracker/js/plausible.hash.local.pageleave.js" data-allow-fetch></script></head><body>diff --git a/tracker/test/fixtures/scroll-depth-slow-window-load.html b/tracker/test/fixtures/scroll-depth-slow-window-load.htmlindex a46b9c94b1..1638f06278 100644--- a/tracker/test/fixtures/scroll-depth-slow-window-load.html+++ b/tracker/test/fixtures/scroll-depth-slow-window-load.html@@ -4,7 +4,7 @@<meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Document</title>- <script defer src="/tracker/js/plausible.local.pageleave.js"></script>+ <script defer src="/tracker/js/plausible.local.pageleave.js" data-allow-fetch></script></head><body><a id="navigate-away" href="/manual.html">@@ -13,4 +13,4 @@<br><img id="slow-image" src="/img/slow-image" alt="slow image"></body>-</html>\ No newline at end of file+</html>diff --git a/tracker/test/fixtures/scroll-depth.html b/tracker/test/fixtures/scroll-depth.htmlindex fe0265852d..2800bf016c 100644--- a/tracker/test/fixtures/scroll-depth.html+++ b/tracker/test/fixtures/scroll-depth.html@@ -3,7 +3,7 @@<head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">- <script defer src="/tracker/js/plausible.local.pageleave.js"></script>+ <script defer src="/tracker/js/plausible.local.pageleave.js" data-allow-fetch></script><title>Document</title></head><body>@@ -11,4 +11,4 @@<a id="navigate-away" href="/manual.html">Navigate away</a></div></body>-</html>\ No newline at end of file+</html>