From d3a86ab1339b383db61a144b87d59498936b4052 Mon Sep 17 00:00:00 2001 From: velzie Date: Tue, 3 Sep 2024 10:23:17 -0400 Subject: [PATCH] fix janky base stuff --- src/client/client.ts | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/client/client.ts b/src/client/client.ts index 484371c..16503e5 100644 --- a/src/client/client.ts +++ b/src/client/client.ts @@ -111,23 +111,19 @@ export class ScramjetClient { ); } - let baseurl: URL; - if (iswindow) { - // setup base url - // base url can only be updated at document load time and it will affect all urls resolved by encodeurl/rewriteurl - const base = this.global.document.querySelector("base"); - if (base) { - baseurl = new URL(decodeUrl(base.href)); - } - } - const client = this; this.meta = { get origin() { return client.url; }, get base() { - return baseurl || client.url; + if (iswindow) { + const base = client.global.document.querySelector("base"); + if (base) { + return new URL(base.getAttribute(`href`), client.url.origin); + } + } + return client.url; }, };