fix: avoid trailing slashes on downloads

acdh-oeaw · Jun 12, 2024 · 29695dd · 29695dd
1 parent 0de1baf
commit 29695dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/components/content/download.astro b/src/components/content/download.astro
@@ -6,6 +6,4 @@ interface Props {
 const { href } = Astro.props;
 ---
 
-<a download href={href}>
-	<slot />
-</a>
+<a download="" href={href}><slot /></a>
diff --git a/src/components/navigation/nav-link.astro b/src/components/navigation/nav-link.astro
@@ -9,6 +9,4 @@ const pathname = href != null ? (typeof href === "string" ? href : href.pathname
 const isCurrent = pathname === Astro.url.pathname;
 ---
 
-<a {...rest} aria-current={isCurrent ? "page" : undefined} href={href}>
-	<slot />
-</a>
+<a {...rest} aria-current={isCurrent ? "page" : undefined} href={href}><slot /></a>
diff --git a/src/lib/ensure-trailing-slash.ts b/src/lib/ensure-trailing-slash.ts
@@ -1,3 +1,7 @@
+const hasFileExtension = /\.\w+?$/;
+
 export function ensureTrailingSlash(path: string): string {
+	if (hasFileExtension.test(path)) return path;
+
 	return path.endsWith("/") ? path : path + "/";
 }