From 0484dc0e7e5e73b636b432042295a0736e1beb9a Mon Sep 17 00:00:00 2001
From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com>
Date: Sat, 10 Jul 2021 13:30:31 +0900
Subject: feat: Improve canonicalURL for Netlify CMS (#396)

---
 layouts/partials/canonical-link.html | 5 +++--
 layouts/partials/head/general.html   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/layouts/partials/canonical-link.html b/layouts/partials/canonical-link.html
index 8c0d2329..ed53fe0c 100644
--- 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
index 13907b8a..c6511c52 100644
--- 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 }}
-- 
cgit v1.2.3