Merge pull request #95 from jaredLunde:canonical-url-fix

jonasmerlin · web-flow · commit 0e3781993b35 · 2024-06-01T18:28:39.000+02:00
fix: use Astro.site property to generate default canonical urls
diff --git a/src/SEO.astro b/src/SEO.astro
@@ -128,13 +128,16 @@ if (Astro.props.title) {
 } else if (Astro.props.titleDefault) {
   updatedTitle = Astro.props.titleDefault;
 }
+
+const baseUrl = Astro.site ?? Astro.url;
+const defaultCanonicalUrl = new URL(Astro.url.pathname + Astro.url.search, baseUrl);
 ---
 
 {updatedTitle ? <title set:html={updatedTitle} /> : null}
 
 {Astro.props.charset ? <meta charset={Astro.props.charset} /> : null}
 
-<link rel="canonical" href={Astro.props.canonical || Astro.url.href} />
+<link rel="canonical" href={Astro.props.canonical || defaultCanonicalUrl.href} />
 
 {
   Astro.props.description ? (

Original file line number	Diff line number	Diff line change
`@@ -128,13 +128,16 @@ if (Astro.props.title) {`
`128`	`128`	`} else if (Astro.props.titleDefault) {`
`129`	`129`	`updatedTitle = Astro.props.titleDefault;`
`130`	`130`	`}`
	`131`	`+`
	`132`	`+const baseUrl = Astro.site ?? Astro.url;`
	`133`	`+const defaultCanonicalUrl = new URL(Astro.url.pathname + Astro.url.search, baseUrl);`
`131`	`134`	`---`
`132`	`135`
`133`	`136`	`{updatedTitle ? <title set:html={updatedTitle} /> : null}`
`134`	`137`
`135`	`138`	`{Astro.props.charset ? <meta charset={Astro.props.charset} /> : null}`
`136`	`139`
`137`		`-<link rel="canonical" href={Astro.props.canonical \|\| Astro.url.href} />`
	`140`	`+<link rel="canonical" href={Astro.props.canonical \|\| defaultCanonicalUrl.href} />`
`138`	`141`
`139`	`142`	`{`
`140`	`143`	`Astro.props.description ? (`