feat: Improve canonicalURL for Netlify CMS (#396)

peaceiris · Jul 10, 2021 · 0484dc0 · 0484dc0
1 parent bac23f3
commit 0484dc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/layouts/partials/canonical-link.html b/layouts/partials/canonical-link.html
@@ -1,4 +1,5 @@
-{{ with $.Page.Params.canonicalURL }}
+{{ $url := urls.Parse $.Page.Params.canonicalURL }}
+{{ if $url.Host }}
   {{ i18n "canonical_link" . }}
-  <a href="{{ . | safeURL }}" rel="noopener noreferrer" target="_blank">{{ (. | safeURL | urls.Parse).Host }}</a>
+  <a href="{{ $.Page.Params.canonicalURL | safeURL }}" rel="noopener noreferrer" target="_blank">{{ $url.Host }}</a>
 {{ end }}
diff --git a/layouts/partials/head/general.html b/layouts/partials/head/general.html
@@ -57,6 +57,7 @@
 <!-- Open Graph Protocol (OGP) -->
 {{ partial "head/ogp" . }}
 
-{{ with .Page.Params.canonicalURL }}
-<link rel="canonical" href="{{ . | safeURL }}">
+{{ $canonicalURL := urls.Parse $.Page.Params.canonicalURL }}
+{{ if $canonicalURL.Host }}
+<link rel="canonical" href="{{ $.Page.Params.canonicalURL | safeURL }}">
 {{ end }}