From 357c13fb1569865c3a8d387717d766415b253233 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Wed, 10 Apr 2024 16:05:59 -0700 Subject: [PATCH 1/3] Bump version v2.11.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bd27a4cf..887ed43d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "umami", - "version": "2.11.0", + "version": "2.11.1", "description": "A simple, fast, privacy-focused alternative to Google Analytics.", "author": "Umami Software, Inc. ", "license": "MIT", From bd360207a65391332ce8c20dbe71c363716bccb9 Mon Sep 17 00:00:00 2001 From: Cedric Date: Mon, 15 Apr 2024 23:25:15 +0200 Subject: [PATCH 2/3] fix(tracker): Remove domain name when parsing url --- src/tracker/index.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/tracker/index.js b/src/tracker/index.js index 43a51501..438c08d2 100644 --- a/src/tracker/index.js +++ b/src/tracker/index.js @@ -52,6 +52,12 @@ }; const parseURL = url => { + try { + const { pathname, search } = new URL(url); + url = pathname + search; + } catch { + /* empty */ + } return excludeSearch ? url.split('?')[0] : url; }; From 0225e63abcf1160cf6bad0f7c8d06747a1bc69a6 Mon Sep 17 00:00:00 2001 From: Cedric Date: Mon, 15 Apr 2024 23:34:52 +0200 Subject: [PATCH 3/3] fix(tracker): Respect excludeSearch consistently --- src/tracker/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tracker/index.js b/src/tracker/index.js index 438c08d2..cc6b8dbb 100644 --- a/src/tracker/index.js +++ b/src/tracker/index.js @@ -7,7 +7,7 @@ document, history, } = window; - const { hostname, pathname, search } = location; + const { hostname, href } = location; const { currentScript, referrer } = document; if (!currentScript) return; @@ -244,7 +244,7 @@ }; } - let currentUrl = `${pathname}${search}`; + let currentUrl = parseURL(href); let currentRef = referrer !== hostname ? referrer : ''; let title = document.title; let cache;